X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=4b4d91f2bab0dc5b23500eebbb19042ec2be51b2;hb=9d3a999b3ae3502633858c50185c0180949d405c;hp=eb52ebd0f8f7e95fb516885ff66af1ba7ab61320;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index eb52ebd0f8..4b4d91f2ba 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,86 +1,96 @@
 /*
-  collision-reg.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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2001 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.
 
-#include "note-column.hh"
-#include "collision.hh"
+  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"
 
-/*
-  collect Note_column, and as soon as there are 2 or more, put them in
-  a collision object.  */
-class Collision_engraver : public Engraver {
-  Item * col_p_;
-  Link_array<Grob> note_column_l_arr_;
+class Collision_engraver : public Engraver
+{
+  Item *col_;
+  vector<Grob *> note_columns_;
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 public:
-  TRANSLATOR_DECLARATIONS(Collision_engraver);
+  TRANSLATOR_DECLARATIONS (Collision_engraver);
 };
 
-
 void
-Collision_engraver::create_grobs ()
+Collision_engraver::process_acknowledged ()
 {
-  if (col_p_ || note_column_l_arr_.size () < 2)
-    return ;
-  if (!col_p_) 
-    {
-      col_p_ = new Item (get_property ("NoteCollision"));
-      Axis_group_interface::set_interface (col_p_);
-      Axis_group_interface::set_axes (col_p_, X_AXIS, Y_AXIS);
+  if (col_ || note_columns_.size () < 2)
+    return;
+  if (!col_)
+    col_ = make_item ("NoteCollision", SCM_EOL);
 
-      announce_grob (col_p_,0);
-    }
-  
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    Collision::add_column (col_p_,note_column_l_arr_[i]);
+  for (vsize i = 0; i < note_columns_.size (); i++)
+    Note_collision_interface::add_column (col_, note_columns_[i]);
 }
 
 void
-Collision_engraver::acknowledge_grob (Grob_info i)
+Collision_engraver::acknowledge_note_column (Grob_info i)
 {
-  if (Note_column::has_interface (i.grob_l_))
+  if (Note_column::has_interface (i.grob ()))
     {
       /*should check Y axis? */
-      if (Note_column::rest_b (i.grob_l_) || i.grob_l_->parent_l (X_AXIS))
-	return ;
+      if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
+        return;
 
-      note_column_l_arr_.push (i.grob_l_);
+      if (to_boolean (i.grob ()->get_property ("ignore-collision")))
+        return;
+
+      note_columns_.push_back (i.grob ());
     }
 }
 
 void
 Collision_engraver::stop_translation_timestep ()
 {
-  if (col_p_) 
-    {
-      typeset_grob (col_p_);
-      col_p_ =0;
-    }
-  note_column_l_arr_.clear ();
+  col_ = 0;
+  note_columns_.clear ();
 }
 
 Collision_engraver::Collision_engraver ()
 {
-  col_p_ =0;
+  col_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Collision_engraver, note_column);
+
+ADD_TRANSLATOR (Collision_engraver,
+                /* doc */
+                "Collect @code{NoteColumns}, and as soon as there are two or"
+                " more, put them in a @code{NoteCollision} object.",
 
+                /* create */
+                "NoteCollision ",
 
+                /* read */
+                "",
 
-ENTER_DESCRIPTION(Collision_engraver,
-/* descr */       "",
-/* creats*/       "NoteCollision",
-/* acks  */       "note-column-interface",
-/* reads */       "",
-/* write */       "");
+                /* write */
+                ""
+               );