From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 23 Feb 2008 23:51:35 +0000 (-0300)
Subject: Thinkos: make text/trill spanners run up to the last note.
X-Git-Tag: release/2.11.41-1~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a447796c7e81f81b100fb6e15c1395a93c28c21;p=lilypond.git

Thinkos: make text/trill spanners run up to the last note.
---

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 7d789b2973..697cc4d2f1 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -127,13 +127,16 @@ Text_spanner_engraver::finalize ()
 void
 Text_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (!span_)
-    return;
-
-  Pointer_group_interface::add_grob (span_,
-				     ly_symbol2scm ("note-columns"),
-				     info.grob());
-  add_bound_item (span_, info.grob ());
+  if (span_) {
+    Pointer_group_interface::add_grob (span_,
+				       ly_symbol2scm ("note-columns"),
+				       info.grob());
+    add_bound_item (span_, info.grob ());
+  } else if (finished_) {
+    Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
+				       info.grob());
+    add_bound_item (finished_, info.grob ());
+  }
 }
 
 ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 1b183d6da6..de36c66686 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -64,13 +64,16 @@ Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 void
 Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (!span_)
-    return;
-
-  Pointer_group_interface::add_grob (span_,
-				     ly_symbol2scm ("note-columns"),
-				     info.grob());
-  add_bound_item (span_, info.grob ());
+  if (span_) {
+    Pointer_group_interface::add_grob (span_,
+				       ly_symbol2scm ("note-columns"),
+				       info.grob());
+    add_bound_item (span_, info.grob ());
+  } else if (finished_) {
+    Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
+				       info.grob());
+    add_bound_item (finished_, info.grob ());
+  }
 }
 
 void