X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=a8bb1d2f899d06d0e721e3369d9fdb3cd9615ce9;hb=21085be16bbb0fc1914210b69476c4f0a3ec92ea;hp=c6252d5a46504d9195133d31eb4b5db757ccaf54;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index c6252d5a46..a8bb1d2f89 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ #include "warn.hh" #include "dimensions.hh" #include "hairpin.hh" -#include "musical-request.hh" +#include "event.hh" #include "paper-column.hh" #include "note-column.hh" #include "item.hh" @@ -23,7 +23,7 @@ /* TODO: - * direction of text-dynamic-request if not equal to direction of + * direction of text-dynamic-event if not equal to direction of line-spanner - TODO: this engraver is too complicated. We should split it into @@ -43,10 +43,10 @@ class Dynamic_engraver : public Engraver Spanner * finished_cresc_; Spanner * cresc_; - Text_script_req* script_req_; + Music* script_ev_; - Span_req * current_cresc_req_; - Drul_array accepted_spanreqs_drul_; + Music * current_cresc_ev_; + Drul_array accepted_spanreqs_drul_; Spanner* line_spanner_; Spanner* finished_line_spanner_; @@ -76,10 +76,10 @@ Dynamic_engraver::Dynamic_engraver () finished_cresc_ = 0; line_spanner_ = 0; finished_line_spanner_ = 0; - current_cresc_req_ = 0; + current_cresc_ev_ = 0; cresc_ =0; - script_req_ = 0; + script_ev_ = 0; accepted_spanreqs_drul_[START] = 0; accepted_spanreqs_drul_[STOP] = 0; } @@ -87,7 +87,7 @@ Dynamic_engraver::Dynamic_engraver () void Dynamic_engraver::start_translation_timestep () { - script_req_ = 0; + script_ev_ = 0; accepted_spanreqs_drul_[START] = 0; accepted_spanreqs_drul_[STOP] = 0; } @@ -95,36 +95,38 @@ Dynamic_engraver::start_translation_timestep () bool Dynamic_engraver::try_music (Music * m) { - if (dynamic_cast (m) - && m->get_mus_property ("text-type") == ly_symbol2scm ("dynamic")) + if (m->is_mus_type ("absolute-dynamic-event")) { - script_req_ = dynamic_cast (m); + /* + TODO: probably broken. + */ + script_ev_ = m; return true; } - else if (Span_req* s = dynamic_cast (m)) + else if (m->is_mus_type ("abort-event")) { - 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. + 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. */ + It will disappear by itself when stop_translation_timestep + () finds that there is nothing to support anymore. */ - if (cresc_) - cresc_->suicide (); - cresc_ = 0; - } - else if (t == "crescendo" - || t == "decrescendo") - { - accepted_spanreqs_drul_[s->get_span_dir ()] = s; - return true; - } + if (cresc_) + cresc_->suicide (); + cresc_ = 0; + } + else if (m->is_mus_type ("decrescendo-event") + || m->is_mus_type ("crescendo-event")) + { + Direction d = to_dir (m->get_mus_property ("span-direction")); + + accepted_spanreqs_drul_[d] = m; + if (current_cresc_ev_ && d == START) + accepted_spanreqs_drul_[STOP] = m; + return true; } return false; } @@ -132,23 +134,23 @@ Dynamic_engraver::try_music (Music * m) void Dynamic_engraver::process_music () { - if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_) + if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_ev_) { if (!line_spanner_) { line_spanner_ = new Spanner (get_property ("DynamicLineSpanner")); Music * rq = accepted_spanreqs_drul_[START]; - if (script_req_) - rq = script_req_ ; + if (script_ev_) + rq = script_ev_ ; announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL); } } /* - During a (de)crescendo, pending request will not be cleared, + During a (de)crescendo, pending event will not be cleared, and a line-spanner will always be created, as \< \! are already - two requests. + two events. Note: line-spanner must always have at least same duration as (de)crecsendo, b.o. line-breaking. @@ -160,34 +162,33 @@ Dynamic_engraver::process_music () maybe we should leave dynamic texts to the text-engraver and simply acknowledge them? */ - if (script_req_) + if (script_ev_) { script_ = new Item (get_property ("DynamicText")); script_->set_grob_property ("text", - script_req_->get_mus_property ("text")); + script_ev_->get_mus_property ("text")); + - if (Direction d = script_req_->get_direction ()) - Directional_element_interface::set (line_spanner_, d); + if (Direction d = to_dir (script_ev_->get_mus_property ("direction"))) + set_grob_direction (line_spanner_, d); Axis_group_interface::add_element (line_spanner_, script_); - announce_grob(script_, script_req_->self_scm()); + announce_grob(script_, script_ev_->self_scm()); } - if (accepted_spanreqs_drul_[STOP]) + 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_) - { - accepted_spanreqs_drul_[STOP]->origin ()->warning - (_ ("can't find start of (de)crescendo")); - accepted_spanreqs_drul_[STOP] = 0; - } - else + + + if (cresc_) { assert (!finished_cresc_ && cresc_); @@ -199,34 +200,50 @@ Dynamic_engraver::process_music () finished_cresc_ = cresc_; cresc_ = 0; - current_cresc_req_ = 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 (accepted_spanreqs_drul_[START]) { - if (current_cresc_req_) + if (current_cresc_ev_) { - String msg = current_cresc_req_->get_span_dir () == 1 + Direction sd = to_dir (current_cresc_ev_->get_mus_property ("span-direction")); + String msg = sd == 1 ? _ ("already have a crescendo") : _ ("already have a decrescendo"); accepted_spanreqs_drul_[START]->origin ()->warning (msg); - current_cresc_req_->origin ()->warning (_("Cresc started here")); + current_cresc_ev_->origin ()->warning (_("Cresc started here")); } else { - current_cresc_req_ = accepted_spanreqs_drul_[START]; + current_cresc_ev_ = accepted_spanreqs_drul_[START]; + + if (Direction d = to_dir (current_cresc_ev_->get_mus_property ("direction"))) + set_grob_direction (line_spanner_, d); /* TODO: Use symbols. */ - String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type")); + String start_type = + ly_symbol2string (current_cresc_ev_->get_mus_property ("name")); /* 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 (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin")) { @@ -236,6 +253,8 @@ Dynamic_engraver::process_music () ? BIGGER : SMALLER)); } + + /* This is a convenient (and legacy) interface to TextSpanners for use in (de)crescendi. @@ -244,7 +263,7 @@ Dynamic_engraver::process_music () else { cresc_ = new Spanner (get_property ("TextSpanner")); - cresc_->set_grob_property ("type", s); + cresc_->set_grob_property ("style", s); daddy_trans_->set_property ((start_type + "Spanner").to_str0 (), SCM_EOL); s = get_property ((start_type + "Text").to_str0 ()); @@ -254,7 +273,7 @@ Dynamic_engraver::process_music () if (gh_string_p (s) || gh_pair_p (s)) { cresc_->set_grob_property ("edge-text", - gh_cons (s, scm_makfrom0str (""))); + gh_cons (s, scm_makfrom0str (""))); daddy_trans_->set_property ((start_type + "Text").to_str0 (), SCM_EOL); } @@ -277,7 +296,7 @@ void Dynamic_engraver::stop_translation_timestep () { typeset_all (); - if (!current_cresc_req_) + if (!current_cresc_ev_) { finished_line_spanner_ = line_spanner_; line_spanner_ =0; @@ -304,7 +323,7 @@ Dynamic_engraver::finalize () cresc_ = 0; if (cresc_) { - current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo")); + current_cresc_ev_->origin ()->warning (_ ("unterminated (de)crescendo")); cresc_->suicide (); cresc_ = 0; } @@ -426,14 +445,14 @@ Dynamic_engraver::acknowledge_grob (Grob_info i) } } ENTER_DESCRIPTION(Dynamic_engraver, -/* descr */ " -This engraver creates hairpins, dynamic texts, and their vertical -alignments. The symbols are collected onto a DynamicLineSpanner grob -which takes care of vertical positioning. -", +/* 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 */ "general-music", +/* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event", /* acks */ "note-column-interface script-interface", /* reads */ "", /* write */ "");