Run `make grand-replace'.

[lilypond.git] / lily / arpeggio-engraver.cc

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 5c82930b4f14fdd8d49a64077c21fddadec0ba29..062d6a816fa3cf3155eee6513329f51522f75d92 100644 (file)
--- 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--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -13,7 +13,9 @@
 #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"
 
@@ -24,14 +26,13 @@ public:
 
   void acknowledge_stem (Grob_info);
   void acknowledge_rhythmic_head (Grob_info);
-  void acknowledge_note_column (Grob_info);
 protected:
   void process_music ();
   void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (arpeggio);
 private:
   Item *arpeggio_;
-  Music *arpeggio_event_;
+  Stream_event *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
@@ -40,14 +41,10 @@ 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
@@ -72,18 +69,7 @@ Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
       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 ());
-    }
+    Side_position_interface::add_support (arpeggio_, info.grob ());
 }
 
 void
@@ -102,13 +88,19 @@ 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_ACKNOWLEDGER (Arpeggio_engraver, stem);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
+
+ADD_TRANSLATOR (Arpeggio_engraver,
+               /* doc */
+               "Generate an Arpeggio symbol.",
+
+               /* create */
+               "Arpeggio",
+
+               /* read */
+               "",
 
-  ADD_TRANSLATOR (Arpeggio_engraver,
-                 /* doc */ "Generate an Arpeggio symbol",
-                 /* create */ "Arpeggio",
-                 /* accept */ "arpeggio-event",
-                 /* read */ "",
-                 /* write */ "");
+               /* write */
+               ""
+               );