Fix 417.

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 2e2b30ef2830e406a660992ba68a29cd53af524f..fe6c2d029be69e396027b0b0d85d4f52abc96d2c 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"
 
@@ -175,6 +176,15 @@ Dynamic_engraver::process_music ()
            }
 
          finished_cresc_ = cresc_;
+
+         /* backwards compatibility with hairpinToBarline */
+         bool use_bar = to_boolean (get_property ("hairpinToBarline"))
+           && scm_is_string (get_property ("whichBar"))
+           && !script_ev_;
+
+         finished_cresc_->set_property ("to-barline", scm_from_bool (use_bar));
+
+         announce_end_grob (finished_cresc_, SCM_EOL);
          cresc_ = 0;
          current_cresc_ev_ = 0;
        }
@@ -252,16 +262,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_)
@@ -328,25 +344,10 @@ Dynamic_engraver::typeset_all ()
 {
   if (finished_cresc_)
     {
-      bool use_bar = to_boolean (get_property ("hairpinToBarline"))
-       && scm_is_string (get_property ("whichBar"))
-       && !script_ev_;
-                         
-      
-      if (!finished_cresc_->get_bound (RIGHT)
-         || use_bar)
+      if (!finished_cresc_->get_bound (RIGHT))
        {
                  
-         Grob *column_bound = 0;
-         if (use_bar)
-           {
-             column_bound = unsmob_grob (get_property ("breakableSeparationItem"));
-           }
-         
-         if (!column_bound)
-           column_bound = unsmob_grob (use_bar
-                                       ? get_property ("currentCommandColumn")
-                                       : get_property ("currentMusicalColumn"));
+         Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn"));
          
          finished_cresc_->set_bound (RIGHT, script_
                                      ? script_
@@ -390,7 +391,6 @@ Dynamic_engraver::typeset_all ()
          finished_line_spanner_->set_bound (RIGHT, ci);
          finished_line_spanner_->set_bound (LEFT, ci);
        }
-
       finished_line_spanner_ = 0;
     }
 }
@@ -443,6 +443,7 @@ ADD_TRANSLATOR (Dynamic_engraver,
 
                /* create */
                "DynamicLineSpanner "
+               "DynamicTextSpanner "
                "DynamicText "
                "Hairpin "
                "TextSpanner ",