*** empty log message ***

[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 3971353441676daed87b36db818d91564aa95018..33a9cfb24b4bc882f307fff099bb3e18b87cd64f 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -80,16 +80,16 @@ Multi_measure_rest_engraver::process_music ()
   if (rest_ev_ && !mmrest_
       && stop_moment_ > now_mom ())
     {
-      mmrest_ = make_spanner ("MultiMeasureRest");
+      mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ());
 
       if (text_events_.size ())
        {
          for (int i = 0; i < text_events_.size (); i++)
            {
-             Spanner *sp
-               = make_spanner ("MultiMeasureRestText");
 
              Music* e = text_events_[i];
+             Spanner *sp
+               = make_spanner ("MultiMeasureRestText", e->self_scm () );
              SCM t = e->get_property ("text");
              SCM dir = e->get_property ("direction");
              sp->set_property ("text",t);
@@ -97,7 +97,6 @@ Multi_measure_rest_engraver::process_music ()
                sp->set_property ("direction",dir);
              
              numbers_.push (sp);
-             announce_grob (sp, e->self_scm ());
            }
 
          /*
@@ -120,9 +119,8 @@ Multi_measure_rest_engraver::process_music ()
       else
        {
          Spanner *sp
-           = make_spanner ("MultiMeasureRestNumber");
+           = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm () );
          numbers_.push (sp);
-         announce_grob (sp, rest_ev_->self_scm ());
        }
 
       for (int i =0 ; i < numbers_.size (); i++)
@@ -131,7 +129,6 @@ Multi_measure_rest_engraver::process_music ()
          numbers_[i]->set_parent (mmrest_, Y_AXIS);
        }
       
-      announce_grob (mmrest_, rest_ev_->self_scm ());
       start_measure_
        = ly_scm2int (get_property ("currentBarNumber"));
     }
@@ -182,35 +179,8 @@ Multi_measure_rest_engraver::stop_translation_timestep ()
   SCM smp = get_property ("measurePosition");
   Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
-  if (mmrest_
-      && !mp.to_bool ()
-      && mmrest_->get_bound (LEFT) && mmrest_->get_bound (RIGHT))
-    {
-      typeset_grob (mmrest_);
-      for (int i = 0 ; i < numbers_.size (); i++)
-       {
-         typeset_grob (numbers_[i]);
-       }
-      
-      /*
-       we must keep mmrest_ around to set measure-count, so
-       no mmrest_ = 0 here. 
-       */
-    }
-
   if (last_rest_)
     {
-      /* sanity check */
-      if (last_rest_->get_bound (LEFT) && last_rest_->get_bound (RIGHT)
-         && last_rest_->get_bound (LEFT) != last_rest_->get_bound (RIGHT))
-       {
-         typeset_grob (last_rest_);
-
-         for (int i = 0; i < last_numbers_.size ();i++)
-           {
-             typeset_grob (last_numbers_[i]);
-           }
-       }
       last_rest_ = 0;
       last_numbers_.clear ();
     }
@@ -271,7 +241,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
          else 
            {
              SCM text
-               = scm_number_to_string (scm_int2num (num), SCM_MAKINUM (10));
+               = scm_number_to_string (scm_int2num (num), scm_from_int (10));
              last->set_property ("text", text);
            }
        }
@@ -283,21 +253,6 @@ Multi_measure_rest_engraver::start_translation_timestep ()
 void
 Multi_measure_rest_engraver::finalize ()
 {
-  if (mmrest_)
-    {
-      typeset_grob (mmrest_);
-    }
-  if (last_rest_)
-    {
-      typeset_grob (last_rest_);
-    }
-
-  for (int i = 0; i < last_numbers_.size ();i++)
-    typeset_grob (last_numbers_[i]);
-
-  for (int i = 0; i < numbers_.size ();i++)
-    typeset_grob (numbers_[i]);
-
 }
 
 ENTER_DESCRIPTION (Multi_measure_rest_engraver,