X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=fc5563854cc2295fc5407cd33c0aceb40790ee27;hb=78eb8695d44a5a5775457a14770093299b6d5fa6;hp=9a7816bf0dd5cbdbff45a4d34917e2a12eab17e8;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 9a7816bf0d..fc5563854c 100644
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
@@ -12,6 +12,7 @@
 #include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 #include "moment.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -68,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_);
@@ -147,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);
@@ -250,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 "
@@ -268,4 +272,6 @@ ADD_TRANSLATOR (Multi_measure_rest_engraver,
 		"measurePosition "
 		"measureLength ",
 		
-		/* write */ "");
+		/* write */
+		""
+		);