X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fenglish.ly;h=fec9b11aee0b622baa8bc82ee53666900ca2f01b;hb=de94141c98300335d2675fff9e5a4cb9b42fccac;hp=9afeff28f60ed48e5b784e05b22089c129be8268;hpb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;p=lilypond.git diff --git a/ly/english.ly b/ly/english.ly index 9afeff28f6..fec9b11aee 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -1,82 +1,135 @@ %{ English note names spelled out in full, and abbreviated - with s for sharp and f for flat. + + 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 %} -\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 )) +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)) - (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 )) + (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)) - (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 )) + (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)) + + (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)) ) -\version "1.3.146" +pitchnames = \pitchnamesEnglish + +\version "2.12.0" + +#(ly:parser-set-note-names parser pitchnames)