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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 32dddc1d7a..58c6103480 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  collision-engraver.cc -- implement Collision_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -46,6 +57,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 ());
     }
 }
@@ -67,7 +81,16 @@ Collision_engraver::Collision_engraver ()
 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",
-		/* read */ "",
-		/* 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 */
+		""
+		);