X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=18ebeda94301a50fa6bf962f50da52b6dd633a09;hb=489ffb188ae02237fa0a22763d08841a669dc2a4;hp=843573fdb3dba434f24a3464ddea064dab28cc44;hpb=02c656d3b0cb895cc81b428d699d960746800e45;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 843573fdb3..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--2005 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -12,13 +12,21 @@ #include "directional-element-interface.hh" #include "engraver.hh" #include "hairpin.hh" +#include "international.hh" #include "interval.hh" #include "note-column.hh" #include "paper-column.hh" +#include "pointer-group-interface.hh" #include "script-interface.hh" +#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 "text-interface.hh" + +#include "translator.icc" /* TODO: @@ -27,7 +35,7 @@ line-spanner - TODO: this engraver is too complicated. We should split it into - the handling of the basic grobs and the linespanner + the handling of the basic grobs and the linespanner - TODO: the line-spanner is not killed after the (de)crescs are finished. @@ -45,24 +53,25 @@ 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_spanreqs_drul_; + Drul_array accepted_spanevents_drul_; - Link_array pending_columns_; - Link_array pending_elements_; + vector pending_columns_; + vector pending_elements_; void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); + DECLARE_TRANSLATOR_LISTENER (span_dynamic); protected: virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music *req); - virtual void stop_translation_timestep (); - virtual void process_music (); + void stop_translation_timestep (); + void process_music (); }; Dynamic_engraver::Dynamic_engraver () @@ -75,44 +84,45 @@ Dynamic_engraver::Dynamic_engraver () cresc_ = 0; script_ev_ = 0; - accepted_spanreqs_drul_[START] = 0; - accepted_spanreqs_drul_[STOP] = 0; + accepted_spanevents_drul_[START] = 0; + 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_spanreqs_drul_[d] = m; - if (current_cresc_ev_ && d == START) - accepted_spanreqs_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 Dynamic_engraver::process_music () { - if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_ev_) + if (accepted_spanevents_drul_[START] || accepted_spanevents_drul_[STOP] || script_ev_) { if (!line_spanner_) { - Music *rq = accepted_spanreqs_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_; } @@ -139,14 +149,16 @@ Dynamic_engraver::process_music () if (Direction d = to_dir (script_ev_->get_property ("direction"))) set_grob_direction (line_spanner_, d); + else if (Direction d = to_dir (line_spanner_->get_property ("direction"))) + set_grob_direction (script_, d); Axis_group_interface::add_element (line_spanner_, script_); } - Music *stop_ev = accepted_spanreqs_drul_ [STOP] - ? accepted_spanreqs_drul_[STOP] : script_ev_; + Stream_event *stop_ev = accepted_spanevents_drul_ [STOP] + ? accepted_spanevents_drul_[STOP] : script_ev_; - if (accepted_spanreqs_drul_[STOP] || script_ev_) + if (accepted_spanevents_drul_[STOP] || script_ev_) { /* finish side position alignment if the (de)cresc ends here, and @@ -162,32 +174,32 @@ Dynamic_engraver::process_music () cresc_->set_bound (RIGHT, script_); add_bound_item (line_spanner_, script_); } - + finished_cresc_ = cresc_; cresc_ = 0; current_cresc_ev_ = 0; } - else if (accepted_spanreqs_drul_[STOP]) + else if (accepted_spanevents_drul_[STOP]) { - accepted_spanreqs_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; } } - if (accepted_spanreqs_drul_[START]) + if (accepted_spanevents_drul_[START]) { if (current_cresc_ev_) { - String msg = _ ("already have a decrescendo"); - if (current_cresc_ev_->is_mus_type ("decrescendo-event")) + string msg = _ ("already have a decrescendo"); + if (current_cresc_ev_->in_event_class ("crescendo-event")) msg = _ ("already have a crescendo"); - accepted_spanreqs_drul_[START]->origin ()->warning (msg); + accepted_spanevents_drul_[START]->origin ()->warning (msg); current_cresc_ev_->origin ()->warning (_ ("cresc starts here")); } else { - current_cresc_ev_ = accepted_spanreqs_drul_[START]; + current_cresc_ev_ = accepted_spanevents_drul_[START]; if (Direction d = to_dir (current_cresc_ev_->get_property ("direction"))) set_grob_direction (line_spanner_, d); @@ -195,22 +207,28 @@ 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; + } - SCM s = get_property ((start_type + "Spanner").to_str0 ()); + /* + 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")) { - cresc_ = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ()); + cresc_ = make_spanner ("Hairpin", accepted_spanevents_drul_[START]->self_scm ()); if (finished_cresc_) { Pointer_group_interface::add_grob (finished_cresc_, @@ -221,9 +239,6 @@ Dynamic_engraver::process_music () ly_symbol2scm ("adjacent-hairpins"), finished_cresc_); } - cresc_->set_property ("grow-direction", - scm_int2num ((start_type == "crescendo") - ? BIGGER : SMALLER)); } /* @@ -233,21 +248,27 @@ Dynamic_engraver::process_music () */ else { - cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanreqs_drul_[START]->self_scm ()); + cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanevents_drul_[START]->self_scm ()); cresc_->set_property ("style", s); context ()->set_property ((start_type - + "Spanner").to_str0 (), SCM_EOL); - s = get_property ((start_type + "Text").to_str0 ()); - /* - FIXME: use get_markup () to check type. - */ - if (scm_is_string (s) || scm_is_pair (s)) + + "Spanner").c_str (), SCM_EOL); + s = get_property ((start_type + "Text").c_str ()); + if (Text_interface::is_markup (s)) { - cresc_->set_property ("edge-text", - scm_cons (s, scm_makfrom0str (""))); - context ()->set_property ((start_type + "Text").to_str0 (), + 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_) @@ -264,14 +285,15 @@ Dynamic_engraver::process_music () void Dynamic_engraver::stop_translation_timestep () { - typeset_all (); - if (!current_cresc_ev_) + if (!current_cresc_ev_ && line_spanner_) { + assert (!finished_line_spanner_); finished_line_spanner_ = line_spanner_; line_spanner_ = 0; - typeset_all (); } + typeset_all (); + if (cresc_ && !cresc_->get_bound (LEFT)) { cresc_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn"))); @@ -279,8 +301,8 @@ Dynamic_engraver::stop_translation_timestep () } script_ev_ = 0; - accepted_spanreqs_drul_[START] = 0; - accepted_spanreqs_drul_[STOP] = 0; + accepted_spanevents_drul_[START] = 0; + accepted_spanevents_drul_[STOP] = 0; } void @@ -313,11 +335,29 @@ 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 = 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_ - : unsmob_grob (get_property ("currentMusicalColumn"))); + : column_bound); if (finished_line_spanner_) add_bound_item (finished_line_spanner_, @@ -363,67 +403,56 @@ Dynamic_engraver::typeset_all () } void -Dynamic_engraver::acknowledge_grob (Grob_info info) +Dynamic_engraver::acknowledge_note_column (Grob_info info) { if (!line_spanner_) return; - if (Note_column::has_interface (info.grob ())) + if (line_spanner_ + /* Don't refill killed spanner */ + && line_spanner_->is_live ()) { - if (line_spanner_ - /* Don't refill killed spanner */ - && line_spanner_->is_live ()) - { - Side_position_interface::add_support (line_spanner_, info.grob ()); - add_bound_item (line_spanner_, dynamic_cast (info.grob ())); - } - - if (script_ && !script_->get_parent (X_AXIS)) - { - SCM head = scm_last_pair (info.grob ()->get_property ("note-heads")); - if (scm_is_pair (head)) - script_->set_parent (unsmob_grob (scm_car (head)), X_AXIS); - } + Side_position_interface::add_support (line_spanner_, info.grob ()); + add_bound_item (line_spanner_, dynamic_cast (info.grob ())); + } - if (cresc_) + if (script_ && !script_->get_parent (X_AXIS)) + { + extract_grob_set (info.grob (), "note-heads", heads); + if (heads.size ()) { - if (!cresc_->get_bound (LEFT)) - { - cresc_->set_bound (LEFT, info.grob ()); - add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); - } + Grob *head = heads[0]; + script_->set_parent (head, X_AXIS); + Self_alignment_interface::set_center_parent (script_, X_AXIS); } + } - if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT)) + if (cresc_) + { + if (!cresc_->get_bound (LEFT)) { - finished_cresc_->set_bound (RIGHT, info.grob ()); + cresc_->set_bound (LEFT, info.grob ()); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); } } - - else if (Script_interface::has_interface (info.grob ()) && script_) - { - 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 ()); - } + if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT)) + finished_cresc_->set_bound (RIGHT, info.grob ()); } +ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); + ADD_TRANSLATOR (Dynamic_engraver, - /* descr */ + /* doc */ "This engraver creates hairpins, dynamic texts, and their vertical\n" "alignments. The symbols are collected onto a DynamicLineSpanner grob\n" "which takes care of vertical positioning. ", - /* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner", - /* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event", - /* acks */ "note-column-interface script-interface", - /* reads */ "", + /* create */ + "DynamicLineSpanner " + "DynamicText " + "Hairpin " + "TextSpanner ", + + /* read */ "", /* write */ "");