Ensure Python 2.4 compatibility in lilypond-book

[lilypond.git] / ly / english.ly

diff --git a/ly/english.ly b/ly/english.ly
index 608568305fee9ed90b20a7990f9aad7e6559d6fa..5cf7e3ee79b433ffb0c80e9bc4396d1871e62468 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -1,8 +1,20 @@
-%%%% english.ly -- common English names for notes
+%%%% common English names for notes
+%%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% source file of the GNU LilyPond music typesetter
+%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%
-%%%% (c) 1996--2009 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/>.
 
 \version "2.12.0"
 
@@ -10,14 +22,14 @@
 
   f   = flat
   ff  = double-flat
-  qf  = quarter-flat
-  tqf = three-quarters flat
+  qf  = quarter[-tone] flat
+  tqf = three-quarter[-tones] flat
 
   s   = sharp
   x   = double-sharp
   ss  = double-sharp
-  qs  = quarter-sharp
-  tqs = three-quarters sharp
+  qs  = quarter[-tone] sharp
+  tqs = three-quarter[-tones] sharp
 
 %}