* Documentation/windows/zlily-profile.sh:

[lilypond.git] / lily / collision-engraver.cc

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index ca18e2ddde1b8fe1ce3b0cf1faf1bf46f52b80ea..8e8c0f4fa0b0cacba474295c2efe841da630d1d3 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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"
@@ -24,8 +24,7 @@ protected:
   virtual void create_grobs ();
   virtual void stop_translation_timestep ();
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Collision_engraver ();
+  TRANSLATOR_DECLARATIONS(Collision_engraver);
 };
 
 
@@ -37,26 +36,23 @@ Collision_engraver::create_grobs ()
   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);
-
-      announce_grob (col_p_,0);
+      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]);
+    Note_collision_interface::add_column (col_p_,note_column_l_arr_[i]);
 }
 
 void
 Collision_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column::has_interface (i.elem_l_))
+  if (Note_column::has_interface (i.grob_l_))
     {
       /*should check Y axis? */
-      if (Note_column::rest_b (i.elem_l_) || i.elem_l_->parent_l (X_AXIS))
+      if (Note_column::rest_b (i.grob_l_) || i.grob_l_->get_parent (X_AXIS))
        return ;
 
-      note_column_l_arr_.push (i.elem_l_);
+      note_column_l_arr_.push (i.grob_l_);
     }
 }
 
@@ -78,4 +74,10 @@ Collision_engraver::Collision_engraver ()
 
 
 
-ADD_THIS_TRANSLATOR (Collision_engraver);
+
+ENTER_DESCRIPTION(Collision_engraver,
+/* descr */       "",
+/* creats*/       "NoteCollision",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");