X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=171cc1a63c5510c247f4d740a85926e21b9c854e;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=2508bb83902d5a4be99846f7459f6246a515b589;hpb=6b6a34e929bf1d5a8859fe77e66396c3c15ef37c;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 2508bb8390..171cc1a63c 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,75 +1,82 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2004 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
 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 "event.hh"
+
 #include "engraver-group-engraver.hh"
-#include "note-head.hh"
-#include "local-key-item.hh"
+#include "item.hh"
+#include "engraver.hh"
+
 
+class Breathing_sign_engraver : public Engraver {
+public:
+  TRANSLATOR_DECLARATIONS(Breathing_sign_engraver);
+  
+protected:
+  virtual bool try_music (Music *req);
+  virtual void process_acknowledged_grobs ();
+  virtual void stop_translation_timestep ();
 
-Breathing_sign_engraver::Breathing_sign_engraver()
+private:
+  Music * breathing_sign_req_;
+  Grob * breathing_sign_;
+};
+
+Breathing_sign_engraver::Breathing_sign_engraver ()
 {
-  breathing_sign_p_ = 0;
-  breathing_sign_req_l_ = 0;
+  breathing_sign_ = 0;
+  breathing_sign_req_ = 0;
 }
 
 bool
-Breathing_sign_engraver::do_try_music (Music*r_l)
+Breathing_sign_engraver::try_music (Music*r)
 {
-  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l))
-    {
-      breathing_sign_req_l_ = b;
-      return true;
-    }
- 
-  return false;
+  breathing_sign_req_ = r;
+  return true;
 }
 
 void
-Breathing_sign_engraver::do_process_music()
+Breathing_sign_engraver::process_acknowledged_grobs ()
 {
-  if(breathing_sign_req_l_)
+  if (breathing_sign_req_ && ! breathing_sign_)
     {
-      breathing_sign_p_ = new Breathing_sign;
-      breathing_sign_p_->set_elt_property ("break-align-symbol",
-					   ly_symbol2scm ("Breathing_sign"));
-      Staff_symbol_referencer_interface st (breathing_sign_p_);
-      st.set_interface ();
+      breathing_sign_ = make_item ("BreathingSign");
 
-      announce_element (Score_element_info (breathing_sign_p_, breathing_sign_req_l_));
+      announce_grob(breathing_sign_, breathing_sign_req_->self_scm());
+      breathing_sign_req_ = 0;
     }
 }
 
 void 
-Breathing_sign_engraver::do_pre_move_processing()
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  if(breathing_sign_p_)
+  if (breathing_sign_)
     {
-      typeset_element(breathing_sign_p_);
-      breathing_sign_p_ = 0;
+      typeset_grob (breathing_sign_);
+      breathing_sign_ = 0;
     }
+  breathing_sign_req_ = 0;
 }
 
-void
-Breathing_sign_engraver::do_post_move_processing()
-{
-  breathing_sign_req_l_ = 0;
-}
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+ENTER_DESCRIPTION(Breathing_sign_engraver,
+/* descr */       "",
+/* creats*/       "BreathingSign",
+/* accepts */     "breathing-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");