X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=7c0856e654708849732c3cf4d453cacf9a2b26ca;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=aed027544c498ac6a65fe607f9e74b740b57283c;hpb=19b37df119ff6ca84421d984fe1d33112ad08299;p=lilypond.git diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index aed027544c..7c0856e654 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2010 Jan Nieuwenhuizen + Copyright (C) 1998--2014 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,25 +34,23 @@ using namespace std; class Metronome_mark_engraver : public Engraver { -public: - TRANSLATOR_DECLARATIONS (Metronome_mark_engraver); - -protected: Item *text_; Grob *support_; Grob *bar_; + Stream_event *tempo_ev_; - SCM last_duration_; - SCM last_count_; - SCM last_text_; - - DECLARE_ACKNOWLEDGER (break_aligned); - DECLARE_ACKNOWLEDGER (grob); +public: + TRANSLATOR_DECLARATIONS (Metronome_mark_engraver); protected: - virtual void derived_mark () const; void stop_translation_timestep (); void process_music (); + + DECLARE_ACKNOWLEDGER (break_aligned); + DECLARE_ACKNOWLEDGER (break_alignment); + DECLARE_ACKNOWLEDGER (grob); + + DECLARE_TRANSLATOR_LISTENER (tempo_change); }; Metronome_mark_engraver::Metronome_mark_engraver () @@ -60,24 +58,21 @@ Metronome_mark_engraver::Metronome_mark_engraver () text_ = 0; support_ = 0; bar_ = 0; - last_duration_ = SCM_EOL; - last_count_ = SCM_EOL; - last_text_ = SCM_EOL; + tempo_ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Metronome_mark_engraver, tempo_change); void -Metronome_mark_engraver::derived_mark () const +Metronome_mark_engraver::listen_tempo_change (Stream_event *ev) { - scm_gc_mark (last_count_); - scm_gc_mark (last_duration_); - scm_gc_mark (last_text_); + ASSIGN_EVENT_ONCE (tempo_ev_, ev); } static bool safe_is_member (SCM scm, SCM lst) { return scm_list_p (lst) == SCM_BOOL_T - && scm_member (scm, lst) != SCM_BOOL_F; + && scm_member (scm, lst) != SCM_BOOL_F; } void @@ -88,15 +83,29 @@ Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info) if (text_ && g->get_property ("break-align-symbol") == ly_symbol2scm ("staff-bar")) - bar_ = g; + bar_ = g; else if (text_ - && !support_ - && safe_is_member (g->get_property ("break-align-symbol"), - text_->get_property ("break-align-symbols"))) + && !support_ + && safe_is_member (g->get_property ("break-align-symbol"), + text_->get_property ("break-align-symbols")) + && Item::break_visible (g)) { support_ = g; text_->set_parent (g, X_AXIS); } + if (bar_ || support_) + text_->set_property ("non-musical", SCM_BOOL_T); +} + +void +Metronome_mark_engraver::acknowledge_break_alignment (Grob_info info) +{ + Grob *g = info.grob (); + + if (text_ + && support_ + && dynamic_cast (g)) + text_->set_parent (g, X_AXIS); } void @@ -106,10 +115,10 @@ Metronome_mark_engraver::acknowledge_grob (Grob_info info) if (text_) for (SCM s = text_->get_property ("non-break-align-symbols"); - scm_is_pair (s); - s = scm_cdr (s)) + scm_is_pair (s); + s = scm_cdr (s)) if (g->internal_has_interface (scm_car (s))) - text_->set_parent (g, X_AXIS); + text_->set_parent (g, X_AXIS); } void @@ -118,85 +127,70 @@ Metronome_mark_engraver::stop_translation_timestep () if (text_) { if (text_->get_parent (X_AXIS) - && text_->get_parent (X_AXIS)->internal_has_interface (ly_symbol2scm ("multi-measure-rest-interface")) - && bar_) - text_->set_parent (bar_, X_AXIS); + && text_->get_parent (X_AXIS)->internal_has_interface (ly_symbol2scm ("multi-measure-rest-interface")) + && bar_) + text_->set_parent (bar_, X_AXIS); else if (!support_) - { - /* - Gardner Read "Music Notation", p.278 - - Align the metronome mark over the time signature (or the - first notational element of the measure if no time - signature is present in that measure). - */ - if (Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"))) - text_->set_parent (mc, X_AXIS); - else if (Grob *cc = unsmob_grob (get_property ("currentCommandColumn"))) - text_->set_parent (cc, X_AXIS); - } + { + /* + Gardner Read "Music Notation", p.278 + + Align the metronome mark over the time signature (or the + first notational element of the measure if no time + signature is present in that measure). + */ + if (Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"))) + text_->set_parent (mc, X_AXIS); + else if (Grob *cc = unsmob_grob (get_property ("currentCommandColumn"))) + text_->set_parent (cc, X_AXIS); + } text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); + grob_list_to_grob_array (get_property ("stavesFound"))); text_ = 0; support_ = 0; bar_ = 0; + tempo_ev_ = 0; } } void Metronome_mark_engraver::process_music () { - SCM count = get_property ("tempoUnitCount"); - SCM duration = get_property ("tempoUnitDuration"); - SCM text = get_property ("tempoText"); - - if ( ( (unsmob_duration (duration) && scm_is_number (count)) - || Text_interface::is_markup (text) ) - && !(ly_is_equal (count, last_count_) - && ly_is_equal (duration, last_duration_) - && ly_is_equal (text, last_text_))) + if (tempo_ev_) { - text_ = make_item ("MetronomeMark", SCM_EOL); + text_ = make_item ("MetronomeMark", tempo_ev_->self_scm ()); SCM proc = get_property ("metronomeMarkFormatter"); - SCM result = scm_call_4 (proc, - text, - duration, - count, - context ()->self_scm ()); + SCM result = scm_call_2 (proc, + tempo_ev_->self_scm (), + context ()->self_scm ()); text_->set_property ("text", result); } - - last_duration_ = duration; - last_count_ = count; - last_text_ = text; } - - ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_aligned); +ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_alignment); ADD_ACKNOWLEDGER (Metronome_mark_engraver, grob); ADD_TRANSLATOR (Metronome_mark_engraver, - /* doc */ - "Engrave metronome marking. This delegates the formatting" - " work to the function in the @code{metronomeMarkFormatter}" - " property. The mark is put over all staves. The staves are" - " taken from the @code{stavesFound} property, which is" - " maintained by @ref{Staff_collecting_engraver}.", - - /* create */ - "MetronomeMark ", - - /* read */ - "stavesFound " - "metronomeMarkFormatter " - "tempoUnitDuration " - "tempoUnitCount " - "tempoText " - "tempoHideNote ", - - /* write */ - "" - ); + /* doc */ + "Engrave metronome marking. This delegates the formatting" + " work to the function in the @code{metronomeMarkFormatter}" + " property. The mark is put over all staves. The staves are" + " taken from the @code{stavesFound} property, which is" + " maintained by @ref{Staff_collecting_engraver}.", + + /* create */ + "MetronomeMark ", + + /* read */ + "currentCommandColumn " + "currentMusicalColumn " + "metronomeMarkFormatter " + "stavesFound " + "tempoHideNote ", + + /* write */ + "" + );