Rename collision-distance beam detail property to collision-padding.

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index db9b1c1b5568f3412e7c170999c46c3b6907f63d..6b495b379427ac4d7f0f383058162a53a61a8a92 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -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);
 }
 
@@ -756,8 +756,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;

diff --git a/lily/include/beam-scoring-problem.hh b/lily/include/beam-scoring-problem.hh
index 7f6ce478d73b79d24ba22c2ffc6d55421d01c152..08664049e8b331393e0933e5b53f5dc74f1fb5be 100644 (file)
--- a/lily/include/beam-scoring-problem.hh
+++ b/lily/include/beam-scoring-problem.hh
@@ -90,7 +90,7 @@ struct Beam_quant_parameters
   Real IDEAL_SLOPE_FACTOR;
   Real ROUND_TO_ZERO_SLOPE;
   Real COLLISION_PENALTY;
-  Real COLLISION_DISTANCE;
+  Real COLLISION_PADDING;
   Real HORIZONTAL_INTER_QUANT_PENALTY;
   Real STEM_COLLISION_FACTOR;
   

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 286490e81beffd11d05169fb2858eeb4b6736e9d..26adbfd471b851b3cf65d475d3a89c4b60f2e4b1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -361,7 +361,7 @@
            (musical-direction-factor . 400)
            (ideal-slope-factor . 10)
           (collision-penalty . 500)
-          (collision-distance . 0.35)
+          (collision-padding . 0.35)
            (round-to-zero-slope . 0.02)))
        (direction . ,ly:beam::calc-direction)