X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmetronome-engraver.cc;h=7eaf3145ad2086308997e38c09bf5d10a2fd0b6f;hb=9a63326816f586dd79d326776583697f95203330;hp=5bc715339c69365ccda96429896bf3242418bc7c;hpb=19bb2e8bc9c42b2ffe8dc680bab084597ce6bf64;p=lilypond.git diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 5bc715339c..7eaf3145ad 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -1,9 +1,20 @@ /* - mark-engraver.cc -- implement Metronome_mark_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2010 Jan Nieuwenhuizen - (c) 1998--2007 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 + 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 @@ -15,25 +26,29 @@ using namespace std; #include "duration.hh" #include "grob-array.hh" #include "item.hh" +#include "music.hh" #include "stream-event.hh" +#include "text-interface.hh" #include "translator.icc" -/** - put stuff over or next to bars. Examples: bar numbers, marginal notes, - rehearsal marks. -*/ class Metronome_mark_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Metronome_mark_engraver); + protected: Item *text_; - Grob *bar_line_; + Grob *support_; + Grob *bar_; SCM last_duration_; SCM last_count_; - + SCM last_text_; + + DECLARE_ACKNOWLEDGER (break_aligned); + DECLARE_ACKNOWLEDGER (grob); + protected: virtual void derived_mark () const; void stop_translation_timestep (); @@ -43,8 +58,11 @@ protected: Metronome_mark_engraver::Metronome_mark_engraver () { text_ = 0; + support_ = 0; + bar_ = 0; last_duration_ = SCM_EOL; last_count_ = SCM_EOL; + last_text_ = SCM_EOL; } void @@ -52,6 +70,53 @@ Metronome_mark_engraver::derived_mark () const { scm_gc_mark (last_count_); scm_gc_mark (last_duration_); + scm_gc_mark (last_text_); +} + +static bool +safe_is_member (SCM scm, SCM lst) +{ + return scm_list_p (lst) == SCM_BOOL_T + && scm_member (scm, lst) != SCM_BOOL_F; +} + +void +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")) + bar_ = g; + else if (text_ + && !support_ + && safe_is_member (g->get_property ("break-align-symbol"), + text_->get_property ("break-align-symbols"))) + { + support_ = g; + text_->set_parent (g, X_AXIS); + } +} + +SCM +grob_name_scm (Grob *g) +{ + SCM name_pair = scm_assq (ly_symbol2scm ("name"), g->get_property ("meta")); + return (scm_is_pair (name_pair) + ? ly_camel_case_2_lisp_identifier (scm_cdr (name_pair)) + : SCM_EOL); +} + +void +Metronome_mark_engraver::acknowledge_grob (Grob_info info) +{ + Grob *g = info.grob (); + + if (text_ + && safe_is_member (grob_name_scm (g), + text_->get_property ("non-break-align-symbols"))) + text_->set_parent (g, X_AXIS); } void @@ -59,11 +124,29 @@ Metronome_mark_engraver::stop_translation_timestep () { if (text_) { - Grob *mc = unsmob_grob (get_property ("currentMusicalColumn")); - text_->set_parent (mc, X_AXIS); + 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); + 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); + } text_->set_object ("side-support-elements", grob_list_to_grob_array (get_property ("stavesFound"))); text_ = 0; + support_ = 0; + bar_ = 0; } } @@ -72,16 +155,19 @@ Metronome_mark_engraver::process_music () { SCM count = get_property ("tempoUnitCount"); SCM duration = get_property ("tempoUnitDuration"); - - if (unsmob_duration (duration) - && scm_is_number (count) + 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 (duration, last_duration_) + && ly_is_equal (text, last_text_))) { text_ = make_item ("MetronomeMark", SCM_EOL); SCM proc = get_property ("metronomeMarkFormatter"); - SCM result = scm_call_3 (proc, + SCM result = scm_call_4 (proc, + text, duration, count, context ()->self_scm ()); @@ -91,8 +177,14 @@ Metronome_mark_engraver::process_music () last_duration_ = duration; last_count_ = count; + last_text_ = text; } + + +ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_aligned); +ADD_ACKNOWLEDGER (Metronome_mark_engraver, grob); + ADD_TRANSLATOR (Metronome_mark_engraver, /* doc */ "Engrave metronome marking. This delegates the formatting" @@ -108,7 +200,9 @@ ADD_TRANSLATOR (Metronome_mark_engraver, "stavesFound " "metronomeMarkFormatter " "tempoUnitDuration " - "tempoUnitCount ", + "tempoUnitCount " + "tempoText " + "tempoHideNote ", /* write */ ""