X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=6cd2bfde25e73ff844e875ba6fc6b12519a2bc08;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=09606c261e655185bee87ee4d76ab277d4cd02c1;hpb=9a2ffbf058002a6a82acc5748a2998840885afb8;p=lilypond.git diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 09606c261e..6cd2bfde25 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--2011 Jan Nieuwenhuizen + Copyright (C) 1998--2015 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 @@ -46,14 +46,15 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (break_aligned); - DECLARE_ACKNOWLEDGER (break_alignment); - DECLARE_ACKNOWLEDGER (grob); + void acknowledge_break_aligned (Grob_info); + void acknowledge_break_alignment (Grob_info); + void acknowledge_grob (Grob_info); - DECLARE_TRANSLATOR_LISTENER (tempo_change); + void listen_tempo_change (Stream_event *); }; -Metronome_mark_engraver::Metronome_mark_engraver () +Metronome_mark_engraver::Metronome_mark_engraver (Context *c) + : Engraver (c) { text_ = 0; support_ = 0; @@ -61,7 +62,6 @@ Metronome_mark_engraver::Metronome_mark_engraver () tempo_ev_ = 0; } -IMPLEMENT_TRANSLATOR_LISTENER (Metronome_mark_engraver, tempo_change); void Metronome_mark_engraver::listen_tempo_change (Stream_event *ev) { @@ -71,8 +71,7 @@ Metronome_mark_engraver::listen_tempo_change (Stream_event *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; + return ly_is_list (lst) && scm_is_true (scm_member (scm, lst)); } void @@ -81,14 +80,14 @@ Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info) Grob *g = info.grob (); if (text_ - && g->get_property ("break-align-symbol") - == ly_symbol2scm ("staff-bar")) + && scm_is_eq (g->get_property ("break-align-symbol"), + ly_symbol2scm ("staff-bar"))) bar_ = g; else if (text_ - && !support_ - && safe_is_member (g->get_property ("break-align-symbol"), - text_->get_property ("break-align-symbols")) - && Item::break_visible (g)) + && !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); @@ -115,10 +114,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 @@ -127,25 +126,25 @@ 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 (get_property ("currentMusicalColumn"))) + text_->set_parent (mc, X_AXIS); + else if (Grob *cc = unsmob (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; @@ -162,35 +161,41 @@ Metronome_mark_engraver::process_music () SCM proc = get_property ("metronomeMarkFormatter"); SCM result = scm_call_2 (proc, - tempo_ev_->self_scm (), - context ()->self_scm ()); + tempo_ev_->self_scm (), + context ()->self_scm ()); text_->set_property ("text", result); } } -ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_aligned); -ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_alignment); -ADD_ACKNOWLEDGER (Metronome_mark_engraver, grob); + +void +Metronome_mark_engraver::boot () +{ + ADD_LISTENER (Metronome_mark_engraver, tempo_change); + 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 */ - "currentCommandColumn " - "currentMusicalColumn " - "metronomeMarkFormatter " - "stavesFound " - "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 */ + "" + );