X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdynamic-engraver.cc;h=ee6518118f89c05697333deb102981cfe7e4122d;hb=0f2133cac2c3400eb883b5a00e5bb4fd98bb38a6;hp=51161d15017c7d43498d8773ee85053b514f3401;hpb=2eb63c6977706ba261e4ee0674c734a34b3ee904;p=lilypond.git

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 51161d1501..ee6518118f 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -1,13 +1,25 @@
 /*
-  dynamic-engraver.cc -- implement Dynamic_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "axis-group-interface.hh"
 #include "context.hh"
+#include "engraver.hh"
 #include "dimensions.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
@@ -176,16 +188,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 +265,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 +289,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_);
 	}
     }
@@ -448,8 +449,7 @@ ADD_TRANSLATOR (Dynamic_engraver,
 		"DynamicLineSpanner "
 		"DynamicTextSpanner "
 		"DynamicText "
-		"Hairpin "
-		"TextSpanner ",
+		"Hairpin ",
 
 		/* read */
 		"",