* lily/all-font-metrics.cc (find_font): Add "lm" to try-AFM-first

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index af3d0ecc8903c03a8a1d5e05e7c009abe2981e5f..7af8ad7a73e97a6cbc3e5c54b50d5311ab5d6f57 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
@@ -22,11 +21,9 @@ protected:
   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;
@@ -38,12 +35,14 @@ 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]);
 }
@@ -62,16 +61,12 @@ Rest_collision_engraver::acknowledge_grob (Grob_info i)
 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,
+ENTER_DESCRIPTION (Rest_collision_engraver,
 /* descr */       "Handles collisions of rests.",
 /* creats*/       "RestCollision",
 /* accepts */     "",