* lilypond/scm-option.cc (ly_option_usage): Add final newline.

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index d3eba9978dad3fdb5ac7d671f18428dd351b167e..13edfdd486bee94df2fbf744f1f60850c590f7df 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  collision-reg.cc -- implement Collision_engraver
+  collision-engraver.cc -- implement Collision_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -14,7 +14,7 @@
 
 class Collision_engraver : public Engraver
 {
-  Item * col_;
+  Item *col_;
   Link_array<Grob> note_columns_;
 
 protected:
@@ -25,20 +25,18 @@ public:
   TRANSLATOR_DECLARATIONS (Collision_engraver);
 };
 
-
 void
 Collision_engraver::process_acknowledged_grobs ()
 {
   if (col_ || note_columns_.size () < 2)
-    return ;
-  if (!col_) 
+    return;
+  if (!col_)
     {
       col_ = make_item ("NoteCollision", SCM_EOL);
-      
     }
-  
-  for (int i = 0; i< note_columns_.size (); i++)
-    Note_collision_interface::add_column (col_,note_columns_[i]);
+
+  for (int i = 0; i < note_columns_.size (); i++)
+    Note_collision_interface::add_column (col_, note_columns_[i]);
 }
 
 void
@@ -48,7 +46,7 @@ Collision_engraver::acknowledge_grob (Grob_info i)
     {
       /*should check Y axis? */
       if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
-       return ;
+       return;
 
       note_columns_.push (i.grob_);
     }
@@ -66,13 +64,10 @@ Collision_engraver::Collision_engraver ()
   col_ = 0;
 }
 
-
-
-
 ADD_TRANSLATOR (Collision_engraver,
-/* descr */       "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
-/* creats*/       "NoteCollision",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "",
-/* write */       "");
+               /* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
+               /* creats*/ "NoteCollision",
+               /* accepts */ "",
+               /* acks  */ "note-column-interface",
+               /* reads */ "",
+               /* write */ "");