*** empty log message ***

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 7184c5be4b0a303ba012d776ca4501710f8b26c8..5ae86b5413c81149610b9d57ba1a83e4772577b0 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,64 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "rest-collision.hh"
 #include "engraver.hh"
-#include "collision.hh"
+#include "note-collision.hh"
 #include "note-column.hh"
 
 class Rest_collision_engraver : public Engraver
 {
-  Item* rest_collision_p_;
+  Item* rest_collision_;
 
-  Link_array<Score_element> note_column_l_arr_;
+  Link_array<Grob> note_columns_;
 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 process_acknowledged_grobs ();
+  virtual void stop_translation_timestep ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Rest_collision_engraver();
-  
+  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;
+  rest_collision_ =0;
 }
 
 void
-Rest_collision_engraver::process_acknowledged ()
+Rest_collision_engraver::process_acknowledged_grobs ()
 {
-  if (rest_collision_p_ || note_column_l_arr_.size () < 2)
+  if (rest_collision_ || note_columns_.size () < 2)
     return;
 
-  rest_collision_p_ = new Item (get_property ("RestCollision"));
-  Rest_collision::set_interface (rest_collision_p_);
-  announce_element (rest_collision_p_, 0);
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    Rest_collision::add_column ( rest_collision_p_,note_column_l_arr_[i]);
+  rest_collision_ = new Item (get_property ("RestCollision"));
+
+  announce_grob(rest_collision_, SCM_EOL);
+  for (int i=0; i< note_columns_.size (); i++)
+    Rest_collision::add_column (rest_collision_,note_columns_[i]);
 }
 
 void
-Rest_collision_engraver::acknowledge_element (Score_element_info i)
+Rest_collision_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column::has_interface (i.elem_l_))
-    note_column_l_arr_.push (i.elem_l_);
+  if (Note_column::has_interface (i.grob_))
+    note_columns_.push (i.grob_);
 }
 
 void
-Rest_collision_engraver::do_pre_move_processing()
+Rest_collision_engraver::stop_translation_timestep ()
 {
-  if (rest_collision_p_) 
+  if (rest_collision_) 
     {
-      typeset_element (rest_collision_p_);
-      rest_collision_p_ = 0;
+      typeset_grob (rest_collision_);
+      rest_collision_ = 0;
     }
-  note_column_l_arr_.clear ();
+  note_columns_.clear ();
 }
+ENTER_DESCRIPTION(Rest_collision_engraver,
+/* descr */       "Handles collisions of rests.",
+/* creats*/       "RestCollision",
+/* accepts */     "",
+/* acks  */      "note-column-interface",
+/* reads */       "",
+/* write */       "");