X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdynamic-engraver.cc;h=23ae1bd02099a793af3910efdba5053dad7adcb6;hb=54404c570a48ddf9772c5ca64a154d0c0149e61e;hp=977053e621b825b3f3a05393e9feef630518ee4e;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 977053e621..23ae1bd020 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -1,281 +1,412 @@ /* - 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--2001 Han-Wen Nienhuys */ #include "debug.hh" -#include "crescendo.hh" +#include "dimensions.hh" +#include "hairpin.hh" #include "musical-request.hh" -#include "lookup.hh" -#include "paper-def.hh" #include "paper-column.hh" -#include "staff-symbol.hh" #include "note-column.hh" -#include "text-item.hh" +#include "item.hh" #include "side-position-interface.hh" #include "engraver.hh" -#include "stem.hh" -#include "note-head.hh" #include "group-interface.hh" +#include "directional-element-interface.hh" +#include "translator-group.hh" +#include "axis-group-interface.hh" + + +/* + TODO: + + * direction of text-dynamic-request 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_; + Item * script_p_; + Spanner * finished_cresc_p_; + Spanner * cresc_p_; - Span_req * cresc_req_l_; - Array dynamic_req_l_arr_; - void typeset_all (); -public: - VIRTUAL_COPY_CONS(Translator); - Dynamic_engraver(); + Text_script_req* script_req_l_; -protected: + Span_req * current_cresc_req_; + Drul_array accepted_spanreqs_drul_; - 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* line_spanner_; + Spanner* finished_line_spanner_; -void -Dynamic_engraver::announce_element (Score_element_info i) -{ - group (i.elem_l_, "interfaces").add_thing (ly_symbol2scm ("dynamic")); + Link_array pending_column_arr_; + Link_array pending_element_arr_; - Engraver::announce_element (i); -} + void typeset_all (); +public: + VIRTUAL_COPY_CONS (Translator); + Dynamic_engraver (); + +protected: + virtual void finalize (); + virtual void acknowledge_grob (Grob_info); + virtual bool try_music (Music *req_l); + virtual void stop_translation_timestep (); + virtual void process_music (); + virtual void start_translation_timestep (); +}; -Dynamic_engraver::Dynamic_engraver() -{ - do_post_move_processing(); - text_p_ =0; +ADD_THIS_TRANSLATOR (Dynamic_engraver); - to_end_cresc_p_ = cresc_p_ = 0; - cresc_req_l_ = 0; +Dynamic_engraver::Dynamic_engraver () +{ + 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::start_translation_timestep () { - 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 * m) +Dynamic_engraver::try_music (Music * m) { - Request * r = dynamic_cast (m); - - if(Text_script_req * d = dynamic_cast (r)) + if (dynamic_cast (m) + && m->get_mus_property ("text-type") == ly_symbol2scm ("dynamic")) { - if (d->style_str_ != "dynamic") - return false; + script_req_l_ = dynamic_cast (m); + return true; + } + else if (Span_req* s = dynamic_cast (m)) + { + String t = ly_scm2string (s->get_mus_property ("span-type")); + if (t== "abort") + { + accepted_spanreqs_drul_[LEFT] = 0; + accepted_spanreqs_drul_[RIGHT] = 0; + /* + Let's not kill the line spanner, since that would fuck up + earlier, not-to-be-terminated stuff. + + It will disappear by itself when stop_translation_timestep + () finds that there is nothing to support anymore. */ + + if (cresc_p_) + cresc_p_->suicide (); + cresc_p_ = 0; + } + else if (t == "crescendo" + || t == "decrescendo") + { + accepted_spanreqs_drul_[s->get_span_dir ()] = s; + return true; + } } - else if (Span_req * s = dynamic_cast (r)) + return false; +} + +void +Dynamic_engraver::process_music () +{ + if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_) { - if (s-> span_type_str_ != "crescendo" - && s->span_type_str_ != "decrescendo") - return false; + if (!line_spanner_) + { + line_spanner_ = new Spanner (get_property ("DynamicLineSpanner")); + + Side_position_interface::set_axis (line_spanner_, Y_AXIS); + Axis_group_interface::set_interface (line_spanner_); + Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS); + + Music * rq = accepted_spanreqs_drul_[START]; + if (script_req_l_) + rq = script_req_l_ ; + announce_grob (line_spanner_, rq); + + + } } - else - return false; - for (int i=0; i < dynamic_req_l_arr_.size (); i++) - if (r->equal_b (dynamic_req_l_arr_[i])) - return true; + /* + During a (de)crescendo, pending request will not be cleared, + and a line-spanner will always be created, as \< \! are already + two requests. + + Note: line-spanner must always have at least same duration + as (de)crecsendo, b.o. line-breaking. + */ + - dynamic_req_l_arr_.push (r); - return true; -} + /* + 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_grob_property ("text", + script_req_l_->get_mus_property ("text")); + + Side_position_interface::set_direction (script_p_, DOWN); -void -Dynamic_engraver::do_process_requests() -{ - Crescendo* new_cresc_p=0; + if (Direction d = script_req_l_->get_direction ()) + Directional_element_interface::set (line_spanner_, d); + + Axis_group_interface::add_element (line_spanner_, script_p_); - for (int i=0; i < dynamic_req_l_arr_.size(); i++) + announce_grob (script_p_, script_req_l_); + } + + if (accepted_spanreqs_drul_[STOP]) { - if (Text_script_req *absd = - dynamic_cast ( dynamic_req_l_arr_[i])) + /* + finish side position alignment if the (de)cresc ends here, and + there are no new dynamics. + */ + + if (!cresc_p_) { - if (text_p_) - { - dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused.")); - continue; - } - - 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); + accepted_spanreqs_drul_[STOP]->origin ()->warning + (_ ("can't find start of (de)crescendo")); + accepted_spanreqs_drul_[STOP] = 0; + } + else + { + assert (!finished_cresc_p_ && cresc_p_); + cresc_p_->set_bound (RIGHT, script_p_ + ? script_p_ + : unsmob_grob (get_property ("currentMusicalColumn"))); + add_bound_item (line_spanner_, cresc_p_->get_bound (RIGHT)); - if (absd->get_direction ()) - { - text_p_->set_elt_property ("direction", gh_int2scm (absd->get_direction ())); - } + 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_->get_span_dir () == 1 + ? _ ("already have a crescendo") + : _ ("already have a decrescendo")); + } + else + { + current_cresc_req_ = accepted_spanreqs_drul_[START]; /* - UGH UGH - */ - SCM prop = get_property ("dynamicDirection"); - if (!isdir_b (prop)) - { - prop = get_property ("verticalDirection"); - } + TODO: Use symbols. + */ - if (isdir_b (prop) && to_dir (prop)) - text_p_->set_elt_property ("direction", prop); + String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type")); - prop = get_property ("dynamicPadding"); - if (gh_number_p(prop)) + /* + ugh. Use push/pop? + */ + SCM s = get_property ((start_type + "Spanner").ch_C ()); + if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin")) { - text_p_->set_elt_property ("padding", prop); + cresc_p_ = new Spanner (get_property ("Hairpin")); + cresc_p_->set_grob_property ("grow-direction", + gh_int2scm ((start_type == "crescendo") + ? BIGGER : SMALLER)); + } - 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) + /* + This is a convenient (and legacy) interface to TextSpanners + for use in (de)crescendi. + Hmm. + */ + else { - if (!cresc_p_) - { - span_l->warning (_ ("Can't find (de)crescendo to end")); - } - else + cresc_p_ = new Spanner (get_property ("TextSpanner")); + cresc_p_->set_interface (ly_symbol2scm ("dynamic-interface")); + cresc_p_->set_grob_property ("type", s); + + daddy_trans_l_->set_property (start_type + + "Spanner", SCM_UNDEFINED); + s = get_property ((start_type + "Text").ch_C ()); + /* + FIXME: use markup_p () to check type. + */ + if (gh_string_p (s) || gh_pair_p (s)) { - assert (!to_end_cresc_p_); - to_end_cresc_p_ =cresc_p_; - - cresc_p_ = 0; + cresc_p_->set_grob_property ("edge-text", + gh_cons (s, ly_str02scm (""))); + daddy_trans_l_->set_property (start_type + "Text", + SCM_UNDEFINED); } } - else if (span_l->span_dir_ == START) - { - 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)); - } - } - } - if (new_cresc_p) - { - if (cresc_p_) - { - ::warning (_ ("Too many crescendi here")); + cresc_p_->set_bound (LEFT, script_p_ + ? script_p_ + : unsmob_grob (get_property ("currentMusicalColumn"))); - typeset_element (cresc_p_); + Axis_group_interface::add_element (line_spanner_, 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); + add_bound_item (line_spanner_, cresc_p_->get_bound (LEFT)); + + announce_grob (cresc_p_, accepted_spanreqs_drul_[START]); } } } void -Dynamic_engraver::do_pre_move_processing() +Dynamic_engraver::stop_translation_timestep () { typeset_all (); + if (script_req_l_ && !current_cresc_req_) + { + finished_line_spanner_ = line_spanner_; + line_spanner_ =0; + typeset_all (); + } } - - -ADD_THIS_TRANSLATOR(Dynamic_engraver); - void -Dynamic_engraver::do_removal_processing () +Dynamic_engraver::finalize () { + typeset_all (); + + if (line_spanner_ + && line_spanner_->immutable_property_alist_ == SCM_EOL) + line_spanner_ = 0; + if (line_spanner_) + { + finished_line_spanner_ = line_spanner_; + typeset_all (); + } + + if (cresc_p_ + && cresc_p_->immutable_property_alist_ == SCM_EOL) + cresc_p_ = 0; if (cresc_p_) { - typeset_element (cresc_p_ ); - cresc_req_l_->warning (_ ("unended crescendo")); - cresc_p_ =0; + current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo")); + cresc_p_->suicide (); + cresc_p_ = 0; } - typeset_all (); } - void Dynamic_engraver::typeset_all () { - if (to_end_cresc_p_) + /* + remove suicided spanners, + ugh: we'll need this for every spanner, beam, slur + Hmm, how to do this, cleanly? + Maybe just check at typeset_grob ()? + */ + if (finished_cresc_p_ + && finished_cresc_p_->immutable_property_alist_ == SCM_EOL) + finished_cresc_p_ = 0; + if (finished_line_spanner_ + && finished_line_spanner_->immutable_property_alist_ == SCM_EOL) + finished_line_spanner_ = 0; + + if (finished_cresc_p_) { - 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_p_->get_bound (RIGHT)) + { + finished_cresc_p_->set_bound (RIGHT, script_p_ + ? script_p_ + : unsmob_grob (get_property ("currentMusicalColumn"))); + if (finished_line_spanner_) + add_bound_item (finished_line_spanner_, + finished_cresc_p_->get_bound (RIGHT)); + } + typeset_grob (finished_cresc_p_); + finished_cresc_p_ =0; } - if (text_p_) + if (script_p_) { - typeset_element (text_p_); - text_p_ =0; + typeset_grob (script_p_); + script_p_ = 0; + } + if (finished_line_spanner_) + { + /* To make sure that this works */ + Side_position_interface::add_staff_support (finished_line_spanner_); + + /* + 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); + } + + typeset_grob (finished_line_spanner_); + finished_line_spanner_ = 0; } } void -Dynamic_engraver::typeset_element (Score_element * e) -{ - side_position(e).add_staff_support (); - Engraver::typeset_element (e); -} - -void -Dynamic_engraver::acknowledge_element (Score_element_info i) +Dynamic_engraver::acknowledge_grob (Grob_info i) { - if (dynamic_cast (i.elem_l_) - || dynamic_cast (i.elem_l_) - ) + if (Note_column::has_interface (i.elem_l_)) { - if (text_p_) - Side_position_interface (text_p_).add_support (i.elem_l_); - - if (to_end_cresc_p_) - Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_); - - if (cresc_p_) - Side_position_interface(cresc_p_).add_support (i.elem_l_); + if (line_spanner_ + /* Don't refill killed spanner */ + && line_spanner_->immutable_property_alist_ != SCM_EOL) + { + Side_position_interface::add_support (line_spanner_,i.elem_l_); + add_bound_item (line_spanner_,dynamic_cast (i.elem_l_)); + } } } -