2003 -> 2004

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

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index fe0d3b531ddbc433317da6bf51121108d3dd3e2a..171cc1a63c5510c247f4d740a85926e21b9c854e 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,12 +15,12 @@ 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:
@@ -30,10 +30,9 @@ protected:
   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_;
+  Music * breathing_sign_req_;
   Grob * breathing_sign_;
 };
 
@@ -46,13 +45,8 @@ Breathing_sign_engraver::Breathing_sign_engraver ()
 bool
 Breathing_sign_engraver::try_music (Music*r)
 {
-  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r))
-    {
-      breathing_sign_req_ = b;
-      return true;
-    }
- 
-  return false;
+  breathing_sign_req_ = r;
+  return true;
 }
 
 void
@@ -60,8 +54,7 @@ Breathing_sign_engraver::process_acknowledged_grobs ()
 {
   if (breathing_sign_req_ && ! breathing_sign_)
     {
-      SCM b = get_property ("BreathingSign");
-      breathing_sign_ = new Item (b);
+      breathing_sign_ = make_item ("BreathingSign");
 
       announce_grob(breathing_sign_, breathing_sign_req_->self_scm());
       breathing_sign_req_ = 0;
@@ -76,11 +69,6 @@ Breathing_sign_engraver::stop_translation_timestep ()
       typeset_grob (breathing_sign_);
       breathing_sign_ = 0;
     }
-}
-
-void
-Breathing_sign_engraver::start_translation_timestep ()
-{
   breathing_sign_req_ = 0;
 }
 
@@ -88,7 +76,7 @@ Breathing_sign_engraver::start_translation_timestep ()
 ENTER_DESCRIPTION(Breathing_sign_engraver,
 /* descr */       "",
 /* creats*/       "BreathingSign",
-/* accepts */     "general-music",
+/* accepts */     "breathing-event",
 /* acks  */      "",
 /* reads */       "",
 /* write */       "");