X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=8df7f8fccc0b39e840c38f7ccbcdf58c2c6daca2;hb=2db1e457b20d67b2ff019c16dcecf649709f71cb;hp=8d4cb2880f195d1cd0c819092023872ffb154fb5;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 8d4cb2880f..8df7f8fccc 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" @@ -21,7 +21,9 @@ #include "self-alignment-interface.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "warn.hh" +#include "spanner.hh" #include "translator.icc" @@ -50,10 +52,10 @@ class Dynamic_engraver : public Engraver Spanner *finished_line_spanner_; Spanner *finished_cresc_; - Music *script_ev_; - Music *current_cresc_ev_; + Stream_event *script_ev_; + Stream_event *current_cresc_ev_; - Drul_array accepted_spanevents_drul_; + Drul_array accepted_spanevents_drul_; vector pending_columns_; vector pending_elements_; @@ -61,14 +63,15 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (script); + DECLARE_ACKNOWLEDGER (accidental); DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (slur); + DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); + DECLARE_TRANSLATOR_LISTENER (span_dynamic); protected: virtual void finalize (); - virtual bool try_music (Music *event); void stop_translation_timestep (); void process_music (); }; @@ -87,28 +90,30 @@ Dynamic_engraver::Dynamic_engraver () accepted_spanevents_drul_[STOP] = 0; } -bool -Dynamic_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, absolute_dynamic); +void +Dynamic_engraver::listen_absolute_dynamic (Stream_event *ev) { - if (m->is_mus_type ("absolute-dynamic-event")) - { - /* - TODO: probably broken. - */ - script_ev_ = m; - return true; - } - else if (m->is_mus_type ("decrescendo-event") - || m->is_mus_type ("crescendo-event")) - { - Direction d = to_dir (m->get_property ("span-direction")); + /* + TODO: probably broken. + */ + ASSIGN_EVENT_ONCE (script_ev_, ev); +} - accepted_spanevents_drul_[d] = m; - if (current_cresc_ev_ && d == START) - accepted_spanevents_drul_[STOP] = m; - return true; - } - return false; +IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, span_dynamic); +void +Dynamic_engraver::listen_span_dynamic (Stream_event *ev) +{ + Direction d = to_dir (ev->get_property ("span-direction")); + + 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 @@ -118,7 +123,7 @@ Dynamic_engraver::process_music () { if (!line_spanner_) { - Music *rq = accepted_spanevents_drul_[START]; + Stream_event *rq = accepted_spanevents_drul_[START]; line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL); if (script_ev_) rq = script_ev_; @@ -152,7 +157,7 @@ Dynamic_engraver::process_music () Axis_group_interface::add_element (line_spanner_, script_); } - Music *stop_ev = accepted_spanevents_drul_ [STOP] + Stream_event *stop_ev = accepted_spanevents_drul_ [STOP] ? accepted_spanevents_drul_[STOP] : script_ev_; if (accepted_spanevents_drul_[STOP] || script_ev_) @@ -178,7 +183,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; } } @@ -188,7 +193,7 @@ Dynamic_engraver::process_music () if (current_cresc_ev_) { string msg = _ ("already have a decrescendo"); - if (current_cresc_ev_->is_mus_type ("decrescendo-event")) + if (current_cresc_ev_->in_event_class ("crescendo-event")) msg = _ ("already have a crescendo"); accepted_spanevents_drul_[START]->origin ()->warning (msg); @@ -204,18 +209,24 @@ Dynamic_engraver::process_music () /* TODO: Use symbols. */ - - string start_type - = ly_symbol2string (current_cresc_ev_->get_property ("name")); - - /* - ugh. Use push/pop? - */ - if (start_type == "DecrescendoEvent") + + SCM start_sym = current_cresc_ev_->get_property ("class"); + string start_type; + + if (start_sym == ly_symbol2scm ("decrescendo-event")) start_type = "decrescendo"; - else if (start_type == "CrescendoEvent") + else if (start_sym == ly_symbol2scm ("crescendo-event")) start_type = "crescendo"; + else + { + programming_error ("unknown dynamic spanner type"); + return; + } + /* + UGH. TODO: should read from original event, so appearance + may be altered with \tweak. + */ SCM s = get_property ((start_type + "Spanner").c_str ()); if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin")) { @@ -230,9 +241,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,7 +261,7 @@ Dynamic_engraver::process_music () if (scm_is_string (s) || scm_is_pair (s)) { cresc_->set_property ("edge-text", - scm_cons (s, scm_makfrom0str (""))); + scm_cons (s, scm_from_locale_string (""))); context ()->set_property ((start_type + "Text").c_str (), SCM_EOL); } @@ -323,11 +331,21 @@ Dynamic_engraver::typeset_all () { if (finished_cresc_) { - if (!finished_cresc_->get_bound (RIGHT)) + bool use_bar = to_boolean (get_property ("hairpinToBarline")) + && scm_is_string (get_property ("whichBar")) + && !script_ev_; + + + if (!finished_cresc_->get_bound (RIGHT) + || use_bar) { + Grob *column_bound = unsmob_grob (use_bar + ? get_property ("currentCommandColumn") + : get_property ("currentMusicalColumn")); + finished_cresc_->set_bound (RIGHT, script_ ? script_ - : unsmob_grob (get_property ("currentMusicalColumn"))); + : column_bound); if (finished_line_spanner_) add_bound_item (finished_line_spanner_, @@ -372,6 +390,12 @@ 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) @@ -380,7 +404,6 @@ Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) Side_position_interface::add_support (line_spanner_, info.grob ()); } - void Dynamic_engraver::acknowledge_slur (Grob_info info) { @@ -388,7 +411,6 @@ Dynamic_engraver::acknowledge_slur (Grob_info info) Side_position_interface::add_support (line_spanner_, info.grob ()); } - void Dynamic_engraver::acknowledge_note_column (Grob_info info) { @@ -427,26 +449,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, script); +ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); ADD_ACKNOWLEDGER (Dynamic_engraver, slur); ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); @@ -457,7 +460,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 */ "");