X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=2d718092f0d26dbabc42fc6ffcdb6b4e3bb0e4c7;hb=df7667c81afced0f9d6422b5cbaaf49fd5b3ae1f;hp=af3d0ecc8903c03a8a1d5e05e7c009abe2981e5f;hpb=67b894e5352976437c9db5d7b15fd51326bab56a;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index af3d0ecc89..2d718092f0 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,35 +1,32 @@
 /*
-  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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "warn.hh"
-#include "rest-collision.hh"
 #include "engraver.hh"
-#include "note-collision.hh"
+#include "rest-collision.hh"
 #include "note-column.hh"
 
 class Rest_collision_engraver : public Engraver
 {
-  Item* rest_collision_;
-  int rest_count_; 
+  Item *rest_collision_;
+  int rest_count_;
   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(Rest_collision_engraver);  
+  TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
 
-
-
 Rest_collision_engraver::Rest_collision_engraver ()
 {
-  rest_collision_ =0;
+  rest_collision_ = 0;
   rest_count_ = 0;
 }
 
@@ -38,43 +35,40 @@ Rest_collision_engraver::process_acknowledged_grobs ()
 {
   if (rest_collision_
       || note_columns_.is_empty ()
-      || !rest_count_)
+      || !rest_count_
+      || (note_columns_.size () == rest_count_
+	  && rest_count_ < 2))
     return;
 
-  rest_collision_ = make_item ("RestCollision");
+  rest_collision_ = make_item ("RestCollision", SCM_EOL);
 
-  announce_grob(rest_collision_, SCM_EOL);
-  for (int i=0; i < note_columns_.size (); i++)
-    Rest_collision::add_column (rest_collision_,note_columns_[i]);
+  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.grob_))
+  if (Note_column::has_interface (i.grob ()))
     {
-      note_columns_.push (i.grob_);
-      if (Note_column::has_rests (i.grob_))
-	rest_count_ ++;
+      note_columns_.push (i.grob ());
+      if (Note_column::has_rests (i.grob ()))
+	rest_count_++;
     }
 }
 
 void
 Rest_collision_engraver::stop_translation_timestep ()
 {
-  if (rest_collision_) 
-    {
-      typeset_grob (rest_collision_);
-      rest_collision_ = 0;
-    }
+  rest_collision_ = 0;
   note_columns_.clear ();
   rest_count_ = 0;
 }
 
-ENTER_DESCRIPTION(Rest_collision_engraver,
-/* descr */       "Handles collisions of rests.",
-/* creats*/       "RestCollision",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Rest_collision_engraver,
+		/* descr */ "Handles collisions of rests.",
+		/* creats*/ "RestCollision",
+		/* accepts */ "",
+		/* acks  */ "note-column-interface",
+		/* reads */ "",
+		/* write */ "");