Fix 352.

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 2e2b30ef2830e406a660992ba68a29cd53af524f..18ebeda94301a50fa6bf962f50da52b6dd633a09 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -24,6 +24,7 @@
 #include "stream-event.hh"
 #include "warn.hh"
 #include "spanner.hh"
+#include "text-interface.hh"
 
 #include "translator.icc"
 
@@ -252,16 +253,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_from_locale_string ("")));
+                 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_)