Run `make grand-replace'.

[lilypond.git] / lily / trill-spanner-engraver.cc

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 857c03051d0f0eefa93ae68355aba0aae19a2096..8288e78ddcfdedebff68df928d71a1f56cd17889 100644 (file)
--- 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,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 */
+               ""
+               );