* Documentation/windows/zlily-profile.sh:

[lilypond.git] / ly / english.ly

diff --git a/ly/english.ly b/ly/english.ly
index 50042bb52b6f568d7ae5c2a8de08247cbaa83765..ceddb8ac3173214f172184cf71eeee4bb37aa4d1 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -3,79 +3,80 @@
      with s for sharp and f for flat.
 %}
 
-\notenames #'(
-       (cflatflat . ( -1 0 -2 ))
-       (cflat . ( -1 0 -1 ))
-       (c . ( -1 0 0 ))
-       (csharp . ( -1 0 1 ))
-       (csharpsharp . ( -1 0 2 ))
-       (dflatflat . ( -1 1 -2 ))
-       (dflat . ( -1 1 -1 ))
-       (d . ( -1 1 0 ))
-       (dsharp . ( -1 1 1 ))
-       (dsharpsharp . ( -1 1 2 ))
-       (eflatflat . ( -1 2 -2 ))
-       (eflat . ( -1 2 -1 ))
-       (e . ( -1 2 0 ))
-       (esharp . ( -1 2 1 ))
-       (esharpsharp . ( -1 2 2 ))
-       (fflatflat . ( -1 3 -2 ))
-       (fflat . ( -1 3 -1 ))
-       (f . ( -1 3 0 ))
-       (fsharp . ( -1 3 1 ))
-       (fsharpsharp . ( -1 3 2 ))
-       (gflatflat . ( -1 4 -2 ))
-       (gflat . ( -1 4 -1 ))
-       (g . ( -1 4 0 ))
-       (gsharp . ( -1 4 1 ))
-       (gsharpsharp . ( -1 4 2 ))
-       (aflatflat . ( -1 5 -2 ))
-       (aflat . ( -1 5 -1 ))
-       (a . ( -1 5 0 ))
-       (asharp . ( -1 5 1 ))
-       (asharpsharp . ( -1 5 2 ))
-       (bflatflat . ( -1 6 -2 ))
-       (bflat . ( -1 6 -1 ))
-       (b . ( -1 6 0 ))
-       (bsharp . ( -1 6 1 ))
-       (bsharpsharp . ( -1 6 2 ))
+\pitchnames #`(
+       (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 ))
 
-       (cff . ( -1 0 -2 ))
-       (cf . ( -1 0 -1 ))
-       (c . ( -1 0 0 ))
-       (cs . ( -1 0 1 ))
-       (css . ( -1 0 2 ))
-       (dff . ( -1 1 -2 ))
-       (df . ( -1 1 -1 ))
-       (d . ( -1 1 0 ))
-       (ds . ( -1 1 1 ))
-       (dss . ( -1 1 2 ))
-       (eff . ( -1 2 -2 ))
-       (ef . ( -1 2 -1 ))
-       (e . ( -1 2 0 ))
-       (es . ( -1 2 1 ))   ; es = E-flat in Dutch
-       (ess . ( -1 2 2 ))
-       (fff . ( -1 3 -2 ))
-       (ff . ( -1 3 -1 ))
-       (f . ( -1 3 0 ))
-       (fs . ( -1 3 1 ))
-       (fss . ( -1 3 2 ))
-       (gff . ( -1 4 -2 ))
-       (gf . ( -1 4 -1 ))
-       (g . ( -1 4 0 ))
-       (gs . ( -1 4 1 ))
-       (gss . ( -1 4 2 ))
-       (aff . ( -1 5 -2 ))
-       (af . ( -1 5 -1 ))
-       (a . ( -1 5 0 ))
-       (as . ( -1 5 1 ))   ; as = A-flat in Dutch
-       (ass . ( -1 5 2 ))
-       (bff . ( -1 6 -2 ))
-       (bf . ( -1 6 -1 ))
-       (b . ( -1 6 0 ))
-       (bs . ( -1 6 1 ))
-       (bss . ( -1 6 2 ))
+       (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 ))    
+       (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 ))
+       (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.59";
+\version "1.5.49"