X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=0da8f321c6f9ba820212fcc40453a060d827e931;hb=8ecd09ad7514d57630fb611d38c161f3c3c708db;hp=fbfd95459d5ee0a3f6e137e910f73c41e168c6a2;hpb=e58bda01918afdf2436c8e4fc8c8354141fc04f8;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index fbfd95459d..0da8f321c6 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -1,193 +1,336 @@ /* - dynamic-reg.cc -- implement Dynamic_engraver + dynamic-engraver.cc -- implement Dynamic_engraver source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ #include "debug.hh" +#include "dimensions.hh" #include "crescendo.hh" -#include "dynamic-engraver.hh" #include "musical-request.hh" -#include "text-item.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "score-column.hh" -#include "staff-sym.hh" +#include "paper-column.hh" #include "note-column.hh" +#include "item.hh" +#include "side-position-interface.hh" +#include "engraver.hh" +#include "group-interface.hh" +#include "directional-element-interface.hh" +#include "translator-group.hh" +#include "axis-group-interface.hh" -Dynamic_engraver::Dynamic_engraver() + +/* + TODO: + + * direction of text-dynamic-request if not equal to direction of + line-spanner +*/ + +/** + print text & hairpin dynamics. + */ +class Dynamic_engraver : public Engraver +{ + Item * script_p_; + Spanner * finished_cresc_p_; + Spanner * cresc_p_; + + Dynamic_script_req* script_req_l_; + + Span_req * current_cresc_req_; + Drul_array accepted_spanreqs_drul_; + + Spanner* line_spanner_; + Spanner* finished_line_spanner_; + + Link_array pending_column_arr_; + Link_array pending_element_arr_; + + void typeset_all (); + +public: + VIRTUAL_COPY_CONS(Translator); + Dynamic_engraver (); + +protected: + virtual void do_removal_processing (); + virtual void acknowledge_element (Score_element_info); + virtual bool do_try_music (Music *req_l); + virtual void do_process_music (); + virtual void do_pre_move_processing (); + virtual void do_post_move_processing (); +}; + +ADD_THIS_TRANSLATOR (Dynamic_engraver); + + +Dynamic_engraver::Dynamic_engraver () { - do_post_move_processing(); - dir_ = CENTER; - dynamic_p_ =0; - to_end_cresc_p_ = cresc_p_ = 0; - cresc_req_l_ = 0; + script_p_ = 0; + finished_cresc_p_ = 0; + line_spanner_ = 0; + finished_line_spanner_ = 0; + current_cresc_req_ = 0; + cresc_p_ =0; + + script_req_l_ = 0; + accepted_spanreqs_drul_[START] = 0; + accepted_spanreqs_drul_[STOP] = 0; } void -Dynamic_engraver::do_post_move_processing() +Dynamic_engraver::do_post_move_processing () { - dynamic_req_l_arr_.clear(); + script_req_l_ = 0; + accepted_spanreqs_drul_[START] = 0; + accepted_spanreqs_drul_[STOP] = 0; } bool -Dynamic_engraver::do_try_music (Music * r) +Dynamic_engraver::do_try_music (Music * m) { - if(Dynamic_req * d = dynamic_cast (r)) + if (Dynamic_script_req* d = dynamic_cast (m)) { - for (int i=0; i < dynamic_req_l_arr_.size (); i++) - if (d->equal_b (dynamic_req_l_arr_[i])) - return true; - - dynamic_req_l_arr_.push (d); + script_req_l_ = d; return true; } + else if (Span_req* s = dynamic_cast (m)) + { + if (s->span_type_str_ == "abort") + { + accepted_spanreqs_drul_[LEFT] = 0; + accepted_spanreqs_drul_[RIGHT] = 0; + if (line_spanner_) + line_spanner_->suicide (); + line_spanner_ = 0; + if (cresc_p_) + cresc_p_->suicide (); + cresc_p_ = 0; + } + else if ((s->span_type_str_ == "crescendo" + || s->span_type_str_ == "decrescendo")) + { + accepted_spanreqs_drul_[s->span_dir_] = s; + return true; + } + } return false; } + void -Dynamic_engraver::do_process_requests() +Dynamic_engraver::do_process_music () { - Crescendo* new_cresc_p=0; - for (int i=0; i < dynamic_req_l_arr_.size(); i++) + if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_) + { - Dynamic_req *dreq_l = dynamic_req_l_arr_[i]; - if (Absolute_dynamic_req *absd = dynamic_cast (dreq_l)) + if (!line_spanner_) { + line_spanner_ = new Spanner (get_property ("DynamicLineSpanner")); - if (dynamic_p_) - { - dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused")); - continue; - } - - Text_def * td_p = new Text_def; - td_p->align_dir_ = CENTER; - String loud = absd->loudness_str (); - td_p->text_str_ = paper ()->lookup_l (0)->dynamic (loud).str_; // ugh - td_p->style_str_ = "dynamic"; + Side_position::set_axis (line_spanner_, Y_AXIS); + Axis_group_interface::set_interface (line_spanner_); + Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS); + + Request * rq = accepted_spanreqs_drul_[START]; + if (script_req_l_) rq = script_req_l_ ; + announce_element (line_spanner_, rq); + + + } + } + + /* + finish side position alignment if the (de)cresc ends here, and + there are no new dynamics. + + */ + else if (accepted_spanreqs_drul_[STOP] + && !accepted_spanreqs_drul_[START] && !script_req_l_) + { + finished_line_spanner_ = line_spanner_; + line_spanner_ = 0; + } + + /* + todo: resurrect dynamic{direction, padding,minimumspace} + */ + /* + During a (de)crescendo, pending request will not be cleared, + and a line-spanner will always be created, as \< \! are already + two requests. + + Maybe always creating a line-spanner for a (de)crescendo (see + below) is not a good idea: + + a\< b\p \!c + + the \p will be centred on the line-spanner, and thus clash + with the hairpin. When axis-group code is in place, the \p + should move below the hairpin, which is probably better? + + Urg, but 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_req_l_) + { + script_p_ = new Item (get_property ("DynamicText")); + script_p_->set_elt_property ("text", + script_req_l_->get_mus_property ("text")); + if (Direction d = script_req_l_->get_direction ()) + Directional_element_interface::set (line_spanner_, d); + + Axis_group_interface::add_element (line_spanner_, script_p_); + announce_element (script_p_, script_req_l_); + } + + if (accepted_spanreqs_drul_[STOP]) + { + if (!cresc_p_) + { + accepted_spanreqs_drul_[STOP]->origin ()->warning + (_ ("can't find start of (de)crescendo")); + } + else + { + assert (!finished_cresc_p_); + Score_element* cc = unsmob_element (get_property ("currentMusicalColumn")); + cresc_p_->set_bound (RIGHT, cc); - dynamic_p_ = new Text_item (td_p); - announce_element (Score_element_info (dynamic_p_, dreq_l)); + finished_cresc_p_ = cresc_p_; + cresc_p_ = 0; + current_cresc_req_ = 0; + } + } + + if (accepted_spanreqs_drul_[START]) + { + if (current_cresc_req_) + { + accepted_spanreqs_drul_[START]->origin ()->warning + (current_cresc_req_->span_dir_ == 1 + ? _ ("already have a crescendo") + : _ ("already have a decrescendo")); } - else if (Span_dynamic_req *span_l = dynamic_cast (dreq_l)) + else { - if (span_l->spantype == Span_req::STOP) + current_cresc_req_ = accepted_spanreqs_drul_[START]; + + /* + TODO: Use symbols. + */ + SCM s = get_property ((accepted_spanreqs_drul_[START]->span_type_str_ + "Spanner").ch_C()); + + if (!gh_string_p (s) || ly_scm2string (s) == "hairpin") { - if (!cresc_p_) - { - span_l->warning (_ ("can't find (de)crescendo to end")); - } - else + cresc_p_ = new Spanner (get_property ("Crescendo")); + cresc_p_->set_elt_property ("grow-direction", + gh_int2scm ((accepted_spanreqs_drul_[START]->span_type_str_ == "crescendo") + ? BIGGER : SMALLER)); + + } + /* + This is a convenient (and legacy) interface to TextSpanners + for use in (de)crescendi. + Hmm. + */ + else + { + cresc_p_ = new Spanner (get_property ("TextSpanner")); + cresc_p_->set_elt_property ("type", s); + daddy_trans_l_->set_property (accepted_spanreqs_drul_[START]->span_type_str_ + + "Spanner", SCM_UNDEFINED); + s = get_property ((accepted_spanreqs_drul_[START]->span_type_str_ + "Text").ch_C()); + if (gh_string_p (s)) { - assert (!to_end_cresc_p_); - to_end_cresc_p_ =cresc_p_; - cresc_p_ = 0; + cresc_p_->set_elt_property ("edge-text", + gh_cons (s, ly_str02scm (""))); + daddy_trans_l_->set_property (accepted_spanreqs_drul_[START]->span_type_str_ + + "Text", SCM_UNDEFINED); } } - else if (span_l->spantype == Span_req::START) + + Score_element *cc = unsmob_element (get_property ("currentMusicalColumn")); + cresc_p_->set_bound (LEFT, cc); + + if (script_p_) { - cresc_req_l_ = span_l; - assert (!new_cresc_p); - new_cresc_p = new Crescendo; - new_cresc_p->grow_dir_ = span_l->dynamic_dir_; - announce_element (Score_element_info (new_cresc_p, span_l)); + Side_position::set_direction (script_p_, LEFT); + Side_position::set_axis (script_p_, X_AXIS); + Side_position::add_support (script_p_, cresc_p_); } - } - } - 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_l ()); - if (dynamic_p_) - { - cresc_p_->dyn_b_drul_[LEFT] = true; + Axis_group_interface::add_element (line_spanner_, cresc_p_); + announce_element (cresc_p_, accepted_spanreqs_drul_[START]); } } } void -Dynamic_engraver::do_pre_move_processing() +Dynamic_engraver::do_pre_move_processing () { - Staff_symbol* s_l = get_staff_info().staff_sym_l_; - if (to_end_cresc_p_) + typeset_all (); +} + +void +Dynamic_engraver::do_removal_processing () +{ + typeset_all (); + if (line_spanner_) { - if (dynamic_p_) - to_end_cresc_p_->dyn_b_drul_[RIGHT]=true; - - - Scalar prop = get_property ("dynamicdir"); - if (prop.isnum_b ()) - { - to_end_cresc_p_->dir_ = (Direction) (int) prop; - } - to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_l ()); - to_end_cresc_p_->add_support (s_l); - typeset_element (to_end_cresc_p_); - to_end_cresc_p_ = 0; + finished_line_spanner_ = line_spanner_; + typeset_all (); } - if (dynamic_p_) + + if (cresc_p_) { - Scalar prop = get_property ("dynamicdir"); - if (prop.isnum_b ()) - { - dynamic_p_->dir_ = (Direction) (int) prop; - } - - dynamic_p_->add_support (s_l); - typeset_element (dynamic_p_); - dynamic_p_ = 0; + current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo")); + cresc_p_->suicide (); + cresc_p_ = 0; } } - - -ADD_THIS_TRANSLATOR(Dynamic_engraver); - void -Dynamic_engraver::do_removal_processing () -{ - if (cresc_p_) +Dynamic_engraver::typeset_all () +{ + if (finished_cresc_p_) { - typeset_element (cresc_p_ ); - - cresc_req_l_->warning (_ ("unended crescendo")); - cresc_p_ =0; + typeset_element (finished_cresc_p_); + finished_cresc_p_ =0; } - if (to_end_cresc_p_) + + if (script_p_) { - typeset_element (to_end_cresc_p_); - to_end_cresc_p_ =0; + typeset_element (script_p_); + script_p_ = 0; } - if (dynamic_p_) + if (finished_line_spanner_) { - typeset_element (dynamic_p_); - dynamic_p_ =0; + Side_position::add_staff_support (finished_line_spanner_); + extend_spanner_over_elements (finished_line_spanner_); + typeset_element (finished_line_spanner_); + finished_line_spanner_ = 0; } } void Dynamic_engraver::acknowledge_element (Score_element_info i) { - if (dynamic_cast (i.elem_l_)) + if (Note_column::has_interface (i.elem_l_)) { - if (dynamic_p_) - dynamic_p_->add_support (i.elem_l_); - - if (to_end_cresc_p_) - to_end_cresc_p_->add_support (i.elem_l_); - - if (cresc_p_) - cresc_p_->add_support (i.elem_l_); + if (line_spanner_) + { + Side_position::add_support (line_spanner_,i.elem_l_); + add_bound_item (line_spanner_,dynamic_cast(i.elem_l_)); + } } }