X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=b65131579fb6769dedec81720ebb525abe1b7d84;hb=dd237d4df77489170dc5c204a9ba58819a904dfa;hp=e7a70c4301f263cf37e7d2f65cf700959e334491;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index e7a70c4301..b65131579f 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,73 +1,78 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  (c) 1999--2005 Michael Krause
+  (c) 1999--2009 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
-TODO:
+  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.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver.hh"
 #include "item.hh"
+#include "stream-event.hh"
 
+#include "translator.icc"
 
-class Breathing_sign_engraver : public Engraver {
+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 ();
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (breathing);
 private:
-  Music * breathing_sign_req_;
-  Grob * breathing_sign_;
+  Stream_event *breathing_sign_event_;
+  Grob *breathing_sign_;
 };
 
 Breathing_sign_engraver::Breathing_sign_engraver ()
 {
   breathing_sign_ = 0;
-  breathing_sign_req_ = 0;
+  breathing_sign_event_ = 0;
 }
 
-bool
-Breathing_sign_engraver::try_music (Music*r)
+IMPLEMENT_TRANSLATOR_LISTENER (Breathing_sign_engraver, breathing);
+void
+Breathing_sign_engraver::listen_breathing (Stream_event *ev)
 {
-  breathing_sign_req_ = r;
-  return true;
+  ASSIGN_EVENT_ONCE (breathing_sign_event_, ev);
 }
 
 void
-Breathing_sign_engraver::process_acknowledged_grobs ()
+Breathing_sign_engraver::process_music ()
 {
-  if (breathing_sign_req_ && ! breathing_sign_)
+  if (breathing_sign_event_)
     {
-      breathing_sign_ = make_item ("BreathingSign", breathing_sign_req_->self_scm ());
-      breathing_sign_req_ = 0;
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
     }
 }
 
-void 
+void
 Breathing_sign_engraver::stop_translation_timestep ()
 {
   breathing_sign_ = 0;
-  breathing_sign_req_ = 0;
+  breathing_sign_event_ = 0;
 }
 
-
 ADD_TRANSLATOR (Breathing_sign_engraver,
-/* descr */       "",
-/* creats*/       "BreathingSign",
-/* accepts */     "breathing-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+		/* doc */
+		"Create a breathing sign.",
+
+		/* create */
+		"BreathingSign ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);