Run `make grand-replace'.

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 1ee16363ae80c6184f2af6c7f2f96fe5d713f065..df1c486924e296d59aa5f2bb54fbba632fce2c12 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
 #include "engraver.hh"
 #include "rest-collision.hh"
 #include "note-column.hh"
+#include "item.hh"
 
 class Rest_collision_engraver : public Engraver
 {
   Item *rest_collision_;
-  int rest_count_;
-  Link_array__Grob_ note_columns_;
+  vsize rest_count_;
+  vector<Grob*> note_columns_;
 protected:
   DECLARE_ACKNOWLEDGER (note_column);
   void process_acknowledged ();
@@ -66,8 +67,15 @@ Rest_collision_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
-               /* doc */ "Handles collisions of rests.",
-               /* create */ "RestCollision",
-               /* accept */ "",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Handle collisions of rests.",
+
+               /* create */
+               "RestCollision ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );