Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / breathing-sign-engraver.cc

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index d7a1a05d11379f05a6e5813049abcd78746da71d..d659b64a90b2a0af0ba77b43f0b23fecd47d9da8 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,72 +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 "breathing-sign-engraver.hh"
+#include "staff-symbol-referencer.hh"
 #include "breathing-sign.hh"
-#include "musical-request.hh"
-#include "command-request.hh"
 #include "engraver-group.hh"
-#include "note-head.hh"
-#include "local-key-item.hh"
+#include "item.hh"
+
+class Breathing_sign_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
 
-#include <iostream.h>
+protected:
+  virtual bool try_music (Music *event);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
-Breathing_sign_engraver::Breathing_sign_engraver()
+private:
+  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::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_event_ = r;
+  return true;
 }
 
 void
-Breathing_sign_engraver::do_process_requests()
-{
-  if(breathing_sign_req_l_) {
-    breathing_sign_p_ = new Breathing_sign;
-
-    Scalar prop = get_property ("verticalDirection", 0);
-    if(prop.isnum_b())
-      breathing_sign_p_->set_vertical_position((Direction)int(prop));
-
-    announce_element (Score_element_info (breathing_sign_p_, breathing_sign_req_l_));
-  }
-}
-
-void 
-Breathing_sign_engraver::do_pre_move_processing()
+Breathing_sign_engraver::process_acknowledged ()
 {
-  if(breathing_sign_p_) {
-    typeset_element(breathing_sign_p_);
-    breathing_sign_p_ = 0;
-  }
+  if (breathing_sign_event_ && ! breathing_sign_)
+    {
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
+      breathing_sign_event_ = 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_event_ = 0;
 }
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+#include "translator.icc"
+
+ADD_TRANSLATOR (Breathing_sign_engraver,
+               /* doc */ "",
+               /* create */ "BreathingSign",
+               /* accept */ "breathing-event",
+               /* read */ "",
+               /* write */ "");