X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=0086d121e79362616f2b0dbf998271a8cf384e2b;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=fc324c1582766a5cc652837f1e288cebe7a2ad39;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index fc324c1582..0086d121e7 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-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>
 */
 
 #include "engraver.hh"
@@ -13,21 +13,27 @@
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
+#include "stream-event.hh"
 #include "note-column.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Arpeggio_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
+  void acknowledge_note_column (Grob_info);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  void process_music ();
+  void stop_translation_timestep ();
+  DECLARE_TRANSLATOR_LISTENER (arpeggio);
 private:
   Item *arpeggio_;
-  Music *arpeggio_event_;
+  Stream_event *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
@@ -36,45 +42,43 @@ Arpeggio_engraver::Arpeggio_engraver ()
   arpeggio_event_ = 0;
 }
 
-bool
-Arpeggio_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Arpeggio_engraver, arpeggio);
+void Arpeggio_engraver::listen_arpeggio (Stream_event *ev)
 {
-  if (!arpeggio_event_)
-    {
-      arpeggio_event_ = m;
-    }
-  return true;
+  ASSIGN_EVENT_ONCE (arpeggio_event_, ev);
 }
 
 void
-Arpeggio_engraver::acknowledge_grob (Grob_info info)
+Arpeggio_engraver::acknowledge_stem (Grob_info info)
 {
   if (arpeggio_)
     {
-      if (Stem::has_interface (info.grob ()))
-	{
-	  if (!arpeggio_->get_parent (Y_AXIS))
-	    arpeggio_->set_parent (info.grob (), Y_AXIS);
-
-	  Pointer_group_interface::add_grob (arpeggio_,
-					     ly_symbol2scm ("stems"),
-					     info.grob ());
-	}
-
-      /*
-	We can't catch local key items (accidentals) from Voice context,
-	see Local_key_engraver
-      */
-      else if (Rhythmic_head::has_interface (info.grob ()))
-	{
-	  Side_position_interface::add_support (arpeggio_, info.grob ());
-	}
-      else if (Note_column::has_interface (info.grob ()))
-	{
-	  info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
-	}
+      if (!arpeggio_->get_parent (Y_AXIS))
+	arpeggio_->set_parent (info.grob (), Y_AXIS);
+
+      Pointer_group_interface::add_grob (arpeggio_,
+					 ly_symbol2scm ("stems"),
+					 info.grob ());
     }
 }
+void
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
+{
+  if (arpeggio_)
+
+    /*
+      We can't catch local key items (accidentals) from Voice context,
+      see Local_key_engraver
+    */
+    Side_position_interface::add_support (arpeggio_, info.grob ());
+}
+
+void
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
+{
+  if (arpeggio_)
+    info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
+}
 
 void
 Arpeggio_engraver::process_music ()
@@ -92,10 +96,12 @@ Arpeggio_engraver::stop_translation_timestep ()
   arpeggio_event_ = 0;
 }
 
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column);
+
 ADD_TRANSLATOR (Arpeggio_engraver,
-		/* descr */ "Generate an Arpeggio symbol",
-		/* creats*/ "Arpeggio",
-		/* accepts */ "arpeggio-event",
-		/* acks  */ "stem-interface rhythmic-head-interface note-column-interface",
-		/* reads */ "",
+		/* doc */ "Generate an Arpeggio symbol",
+		/* create */ "Arpeggio",
+		/* read */ "",
 		/* write */ "");