X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=60bb70f6a4d7e6c94405d22bdc93cf8e8fa9881f;hb=f2c2c5c43858f323e4708f83fd97e0f38017c275;hp=756bb50bee558650b1fb9ad17f65b17bc0430f1a;hpb=8f58f4428d70961938e9151097886d861b3faeb3;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 756bb50bee..60bb70f6a4 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,52 +1,73 @@
 /*
-  rest-collision-reg.cc -- implement Rest_collision_engraver
+  rest-collision-engraver.cc -- implement Rest_collision_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
+#include "warn.hh"
+#include "engraver.hh"
 #include "rest-collision.hh"
-#include "rest-collision-engraver.hh"
-#include "collision.hh"
 #include "note-column.hh"
 
+class Rest_collision_engraver : public Engraver
+{
+  Item *rest_collision_;
+  int rest_count_;
+  Link_array<Grob> note_columns_;
+protected:
+  DECLARE_ACKNOWLEDGER(note_column);
+  PRECOMPUTED_VIRTUAL void process_acknowledged ();
+  PRECOMPUTED_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;
+  rest_collision_ = 0;
+  rest_count_ = 0;
 }
 
 void
 Rest_collision_engraver::process_acknowledged ()
 {
-  if (rest_collision_p_ || note_column_l_arr_.size () < 2)
+  if (rest_collision_
+      || note_columns_.is_empty ()
+      || !rest_count_
+      || (note_columns_.size () == rest_count_
+	  && rest_count_ < 2))
     return;
 
-  rest_collision_p_ = new Rest_collision;
-  announce_element (Score_element_info (rest_collision_p_, 0));
-  for (int i=0; i< note_column_l_arr_.size (); i++)
-    rest_collision_p_->add_column (note_column_l_arr_[i]);
+  rest_collision_ = make_item ("RestCollision", 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_note_column (Grob_info i)
 {
-  if (dynamic_cast<Note_column *> (i.elem_l_))
-    note_column_l_arr_.push (dynamic_cast<Note_column *> (i.elem_l_));
+  note_columns_.push (i.grob ());
+  if (Note_column::has_rests (i.grob ()))
+    rest_count_++;
 }
 
 void
-Rest_collision_engraver::do_pre_move_processing()
+Rest_collision_engraver::stop_translation_timestep ()
 {
-  if (rest_collision_p_) 
-    {
-      typeset_element (rest_collision_p_);
-      rest_collision_p_ = 0;
-    }
-  note_column_l_arr_.clear ();
+  rest_collision_ = 0;
+  note_columns_.clear ();
+  rest_count_ = 0;
 }
+
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER(Rest_collision_engraver, note_column);
+ADD_TRANSLATOR (Rest_collision_engraver,
+		/* descr */ "Handles collisions of rests.",
+		/* creats*/ "RestCollision",
+		/* accepts */ "",
+		/* reads */ "",
+		/* write */ "");