X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=0850067b6946434328ad6975cbd9c8bce9f1eb9f;hb=4517f836a82360e688e4f831b9ae3bf548ea296f;hp=8c06a74e8dd09c8f979578f78116ae9fec4c3f6f;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 8c06a74e8d..0850067b69 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,90 +1,78 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2008 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"
+#include "item.hh"
+#include "stream-event.hh"
 
-class Breathing_sign_engraver : public Engraver {
+#include "translator.icc"
+
+class Breathing_sign_engraver : public Engraver
+{
 public:
-  Breathing_sign_engraver();
-  VIRTUAL_COPY_CONS(Translator);
-  
-protected:
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_music();
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
 
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (breathing);
 private:
-  Breathing_sign_req * breathing_sign_req_l_;
-  Score_element * breathing_sign_p_;
+  Stream_event *breathing_sign_event_;
+  Grob *breathing_sign_;
 };
 
-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::Breathing_sign_engraver ()
 {
-  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l))
-    {
-      breathing_sign_req_l_ = b;
-      return true;
-    }
- 
-  return false;
+  breathing_sign_ = 0;
+  breathing_sign_event_ = 0;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Breathing_sign_engraver, breathing);
 void
-Breathing_sign_engraver::do_process_music()
+Breathing_sign_engraver::listen_breathing (Stream_event *ev)
 {
-  if(breathing_sign_req_l_)
-    {
-      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_);
-    }
+  ASSIGN_EVENT_ONCE (breathing_sign_event_, ev);
 }
 
-void 
-Breathing_sign_engraver::do_pre_move_processing()
+void
+Breathing_sign_engraver::process_music ()
 {
-  if(breathing_sign_p_)
+  if (breathing_sign_event_)
     {
-      typeset_element(breathing_sign_p_);
-      breathing_sign_p_ = 0;
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
     }
 }
 
 void
-Breathing_sign_engraver::do_post_move_processing()
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  breathing_sign_req_l_ = 0;
+  breathing_sign_ = 0;
+  breathing_sign_event_ = 0;
 }
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+ADD_TRANSLATOR (Breathing_sign_engraver,
+		/* doc */
+		"Create a breathing sign.",
+
+		/* create */
+		"BreathingSign ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);