release: 1.5.30

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

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 2a19cdb4abdf8927002af3c24677cc19085464fe..439e09bee37b6d9d88f67797883b8d9aa21ea233 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -8,7 +8,7 @@
 TODO:
 
   . Cancel any beams running through the breathing sign
-    ([e8 \breathe f e f] should become [e8] \breathe [f e f])
+ ([e8 \breathe f e f] should become [e8] \breathe [f e f])
   . Spacing is not yet completely pretty
 
 */
@@ -24,29 +24,27 @@ TODO:
 
 class Breathing_sign_engraver : public Engraver {
 public:
-  Breathing_sign_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Breathing_sign_engraver);
   
 protected:
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_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()
+Breathing_sign_engraver::Breathing_sign_engraver ()
 {
   breathing_sign_p_ = 0;
   breathing_sign_req_l_ = 0;
 }
 
 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,33 +56,40 @@ Breathing_sign_engraver::do_try_music (Music*r_l)
 }
 
 void
-Breathing_sign_engraver::do_process_music()
+Breathing_sign_engraver::create_grobs ()
 {
-  if(breathing_sign_req_l_)
+  if (breathing_sign_req_l_ && ! breathing_sign_p_)
     {
-      SCM b = get_property ("basicBreathingSignProperties");
+      SCM b = get_property ("BreathingSign");
       breathing_sign_p_ = new Item (b);
 
       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_->self_scm());
+      breathing_sign_req_l_ = 0;
     }
 }
 
 void 
-Breathing_sign_engraver::do_pre_move_processing()
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  if(breathing_sign_p_)
+  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;
 }
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+
+ENTER_DESCRIPTION(Breathing_sign_engraver,
+/* descr */       "",
+/* creats*/       "BreathingSign",
+/* acks  */       "",
+/* reads */       "",
+/* write */       "");