From 2529c013adb66d93d27b4a8bad0ed321beee2254 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 22 Aug 2006 08:58:18 +0000 Subject: [PATCH] * THANKS: update sponsors. * ly/english.ly: quarter tone naming (thanks, Trevor Baca) --- ChangeLog | 4 ++++ THANKS | 7 +++++- lily/melisma-translator.cc | 9 ++++++- ly/english.ly | 48 +++++++++++++++++++++++++++++++++++--- 4 files changed, 63 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31c7ca876b..3d4ae6d948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-08-22 Han-Wen Nienhuys + * THANKS: update sponsors. + + * ly/english.ly: quarter tone naming (thanks, Trevor Baca) + * Documentation/topdocs/NEWS.tely (Top): doc new feature. * input/regression/tie-chord-untied.ly: new file. diff --git a/THANKS b/THANKS index 49e9e0524a..c9af7de1b0 100644 --- a/THANKS +++ b/THANKS @@ -21,9 +21,13 @@ Joe Neeman SPONSORS Andrew Sidwell +Anthony Youngman Chris Sawer +David Griffel Jamie Bullock +Kieren MacMillan Michael Meixner +Paul Scott Steve Doonan Trent Johnston Trevor Bača @@ -61,7 +65,7 @@ J. Leung Karim Haddad Karl Hammar Keith Packard -Kieren MacMillian +Kieren MacMillan Lee T. Wilkirson Mark Dewey Markus Schneider @@ -79,6 +83,7 @@ Stephen Carter Stephen Kress Thies Albrecht Trent Johnston +Trevor Bača Vaclav Smilauer Werner Lemberg Zoltan V. Laszlo diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc index 950eee3e05..69f9f7f53a 100644 --- a/lily/melisma-translator.cc +++ b/lily/melisma-translator.cc @@ -70,5 +70,12 @@ ADD_TRANSLATOR (Melisma_translator, /* doc */ "This translator collects melisma information about ties, beams, and user settings (@code{melismaBusy}, and signals it to the @code{\addlyrics} code. ", /* create */ "", /* accept */ "", - /* read */ "melismaBusy melismaBusyProperties slurMelismaBusy tieMelismaBusy beamMelismaBusy", + /* read */ + "beamMelismaBusy " + "melismaBusy " + "melismaBusyProperties " + "slurMelismaBusy " + "tieMelismaBusy " + , + /* write */ ""); diff --git a/ly/english.ly b/ly/english.ly index 67820fffb5..5277d125f5 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -1,6 +1,15 @@ %{ 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 %} pitchnamesEnglish = #`( @@ -41,46 +50,79 @@ pitchnamesEnglish = #`( (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)) - - (es . ,(ly:make-pitch -1 2 SHARP)) + (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)) + (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)) ) -- 2.39.5