Run `make grand-replace'.

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index c218fef2ebbf6abdc764a3264dc6d945861014df..c8adf5694d80f60f8ed2a4121d84d87ada830911 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -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);
 }
 
@@ -1512,16 +1523,15 @@ Beam::get_direction_beam_count (Grob *me, Direction d)
 }
 
 ADD_INTERFACE (Beam,
-
-              "A beam. \n\n"
-              "The @code{thickness} property is the weight of beams, "
-              "measured in staffspace.  The @code{direction} "
-              "property is not user-serviceable. Use "
-              "the @code{direction} property of @code{Stem} instead. "
-
-              ,
+              "A beam.\n"
+              "\n"
+              "The @code{thickness} property is the weight of beams,"
+              " measured in staffspace.  The @code{direction} property is"
+              " not user-serviceable.  Use the @code{direction} property"
+              " of @code{Stem} instead.",
               
               /* properties */
+              "annotation "
               "auto-knee-gap "
               "beamed-stem-shorten "
               "beaming "
@@ -1530,7 +1540,7 @@ ADD_INTERFACE (Beam,
               "concaveness "
               "damping "
               "details "
-              "direction " 
+              "direction "
               "gap "
               "gap-count "
               "grow-direction "