X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=488bec75f5692aaf805a2a79c967461cd8dbaf48;hb=393d61330753cdd9a86f94fc6ec23d29cfb845ed;hp=51161d15017c7d43498d8773ee85053b514f3401;hpb=ac6c83f047635535d0481a15654c13e776334dc6;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 51161d1501..488bec75f5 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,11 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2007 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "axis-group-interface.hh" #include "context.hh" +#include "engraver.hh" #include "dimensions.hh" #include "directional-element-interface.hh" #include "engraver.hh" @@ -176,16 +177,6 @@ Dynamic_engraver::process_music () } finished_cresc_ = cresc_; - - /* backwards compatibility with hairpinToBarline */ - if (finished_cresc_->get_property ("to-barline") == SCM_EOL) - { - bool use_bar = to_boolean (get_property ("hairpinToBarline")) - && scm_is_string (get_property ("whichBar")); - - finished_cresc_->set_property ("to-barline", scm_from_bool (use_bar)); - } - announce_end_grob (finished_cresc_, SCM_EOL); cresc_ = 0; current_cresc_ev_ = 0; @@ -263,7 +254,7 @@ Dynamic_engraver::process_music () cresc_->set_property ("style", s); context ()->set_property ((start_type + "Spanner").c_str (), SCM_EOL); - s = get_property ((start_type + "Text").c_str ()); + s = get_property ((start_type + "Text").c_str ()); if (Text_interface::is_markup (s)) { cresc_->set_property ("text", s); @@ -287,7 +278,6 @@ Dynamic_engraver::process_music () cresc_->set_bound (LEFT, script_); add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); } - Axis_group_interface::add_element (line_spanner_, cresc_); } }