X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=d2cf95e1e8515d33962325207af37dd59e456cb6;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=2a61907af2a7fef3844b297c5ff07dc6e5ef5eb4;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 2a61907af2..d2cf95e1e8 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,24 +1,35 @@
 /*
-  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.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 "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:
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   void process_acknowledged ();
   void stop_translation_timestep ();
 public:
@@ -31,11 +42,9 @@ 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]);
 }
 
@@ -46,9 +55,12 @@ Collision_engraver::acknowledge_note_column (Grob_info i)
     {
       /*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 (i.grob ());
+      note_columns_.push_back (i.grob ());
     }
 }
 
@@ -66,11 +78,19 @@ Collision_engraver::Collision_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Collision_engraver, note_column);
+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 */ "",
-		/* 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 */
+                ""
+               );