``slikken kreng''

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index e9989408b3759171a0484d804491e2e15eeaeafe..f6bbb7e1a7c04344fc8e0a5ffaceafe1a6c8814c 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,57 +3,81 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
-#include "collision-engraver.hh"
-#include "collision.hh"
+#include "note-collision.hh"
+
+#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_;
+  Link_array<Grob> note_columns_;
+
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_acknowledged_grobs ();
+  virtual void stop_translation_timestep ();
+public:
+  TRANSLATOR_DECLARATIONS(Collision_engraver);
+};
+
 
 void
-Collision_engraver::process_acknowledged ()
+Collision_engraver::process_acknowledged_grobs ()
 {
-   
-  if (col_p_ || note_column_l_arr_.size () < 2)
-      return ;
-  if (!col_p_) 
+  if (col_ || note_columns_.size () < 2)
+    return ;
+  if (!col_) 
     {
-      col_p_ = new Collision;
-      announce_element (Score_element_info (col_p_,0));
+      col_ = new Item (get_property ("NoteCollision"));
+      announce_grob (col_, SCM_EOL);
     }
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    col_p_->add_column (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_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.grob_))
     {
       /*should check Y axis? */
-      if (c->rest_b () || c->dim_cache_[X_AXIS]->parent_l_)
+      if (Note_column::rest_b (i.grob_) || i.grob_->get_parent (X_AXIS))
        return ;
 
-      note_column_l_arr_.push (c);
+      note_columns_.push (i.grob_);
     }
 }
 
 void
-Collision_engraver::do_pre_move_processing()
+Collision_engraver::stop_translation_timestep ()
 {
-  if (col_p_) 
+  if (col_) 
     {
-      typeset_element (col_p_);
-      col_p_ =0;
+      typeset_grob (col_);
+      col_ =0;
     }
-  note_column_l_arr_.clear ();
+  note_columns_.clear ();
 }
 
-Collision_engraver::Collision_engraver()
+Collision_engraver::Collision_engraver ()
 {
-  col_p_ =0;
+  col_ =0;
 }
 
 
 
-ADD_THIS_TRANSLATOR(Collision_engraver);
+
+ENTER_DESCRIPTION(Collision_engraver,
+/* descr */       "",
+/* creats*/       "NoteCollision",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");