X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=52c811b6338bb13be863b459e5232e3858979a68;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=22cfd55171103e379f78115736ddc8bfd105dc8f;hpb=0d6207e894224577f9879f4036ef8cab4925c4c7;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 22cfd55171..52c811b633 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,54 +3,53 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
+#include "item.hh"
 
 class Collision_engraver : public Engraver
 {
-  Item * col_;
-  Link_array<Grob> note_columns_;
+  Item *col_;
+  vector<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);
-      
-    }
-  
-  for (int i = 0; i< note_columns_.size (); i++)
+    return;
+  if (!col_)
+    col_ = make_item ("NoteCollision", SCM_EOL);
+
+  for (vsize 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_))
+  if (Note_column::has_interface (i.grob ()))
     {
       /*should check Y axis? */
-      if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
-	return ;
+      if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
+	return;
 
-      note_columns_.push (i.grob_);
+      if (to_boolean (i.grob ()->get_property ("ignore-collision")))
+	return;
+      
+      note_columns_.push_back (i.grob ());
     }
 }
 
@@ -66,13 +65,21 @@ 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 */       "",
-/* write */       "");
+		/* doc */
+		"Collect @code{NoteColumns}, and as soon as there are two or"
+		" more, put them in a @code{NoteCollision} object.",
+
+		/* create */
+		"NoteCollision ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);