X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=71dfcce857cadd90f9e1be69bd26eb58b92d7110;hb=873c31e41713a3aa7e162268286521e0d582e4f4;hp=8b476249312a452717e9a73b17f8a25d7a2f386f;hpb=1c5b28defa29c019a3d2038bf4b19ed215ec2d87;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 8b47624931..71dfcce857 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 "context.hh" -#include "axis-group-interface.hh" -#include "script.hh" +#include "staff-symbol-referencer.hh" +#include "warn.hh" /* TODO: @@ -39,18 +43,19 @@ */ class Dynamic_engraver : public Engraver { - Item * script_; - Spanner * finished_cresc_; - Spanner * cresc_; + Item *script_; + Spanner *line_spanner_; + Spanner *slur_; + Spanner *cresc_; - Music* script_ev_; + Spanner *finished_line_spanner_; + Spanner *finished_cresc_; + + 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_; @@ -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")) { @@ -141,14 +147,13 @@ Dynamic_engraver::process_music () { 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_); - } Music *stop_ev = accepted_spanreqs_drul_ [STOP] ? @@ -218,12 +223,22 @@ Dynamic_engraver::process_music () start_type = "crescendo"; SCM s = get_property ((start_type + "Spanner").to_str0 ()); - if (!ly_c_symbol_p (s) || s == ly_symbol2scm ("hairpin")) + if (!scm_is_symbol (s) || s == ly_symbol2scm ("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", - scm_int2num ((start_type == "crescendo") - ? BIGGER : SMALLER)); + scm_int2num ((start_type == "crescendo") + ? BIGGER : SMALLER)); } @@ -235,31 +250,30 @@ Dynamic_engraver::process_music () */ else { - cresc_ = make_spanner ("TextSpanner", accepted_spanreqs_drul_[START]->self_scm ()); + 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); + + "Spanner").to_str0 (), SCM_EOL); s = get_property ((start_type + "Text").to_str0 ()); /* FIXME: use get_markup () to check type. */ - if (ly_c_string_p (s) || ly_c_pair_p (s)) + if (scm_is_string (s) || ly_c_pair_p (s)) { cresc_->set_property ("edge-text", - scm_cons (s, scm_makfrom0str (""))); + scm_cons (s, scm_makfrom0str (""))); context ()->set_property ((start_type + "Text").to_str0 (), - SCM_EOL); + SCM_EOL); } } cresc_->set_bound (LEFT, script_ - ? script_ - : unsmob_grob (get_property ("currentMusicalColumn"))); + ? script_ + : unsmob_grob (get_property ("currentMusicalColumn"))); Axis_group_interface::add_element (line_spanner_, cresc_); add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); - } } } @@ -270,8 +284,9 @@ Dynamic_engraver::stop_translation_timestep () typeset_all (); if (!current_cresc_ev_) { + finished_line_spanner_ = line_spanner_; - line_spanner_ =0; + line_spanner_ = 0; typeset_all (); } @@ -307,28 +322,15 @@ 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_->is_live ()) - finished_cresc_ = 0; - if (finished_line_spanner_ - && !finished_line_spanner_->is_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)); @@ -336,7 +338,7 @@ Dynamic_engraver::typeset_all () finished_cresc_ =0; } - script_ = 0; + script_ = 0; if (finished_line_spanner_) { /* @@ -350,7 +352,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); @@ -373,46 +375,46 @@ Dynamic_engraver::typeset_all () } 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_->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 ("note-heads")); + SCM head = scm_last_pair (info.grob_->get_property ("note-heads")); if (ly_c_pair_p (head)) script_->set_parent (unsmob_grob (ly_car (head)), X_AXIS); } - } - 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 (ly_c_number_p (p) - && ly_scm2int (p) < ly_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_); } + else if (Slur::has_interface (info.grob_)) + slur_ = dynamic_cast (info.grob_); } + ENTER_DESCRIPTION (Dynamic_engraver, /* descr */ "This engraver creates hairpins, dynamic texts, and their vertical\n" @@ -422,6 +424,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 */ "");