release: 1.5.38

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 606dfe30d6e81bf136e0c716e66783b1cb3221c8..7bdfbbf9276dccb0bbd3ca43944bbd161d44bf12 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,51 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "debug.hh"
 #include "rest-collision.hh"
-#include "rest-collision-engraver.hh"
+#include "engraver.hh"
 #include "collision.hh"
 #include "note-column.hh"
 
+class Rest_collision_engraver : public Engraver
+{
+  Item* rest_collision_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:
+  TRANSLATOR_DECLARATIONS(Rest_collision_engraver);  
+};
 
 
-ADD_THIS_TRANSLATOR(Rest_collision_engraver);
 
-Rest_collision_engraver::Rest_collision_engraver()
+Rest_collision_engraver::Rest_collision_engraver ()
 {
   rest_collision_p_ =0;
 }
 
 void
-Rest_collision_engraver::process_acknowledged ()
+Rest_collision_engraver::create_grobs ()
 {
   if (rest_collision_p_ || note_column_l_arr_.size () < 2)
     return;
 
-  rest_collision_p_ = new Rest_collision (get_property ("basicRestCollisionProperties"));
-  
-  announce_element (Score_element_info (rest_collision_p_, 0));
+  rest_collision_p_ = new Item (get_property ("RestCollision"));
+  Rest_collision::set_interface (rest_collision_p_);
+  announce_grob(rest_collision_p_, SCM_EOL);
   for (int i=0; i< note_column_l_arr_.size (); i++)
-    rest_collision_p_->add_column (note_column_l_arr_[i]);
+    Rest_collision::add_column (rest_collision_p_,note_column_l_arr_[i]);
 }
 
 void
-Rest_collision_engraver::acknowledge_element (Score_element_info i)
+Rest_collision_engraver::acknowledge_grob (Grob_info i)
 {
-  if (dynamic_cast<Note_column *> (i.elem_l_))
-    note_column_l_arr_.push (dynamic_cast<Note_column *> (i.elem_l_));
+  if (Note_column::has_interface (i.grob_l_))
+    note_column_l_arr_.push (i.grob_l_);
 }
 
 void
-Rest_collision_engraver::do_pre_move_processing()
+Rest_collision_engraver::stop_translation_timestep ()
 {
   if (rest_collision_p_) 
     {
-      typeset_element (rest_collision_p_);
+      typeset_grob (rest_collision_p_);
       rest_collision_p_ = 0;
     }
   note_column_l_arr_.clear ();
 }
+ENTER_DESCRIPTION(Rest_collision_engraver,
+/* descr */       "Handles collisions of rests.",
+/* creats*/       "RestCollision",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");