Browse Source

Remove the dontlist phoneme feature flag.

The 'dontlist' feature was used by the now removed PrintPhonemesUsed
function to not display that phoneme in the list. It was also only
used by the English phonemetable.
master
Reece H. Dunn 8 years ago
parent
commit
1c75e58bda
3 changed files with 8 additions and 15 deletions
  1. 8
    13
      phsource/ph_english
  2. 0
    1
      src/libespeak-ng/compiledata.c
  3. 0
    1
      src/libespeak-ng/phoneme.h

+ 8
- 13
phsource/ph_english View File



phoneme t2 // [t] which doesn't reduce phoneme t2 // [t] which doesn't reduce
vcd alv stop dontlist
vcd alv stop
ChangePhoneme(t) ChangePhoneme(t)
endphoneme endphoneme






phoneme d# // change to [d] or [t] depending on whether previous phoneme is voiced phoneme d# // change to [d] or [t] depending on whether previous phoneme is voiced
vls alv stop dontlist
vls alv stop
IF prevPh(isVoiced) THEN IF prevPh(isVoiced) THEN
ChangePhoneme(d) ChangePhoneme(d)
ELSE ELSE




phoneme z# // change to [z] or [s] depending on whether previous phoneme is voiced phoneme z# // change to [z] or [s] depending on whether previous phoneme is voiced
vls alv frc sibilant dontlist
vls alv frc sibilant
IF prevPh(isVoiced) THEN IF prevPh(isVoiced) THEN
ChangePhoneme(z) ChangePhoneme(z)
ELSE ELSE


phoneme @2 // Schwa, changes to I before a vowel. th**e**, used only for "the". phoneme @2 // Schwa, changes to I before a vowel. th**e**, used only for "the".
vowel starttype #@ endtype #@ vowel starttype #@ endtype #@
unstressed dontlist
unstressed
length 120 length 120
IF nextPh(isVowel) THEN IF nextPh(isVowel) THEN
ChangePhoneme(I2) ChangePhoneme(I2)


phoneme @5 // Schwa, changes to U before a vowel. t**o**, used only for "to". phoneme @5 // Schwa, changes to U before a vowel. t**o**, used only for "to".
vowel starttype #@ endtype #@ vowel starttype #@ endtype #@
unstressed dontlist
unstressed
length 140 length 140
IF nextPh(isVowel) OR nextPh(isPause) THEN IF nextPh(isVowel) OR nextPh(isPause) THEN
ChangePhoneme(U) ChangePhoneme(U)




phoneme a2 // don't reduce to a# phoneme a2 // don't reduce to a#
vowel dontlist
vowel
ChangePhoneme(a) ChangePhoneme(a)
endphoneme endphoneme




phoneme E# // [@] in unstressed syllables, if next vowel is stressed phoneme E# // [@] in unstressed syllables, if next vowel is stressed
vowel starttype #e endtype #e vowel starttype #e endtype #e
dontlist


IF thisPh(isUnstressed) AND nextVowel(isVowel) AND nextVowel(isStressed) THEN IF thisPh(isUnstressed) AND nextVowel(isVowel) AND nextVowel(isStressed) THEN
ChangePhoneme(@) ChangePhoneme(@)


phoneme E2 // does not reduce in unstressed syllables phoneme E2 // does not reduce in unstressed syllables
vowel starttype #e endtype #e vowel starttype #e endtype #e
dontlist
length 140 length 140
ChangePhoneme(E) // a second change ([E] to [I2]) won't happen ChangePhoneme(E) // a second change ([E] to [I2]) won't happen
endphoneme endphoneme


phoneme 0# // [@] in unstressed syllables phoneme 0# // [@] in unstressed syllables
vowel starttype #o endtype #o vowel starttype #o endtype #o
dontlist


IF thisPh(isUnstressed) AND nextVowel(isVowel) AND NOT nextVowel(isUnstressed) THEN IF thisPh(isUnstressed) AND nextVowel(isVowel) AND NOT nextVowel(isUnstressed) THEN
ChangePhoneme(@) ChangePhoneme(@)


phoneme 02 // becomes V in en-us phoneme 02 // becomes V in en-us
vowel starttype #o endtype #o vowel starttype #o endtype #o
dontlist
length 140 length 140
ChangePhoneme(0) ChangePhoneme(0)
endphoneme endphoneme


phoneme A# // [a] in British [A:] in American phoneme A# // [a] in British [A:] in American
vowel starttype #a endtype #a vowel starttype #a endtype #a
dontlist
ChangePhoneme(a) ChangePhoneme(a)
endphoneme endphoneme






phoneme oU# phoneme oU#
vowel dontlist
vowel
IF thisPh(isStressed) THEN IF thisPh(isStressed) THEN
ChangePhoneme(0) ChangePhoneme(0)
ENDIF ENDIF




phoneme a#2 // for word 'an' phoneme a#2 // for word 'an'
vowel dontlist
vowel
IF next2Ph(isVowel) THEN IF next2Ph(isVowel) THEN
ChangePhoneme(a#) ChangePhoneme(a#)
ELSE ELSE

+ 0
- 1
src/libespeak-ng/compiledata.c View File

{ "trill", tPHONEME_FLAG, phTRILL }, // TODO (deprecated): use 'trl' instead { "trill", tPHONEME_FLAG, phTRILL }, // TODO (deprecated): use 'trl' instead
{ "palatal", tPHONEME_FLAG, phPALATAL }, // TODO (deprecated): use 'pzd' instead { "palatal", tPHONEME_FLAG, phPALATAL }, // TODO (deprecated): use 'pzd' instead
{ "long", tPHONEME_FLAG, phLONG }, // TODO (deprecated): use 'lng' instead { "long", tPHONEME_FLAG, phLONG }, // TODO (deprecated): use 'lng' instead
{ "dontlist", tPHONEME_FLAG, phDONTLIST },
{ "brkafter", tPHONEME_FLAG, phBRKAFTER }, { "brkafter", tPHONEME_FLAG, phBRKAFTER },
{ "rhotic", tPHONEME_FLAG, phRHOTIC }, // TODO (deprecated): use 'rzd' instead { "rhotic", tPHONEME_FLAG, phRHOTIC }, // TODO (deprecated): use 'rzd' instead
{ "nonsyllabic", tPHONEME_FLAG, phNONSYLLABIC }, // TODO (deprecated): use 'nsy' instead { "nonsyllabic", tPHONEME_FLAG, phNONSYLLABIC }, // TODO (deprecated): use 'nsy' instead

+ 0
- 1
src/libespeak-ng/phoneme.h View File

#define phTRILL 0x80 #define phTRILL 0x80
#define phPALATAL 0x200 #define phPALATAL 0x200
#define phSINGLE_INSTN 0x1000 // this phoneme has a single instruction program, with an implicit Return #define phSINGLE_INSTN 0x1000 // this phoneme has a single instruction program, with an implicit Return
#define phDONTLIST 0x2000 // don't list in dict_phonemes
#define phBRKAFTER 0x4000 // [*] add a post-pause #define phBRKAFTER 0x4000 // [*] add a post-pause


#define phNONSYLLABIC 0x100000 // don't count this vowel as a syllable when finding the stress position #define phNONSYLLABIC 0x100000 // don't count this vowel as a syllable when finding the stress position

Loading…
Cancel
Save