patch::: 1.3.131.jcn1

[lilypond.git] / lily / breathing-sign-engraver.cc

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index dfdc58b950d98b62b47bfa084454fa21afa8da9a..5e1c08fa2f6b29dac566f005b5e309dd309c2825 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -28,15 +28,14 @@ public:
   VIRTUAL_COPY_CONS(Translator);
   
 protected:
-  virtual bool do_try_music (Music *req_l);
-  void deprecated_process_music();
-
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
+  virtual bool try_music (Music *req_l);
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep();
+  virtual void start_translation_timestep();
 
 private:
   Breathing_sign_req * breathing_sign_req_l_;
-  Score_element * breathing_sign_p_;
+  Grob * breathing_sign_p_;
 };
 
 Breathing_sign_engraver::Breathing_sign_engraver()
@@ -46,7 +45,7 @@ Breathing_sign_engraver::Breathing_sign_engraver()
 }
 
 bool
-Breathing_sign_engraver::do_try_music (Music*r_l)
+Breathing_sign_engraver::try_music (Music*r_l)
 {
   if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l))
     {
@@ -58,7 +57,7 @@ Breathing_sign_engraver::do_try_music (Music*r_l)
 }
 
 void
-Breathing_sign_engraver::deprecated_process_music()
+Breathing_sign_engraver::create_grobs ()
 {
   if(breathing_sign_req_l_ && ! breathing_sign_p_)
     {
@@ -67,22 +66,23 @@ Breathing_sign_engraver::deprecated_process_music()
 
       Breathing_sign::set_interface (breathing_sign_p_);
 
-      announce_element (breathing_sign_p_, breathing_sign_req_l_);
+      announce_grob (breathing_sign_p_, breathing_sign_req_l_);
+      breathing_sign_req_l_ = 0;
     }
 }
 
 void 
-Breathing_sign_engraver::do_pre_move_processing()
+Breathing_sign_engraver::stop_translation_timestep()
 {
   if(breathing_sign_p_)
     {
-      typeset_element(breathing_sign_p_);
+      typeset_grob(breathing_sign_p_);
       breathing_sign_p_ = 0;
     }
 }
 
 void
-Breathing_sign_engraver::do_post_move_processing()
+Breathing_sign_engraver::start_translation_timestep()
 {
   breathing_sign_req_l_ = 0;
 }