* lily/rest.cc (polyphonic_offset_callback): new function. Do

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index af3d0ecc8903c03a8a1d5e05e7c009abe2981e5f..893a781501311fceb53f3ccc938ee01fc50c6cc2 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -7,9 +7,8 @@
 */
 
 #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
@@ -25,8 +24,6 @@ public:
   TRANSLATOR_DECLARATIONS(Rest_collision_engraver);  
 };
 
-
-
 Rest_collision_engraver::Rest_collision_engraver ()
 {
   rest_collision_ =0;
@@ -38,7 +35,9 @@ 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");