X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=34b296d10b248028416c87286138c4073c6583af;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fe0d3b531ddbc433317da6bf51121108d3dd3e2a;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index fe0d3b531d..34b296d10b 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,94 +1,89 @@
 /*
-  breathing_sign-engraver.cc -- implement Breathing_sign_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999 Michael Krause
+  Copyright (C) 1999--2015 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])
   . Spacing is not yet completely pretty
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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"
+
+#include "translator.icc"
 
-class Breathing_sign_engraver : public Engraver {
+class Breathing_sign_engraver : public Engraver
+{
 public:
-  TRANSLATOR_DECLARATIONS(Breathing_sign_engraver);
-  
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
+
 protected:
-  virtual bool try_music (Music *req);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (breathing);
 private:
-  Breathing_sign_req * breathing_sign_req_;
-  Grob * breathing_sign_;
+  Stream_event *breathing_sign_event_;
+  Grob *breathing_sign_;
 };
 
 Breathing_sign_engraver::Breathing_sign_engraver ()
 {
   breathing_sign_ = 0;
-  breathing_sign_req_ = 0;
+  breathing_sign_event_ = 0;
 }
 
-bool
-Breathing_sign_engraver::try_music (Music*r)
+IMPLEMENT_TRANSLATOR_LISTENER (Breathing_sign_engraver, breathing);
+void
+Breathing_sign_engraver::listen_breathing (Stream_event *ev)
 {
-  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r))
-    {
-      breathing_sign_req_ = b;
-      return true;
-    }
- 
-  return false;
+  ASSIGN_EVENT_ONCE (breathing_sign_event_, ev);
 }
 
 void
-Breathing_sign_engraver::process_acknowledged_grobs ()
+Breathing_sign_engraver::process_music ()
 {
-  if (breathing_sign_req_ && ! breathing_sign_)
+  if (breathing_sign_event_)
     {
-      SCM b = get_property ("BreathingSign");
-      breathing_sign_ = new Item (b);
-
-      announce_grob(breathing_sign_, breathing_sign_req_->self_scm());
-      breathing_sign_req_ = 0;
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
     }
 }
 
-void 
+void
 Breathing_sign_engraver::stop_translation_timestep ()
 {
-  if (breathing_sign_)
-    {
-      typeset_grob (breathing_sign_);
-      breathing_sign_ = 0;
-    }
+  breathing_sign_ = 0;
+  breathing_sign_event_ = 0;
 }
 
-void
-Breathing_sign_engraver::start_translation_timestep ()
-{
-  breathing_sign_req_ = 0;
-}
+ADD_TRANSLATOR (Breathing_sign_engraver,
+                /* doc */
+                "Create a breathing sign.",
+
+                /* create */
+                "BreathingSign ",
 
+                /* read */
+                "",
 
-ENTER_DESCRIPTION(Breathing_sign_engraver,
-/* descr */       "",
-/* creats*/       "BreathingSign",
-/* accepts */     "general-music",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+                /* write */
+                ""
+               );