* The grand 2005-2006 replace.

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index eca0414667da9919c518f79d0dd3fa9075e4281b..5a6aa6cfbf62947d35e7a081752cc884df54fa69 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,7 +3,7 @@
 
   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 "warn.hh"
@@ -17,9 +17,9 @@ class Rest_collision_engraver : public Engraver
   int rest_count_;
   Link_array<Grob> note_columns_;
 protected:
-  DECLARE_ACKNOWLEDGER(note_column);
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 public:
   TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
@@ -64,11 +64,10 @@ Rest_collision_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Rest_collision_engraver, note_column);
+ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
-               /* descr */ "Handles collisions of rests.",
-               /* creats*/ "RestCollision",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "",
+               /* doc */ "Handles collisions of rests.",
+               /* create */ "RestCollision",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");