add \defaultchild to InnerStaffGroup.

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 28f8002305da5e929052afccec1284c08d263e7b..2d718092f0d26dbabc42fc6ffcdb6b4e3bb0e4c7 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  rest-collision-reg.cc -- implement Rest_collision_engraver
+  rest-collision-engraver.cc -- implement Rest_collision_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -13,15 +13,15 @@
 
 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 ()
@@ -35,14 +35,13 @@ 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))
+         && rest_count_ < 2))
     return;
 
   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]);
 }
@@ -50,11 +49,11 @@ Rest_collision_engraver::process_acknowledged_grobs ()
 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_++;
     }
 }
 
@@ -67,9 +66,9 @@ Rest_collision_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Rest_collision_engraver,
-/* descr */       "Handles collisions of rests.",
-/* creats*/       "RestCollision",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+               /* descr */ "Handles collisions of rests.",
+               /* creats*/ "RestCollision",
+               /* accepts */ "",
+               /* acks  */ "note-column-interface",
+               /* reads */ "",
+               /* write */ "");