partial: 1.3.13.jcn

[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 cd6efa31723b2ed8875264042e9daaeb850e510e..d6c065ccf29c8985a2a207999b51028201ca72c1 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -13,6 +13,7 @@
 #include "engraver-group-engraver.hh"
 #include "timing-translator.hh"
 #include "bar.hh"
+#include "staff-symbol-referencer.hh"
 
 
 ADD_THIS_TRANSLATOR (Multi_measure_rest_engraver);
@@ -77,6 +78,10 @@ Multi_measure_rest_engraver::do_process_requests ()
       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"));
@@ -95,7 +100,7 @@ Multi_measure_rest_engraver::do_pre_move_processing ()
 
   if (mmrest_p_ && (now >= rest_moments_[START]) 
     && !time->measure_position ()
-    && (mmrest_p_->column_arr_.size () >= 2))
+    && (scm_ilength (mmrest_p_->get_elt_property ("columns")) >= 2))
     {
       typeset_element (mmrest_p_);
       /*