X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftrill-spanner-engraver.cc;h=844af53736d41ee467acc036e79b47d938c85412;hb=150f6212ddfc29d66265cf47fd843f428646035f;hp=95f437e1ee182f146130182cfec952c4246b9f96;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 95f437e1ee..844af53736 100644
--- 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--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
@@ -13,9 +13,13 @@
   automatically is the end of the trill?
 */
 
+#include "engraver.hh"
+
+#include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -26,15 +30,15 @@ public:
 protected:
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (note_column);
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (trill_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 ();
 };
 
@@ -47,17 +51,12 @@ Trill_spanner_engraver::Trill_spanner_engraver ()
   event_drul_[STOP] = 0;
 }
 
-bool
-Trill_spanner_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
+void
+Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 {
-  if (m->is_mus_type ("trill-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
@@ -66,9 +65,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_;
@@ -80,9 +77,7 @@ Trill_spanner_engraver::process_music ()
   if (event_drul_[START])
     {
       if (current_event_)
-	{
-	  event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
-	}
+	event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
       else
 	{
 	  current_event_ = event_drul_[START];
@@ -102,7 +97,7 @@ Trill_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 ());
 	}
     }
 }
@@ -141,15 +136,14 @@ Trill_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     {
-      current_event_->origin ()->warning (_ ("unterminated trill spanner"));
-      span_->suicide ();
-      span_ = 0;
+      finished_ = span_;
+      typeset_all ();
     }
 }
+
 ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
 ADD_TRANSLATOR (Trill_spanner_engraver,
-		/* doc */ "Create trill spanner from a Music.",
+		/* doc */ "Create trill spanner from an event.",
 		/* create */ "TrillSpanner",
-		/* accept */ "trill-span-event",
 		/* read */ "",
 		/* write */ "");