Bugfix: uniq-list uses equal? iso. eq?.

[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..cf5f25a613f6099d70f76d91182a7b140694e5f1 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -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);