X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=7ccabdc2acf0b1096a26ffef484e9ec23e5ee1c6;hb=8fc0065379238f46977a22a90559a25833b5a75b;hp=e6498a239c7c7260e5bd384b05770bb98ac74a06;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index e6498a239c..7ccabdc2ac 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -5,20 +5,24 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "warn.hh" + +#include "axis-group-interface.hh" +#include "context.hh" #include "dimensions.hh" -#include "hairpin.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" #include "event.hh" -#include "paper-column.hh" -#include "note-column.hh" +#include "group-interface.hh" +#include "hairpin.hh" +#include "interval.hh" #include "item.hh" +#include "slur.hh" +#include "note-column.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 "translator-group.hh" -#include "axis-group-interface.hh" -#include "script.hh" +#include "staff-symbol-referencer.hh" +#include "warn.hh" /* TODO: @@ -39,24 +43,25 @@ */ class Dynamic_engraver : public Engraver { - Item * script_; - Spanner * finished_cresc_; - Spanner * cresc_; + Item *script_; + Spanner *line_spanner_; + Spanner *slur_; + Spanner *cresc_; + + Spanner *finished_line_spanner_; + Spanner *finished_cresc_; - Music* script_ev_; + Music *script_ev_; + Music *current_cresc_ev_; - Music * current_cresc_ev_; Drul_array accepted_spanreqs_drul_; - Spanner* line_spanner_; - Spanner* finished_line_spanner_; - Link_array pending_columns_; Link_array pending_elements_; void typeset_all (); -TRANSLATOR_DECLARATIONS(Dynamic_engraver ); + TRANSLATOR_DECLARATIONS (Dynamic_engraver); protected: virtual void finalize (); @@ -72,6 +77,7 @@ protected: Dynamic_engraver::Dynamic_engraver () { script_ = 0; + slur_ = 0; finished_cresc_ = 0; line_spanner_ = 0; finished_line_spanner_ = 0; @@ -84,7 +90,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")) { @@ -97,7 +103,7 @@ Dynamic_engraver::try_music (Music * m) else if (m->is_mus_type ("decrescendo-event") || m->is_mus_type ("crescendo-event")) { - Direction d = to_dir (m->get_mus_property ("span-direction")); + Direction d = to_dir (m->get_property ("span-direction")); accepted_spanreqs_drul_[d] = m; if (current_cresc_ev_ && d == START) @@ -114,12 +120,11 @@ 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 ); + if (script_ev_) - rq = script_ev_ ; - announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL); + rq = script_ev_; } } @@ -131,7 +136,6 @@ Dynamic_engraver::process_music () Note: line-spanner must always have at least same duration as (de)crecsendo, b.o. line-breaking. */ - /* @@ -140,17 +144,15 @@ Dynamic_engraver::process_music () */ if (script_ev_) { - script_ = make_item ("DynamicText"); - script_->set_grob_property ("text", - script_ev_->get_mus_property ("text")); + script_ = make_item ("DynamicText", script_ev_->self_scm ()); + script_->set_property ("text", + script_ev_->get_property ("text")); - if (Direction d = to_dir (script_ev_->get_mus_property ("direction"))) + 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] ? @@ -178,9 +180,9 @@ Dynamic_engraver::process_music () 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")); + accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); stop_ev = 0; } @@ -190,11 +192,10 @@ Dynamic_engraver::process_music () { if (current_cresc_ev_) { - Direction sd = to_dir (current_cresc_ev_->get_mus_property ("span-direction")); - String msg = sd == 1 - ? _ ("already have a crescendo") - : _ ("already have a decrescendo"); - + String msg = _ ("already have a decrescendo"); + if (current_cresc_ev_->is_mus_type ("decrescendo-event")) + msg = _ ("already have a crescendo"); + accepted_spanreqs_drul_[START]->origin ()->warning (msg); current_cresc_ev_->origin ()->warning (_("Cresc started here")); } @@ -202,7 +203,7 @@ Dynamic_engraver::process_music () { current_cresc_ev_ = accepted_spanreqs_drul_[START]; - if (Direction d = to_dir (current_cresc_ev_->get_mus_property ("direction"))) + if (Direction d = to_dir (current_cresc_ev_->get_property ("direction"))) set_grob_direction (line_spanner_, d); /* @@ -210,7 +211,7 @@ Dynamic_engraver::process_music () */ String start_type = - ly_symbol2string (current_cresc_ev_->get_mus_property ("name")); + ly_symbol2string (current_cresc_ev_->get_property ("name")); /* ugh. Use push/pop? @@ -221,12 +222,22 @@ Dynamic_engraver::process_music () 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_->set_grob_property ("grow-direction", - gh_int2scm ((start_type == "crescendo") - ? BIGGER : SMALLER)); + 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", + scm_int2num ((start_type == "crescendo") + ? BIGGER : SMALLER)); } @@ -238,32 +249,30 @@ Dynamic_engraver::process_music () */ else { - cresc_ = make_spanner ("TextSpanner"); - cresc_->set_grob_property ("style", s); - daddy_trans_->set_property ((start_type - + "Spanner").to_str0 (), SCM_EOL); + cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanreqs_drul_[START]->self_scm ()); + cresc_->set_property ("style", s); + 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_grob_property ("edge-text", - gh_cons (s, scm_makfrom0str (""))); - daddy_trans_->set_property ((start_type + "Text").to_str0 (), - SCM_EOL); + cresc_->set_property ("edge-text", + 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"))); - - Axis_group_interface::add_element (line_spanner_, cresc_); - - add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); + if (script_) + { + cresc_->set_bound (LEFT, script_); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); + } - announce_grob(cresc_, accepted_spanreqs_drul_[START]->self_scm()); + Axis_group_interface::add_element (line_spanner_, cresc_); } } } @@ -275,10 +284,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; @@ -290,7 +305,7 @@ Dynamic_engraver::finalize () typeset_all (); if (line_spanner_ - && !line_spanner_->live()) + && !line_spanner_->is_live ()) line_spanner_ = 0; if (line_spanner_) { @@ -299,7 +314,7 @@ Dynamic_engraver::finalize () } if (cresc_ - && !cresc_->live()) + && !cresc_->is_live ()) cresc_ = 0; if (cresc_) { @@ -311,41 +326,23 @@ 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; - } + script_ = 0; if (finished_line_spanner_) { /* @@ -359,7 +356,7 @@ Dynamic_engraver::typeset_all () */ - Grob * l = finished_line_spanner_->get_bound (LEFT ); + 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); @@ -377,51 +374,61 @@ Dynamic_engraver::typeset_all () 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)) { - script_->set_parent (i.grob_, 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_ && !cresc_->get_bound (LEFT)) + { + cresc_->set_bound (LEFT, info.grob_); + add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); + } + } - else if (Script_interface::has_interface (i.grob_) && script_) + else if (Script_interface::has_interface (info.grob_) && script_) { - SCM p = i.grob_->get_grob_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_grob_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_); } + else if (Slur::has_interface (info.grob_)) + slur_ = dynamic_cast (info.grob_); } -ENTER_DESCRIPTION(Dynamic_engraver, + +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" @@ -430,6 +437,6 @@ ENTER_DESCRIPTION(Dynamic_engraver, /* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner", /* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event", -/* acks */ "note-column-interface script-interface", +/* acks */ "note-column-interface script-interface slur-interface", /* reads */ "", /* write */ "");