* stepmake/aclocal.m4 (STEPMAKE_KPATHSEA): Do not include

[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..ab27e6cd06b278a6da43dc7e9d07a8a63f0ff4b2 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,19 +1,16 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
        Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "event.hh"
 #include "multi-measure-rest.hh"
 #include "paper-column.hh"
 #include "engraver-group-engraver.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
-#include "engraver.hh"
 #include "moment.hh"
-#include "spanner.hh"
 
 /**
    The name says it all: make multi measure rests 
@@ -52,7 +49,7 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
   bar_seen_ = false;
   start_measure_ = 0;
   mmrest_ = 0;
-  last_rest_ =0;
+  last_rest_ = 0;
   rest_ev_ = 0;
 }
 
@@ -80,24 +77,27 @@ 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 ());
+
+      Spanner *sp
+       = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm () );
+      numbers_.push (sp);
 
       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);
+             sp->set_property ("text", t);
              if (is_direction (dir))
-               sp->set_property ("direction",dir);
+               sp->set_property ("direction", dir);
              
              numbers_.push (sp);
-             announce_grob (sp, e->self_scm ());
            }
 
          /*
@@ -105,8 +105,8 @@ Multi_measure_rest_engraver::process_music ()
           */
          Direction d = DOWN; 
          do {
-           Grob *last =0;
-           for (int i=0; i <numbers_.size (); i++)
+           Grob *last = 0;
+           for (int i = 0; i <numbers_.size (); i++)
              {
                if (scm_int2num (d) == numbers_[i]->get_property ("direction"))
                  {
@@ -117,26 +117,18 @@ Multi_measure_rest_engraver::process_music ()
              }
          } while (flip (&d) != DOWN);
        }
-      else
-       {
-         Spanner *sp
-           = make_spanner ("MultiMeasureRestNumber");
-         numbers_.push (sp);
-         announce_grob (sp, rest_ev_->self_scm ());
-       }
 
-      for (int i =0 ; i < numbers_.size (); i++)
+      for (int i = 0 ; i < numbers_.size (); i++)
        {
          Side_position_interface::add_support (numbers_[i], mmrest_);
          numbers_[i]->set_parent (mmrest_, Y_AXIS);
        }
       
-      announce_grob (mmrest_, rest_ev_->self_scm ());
       start_measure_
-       = ly_scm2int (get_property ("currentBarNumber"));
+       = scm_to_int (get_property ("currentBarNumber"));
     }
 
-  bar_seen_ = ly_c_string_p (get_property ("whichBar"));
+  bar_seen_ = scm_is_string (get_property ("whichBar"));
 }
 
 void
@@ -160,7 +152,6 @@ Multi_measure_rest_engraver::stop_translation_timestep ()
 
   if (last_command_item_ &&  (mmrest_ || last_rest_))
     {
-          
       if (last_rest_)
        {
          add_bound_item (last_rest_, last_command_item_);
@@ -178,39 +169,9 @@ 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. 
-       */
-    }
-
+  Moment mp(robust_scm2moment (get_property ("measurePosition"),  Moment (0)));
   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 ();
     }
@@ -228,10 +189,9 @@ Multi_measure_rest_engraver::start_translation_timestep ()
 
   bar_seen_ = false;
 
-  SCM smp = get_property ("measurePosition");
-  Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+  Moment mp (robust_scm2moment (get_property ("measurePosition"),  Moment (0)));
 
-  Moment now =now_mom ();
+  Moment now = now_mom ();
   if (mmrest_
       && now.main_part_ != last_main_moment_
       && mp.main_part_ == Rational (0))
@@ -239,7 +199,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       last_rest_ = mmrest_;
       last_numbers_ = numbers_;
       
-      int cur = ly_scm2int (get_property ("currentBarNumber"));
+      int cur = scm_to_int (get_property ("currentBarNumber"));
       int num = cur - start_measure_;
 
       /*
@@ -263,15 +223,15 @@ Multi_measure_rest_engraver::start_translation_timestep ()
        {
          SCM thres = get_property ("restNumberThreshold");
          int t = 1;
-         if (ly_c_number_p (thres))
-           t = ly_scm2int (thres);
+         if (scm_is_number (thres))
+           t = scm_to_int (thres);
       
          if (num <= t)
            last->suicide ();
          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,24 +243,9 @@ 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,
+ADD_TRANSLATOR (Multi_measure_rest_engraver,
 /* descr */
                  "Engraves multi-measure rests that are produced with @code{R}.  Reads "
 "measurePosition and currentBarNumber to determine what number to print "