Merge branch 'stable/2.14' of ssh://git.sv.gnu.org/srv/git/lilypond into stable/2.14

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index 6ae2ed4819bd43d75c03869a5be7085abf56b9ee..6845b1346be59a2eefe2b3499965057993ee1b69 100644 (file)
--- 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);
@@ -1819,6 +1820,7 @@ ADD_INTERFACE (Beam,
               "clip-edges "
               "concaveness "
               "collision-interfaces "
+              "collision-voice-only "
               "covered-grobs "
               "damping "
               "details "