diff --git a/docs/phontab.md b/docs/phontab.md index 32070468..3b567395 100644 --- a/docs/phontab.md +++ b/docs/phontab.md @@ -149,7 +149,6 @@ must be present. | Type | Description | |-----------|-------------| | `liquid` | semi-vowels, such as: `r`, `l`, `j`, `w` | -| `nasal` | nasal e.g.: `m`, `n`, `N` | | `pause` | | | `stress` | Used for stress symbols, eg: `'` `,` `=` `%` | | `virtual` | Used to represent a class of phonemes. | diff --git a/phsource/ph_basque b/phsource/ph_basque index 90148478..d64c6c7c 100644 --- a/phsource/ph_basque +++ b/phsource/ph_basque @@ -138,7 +138,7 @@ phoneme g endphoneme phoneme n - vcd alv nasal + vcd alv nas lengthmod 4 IF prevPhW(#i) AND nextPhW(isVowel) THEN @@ -149,7 +149,7 @@ phoneme n endphoneme phoneme n2 // doesn't palatalise, used for exceptions - vcd alv nasal + vcd alv nas lengthmod 4 CALL base/n endphoneme diff --git a/phsource/ph_burmese b/phsource/ph_burmese index 58387e96..54f67050 100644 --- a/phsource/ph_burmese +++ b/phsource/ph_burmese @@ -420,25 +420,25 @@ endphoneme //=========== phoneme mh //voiceless - vls blb nasal + vls blb nas endphoneme phoneme m - //vcd blb nasal + //vcd blb nas import_phoneme base/m endphoneme phoneme nh - vls alv nasal + vls alv nas endphoneme phoneme n - //vcd alv nasal + //vcd alv nas import_phoneme base/n endphoneme phoneme ɲh - vls pal nasal + vls pal nas endphoneme phoneme ɲ @@ -447,16 +447,16 @@ phoneme ɲ endphoneme phoneme ŋh - vls vel nasal + vls vel nas endphoneme phoneme ŋ - //vcd vel nasal + //vcd vel nas import_phoneme base/N endphoneme //phoneme ɴ -// vcd glt nasal +// vcd glt nas //endphoneme phoneme p diff --git a/phsource/ph_english_n b/phsource/ph_english_n index 230b20c4..01552ecf 100644 --- a/phsource/ph_english_n +++ b/phsource/ph_english_n @@ -1,6 +1,6 @@ phoneme N - vcd vel nasal + vcd vel nas lengthmod 8 // longer than 'n' IfNextVowelAppend(g) CALL base/N diff --git a/phsource/ph_english_wm b/phsource/ph_english_wm index fc928042..e0d0d3de 100644 --- a/phsource/ph_english_wm +++ b/phsource/ph_english_wm @@ -1,6 +1,6 @@ phoneme N - vcd vel nasal + vcd vel nas lengthmod 8 // longer than 'n' IfNextVowelAppend(g) CALL base/N diff --git a/phsource/ph_french b/phsource/ph_french index 0d759caa..50b1ddf0 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -744,7 +744,7 @@ endphoneme phoneme n - vcd alv nasal + vcd alv nas Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk lengthmod 4 @@ -774,7 +774,7 @@ endphoneme phoneme n2 - vcd alv nasal + vcd alv nas IF nextPh(w) OR nextPh(isVowel) THEN ChangePhoneme(n) ELSE diff --git a/phsource/ph_icelandic b/phsource/ph_icelandic index 0dd9a8ad..a1870588 100644 --- a/phsource/ph_icelandic +++ b/phsource/ph_icelandic @@ -221,7 +221,7 @@ endphoneme //=========== phoneme m# - vcd blb nasal + vcd blb nas lengthmod 6 ipa m# Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk @@ -230,7 +230,7 @@ endphoneme phoneme n# - vcd alv nasal + vcd alv nas lengthmod 6 ipa n# Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk @@ -249,7 +249,7 @@ endphoneme phoneme n^# - vcd pal nasal palatal + vcd pal nas palatal lengthmod 6 ipa ɲ# Vowelout f1=3 f2=2300 300 400 f3=100 80 brk rate @@ -259,7 +259,7 @@ endphoneme phoneme N# - vcd vel nasal + vcd vel nas lengthmod 6 ipa ŋ# Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk diff --git a/phsource/ph_japanese b/phsource/ph_japanese index b5d6ba77..0fbaca5c 100644 --- a/phsource/ph_japanese +++ b/phsource/ph_japanese @@ -102,7 +102,7 @@ endphoneme // Consonants ///////////////////////////////////////////////////////////////// phoneme m - vcd blb nasal + vcd blb nas Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk lengthmod 4 @@ -121,7 +121,7 @@ phoneme m endphoneme phoneme n - vcd alv nasal + vcd alv nas Vowelout f1=2 f2=1500 -300 250 f3=-100 80 rms=20 brk lengthmod 4 @@ -140,7 +140,7 @@ phoneme n endphoneme phoneme N - vcd vel nasal + vcd vel nas ipa ŋ Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk lengthmod 3 @@ -168,7 +168,7 @@ phoneme N endphoneme phoneme N\\ - vcd uvl nasal + vcd uvl nas ipa ɴ // FIXME: Stub phoneme. CALL jp/n diff --git a/phsource/ph_kyrgyz b/phsource/ph_kyrgyz index dc8a6aa7..15e85132 100644 --- a/phsource/ph_kyrgyz +++ b/phsource/ph_kyrgyz @@ -265,7 +265,7 @@ endphoneme phoneme m ipa m - vcd blb nasal + vcd blb nas Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk lengthmod 4 @@ -298,7 +298,7 @@ endphoneme phoneme n ipa n - vcd alv nasal + vcd alv nas Vowelout f1=2 f2=1500 -300 250 f3=-100 80 rms=20 brk lengthmod 4 @@ -328,7 +328,7 @@ endphoneme phoneme N // si**ng** ipa N - vcd vel nasal + vcd vel nas Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk lengthmod 8 // longer than 'n' diff --git a/phsource/ph_romanian b/phsource/ph_romanian index a566c11f..6276bf06 100644 --- a/phsource/ph_romanian +++ b/phsource/ph_romanian @@ -186,7 +186,7 @@ phoneme l; phoneme m; - vcd blb nasal + vcd blb nas lengthmod 4 CALL base/m @@ -195,7 +195,7 @@ endphoneme phoneme n; - vcd alv nasal + vcd alv nas lengthmod 4 CALL base/n diff --git a/phsource/ph_russian b/phsource/ph_russian index e013c867..5543aae0 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -83,7 +83,7 @@ endphoneme //phoneme n -// vcd pal nasal +// vcd pal nas // FMT(n/nru) // // import_phoneme en/n @@ -91,7 +91,7 @@ endphoneme //endphoneme phoneme n_ -// vcd pal nasal +// vcd pal nas // FMT(n/nru) import_phoneme en/n @@ -102,7 +102,7 @@ endphoneme phoneme n# - vcd pal nasal palatal + vcd pal nas palatal ipa ɲ Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate lengthmod 4 @@ -202,7 +202,7 @@ endphoneme //endphoneme phoneme m; - vcd blb nasal + vcd blb nas Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk lengthmod 4 diff --git a/phsource/ph_swahili b/phsource/ph_swahili index ed94ed44..e79ab8f6 100644 --- a/phsource/ph_swahili +++ b/phsource/ph_swahili @@ -123,7 +123,7 @@ endphoneme phoneme n^ - vcd pal nasal palatal + vcd pal nas palatal ipa ɲ Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate lengthmod 4 @@ -148,7 +148,7 @@ phoneme n^ endphoneme phoneme N - vcd vel nasal + vcd vel nas Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk lengthmod 8 // longer than 'n' diff --git a/phsource/ph_vietnam b/phsource/ph_vietnam index de6378bb..c0314d4b 100644 --- a/phsource/ph_vietnam +++ b/phsource/ph_vietnam @@ -434,7 +434,7 @@ phoneme p endphoneme phoneme n - vcd alv nasal + vcd alv nas Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 brk len=15 Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk len=15 lengthmod 4 diff --git a/phsource/ph_zh b/phsource/ph_zh index 8fd101f8..84a044f1 100644 --- a/phsource/ph_zh +++ b/phsource/ph_zh @@ -59,7 +59,7 @@ endphoneme phoneme n - vcd alv nasal + vcd alv nas Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk lengthmod 2 @@ -80,7 +80,7 @@ endphoneme phoneme N - vcd vel nasal + vcd vel nas Vowelout f1=2 f2=1900 0 300 f3=400 80 len=50 rms=15 brk lengthmod 7 diff --git a/phsource/phonemes b/phsource/phonemes index a2431e1b..10ceb38e 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -705,7 +705,7 @@ endphoneme phoneme m - vcd blb nasal + vcd blb nas Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk lengthmod 4 @@ -737,7 +737,7 @@ endphoneme phoneme n - vcd alv nasal + vcd alv nas Vowelout f1=2 f2=1500 -300 250 f3=-100 80 rms=20 brk lengthmod 4 @@ -766,7 +766,7 @@ endphoneme phoneme n. - vcd rfx nasal + vcd rfx nas ipa ɳ starttype n endtype n Vowelin f1=2 f2=1700 -300 300 f3=-500 80 rms=20 colr=2 @@ -797,7 +797,7 @@ endphoneme phoneme n^ // Spanish **ñ** - vcd pal nasal palatal + vcd pal nas palatal ipa ɲ Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate lengthmod 4 @@ -830,7 +830,7 @@ endphoneme phoneme N // si**ng** - vcd vel nasal + vcd vel nas Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk lengthmod 8 // longer than 'n' diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index 1d6e45a2..62b57765 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -219,12 +219,8 @@ static keywtab_t keywords[] = { { "pause", tPHONEME_TYPE, phPAUSE }, { "stress", tPHONEME_TYPE, phSTRESS }, { "virtual", tPHONEME_TYPE, phVIRTUAL }, - { "delete_phoneme", tPHONEME_TYPE, phDELETED }, - // type of consonant - { "nasal", tPHONEME_TYPE, phNASAL }, // TODO (deprecated): use 'nas' instead - // keywords { "phonemetable", tSTATEMENT, kPHONEMETABLE }, { "include", tSTATEMENT, kINCLUDE },