X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fenglish.ly;h=3d18b2b645fc4bd871cdeebb7d62814f8f1189c4;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=0ce982f82689612991fa749d06bc0e6562fb7036;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git

diff --git a/ly/english.ly b/ly/english.ly
index 0ce982f826..3d18b2b645 100644
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -1,81 +1,23 @@
-%{
-     English note names spelled out in full, and abbreviated
-     with s for sharp and f for flat.
-%}
+%%%% common English names for notes
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 2010--2015 Valentin Villenave <valentin@villenave.net>
+%%%%
+%%%% 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/>.
 
-\notenames #`(
-	(cflatflat . ,(make-pitch -1 0 -2 ))
-	(cflat . ,(make-pitch -1 0 -1 ))
-	(c . ,(make-pitch -1 0 0 ))
-	(csharp . ,(make-pitch -1 0 1 ))
-	(csharpsharp . ,(make-pitch -1 0 2 ))
-	(dflatflat . ,(make-pitch -1 1 -2 ))
-	(dflat . ,(make-pitch -1 1 -1 ))
-	(d . ,(make-pitch -1 1 0 ))
-	(dsharp . ,(make-pitch -1 1 1 ))
-	(dsharpsharp . ,(make-pitch -1 1 2 ))
-	(eflatflat . ,(make-pitch -1 2 -2 ))
-	(eflat . ,(make-pitch -1 2 -1 ))
-	(e . ,(make-pitch -1 2 0 ))
-	(esharp . ,(make-pitch -1 2 1 ))
-	(esharpsharp . ,(make-pitch -1 2 2 ))
-	(fflatflat . ,(make-pitch -1 3 -2 ))
-	(fflat . ,(make-pitch -1 3 -1 ))
-	(f . ,(make-pitch -1 3 0 ))
-	(fsharp . ,(make-pitch -1 3 1 ))
-	(fsharpsharp . ,(make-pitch -1 3 2 ))
-	(gflatflat . ,(make-pitch -1 4 -2 ))
-	(gflat . ,(make-pitch -1 4 -1 ))
-	(g . ,(make-pitch -1 4 0 ))
-	(gsharp . ,(make-pitch -1 4 1 ))
-	(gsharpsharp . ,(make-pitch -1 4 2 ))
-	(aflatflat . ,(make-pitch -1 5 -2 ))
-	(aflat . ,(make-pitch -1 5 -1 ))
-	(a . ,(make-pitch -1 5 0 ))
-	(asharp . ,(make-pitch -1 5 1 ))
-	(asharpsharp . ,(make-pitch -1 5 2 ))
-	(bflatflat . ,(make-pitch -1 6 -2 ))
-	(bflat . ,(make-pitch -1 6 -1 ))
-	(b . ,(make-pitch -1 6 0 ))
-	(bsharp . ,(make-pitch -1 6 1 ))
-	(bsharpsharp . ,(make-pitch -1 6 2 ))
+%%%% Legacy file. (see scm/define-note-names.scm)
 
-	(cff . ,(make-pitch -1 0 -2 ))
-	(cf . ,(make-pitch -1 0 -1 ))
-	(c . ,(make-pitch -1 0 0 ))
-	(cs . ,(make-pitch -1 0 1 ))
-	(css . ,(make-pitch -1 0 2 ))
-	(dff . ,(make-pitch -1 1 -2 ))
-	(df . ,(make-pitch -1 1 -1 ))
-	(d . ,(make-pitch -1 1 0 ))
-	(ds . ,(make-pitch -1 1 1 ))
-	(dss . ,(make-pitch -1 1 2 ))
-	(eff . ,(make-pitch -1 2 -2 ))
-	(ef . ,(make-pitch -1 2 -1 ))
-	(e . ,(make-pitch -1 2 0 ))
-	(es . ,(make-pitch -1 2 1 ))   ; es = E-flat in Dutch
-	(ess . ,(make-pitch -1 2 2 ))
-	(fff . ,(make-pitch -1 3 -2 ))
-	(ff . ,(make-pitch -1 3 -1 ))
-	(f . ,(make-pitch -1 3 0 ))
-	(fs . ,(make-pitch -1 3 1 ))
-	(fss . ,(make-pitch -1 3 2 ))
-	(gff . ,(make-pitch -1 4 -2 ))
-	(gf . ,(make-pitch -1 4 -1 ))
-	(g . ,(make-pitch -1 4 0 ))
-	(gs . ,(make-pitch -1 4 1 ))
-	(gss . ,(make-pitch -1 4 2 ))
-	(aff . ,(make-pitch -1 5 -2 ))
-	(af . ,(make-pitch -1 5 -1 ))
-	(a . ,(make-pitch -1 5 0 ))
-	(as . ,(make-pitch -1 5 1 ))   ; as = A-flat in Dutch
-	(ass . ,(make-pitch -1 5 2 ))
-	(bff . ,(make-pitch -1 6 -2 ))
-	(bf . ,(make-pitch -1 6 -1 ))
-	(b . ,(make-pitch -1 6 0 ))
-	(bs . ,(make-pitch -1 6 1 ))
-	(bss . ,(make-pitch -1 6 2 ))
-)
-
-\version "1.3.96";
+\version "2.16.0"
 
+\language "english"