Run `make grand-replace'.

[lilypond.git] / lily / spacing-engraver.cc

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 81d5f2c8294a7f8b95a6bf2da46cb0457a394628..dffb21d638cab98b0c29d179998b339954692a0f 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -174,7 +174,7 @@ Spacing_engraver::add_starter_duration (Grob_info i)
       Stream_event *r = i.event_cause ();
       if (r && r->in_event_class ("rhythmic-event"))
        {
-         Moment len = get_event_length (r);
+         Moment len = get_event_length (r, now_);
          Rhythmic_tuple t (i, now_mom () + len);
          now_durations_.push_back (t);
        }
@@ -211,6 +211,7 @@ Spacing_engraver::stop_translation_timestep ()
       Stream_event *ev = playing_durations_[i].info_.event_cause ();
       if (ev)
        {
+         Moment now = now_mom ();
          Moment m = get_event_length (ev);
          shortest_playing = min (shortest_playing, m);
        }
@@ -261,13 +262,18 @@ ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_grob);
 
 ADD_TRANSLATOR (Spacing_engraver,
-               "make a SpacingSpanner and do "
-               "bookkeeping of shortest starting and playing notes  ",
+               /* doc */
+               "Make a @code{SpacingSpanner} and do bookkeeping of shortest"
+               " starting and playing notes.",
+
+               /* create */
+               "SpacingSpanner ",
 
-               /* create */ "SpacingSpanner",
                /* read */
                "currentMusicalColumn "
                "currentCommandColumn "
-               "proportionalNotationDuration",
+               "proportionalNotationDuration ",
                
-               /* write */ "");
+               /* write */
+               ""
+               );