X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=a8d47464aeb86bb5be7a0dfb2f782a5a74a70444;hb=c3f1e9e806a3d386f82439130f9593c3537ed08c;hp=5a24b9c6c9f3513c321205e1f79843c09e64a39d;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 5a24b9c6c9..a8d47464ae 100644
--- 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,22 +24,20 @@ TODO:
 
 class Breathing_sign_engraver : public Engraver {
 public:
-  Breathing_sign_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Breathing_sign_engraver);
   
 protected:
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music();
-
-  virtual void stop_translation_timestep();
-  virtual void start_translation_timestep();
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
 
 private:
   Breathing_sign_req * breathing_sign_req_l_;
   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;
@@ -58,9 +56,9 @@ Breathing_sign_engraver::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_)
+  if (breathing_sign_req_l_ && ! breathing_sign_p_)
     {
       SCM b = get_property ("BreathingSign");
       breathing_sign_p_ = new Item (b);
@@ -68,23 +66,30 @@ Breathing_sign_engraver::deprecated_process_music()
       Breathing_sign::set_interface (breathing_sign_p_);
 
       announce_grob (breathing_sign_p_, breathing_sign_req_l_);
+      breathing_sign_req_l_ = 0;
     }
 }
 
 void 
-Breathing_sign_engraver::stop_translation_timestep()
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  if(breathing_sign_p_)
+  if (breathing_sign_p_)
     {
-      typeset_grob(breathing_sign_p_);
+      typeset_grob (breathing_sign_p_);
       breathing_sign_p_ = 0;
     }
 }
 
 void
-Breathing_sign_engraver::start_translation_timestep()
+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 */       "");