X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=917a47d4f6caa54a65c5ac6952b7a10093f121ed;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=2a19cdb4abdf8927002af3c24677cc19085464fe;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 2a19cdb4ab..917a47d4f6 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,90 +1,95 @@
 /*
-  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:
-  Breathing_sign_engraver();
-  VIRTUAL_COPY_CONS(Translator);
-  
-protected:
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_music();
+  TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
 
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
 
+  void listen_breathing (Stream_event *);
 private:
-  Breathing_sign_req * breathing_sign_req_l_;
-  Score_element * breathing_sign_p_;
+  Stream_event *breathing_sign_event_;
+  Grob *breathing_sign_;
 };
 
-Breathing_sign_engraver::Breathing_sign_engraver()
+Breathing_sign_engraver::Breathing_sign_engraver (Context *c)
+  : Engraver (c)
 {
-  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)
+void
+Breathing_sign_engraver::listen_breathing (Stream_event *ev)
 {
-  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l))
-    {
-      breathing_sign_req_l_ = b;
-      return true;
-    }
- 
-  return false;
+  ASSIGN_EVENT_ONCE (breathing_sign_event_, ev);
 }
 
 void
-Breathing_sign_engraver::do_process_music()
+Breathing_sign_engraver::process_music ()
 {
-  if(breathing_sign_req_l_)
+  if (breathing_sign_event_)
     {
-      SCM b = get_property ("basicBreathingSignProperties");
-      breathing_sign_p_ = new Item (b);
-
-      Breathing_sign::set_interface (breathing_sign_p_);
-
-      announce_element (breathing_sign_p_, breathing_sign_req_l_);
+      breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
     }
 }
 
-void 
-Breathing_sign_engraver::do_pre_move_processing()
+void
+Breathing_sign_engraver::stop_translation_timestep ()
 {
-  if(breathing_sign_p_)
-    {
-      typeset_element(breathing_sign_p_);
-      breathing_sign_p_ = 0;
-    }
+  breathing_sign_ = 0;
+  breathing_sign_event_ = 0;
 }
 
 void
-Breathing_sign_engraver::do_post_move_processing()
+Breathing_sign_engraver::boot ()
 {
-  breathing_sign_req_l_ = 0;
+  ADD_LISTENER (Breathing_sign_engraver, breathing);
 }
 
-ADD_THIS_TRANSLATOR(Breathing_sign_engraver);
+ADD_TRANSLATOR (Breathing_sign_engraver,
+                /* doc */
+                "Create a breathing sign.",
+
+                /* create */
+                "BreathingSign ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );