patch::: 1.3.130.jcn1

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index ecca483478ffefd3450aadda7c1cbfb1e1667ce1..7f361c5d8ec0a26bbb5e49a232c6c2b777ba358e 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,50 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
-#include "collision-engraver.hh"
 #include "collision.hh"
-#include "dimension-cache.hh"
 
-ADD_THIS_TRANSLATOR (Collision_engraver);
+#include "engraver.hh"
+#include "axis-group-interface.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_;
+
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep();
+public:
+  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 ;
+    return ;
   if (!col_p_) 
     {
-      col_p_ = new Collision;
-      announce_element (Score_element_info (col_p_,0));
+      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);
     }
+  
   for (int i=0; i< note_column_l_arr_.size (); i++)
-    col_p_->add_column (note_column_l_arr_[i]);
+    Collision::add_column (col_p_,note_column_l_arr_[i]);
 }
 
 void
-Collision_engraver::acknowledge_element (Score_element_info i)
+Collision_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column * c = dynamic_cast<Note_column *> (i.elem_l_))
+  if (Note_column::has_interface (i.elem_l_))
     {
       /*should check Y axis? */
-      if (c->rest_b () || c->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 (c);
+      note_column_l_arr_.push (i.elem_l_);
     }
 }
 
 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 ();
@@ -56,3 +75,7 @@ Collision_engraver::Collision_engraver()
 {
   col_p_ =0;
 }
+
+
+
+ADD_THIS_TRANSLATOR(Collision_engraver);