X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=6f5f28beb7006c31601f4808886760fc71e7c352;hb=3635122e33a2c93a6240647b98f3e37d2cfdfe81;hp=857c03051d0f0eefa93ae68355aba0aae19a2096;hpb=c790b5919ec06fb292e380a2d3d7856e86f16417;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 857c03051d..6f5f28beb7 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -64,17 +64,18 @@ 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());
+  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 (Trill_spanner_engraver, note_column);
-
-
 void
 Trill_spanner_engraver::process_music ()
 {
@@ -85,6 +86,7 @@ Trill_spanner_engraver::process_music ()
       else
 	{
 	  finished_ = span_;
+	  announce_end_grob (finished_, SCM_EOL);
 	  span_ = 0;
 	  current_event_ = 0;
 	}
@@ -143,9 +145,18 @@ Trill_spanner_engraver::finalize ()
     }
 }
 
+ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+
 ADD_TRANSLATOR (Trill_spanner_engraver,
-		/* doc */ "Create trill spanner from an event.",
+		/* doc */
+		"Create trill spanner from an event.",
+
 		/* create */
 		"TrillSpanner ",
-		/* read */ "",
-		/* write */ "");
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);