X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=0291bfae3b75430aab0d5469fb06edba8ddffa56;hb=f0968255554403de5d86b7e6efff5e644cba7f7a;hp=0ebc5dde5e4e72f51041fc5df754c6eece0024c8;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 0ebc5dde5e..0291bfae3b 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -3,64 +3,73 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
-#include "rest-collision.hh"
+#include "warn.hh"
 #include "engraver.hh"
-#include "collision.hh"
+#include "rest-collision.hh"
 #include "note-column.hh"
 
 class Rest_collision_engraver : public Engraver
 {
-  Item* rest_collision_p_;
-
-  Link_array<Grob> note_column_l_arr_;
+  Item* rest_collision_;
+  int rest_count_; 
+  Link_array<Grob> note_columns_;
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
-  virtual void stop_translation_timestep();
+  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;
+  rest_count_ = 0;
 }
 
 void
-Rest_collision_engraver::create_grobs ()
+Rest_collision_engraver::process_acknowledged_grobs ()
 {
-  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 Item (get_property ("RestCollision"));
-  Rest_collision::set_interface (rest_collision_p_);
-  announce_grob (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_ = 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_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_);
+      if (Note_column::has_rests (i.grob_))
+	rest_count_ ++;
+    }
 }
 
 void
-Rest_collision_engraver::stop_translation_timestep()
+Rest_collision_engraver::stop_translation_timestep ()
 {
-  if (rest_collision_p_) 
-    {
-      typeset_grob (rest_collision_p_);
-      rest_collision_p_ = 0;
-    }
-  note_column_l_arr_.clear ();
+  rest_collision_ = 0;
+  note_columns_.clear ();
+  rest_count_ = 0;
 }
+
+ADD_TRANSLATOR (Rest_collision_engraver,
+/* descr */       "Handles collisions of rests.",
+/* creats*/       "RestCollision",
+/* accepts */     "",
+/* acks  */      "note-column-interface",
+/* reads */       "",
+/* write */       "");