X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=917a47d4f6caa54a65c5ac6952b7a10093f121ed;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=439e09bee37b6d9d88f67797883b8d9aa21ea233;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git
diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 439e09bee3..917a47d4f6 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,95 +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 .
*/
-#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_l);
- virtual void create_grobs ();
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
+ void process_music ();
+ void stop_translation_timestep ();
+ void listen_breathing (Stream_event *);
private:
- Breathing_sign_req * breathing_sign_req_l_;
- Grob * 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::try_music (Music*r_l)
+void
+Breathing_sign_engraver::listen_breathing (Stream_event *ev)
{
- if (Breathing_sign_req * b= dynamic_cast (r_l))
- {
- breathing_sign_req_l_ = b;
- return true;
- }
-
- return false;
+ ASSIGN_EVENT_ONCE (breathing_sign_event_, ev);
}
void
-Breathing_sign_engraver::create_grobs ()
+Breathing_sign_engraver::process_music ()
{
- if (breathing_sign_req_l_ && ! breathing_sign_p_)
+ if (breathing_sign_event_)
{
- 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_->self_scm());
- breathing_sign_req_l_ = 0;
+ breathing_sign_ = make_item ("BreathingSign", breathing_sign_event_->self_scm ());
}
}
-void
+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_event_ = 0;
}
void
-Breathing_sign_engraver::start_translation_timestep ()
+Breathing_sign_engraver::boot ()
{
- breathing_sign_req_l_ = 0;
+ ADD_LISTENER (Breathing_sign_engraver, breathing);
}
+ADD_TRANSLATOR (Breathing_sign_engraver,
+ /* doc */
+ "Create a breathing sign.",
+
+ /* create */
+ "BreathingSign ",
+
+ /* read */
+ "",
-ENTER_DESCRIPTION(Breathing_sign_engraver,
-/* descr */ "",
-/* creats*/ "BreathingSign",
-/* acks */ "",
-/* reads */ "",
-/* write */ "");
+ /* write */
+ ""
+ );