From 8f30e3d6076ceee267cbb82f551b84f7c414788b Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Fri, 13 Apr 2018 07:27:45 +0100 Subject: [PATCH] Revert "en: use '@' instead of 'I' for the ROSES vowel in en and en-GB." This reverts commit 223ff9c8ad9ab3dc6247ce4f3033384e1e5fc89f. --- docs/languages/gmw/en.md | 2 +- phsource/ph_english | 9 +++++++-- phsource/ph_english_n | 14 -------------- phsource/ph_english_rp | 15 --------------- phsource/ph_english_wi | 14 -------------- phsource/ph_english_wm | 14 -------------- tests/language-phonemes.test | 2 +- tests/language-pronunciation.test | 2 +- tests/translate.test | 2 +- 9 files changed, 11 insertions(+), 63 deletions(-) diff --git a/docs/languages/gmw/en.md b/docs/languages/gmw/en.md index c39cfc5e..76f71070 100644 --- a/docs/languages/gmw/en.md +++ b/docs/languages/gmw/en.md @@ -103,7 +103,7 @@ Additionally, espeak-ng has the following phonemes for unstressed vowels. | Lexical Set | en | BrE | RP | GenAm | JaE | |-------------|-------|-------|-------|-------|-------| | EXPLORE | `e#` | ɛ | ɪ | ɛ | ɛ | -| ROSES | `I#` | ə | ɪ | ᵻ | ɪ | +| ROSES | `I#` | ɪ | ɪ | ᵻ | ɪ | | BLESSED | `I2#` | ɪ | ɪ | ᵻ | ɛ | | RABBIT | `I2` | ɪ | ɪ | ɪ | ɪ | diff --git a/phsource/ph_english b/phsource/ph_english index 443ef345..5f9329f5 100644 --- a/phsource/ph_english +++ b/phsource/ph_english @@ -276,11 +276,16 @@ endphoneme phoneme I# // used for [I] which may be [@] in some accents - vwl starttype #@ endtype #@ + vwl starttype #i endtype #i unstressed + length 130 + + IF MbrolaSynth THEN + ChangePhoneme(I) + ENDIF IfNextVowelAppend(;) - ChangePhoneme(@) + ChangePhoneme(I2) endphoneme diff --git a/phsource/ph_english_n b/phsource/ph_english_n index 37f4d732..7cec30fd 100644 --- a/phsource/ph_english_n +++ b/phsource/ph_english_n @@ -59,20 +59,6 @@ phoneme I2 endphoneme -phoneme I# // used for [I] which may be [@] in some accents - vwl starttype #i endtype #i - unstressed - length 130 - - IF MbrolaSynth THEN - ChangePhoneme(I) - ENDIF - - IfNextVowelAppend(;) - ChangePhoneme(I2) -endphoneme - - phoneme i // optional variant of [I] for end of words vwl starttype #i endtype #i length 150 diff --git a/phsource/ph_english_rp b/phsource/ph_english_rp index cbec0cd2..6f89359a 100644 --- a/phsource/ph_english_rp +++ b/phsource/ph_english_rp @@ -72,7 +72,6 @@ phoneme I FMT(vowel/ii) endphoneme - phoneme I2 vwl starttype #i endtype #i unstressed @@ -82,20 +81,6 @@ phoneme I2 endphoneme -phoneme I# // used for [I] which may be [@] in some accents - vwl starttype #i endtype #i - unstressed - length 130 - - IF MbrolaSynth THEN - ChangePhoneme(I) - ENDIF - - IfNextVowelAppend(;) - ChangePhoneme(I2) -endphoneme - - phoneme i vwl starttype #i endtype #i unstressed diff --git a/phsource/ph_english_wi b/phsource/ph_english_wi index faa02f9d..7257bf67 100644 --- a/phsource/ph_english_wi +++ b/phsource/ph_english_wi @@ -60,20 +60,6 @@ phoneme I2 endphoneme -phoneme I# // used for [I] which may be [@] in some accents - vwl starttype #i endtype #i - unstressed - length 130 - - IF MbrolaSynth THEN - ChangePhoneme(I) - ENDIF - - IfNextVowelAppend(;) - ChangePhoneme(I2) -endphoneme - - phoneme I2# // used for [I] in -ed adjectives which may be [E] in some accents vwl starttype #@ endtype #@ unstressed diff --git a/phsource/ph_english_wm b/phsource/ph_english_wm index 03cc17a7..de0185b8 100644 --- a/phsource/ph_english_wm +++ b/phsource/ph_english_wm @@ -53,20 +53,6 @@ phoneme I2 endphoneme -phoneme I# // used for [I] which may be [@] in some accents - vwl starttype #i endtype #i - unstressed - length 130 - - IF MbrolaSynth THEN - ChangePhoneme(I) - ENDIF - - IfNextVowelAppend(;) - ChangePhoneme(I2) -endphoneme - - phoneme i // optional variant of [I] for end of words vwl starttype #i endtype #i length 220 diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test index c1e120e3..d22f0aa7 100755 --- a/tests/language-phonemes.test +++ b/tests/language-phonemes.test @@ -50,7 +50,7 @@ test_lang cy 5c5c7ab1c1b531dcacbbe072d5ee9cef3467d945 "ma na Na pa ta ka ba da g test_lang da c55842af4f63fd67e6e48b97903b77223b6a4d77 "ma na Na pa ta ka ba da ga fa sa ha S;a tS;a va Da ja ra Ra _:_ m@ m@- m3 m3- mi m?i mI me m?e mE m?E m& m?& m&# m?&# mA m?A mu m?u mo m?o mO m?O mV m?V m0 m?0 my m?y mY mW m?W mW# m?W# maI" test_lang de 05674cedba4cfef615b412f6c805a7ff592ba045 "ma na Na pa ta ka ?a ba da ga pFa tsa tSa dZa sa Sa za Za fa Ta Ca xa ha ca Da ja la ra g#a l/a l2a _:_ m@ m3 ma mE mE2 mI mO mU mA mi2 my mW mI: mA: mi: mu: mE: me: mo: my: mY: maU maI mEI mOY moU mA~ miR mUR" test_lang el b01fb02420612ea59c43bf6aff4175063bd93bcb "ma na pa ta ka ba da ga fa Ta sa xa va Da za Qa ra la _:_ ma me mi mo mu" -test_lang en 0eadc2ec27672db64148e97ce18da1a0f8f82a97 "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" +test_lang en c4ed41c6ef4a43bae30f3469fe886c7b456dd02d "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" test_lang en-029 cfd13bc57be7f495935c662472eae3d2c7200ebd "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" test_lang en-GB-scotland b802f6862386b748d4224b26a0fde05abfd20b3d "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" test_lang en-GB-x-gbclan 8f3d17600cfbfe77c5e92a7f8a89544a78452a7a "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" diff --git a/tests/language-pronunciation.test b/tests/language-pronunciation.test index c2341d77..46bad339 100755 --- a/tests/language-pronunciation.test +++ b/tests/language-pronunciation.test @@ -16,7 +16,7 @@ test_phonemes de \ " dr'Uk3 l'amp@ (en)k@mpj'u:t3(de) St'Ern St'Ern@" \ "drucker lampe computer stern sterne" test_phonemes en \ - " k'It dr'Es tr'ap l'0t str'Vt f'Ut fl'i:s p'A:m T'O:t g'u:s n'3:s st'A@t n'O@T f'o@s kj'U@ n,i@3 skw'e@ t'3:m b'3:d h'api k'0m@ l'Et3r- Ekspl'o@ r'oUz@z r'abIt f'eIs pr'aIs tS'OIs g'oUt m'aUT b'aaT kl'0T m'Ili@n d@v'aId@d" \ + " k'It dr'Es tr'ap l'0t str'Vt f'Ut fl'i:s p'A:m T'O:t g'u:s n'3:s st'A@t n'O@T f'o@s kj'U@ n,i@3 skw'e@ t'3:m b'3:d h'api k'0m@ l'Et3r- Ekspl'o@ r'oUzI2z r'abIt f'eIs pr'aIs tS'OIs g'oUt m'aUT b'aaT kl'0T m'Ili@n dI2v'aIdI2d" \ "kit dress trap lot strut foot fleece palm thought goose nurse start north force cure near square term bird happy comma letter explore roses rabbit face price choice goat mouth bath cloth million divided" test_phonemes en-029 \ " k'It dr'Es tr'ap l'0t str'Vt f'Ut fl'i:s p'A:m t['O:t g'u:s n'3:s st'A@t n'O@t[ f'o@s kj'o@ n,i@3 skw'e@ t'3:m b'3:d h'api k'0ma# l'Eta# Ekspl'o@ r'oUzI2z r'abIt f'eIs pr'aIs tS'OIs g'oUt m'aUt[ b'aat[ kl'0t[ m'Ili@n dI2v'aIdI2d" \ diff --git a/tests/translate.test b/tests/translate.test index eff110dd..96f32a75 100755 --- a/tests/translate.test +++ b/tests/translate.test @@ -43,5 +43,5 @@ test_phonemes en " Ekskla#m'eIS@n kw'EstS@n m'A@k" "⁉" test_phonemes en " Ekskla#m'eIS@n kw'EstS@n m'A@k r'eInboU" "⁉ 🌈" # A list entry that uses '$text' to map to another list entry crashes 1.49.2 multi-word support: -test_phonemes en " d'eIbju:t@d" "débuted" +test_phonemes en " d'eIbju:tI2d" "débuted" test_phonemes en-US " d'eIbju:t#I#d" "débuted"