Optionally preserve input path.

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index fe6c2d029be69e396027b0b0d85d4f52abc96d2c..51161d15017c7d43498d8773ee85053b514f3401 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -178,11 +178,13 @@ 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_;
+         if (finished_cresc_->get_property ("to-barline") == SCM_EOL)
+           {
+             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));
+             finished_cresc_->set_property ("to-barline", scm_from_bool (use_bar));
+           }
 
          announce_end_grob (finished_cresc_, SCM_EOL);
          cresc_ = 0;
@@ -437,9 +439,10 @@ ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
 
 ADD_TRANSLATOR (Dynamic_engraver,
                /* doc */
-               "This engraver creates hairpins, dynamic texts, and their vertical\n"
-               "alignments.  The symbols are collected onto a DynamicLineSpanner grob\n"
-               "which takes care of vertical positioning.  ",
+               "Create hairpins, dynamic texts, and their vertical"
+               " alignments.  The symbols are collected onto a"
+               " @code{DynamicLineSpanner} grob which takes care of vertical"
+               " positioning.",
 
                /* create */
                "DynamicLineSpanner "
@@ -448,5 +451,9 @@ ADD_TRANSLATOR (Dynamic_engraver,
                "Hairpin "
                "TextSpanner ",
 
-               /* read */ "",
-               /* write */ "");
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );