X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fenglish.ly;h=4f7983c7a4ac53acd0be7f1b698435dbfc41185d;hb=9bcc4ca5022e7ecdfe4bd796a4739bf7b7a72a29;hp=de66eda7d7bdc6479036bdd0d35fe65150b1c87a;hpb=75be12aa75a535af753d6125bfc03da3ee303b36;p=lilypond.git diff --git a/ly/english.ly b/ly/english.ly index de66eda7d7..4f7983c7a4 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -1,158 +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 %} -\notenames { - cflatflat = \musicalpitch { -1 0 -2 } - cflat = \musicalpitch { -1 0 -1 } - c = \musicalpitch { -1 0 0 } - csharp = \musicalpitch { -1 0 1 } - csharpsharp = \musicalpitch { -1 0 2 } - dflatflat = \musicalpitch { -1 1 -2 } - dflat = \musicalpitch { -1 1 -1 } - d = \musicalpitch { -1 1 0 } - dsharp = \musicalpitch { -1 1 1 } - dsharpsharp = \musicalpitch { -1 1 2 } - eflatflat = \musicalpitch { -1 2 -2 } - eflat = \musicalpitch { -1 2 -1 } - e = \musicalpitch { -1 2 0 } - esharp = \musicalpitch { -1 2 1 } - esharpsharp = \musicalpitch { -1 2 2 } - fflatflat = \musicalpitch { -1 3 -2 } - fflat = \musicalpitch { -1 3 -1 } - f = \musicalpitch { -1 3 0 } - fsharp = \musicalpitch { -1 3 1 } - fsharpsharp = \musicalpitch { -1 3 2 } - gflatflat = \musicalpitch { -1 4 -2 } - gflat = \musicalpitch { -1 4 -1 } - g = \musicalpitch { -1 4 0 } - gsharp = \musicalpitch { -1 4 1 } - gsharpsharp = \musicalpitch { -1 4 2 } - aflatflat = \musicalpitch { -1 5 -2 } - aflat = \musicalpitch { -1 5 -1 } - a = \musicalpitch { -1 5 0 } - asharp = \musicalpitch { -1 5 1 } - asharpsharp = \musicalpitch { -1 5 2 } - bflatflat = \musicalpitch { -1 6 -2 } - bflat = \musicalpitch { -1 6 -1 } - b = \musicalpitch { -1 6 0 } - bsharp = \musicalpitch { -1 6 1 } - bsharpsharp = \musicalpitch { -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 = \musicalpitch { -1 0 -2 } - cf = \musicalpitch { -1 0 -1 } - c = \musicalpitch { -1 0 0 } - cs = \musicalpitch { -1 0 1 } - css = \musicalpitch { -1 0 2 } - dff = \musicalpitch { -1 1 -2 } - df = \musicalpitch { -1 1 -1 } - d = \musicalpitch { -1 1 0 } - ds = \musicalpitch { -1 1 1 } - dss = \musicalpitch { -1 1 2 } - eff = \musicalpitch { -1 2 -2 } - ef = \musicalpitch { -1 2 -1 } - e = \musicalpitch { -1 2 0 } - es = \musicalpitch { -1 2 1 } % es = E-flat in Dutch - ess = \musicalpitch { -1 2 2 } - fff = \musicalpitch { -1 3 -2 } - ff = \musicalpitch { -1 3 -1 } - f = \musicalpitch { -1 3 0 } - fs = \musicalpitch { -1 3 1 } - fss = \musicalpitch { -1 3 2 } - gff = \musicalpitch { -1 4 -2 } - gf = \musicalpitch { -1 4 -1 } - g = \musicalpitch { -1 4 0 } - gs = \musicalpitch { -1 4 1 } - gss = \musicalpitch { -1 4 2 } - aff = \musicalpitch { -1 5 -2 } - af = \musicalpitch { -1 5 -1 } - a = \musicalpitch { -1 5 0 } - as = \musicalpitch { -1 5 1 } % as = A-flat in Dutch - ass = \musicalpitch { -1 5 2 } - bff = \musicalpitch { -1 6 -2 } - bf = \musicalpitch { -1 6 -1 } - b = \musicalpitch { -1 6 0 } - bs = \musicalpitch { -1 6 1 } - bss = \musicalpitch { -1 6 2 } + (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)) - % - % upper case: 1 octave lower. - % + (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)) +) - Cflatflat = \musicalpitch { -2 0 -2 } - Cflat = \musicalpitch { -2 0 -1 } - C = \musicalpitch { -2 0 0 } - Csharp = \musicalpitch { -2 0 1 } - Csharpsharp = \musicalpitch { -2 0 2 } - Dflatflat = \musicalpitch { -2 1 -2 } - Dflat = \musicalpitch { -2 1 -1 } - D = \musicalpitch { -2 1 0 } - Dsharp = \musicalpitch { -2 1 1 } - Dsharpsharp = \musicalpitch { -2 1 2 } - Eflatflat = \musicalpitch { -2 2 -2 } - Eflat = \musicalpitch { -2 2 -1 } - E = \musicalpitch { -2 2 0 } - Esharp = \musicalpitch { -2 2 1 } - Esharpsharp = \musicalpitch { -2 2 2 } - Fflatflat = \musicalpitch { -2 3 -2 } - Fflat = \musicalpitch { -2 3 -1 } - F = \musicalpitch { -2 3 0 } - Fsharp = \musicalpitch { -2 3 1 } - Fsharpsharp = \musicalpitch { -2 3 2 } - Gflatflat = \musicalpitch { -2 4 -2 } - Gflat = \musicalpitch { -2 4 -1 } - G = \musicalpitch { -2 4 0 } - Gsharp = \musicalpitch { -2 4 1 } - Gsharpsharp = \musicalpitch { -2 4 2 } - Aflatflat = \musicalpitch { -2 5 -2 } - Aflat = \musicalpitch { -2 5 -1 } - A = \musicalpitch { -2 5 0 } - Asharp = \musicalpitch { -2 5 1 } - Asharpsharp = \musicalpitch { -2 5 2 } - Bflatflat = \musicalpitch { -2 6 -2 } - Bflat = \musicalpitch { -2 6 -1 } - B = \musicalpitch { -2 6 0 } - Bsharp = \musicalpitch { -2 6 1 } - Bsharpsharp = \musicalpitch { -2 6 2 } +pitchnames = \pitchnamesEnglish - Cff = \musicalpitch { -2 0 -2 } - Cf = \musicalpitch { -2 0 -1 } - C = \musicalpitch { -2 0 0 } - Cs = \musicalpitch { -2 0 1 } - Css = \musicalpitch { -2 0 2 } - Dff = \musicalpitch { -2 1 -2 } - Df = \musicalpitch { -2 1 -1 } - D = \musicalpitch { -2 1 0 } - Ds = \musicalpitch { -2 1 1 } - Dss = \musicalpitch { -2 1 2 } - Eff = \musicalpitch { -2 2 -2 } - Ef = \musicalpitch { -2 2 -1 } - E = \musicalpitch { -2 2 0 } - Es = \musicalpitch { -2 2 1 } - Ess = \musicalpitch { -2 2 2 } - Fff = \musicalpitch { -2 3 -2 } - Ff = \musicalpitch { -2 3 -1 } - F = \musicalpitch { -2 3 0 } - Fs = \musicalpitch { -2 3 1 } - Fss = \musicalpitch { -2 3 2 } - Gff = \musicalpitch { -2 4 -2 } - Gf = \musicalpitch { -2 4 -1 } - G = \musicalpitch { -2 4 0 } - Gs = \musicalpitch { -2 4 1 } - Gss = \musicalpitch { -2 4 2 } - Aff = \musicalpitch { -2 5 -2 } - Af = \musicalpitch { -2 5 -1 } - A = \musicalpitch { -2 5 0 } - As = \musicalpitch { -2 5 1 } - Ass = \musicalpitch { -2 5 2 } - Bff = \musicalpitch { -2 6 -2 } - Bf = \musicalpitch { -2 6 -1 } - B = \musicalpitch { -2 6 0 } - Bs = \musicalpitch { -2 6 1 } - Bss = \musicalpitch { -2 6 2 } +\version "2.10.0" -} +#(ly:parser-set-note-names parser pitchnames)