X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=ebda6eb256fe484354feb94add3a4a979932198f;hb=b4fd565c684d2eefedc8af532b346e8e2d65638d;hp=7ef972ec27cdc721660ae36827673d31cb334e8b;hpb=c5a3f0c024f4cb629811cff9eb04abff36e94138;p=lilypond.git diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 7ef972ec27..ebda6eb256 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -179,7 +179,7 @@ Beam::quanting (SCM smob, SCM posns) if (Stem::is_normal_stem (s)) { - base_lengths.push_back (calc_stem_y (me, s, common, xl, xr, + base_lengths.push_back (calc_stem_y (me, s, common, xl, xr, CENTER, Interval (0, 0), f) / ss); } else @@ -189,12 +189,7 @@ Beam::quanting (SCM smob, SCM posns) stem_xposns.push_back (s->relative_coordinate (common[X_AXIS], X_AXIS)); } - bool xstaff = false; - if (lvs && fvs) - { - Grob *commony = fvs->common_refpoint (lvs, Y_AXIS); - xstaff = Align_interface::has_interface (commony); - } + bool xstaff = Align_interface::has_interface (common[Y_AXIS]); Direction ldir = Direction (stem_infos[0].dir_); Direction rdir = Direction (stem_infos.back ().dir_); @@ -384,8 +379,7 @@ Beam::score_stem_lengths (vector const &stems, Direction d = DOWN; do score[d] /= max (count[d], 1); - while (flip (&d) != DOWN) - ; + while (flip (&d) != DOWN); return score[LEFT] + score[RIGHT]; }