X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=7bff5a8cd4a9d0cebbfddb04d17ba89b7efb9c82;hb=1f3a3c18f8914a996be5af986d8c6f7e022d4ea3;hp=32dddc1d7ae36c91e3079b7c840856307c6e6b64;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 32dddc1d7a..7bff5a8cd4 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -46,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 ());
     }
 }