The grand \paper -> \layout, \bookpaper -> \paper renaming.

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

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 4207c86683825d74090f40ec37d6fe7db1962cf3..10074de3f6c15532bd1c4fcbb8c70438e3220fa0 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,7 +1,7 @@
 /*
   breathing_sign-engraver.cc -- implement Breathing_sign_engraver
 
-  Copyright (C) 1999 Michael Krause
+  (c) 1999--2004 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
@@ -15,76 +15,62 @@ TODO:
 
 #include "staff-symbol-referencer.hh"
 #include "breathing-sign.hh"
-#include "musical-request.hh"
-#include "command-request.hh"
+#include "event.hh"
+
 #include "engraver-group-engraver.hh"
 #include "item.hh"
 #include "engraver.hh"
-#include "command-request.hh"
+
 
 class Breathing_sign_engraver : public Engraver {
 public:
-  Breathing_sign_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
   
 protected:
-  virtual bool try_music (Music *req_l);
-  virtual void create_grobs ();
+  virtual bool try_music (Music *req);
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
 
 private:
-  Breathing_sign_req * breathing_sign_req_l_;
-  Grob * breathing_sign_p_;
+  Music * breathing_sign_req_;
+  Grob * breathing_sign_;
 };
 
 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::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::create_grobs ()
+Breathing_sign_engraver::process_acknowledged_grobs ()
 {
-  if (breathing_sign_req_l_ && ! breathing_sign_p_)
+  if (breathing_sign_req_ && ! breathing_sign_)
     {
-      SCM b = get_property ("BreathingSign");
-      breathing_sign_p_ = new Item (b);
-
-      Breathing_sign::set_interface (breathing_sign_p_);
-
-      announce_grob (breathing_sign_p_, breathing_sign_req_l_);
-      breathing_sign_req_l_ = 0;
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_req_->self_scm ());
+      breathing_sign_req_ = 0;
     }
 }
 
 void 
 Breathing_sign_engraver::stop_translation_timestep ()
 {
-  if (breathing_sign_p_)
-    {
-      typeset_grob (breathing_sign_p_);
-      breathing_sign_p_ = 0;
-    }
+  breathing_sign_ = 0;
+  breathing_sign_req_ = 0;
 }
 
-void
-Breathing_sign_engraver::start_translation_timestep ()
-{
-  breathing_sign_req_l_ = 0;
-}
 
-ADD_THIS_TRANSLATOR (Breathing_sign_engraver);
+ENTER_DESCRIPTION (Breathing_sign_engraver,
+/* descr */       "",
+/* creats*/       "BreathingSign",
+/* accepts */     "breathing-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");