release: 1.3.14

[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 f3a39170c9dadcb9fe1981e6a40caa39a96e1cbe..9f8f34fd2a033b19594c51c9cad31364209b4709 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -9,14 +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-score.hh"
-//#include "p-score.hh"
-//#include "paper-def.hh"
-//#include "main.hh"
-//#include "global-translator.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);
@@ -27,6 +24,8 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
   rest_moments_[START] =
     rest_moments_[STOP] =0;
   multi_measure_req_l_ = 0;
+
+  lastrest_p_ =0;
   mmrest_p_ = 0;
 }
 
@@ -45,20 +44,28 @@ Multi_measure_rest_engraver::acknowledge_element (Score_element_info i)
 bool
 Multi_measure_rest_engraver::do_try_music (Music* req_l)
 {
- if (Multi_measure_rest_req *mr = dynamic_cast<Multi_measure_rest_req *> (req_l))
-   {
-     if (multi_measure_req_l_)
-       if (!multi_measure_req_l_->equal_b (mr)
-          || rest_moments_[START] != now_mom ())
-        return false;
-  
-     multi_measure_req_l_ = mr;
-     rest_moments_[START] = now_mom ();
-     
-     rest_moments_[STOP] = rest_moments_[START] + multi_measure_req_l_->duration_.length_mom ();
-     return true;
-   }
- return false;
+  Rhythmic_req *r=0;
+  if (Multi_measure_rest_req *mr = 
+      dynamic_cast<Multi_measure_rest_req *> (req_l))
+    r=mr;
+  else if (Repetitions_req *rr = 
+          dynamic_cast<Repetitions_req *> (req_l))
+    r=rr;
+  if (r)
+    {
+      if (multi_measure_req_l_)
+       if (!multi_measure_req_l_->equal_b (r)
+           || rest_moments_[START] != now_mom ())
+         return false;
+      
+      multi_measure_req_l_ = r;
+      rest_moments_[START] = now_mom ();
+      
+      rest_moments_[STOP] = rest_moments_[START] +
+       multi_measure_req_l_->duration_.length_mom ();
+      return true;
+    }
+  return false;
 }
 
 void
@@ -66,10 +73,20 @@ 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", 
+                                    ly_str02scm ("scripts-repeatsign"));
       announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_));
-      start_measure_i_ = time->bars_i_;
+      start_measure_i_ = time->bars_i ();
     }
 }
 
@@ -77,10 +94,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_);
       /*
@@ -97,13 +117,15 @@ 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_ = time->bars_i () - start_measure_i_;
       mmrest_p_ = 0;
     }
 
@@ -114,3 +136,4 @@ Multi_measure_rest_engraver::do_post_move_processing ()
     }
 }
 
+