X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=9108be2a2feea4a6fe75906609b64423412c0af5;hb=aa7e0d00e324791a14ba0b9d840ec4fe7e962700;hp=2259c170976208c08a510c5203d4bf97636eba11;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 2259c17097..9108be2a2f 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,71 +1,78 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2007 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 "breathing-sign-engraver.hh"
 #include "breathing-sign.hh"
-#include "musical-request.hh"
-#include "command-request.hh"
-#include "engraver-group-engraver.hh"
-#include "note-head.hh"
-#include "local-key-item.hh"
+#include "engraver.hh"
+#include "item.hh"
+#include "stream-event.hh"
 
+#include "translator.icc"
 
-Breathing_sign_engraver::Breathing_sign_engraver()
+class Breathing_sign_engraver : public Engraver
 {
-  breathing_sign_p_ = 0;
-  breathing_sign_req_l_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
+
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
 
-bool
-Breathing_sign_engraver::do_try_music (Music*r_l)
+  DECLARE_TRANSLATOR_LISTENER (breathing);
+private:
+  Stream_event *breathing_sign_event_;
+  Grob *breathing_sign_;
+};
+
+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_requests()
+Breathing_sign_engraver::listen_breathing (Stream_event *ev)
 {
-  if(breathing_sign_req_l_) {
-    breathing_sign_p_ = new Breathing_sign;
-
-    SCM prop = get_property ("verticalDirection", 0);
-    if(isdir_b(prop))
-      breathing_sign_p_->set_vertical_position(to_dir (prop));
-
-    announce_element (Score_element_info (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_) {
-    typeset_element(breathing_sign_p_);
-    breathing_sign_p_ = 0;
-  }
+  if (breathing_sign_event_)
+    {
+      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 */
+		""
+		);