X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fbeam-quanting.cc;h=c5cafd5cfa9acb63e93723eaa7aa76347b06cc8a;hb=346067ab7e42c9cbc359d48b23c79dc0780c8320;hp=e868e51d7f124af9c4ee4a690a19890314569429;hpb=cadb80a98fffcf101886553dd1327e7c468682dc;p=lilypond.git

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index e868e51d7f..c5cafd5cfa 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -176,6 +176,8 @@ void Beam_scoring_problem::add_collision (Real x, Interval y,
   c.beam_y_.widen (0.5 * beam_thickness);
   
   c.x_ = x;
+
+  y *= 1/staff_space;
   c.y_ = y;
   c.base_penalty_ = score_factor;
   collisions_.push_back (c);
@@ -447,6 +449,12 @@ Beam_scoring_problem::solve () const {
   vector<Beam_configuration*> configs;
   generate_quants (&configs);
 
+  if (configs.empty ())
+    {
+      programming_error ("No viable beam quanting found.  Using unquanted y value.");
+      return unquanted_y;
+    }
+
   Beam_configuration *best = NULL;  
 
   bool debug =