Run `make grand-replace'.

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 7d789b29735d6f1a0109fb21dcdd67274dabccd2..9c1ebdcf0f0f2a76e565e40c6366c39ca98c63f6 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-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>
 */
 
 #include "engraver.hh"
@@ -63,6 +63,7 @@ Text_spanner_engraver::process_music ()
       else
        {
          finished_ = span_;
+         announce_end_grob (finished_, SCM_EOL);
          span_ = 0;
          current_event_ = 0;
        }
@@ -127,13 +128,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);
@@ -141,10 +145,13 @@ ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
                /* doc */
                "Create text spanner from an event.",
+
                /* create */
                "TextSpanner ",
+
                /* read */
                "",
+
                /* write */
                ""
                );