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 3f07d5b5accd769f76a4b30e58026f7f17a1feb2..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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
@@ -17,6 +17,7 @@
 
 #include "international.hh"
 #include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 #include "stream-event.hh"
 #include "spanner.hh"
@@ -29,8 +30,9 @@ public:
   TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (trill_span);
+  DECLARE_ACKNOWLEDGER (note_column);
+
   void stop_translation_timestep ();
   void process_music ();
 
@@ -59,16 +61,32 @@ Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
   ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
+void
+Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
+{
+  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
 Trill_spanner_engraver::process_music ()
 {
   if (event_drul_[STOP])
     {
       if (!span_)
-       event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
+       event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
       else
        {
          finished_ = span_;
+         announce_end_grob (finished_, SCM_EOL);
          span_ = 0;
          current_event_ = 0;
        }
@@ -88,20 +106,6 @@ Trill_spanner_engraver::process_music ()
     }
 }
 
-void
-Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
-{
-  Spanner *spans[2] ={span_, finished_};
-  for (int i = 0; i < 2; i++)
-    {
-      if (spans[i])
-       {
-         Side_position_interface::add_support (spans[i], info.grob ());
-         add_bound_item (spans[i], info.grob ());
-       }
-    }
-}
-
 void
 Trill_spanner_engraver::typeset_all ()
 {
@@ -142,8 +146,17 @@ Trill_spanner_engraver::finalize ()
 }
 
 ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+
 ADD_TRANSLATOR (Trill_spanner_engraver,
-               /* doc */ "Create trill spanner from an event.",
-               /* create */ "TrillSpanner",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Create trill spanner from an event.",
+
+               /* create */
+               "TrillSpanner ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );