X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=900f76626241f62b555007ce3b0303d8a7b17139;hb=bef92d6520b770de640bde6125368c6f0056aed4;hp=5bd62f19bc246e038c86961b6e8d3977c15bb75b;hpb=dcbe4187b56ee3f420c3ad81bad54e8406c727e8;p=lilypond.git

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 5bd62f19bc..900f766262 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -1,10 +1,21 @@
 /*
-  beam-quanting.cc -- implement Beam quanting functions
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "beam.hh"
@@ -37,10 +48,6 @@ Beam_quant_parameters::fill (Grob *him)
 {
   SCM details = him->get_property ("details");
 
-  /*
-    TODO: put in 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);
@@ -113,17 +120,16 @@ Beam::quanting (SCM smob, SCM posns)
   /*
     Calculations are relative to a unit-scaled staff, i.e. the quants are
     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));
@@ -134,7 +140,6 @@ Beam::quanting (SCM smob, SCM posns)
     going to REGION_SIZE == 2, yields another 0.6 second with
     wtk1-fugue2.
 
-
     (result indexes between 70 and 575)  ? --hwn.
 
   */
@@ -179,7 +184,7 @@ Beam::quanting (SCM smob, SCM posns)
 
       if (Stem::is_normal_stem (s))
 	{
-	  base_lengths.push_back (calc_stem_y (me, s, common, xl, xr,
+	  base_lengths.push_back (calc_stem_y (me, s, common, xl, xr, CENTER, 
 					       Interval (0, 0), f) / ss);
 	}
       else
@@ -255,7 +260,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;
 
@@ -379,8 +384,7 @@ Beam::score_stem_lengths (vector<Grob*> const &stems,
   Direction d = DOWN;
   do
     score[d] /= max (count[d], 1);
-  while (flip (&d) != DOWN)
-    ;
+  while (flip (&d) != DOWN);
 
   return score[LEFT] + score[RIGHT];
 }
@@ -448,7 +452,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,
 
@@ -476,8 +480,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);
@@ -505,9 +509,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