Take collisions into account in Beam::shift_region_to_valid().

[lilypond.git] / lily / beam-quanting.cc

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index f8a9434e7eab4f34d0d418ac75b245178346e4f7..cc2c707dffdad3aaaedffbe3da6bd7d93598f2b2 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -20,9 +20,9 @@
 
 #include "beam-scoring-problem.hh"
 
+#include <algorithm>
 #include <queue>  
 #include <set>
-#include <algorithm>
 using namespace std;
 
 #include "align-interface.hh"
@@ -72,7 +72,7 @@ Beam_quant_parameters::fill (Grob *him)
 
   // Collisions
   COLLISION_PENALTY = get_detail (details, ly_symbol2scm ("collision-penalty"), 500);
-  COLLISION_DISTANCE = get_detail (details, ly_symbol2scm ("collision-distance"), 0.5);
+  COLLISION_PADDING = get_detail (details, ly_symbol2scm ("collision-padding"), 0.5);
   STEM_COLLISION_FACTOR = get_detail (details, ly_symbol2scm ("stem-collision-factor"), 0.1);
 }
 
@@ -194,13 +194,11 @@ void Beam_scoring_problem::init_collisions (vector<Grob*> grobs)
   set<Grob*> stems;
   for (vsize i = 0; i < grobs.size (); i++) {
     Box b;
-
     for (Axis a = X_AXIS; a < NO_AXES; incr (a))
       b[a] = grobs[i]->extent(common[a], a);
 
-    Real width = b[X_AXIS].length();
-
-    Real width_factor = sqrt(width / staff_space);
+    Real width = b[X_AXIS].length ();
+    Real width_factor = sqrt (width / staff_space);
 
     Direction d = LEFT;
     do
@@ -450,10 +448,12 @@ Beam_scoring_problem::solve () const {
 
   Beam_configuration *best = NULL;  
 
+  bool debug =
+    to_boolean (beam->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring")));
   SCM inspect_quants = beam->get_property ("inspect-quants");
-  if (to_boolean (beam->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring")))
-      && scm_is_pair (inspect_quants))
+  if (scm_is_pair (inspect_quants)) 
     {
+      debug = true;
       best = force_score (inspect_quants, configs);
     }
   else
@@ -463,7 +463,6 @@ Beam_scoring_problem::solve () const {
       for (vsize i = 0; i < configs.size(); i++)
         queue.push(configs[i]);
 
-
       /*
         TODO
 
@@ -494,7 +493,7 @@ Beam_scoring_problem::solve () const {
   Interval final_positions = best->y;
 
 #if DEBUG_BEAM_SCORING
-  if (to_boolean (beam->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"))))
+  if (debug)
     {
       // debug quanting
       int completed = 0;
@@ -505,7 +504,7 @@ Beam_scoring_problem::solve () const {
         }
 
       string card = best->score_card_ + to_string (" c%d/%d", completed, configs.size());
-      beam->set_property ("quant-score", ly_string2scm (card));
+      beam->set_property ("annotation", ly_string2scm (card));
     }
 #endif
 
@@ -755,8 +754,8 @@ Beam_scoring_problem::score_collisions (Beam_configuration *config) const
                     beam_y.distance (collision_y[UP]));
 
       Real scale_free = 
-        max (parameters.COLLISION_DISTANCE - dist, 0.0)/
-        parameters.COLLISION_DISTANCE;
+        max (parameters.COLLISION_PADDING - dist, 0.0)/
+        parameters.COLLISION_PADDING;
       demerits +=
         collisions_[i].base_penalty_ *
         pow (scale_free, 3) * parameters.COLLISION_PENALTY;