X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=18ebeda94301a50fa6bf962f50da52b6dd633a09;hb=489ffb188ae02237fa0a22763d08841a669dc2a4;hp=09a7e3930535a52b7a89686c7fde09ad804eb4cb;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 09a7e39305..18ebeda943 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -23,6 +23,8 @@ #include "staff-symbol-referencer.hh" #include "stream-event.hh" #include "warn.hh" +#include "spanner.hh" +#include "text-interface.hh" #include "translator.icc" @@ -62,11 +64,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); DECLARE_TRANSLATOR_LISTENER (span_dynamic); @@ -97,7 +95,7 @@ Dynamic_engraver::listen_absolute_dynamic (Stream_event *ev) /* TODO: probably broken. */ - script_ev_ = ev; + ASSIGN_EVENT_ONCE (script_ev_, ev); } IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, span_dynamic); @@ -106,9 +104,14 @@ Dynamic_engraver::listen_span_dynamic (Stream_event *ev) { Direction d = to_dir (ev->get_property ("span-direction")); - accepted_spanevents_drul_[d] = ev; - if (current_cresc_ev_ && d == START) - accepted_spanevents_drul_[STOP] = ev; + if (d == START) + ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[START], ev); + + /* Cancel any ongoing crescendo, either explicitly by \! or + implicitly by a new crescendo. Also avoid warning if cresc is + cancelled both implicitly and explicitly. */ + if ((d == STOP || current_cresc_ev_) && !accepted_spanevents_drul_[STOP]) + ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[STOP], ev); } void @@ -178,7 +181,7 @@ Dynamic_engraver::process_music () } else if (accepted_spanevents_drul_[STOP]) { - accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo")); stop_ev = 0; } } @@ -236,9 +239,6 @@ Dynamic_engraver::process_music () ly_symbol2scm ("adjacent-hairpins"), finished_cresc_); } - cresc_->set_property ("grow-direction", - scm_from_int ((start_type == "crescendo") - ? BIGGER : SMALLER)); } /* @@ -253,16 +253,22 @@ Dynamic_engraver::process_music () context ()->set_property ((start_type + "Spanner").c_str (), SCM_EOL); s = get_property ((start_type + "Text").c_str ()); - /* - FIXME: use get_markup () to check type. - */ - if (scm_is_string (s) || scm_is_pair (s)) + if (Text_interface::is_markup (s)) { - cresc_->set_property ("edge-text", - scm_cons (s, scm_makfrom0str (""))); + cresc_->set_property ("text", s); context ()->set_property ((start_type + "Text").c_str (), SCM_EOL); } + + if (script_) + { + set_nested_property (cresc_, + scm_list_3 (ly_symbol2scm ("bound-details"), + ly_symbol2scm ("left"), + ly_symbol2scm ("attach-dir") + ), + scm_from_int (RIGHT)); + } } if (script_) @@ -337,10 +343,18 @@ Dynamic_engraver::typeset_all () if (!finished_cresc_->get_bound (RIGHT) || use_bar) { - Grob *column_bound = unsmob_grob (use_bar - ? get_property ("currentCommandColumn") - : get_property ("currentMusicalColumn")); - + + Grob *column_bound = 0; + if (use_bar) + { + column_bound = unsmob_grob (get_property ("breakableSeparationItem")); + } + + if (!column_bound) + column_bound = unsmob_grob (use_bar + ? get_property ("currentCommandColumn") + : get_property ("currentMusicalColumn")); + finished_cresc_->set_bound (RIGHT, script_ ? script_ : column_bound); @@ -388,31 +402,6 @@ Dynamic_engraver::typeset_all () } } - -void -Dynamic_engraver::acknowledge_accidental (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - -void -Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - -void -Dynamic_engraver::acknowledge_slur (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - void Dynamic_engraver::acknowledge_note_column (Grob_info info) { @@ -451,30 +440,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) finished_cresc_->set_bound (RIGHT, info.grob ()); } -void -Dynamic_engraver::acknowledge_script (Grob_info info) -{ - if (!line_spanner_ || !script_) - return; - - SCM p = info.grob ()->get_property ("script-priority"); - - /* - UGH. - - DynamicText doesn't really have a script-priority field. - */ - if (scm_is_number (p) - && scm_to_int (p) - < scm_to_int (script_->get_property ("script-priority"))) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - -ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); -ADD_ACKNOWLEDGER (Dynamic_engraver, script); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); -ADD_ACKNOWLEDGER (Dynamic_engraver, slur); -ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); ADD_TRANSLATOR (Dynamic_engraver, /* doc */ @@ -482,7 +448,11 @@ ADD_TRANSLATOR (Dynamic_engraver, "alignments. The symbols are collected onto a DynamicLineSpanner grob\n" "which takes care of vertical positioning. ", - /* create */ "DynamicLineSpanner DynamicText Hairpin TextSpanner", - /* accept */ "absolute-dynamic-event crescendo-event decrescendo-event", + /* create */ + "DynamicLineSpanner " + "DynamicText " + "Hairpin " + "TextSpanner ", + /* read */ "", /* write */ "");