X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=7bff5a8cd4a9d0cebbfddb04d17ba89b7efb9c82;hb=ee232b8901151e7371f77b099be6894bfcfad792;hp=285dd9082081f64e65c49470048475495ee28fcf;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 285dd90820..7bff5a8cd4 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "note-column.hh"
 #include "note-collision.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:
   DECLARE_ACKNOWLEDGER (note_column);
@@ -45,6 +46,9 @@ Collision_engraver::acknowledge_note_column (Grob_info i)
       if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
 	return;
 
+      if (to_boolean (i.grob ()->get_property ("ignore-collision")))
+	return;
+      
       note_columns_.push_back (i.grob ());
     }
 }
@@ -68,6 +72,5 @@ ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 ADD_TRANSLATOR (Collision_engraver,
 		/* doc */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
 		/* create */ "NoteCollision",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");