X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=2994956a50c01d665a717b92a3c36df6d1837024;hb=c05010e867e94c704197efe12aa5df5ab596af46;hp=d5212ded7fbd43f657f9f361253c0baf890002f5;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index d5212ded7f..2994956a50 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -11,6 +11,10 @@
 #include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Text_spanner_engraver : public Engraver
 {
@@ -19,15 +23,15 @@ public:
 protected:
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (note_column);
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (text_span);
   void stop_translation_timestep ();
   void process_music ();
 
 private:
   Spanner *span_;
   Spanner *finished_;
-  Music *current_event_;
-  Drul_array<Music *> event_drul_;
+  Stream_event *current_event_;
+  Drul_array<Stream_event *> event_drul_;
   void typeset_all ();
 };
 
@@ -40,17 +44,12 @@ Text_spanner_engraver::Text_spanner_engraver ()
   event_drul_[STOP] = 0;
 }
 
-bool
-Text_spanner_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Text_spanner_engraver, text_span);
+void
+Text_spanner_engraver::listen_text_span (Stream_event *ev)
 {
-  if (m->is_mus_type ("text-span-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
-      event_drul_[d] = m;
-      return true;
-    }
-
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 void
@@ -59,7 +58,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_;
@@ -92,7 +91,7 @@ Text_spanner_engraver::acknowledge_note_column (Grob_info info)
       if (spans[i])
 	{
 	  Side_position_interface::add_support (spans[i], info.grob ());
-	  add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
+	  add_bound_item (spans[i], info.grob ());
 	}
     }
 }
@@ -137,11 +136,9 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-#include "translator.icc"
 ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
-		/* doc */ "Create text spanner from a Music.",
+		/* doc */ "Create text spanner from an event.",
 		/* create */ "TextSpanner",
-		/* accept */ "text-span-event",
 		/* read */ "",
 		/* write */ "");