From aa5e5ebae019f93e10945474cc2cc4849349603c Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:46:51 +0000 Subject: [PATCH] lilypond-1.1.28 --- lily/separating-group-spanner.cc | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 468b340d39..dbda2e4640 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -19,31 +19,30 @@ Separating_group_spanner::get_rods () const for (int i=0; i < spacing_unit_l_arr_.size () -1; i++) { + Single_malt_grouping_item *l =spacing_unit_l_arr_[i]; + Single_malt_grouping_item *lb + = dynamic_cast(l->find_prebroken_piece (RIGHT)); + Single_malt_grouping_item *r = spacing_unit_l_arr_[i+1]; + Single_malt_grouping_item *rb + = dynamic_cast(r->find_prebroken_piece (LEFT)); + a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1])); - bool lb =spacing_unit_l_arr_[i]->column_l ()->breakable_b_; if (lb) { - Rod r((Single_malt_grouping_item*) - spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), - spacing_unit_l_arr_[i+1]); - r.distance_f_ += paper ()->interline_f () *1.5; - a.push (r); + Rod rod(lb, r); + rod.distance_f_ += paper ()->interline_f () *1.5; + a.push (rod); } - bool rb=spacing_unit_l_arr_[i+1]->column_l ()->breakable_b_; + if (rb) { - a.push (Rod (spacing_unit_l_arr_[i], - (Single_malt_grouping_item*) - spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT))); + a.push (Rod (l, rb)); } if (lb && rb) { - Rod r((Single_malt_grouping_item*) - spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), - (Single_malt_grouping_item*) - spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)); - r.distance_f_ += paper ()->interline_f () *1.5; - a.push (r); + Rod rod(lb, rb); + rod.distance_f_ += paper ()->interline_f () *1.5; + a.push (rod); } } -- 2.39.5