Fix issue 493

Announce end grob in trill and text spanners so that 'to-barline will work. Also
fix 'to-barline with hairpins (which was overridden by the hairpinToBarline
compatibility code).

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 8a71cad06ab2b29b907ebd73f4af7a1fa20cea8b..f6e5911f2bf264e7d7efb941a1945f63eede0a45 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -178,10 +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"));
+         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;

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 7c629297387815c90809610f2144e52517943e9e..d0063c953249955ef63aa4f180aeadd2b72b37fa 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -361,5 +361,6 @@ ADD_INTERFACE (Line_spanner,
               "note-columns "
               "right-bound-info " 
               "thickness "
+              "to-barline "
               );
 

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 697cc4d2f1fa2621a6ee127db7836479ae3ba1fe..cb7b8500139052cec742aeebfc4116c7f18e85e5 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -63,6 +63,7 @@ Text_spanner_engraver::process_music ()
       else
        {
          finished_ = span_;
+         announce_end_grob (finished_, SCM_EOL);
          span_ = 0;
          current_event_ = 0;
        }

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index de36c666867302bb2861f0fbaadcd82a1571e767..1f9d4cf0dcf4a319b9ce1ec0441eb056fff66d4b 100644 (file)
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -86,6 +86,7 @@ Trill_spanner_engraver::process_music ()
       else
        {
          finished_ = span_;
+         announce_end_grob (finished_, SCM_EOL);
          span_ = 0;
          current_event_ = 0;
        }