X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign-engraver.cc;h=ba23eede6d3179b589000798c7cabcb1e9950278;hb=b690023c78792a05ea55c69d41be63a04f93b43a;hp=7d49c31d731667c475f90e0ac2eaadfc7d1b8f34;hpb=cd93507bb0b0559c7d916c1b19d7ac1f83d1cc8e;p=lilypond.git diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 7d49c31d73..ba23eede6d 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -1,39 +1,35 @@ /* breathing_sign-engraver.cc -- implement Breathing_sign_engraver - (c) 1999--2003 Michael Krause + (c) 1999--2005 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]) + ([e8 \breathe f e f] should become [e8] \breathe [f e f]) . Spacing is not yet completely pretty - */ #include "staff-symbol-referencer.hh" #include "breathing-sign.hh" -#include "event.hh" - #include "engraver-group-engraver.hh" #include "item.hh" -#include "engraver.hh" - -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 (); private: - Music * breathing_sign_req_; - Grob * breathing_sign_; + Music *breathing_sign_req_; + Grob *breathing_sign_; }; Breathing_sign_engraver::Breathing_sign_engraver () @@ -43,7 +39,7 @@ Breathing_sign_engraver::Breathing_sign_engraver () } bool -Breathing_sign_engraver::try_music (Music*r) +Breathing_sign_engraver::try_music (Music *r) { breathing_sign_req_ = r; return true; @@ -54,30 +50,22 @@ Breathing_sign_engraver::process_acknowledged_grobs () { if (breathing_sign_req_ && ! breathing_sign_) { - SCM b = get_property ("BreathingSign"); - breathing_sign_ = new Item (b); - - announce_grob(breathing_sign_, breathing_sign_req_->self_scm()); + breathing_sign_ = make_item ("BreathingSign", breathing_sign_req_->self_scm ()); breathing_sign_req_ = 0; } } -void +void Breathing_sign_engraver::stop_translation_timestep () { - if (breathing_sign_) - { - typeset_grob (breathing_sign_); - breathing_sign_ = 0; - } + breathing_sign_ = 0; breathing_sign_req_ = 0; } - -ENTER_DESCRIPTION(Breathing_sign_engraver, -/* descr */ "", -/* creats*/ "BreathingSign", -/* accepts */ "breathing-event", -/* acks */ "", -/* reads */ "", -/* write */ ""); +ADD_TRANSLATOR (Breathing_sign_engraver, + /* descr */ "", + /* creats*/ "BreathingSign", + /* accepts */ "breathing-event", + /* acks */ "", + /* reads */ "", + /* write */ "");