X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=b3e574dad8978488b96de7cf80d4728041ef5485;hb=9bef4c41f80988822469f80337c3c007e4adb4d1;hp=fc22dd50f2fd2fe2c8b9132262c6dd67fc2c8597;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index fc22dd50f2..b3e574dad8 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Han-Wen Nienhuys + Copyright (C) 1998--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -113,19 +113,7 @@ Separation_item::boxes (Grob *me, Grob *left) if (left) elts = Accidental_placement::get_relevant_accidentals (read_only_elts, left); else - { - elts = read_only_elts; - - /* This is a special-case for NoteColumn: we want to include arpeggio in its - skyline (so spacing takes it into account) but we don't want to include it - in the NoteColumn's extent because some spanners (eg. Hairpin) bound themselves - on the NoteColumn and we don't want them to include arpeggios in their bounds. - */ - if (Grob *a = Note_column::arpeggio (me)) - { - elts.push_back (a); - } - } + elts = read_only_elts; Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS);