Run `make grand-replace'.

[lilypond.git] / lily / multi-measure-rest-engraver.cc

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index ecb0d97a62246863ef4fd011c5096563f0a21799..9391aac0b880d9f56f5b4fc30e1c74a744857121 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
@@ -69,7 +69,7 @@ Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev)
   /* FIXME: Should use ASSIGN_EVENT_ONCE. Can't do that yet because of
      the kill-mm-rests hack in part-combine-iterator. */
   rest_ev_ = ev;
-  stop_moment_ = now_mom () + get_event_length (rest_ev_);
+  stop_moment_ = now_mom () + get_event_length (rest_ev_, now_mom ());
   /*
   if (ASSIGN_EVENT_ONCE (rest_ev_, ev))
     stop_moment_ = now_mom () + get_event_length (rest_ev_);
@@ -148,12 +148,13 @@ void
 Multi_measure_rest_engraver::stop_translation_timestep ()
 {
   /* We cannot do this earlier, as breakableSeparationItem is not yet
-     there.  */
+     there.
+
+     Actually, we no longer use breakableSeparationItem -- should this be moved?
+     -- jneem */
   if (bar_seen_)
     {
-      Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem"));
-      if (!cmc)
-       cmc = unsmob_grob (get_property ("currentCommandColumn"));
+      Grob *cmc = unsmob_grob (get_property ("currentCommandColumn"));
 
       /* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly  */
       last_command_item_ = dynamic_cast<Item *> (cmc);
@@ -251,10 +252,12 @@ Multi_measure_rest_engraver::finalize ()
 
 ADD_TRANSLATOR (Multi_measure_rest_engraver,
                /* doc */
-               "Engraves multi-measure rests that are produced with @code{R}.  Reads "
-               "@code{measurePosition} and @code{internalBarNumber} to determine what number to print "
-               "over the @ref{MultiMeasureRest}.  Reads @code{measureLength} to determine if it "
-               "should use a whole rest or a breve rest to represent 1 measure ",
+               "Engrave multi-measure rests that are produced with"
+               " @samp{R}.  It reads @code{measurePosition} and"
+               " @code{internalBarNumber} to determine what number to print"
+               " over the @ref{MultiMeasureRest}.  Reads @code{measureLength}"
+               " to determine whether it should use a whole rest or a breve"
+               " rest to represent one measure.",
                
                /* create */
                "MultiMeasureRest "
@@ -269,4 +272,6 @@ ADD_TRANSLATOR (Multi_measure_rest_engraver,
                "measurePosition "
                "measureLength ",
                
-               /* write */ "");
+               /* write */
+               ""
+               );