From: Han-Wen Nienhuys <hanwen@lilypond.org>
Date: Tue, 1 Mar 2011 01:34:55 +0000 (-0300)
Subject: Rename collision-distance beam detail property to collision-padding.
X-Git-Tag: release/2.13.52-1~3^2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e3a15ec3c1951dd16f6ee71fbd79870d9e2fb3a0;p=lilypond.git

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

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index db9b1c1b55..6b495b3794 100644
--- 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 7f6ce478d7..08664049e8 100644
--- 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 286490e81b..26adbfd471 100644
--- 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)