Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index b7628c325c29fef4d5ec88aab8d164500a85278c..f7b2576d85043c734d0dc9e55add6526ff762ddc 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--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 ();
@@ -48,7 +48,7 @@ void
 Text_spanner_engraver::listen_text_span (Stream_event *ev)
 {
   Direction d = to_dir (ev->get_property ("span-direction"));
-  event_drul_[d] = ev;
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 void
@@ -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,10 +121,13 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
-               /* doc */ "Create text spanner from a Music.",
-               /* create */ "TextSpanner",
-               /* accept */ "text-span-event",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Create text spanner from an event.",
+               /* create */
+               "TextSpanner ",
+               /* read */
+               "",
+               /* write */
+               ""
+               );