From fe74d0b41bd32ca040ba899a420ed279dfa8113b Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 28 Jan 2017 13:51:34 +0000 Subject: [PATCH] Replace 'stop' with 'stp'. --- docs/phontab.md | 1 - phsource/ph_afrikaans | 2 +- phsource/ph_albanian | 6 +++--- phsource/ph_amhari | 8 ++++---- phsource/ph_arabic | 4 ++-- phsource/ph_aragon | 6 +++--- phsource/ph_base2 | 8 ++++---- phsource/ph_basque | 2 +- phsource/ph_bulgarian | 2 +- phsource/ph_burmese | 20 ++++++++++---------- phsource/ph_consonants | 12 ++++++------ phsource/ph_croatian | 4 ++-- phsource/ph_danish | 4 ++-- phsource/ph_english | 6 +++--- phsource/ph_english_us | 8 ++++---- phsource/ph_estonian | 10 +++++----- phsource/ph_finnish | 2 +- phsource/ph_french | 18 +++++++++--------- phsource/ph_georgian | 2 +- phsource/ph_german | 6 +++--- phsource/ph_greek | 4 ++-- phsource/ph_greenlandic | 2 +- phsource/ph_guarani | 4 ++-- phsource/ph_hindi_base | 16 ++++++++-------- phsource/ph_hungarian | 6 +++--- phsource/ph_icelandic | 8 ++++---- phsource/ph_japanese | 14 +++++++------- phsource/ph_kannada | 2 +- phsource/ph_korean | 4 ++-- phsource/ph_kurdish | 4 ++-- phsource/ph_kyrgyz | 14 +++++++------- phsource/ph_latvian | 10 +++++----- phsource/ph_lithuanian | 8 ++++---- phsource/ph_macedonian | 2 +- phsource/ph_malayalam | 10 +++++----- phsource/ph_maltese | 2 +- phsource/ph_oromo | 8 ++++---- phsource/ph_polish | 8 ++++---- phsource/ph_pt_brazil | 2 +- phsource/ph_romanian | 8 ++++---- phsource/ph_russian | 2 +- phsource/ph_s_gaelic | 6 +++--- phsource/ph_serbian | 4 ++-- phsource/ph_setswana | 6 +++--- phsource/ph_slovak | 4 ++-- phsource/ph_slovenian | 4 ++-- phsource/ph_spanish | 6 +++--- phsource/ph_swahili | 8 ++++---- phsource/ph_tatar | 2 +- phsource/ph_telugu | 4 ++-- phsource/ph_turkish | 4 ++-- phsource/ph_vietnam | 10 +++++----- phsource/ph_welsh | 2 +- phsource/ph_zh | 12 ++++++------ phsource/ph_zh_yue | 6 +++--- phsource/phonemes | 24 ++++++++++++------------ src/libespeak-ng/compiledata.c | 1 - 57 files changed, 185 insertions(+), 187 deletions(-) diff --git a/docs/phontab.md b/docs/phontab.md index 0fc3b8f9..32070468 100644 --- a/docs/phontab.md +++ b/docs/phontab.md @@ -150,7 +150,6 @@ must be present. |-----------|-------------| | `liquid` | semi-vowels, such as: `r`, `l`, `j`, `w` | | `nasal` | nasal e.g.: `m`, `n`, `N` | -| `stop` | stop (plosive) e.g.: `p`, `b`, `t`, `d`, `k`, `g` | | `pause` | | | `stress` | Used for stress symbols, eg: `'` `,` `=` `%` | | `virtual` | Used to represent a class of phonemes. | diff --git a/phsource/ph_afrikaans b/phsource/ph_afrikaans index e5a18613..da136811 100644 --- a/phsource/ph_afrikaans +++ b/phsource/ph_afrikaans @@ -324,7 +324,7 @@ endphoneme phoneme c // used in -tjie - vls pal stop palatal + vls pal stp palatal voicingswitch g lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3= 200 80 diff --git a/phsource/ph_albanian b/phsource/ph_albanian index 251c07cd..ce68a3d7 100644 --- a/phsource/ph_albanian +++ b/phsource/ph_albanian @@ -212,7 +212,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp voicingswitch b lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -228,7 +228,7 @@ endphoneme phoneme d - vcd alv stop + vcd alv stp voicingswitch t lengthmod 5 Vowelin f1=2 f2=1700 -300 300 f3=-200 80 amp=16 @@ -304,7 +304,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp voicingswitch g lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_amhari b/phsource/ph_amhari index 650452ca..78e54143 100644 --- a/phsource/ph_amhari +++ b/phsource/ph_amhari @@ -73,7 +73,7 @@ endphoneme phoneme p` - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 gpaus @@ -83,7 +83,7 @@ endphoneme phoneme b - vcd blb stop + vcd blb stp IF prevPhW(isVowel) AND nextPhW(isVowel) THEN ChangePhoneme(B) ENDIF @@ -92,7 +92,7 @@ endphoneme phoneme t` - vls alv stop + vls alv stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1700 -300 300 f3=-100 80 gpaus @@ -118,7 +118,7 @@ endphoneme phoneme k` - vls vel stop + vls vel stp lengthmod 2 Vowelin f1=0 f2=1700 -250 250 f3= -200 80 gpaus f4 Vowelout f1=0 f2=2300 300 400 f3=-200 80 rms=20 diff --git a/phsource/ph_arabic b/phsource/ph_arabic index 8d079dd3..72269fb3 100644 --- a/phsource/ph_arabic +++ b/phsource/ph_arabic @@ -43,7 +43,7 @@ endphoneme phoneme dH //arabic Dhad - alv vls stop + alv vls stp ipa dˤ voicingswitch d[ lengthmod 7 @@ -54,7 +54,7 @@ phoneme dH //arabic Dhad endphoneme phoneme s[ - vls dnt stop + vls dnt stp voicingswitch s length 160 lengthmod 7 diff --git a/phsource/ph_aragon b/phsource/ph_aragon index fc7e13fc..2fc5a79c 100644 --- a/phsource/ph_aragon +++ b/phsource/ph_aragon @@ -1,7 +1,7 @@ // based on Spanish phoneme t# - vls dnt stop + vls dnt stp IF NOT prevVowel(isStressed) THEN ChangePhoneme(t) ENDIF @@ -28,7 +28,7 @@ endphoneme //phoneme k -// vls vel stop +// vls vel stp // lengthmod 2 // voicingswitch g // Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -48,7 +48,7 @@ endphoneme //phoneme t -// vls dnt stop +// vls dnt stp // lengthmod 2 // voicingswitch d // Vowelin f1=0 f2=1600 -300 300 f3=-100 80 diff --git a/phsource/ph_base2 b/phsource/ph_base2 index 6a9003fc..1172f74e 100644 --- a/phsource/ph_base2 +++ b/phsource/ph_base2 @@ -160,7 +160,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -181,7 +181,7 @@ endphoneme phoneme t // dental variant of /t/ - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -194,7 +194,7 @@ endphoneme phoneme d // dental variant of /d/ - vcd dnt stop + vcd dnt stp lengthmod 5 voicingswitch t Vowelin f1=2 f2=1500 -300 300 f3=-150 80 @@ -216,7 +216,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_basque b/phsource/ph_basque index 3f822b95..90148478 100644 --- a/phsource/ph_basque +++ b/phsource/ph_basque @@ -105,7 +105,7 @@ endphoneme phoneme t - vls dnt stop + vls dnt stp lengthmod 2 CALL base2/t endphoneme diff --git a/phsource/ph_bulgarian b/phsource/ph_bulgarian index 28da92ac..3898437b 100644 --- a/phsource/ph_bulgarian +++ b/phsource/ph_bulgarian @@ -93,7 +93,7 @@ endphoneme phoneme g; - vcd vel stop + vcd vel stp palatal voicingswitch k lengthmod 5 diff --git a/phsource/ph_burmese b/phsource/ph_burmese index 029f215b..58387e96 100644 --- a/phsource/ph_burmese +++ b/phsource/ph_burmese @@ -460,32 +460,32 @@ endphoneme //endphoneme phoneme p - //vls blb stop + //vls blb stp import_phoneme base/b endphoneme phoneme b - //vcd blb stop + //vcd blb stp import_phoneme base/b endphoneme phoneme ph //aspirated - //vls blb stop + //vls blb stp import_phoneme base/p endphoneme phoneme t - //vls alv stop + //vls alv stp import_phoneme base/d endphoneme phoneme d - //vcd alv stop + //vcd alv stp import_phoneme base/d endphoneme phoneme th - //vls alv stop + //vls alv stp import_phoneme base/t endphoneme @@ -505,22 +505,22 @@ phoneme tÉ•h endphoneme phoneme k - //vls vel stop + //vls vel stp import_phoneme base/k endphoneme phoneme g - //vcd vel stop + //vcd vel stp import_phoneme base/g endphoneme phoneme kh - //vls vel stop + //vls vel stp import_phoneme base/k endphoneme phoneme Ê” - vls glt stop + vls glt stp endphoneme phoneme θ diff --git a/phsource/ph_consonants b/phsource/ph_consonants index 378729fb..44b97803 100644 --- a/phsource/ph_consonants +++ b/phsource/ph_consonants @@ -34,7 +34,7 @@ endphoneme phoneme p- // unaspirated - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -51,7 +51,7 @@ endphoneme phoneme ph // aspirated - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -67,7 +67,7 @@ endphoneme phoneme t- - vls alv stop + vls alv stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -93,7 +93,7 @@ endphoneme phoneme k- // unaspirated - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 300 f3=-150 80 @@ -106,7 +106,7 @@ endphoneme phoneme kh - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 300 f3=-150 80 @@ -121,7 +121,7 @@ phoneme kh endphoneme phoneme k# - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=1 f2=1400 -100 100 f3=-150 80 diff --git a/phsource/ph_croatian b/phsource/ph_croatian index 5721b6d4..b6c5e194 100644 --- a/phsource/ph_croatian +++ b/phsource/ph_croatian @@ -187,7 +187,7 @@ endphoneme phoneme t // dental variant of /t/ - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -200,7 +200,7 @@ endphoneme phoneme d - vcd alv stop + vcd alv stp lengthmod 5 voicingswitch t Vowelin f1=2 f2=1700 -300 300 f3=-100 80 amp=16 diff --git a/phsource/ph_danish b/phsource/ph_danish index 289767b1..ea35cc5d 100644 --- a/phsource/ph_danish +++ b/phsource/ph_danish @@ -877,7 +877,7 @@ phoneme s endphoneme phoneme p - vls blb stop + vls blb stp voicingswitch b lengthmod 7 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 @@ -898,7 +898,7 @@ phoneme p endphoneme phoneme t - vls alv stop + vls alv stp voicingswitch d lengthmod 7 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_english b/phsource/ph_english index 3003dc51..c7539730 100644 --- a/phsource/ph_english +++ b/phsource/ph_english @@ -1,18 +1,18 @@ phoneme t2 // [t] which doesn't reduce - vcd alv stop + vcd alv stp ChangePhoneme(t) endphoneme phoneme t# // reduced [t] as in "city" in en-us - vcd alv stop + vcd alv stp ChangePhoneme(t) endphoneme phoneme d# // change to [d] or [t] depending on whether previous phoneme is voiced - vls alv stop + vls alv stp IF prevPh(isVoiced) THEN ChangePhoneme(d) ELSE diff --git a/phsource/ph_english_us b/phsource/ph_english_us index f7a15031..212725fe 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -397,7 +397,7 @@ endphoneme phoneme t# // reduced [t] as in "city" - vcd alv stop + vcd alv stp ipa ɾ lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 @@ -422,7 +422,7 @@ endphoneme phoneme t - vls alv stop + vls alv stp voicingswitch d lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -453,8 +453,8 @@ phoneme t2 // [t] which doesn't reduce import_phoneme base/t endphoneme -phoneme ? // glottal stop - vls glt stop +phoneme ? // glottal stp + vls glt stp lengthmod 1 // 5? longer preceding vowel nolink Vowelin glstop diff --git a/phsource/ph_estonian b/phsource/ph_estonian index 483ba3f3..ca935422 100644 --- a/phsource/ph_estonian +++ b/phsource/ph_estonian @@ -264,7 +264,7 @@ endphoneme phoneme t // dental variant of /t/ - vls dnt stop lengthenstop + vls dnt stp lengthenstop voicingswitch d lengthmod 5 Vowelin f1=1 f2=1500 -250 250 f3=-100 80 amp=20 @@ -278,7 +278,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp voicingswitch t lengthmod 5 Vowelin f1=2 f2=1700 -100 200 f3=0 80 @@ -315,7 +315,7 @@ phoneme r // used for [r] when not preceding a vowel endphoneme phoneme k // tasasemad klõklsud - vls vel stop + vls vel stp lengthmod 5 voicingswitch g Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -378,7 +378,7 @@ phoneme s^ endphoneme phoneme t^ - vls pal stop palatal + vls pal stp palatal lengthmod 5 voicingswitch d^ Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 @@ -390,7 +390,7 @@ phoneme t^ endphoneme phoneme d^ - vcd alv stop palatal + vcd alv stp palatal lengthmod 5 voicingswitch t^ Vowelin f1=2 f2=2700 400 600 f3=200 80 rate len=80 diff --git a/phsource/ph_finnish b/phsource/ph_finnish index c69bed1d..0f953ad6 100644 --- a/phsource/ph_finnish +++ b/phsource/ph_finnish @@ -276,7 +276,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp voicingswitch t lengthmod 5 Vowelin f1=2 f2=1700 -100 200 f3=0 80 diff --git a/phsource/ph_french b/phsource/ph_french index aecd7db4..0d759caa 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -618,7 +618,7 @@ endphoneme // uses the consonants in file "phonemes", unless overridden here phoneme b - vcd blb stop + vcd blb stp starttype #cFR endtype #cFR voicingswitch p lengthmod 6 @@ -654,7 +654,7 @@ endphoneme phoneme d - vcd alv stop + vcd alv stp starttype #cFR endtype #cFR voicingswitch t lengthmod 5 @@ -694,7 +694,7 @@ endphoneme phoneme g - vcd vel stop + vcd vel stp starttype #cFR endtype #cFR voicingswitch k lengthmod 5 @@ -720,7 +720,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp starttype #cFR endtype #cFR voicingswitch g length 50 @@ -784,7 +784,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp starttype #cFR endtype #cFR voicingswitch b lengthmod 2 @@ -806,7 +806,7 @@ endphoneme phoneme p2 // silent unless followed by vowel - vls blb stop + vls blb stp lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 Vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22 @@ -857,7 +857,7 @@ endphoneme phoneme t - vls alv stop + vls alv stp starttype #cFR endtype #cFR voicingswitch d lengthmod 2 @@ -876,7 +876,7 @@ endphoneme phoneme t2 // silent unless followed by vowel - vls alv stop + vls alv stp Vowelin f1=0 f2=1600 -300 300 f3=-100 80 Vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20 lengthmod 2 @@ -891,7 +891,7 @@ endphoneme phoneme t3 // silent unless followed by vowel or pause - vls alv stop + vls alv stp lengthmod 2 IF nextPh(isPause) THEN ChangePhoneme(t) diff --git a/phsource/ph_georgian b/phsource/ph_georgian index 99fba0e4..164137bb 100644 --- a/phsource/ph_georgian +++ b/phsource/ph_georgian @@ -66,7 +66,7 @@ endphoneme phoneme k# - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=1 f2=1400 -100 100 f3=-150 80 diff --git a/phsource/ph_german b/phsource/ph_german index 4eb0792a..d5e2840a 100644 --- a/phsource/ph_german +++ b/phsource/ph_german @@ -241,7 +241,7 @@ endphoneme //=========== phoneme t - vls alv stop + vls alv stp voicingswitch d lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -410,7 +410,7 @@ phoneme b endphoneme phoneme d - vcd alv stop + vcd alv stp voicingswitch t IF nextPh(l2) THEN ChangePhoneme(t) @@ -433,7 +433,7 @@ phoneme d endphoneme phoneme g - vcd vel stop + vcd vel stp voicingswitch k IF nextPh(l2) THEN ChangePhoneme(k) diff --git a/phsource/ph_greek b/phsource/ph_greek index 497ce1c3..0047131a 100644 --- a/phsource/ph_greek +++ b/phsource/ph_greek @@ -48,7 +48,7 @@ endphoneme // CONSONANTS phoneme t // revert to alveolar /t/ - vls alv stop + vls alv stp lengthmod 2 voicingswitch d Vowelin f1=1 f2=1600 -300 300 f3=-100 80 amp=11 @@ -67,7 +67,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_greenlandic b/phsource/ph_greenlandic index 1bcd3d22..8cb79848 100644 --- a/phsource/ph_greenlandic +++ b/phsource/ph_greenlandic @@ -85,7 +85,7 @@ endphoneme phoneme tl# - vls alv stop + vls alv stp lengthmod 2 ipa tl# Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_guarani b/phsource/ph_guarani index 332d4802..64371ef6 100644 --- a/phsource/ph_guarani +++ b/phsource/ph_guarani @@ -89,7 +89,7 @@ endphoneme // consonants phoneme b - vcd blb stop + vcd blb stp IF nextPh(isVowel) OR nextPh(isRhotic) OR nextPh(isLiquid) THEN IF prevPh(isPause) OR prevPh(isNasal) THEN ELSE @@ -114,7 +114,7 @@ phoneme r endphoneme phoneme g - vcd vel stop + vcd vel stp lengthmod 5 voicingswitch k Vowelin f1=2 f2=2300 200 300 f3=-300 80 diff --git a/phsource/ph_hindi_base b/phsource/ph_hindi_base index 77421ab2..a08d08a4 100644 --- a/phsource/ph_hindi_base +++ b/phsource/ph_hindi_base @@ -317,7 +317,7 @@ endphoneme phoneme b# - vcd blb stop + vcd blb stp lengthmod 5 voicingswitch p# Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -343,7 +343,7 @@ endphoneme phoneme t# // dental variant of /t/ - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1500 -300 300 f3=-100 80 amp=16 @@ -362,7 +362,7 @@ endphoneme phoneme d# - vcd dnt stop + vcd dnt stp lengthmod 5 voicingswitch t# Vowelin f1=0 f2=1500 -300 300 f3=-100 80 @@ -382,7 +382,7 @@ endphoneme //=================== phoneme t. - vls rfx stop + vls rfx stp lengthmod 2 ipa ʈ voicingswitch d. @@ -392,7 +392,7 @@ phoneme t. endphoneme phoneme t.# - vls rfx stop + vls rfx stp lengthmod 2 ipa ʈU+02B0 voicingswitch d.# @@ -406,7 +406,7 @@ phoneme t.# endphoneme phoneme d. - vcd rfx stop + vcd rfx stp lengthmod 5 voicingswitch t. ipa É– @@ -426,7 +426,7 @@ endphoneme phoneme d.# - vcd rfx stop + vcd rfx stp lengthmod 5 ipa É–U+02B0 voicingswitch t.# @@ -514,7 +514,7 @@ endphoneme phoneme g# - vcd dnt stop + vcd dnt stp lengthmod 5 voicingswitch k# Vowelin f1=1 f2=2300 200 300 f3=-150 80 rms=20 diff --git a/phsource/ph_hungarian b/phsource/ph_hungarian index b7c85867..db2ccaec 100644 --- a/phsource/ph_hungarian +++ b/phsource/ph_hungarian @@ -111,7 +111,7 @@ endphoneme phoneme t // dental variant of /t/ - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -125,7 +125,7 @@ endphoneme phoneme t2 // changes to pause when followed by [t], so the [t][ becomes [t:] - vls dnt stop + vls dnt stp lengthmod 2 IF nextPh(t) THEN WAV(ustop/null, 0) @@ -136,7 +136,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp voicingswitch t lengthmod 5 Vowelin f1=2 f2=1500 -300 300 f3=-150 80 diff --git a/phsource/ph_icelandic b/phsource/ph_icelandic index 6868413d..0dd9a8ad 100644 --- a/phsource/ph_icelandic +++ b/phsource/ph_icelandic @@ -286,7 +286,7 @@ endphoneme phoneme tl# - vls alv stop + vls alv stp lengthmod 2 ipa tl# Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -305,7 +305,7 @@ endphoneme phoneme b - vls blb stop + vls blb stp lengthmod 5 Vowelin f1=1 f2=1000 -300 -200 f3=-200 80 amp=11 Vowelout f1=2 f2=1000 -300 -300 f3=-300 80 brk @@ -314,7 +314,7 @@ endphoneme phoneme d - vls alv stop + vls alv stp lengthmod 5 Vowelin f1=2 f2=1700 -300 300 f3=-100 80 Vowelout f1=2 f2=1700 -300 300 f3=-100 80 @@ -326,7 +326,7 @@ endphoneme phoneme g - vls vel stop + vls vel stp lengthmod 5 Vowelin f1=2 f2=2300 200 300 f3=-300 80 Vowelout f1=2 f2=2300 250 300 f3=-300 80 brk diff --git a/phsource/ph_japanese b/phsource/ph_japanese index 7c3f9487..b5d6ba77 100644 --- a/phsource/ph_japanese +++ b/phsource/ph_japanese @@ -177,7 +177,7 @@ endphoneme // Plosives phoneme p - vls blb stop + vls blb stp voicingswitch b lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 @@ -187,7 +187,7 @@ phoneme p endphoneme phoneme b - vcd blb stop + vcd blb stp voicingswitch p Vowelout f1=2 f2=1000 -500 -300 f3=-300 80 brk lengthmod 5 @@ -214,7 +214,7 @@ phoneme b endphoneme phoneme t - vls alv stop + vls alv stp voicingswitch d lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -224,7 +224,7 @@ phoneme t endphoneme phoneme d - vcd alv stop + vcd alv stp voicingswitch t lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 @@ -234,7 +234,7 @@ phoneme d endphoneme phoneme k - vls vel stop + vls vel stp voicingswitch g lengthmod 2 Vowelin f1=0 f2=2300 200 300 f3=-200 80 @@ -244,7 +244,7 @@ phoneme k endphoneme phoneme g - vcd vel stop + vcd vel stp voicingswitch k lengthmod 5 Vowelin f1=2 f2=2300 200 300 f3=-300 80 @@ -254,7 +254,7 @@ phoneme g endphoneme phoneme ? - vls glt stop + vls glt stp lengthmod 3 nolink Vowelin glstop diff --git a/phsource/ph_kannada b/phsource/ph_kannada index 05b33eea..5dec682f 100644 --- a/phsource/ph_kannada +++ b/phsource/ph_kannada @@ -109,7 +109,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp voicingswitch t[ lengthmod 5 Vowelin f1=2 f2=1500 -300 300 f3=-150 80 diff --git a/phsource/ph_korean b/phsource/ph_korean index 0512a637..7ceddb98 100644 --- a/phsource/ph_korean +++ b/phsource/ph_korean @@ -49,7 +49,7 @@ endphoneme // consonants phoneme k- // /ㄲ/ - vls vel stop + vls vel stp lengthmod 3 Vowelin f1=1 f2=1700 0 200 f3=-300 80 f4 Vowelout f1=1 f2=1700 0 200 f3=-300 80 f4 rms=30 @@ -62,7 +62,7 @@ phoneme kh // /ã…‹/ endphoneme phoneme t- // /ㄸ/ - vls alv stop + vls alv stp lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 rms=40 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 diff --git a/phsource/ph_kurdish b/phsource/ph_kurdish index 8c55fe5f..89b8fcbe 100644 --- a/phsource/ph_kurdish +++ b/phsource/ph_kurdish @@ -111,7 +111,7 @@ endphoneme phoneme c - vls pal stop + vls pal stp lengthmod 2 voicingswitch J Vowelin f1=0 f2=2700 200 500 f3=400 80 len=60 @@ -124,7 +124,7 @@ endphoneme phoneme J - vcd pla stop + vcd pla stp voicingswitch c lengthmod 5 Vowelin f1=2 f2=2700 400 600 f3=300 80 diff --git a/phsource/ph_kyrgyz b/phsource/ph_kyrgyz index 97a709d0..dc8a6aa7 100644 --- a/phsource/ph_kyrgyz +++ b/phsource/ph_kyrgyz @@ -408,7 +408,7 @@ endphoneme phoneme b ipa b - vcd blb stop + vcd blb stp voicingswitch p Vowelout f1=2 f2=1000 -500 -300 f3=-300 80 brk lengthmod 5 @@ -485,7 +485,7 @@ endphoneme phoneme g - vcd vel stop + vcd vel stp voicingswitch k lengthmod 5 Vowelin f1=2 f2=2300 200 300 f3=-300 80 @@ -503,7 +503,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp voicingswitch g lengthmod 2 Vowelin f1=0 f2=2300 200 300 f3=-200 80 @@ -560,7 +560,7 @@ endphoneme phoneme p ipa p - vls blb stop + vls blb stp voicingswitch b lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 @@ -583,7 +583,7 @@ endphoneme phoneme t // dental /t/ ipa t[ - vls dnt stop + vls dnt stp voicingswitch d lengthmod 2 Vowelin f1=1 f2=1500 -250 250 f3=-100 80 amp=16 @@ -598,7 +598,7 @@ endphoneme phoneme d // dental /d/ ipa d[ - vcd dnt stop + vcd dnt stp voicingswitch t lengthmod 5 Vowelin f1=2 f2=1500 -300 300 f3=-150 80 @@ -621,7 +621,7 @@ endphoneme phoneme q ipa q - vls uvl stop + vls uvl stp lengthmod 2 Vowelin f1=1 f2=1700 0 200 f3=-300 80 gpaus f4 rms=30 Vowelout f1=1 f2=1700 -100 200 f3=-300 80 f4 rms=35 diff --git a/phsource/ph_latvian b/phsource/ph_latvian index 13baa685..6bb79b41 100644 --- a/phsource/ph_latvian +++ b/phsource/ph_latvian @@ -185,7 +185,7 @@ phoneme r // Latvian soft r endphoneme phoneme t - vls alv stop //lengthenstop + vls alv stp //lengthenstop lengthmod 1 voicingswitch d IF nextPh(isPause2) THEN @@ -195,7 +195,7 @@ phoneme t endphoneme phoneme p - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -210,7 +210,7 @@ phoneme p endphoneme phoneme k - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -228,13 +228,13 @@ phoneme k endphoneme phoneme c - vls pal stop palatal + vls pal stp palatal voicingswitch J WAV(ustop/c, 80) endphoneme phoneme D // louder and shorter version of d - vcd alv stop + vcd alv stp voicingswitch t length 10 lengthmod 5 diff --git a/phsource/ph_lithuanian b/phsource/ph_lithuanian index ece99385..1c02d97e 100644 --- a/phsource/ph_lithuanian +++ b/phsource/ph_lithuanian @@ -236,7 +236,7 @@ endphoneme phoneme t - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -249,7 +249,7 @@ endphoneme phoneme t; - vls pal stop palatal + vls pal stp palatal lengthmod 2 voicingswitch d; Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 @@ -262,7 +262,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp lengthmod 5 voicingswitch t Vowelin f1=2 f2=1500 -300 300 f3=-150 80 @@ -283,7 +283,7 @@ endphoneme phoneme d; - vcd alv stop palatal + vcd alv stp palatal lengthmod 5 voicingswitch t; Vowelin f1=2 f2=2700 400 600 f3=200 80 rate len=80 diff --git a/phsource/ph_macedonian b/phsource/ph_macedonian index e8e455d4..d0981d05 100644 --- a/phsource/ph_macedonian +++ b/phsource/ph_macedonian @@ -1,7 +1,7 @@ // Based on ph_croatian phoneme k^ - vls pal stop + vls pal stp lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=400 80 Vowelout f1=0 f2=2700 400 600 f3=400 80 rms=20 diff --git a/phsource/ph_malayalam b/phsource/ph_malayalam index 87745877..3069b7b0 100644 --- a/phsource/ph_malayalam +++ b/phsource/ph_malayalam @@ -147,7 +147,7 @@ endphoneme // Aspirated voice stops, sound like aspirated unvoiced stops ? phoneme b# - vls blb stop prevoice + vls blb stp prevoice lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 @@ -172,7 +172,7 @@ endphoneme phoneme d# - vls dnt stop prevoice + vls dnt stp prevoice lengthmod 2 voicingswitch d Vowelin f1=0 f2=1500 -300 300 f3=-100 80 amp=16 @@ -194,7 +194,7 @@ endphoneme phoneme t.# - vls rfx stop + vls rfx stp lengthmod 2 ipa ʈU+02B0 voicingswitch d.# @@ -209,7 +209,7 @@ endphoneme phoneme d.# - vls rfx stop prevoice + vls rfx stp prevoice lengthmod 2 ipa ʈU+02B0 Vowelin f1=0 f2=1800 -300 300 f3=-200 80 @@ -250,7 +250,7 @@ endphoneme phoneme g# - vls vel stop prevoice + vls vel stp prevoice lengthmod 2 Vowelin f1=1 f2=1400 -100 100 f3=-150 80 Vowelout f1=0 f2=2300 300 400 f3=-150 80 rms=20 diff --git a/phsource/ph_maltese b/phsource/ph_maltese index 9f0516dc..132f49dc 100644 --- a/phsource/ph_maltese +++ b/phsource/ph_maltese @@ -229,7 +229,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp voicingswitch t lengthmod 5 Vowelin f1=2 f2=1700 -100 200 f3=0 80 diff --git a/phsource/ph_oromo b/phsource/ph_oromo index 18176a5a..212fbb55 100644 --- a/phsource/ph_oromo +++ b/phsource/ph_oromo @@ -125,7 +125,7 @@ phoneme r endphoneme phoneme k` - vls vel stop + vls vel stp lengthmod 2 Vowelin f1=0 f2=1700 -250 250 f3= -200 80 gpaus f4 Vowelout f1=0 f2=2300 300 400 f3=-200 80 rms=20 @@ -133,7 +133,7 @@ phoneme k` endphoneme phoneme t` - vls alv stop + vls alv stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1700 -300 300 f3=-100 80 gpaus @@ -157,7 +157,7 @@ phoneme tS` endphoneme phoneme P - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 gpaus @@ -167,7 +167,7 @@ endphoneme phoneme D - vcd alv stop + vcd alv stp lengthmod 6 voicingswitch d CALL base/D diff --git a/phsource/ph_polish b/phsource/ph_polish index 06027a8d..26e5232e 100644 --- a/phsource/ph_polish +++ b/phsource/ph_polish @@ -96,7 +96,7 @@ endphoneme phoneme t - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -109,7 +109,7 @@ endphoneme phoneme t; - vls pal stop palatal + vls pal stp palatal lengthmod 2 voicingswitch d; Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 @@ -122,7 +122,7 @@ endphoneme phoneme d - vcd dnt stop + vcd dnt stp lengthmod 5 voicingswitch t Vowelin f1=2 f2=1500 -300 300 f3=-150 80 @@ -143,7 +143,7 @@ endphoneme phoneme d; - vcd alv stop palatal + vcd alv stp palatal lengthmod 5 voicingswitch t; Vowelin f1=2 f2=2700 400 600 f3=200 80 rate len=80 diff --git a/phsource/ph_pt_brazil b/phsource/ph_pt_brazil index 1e791df0..4e7b684c 100644 --- a/phsource/ph_pt_brazil +++ b/phsource/ph_pt_brazil @@ -211,7 +211,7 @@ endphoneme phoneme * - vcd alv stop + vcd alv stp lengthmod 6 ipa ɾ Vowelin f1=1 f2=1700 -300 300 f3=0 80 diff --git a/phsource/ph_romanian b/phsource/ph_romanian index 18debc1f..a566c11f 100644 --- a/phsource/ph_romanian +++ b/phsource/ph_romanian @@ -204,7 +204,7 @@ endphoneme phoneme p; - vls blb stop + vls blb stp lengthmod 2 voicingswitch b CALL base2/p @@ -213,7 +213,7 @@ endphoneme phoneme t; // dental variant of /t/ - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d CALL base2/t @@ -258,7 +258,7 @@ endphoneme phoneme b; - vcd blb stop + vcd blb stp voicingswitch p; lengthmod 5 Vowelout f1=2 f2=1000 -500 -300 f3=-300 80 brk colr=1 @@ -271,7 +271,7 @@ endphoneme phoneme d; // dental variant of /d/ - vcd dnt stop + vcd dnt stp voicingswitch t; lengthmod 5 CALL base2/d diff --git a/phsource/ph_russian b/phsource/ph_russian index dca92c06..e013c867 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -1,7 +1,7 @@ phoneme g - vcd vel stop prevoice + vcd vel stp prevoice voicingswitch k lengthmod 5 Vowelin f1=2 f2=2300 200 300 f3=-300 80 diff --git a/phsource/ph_s_gaelic b/phsource/ph_s_gaelic index bd992607..43a8c102 100644 --- a/phsource/ph_s_gaelic +++ b/phsource/ph_s_gaelic @@ -238,14 +238,14 @@ phoneme g endphoneme phoneme g; - vls vel stop + vls vel stp Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 Vowelout f1=1 f2=2700 400 600 f3=200 70 len=50 colr=1 WAV(ustop/ki_ejc, 130) endphoneme phoneme k; - vls vel stop + vls vel stp Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 Vowelout f1=1 f2=2700 400 600 f3=200 70 len=50 colr=1 WAV(ustop/ki) @@ -272,7 +272,7 @@ phoneme n[ // temporary endphoneme phoneme * // reduced [t] as in "city" - vcd alv stop + vcd alv stp ipa ɾ lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_serbian b/phsource/ph_serbian index 915a8202..6c472615 100644 --- a/phsource/ph_serbian +++ b/phsource/ph_serbian @@ -32,7 +32,7 @@ endphoneme phoneme t // dental variant of /t/ - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -45,7 +45,7 @@ endphoneme phoneme d - vcd alv stop + vcd alv stp lengthmod 5 voicingswitch t Vowelin f1=2 f2=1700 -300 300 f3=-100 80 amp=16 diff --git a/phsource/ph_setswana b/phsource/ph_setswana index 947e39bd..723252e3 100644 --- a/phsource/ph_setswana +++ b/phsource/ph_setswana @@ -167,7 +167,7 @@ phoneme d // dental variant of /d/ endphoneme phoneme kh - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 300 f3=-150 80 @@ -182,7 +182,7 @@ phoneme kh endphoneme phoneme k- // unaspirated - vls vel stop + vls vel stp lengthmod 2 voicingswitch g Vowelin f1=0 f2=2300 200 300 f3=-150 80 @@ -215,7 +215,7 @@ endphoneme phoneme ph // aspirated - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 diff --git a/phsource/ph_slovak b/phsource/ph_slovak index a19ae771..605fd231 100644 --- a/phsource/ph_slovak +++ b/phsource/ph_slovak @@ -169,7 +169,7 @@ endphoneme phoneme t - vls alv stop + vls alv stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -182,7 +182,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp lengthmod 2 voicingswitch b Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 diff --git a/phsource/ph_slovenian b/phsource/ph_slovenian index 64076657..5f5fb487 100644 --- a/phsource/ph_slovenian +++ b/phsource/ph_slovenian @@ -96,7 +96,7 @@ endphoneme phoneme t - vls dnt stop + vls dnt stp lengthmod 2 voicingswitch d Vowelin f1=0 f2=1600 -300 300 f3=-100 80 @@ -109,7 +109,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp voicingswitch g lengthmod 2 Vowelin f1=0 f2=2300 200 300 f3=-200 80 diff --git a/phsource/ph_spanish b/phsource/ph_spanish index c769b263..bb13e6cd 100644 --- a/phsource/ph_spanish +++ b/phsource/ph_spanish @@ -85,7 +85,7 @@ endphoneme phoneme g - vcd vel stop + vcd vel stp lengthmod 5 voicingswitch k Vowelin f1=2 f2=2300 200 300 f3=-300 80 @@ -109,7 +109,7 @@ phoneme g endphoneme phoneme d - vcd dnt stop + vcd dnt stp IF nextPh(isVowel) OR nextPh(isRhotic) OR nextPh(j) THEN IF prevPh(isPause) OR prevPh(isNasal) OR prevPh(l) THEN @@ -122,7 +122,7 @@ phoneme d endphoneme phoneme b - vcd blb stop + vcd blb stp IF nextPh(isVowel) OR nextPh(isRhotic) OR nextPh(isLiquid) THEN IF prevPh(isPause) OR prevPh(isNasal) THEN diff --git a/phsource/ph_swahili b/phsource/ph_swahili index 3a46330c..ed94ed44 100644 --- a/phsource/ph_swahili +++ b/phsource/ph_swahili @@ -65,7 +65,7 @@ phoneme z endphoneme phoneme t - vls alv stop + vls alv stp voicingswitch d lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -108,7 +108,7 @@ phoneme s endphoneme phoneme p - vls blb stop + vls blb stp voicingswitch b lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 @@ -197,7 +197,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp voicingswitch g lengthmod 2 Vowelin f1=0 f2=2300 200 300 f3=-200 80 @@ -234,7 +234,7 @@ phoneme J endphoneme phoneme g - vcd vel stop + vcd vel stp voicingswitch k lengthmod 5 Vowelin f1=2 f2=2300 200 300 f3=-300 80 diff --git a/phsource/ph_tatar b/phsource/ph_tatar index 2d58ed21..eca69a06 100644 --- a/phsource/ph_tatar +++ b/phsource/ph_tatar @@ -133,7 +133,7 @@ phoneme d endphoneme phoneme k - vls vel stop + vls vel stp IF prevVowel(isFlag2) OR nextVowel(isFlag2) THEN // back vowels ChangePhoneme(q) ENDIF diff --git a/phsource/ph_telugu b/phsource/ph_telugu index 4699aab0..96ec94fc 100644 --- a/phsource/ph_telugu +++ b/phsource/ph_telugu @@ -107,7 +107,7 @@ endphoneme phoneme t.# - vls rfx stop + vls rfx stp lengthmod 2 ipa ʈU+02B0 voicingswitch d.# @@ -121,7 +121,7 @@ phoneme t.# endphoneme phoneme d.# - vcd rfx stop + vcd rfx stp lengthmod 5 ipa É–U+02B0 voicingswitch t.# diff --git a/phsource/ph_turkish b/phsource/ph_turkish index bf8a5ec3..aab39541 100644 --- a/phsource/ph_turkish +++ b/phsource/ph_turkish @@ -163,7 +163,7 @@ endphoneme phoneme c - vls pal stop + vls pal stp lengthmod 2 Vowelin f1=0 f2=2700 200 500 f3=400 80 len=60 Vowelout f1=0 f2=2700 300 500 f3=300 80 @@ -175,7 +175,7 @@ endphoneme phoneme J - vcd pla stop + vcd pla stp lengthmod 5 IF PreVoicing THEN diff --git a/phsource/ph_vietnam b/phsource/ph_vietnam index 61a8ab4b..de6378bb 100644 --- a/phsource/ph_vietnam +++ b/phsource/ph_vietnam @@ -382,7 +382,7 @@ phoneme l endphoneme phoneme t - vls alv stop + vls alv stp //voicingswitch d lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 len=15 @@ -402,7 +402,7 @@ phoneme cr endphoneme phoneme d_ - vcd alv stop + vcd alv stp // lengthmod 5 ipa É— Vowelin f1=1 f2=1700 -300 300 f3=-100 80 len=15 @@ -411,7 +411,7 @@ WAV(vietnam/dd) endphoneme phoneme c - vls pal stop palatal + vls pal stp palatal //voicingswitch J lengthmod 2 length 2 @@ -424,7 +424,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 Vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22 @@ -443,7 +443,7 @@ FMT(n/nr_) endphoneme phoneme t[ // dental variant of /t/ - vls dnt stop + vls dnt stp voicingswitch d[ lengthmod 2 length 5 diff --git a/phsource/ph_welsh b/phsource/ph_welsh index d0dc5079..67556477 100644 --- a/phsource/ph_welsh +++ b/phsource/ph_welsh @@ -223,7 +223,7 @@ endphoneme phoneme g - vcd vel stop + vcd vel stp lengthmod 5 voicingswitch k Vowelin f1=2 f2=2300 200 300 f3=-300 80 diff --git a/phsource/ph_zh b/phsource/ph_zh index 1fdee899..8fd101f8 100644 --- a/phsource/ph_zh +++ b/phsource/ph_zh @@ -142,7 +142,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 Vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22 @@ -150,7 +150,7 @@ phoneme p endphoneme phoneme ph - vls blb stop + vls blb stp lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 Vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22 @@ -165,7 +165,7 @@ phoneme f //not clear before some vowel endphoneme phoneme t - vls alv stop + vls alv stp lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 rms=40 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 @@ -174,7 +174,7 @@ endphoneme phoneme th - vls alv stop + vls alv stp lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 @@ -182,7 +182,7 @@ phoneme th endphoneme phoneme k - vls uvl stop + vls uvl stp lengthmod 2 Vowelin f1=1 f2=1700 0 200 f3=-300 80 f4 Vowelout f1=1 f2=1700 0 200 f3=-300 80 f4 rms=30 @@ -190,7 +190,7 @@ phoneme k endphoneme phoneme kh - vls uvl stop + vls uvl stp lengthmod 2 Vowelin f1=1 f2=1700 0 200 f3=-300 80 f4 Vowelout f1=1 f2=1700 0 200 f3=-300 80 f4 rms=30 diff --git a/phsource/ph_zh_yue b/phsource/ph_zh_yue index bda17ac7..da0ccb63 100644 --- a/phsource/ph_zh_yue +++ b/phsource/ph_zh_yue @@ -72,7 +72,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp lengthmod 2 Vowelin f1=0 f2=2300 200 300 f3=-200 80 Vowelout f1=1 f2=2300 300 400 f3=-200 80 rms=20 @@ -98,7 +98,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 rms=30 Vowelout f1=1 f2=1000 -500 -350 f3=-300 80 rms=22 @@ -109,7 +109,7 @@ phoneme p endphoneme phoneme t - vls alv stop + vls alv stp lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=100 80 Vowelout f1=1 f2=1700 -300 250 f3=-100 80 rms=20 diff --git a/phsource/phonemes b/phsource/phonemes index 7a94437d..a2431e1b 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -114,8 +114,8 @@ phoneme _X1 // a language specific action length 10 endphoneme -phoneme ? // glottal stop - vls glt stop +phoneme ? // glottal stp + vls glt stp lengthmod 3 // ?? nolink Vowelin glstop @@ -931,7 +931,7 @@ endphoneme phoneme b - vcd blb stop + vcd blb stp voicingswitch p Vowelout f1=2 f2=1000 -500 -300 f3=-300 80 brk lengthmod 5 @@ -971,7 +971,7 @@ endphoneme phoneme d - vcd alv stop + vcd alv stp voicingswitch t lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 @@ -992,7 +992,7 @@ endphoneme phoneme d[ - vcd dnt stop + vcd dnt stp voicingswitch t[ lengthmod 5 Vowelin f1=2 f2=1500 -300 300 f3=-150 80 @@ -1082,7 +1082,7 @@ endphoneme phoneme g - vcd vel stop + vcd vel stp voicingswitch k lengthmod 5 Vowelin f1=2 f2=2300 200 300 f3=-300 80 @@ -1339,7 +1339,7 @@ endphoneme phoneme p - vls blb stop + vls blb stp voicingswitch b lengthmod 2 Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 @@ -1361,7 +1361,7 @@ endphoneme phoneme t - vls alv stop + vls alv stp voicingswitch d lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -1379,7 +1379,7 @@ endphoneme phoneme t[ // dental variant of /t/ - vls dnt stop + vls dnt stp voicingswitch d[ lengthmod 2 Vowelin f1=1 f2=1500 -250 250 f3=-100 80 amp=16 @@ -1420,7 +1420,7 @@ endphoneme phoneme c - vls pal stop palatal + vls pal stp palatal voicingswitch J lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 @@ -1434,7 +1434,7 @@ endphoneme phoneme k - vls vel stop + vls vel stp voicingswitch g lengthmod 2 Vowelin f1=0 f2=2300 200 300 f3=-200 80 @@ -1460,7 +1460,7 @@ endphoneme phoneme q - vls uvl stop + vls uvl stp lengthmod 2 Vowelin f1=1 f2=1700 0 200 f3=-300 80 gpaus f4 rms=30 Vowelout f1=1 f2=1700 -100 200 f3=-300 80 f4 rms=35 diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index db0f5f49..1d6e45a2 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -223,7 +223,6 @@ static keywtab_t keywords[] = { { "delete_phoneme", tPHONEME_TYPE, phDELETED }, // type of consonant - { "stop", tPHONEME_TYPE, phSTOP }, // TODO (deprecated): use 'stp' instead { "nasal", tPHONEME_TYPE, phNASAL }, // TODO (deprecated): use 'nas' instead // keywords