From e5ae2a5d0c4cacfad330affa26ae3df8e08aab7b Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:55:57 +0000 Subject: [PATCH] lilypond-1.3.89 --- lily/spanner.cc | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/lily/spanner.cc b/lily/spanner.cc index 7272c2d91e..184c253b9c 100644 --- 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); -- 2.39.5