Imported Upstream version 2.14.2

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 7bff5a8cd4a9d0cebbfddb04d17ba89b7efb9c82..a92a2a71715adbb366e92b86741fd44f83ad220f 100644 (file)
--- 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--2011 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"
@@ -70,7 +81,16 @@ Collision_engraver::Collision_engraver ()
 ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 
 ADD_TRANSLATOR (Collision_engraver,
-               /* doc */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
-               /* create */ "NoteCollision",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Collect @code{NoteColumns}, and as soon as there are two or"
+               " more, put them in a @code{NoteCollision} object.",
+
+               /* create */
+               "NoteCollision ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );