X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=43974170de67bc891f073feb2b46ff7fd3e6745f;hb=66adac8fa4ba5126100ff8748a2576c6983637c5;hp=2b8c4923feb5b6e67558a054386bbfc2d817b1a1;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 2b8c4923fe..43974170de 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,83 +1,76 @@
 /*
-  collision-reg.cc -- implement Collision_engraver
+  collision-engraver.cc -- implement Collision_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "note-column.hh"
-#include "collision.hh"
-
 #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"));
-      announce_grob (col_p_, SCM_EOL);
-    }
-  
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    Collision::add_column (col_p_,note_column_l_arr_[i]);
+  if (col_ || note_columns_.size () < 2)
+    return;
+  if (!col_)
+    col_ = make_item ("NoteCollision", SCM_EOL);
+
+  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_->get_parent (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);
 
-
-ENTER_DESCRIPTION(Collision_engraver,
-/* descr */       "",
-/* creats*/       "NoteCollision",
-/* acks  */       "note-column-interface",
-/* reads */       "",
-/* write */       "");
+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 */ "");