X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=fe6c2d029be69e396027b0b0d85d4f52abc96d2c;hb=730dd1aeadf4609b4a08bd08702c1a478f11d372;hp=8f64db11363add6c9653bacb8efed2f7cc0a9254;hpb=4c6ce589763e6264ff65a83026b16aea682943e4;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 8f64db1136..fe6c2d029b 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -24,6 +24,7 @@ #include "stream-event.hh" #include "warn.hh" #include "spanner.hh" +#include "text-interface.hh" #include "translator.icc" @@ -63,10 +64,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); DECLARE_TRANSLATOR_LISTENER (span_dynamic); @@ -178,12 +176,21 @@ Dynamic_engraver::process_music () } finished_cresc_ = cresc_; + + /* backwards compatibility with hairpinToBarline */ + bool use_bar = to_boolean (get_property ("hairpinToBarline")) + && scm_is_string (get_property ("whichBar")) + && !script_ev_; + + finished_cresc_->set_property ("to-barline", scm_from_bool (use_bar)); + + announce_end_grob (finished_cresc_, SCM_EOL); cresc_ = 0; current_cresc_ev_ = 0; } else if (accepted_spanevents_drul_[STOP]) { - accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo")); stop_ev = 0; } } @@ -255,16 +262,22 @@ Dynamic_engraver::process_music () context ()->set_property ((start_type + "Spanner").c_str (), SCM_EOL); s = get_property ((start_type + "Text").c_str ()); - /* - FIXME: use get_markup () to check type. - */ - if (scm_is_string (s) || scm_is_pair (s)) + if (Text_interface::is_markup (s)) { - cresc_->set_property ("edge-text", - scm_cons (s, scm_makfrom0str (""))); + cresc_->set_property ("text", s); context ()->set_property ((start_type + "Text").c_str (), SCM_EOL); } + + if (script_) + { + set_nested_property (cresc_, + scm_list_3 (ly_symbol2scm ("bound-details"), + ly_symbol2scm ("left"), + ly_symbol2scm ("attach-dir") + ), + scm_from_int (RIGHT)); + } } if (script_) @@ -331,18 +344,11 @@ Dynamic_engraver::typeset_all () { if (finished_cresc_) { - bool use_bar = to_boolean (get_property ("hairpinToBarline")) - && scm_is_string (get_property ("whichBar")) - && !script_ev_; - - - if (!finished_cresc_->get_bound (RIGHT) - || use_bar) + if (!finished_cresc_->get_bound (RIGHT)) { - Grob *column_bound = unsmob_grob (use_bar - ? get_property ("currentCommandColumn") - : get_property ("currentMusicalColumn")); - + + Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn")); + finished_cresc_->set_bound (RIGHT, script_ ? script_ : column_bound); @@ -385,36 +391,10 @@ Dynamic_engraver::typeset_all () finished_line_spanner_->set_bound (RIGHT, ci); finished_line_spanner_->set_bound (LEFT, ci); } - finished_line_spanner_ = 0; } } - -void -Dynamic_engraver::acknowledge_accidental (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - -void -Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - -void -Dynamic_engraver::acknowledge_slur (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - void Dynamic_engraver::acknowledge_note_column (Grob_info info) { @@ -453,10 +433,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) finished_cresc_->set_bound (RIGHT, info.grob ()); } -ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); -ADD_ACKNOWLEDGER (Dynamic_engraver, slur); -ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); ADD_TRANSLATOR (Dynamic_engraver, /* doc */ @@ -466,6 +443,7 @@ ADD_TRANSLATOR (Dynamic_engraver, /* create */ "DynamicLineSpanner " + "DynamicTextSpanner " "DynamicText " "Hairpin " "TextSpanner ",