X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=d659b64a90b2a0af0ba77b43f0b23fecd47d9da8;hb=51522dcf41e4178a0e16fada95a4e87cefd1d0b4;hp=0ba27cc05d245123147a9d85657a305f80876b14;hpb=a0b072ed070ca6abb36a11e015073b117103e35d;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 0ba27cc05d..d659b64a90 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,93 +1,72 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2006 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 "musical-request.hh"
-#include "command-request.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "item.hh"
-#include "engraver.hh"
-#include "command-request.hh"
 
-class Breathing_sign_engraver : public Engraver {
+class Breathing_sign_engraver : public Engraver
+{
 public:
-  TRANSLATOR_DECLARATIONS(Breathing_sign_engraver);
-  
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
+
 protected:
-  virtual bool try_music (Music *req_l);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  virtual bool try_music (Music *event);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
 private:
-  Breathing_sign_req * breathing_sign_req_l_;
-  Grob * breathing_sign_p_;
+  Music *breathing_sign_event_;
+  Grob *breathing_sign_;
 };
 
 Breathing_sign_engraver::Breathing_sign_engraver ()
 {
-  breathing_sign_p_ = 0;
-  breathing_sign_req_l_ = 0;
+  breathing_sign_ = 0;
+  breathing_sign_event_ = 0;
 }
 
 bool
-Breathing_sign_engraver::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_event_ = r;
+  return true;
 }
 
 void
-Breathing_sign_engraver::process_acknowledged_grobs ()
+Breathing_sign_engraver::process_acknowledged ()
 {
-  if (breathing_sign_req_l_ && ! breathing_sign_p_)
+  if (breathing_sign_event_ && ! breathing_sign_)
     {
-      SCM b = get_property ("BreathingSign");
-      breathing_sign_p_ = new Item (b);
-
-      announce_grob(breathing_sign_p_, breathing_sign_req_l_->self_scm());
-      breathing_sign_req_l_ = 0;
-    }
-}
-
-void 
-Breathing_sign_engraver::stop_translation_timestep ()
-{
-  if (breathing_sign_p_)
-    {
-      typeset_grob (breathing_sign_p_);
-      breathing_sign_p_ = 0;
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
+      breathing_sign_event_ = 0;
     }
 }
 
 void
-Breathing_sign_engraver::start_translation_timestep ()
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  breathing_sign_req_l_ = 0;
+  breathing_sign_ = 0;
+  breathing_sign_event_ = 0;
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION(Breathing_sign_engraver,
-/* descr */       "",
-/* creats*/       "BreathingSign",
-/* acks  */       "",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Breathing_sign_engraver,
+		/* doc */ "",
+		/* create */ "BreathingSign",
+		/* accept */ "breathing-event",
+		/* read */ "",
+		/* write */ "");