X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=c468b610614d584733ddf8fa7c6186ebb92fe081;hb=fe6b181832f78629fc2285dc1d23dccc7373e9ec;hp=ff947053d2ad94319179247c83ecc2cbca4ee3e1;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index ff947053d2..c468b61061 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
-#include "collision.hh"
+#include "note-collision.hh"
 
 #include "engraver.hh"
 #include "axis-group-interface.hh"
@@ -15,72 +15,67 @@
 /*
   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_;
+  Link_array<Grob> note_columns_;
 
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
 public:
-  TRANSLATOR_DECLARATIONS(Collision_engraver);
+  TRANSLATOR_DECLARATIONS (Collision_engraver);
 };
 
 
 void
-Collision_engraver::create_grobs ()
+Collision_engraver::process_acknowledged_grobs ()
 {
-  if (col_p_ || note_column_l_arr_.size () < 2)
+  if (col_ || note_columns_.size () < 2)
     return ;
-  if (!col_p_) 
+  if (!col_) 
     {
-      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);
-
-      announce_grob (col_p_, SCM_EOL);
+      col_ = make_item ("NoteCollision", SCM_EOL);
+      
     }
   
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    Collision::add_column (col_p_,note_column_l_arr_[i]);
+  for (int i=0; i< note_columns_.size (); i++)
+    Note_collision_interface::add_column (col_,note_columns_[i]);
 }
 
 void
 Collision_engraver::acknowledge_grob (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))
+      if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
 	return ;
 
-      note_column_l_arr_.push (i.grob_l_);
+      note_columns_.push (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;
 }
 
 
 
 
-ENTER_DESCRIPTION(Collision_engraver,
+ENTER_DESCRIPTION (Collision_engraver,
 /* descr */       "",
 /* creats*/       "NoteCollision",
-/* acks  */       "note-column-interface",
+/* accepts */     "",
+/* acks  */      "note-column-interface",
 /* reads */       "",
 /* write */       "");