X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=0bdc95efc03c183daf390641d7763d562b460e2e;hb=00e3e15364b9d3c94cda1bcab9f889bb95f6832d;hp=d738a0c4c920cbcc1d0f0224fa60dc8b7c4da72e;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index d738a0c4c9..0bdc95efc0 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,12 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "engraver.hh"
+
+#include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Text_spanner_engraver : public Engraver
 {
@@ -17,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 ();
 };
 
@@ -38,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
@@ -57,9 +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_;
@@ -71,9 +70,7 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[START])
     {
       if (current_event_)
-	{
-	  event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
-	}
+	event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
       else
 	{
 	  current_event_ = event_drul_[START];
@@ -94,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 ());
 	}
     }
 }
@@ -139,11 +136,15 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-#include "translator.icc"
-ADD_ACKNOWLEDGER (Text_spanner_engraver,note_column);
+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 */
+		""
+		);