X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest-collision-engraver.cc;h=d0704a10b50c28a04b57da7dcbd5908a86b4a169;hb=6ff19507c8daefce6654bd3067c1eedb6f6ff3f9;hp=1f8c1c455590fa1c99c18d2c817be3d1cf1797e5;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 1f8c1c4555..d0704a10b5 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,23 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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:
-  virtual void acknowledge_grob (Grob_info);
-  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);
 };
@@ -34,7 +35,7 @@ void
 Rest_collision_engraver::process_acknowledged ()
 {
   if (rest_collision_
-      || note_columns_.is_empty ()
+      || note_columns_.empty ()
       || !rest_count_
       || (note_columns_.size () == rest_count_
 	  && rest_count_ < 2))
@@ -42,19 +43,16 @@ Rest_collision_engraver::process_acknowledged ()
 
   rest_collision_ = make_item ("RestCollision", SCM_EOL);
 
-  for (int i = 0; i < note_columns_.size (); i++)
+  for (vsize i = 0; i < note_columns_.size (); i++)
     Rest_collision::add_column (rest_collision_, note_columns_[i]);
 }
 
 void
-Rest_collision_engraver::acknowledge_grob (Grob_info i)
+Rest_collision_engraver::acknowledge_note_column (Grob_info i)
 {
-  if (Note_column::has_interface (i.grob ()))
-    {
-      note_columns_.push (i.grob ());
-      if (Note_column::has_rests (i.grob ()))
-	rest_count_++;
-    }
+  note_columns_.push_back (i.grob ());
+  if (Note_column::has_rests (i.grob ()))
+    rest_count_++;
 }
 
 void
@@ -67,10 +65,9 @@ Rest_collision_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
+ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
-		/* descr */ "Handles collisions of rests.",
-		/* creats*/ "RestCollision",
-		/* accepts */ "",
-		/* acks  */ "note-column-interface",
-		/* reads */ "",
+		/* doc */ "Handles collisions of rests.",
+		/* create */ "RestCollision",
+		/* read */ "",
 		/* write */ "");