patch::: 1.3.115.jcn2

[lilypond.git] / lily / tuplet-engraver.cc

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index c102fd7ad5e2b919ed782edb1ac2f36df76a6f7e..d6bcec2460e824ae010a123e63c6f29590a7ef12 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -32,15 +32,15 @@ protected:
   /// The spanners. Array order is synced with time_scaled_music_arr_
   Link_array<Spanner> started_span_p_arr_;
 
-  virtual void do_removal_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual bool do_try_music (Music*r);
-  virtual void do_process_music ();
-  virtual void do_post_move_processing ();
+  virtual void finalize ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual bool try_music (Music*r);
+  virtual void start_translation_timestep ();
+  virtual void create_grobs ();
 };
 
 bool
-Tuplet_engraver::do_try_music (Music *r)
+Tuplet_engraver::try_music (Music *r)
 {
   if (Time_scaled_music * c = dynamic_cast<Time_scaled_music *> (r))
     {
@@ -63,7 +63,7 @@ Tuplet_engraver::do_try_music (Music *r)
 }
 
 void
-Tuplet_engraver::do_process_music ()
+Tuplet_engraver::create_grobs ()
 {
   SCM v = get_property ("tupletInvisible");
   if (to_boolean (v))
@@ -81,17 +81,18 @@ Tuplet_engraver::do_process_music ()
       else
        started_span_p_arr_[i] = glep;
       
-      glep->set_elt_property ("text",
-                             ly_str02scm (to_str (time_scaled_music_arr_[i]->den_i_).ch_C()));
+
+      int d = gh_scm2int (time_scaled_music_arr_[i]->get_mus_property ("denominator"));
+      glep->set_grob_property ("text", ly_str02scm (to_str (d).ch_C()));
       
-      announce_element (glep, time_scaled_music_arr_ [i]);
+      announce_grob (glep, time_scaled_music_arr_ [i]);
     }
 }
 
 void
-Tuplet_engraver::acknowledge_element (Score_element_info i)
+Tuplet_engraver::acknowledge_grob (Grob_info i)
 {
-  bool grace= to_boolean (i.elem_l_->get_elt_property ("grace"));
+  bool grace= to_boolean (i.elem_l_->get_grob_property ("grace"));
   SCM wg = get_property ("weAreGraceContext");
   bool wgb = to_boolean (wg);
   if (grace != wgb)
@@ -112,7 +113,7 @@ Tuplet_engraver::acknowledge_element (Score_element_info i)
 }
 
 void
-Tuplet_engraver::do_post_move_processing ()
+Tuplet_engraver::start_translation_timestep ()
 {
   Moment now = now_mom ();
 
@@ -127,7 +128,7 @@ Tuplet_engraver::do_post_move_processing ()
        {
          if (started_span_p_arr_[i])
            {
-             typeset_element (started_span_p_arr_[i]);
+             typeset_grob (started_span_p_arr_[i]);
              started_span_p_arr_[i] =0;
            }
          
@@ -146,12 +147,12 @@ Tuplet_engraver::do_post_move_processing ()
 }
 
 void
-Tuplet_engraver::do_removal_processing ()
+Tuplet_engraver::finalize ()
 {
   for (int i=0; i < started_span_p_arr_.size (); i++)
     {
       if (started_span_p_arr_[i])
-       typeset_element (started_span_p_arr_[i]);
+       typeset_grob (started_span_p_arr_[i]);
     }  
 }