release: 1.3.71

[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 de6975998a9ab50f19d576a4a9fbfa647d3a4b01..214ea14fc2405eba94251d32e7ecf4bb95f10750 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -5,18 +5,18 @@
        Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
 #include "musical-request.hh"
 #include "multi-measure-rest.hh"
 #include "paper-column.hh"
 #include "engraver-group-engraver.hh"
-#include "timing-translator.hh"
 #include "bar.hh"
 #include "staff-symbol-referencer.hh"
 #include "engraver.hh"
 #include "moment.hh"
+#include "spanner.hh"
 
 /**
+   The name says it all: make multi measure rests 
  */
 class Multi_measure_rest_engraver : public Engraver
 {
@@ -38,8 +38,8 @@ private:
   int start_measure_i_;
   Moment start_moment_;
   
-  Multi_measure_rest *mmrest_p_;
-  Multi_measure_rest *lastrest_p_;
+  Spanner *mmrest_p_;
+  Spanner *lastrest_p_;
 };
 
 ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver);
@@ -54,12 +54,13 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
 void
 Multi_measure_rest_engraver::acknowledge_element (Score_element_info i)
 {
-  if (Bar *c = dynamic_cast<Bar*> (i.elem_l_))
+  Item * item = dynamic_cast<Item*> (i.elem_l_); 
+  if (item && Bar::has_interface (item))
     {
       if (mmrest_p_)
-       mmrest_p_->add_column (c);
+       Multi_measure_rest::add_column (mmrest_p_,item);
       if (lastrest_p_)
-       lastrest_p_->add_column (c);
+       Multi_measure_rest::add_column (lastrest_p_,item);
     }
 }
 
@@ -109,28 +110,25 @@ Multi_measure_rest_engraver::do_process_music ()
 
   if (busy_span_req_l_ && !mmrest_p_)
     {
-      Translator * tr = daddy_grav_l()->get_simple_translator ("Timing_engraver");     // ugh
-      Timing_translator * time = dynamic_cast<Timing_translator*> (tr);
+      mmrest_p_ = new Spanner (get_property ("basicMultiMeasureRestProperties"));
 
-      mmrest_p_ = new Multi_measure_rest;
-      Staff_symbol_referencer_interface si (mmrest_p_);
-      si.set_interface ();
+      Multi_measure_rest::set_interface (mmrest_p_);
+      Staff_symbol_referencer::set_interface (mmrest_p_);
 
       announce_element (Score_element_info (mmrest_p_, busy_span_req_l_));
       start_measure_i_
-       = gh_scm2int (time->get_property ("currentBarNumber"));
+       = gh_scm2int (get_property ("currentBarNumber"));
     }
 }
 
 void
 Multi_measure_rest_engraver::do_pre_move_processing ()
 {
-  Moment now (now_mom ());
-  Translator * tr = daddy_grav_l()->get_simple_translator ("Timing_engraver"); // ugh
-  Timing_translator * time  = dynamic_cast<Timing_translator*> (tr);
+  SCM smp = get_property ("measurePosition");
+  Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
-  if (mmrest_p_ && (now >= start_moment_) 
-    && !time->measure_position ()
+  if (mmrest_p_ && (now_mom () >= start_moment_) 
+    && !mp
     && (scm_ilength (mmrest_p_->get_elt_property ("columns")) >= 2))
     {
       typeset_element (mmrest_p_);
@@ -155,15 +153,16 @@ Multi_measure_rest_engraver::do_pre_move_processing ()
 void
 Multi_measure_rest_engraver::do_post_move_processing ()
 {
-  Translator * tr = daddy_grav_l()->get_simple_translator ("Timing_engraver"); // ugh
-  Timing_translator * time  = dynamic_cast<Timing_translator*> (tr);
-
   Moment now (now_mom ());
-
-  if (mmrest_p_ && !time->measure_position ())
+  
+  
+  SCM smp = get_property ("measurePosition");
+  Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+  
+  if (mmrest_p_ && !mp)
     {
       lastrest_p_ = mmrest_p_;
-      int cur = gh_scm2int (time->get_property ("currentBarNumber"));
+      int cur = gh_scm2int (get_property ("currentBarNumber"));
       lastrest_p_->set_elt_property ("measure-count",
                                     gh_int2scm (cur - start_measure_i_));
       mmrest_p_ = 0;