X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fenglish.ly;h=3d18b2b645fc4bd871cdeebb7d62814f8f1189c4;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e913109dfec3cddb48090b4969c5ece91a516c82;hpb=cad8bec93311f8cbcc0b420fb5c93c0311df8979;p=lilypond.git

diff --git a/ly/english.ly b/ly/english.ly
index e913109dfe..3d18b2b645 100644
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -1,141 +1,23 @@
-%%%% 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) 2010--2015 Valentin Villenave <valentin@villenave.net>
 %%%%
-%%%% (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
-\version "2.12.0"
-
-%{
-
-  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 = #`(
-	(cflatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-	(cflat . ,(ly:make-pitch -1 0 FLAT))
-	(c . ,(ly:make-pitch -1 0 NATURAL))
-	(csharp . ,(ly:make-pitch -1 0 SHARP))
-	(csharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-	(dflatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-	(dflat . ,(ly:make-pitch -1 1 FLAT))
-	(d . ,(ly:make-pitch -1 1 NATURAL))
-	(dsharp . ,(ly:make-pitch -1 1 SHARP))
-	(dsharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-	(eflatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(eflat . ,(ly:make-pitch -1 2 FLAT))
-	(e . ,(ly:make-pitch -1 2 NATURAL))
-	(esharp . ,(ly:make-pitch -1 2 SHARP))
-	(esharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-	(fflatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-	(fflat . ,(ly:make-pitch -1 3 FLAT))
-	(f . ,(ly:make-pitch -1 3 NATURAL))
-	(fsharp . ,(ly:make-pitch -1 3 SHARP))
-	(fsharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-	(gflatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-	(gflat . ,(ly:make-pitch -1 4 FLAT))
-	(g . ,(ly:make-pitch -1 4 NATURAL))
-	(gsharp . ,(ly:make-pitch -1 4 SHARP))
-	(gsharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-	(aflatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(aflat . ,(ly:make-pitch -1 5 FLAT))
-	(a . ,(ly:make-pitch -1 5 NATURAL))
-	(asharp . ,(ly:make-pitch -1 5 SHARP))
-	(asharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-	(bflatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-	(bflat . ,(ly:make-pitch -1 6 FLAT))
-	(b . ,(ly:make-pitch -1 6 NATURAL))
-	(bsharp . ,(ly:make-pitch -1 6 SHARP))
-	(bsharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
-	(cff . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-	(ctqf . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
-	(cf . ,(ly:make-pitch -1 0 FLAT))
-	(cqf . ,(ly:make-pitch -1 0 SEMI-FLAT))
-	(c . ,(ly:make-pitch -1 0 NATURAL))
-	(cqs . ,(ly:make-pitch -1 0 SEMI-SHARP))
-	(cs . ,(ly:make-pitch -1 0 SHARP))
-	(ctqs . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
-	(css . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-	(cx . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
-	(dff . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-	(dtqf . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
-	(df . ,(ly:make-pitch -1 1 FLAT))
-	(dqf . ,(ly:make-pitch -1 1 SEMI-FLAT))
-	(d . ,(ly:make-pitch -1 1 NATURAL))
-	(dqs . ,(ly:make-pitch -1 1 SEMI-SHARP))
-	(ds . ,(ly:make-pitch -1 1 SHARP))
-	(dtqs . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
-	(dss . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-	(dx . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
-	(eff . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(etqf . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
-	(ef . ,(ly:make-pitch -1 2 FLAT))
-	(eqf . ,(ly:make-pitch -1 2 SEMI-FLAT))
-	(e . ,(ly:make-pitch -1 2 NATURAL))
-	(eqs . ,(ly:make-pitch -1 2 SEMI-SHARP))
-	(es . ,(ly:make-pitch -1 2 SHARP))
-	(etqs . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
-	(ess . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-	(ex . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
-	(fff . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-	(ftqf . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
-	(ff . ,(ly:make-pitch -1 3 FLAT))
-	(fqf . ,(ly:make-pitch -1 3 SEMI-FLAT))
-	(f . ,(ly:make-pitch -1 3 NATURAL))
-	(fqs . ,(ly:make-pitch -1 3 SEMI-SHARP))
-	(fs . ,(ly:make-pitch -1 3 SHARP))
-	(ftqs . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
-	(fss . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-	(fx . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
-	(gff . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-	(gtqf . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
-	(gf . ,(ly:make-pitch -1 4 FLAT))
-	(gqf . ,(ly:make-pitch -1 4 SEMI-FLAT))
-	(g . ,(ly:make-pitch -1 4 NATURAL))
-	(gqs . ,(ly:make-pitch -1 4 SEMI-SHARP))
-	(gs . ,(ly:make-pitch -1 4 SHARP))
-	(gtqs . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
-	(gss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-	(gx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
-	(aff . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(atqf . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
-	(af . ,(ly:make-pitch -1 5 FLAT))
-	(aqf . ,(ly:make-pitch -1 5 SEMI-FLAT))
-	(a . ,(ly:make-pitch -1 5 NATURAL))
-	(aqs . ,(ly:make-pitch -1 5 SEMI-SHARP))
-	(as . ,(ly:make-pitch -1 5 SHARP))
-	(atqs . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
-	(ass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-	(ax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+%%%% 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/>.
 
-	(bff . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-	(btqf . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
-	(bf . ,(ly:make-pitch -1 6 FLAT))
-	(bqf . ,(ly:make-pitch -1 6 SEMI-FLAT))
-	(b . ,(ly:make-pitch -1 6 NATURAL))
-	(bqs . ,(ly:make-pitch -1 6 SEMI-SHARP))
-	(bs . ,(ly:make-pitch -1 6 SHARP))
-	(btqs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
-	(bss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-	(bx . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
+%%%% Legacy file. (see scm/define-note-names.scm)
 
-pitchnames = \pitchnamesEnglish
+\version "2.16.0"
 
-#(ly:parser-set-note-names parser pitchnames)
+\language "english"