X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=ca6a52d320a09dde5c5ff326611bfe4309ded81b;hb=1478b35691bfdb6e805d7225ee44fbec0622e8fc;hp=7f56435e81958c806e053171e3ec4793645d5465;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 7f56435e81..ca6a52d320 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,23 +1,37 @@
 /*
-  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--2015 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"
 #include "note-column.hh"
 #include "note-collision.hh"
 #include "axis-group-interface.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Collision_engraver : public Engraver
 {
   Item *col_;
-  vector<Grob*> note_columns_;
+  vector<Grob *> note_columns_;
 
 protected:
-  DECLARE_ACKNOWLEDGER (note_column);
+  void acknowledge_note_column (Grob_info);
   void process_acknowledged ();
   void stop_translation_timestep ();
 public:
@@ -39,11 +53,14 @@ Collision_engraver::process_acknowledged ()
 void
 Collision_engraver::acknowledge_note_column (Grob_info i)
 {
-  if (Note_column::has_interface (i.grob ()))
+  if (has_interface<Note_column> (i.grob ()))
     {
       /*should check Y axis? */
       if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
-	return;
+        return;
+
+      if (to_boolean (i.grob ()->get_property ("ignore-collision")))
+        return;
 
       note_columns_.push_back (i.grob ());
     }
@@ -61,12 +78,24 @@ Collision_engraver::Collision_engraver ()
   col_ = 0;
 }
 
-#include "translator.icc"
 
-ADD_ACKNOWLEDGER (Collision_engraver, note_column);
+void
+Collision_engraver::boot ()
+{
+  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 */
+                ""
+               );