patch::: 1.3.136.jcn3

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 9b3218de78922fd0eadd0c253a7270bba2d842d3..ca18e2ddde1b8fe1ce3b0cf1faf1bf46f52b80ea 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
@@ -17,30 +17,30 @@
   a collision object.  */
 class Collision_engraver : public Engraver {
   Item * col_p_;
-  Link_array<Score_element> note_column_l_arr_;
+  Link_array<Grob> note_column_l_arr_;
 
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Collision_engraver();
+  VIRTUAL_COPY_CONS (Translator);
+  Collision_engraver ();
 };
 
 
 void
-Collision_engraver::process_acknowledged ()
+Collision_engraver::create_grobs ()
 {
   if (col_p_ || note_column_l_arr_.size () < 2)
     return ;
   if (!col_p_) 
     {
-      col_p_ = new Item (get_property ("basicCollisionProperties"));
+      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_element (Score_element_info (col_p_,0));
+      announce_grob (col_p_,0);
     }
   
   for (int i=0; i< note_column_l_arr_.size (); i++)
@@ -48,12 +48,12 @@ Collision_engraver::process_acknowledged ()
 }
 
 void
-Collision_engraver::acknowledge_element (Score_element_info i)
+Collision_engraver::acknowledge_grob (Grob_info i)
 {
   if (Note_column::has_interface (i.elem_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.elem_l_) || i.elem_l_->parent_l (X_AXIS))
        return ;
 
       note_column_l_arr_.push (i.elem_l_);
@@ -61,21 +61,21 @@ Collision_engraver::acknowledge_element (Score_element_info i)
 }
 
 void
-Collision_engraver::do_pre_move_processing()
+Collision_engraver::stop_translation_timestep ()
 {
   if (col_p_) 
     {
-      typeset_element (col_p_);
+      typeset_grob (col_p_);
       col_p_ =0;
     }
   note_column_l_arr_.clear ();
 }
 
-Collision_engraver::Collision_engraver()
+Collision_engraver::Collision_engraver ()
 {
   col_p_ =0;
 }
 
 
 
-ADD_THIS_TRANSLATOR(Collision_engraver);
+ADD_THIS_TRANSLATOR (Collision_engraver);