Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / font-interface.cc

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 5dc2129c147696a34ea86738624ebf427167f0a7..4085140311fc8ea866c14a63736ab41d01d19d32 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,9 +1,20 @@
 /*
-  font-interface.cc -- implement Font_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--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 "font-interface.hh"
@@ -50,9 +61,10 @@ Font_interface::text_font_alist_chain (Grob *g)
 }
 
 ADD_INTERFACE (Font_interface,
-              "Any symbol that is typeset through fixed sets of glyphs, "
-              " (ie. fonts)",
+              "Any symbol that is typeset through fixed sets of glyphs,"
+              " (i.e., fonts).",
 
+              /* properties */
               "font "
               "font-encoding "
               "font-family "