X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=a645f36f7efc70df4701790d5882172693b85de0;hb=09bf9a18185476020686ff65b5d70b57051be780;hp=0c5b63b89cdb17942c89a52020816e13765ba94b;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 0c5b63b89c..a645f36f7e 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,24 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 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_;
+  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 (Collision_engraver);
 };
@@ -31,16 +31,14 @@ 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++)
+  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 ()))
     {
@@ -48,7 +46,10 @@ Collision_engraver::acknowledge_grob (Grob_info i)
       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,10 +67,19 @@ Collision_engraver::Collision_engraver ()
 
 #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 */
+		""
+		);