lilypond-1.3.89

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 7272c2d91e76f3c2ae03250394f9ef6ebcfae55c..184c253b9ca6dd38e6ec480c727098297491c452 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -104,10 +104,12 @@ Spanner::do_break_processing ()
          span_p->set_bound(LEFT,bounds[LEFT]);
          span_p->set_bound(RIGHT,bounds[RIGHT]);
 
-         if (bounds[LEFT]->line_l ()
-             && bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ())
+         if (!bounds[LEFT]->line_l () 
+           
+             || !bounds[RIGHT]->line_l ()
+             || bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ())
            {
-             programming_error ("bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ()");
+             programming_error ("bounds of spanner are invalid");
 #if 0
              /*
                lily crashes upon displaying this ...
@@ -122,20 +124,6 @@ Spanner::do_break_processing ()
 #endif
              span_p->suicide ();
            }
-         else if (!bounds[LEFT]->line_l ())
-           {
-             // bounds[LEFT]->line_l ()->typeset_element (span_p);
-             // broken_into_l_arr_.push (span_p);
-             programming_error ("bounds[LEFT]->line_l () == 0");
-             span_p->suicide ();
-           }
-         else if (!bounds[RIGHT]->line_l ())
-           {
-             // bounds[RIGHT]->line_l ()->typeset_element (span_p);
-             // broken_into_l_arr_.push (span_p);
-             programming_error ("bounds[RIGHT]->line_l () == 0");
-             span_p->suicide ();
-           }
          else
            {
              bounds[LEFT]->line_l ()->typeset_element (span_p);