Merge commit 'origin' into beamlets2

[lilypond.git] / lily / new-dynamic-engraver.cc

diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc
index ad28ca205e4aa17dd66de7255c84ba94d0c4d2b7..be395fa2d1059dee50845a8fff526321d08c6aec 100644 (file)
--- a/lily/new-dynamic-engraver.cc
+++ b/lily/new-dynamic-engraver.cc
@@ -10,6 +10,7 @@
 
 #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));
 
        }
     }
@@ -217,7 +220,11 @@ ADD_TRANSLATOR (New_dynamic_engraver,
                "TextSpanner ",
 
                /* read */
-               "currentMusicalColumn ",
+               "crescendoSpanner "
+               "crescendoText "
+               "currentMusicalColumn "
+               "decrescendoSpanner "
+               "decrescendoText ",
 
                /* write */
                ""