release: 1.3.92

[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 4427d7aa9ad52e08ab2442e7bec7285fc27c5d11..552865111bdd9c3073a09fd84827b1d196354e3f 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -5,19 +5,23 @@
        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 
+
+FIXME? The MM rest engraver must be able to see bar lines, so it won't
+work at Voice level. Not a problem in practice, but aesthetically pleasing? 
+
+*/
 class Multi_measure_rest_engraver : public Engraver
 {
 public:
@@ -26,7 +30,7 @@ public:
 
 protected:
   virtual void acknowledge_element (Score_element_info i);
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
   virtual bool do_try_music (Music*);
   virtual void do_pre_move_processing ();
   virtual void do_post_move_processing ();
@@ -38,8 +42,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 +58,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);
     }
 }
 
@@ -87,7 +92,7 @@ Multi_measure_rest_engraver::do_try_music (Music* req_l)
 
 
 void
-Multi_measure_rest_engraver::do_process_requests ()
+Multi_measure_rest_engraver::do_process_music ()
 {
   if (new_req_l_ && stop_req_l_)
     stop_req_l_ = 0;
@@ -109,28 +114,25 @@ Multi_measure_rest_engraver::do_process_requests ()
 
   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_));
+      announce_element (mmrest_p_, busy_span_req_l_);
       start_measure_i_
-       = gh_scm2int (time->get_property ("currentBarNumber", 0));
+       = 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,16 +157,15 @@ 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_;
-      lastrest_p_->measures_i_
-       = gh_scm2int (time->get_property ("currentBarNumber", 0)) - start_measure_i_;
+      int cur = gh_scm2int (get_property ("currentBarNumber"));
+      lastrest_p_->set_elt_property ("measure-count",
+                                    gh_int2scm (cur - start_measure_i_));
       mmrest_p_ = 0;
     }
 }