* mf/GNUmakefile: always trace pfa fonts.

[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 72aedc7d2858f476df3cc02b58696d1cc10634f4..b25fd144d11642f90de8784e9bd22ef0e656e139 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -38,7 +38,7 @@ private:
   Link_array<Music> text_events_;
   int start_measure_;
   Moment start_moment_;
-  
+  Rational last_main_moment_;
 
   Spanner *mmrest_;
   Link_array<Spanner> numbers_;
@@ -115,7 +115,7 @@ Multi_measure_rest_engraver::process_music ()
              SCM t = e->get_mus_property ("text");
              SCM dir = e->get_mus_property ("direction");
              sp->set_grob_property ("text",t);
-             if (ly_dir_p (dir))
+             if (is_direction (dir))
                sp->set_grob_property ("direction",dir);
              
              numbers_.push (sp);
@@ -168,6 +168,7 @@ Multi_measure_rest_engraver::process_music ()
          for (int i = 0; i < numbers_.size(); i++)
            add_bound_item (numbers_[i], it);
        }
+      
       if (last_rest_)
        {
          add_bound_item (last_rest_,it);
@@ -208,11 +209,11 @@ Multi_measure_rest_engraver::stop_translation_timestep ()
        {
          typeset_grob (last_rest_);
 
-         /*
-           huh ? add-staff-support ?
-         */
          for (int i = 0; i < last_numbers_.size ();i++)
-           typeset_grob (last_numbers_[i]);
+           {
+             typeset_grob (last_numbers_[i]);
+             Side_position_interface::add_staff_support (last_numbers_[i]);
+           }
        }
       last_rest_ = 0;
       last_numbers_.clear();
@@ -232,12 +233,15 @@ Multi_measure_rest_engraver::start_translation_timestep ()
 {
   SCM smp = get_property ("measurePosition");
   Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
-  
-  if (mmrest_ && !mp.to_bool ())
+
+  Moment now =now_mom ();
+  if (mmrest_
+      && now.main_part_ != last_main_moment_
+      && mp.main_part_ == Rational (0))
     {
       last_rest_ = mmrest_;
       last_numbers_ = numbers_;
-
+      
       int cur = gh_scm2int (get_property ("currentBarNumber"));
       int num = cur - start_measure_;
       last_rest_->set_grob_property ("measure-count", gh_int2scm (num));
@@ -250,7 +254,8 @@ Multi_measure_rest_engraver::start_translation_timestep ()
        }
 
       mmrest_ = 0;
-
+      numbers_.clear ();
+      
       Grob * last = last_numbers_.size() ? last_numbers_[0] : 0;
       if (last && last->get_grob_property ("text") == SCM_EOL)
        {
@@ -269,6 +274,8 @@ Multi_measure_rest_engraver::start_translation_timestep ()
            }
        }
     }
+
+  last_main_moment_ = now.main_part_;
 }
 
 void