From: Joe Neeman Date: Sat, 26 Jun 2010 16:34:51 +0000 (+0300) Subject: Revert "Fix 1062." X-Git-Tag: release/2.13.27-1~70 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e581052026c48aed3e44fd32de74b8308f8434d;p=lilypond.git Revert "Fix 1062." This reverts commit 891840d4b25b71e9caac50174077d6461bb5cc7f. --- diff --git a/lily/system.cc b/lily/system.cc index c801b2cc1d..f938b8322e 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -583,7 +583,7 @@ System::part_of_line_pure_height (vsize start, vsize end, bool begin) vector offsets = Align_interface::get_minimum_translations (alignment, staves, Y_AXIS, true, start, end); Interval ret; - for (vsize i = 0; i < staves.size (); ++i) + for (vsize i = 0; i < staves.size(); ++i) { Interval iv = begin? Axis_group_interface::begin_of_line_pure_height (staves[i], start) : @@ -592,22 +592,6 @@ System::part_of_line_pure_height (vsize start, vsize end, bool begin) iv.translate (offsets[i]); ret.unite (iv); } - - extract_grob_set (this, "elements", elts); - for (vsize i = 0; i < elts.size (); ++i) - { - Grob *g = elts[i]; - if (!dynamic_cast (g) && !Axis_group_interface::has_interface (g)) - { - Interval iv = g->pure_height (this, start, end); - Item *it = dynamic_cast (g); - Grob *col = it ? it->get_column () : 0; - bool item_at_beginning = col && (Paper_column::get_rank (col) == (int) start); - - if (g->is_live () && begin == item_at_beginning) - ret.unite (iv); - } - } return ret; }