* The grand 2005-2006 replace.

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 66813fb37ce70629dd7e0b374cd9be5e87b391a2..637d6d964311ef86ba06a27f0c78953458ec68c4 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
 #include "note-column.hh"
 #include "note-collision.hh"
-
-#include "engraver.hh"
 #include "axis-group-interface.hh"
 
 class Collision_engraver : public Engraver
@@ -18,29 +17,27 @@ class Collision_engraver : public Engraver
   Link_array<Grob> note_columns_;
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 public:
   TRANSLATOR_DECLARATIONS (Collision_engraver);
 };
 
 void
-Collision_engraver::process_acknowledged_grobs ()
+Collision_engraver::process_acknowledged ()
 {
   if (col_ || note_columns_.size () < 2)
     return;
   if (!col_)
-    {
-      col_ = make_item ("NoteCollision", SCM_EOL);
-    }
+    col_ = make_item ("NoteCollision", SCM_EOL);
 
   for (int i = 0; i < note_columns_.size (); i++)
     Note_collision_interface::add_column (col_, note_columns_[i]);
 }
 
 void
-Collision_engraver::acknowledge_grob (Grob_info i)
+Collision_engraver::acknowledge_note_column (Grob_info i)
 {
   if (Note_column::has_interface (i.grob ()))
     {
@@ -64,10 +61,13 @@ Collision_engraver::Collision_engraver ()
   col_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Collision_engraver, note_column);
+
 ADD_TRANSLATOR (Collision_engraver,
-               /* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
-               /* creats*/ "NoteCollision",
-               /* accepts */ "",
-               /* acks  */ "note-column-interface",
-               /* reads */ "",
+               /* doc */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
+               /* create */ "NoteCollision",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");