X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=17ad169a1fc34d18a2372d57ce2346bae0c2789c;hb=c1a0e9792fcd6a23573ded6e19a37ead6b782b32;hp=7ef972ec27cdc721660ae36827673d31cb334e8b;hpb=ca2de5fb00b832f2875583734af4a74c70e192f6;p=lilypond.git

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 7ef972ec27..17ad169a1f 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -37,8 +37,8 @@ Beam_quant_parameters::fill (Grob *him)
 {
   SCM details = him->get_property ("details");
 
-  /*
-    TODO: put in define-grobs.scm
+  /* 
+     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);
@@ -113,7 +113,6 @@ 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;
@@ -134,7 +133,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 +177,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
@@ -189,12 +187,7 @@ Beam::quanting (SCM smob, SCM posns)
 
       stem_xposns.push_back (s->relative_coordinate (common[X_AXIS], X_AXIS));
     }
-  bool xstaff = false;
-  if (lvs && fvs)
-    {
-      Grob *commony = fvs->common_refpoint (lvs, Y_AXIS);
-      xstaff = Align_interface::has_interface (commony);
-    }
+  bool xstaff = Align_interface::has_interface (common[Y_AXIS]);
 
   Direction ldir = Direction (stem_infos[0].dir_);
   Direction rdir = Direction (stem_infos.back ().dir_);
@@ -384,8 +377,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];
 }