From: Han-Wen Nienhuys Date: Fri, 1 Dec 2006 16:34:47 +0000 (+0100) Subject: take stems for common refpoint too. X-Git-Tag: release/2.11.1-1~9^2~8^2~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a22cdcd513c01949c24d5a7316e2087c9843fde3;p=lilypond.git take stems for common refpoint too. (cherry picked from ed5309f28b1efb3943f38d241c54542534b5bd52 commit) --- diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index db505c694b..f9cac96ac7 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -304,6 +304,20 @@ Accidental_placement::calc_positioning_done (SCM smob) uniq (heads); common[Y_AXIS] = common_refpoint_of_array (heads, common[Y_AXIS], Y_AXIS); + vector stems; + for (vsize i = 0; i < heads.size (); i++) + { + if (Grob *s = Rhythmic_head::get_stem (heads[i])) + { + stems.push_back (s); + common[Y_AXIS] = s->common_refpoint (common[Y_AXIS], Y_AXIS); + } + } + + vector_sort (stems, less ()); + uniq (stems); + + for (vsize i = apes.size (); i--;) { Accidental_placement_entry *ape = apes[i]; @@ -340,15 +354,6 @@ Accidental_placement::calc_positioning_done (SCM smob) head_extents.push_back (Box (heads[i]->extent (common[X_AXIS], X_AXIS), heads[i]->extent (common[Y_AXIS], Y_AXIS))); - vector stems; - for (vsize i = 0; i < heads.size (); i++) - { - if (Grob *s = Rhythmic_head::get_stem (heads[i])) - stems.push_back (s); - } - - vector_sort (stems, less ()); - uniq (stems); for (vsize i = 0; i < stems.size (); i ++) { int very_large = INT_MAX;