X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=dd7e8ad4fbf5c4254c860a627bf7d6718c5d6e55;hb=84aa0dad3e436409f734cca40f475d3808cfdfeb;hp=7f519db38b220b235587685b039b640771a16ee7;hpb=cc288cebe296287d2f99c517869f96c646677f37;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 7f519db38b..dd7e8ad4fb 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -1,281 +1,429 @@ /* - dynamic-reg.cc -- implement Dynamic_engraver + dynamic-engraver.cc -- implement Dynamic_engraver source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "debug.hh" -#include "crescendo.hh" -#include "musical-request.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "paper-column.hh" -#include "staff-symbol.hh" + +#include "axis-group-interface.hh" +#include "context.hh" +#include "dimensions.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" +#include "hairpin.hh" +#include "interval.hh" #include "note-column.hh" -#include "text-item.hh" +#include "paper-column.hh" +#include "script-interface.hh" #include "side-position-interface.hh" -#include "engraver.hh" -#include "stem.hh" -#include "note-head.hh" -#include "group-interface.hh" +#include "staff-symbol-referencer.hh" +#include "warn.hh" + +/* + TODO: + + * direction of text-dynamic-event if not equal to direction of + line-spanner + + - TODO: this engraver is too complicated. We should split it into + the handling of the basic grobs and the linespanner + + - TODO: the line-spanner is not killed after the (de)crescs are + finished. +*/ /** print text & hairpin dynamics. - */ +*/ class Dynamic_engraver : public Engraver { - Text_item * text_p_; - Crescendo * to_end_cresc_p_; - Crescendo * cresc_p_; - - Span_req * cresc_req_l_; - Array dynamic_req_l_arr_; - void typeset_all (); -public: - VIRTUAL_COPY_CONS(Translator); - Dynamic_engraver(); - -protected: + Item *script_; + Spanner *line_spanner_; + Spanner *cresc_; - void announce_element (Score_element_info); - - virtual void do_removal_processing (); - virtual void acknowledge_element (Score_element_info); - virtual bool do_try_music (Music *req_l); - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void typeset_element (Score_element*); -}; + Spanner *finished_line_spanner_; + Spanner *finished_cresc_; -void -Dynamic_engraver::announce_element (Score_element_info i) -{ - group (i.elem_l_, "interfaces").add_thing (ly_symbol2scm ("dynamic")); - - Engraver::announce_element (i); -} + Music *script_ev_; + Music *current_cresc_ev_; + Drul_array accepted_spanreqs_drul_; -Dynamic_engraver::Dynamic_engraver() -{ - do_post_move_processing(); - text_p_ =0; + Link_array pending_columns_; + Link_array pending_elements_; - to_end_cresc_p_ = cresc_p_ = 0; + void typeset_all (); - cresc_req_l_ = 0; -} + TRANSLATOR_DECLARATIONS (Dynamic_engraver); -void -Dynamic_engraver::do_post_move_processing() +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 (); +}; + +Dynamic_engraver::Dynamic_engraver () { - dynamic_req_l_arr_.clear(); + script_ = 0; + finished_cresc_ = 0; + line_spanner_ = 0; + finished_line_spanner_ = 0; + current_cresc_ev_ = 0; + cresc_ = 0; + + script_ev_ = 0; + accepted_spanreqs_drul_[START] = 0; + accepted_spanreqs_drul_[STOP] = 0; } bool -Dynamic_engraver::do_try_music (Music * m) +Dynamic_engraver::try_music (Music *m) { - Request * r = dynamic_cast (m); - - if(Text_script_req * d = dynamic_cast (r)) + if (m->is_mus_type ("absolute-dynamic-event")) { - if (d->style_str_ != "dynamic") - return false; + /* + TODO: probably broken. + */ + script_ev_ = m; + return true; } - else if (Span_req * s = dynamic_cast (r)) + else if (m->is_mus_type ("decrescendo-event") + || m->is_mus_type ("crescendo-event")) { - if (s-> span_type_str_ != "crescendo" - && s->span_type_str_ != "decrescendo") - return false; - } - else - return false; - - for (int i=0; i < dynamic_req_l_arr_.size (); i++) - if (r->equal_b (dynamic_req_l_arr_[i])) + Direction d = to_dir (m->get_property ("span-direction")); + + accepted_spanreqs_drul_[d] = m; + if (current_cresc_ev_ && d == START) + accepted_spanreqs_drul_[STOP] = m; return true; - - dynamic_req_l_arr_.push (r); - return true; + } + return false; } - void -Dynamic_engraver::do_process_requests() +Dynamic_engraver::process_music () { - Crescendo* new_cresc_p=0; + if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_ev_) + { + if (!line_spanner_) + { + Music *rq = accepted_spanreqs_drul_[START]; + line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL); - for (int i=0; i < dynamic_req_l_arr_.size(); i++) + if (script_ev_) + rq = script_ev_; + } + } + + /* + During a (de)crescendo, pending event will not be cleared, + and a line-spanner will always be created, as \< \! are already + two events. + + Note: line-spanner must always have at least same duration + as (de)crecsendo, b.o. line-breaking. + */ + + /* + maybe we should leave dynamic texts to the text-engraver and + simply acknowledge them? + */ + if (script_ev_) { - if (Text_script_req *absd = - dynamic_cast ( dynamic_req_l_arr_[i])) + script_ = make_item ("DynamicText", script_ev_->self_scm ()); + script_->set_property ("text", + script_ev_->get_property ("text")); + + if (Direction d = to_dir (script_ev_->get_property ("direction"))) + set_grob_direction (line_spanner_, d); + + Axis_group_interface::add_element (line_spanner_, script_); + } + + Music *stop_ev = accepted_spanreqs_drul_ [STOP] + ? accepted_spanreqs_drul_[STOP] : script_ev_; + + if (accepted_spanreqs_drul_[STOP] || script_ev_) + { + /* + finish side position alignment if the (de)cresc ends here, and + there are no new dynamics. + */ + + if (cresc_) { - if (text_p_) + assert (!finished_cresc_ && cresc_); + + if (script_) { - dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused.")); - continue; + cresc_->set_bound (RIGHT, script_); + add_bound_item (line_spanner_, script_); } - String loud = absd->text_str_; - - text_p_ = new Text_item; - text_p_->set_elt_property ("text", - ly_str02scm (loud.ch_C())); - text_p_->set_elt_property ("style", gh_str02scm ("dynamic")); - text_p_->set_elt_property ("script-priority", - gh_int2scm (100)); - - Side_position_interface (text_p_).set_axis (Y_AXIS); + finished_cresc_ = cresc_; + cresc_ = 0; + current_cresc_ev_ = 0; + } + else if (accepted_spanreqs_drul_[STOP]) + { + accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + stop_ev = 0; + } + } - - if (absd->get_direction ()) - { - text_p_->set_elt_property ("direction", gh_int2scm (absd->get_direction ())); - } + if (accepted_spanreqs_drul_[START]) + { + if (current_cresc_ev_) + { + 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 starts here")); + } + else + { + current_cresc_ev_ = accepted_spanreqs_drul_[START]; + if (Direction d = to_dir (current_cresc_ev_->get_property ("direction"))) + set_grob_direction (line_spanner_, d); /* - UGH UGH - */ - SCM prop = get_property ("dynamicDirection", 0); - if (!isdir_b (prop)) - { - prop = get_property ("verticalDirection", 0); - } + TODO: Use symbols. + */ - if (isdir_b (prop) && to_dir (prop)) - text_p_->set_elt_property ("direction", prop); + String start_type + = ly_symbol2string (current_cresc_ev_->get_property ("name")); - prop = get_property ("dynamicPadding", 0); - if (gh_number_p(prop)) - { - text_p_->set_elt_property ("padding", prop); - } - announce_element (Score_element_info (text_p_, absd)); - } - else if (Span_req *span_l - = dynamic_cast (dynamic_req_l_arr_[i])) - { - if (span_l->span_dir_ == STOP) + /* + ugh. Use push/pop? + */ + if (start_type == "DecrescendoEvent") + start_type = "decrescendo"; + else if (start_type == "CrescendoEvent") + start_type = "crescendo"; + + SCM s = get_property ((start_type + "Spanner").to_str0 ()); + if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin")) { - if (!cresc_p_) + cresc_ = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ()); + if (finished_cresc_) { - span_l->warning (_ ("Can't find (de)crescendo to end")); + Pointer_group_interface::add_grob (finished_cresc_, + ly_symbol2scm ("adjacent-hairpins"), + cresc_); + + Pointer_group_interface::add_grob (cresc_, + ly_symbol2scm ("adjacent-hairpins"), + finished_cresc_); } - else + cresc_->set_property ("grow-direction", + scm_int2num ((start_type == "crescendo") + ? BIGGER : SMALLER)); + } + + /* + This is a convenient (and legacy) interface to TextSpanners + for use in (de)crescendi. + Hmm. + */ + else + { + cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanreqs_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)) { - assert (!to_end_cresc_p_); - to_end_cresc_p_ =cresc_p_; - - cresc_p_ = 0; + cresc_->set_property ("edge-text", + scm_cons (s, scm_makfrom0str (""))); + context ()->set_property ((start_type + "Text").to_str0 (), + SCM_EOL); } } - else if (span_l->span_dir_ == START) + + if (script_) { - cresc_req_l_ = span_l; - assert (!new_cresc_p); - new_cresc_p = new Crescendo; - new_cresc_p - ->set_elt_property ("grow-direction", - gh_int2scm ((span_l->span_type_str_ == "crescendo") ? BIGGER : SMALLER)); - - side_position (new_cresc_p).set_axis (Y_AXIS); - announce_element (Score_element_info (new_cresc_p, span_l)); + cresc_->set_bound (LEFT, script_); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); } - } - } - - if (new_cresc_p) - { - if (cresc_p_) - { - ::warning (_ ("Too many crescendi here")); - - typeset_element (cresc_p_); - cresc_p_ = 0; - } - - cresc_p_ = new_cresc_p; - cresc_p_->set_bounds(LEFT,get_staff_info().musical_pcol_l ()); - - if (text_p_) - { - index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"), - LEFT, SCM_BOOL_T); - if (to_end_cresc_p_) - index_set_cell (to_end_cresc_p_->get_elt_property ("dynamic-drul"), - RIGHT, SCM_BOOL_T); + Axis_group_interface::add_element (line_spanner_, cresc_); } } } void -Dynamic_engraver::do_pre_move_processing() +Dynamic_engraver::stop_translation_timestep () { typeset_all (); -} - + if (!current_cresc_ev_) + { + finished_line_spanner_ = line_spanner_; + line_spanner_ = 0; + typeset_all (); + } + if (cresc_ && !cresc_->get_bound (LEFT)) + { + cresc_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn"))); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); + } -ADD_THIS_TRANSLATOR(Dynamic_engraver); + script_ev_ = 0; + accepted_spanreqs_drul_[START] = 0; + accepted_spanreqs_drul_[STOP] = 0; +} void -Dynamic_engraver::do_removal_processing () +Dynamic_engraver::finalize () { - if (cresc_p_) + typeset_all (); + + if (line_spanner_ + && !line_spanner_->is_live ()) + line_spanner_ = 0; + if (line_spanner_) { - typeset_element (cresc_p_ ); - cresc_req_l_->warning (_ ("unended crescendo")); - cresc_p_ =0; + finished_line_spanner_ = line_spanner_; + typeset_all (); } - typeset_all (); -} + if (cresc_ + && !cresc_->is_live ()) + cresc_ = 0; + if (cresc_) + { + current_cresc_ev_->origin ()->warning (_ ("unterminated (de)crescendo")); + cresc_->suicide (); + cresc_ = 0; + } +} void Dynamic_engraver::typeset_all () -{ - if (to_end_cresc_p_) +{ + if (finished_cresc_) { - to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_pcol_l ()); - typeset_element (to_end_cresc_p_); - - to_end_cresc_p_ =0; + if (!finished_cresc_->get_bound (RIGHT)) + { + finished_cresc_->set_bound (RIGHT, script_ + ? script_ + : unsmob_grob (get_property ("currentMusicalColumn"))); + if (finished_line_spanner_) + add_bound_item (finished_line_spanner_, + finished_cresc_->get_bound (RIGHT)); + } + finished_cresc_ = 0; } - - if (text_p_) + + script_ = 0; + if (finished_line_spanner_) { - typeset_element (text_p_); - text_p_ =0; + /* + We used to have + + extend-spanner-over-elements (finished_line_spanner_); + + but this is rather kludgy, since finished_line_spanner_ + typically has a staff-symbol field set , extending it over the + entire staff. + + */ + + Grob *l = finished_line_spanner_->get_bound (LEFT); + Grob *r = finished_line_spanner_->get_bound (RIGHT); + if (!r && l) + finished_line_spanner_->set_bound (RIGHT, l); + else if (!l && r) + finished_line_spanner_->set_bound (LEFT, r); + else if (!r && !l) + { + /* + This is a isolated dynamic apparently, and does not even have + any interesting support item. + */ + Grob *cc = unsmob_grob (get_property ("currentMusicalColumn")); + Item *ci = dynamic_cast (cc); + finished_line_spanner_->set_bound (RIGHT, ci); + finished_line_spanner_->set_bound (LEFT, ci); + } + + finished_line_spanner_ = 0; } } void -Dynamic_engraver::typeset_element (Score_element * e) +Dynamic_engraver::acknowledge_grob (Grob_info info) { - side_position(e).add_staff_support (); - Engraver::typeset_element (e); -} + if (!line_spanner_) + return; -void -Dynamic_engraver::acknowledge_element (Score_element_info i) -{ - if (dynamic_cast (i.elem_l_) - || dynamic_cast (i.elem_l_) - ) + if (Note_column::has_interface (info.grob_)) + { + 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); + } + + if (cresc_) + { + if (!cresc_->get_bound (LEFT)) + { + cresc_->set_bound (LEFT, info.grob_); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); + } + } + + if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT)) + { + finished_cresc_->set_bound (RIGHT, info.grob_); + } + } + + else if (Script_interface::has_interface (info.grob_) && script_) { - if (text_p_) - Side_position_interface (text_p_).add_support (i.elem_l_); + SCM p = info.grob_->get_property ("script-priority"); - if (to_end_cresc_p_) - Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_); + /* + UGH. - if (cresc_p_) - Side_position_interface(cresc_p_).add_support (i.elem_l_); + 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_TRANSLATOR (Dynamic_engraver, + /* descr */ + "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 */ "", + /* write */ "");