release: 0.1.59

[lilypond.git] / lily / timing-translator.cc

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index f294431972b42557dfe6cd93a87ebecf3facd15d..de93a9206f402a3cd11e2b065a0f832171825b8c 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -11,10 +11,12 @@
 #include "command-request.hh"
 #include "translator-group.hh"
 #include "global-translator.hh"
+#include "multi-measure-rest.hh"
 
 Timing_translator::Timing_translator ()
 {
   default_grouping_ = Rhythmic_grouping (MInterval (0, 1), 4); // ugh
+  mmrest_b_ = false;
 }
 
 bool
@@ -113,8 +115,9 @@ Timing_translator::do_pre_move_processing()
   Global_translator *global_l =
     daddy_trans_l_->ancestor_l (100)->global_l (); // ugh 100.
 
-  if (!time_.cadenza_b_)
+  if (!time_.cadenza_b_ && !mmrest_b_)
     global_l->add_moment_to_process (time_.next_bar_moment ());
+//  mmrest_b_ = false;
 }
 
 IMPLEMENT_IS_TYPE_B1(Timing_translator, Translator);