X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=8d4cb2880f195d1cd0c819092023872ffb154fb5;hb=30bad63b52fd4a639d6e113d43a4a77514c5fba3;hp=9396c97f9a5498765a84f7019435a68328eca26d;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 9396c97f9a..8d4cb2880f 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--2006 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -12,14 +12,19 @@ #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 "warn.hh" +#include "translator.icc" + /* TODO: @@ -27,7 +32,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. @@ -48,24 +53,26 @@ class Dynamic_engraver : public Engraver Music *script_ev_; Music *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 (script); + DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_ACKNOWLEDGER (slur); 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 (); + virtual bool try_music (Music *event); + void stop_translation_timestep (); + void process_music (); }; - Dynamic_engraver::Dynamic_engraver () { script_ = 0; @@ -76,8 +83,8 @@ 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 @@ -96,9 +103,9 @@ Dynamic_engraver::try_music (Music *m) { Direction d = to_dir (m->get_property ("span-direction")); - accepted_spanreqs_drul_[d] = m; + accepted_spanevents_drul_[d] = m; if (current_cresc_ev_ && d == START) - accepted_spanreqs_drul_[STOP] = m; + accepted_spanevents_drul_[STOP] = m; return true; } return false; @@ -107,13 +114,12 @@ Dynamic_engraver::try_music (Music *m) 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]; - line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm (): SCM_EOL); - + Music *rq = accepted_spanevents_drul_[START]; + line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL); if (script_ev_) rq = script_ev_; } @@ -140,14 +146,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_; + Music *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 @@ -158,37 +166,37 @@ Dynamic_engraver::process_music () { assert (!finished_cresc_ && cresc_); - cresc_->set_bound (RIGHT, script_ - ? script_ - : unsmob_grob (get_property ("currentMusicalColumn"))); - add_bound_item (line_spanner_, cresc_->get_bound (RIGHT)); + if (script_) + { + 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 (_ ("can't 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"); + string msg = _ ("already have a decrescendo"); if (current_cresc_ev_->is_mus_type ("decrescendo-event")) msg = _ ("already have a crescendo"); - accepted_spanreqs_drul_[START]->origin ()->warning (msg); - current_cresc_ev_->origin ()->warning (_ ("Cresc started here")); + 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); @@ -197,7 +205,7 @@ Dynamic_engraver::process_music () TODO: Use symbols. */ - String start_type + string start_type = ly_symbol2string (current_cresc_ev_->get_property ("name")); /* @@ -208,10 +216,10 @@ Dynamic_engraver::process_music () else if (start_type == "CrescendoEvent") start_type = "crescendo"; - SCM s = get_property ((start_type + "Spanner").to_str0 ()); + 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_, @@ -223,9 +231,8 @@ Dynamic_engraver::process_music () finished_cresc_); } cresc_->set_property ("grow-direction", - scm_int2num ((start_type == "crescendo") - ? BIGGER : SMALLER)); - + scm_from_int ((start_type == "crescendo") + ? BIGGER : SMALLER)); } /* @@ -235,11 +242,11 @@ 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 ()); + + "Spanner").c_str (), SCM_EOL); + s = get_property ((start_type + "Text").c_str ()); /* FIXME: use get_markup () to check type. */ @@ -247,7 +254,7 @@ Dynamic_engraver::process_music () { cresc_->set_property ("edge-text", scm_cons (s, scm_makfrom0str (""))); - context ()->set_property ((start_type + "Text").to_str0 (), + context ()->set_property ((start_type + "Text").c_str (), SCM_EOL); } } @@ -266,14 +273,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"))); @@ -281,8 +289,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 @@ -364,60 +372,92 @@ Dynamic_engraver::typeset_all () } } + +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_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_)); - } + 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)) + if (script_ && !script_->get_parent (X_AXIS)) + { + extract_grob_set (info.grob (), "note-heads", heads); + if (heads.size ()) { - 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); + Grob *head = heads[0]; + script_->set_parent (head, X_AXIS); + Self_alignment_interface::set_center_parent (script_, X_AXIS); } + } - if (cresc_ && !cresc_->get_bound (LEFT)) + if (cresc_) + { + if (!cresc_->get_bound (LEFT)) { - cresc_->set_bound (LEFT, 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. + if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT)) + finished_cresc_->set_bound (RIGHT, info.grob ()); +} - 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_); - } +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, note_column); +ADD_ACKNOWLEDGER (Dynamic_engraver, slur); +ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); + 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", + /* accept */ "absolute-dynamic-event crescendo-event decrescendo-event", + /* read */ "", /* write */ "");