Fix merging problem

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

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 8770ab9cefd97754ac420c82333103d92f433d92..8e56784812c6369e692011c0d69ae33c20a6272f 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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
@@ -19,6 +19,7 @@
 #include "note-column.hh"
 #include "side-position-interface.hh"
 #include "stream-event.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -28,7 +29,6 @@ public:
   TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (trill_span);
   void stop_translation_timestep ();
   void process_music ();
@@ -64,7 +64,7 @@ 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_;
@@ -87,20 +87,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], dynamic_cast<Item *> (info.grob ()));
-       }
-    }
-}
-
 void
 Trill_spanner_engraver::typeset_all ()
 {
@@ -140,10 +126,8 @@ 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",
-               /* accept */ "trill-span-event",
                /* read */ "",
                /* write */ "");