From 526bdfea303c7fe33e016932f1dd19389b8c334f Mon Sep 17 00:00:00 2001 From: Erlend Aasland Date: Wed, 12 Mar 2008 13:08:47 +0100 Subject: [PATCH] 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). --- lily/dynamic-engraver.cc | 9 ++++++--- lily/line-spanner.cc | 1 + lily/text-spanner-engraver.cc | 1 + lily/trill-spanner-engraver.cc | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 8a71cad06a..f6e5911f2b 100644 --- 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 7c62929738..d0063c9532 100644 --- 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 697cc4d2f1..cb7b850013 100644 --- 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 de36c66686..1f9d4cf0dc 100644 --- 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; } -- 2.39.5