X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=8c0233c9095b6b93cdd3ca4186daad873682f024;hb=cc511e8f926ae0f45f742b392577b38dda032db4;hp=2ffdc696d2d06d7c6726d8bc19451ed2bb6d6ccf;hpb=9e5c624e4e431f47126a3806a2c0aea579e7a8ac;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 2ffdc696d2..8c0233c909 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,19 +3,25 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen + (c) 1998--2007 Jan Nieuwenhuizen */ #include using namespace std; +#include "engraver.hh" + +#include "axis-group-interface.hh" #include "bar-line.hh" #include "context.hh" -#include "engraver-group.hh" +#include "grob-array.hh" +#include "international.hh" #include "item.hh" -#include "warn.hh" +#include "stream-event.hh" #include "text-interface.hh" -#include "grob-array.hh" +#include "warn.hh" + +#include "translator.icc" /** put stuff over or next to bars. Examples: bar numbers, marginal notes, @@ -24,19 +30,19 @@ using namespace std; class Mark_engraver : public Engraver { - void create_items (Music *); + void create_items (Stream_event *); Item *text_; - Music *mark_ev_; + Stream_event *mark_ev_; public: TRANSLATOR_DECLARATIONS (Mark_engraver); protected: - virtual bool try_music (Music *ev); void process_music (); void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (break_aligned); + DECLARE_TRANSLATOR_LISTENER (mark); + DECLARE_ACKNOWLEDGER (break_alignment); }; Mark_engraver::Mark_engraver () @@ -46,35 +52,31 @@ Mark_engraver::Mark_engraver () } void -Mark_engraver::acknowledge_break_aligned (Grob_info inf) +Mark_engraver::acknowledge_break_alignment (Grob_info inf) { Grob *s = inf.grob (); if (text_ - && (get_property ("rehearsalMarkAlignSymbol") - == s->get_property ("break-align-symbol"))) + && dynamic_cast (s)) { - /* - RehearsalMark cannot be break-aligned, since the width of the - object should not be taken into alignment considerations. - */ text_->set_parent (s, X_AXIS); } } + void Mark_engraver::stop_translation_timestep () { if (text_) - { - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; - } + { + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + text_ = 0; + } mark_ev_ = 0; } void -Mark_engraver::create_items (Music *ev) +Mark_engraver::create_items (Stream_event *ev) { if (text_) return; @@ -82,11 +84,11 @@ Mark_engraver::create_items (Music *ev) text_ = make_item ("RehearsalMark", ev->self_scm ()); } -bool -Mark_engraver::try_music (Music *r) +IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark); +void +Mark_engraver::listen_mark (Stream_event *ev) { - mark_ev_ = r; - return true; + ASSIGN_EVENT_ONCE (mark_ev_, ev); } /* @@ -134,9 +136,7 @@ Mark_engraver::process_music () } } -#include "translator.icc" - -ADD_ACKNOWLEDGER (Mark_engraver, break_aligned); +ADD_ACKNOWLEDGER (Mark_engraver, break_alignment); ADD_TRANSLATOR (Mark_engraver, /* doc */ "This engraver will create RehearsalMark objects. " @@ -145,7 +145,11 @@ ADD_TRANSLATOR (Mark_engraver, "to a different context, " "@ref{Staff_collecting_engraver} must move along, otherwise all marks" "end up on the same Y-location", + /* create */ "RehearsalMark", - /* accept */ "mark-event", - /* read */ "rehearsalMark rehearsalMarkAlignSymbol markFormatter stavesFound", + /* read */ + "markFormatter " + "rehearsalMark " + "stavesFound ", + /* write */ "");