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 7d789b29735d6f1a0109fb21dcdd67274dabccd2..697cc4d2f1fa2621a6ee127db7836479ae3ba1fe 100644 (file)
--- 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 1b183d6da6358c14de8bc11d9e825af28d233a41..de36c666867302bb2861f0fbaadcd82a1571e767 100644 (file)
--- 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