X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=a021d21fdfb36324b1295ddb34272cd040be9d16;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=4a9e01eab7daa9b9285a2b336f70b31d478b9898;hpb=7a558267cfbc5a90bf87a80ce9bcfed087692064;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 4a9e01eab7..a021d21fdf 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,11 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" #include "dimensions.hh" -#include "crescendo.hh" +#include "hairpin.hh" #include "musical-request.hh" #include "paper-column.hh" #include "note-column.hh" @@ -25,6 +25,13 @@ * 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. + */ /** @@ -45,24 +52,22 @@ class Dynamic_engraver : public Engraver Spanner* finished_line_spanner_; Link_array pending_column_arr_; - Link_array pending_element_arr_; + Link_array pending_element_arr_; void typeset_all (); -public: - VIRTUAL_COPY_CONS(Translator); - Dynamic_engraver (); +TRANSLATOR_DECLARATIONS(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 (); + 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 (); }; -ADD_THIS_TRANSLATOR (Dynamic_engraver); + Dynamic_engraver::Dynamic_engraver () @@ -80,7 +85,7 @@ Dynamic_engraver::Dynamic_engraver () } void -Dynamic_engraver::do_post_move_processing () +Dynamic_engraver::start_translation_timestep () { script_req_l_ = 0; accepted_spanreqs_drul_[START] = 0; @@ -88,7 +93,7 @@ Dynamic_engraver::do_post_move_processing () } bool -Dynamic_engraver::do_try_music (Music * m) +Dynamic_engraver::try_music (Music * m) { if (dynamic_cast (m) && m->get_mus_property ("text-type") == ly_symbol2scm ("dynamic")) @@ -98,21 +103,26 @@ Dynamic_engraver::do_try_music (Music * m) } else if (Span_req* s = dynamic_cast (m)) { - if (s->span_type_str_ == "abort") + String t = ly_scm2string (s->get_mus_property ("span-type")); + if (t== "abort") { accepted_spanreqs_drul_[LEFT] = 0; accepted_spanreqs_drul_[RIGHT] = 0; - if (line_spanner_) - line_spanner_->suicide (); - line_spanner_ = 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 ((s->span_type_str_ == "crescendo" - || s->span_type_str_ == "decrescendo")) + else if (t == "crescendo" + || t == "decrescendo") { - accepted_spanreqs_drul_[s->get_span_dir()] = s; + accepted_spanreqs_drul_[s->get_span_dir ()] = s; return true; } } @@ -120,58 +130,33 @@ Dynamic_engraver::do_try_music (Music * m) } void -Dynamic_engraver::do_process_music () +Dynamic_engraver::process_music () { if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_) - { if (!line_spanner_) { line_spanner_ = new Spanner (get_property ("DynamicLineSpanner")); - Side_position::set_axis (line_spanner_, Y_AXIS); + 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_element (line_spanner_, rq); + announce_grob (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 + Note: line-spanner must always have at least same duration as (de)crecsendo, b.o. line-breaking. */ @@ -184,42 +169,54 @@ Dynamic_engraver::do_process_music () if (script_req_l_) { script_p_ = new Item (get_property ("DynamicText")); - script_p_->set_elt_property ("text", + script_p_->set_grob_property ("text", script_req_l_->get_mus_property ("text")); + + Side_position_interface::set_direction (script_p_, DOWN); + 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_); + announce_grob (script_p_, script_req_l_); } if (accepted_spanreqs_drul_[STOP]) { + /* + finish side position alignment if the (de)cresc ends here, and + there are no new dynamics. + */ + if (!cresc_p_) { accepted_spanreqs_drul_[STOP]->origin ()->warning - (_ ("can't find start of (de)crescendo")); + (_ ("can't find start of (de)crescendo")); + accepted_spanreqs_drul_[STOP] = 0; } else { - assert (!finished_cresc_p_); - Score_element* cc = unsmob_element (get_property ("currentMusicalColumn")); + 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)); - cresc_p_->set_bound (RIGHT, cc); 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 + (current_cresc_req_->get_span_dir () == 1 ? _ ("already have a crescendo") : _ ("already have a decrescendo")); } @@ -229,70 +226,90 @@ Dynamic_engraver::do_process_music () /* 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") + String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type")); + + /* + ugh. Use push/pop? + */ + SCM s = get_property ((start_type + "Spanner").ch_C ()); + if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin")) { - 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)); + cresc_p_ = new Spanner (get_property ("Hairpin")); + cresc_p_->set_grob_property ("grow-direction", + gh_int2scm ((start_type == "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)) + cresc_p_->set_interface (ly_symbol2scm ("dynamic-interface")); + cresc_p_->set_grob_property ("type", s); + + daddy_trans_l_->set_property ((start_type + + "Spanner").ch_C(), 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)) { - 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); + cresc_p_->set_grob_property ("edge-text", + gh_cons (s, ly_str02scm (""))); + daddy_trans_l_->set_property ((start_type + "Text").ch_C(), + SCM_UNDEFINED); } } - - Score_element *cc = unsmob_element (get_property ("currentMusicalColumn")); - cresc_p_->set_bound (LEFT, cc); - if (script_p_) - { - Side_position::set_direction (script_p_, LEFT); - Side_position::set_axis (script_p_, X_AXIS); - Side_position::add_support (script_p_, cresc_p_); - } + cresc_p_->set_bound (LEFT, script_p_ + ? script_p_ + : unsmob_grob (get_property ("currentMusicalColumn"))); Axis_group_interface::add_element (line_spanner_, cresc_p_); - announce_element (cresc_p_, accepted_spanreqs_drul_[START]); + + 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 (); + } } 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_) { current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo")); @@ -304,35 +321,96 @@ Dynamic_engraver::do_removal_processing () void Dynamic_engraver::typeset_all () { + /* + 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_) { - typeset_element (finished_cresc_p_); + 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 (script_p_) { - typeset_element (script_p_); + typeset_grob (script_p_); script_p_ = 0; } if (finished_line_spanner_) { - Side_position::add_staff_support (finished_line_spanner_); - extend_spanner_over_elements (finished_line_spanner_); - typeset_element (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::acknowledge_element (Score_element_info i) +Dynamic_engraver::acknowledge_grob (Grob_info i) { - if (Note_column::has_interface (i.elem_l_)) + if (Note_column::has_interface (i.grob_l_)) { - if (line_spanner_) + if (line_spanner_ + /* Don't refill killed spanner */ + && line_spanner_->immutable_property_alist_ != SCM_EOL) { - Side_position::add_support (line_spanner_,i.elem_l_); - add_bound_item (line_spanner_,dynamic_cast(i.elem_l_)); + Side_position_interface::add_support (line_spanner_,i.grob_l_); + add_bound_item (line_spanner_,dynamic_cast (i.grob_l_)); } } } +ENTER_DESCRIPTION(Dynamic_engraver, +/* descr */ "", +/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner", +/* acks */ "note-column-interface", +/* reads */ "", +/* write */ "");