X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=06b7c2d80be86fe2f6fb4690709ee720ced8a57c;hb=23107e17b907b6463c38fc0392161c64a87ac4b6;hp=cf933d500bc3d3071d1386fdb172e8391bb51465;hpb=62f221b6b3861ff055dc0384ec3c48cc665688cd;p=lilypond.git

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index cf933d500b..06b7c2d80b 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -37,10 +37,6 @@ Beam_quant_parameters::fill (Grob *him)
 {
   SCM details = him->get_property ("details");
 
-  /* 
-     TODO: The default values should be copied to define-grobs.scm.
-   */
-  INTER_QUANT_PENALTY = get_detail (details, ly_symbol2scm ("inter-quant-penalty"), 1000.0);
   SECONDARY_BEAM_DEMERIT = get_detail (details, ly_symbol2scm ("secondary-beam-demerit"), 10.0);
   STEM_LENGTH_DEMERIT_FACTOR = get_detail (details, ly_symbol2scm ("stem-length-demerit-factor"), 5);
   REGION_SIZE = get_detail (details, ly_symbol2scm ("region-size"), 2);
@@ -115,14 +111,14 @@ Beam::quanting (SCM smob, SCM posns)
     divided by the current staff_space.
   */
   Real ss = Staff_symbol_referencer::staff_space (me);
-  Real thickness = Beam::get_thickness (me) / ss;
+  Real beam_thickness = Beam::get_beam_thickness (me) / ss;
   Real slt = Staff_symbol_referencer::line_thickness (me) / ss;
 
   Real dy_mus = robust_scm2double (me->get_property ("least-squares-dy"), 0);
   Real straddle = 0.0;
-  Real sit = (thickness - slt) / 2;
+  Real sit = (beam_thickness - slt) / 2;
   Real inter = 0.5;
-  Real hang = 1.0 - (thickness - slt) / 2;
+  Real hang = 1.0 - (beam_thickness - slt) / 2;
   Real quants [] = {straddle, sit, inter, hang };
 
   int num_quants = int (sizeof (quants) / sizeof (Real));
@@ -253,7 +249,7 @@ Beam::quanting (SCM smob, SCM posns)
     if (qscores[i].demerits < reasonable_score)
       {
 	Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr,
-					 rad, slt, thickness, beam_translation,
+					 rad, slt, beam_thickness, beam_translation,
 					 edge_beam_counts, ldir, rdir, &parameters);
 	qscores[i].demerits += d;
 
@@ -445,7 +441,7 @@ Real
 Beam::score_forbidden_quants (Real yl, Real yr,
 			      Real radius,
 			      Real slt,
-			      Real thickness, Real beam_translation,
+			      Real beam_thickness, Real beam_translation,
 			      Drul_array<int> beam_counts,
 			      Direction ldir, Direction rdir,
 
@@ -473,8 +469,8 @@ Beam::score_forbidden_quants (Real yl, Real yr,
 	    will be in the gap of the (2, sit) quant, leading to a
 	    false demerit.
 	  */
-	  Real gap1 = y[d] - stem_dir * ((j - 1) * beam_translation + thickness / 2 - slt / 2.2);
-	  Real gap2 = y[d] - stem_dir * (j * beam_translation - thickness / 2 + slt / 2.2);
+	  Real gap1 = y[d] - stem_dir * ((j - 1) * beam_translation + beam_thickness / 2 - slt / 2.2);
+	  Real gap2 = y[d] - stem_dir * (j * beam_translation - beam_thickness / 2 + slt / 2.2);
 
 	  Interval gap;
 	  gap.add_point (gap1);
@@ -502,9 +498,9 @@ Beam::score_forbidden_quants (Real yl, Real yr,
   if (max (beam_counts[LEFT], beam_counts[RIGHT]) >= 2)
     {
       Real straddle = 0.0;
-      Real sit = (thickness - slt) / 2;
+      Real sit = (beam_thickness - slt) / 2;
       Real inter = 0.5;
-      Real hang = 1.0 - (thickness - slt) / 2;
+      Real hang = 1.0 - (beam_thickness - slt) / 2;
 
       Direction d = LEFT;
       do