Web: really read search-box HTML file in UTF-8

[lilypond.git] / lily / note-column.cc

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 68075fc25001306a2033b529d48fbc34c59053a8..9d75a326f1e9651c188764bfa01176b5b5920d3b 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -1,9 +1,20 @@
 /*
-  note-column.cc -- implement Note_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2009 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 "note-column.hh"
@@ -210,12 +221,13 @@ Note_column::cross_staff_extent (Grob *me, Grob *refp)
 }
 
 ADD_INTERFACE (Note_column,
-              "Stem and noteheads combined",
+              "Stem and noteheads combined.",
 
               /* properties */
               "arpeggio "
               "force-hshift "
               "horizontal-shift "
+              "ignore-collision "
               "note-heads "
               "rest "
               "rest-collision "