X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=18a7491bb1f6d0f3070e4cc414a1278bfba67910;hb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;hp=f72e5b2b9716a68f6d2c6e92c31296bea76a7011;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index f72e5b2b97..18a7491bb1 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -8,29 +8,43 @@
 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))
     {
@@ -42,33 +56,38 @@ 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");
-      breathing_sign_p_ = new Breathing_sign (b);
-      Staff_symbol_referencer_interface st (breathing_sign_p_);
-      st.set_interface ();
+      SCM b = get_property ("BreathingSign");
+      breathing_sign_p_ = new Item (b);
 
-      announce_element (Score_element_info (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 */       "");