X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=ba23eede6d3179b589000798c7cabcb1e9950278;hb=f0b7ccb46df75c89e1f69dd4ef42ab370f1847fe;hp=dfdc58b950d98b62b47bfa084454fa21afa8da9a;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index dfdc58b950..ba23eede6d 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,90 +1,71 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2005 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 "item.hh"
-#include "engraver.hh"
-#include "command-request.hh"
 
-class Breathing_sign_engraver : public Engraver {
+class Breathing_sign_engraver : public Engraver
+{
 public:
-  Breathing_sign_engraver();
-  VIRTUAL_COPY_CONS(Translator);
-  
-protected:
-  virtual bool do_try_music (Music *req_l);
-  void deprecated_process_music();
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
 
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
+protected:
+  virtual bool try_music (Music *req);
+  virtual void process_acknowledged_grobs ();
+  virtual void stop_translation_timestep ();
 
 private:
-  Breathing_sign_req * breathing_sign_req_l_;
-  Score_element * breathing_sign_p_;
+  Music *breathing_sign_req_;
+  Grob *breathing_sign_;
 };
 
-Breathing_sign_engraver::Breathing_sign_engraver()
+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::deprecated_process_music()
-{
-  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 (breathing_sign_p_, breathing_sign_req_l_);
-    }
-}
-
-void 
-Breathing_sign_engraver::do_pre_move_processing()
+Breathing_sign_engraver::process_acknowledged_grobs ()
 {
-  if(breathing_sign_p_)
+  if (breathing_sign_req_ && ! breathing_sign_)
     {
-      typeset_element(breathing_sign_p_);
-      breathing_sign_p_ = 0;
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_req_->self_scm ());
+      breathing_sign_req_ = 0;
     }
 }
 
 void
-Breathing_sign_engraver::do_post_move_processing()
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  breathing_sign_req_l_ = 0;
+  breathing_sign_ = 0;
+  breathing_sign_req_ = 0;
 }
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+ADD_TRANSLATOR (Breathing_sign_engraver,
+		/* descr */ "",
+		/* creats*/ "BreathingSign",
+		/* accepts */ "breathing-event",
+		/* acks  */ "",
+		/* reads */ "",
+		/* write */ "");