X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=8288e78ddcfdedebff68df928d71a1f56cd17889;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1b183d6da6358c14de8bc11d9e825af28d233a41;hpb=2a00c69a012d4ccaf24a036bdb5ac9ea43fb9604;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 1b183d6da6..8288e78ddc 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
@@ -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
@@ -83,6 +86,7 @@ Trill_spanner_engraver::process_music ()
       else
 	{
 	  finished_ = span_;
+	  announce_end_grob (finished_, SCM_EOL);
 	  span_ = 0;
 	  current_event_ = 0;
 	}
@@ -144,8 +148,15 @@ 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 */
+		""
+		);