X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-dynamic-engraver.cc;h=8c8fce980044c14834050ff7b3d9fb4fce1838e8;hb=f69bd6761b3b3c077b0b994bd65b5a5bd79b5582;hp=ad28ca205e4aa17dd66de7255c84ba94d0c4d2b7;hpb=d461778d6fd14bf62f726fe795e2ef542e2133c1;p=lilypond.git

diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc
index ad28ca205e..8c8fce9800 100644
--- a/lily/new-dynamic-engraver.cc
+++ b/lily/new-dynamic-engraver.cc
@@ -3,13 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2008 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2008--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
 
 #include "engraver.hh"
 
+#include "hairpin.hh"
 #include "international.hh"
 #include "item.hh"
 #include "note-column.hh"
@@ -153,12 +154,14 @@ New_dynamic_engraver::process_music ()
       if (current_spanner_)
 	{
 	  current_spanner_->set_bound (LEFT, script_);
-	  set_nested_property (current_spanner_,
-			       scm_list_3 (ly_symbol2scm ("bound-details"),
-					   ly_symbol2scm ("left"),
-					   ly_symbol2scm ("attach-dir")
-					   ),
-			       scm_from_int (RIGHT));
+
+	  if (!Hairpin::has_interface (current_spanner_))
+	    set_nested_property (current_spanner_,
+				 scm_list_3 (ly_symbol2scm ("bound-details"),
+					     ly_symbol2scm ("left"),
+					     ly_symbol2scm ("attach-dir")
+					     ),
+				 scm_from_int (RIGHT));
 
 	}
     }
@@ -213,11 +216,14 @@ ADD_TRANSLATOR (New_dynamic_engraver,
 		/* create */
 		"DynamicTextSpanner "
 		"DynamicText "
-		"Hairpin "
-		"TextSpanner ",
+		"Hairpin ",
 
 		/* read */
-		"currentMusicalColumn ",
+		"crescendoSpanner "
+		"crescendoText "
+		"currentMusicalColumn "
+		"decrescendoSpanner "
+		"decrescendoText ",
 
 		/* write */
 		""