Merge branch 'lilypond/translation'

[lilypond.git] / ly / english.ly

diff --git a/ly/english.ly b/ly/english.ly
index fec9b11aee0b622baa8bc82ee53666900ca2f01b..5cf7e3ee79b433ffb0c80e9bc4396d1871e62468 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -1,15 +1,36 @@
+%%%% common English names for notes
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 1996--2010 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"
+
 %{
-     English note names spelled out in full, and abbreviated
 
-         ff  for double-flat
-                       tqf for three-quarters flat
-                       f   for flat
-                       qf  for quarter-flat
-                       
-                       qs  for quarter-sharp
-                       s   for sharp
-                       tqs for three-quarters sharp
-                       x   for double-sharp
+  f   = flat
+  ff  = double-flat
+  qf  = quarter[-tone] flat
+  tqf = three-quarter[-tones] flat
+
+  s   = sharp
+  x   = double-sharp
+  ss  = double-sharp
+  qs  = quarter[-tone] sharp
+  tqs = three-quarter[-tones] sharp
+
 %}
 
 pitchnamesEnglish = #`(
@@ -129,7 +150,4 @@ pitchnamesEnglish = #`(
 
 pitchnames = \pitchnamesEnglish
 
-\version "2.12.0"
-
-
 #(ly:parser-set-note-names parser pitchnames)