MusicXML: Setting global options before (and not after) using them might be a good...

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index caef2ce4c4231a8fb0d22893be4160a5504f44a5..8a71cad06ab2b29b907ebd73f4af7a1fa20cea8b 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -176,6 +176,14 @@ 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"));
+
+         finished_cresc_->set_property ("to-barline", scm_from_bool (use_bar));
+
+         announce_end_grob (finished_cresc_, SCM_EOL);
          cresc_ = 0;
          current_cresc_ev_ = 0;
        }
@@ -259,6 +267,16 @@ Dynamic_engraver::process_music ()
                  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_)
@@ -325,25 +343,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_
@@ -387,7 +390,6 @@ Dynamic_engraver::typeset_all ()
          finished_line_spanner_->set_bound (RIGHT, ci);
          finished_line_spanner_->set_bound (LEFT, ci);
        }
-
       finished_line_spanner_ = 0;
     }
 }
@@ -440,6 +442,7 @@ ADD_TRANSLATOR (Dynamic_engraver,
 
                /* create */
                "DynamicLineSpanner "
+               "DynamicTextSpanner "
                "DynamicText "
                "Hairpin "
                "TextSpanner ",