X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=dd7e8ad4fbf5c4254c860a627bf7d6718c5d6e55;hb=84aa0dad3e436409f734cca40f475d3808cfdfeb;hp=bb7e3a6cb5e5247bbf4f91ca0ee9ac6c33248555;hpb=947454c5cc430a9627262de4f25274a64789d3c2;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index bb7e3a6cb5..dd7e8ad4fb 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,22 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "warn.hh" + +#include "axis-group-interface.hh" +#include "context.hh" #include "dimensions.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" #include "hairpin.hh" -#include "event.hh" -#include "paper-column.hh" +#include "interval.hh" #include "note-column.hh" -#include "item.hh" +#include "paper-column.hh" +#include "script-interface.hh" #include "side-position-interface.hh" -#include "engraver.hh" -#include "group-interface.hh" -#include "directional-element-interface.hh" -#include "context.hh" -#include "axis-group-interface.hh" -#include "script.hh" +#include "staff-symbol-referencer.hh" +#include "warn.hh" /* TODO: @@ -31,44 +31,40 @@ - TODO: the line-spanner is not killed after the (de)crescs are finished. - */ /** print text & hairpin dynamics. - */ +*/ class Dynamic_engraver : public Engraver { - Item * script_; - Spanner * finished_cresc_; - Spanner * cresc_; + Item *script_; + Spanner *line_spanner_; + Spanner *cresc_; - Music* script_ev_; - - Music * current_cresc_ev_; - Drul_array accepted_spanreqs_drul_; + Spanner *finished_line_spanner_; + Spanner *finished_cresc_; + + Music *script_ev_; + Music *current_cresc_ev_; - Spanner* line_spanner_; - Spanner* finished_line_spanner_; + Drul_array accepted_spanreqs_drul_; Link_array pending_columns_; Link_array pending_elements_; - + void typeset_all (); -TRANSLATOR_DECLARATIONS (Dynamic_engraver ); - + TRANSLATOR_DECLARATIONS (Dynamic_engraver); + 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 (); + virtual void process_music (); }; - - - Dynamic_engraver::Dynamic_engraver () { script_ = 0; @@ -76,7 +72,7 @@ Dynamic_engraver::Dynamic_engraver () line_spanner_ = 0; finished_line_spanner_ = 0; current_cresc_ev_ = 0; - cresc_ =0; + cresc_ = 0; script_ev_ = 0; accepted_spanreqs_drul_[START] = 0; @@ -84,7 +80,7 @@ Dynamic_engraver::Dynamic_engraver () } bool -Dynamic_engraver::try_music (Music * m) +Dynamic_engraver::try_music (Music *m) { if (m->is_mus_type ("absolute-dynamic-event")) { @@ -114,15 +110,14 @@ Dynamic_engraver::process_music () { if (!line_spanner_) { - line_spanner_ = make_spanner ("DynamicLineSpanner"); + Music *rq = accepted_spanreqs_drul_[START]; + line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL); - Music * rq = accepted_spanreqs_drul_[START]; if (script_ev_) - rq = script_ev_ ; - announce_grob (line_spanner_, rq ? rq->self_scm (): SCM_EOL); + rq = script_ev_; } } - + /* During a (de)crescendo, pending event will not be cleared, and a line-spanner will always be created, as \< \! are already @@ -132,60 +127,53 @@ Dynamic_engraver::process_music () as (de)crecsendo, b.o. line-breaking. */ - - /* maybe we should leave dynamic texts to the text-engraver and simply acknowledge them? */ if (script_ev_) { - script_ = make_item ("DynamicText"); + script_ = make_item ("DynamicText", script_ev_->self_scm ()); script_->set_property ("text", - script_ev_->get_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_); - - announce_grob (script_, script_ev_->self_scm ()); } - Music *stop_ev = accepted_spanreqs_drul_ [STOP] ? - accepted_spanreqs_drul_[STOP] : script_ev_; + 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_) { assert (!finished_cresc_ && cresc_); - cresc_->set_bound (RIGHT, script_ - ? script_ - : unsmob_grob (get_property ("currentMusicalColumn"))); - add_bound_item (line_spanner_, cresc_->get_bound (RIGHT)); + if (script_) + { + cresc_->set_bound (RIGHT, script_); + add_bound_item (line_spanner_, script_); + } - finished_cresc_ = cresc_; cresc_ = 0; current_cresc_ev_ = 0; } - else if (accepted_spanreqs_drul_[STOP] ) + 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_ev_) @@ -195,7 +183,7 @@ Dynamic_engraver::process_music () msg = _ ("already have a crescendo"); accepted_spanreqs_drul_[START]->origin ()->warning (msg); - current_cresc_ev_->origin ()->warning (_("Cresc started here")); + current_cresc_ev_->origin ()->warning (_ ("cresc starts here")); } else { @@ -208,8 +196,8 @@ Dynamic_engraver::process_music () TODO: Use symbols. */ - String start_type = - ly_symbol2string (current_cresc_ev_->get_property ("name")); + String start_type + = ly_symbol2string (current_cresc_ev_->get_property ("name")); /* ugh. Use push/pop? @@ -218,18 +206,26 @@ Dynamic_engraver::process_music () 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")) + if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin")) { - cresc_ = make_spanner ("Hairpin"); + cresc_ = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ()); + if (finished_cresc_) + { + Pointer_group_interface::add_grob (finished_cresc_, + ly_symbol2scm ("adjacent-hairpins"), + cresc_); + + Pointer_group_interface::add_grob (cresc_, + ly_symbol2scm ("adjacent-hairpins"), + finished_cresc_); + } cresc_->set_property ("grow-direction", - gh_int2scm ((start_type == "crescendo") - ? BIGGER : SMALLER)); - + scm_int2num ((start_type == "crescendo") + ? BIGGER : SMALLER)); } - /* This is a convenient (and legacy) interface to TextSpanners for use in (de)crescendi. @@ -237,32 +233,30 @@ Dynamic_engraver::process_music () */ else { - cresc_ = make_spanner ("TextSpanner"); + cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanreqs_drul_[START]->self_scm ()); cresc_->set_property ("style", s); - daddy_context_->set_property ((start_type - + "Spanner").to_str0 (), SCM_EOL); + 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 (gh_string_p (s) || gh_pair_p (s)) + if (scm_is_string (s) || scm_is_pair (s)) { cresc_->set_property ("edge-text", - gh_cons (s, scm_makfrom0str (""))); - daddy_context_->set_property ((start_type + "Text").to_str0 (), - SCM_EOL); + scm_cons (s, scm_makfrom0str (""))); + context ()->set_property ((start_type + "Text").to_str0 (), + SCM_EOL); } } - cresc_->set_bound (LEFT, script_ - ? script_ - : unsmob_grob (get_property ("currentMusicalColumn"))); + if (script_) + { + cresc_->set_bound (LEFT, script_); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); + } Axis_group_interface::add_element (line_spanner_, cresc_); - - add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); - - announce_grob (cresc_, accepted_spanreqs_drul_[START]->self_scm ()); } } } @@ -274,10 +268,16 @@ Dynamic_engraver::stop_translation_timestep () if (!current_cresc_ev_) { finished_line_spanner_ = line_spanner_; - line_spanner_ =0; + 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)); + } + script_ev_ = 0; accepted_spanreqs_drul_[START] = 0; accepted_spanreqs_drul_[STOP] = 0; @@ -287,9 +287,9 @@ void Dynamic_engraver::finalize () { typeset_all (); - + if (line_spanner_ - && !line_spanner_->live ()) + && !line_spanner_->is_live ()) line_spanner_ = 0; if (line_spanner_) { @@ -298,7 +298,7 @@ Dynamic_engraver::finalize () } if (cresc_ - && !cresc_->live ()) + && !cresc_->is_live ()) cresc_ = 0; if (cresc_) { @@ -310,47 +310,29 @@ Dynamic_engraver::finalize () 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_ - && !finished_cresc_->live ()) - finished_cresc_ = 0; - if (finished_line_spanner_ - && !finished_line_spanner_->live ()) - finished_line_spanner_ = 0; - +{ if (finished_cresc_) { if (!finished_cresc_->get_bound (RIGHT)) { finished_cresc_->set_bound (RIGHT, script_ - ? script_ - : unsmob_grob (get_property ("currentMusicalColumn"))); + ? script_ + : unsmob_grob (get_property ("currentMusicalColumn"))); if (finished_line_spanner_) add_bound_item (finished_line_spanner_, finished_cresc_->get_bound (RIGHT)); } - typeset_grob (finished_cresc_); - finished_cresc_ =0; - } - - if (script_) - { - typeset_grob (script_); - script_ = 0; + finished_cresc_ = 0; } + + script_ = 0; if (finished_line_spanner_) { /* We used to have - - extend-spanner-over-elements (finished_line_spanner_); + + 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 @@ -358,8 +340,8 @@ Dynamic_engraver::typeset_all () */ - Grob * l = finished_line_spanner_->get_bound (LEFT ); - Grob * r = finished_line_spanner_->get_bound (RIGHT); + 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) @@ -369,68 +351,79 @@ Dynamic_engraver::typeset_all () /* 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); + */ + 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_->set_bound (LEFT, ci); } - - typeset_grob (finished_line_spanner_); + finished_line_spanner_ = 0; } } void -Dynamic_engraver::acknowledge_grob (Grob_info i) +Dynamic_engraver::acknowledge_grob (Grob_info info) { if (!line_spanner_) - return ; - - if (Note_column::has_interface (i.grob_)) + return; + + if (Note_column::has_interface (info.grob_)) { if (line_spanner_ /* Don't refill killed spanner */ - && line_spanner_->live ()) + && line_spanner_->is_live ()) { - Side_position_interface::add_support (line_spanner_,i.grob_); - add_bound_item (line_spanner_,dynamic_cast (i.grob_)); + 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 (i.grob_->get_property ("heads")); - if (gh_pair_p (head)) - script_->set_parent (unsmob_grob (head), 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 (i.grob_) && script_) + + else if (Script_interface::has_interface (info.grob_) && script_) { - SCM p = i.grob_->get_property ("script-priority"); + SCM p = info.grob_->get_property ("script-priority"); /* UGH. DynamicText doesn't really have a script-priority field. - */ - if (gh_number_p (p) - && gh_scm2int (p) < gh_scm2int (script_->get_property ("script-priority"))) - { - Side_position_interface::add_support (line_spanner_, i.grob_); - - } + */ + 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_); } } -ENTER_DESCRIPTION (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 */ ""); + +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 */ "");