X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=4b4d91f2bab0dc5b23500eebbb19042ec2be51b2;hb=aeffb48dcc7e667ba2724bee3578fee4ac86d95c;hp=79d66f6c127bd6c41da73cbbc7146fdaab3e0270;hpb=fcc5f76615e024803904a055902fdc6a3b24dccb;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 79d66f6c12..4b4d91f2ba 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  collision-engraver.cc -- implement Collision_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -15,7 +26,7 @@
 class Collision_engraver : public Engraver
 {
   Item *col_;
-  vector<Grob*> note_columns_;
+  vector<Grob *> note_columns_;
 
 protected:
   DECLARE_ACKNOWLEDGER (note_column);
@@ -44,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 ());
     }
 }
@@ -70,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 */
+                ""
+               );