X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbeam.cc;h=3214fe4193db21e6cf1cee47b0a7dcd135fa106a;hb=a40e959dba858a468bede003e1f07438c6700fad;hp=c218fef2ebbf6abdc764a3264dc6d945861014df;hpb=161230bdbd28f6295b00051c38aca201e1b039c2;p=lilypond.git

diff --git a/lily/beam.cc b/lily/beam.cc
index c218fef2eb..3214fe4193 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -561,9 +561,15 @@ Beam::print (SCM grob)
     }
 	 
 #if (DEBUG_BEAM_SCORING)
-  SCM quant_score = me->get_property ("quant-score");
-  SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"));
-  if (to_boolean (debug) && scm_is_string (quant_score))
+  SCM annotation = me->get_property ("annotation");
+  if (!scm_is_string (annotation))
+    {
+      SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"));
+      if (to_boolean (debug))
+	annotation = me->get_property ("quant-score");
+    }
+  
+  if (scm_is_string (annotation))
     {
       extract_grob_set (me, "stems", stems);      
 
@@ -578,10 +584,13 @@ Beam::print (SCM grob)
       Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
 
       Stencil score = *unsmob_stencil (Text_interface::interpret_markup
-				    (me->layout ()->self_scm (), properties, quant_score));
+				    (me->layout ()->self_scm (), properties, annotation));
 
       if (!score.is_empty ())
-	the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
+	{
+	  score.translate_axis (me->relative_coordinate(commonx, X_AXIS), X_AXIS);
+	  the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
+	}
     }
 #endif
 
@@ -871,8 +880,10 @@ Beam::no_visible_stem_positions (Grob *me, Interval default_value)
 
   Direction dir = get_grob_direction (me);
   Real y = head_positions[dir]
-    + dir * get_beam_translation (me) * multiplicity.length () / 2;
+    * 0.5 * Staff_symbol_referencer::staff_space (me)
+    + dir * get_beam_translation (me) * (multiplicity.length () + 1);
 
+  y /= Staff_symbol_referencer::staff_space (me);
   return Interval (y,y);
 }
 
@@ -1522,6 +1533,7 @@ ADD_INTERFACE (Beam,
 	       ,
 	       
 	       /* properties */
+	       "annotation "
 	       "auto-knee-gap "
 	       "beamed-stem-shorten "
 	       "beaming "