X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=6845b1346be59a2eefe2b3499965057993ee1b69;hb=bf707a03756021f69e3f5d1a8246639a6a601099;hp=f39bf9f62c06e55f0914bf5e83004ad775b96bde;hpb=3cfbe76597441ea915603c4e6e60d3e660fce647;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index f39bf9f62c..6845b1346b 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1303,9 +1303,10 @@ Beam::shift_region_to_valid (SCM grob, SCM posns) || !collision_free[UP].is_empty ()) { // We have space above or below collisions (or, no collisions at - // all). + // all). Should we factor in the size of the collision_free + // interval as well? Interval best = - (collision_free[DOWN].length () > collision_free[UP].length ()) ? + (collision_free[DOWN].distance(beam_left_y) < collision_free[UP].distance (beam_left_y)) ? collision_free[DOWN] : collision_free[UP]; beam_left_y = point_in_interval (best, 2.0);