release: 1.3.142

[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 3729344c06448cd434d021043bffdba3f4c26d2e..9720596664caa40c5b69bea10c17a21161d571f9 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
        Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
@@ -17,20 +17,26 @@
 
 /**
    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:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
   Multi_measure_rest_engraver ();
 
 protected:
-  virtual void acknowledge_element (Score_element_info i);
-  virtual void do_process_music ();
-  virtual bool do_try_music (Music*);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_removal_processing ();
+  virtual void acknowledge_grob (Grob_info i);
+  virtual bool try_music (Music*);
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void finalize ();
+  virtual void create_grobs ();
+
 private:
   Span_req * new_req_l_;
   Span_req * busy_span_req_l_;
@@ -52,7 +58,7 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
 }
 
 void
-Multi_measure_rest_engraver::acknowledge_element (Score_element_info i)
+Multi_measure_rest_engraver::acknowledge_grob (Grob_info i)
 {
   Item * item = dynamic_cast<Item*> (i.elem_l_); 
   if (item && Bar::has_interface (item))
@@ -65,17 +71,19 @@ Multi_measure_rest_engraver::acknowledge_element (Score_element_info i)
 }
 
 bool
-Multi_measure_rest_engraver::do_try_music (Music* req_l)
+Multi_measure_rest_engraver::try_music (Music* req_l)
 {
   if (Span_req * sp = dynamic_cast<Span_req*> (req_l))
     {
-      if (sp->span_type_str_ == "rest")
+      
+      if (scm_equal_p (sp->get_mus_property ("span-type"),
+                      ly_str02scm ("rest")) == SCM_BOOL_T)
        {
-         if (sp->span_dir_ == STOP)
+         if (sp->get_span_dir () == STOP)
            {
              stop_req_l_ = sp;
            }
-         else if (sp->span_dir_ == START && !new_req_l_)
+         else if (sp->get_span_dir () == START && !new_req_l_)
            {
              new_req_l_ = sp;
            }
@@ -85,10 +93,8 @@ Multi_measure_rest_engraver::do_try_music (Music* req_l)
   return false;
 }
 
-
-
 void
-Multi_measure_rest_engraver::do_process_music ()
+Multi_measure_rest_engraver::process_music ()
 {
   if (new_req_l_ && stop_req_l_)
     stop_req_l_ = 0;
@@ -108,37 +114,48 @@ Multi_measure_rest_engraver::do_process_music ()
       new_req_l_ =0;
     }
 
+}
+
+void
+Multi_measure_rest_engraver::create_grobs ()
+{
+
   if (busy_span_req_l_ && !mmrest_p_)
     {
-      mmrest_p_ = new Spanner (get_property ("basicMultiMeasureRestProperties"));
+      mmrest_p_ = new Spanner (get_property ("MultiMeasureRest"));
 
       Multi_measure_rest::set_interface (mmrest_p_);
       Staff_symbol_referencer::set_interface (mmrest_p_);
 
-      announce_element (mmrest_p_, busy_span_req_l_);
+      announce_grob (mmrest_p_, busy_span_req_l_);
       start_measure_i_
        = gh_scm2int (get_property ("currentBarNumber"));
     }
 }
 
 void
-Multi_measure_rest_engraver::do_pre_move_processing ()
+Multi_measure_rest_engraver::stop_translation_timestep ()
 {
   SCM smp = get_property ("measurePosition");
-  Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+  Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
   if (mmrest_p_ && (now_mom () >= start_moment_) 
-    && !mp
-    && (scm_ilength (mmrest_p_->get_elt_property ("columns")) >= 2))
+      && !mp
+      && (scm_ilength (mmrest_p_->get_grob_property ("columns")) >= 2))
     {
-      typeset_element (mmrest_p_);
+      typeset_grob (mmrest_p_);
       /*
-       must keep mmrest_p_ around to set measures_i_
+       we must keep mmrest_p_ around to set measure-count.
        */
     }
+
   if (lastrest_p_)
     {
-      typeset_element (lastrest_p_);
+      /* sanity check */
+      if (scm_ilength (lastrest_p_->get_grob_property ("columns")) >= 2
+         && lastrest_p_->get_bound (LEFT) && lastrest_p_->get_bound (RIGHT)
+         && lastrest_p_->get_bound (LEFT) != lastrest_p_->get_bound (RIGHT))
+       typeset_grob (lastrest_p_);
       lastrest_p_ = 0;
     }
 
@@ -151,16 +168,16 @@ Multi_measure_rest_engraver::do_pre_move_processing ()
 }
 
 void
-Multi_measure_rest_engraver::do_post_move_processing ()
+Multi_measure_rest_engraver::start_translation_timestep ()
 {
   SCM smp = get_property ("measurePosition");
-  Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+  Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
   
   if (mmrest_p_ && !mp)
     {
       lastrest_p_ = mmrest_p_;
       int cur = gh_scm2int (get_property ("currentBarNumber"));
-      lastrest_p_->set_elt_property ("measure-count",
+      lastrest_p_->set_grob_property ("measure-count",
                                     gh_int2scm (cur - start_measure_i_));
       mmrest_p_ = 0;
     }
@@ -168,10 +185,10 @@ Multi_measure_rest_engraver::do_post_move_processing ()
 
 
 void
-Multi_measure_rest_engraver::do_removal_processing ()
+Multi_measure_rest_engraver::finalize ()
 {
   if (mmrest_p_)
-    typeset_element (mmrest_p_);
+    typeset_grob (mmrest_p_);
   if (lastrest_p_)
-    typeset_element (lastrest_p_);
+    typeset_grob (lastrest_p_);
 }