release: 1.3.17

[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 51ff44654231651913b3ddc33fbe5a4ae4449007..e60294316123fb474ccd099e05b4fabb33f5f242 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -9,9 +9,11 @@
 #include "musical-request.hh"
 #include "multi-measure-rest.hh"
 #include "multi-measure-rest-engraver.hh"
-#include "score-column.hh"
-#include "time-description.hh"
+#include "paper-column.hh"
+#include "engraver-group-engraver.hh"
+#include "timing-translator.hh"
 #include "bar.hh"
+#include "staff-symbol-referencer.hh"
 
 
 ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver);
@@ -71,13 +73,21 @@ Multi_measure_rest_engraver::do_process_requests ()
 {
   if (multi_measure_req_l_ && !mmrest_p_)
     {
-      Time_description const *time = get_staff_info().time_C_;
+
+      Translator * tr = daddy_grav_l()->get_simple_translator ("Timing_engraver");     // ugh
+      Timing_translator * time = dynamic_cast<Timing_translator*> (tr);
+
       mmrest_p_ = new Multi_measure_rest;
+      Staff_symbol_referencer_interface si (mmrest_p_);
+      si.set_interface ();
+
+      
       if(dynamic_cast<Repetitions_req *> (multi_measure_req_l_))
-       mmrest_p_->set_elt_property (alt_symbol_scm_sym, 
-                                    ly_ch_C_to_scm ("scripts-repeatsign"));
+       mmrest_p_->set_elt_property ("alt-symbol", 
+                                    ly_str02scm ("scripts-repeatsign"));
       announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_));
-      start_measure_i_ = time->bars_i_;
+      start_measure_i_
+       = gh_int2scm (time->get_property ("currentBarNumber", 0));
     }
 }
 
@@ -85,10 +95,13 @@ void
 Multi_measure_rest_engraver::do_pre_move_processing ()
 {
   Moment now (now_mom ());
-  Time_description const *time = get_staff_info().time_C_;
+  Translator * tr = daddy_grav_l()->get_simple_translator ("Timing_engraver"); // ugh
+  Timing_translator * time  = dynamic_cast<Timing_translator*> (tr);
+
+
   if (mmrest_p_ && (now >= rest_moments_[START]) 
-    && !time->whole_in_measure_
-    && (mmrest_p_->column_arr_.size () >= 2))
+    && !time->measure_position ()
+    && (scm_ilength (mmrest_p_->get_elt_property ("columns")) >= 2))
     {
       typeset_element (mmrest_p_);
       /*
@@ -105,13 +118,16 @@ Multi_measure_rest_engraver::do_pre_move_processing ()
 void
 Multi_measure_rest_engraver::do_post_move_processing ()
 {
-  Time_description const *time = get_staff_info().time_C_;
+  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->whole_in_measure_)
+  if (mmrest_p_ && !time->measure_position ())
     {
       lastrest_p_ = mmrest_p_;
-      lastrest_p_->measures_i_ = time->bars_i_ - start_measure_i_;
+      lastrest_p_->measures_i_
+       = gh_int2scm (time->get_property ("currentBarNumber", 0)) - start_measure_i_;
       mmrest_p_ = 0;
     }
 
@@ -122,3 +138,4 @@ Multi_measure_rest_engraver::do_post_move_processing ()
     }
 }
 
+