Run grand replace for 2015.

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 53ec1a343065fa39b16ba7ff553cbe21dddf2874..d2cf95e1e8515d33962325207af37dd59e456cb6 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 class Collision_engraver : public Engraver
 {
   Item *col_;
-  vector<Grob*> note_columns_;
+  vector<Grob *> note_columns_;
 
 protected:
   DECLARE_ACKNOWLEDGER (note_column);
@@ -55,11 +55,11 @@ Collision_engraver::acknowledge_note_column (Grob_info i)
     {
       /*should check Y axis? */
       if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
-       return;
+        return;
 
       if (to_boolean (i.grob ()->get_property ("ignore-collision")))
-       return;
-      
+        return;
+
       note_columns_.push_back (i.grob ());
     }
 }
@@ -81,16 +81,16 @@ Collision_engraver::Collision_engraver ()
 ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 
 ADD_TRANSLATOR (Collision_engraver,
-               /* doc */
-               "Collect @code{NoteColumns}, and as soon as there are two or"
-               " more, put them in a @code{NoteCollision} object.",
+                /* doc */
+                "Collect @code{NoteColumns}, and as soon as there are two or"
+                " more, put them in a @code{NoteCollision} object.",
 
-               /* create */
-               "NoteCollision ",
+                /* create */
+                "NoteCollision ",
 
-               /* read */
-               "",
+                /* read */
+                "",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );