X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=f7b2576d85043c734d0dc9e55add6526ff762ddc;hb=2c70df4984be974a7ffefaa90ec4c7a2f5f13ee9;hp=289c44e33fa26905e3e41432f055df2642313782;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 289c44e33f..f7b2576d85 100644
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -11,6 +11,7 @@
 #include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
+#include "spanner.hh"
 #include "stream-event.hh"
 
 #include "translator.icc"
@@ -21,7 +22,6 @@ public:
   TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (text_span);
   void stop_translation_timestep ();
   void process_music ();
@@ -57,7 +57,7 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-	event_drul_[STOP]->origin ()->warning (_ ("can't find start of text spanner"));
+	event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
       else
 	{
 	  finished_ = span_;
@@ -81,20 +81,6 @@ Text_spanner_engraver::process_music ()
     }
 }
 
-void
-Text_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
 Text_spanner_engraver::typeset_all ()
 {
@@ -135,9 +121,13 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
-		/* doc */ "Create text spanner from an event.",
-		/* create */ "TextSpanner",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Create text spanner from an event.",
+		/* create */
+		"TextSpanner ",
+		/* read */
+		"",
+		/* write */
+		""
+		);