X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=a8d47464aeb86bb5be7a0dfb2f782a5a74a70444;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=669a606353d7f6237a51ceaf19af567e2670f885;hpb=163503e56aa0c03d41d37fd083bdb96a6a473a11;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 669a606353..a8d47464ae 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -8,63 +8,88 @@
 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
 
 */
 
 #include "staff-symbol-referencer.hh"
-#include "breathing-sign-engraver.hh"
 #include "breathing-sign.hh"
 #include "musical-request.hh"
 #include "command-request.hh"
 #include "engraver-group-engraver.hh"
-#include "note-head.hh"
-#include "local-key-item.hh"
+#include "item.hh"
+#include "engraver.hh"
+#include "command-request.hh"
+
+class Breathing_sign_engraver : public Engraver {
+public:
+  TRANSLATOR_DECLARATIONS(Breathing_sign_engraver);
+  
+protected:
+  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_;
+  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)) {
-    breathing_sign_req_l_ = b;
-    return true;
-  }
+  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l))
+    {
+      breathing_sign_req_l_ = b;
+      return true;
+    }
  
   return false;
 }
 
 void
-Breathing_sign_engraver::do_process_requests()
+Breathing_sign_engraver::create_grobs ()
 {
-  if(breathing_sign_req_l_) {
-    breathing_sign_p_ = new Breathing_sign;
-    Staff_symbol_referencer_interface st (breathing_sign_p_);
-    st.set_interface ();
+  if (breathing_sign_req_l_ && ! breathing_sign_p_)
+    {
+      SCM b = get_property ("BreathingSign");
+      breathing_sign_p_ = new Item (b);
+
+      Breathing_sign::set_interface (breathing_sign_p_);
 
-    announce_element (Score_element_info (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_);
-    breathing_sign_p_ = 0;
-  }
+  if (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;
+  breathing_sign_req_l_ = 0;
 }
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+
+ENTER_DESCRIPTION(Breathing_sign_engraver,
+/* descr */       "",
+/* creats*/       "BreathingSign",
+/* acks  */       "",
+/* reads */       "",
+/* write */       "");