Skip to content

Commit 223ff9c

Browse files
rhdunnrhdunn
committed
en: use '@' instead of 'I' for the ROSES vowel in en and en-GB.
1 parent 1a831dd commit 223ff9c

8 files changed

Lines changed: 62 additions & 10 deletions

File tree

‎phsource/ph_english‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,16 +275,11 @@ endphoneme
275275

276276

277277
phoneme I# // used for [I] which may be [@] in some accents
278-
vwl starttype #i endtype #i
278+
vwl starttype #@ endtype #@
279279
unstressed
280-
length 130
281-
282-
IF MbrolaSynth THEN
283-
ChangePhoneme(I)
284-
ENDIF
285280

286281
IfNextVowelAppend(;)
287-
ChangePhoneme(I2)
282+
ChangePhoneme(@)
288283
endphoneme
289284

290285

‎phsource/ph_english_n‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ phoneme I2
5959
endphoneme
6060

6161

62+
phoneme I# // used for [I] which may be [@] in some accents
63+
vwl starttype #i endtype #i
64+
unstressed
65+
length 130
66+
67+
IF MbrolaSynth THEN
68+
ChangePhoneme(I)
69+
ENDIF
70+
71+
IfNextVowelAppend(;)
72+
ChangePhoneme(I2)
73+
endphoneme
74+
75+
6276
phoneme i // optional variant of [I] for end of words
6377
vwl starttype #i endtype #i
6478
length 150

‎phsource/ph_english_rp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ phoneme I
7272
FMT(vowel/ii)
7373
endphoneme
7474

75+
7576
phoneme I2
7677
vwl starttype #i endtype #i
7778
unstressed
@@ -81,6 +82,20 @@ phoneme I2
8182
endphoneme
8283

8384

85+
phoneme I# // used for [I] which may be [@] in some accents
86+
vwl starttype #i endtype #i
87+
unstressed
88+
length 130
89+
90+
IF MbrolaSynth THEN
91+
ChangePhoneme(I)
92+
ENDIF
93+
94+
IfNextVowelAppend(;)
95+
ChangePhoneme(I2)
96+
endphoneme
97+
98+
8499
phoneme i
85100
vwl starttype #i endtype #i
86101
unstressed

‎phsource/ph_english_wi‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,20 @@ phoneme I2
6060
endphoneme
6161

6262

63+
phoneme I# // used for [I] which may be [@] in some accents
64+
vwl starttype #i endtype #i
65+
unstressed
66+
length 130
67+
68+
IF MbrolaSynth THEN
69+
ChangePhoneme(I)
70+
ENDIF
71+
72+
IfNextVowelAppend(;)
73+
ChangePhoneme(I2)
74+
endphoneme
75+
76+
6377
phoneme i // optional variant of [I] for end of words
6478
vwl starttype #i endtype #i
6579
length 150

‎phsource/ph_english_wm‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@ phoneme I2
5353
endphoneme
5454

5555

56+
phoneme I# // used for [I] which may be [@] in some accents
57+
vwl starttype #i endtype #i
58+
unstressed
59+
length 130
60+
61+
IF MbrolaSynth THEN
62+
ChangePhoneme(I)
63+
ENDIF
64+
65+
IfNextVowelAppend(;)
66+
ChangePhoneme(I2)
67+
endphoneme
68+
69+
5670
phoneme i // optional variant of [I] for end of words
5771
vwl starttype #i endtype #i
5872
length 220

‎tests/language-phonemes.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ test_lang cy 5c5c7ab1c1b531dcacbbe072d5ee9cef3467d945 "ma na Na pa ta ka ba da g
5050
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"
5151
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"
5252
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"
53-
test_lang en 310e767dc7d5d2959bcb20265555492402ec139d "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@"
53+
test_lang en e7f2171ae8954e11c6bcec43e2bbf1ef114318a0 "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@"
5454
test_lang en-029 ac5ccdf91f1a5116de94de4da7700ff39d165fde "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@"
5555
test_lang en-GB-scotland 85c093673f8a7dc503aa86be1686d83236dafc80 "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@"
5656
test_lang en-GB-x-gbclan 5cb6729108a66710909e59e36451c325d20b9132 "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@"

‎tests/language-pronunciation.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test_phonemes de \
1616
" dr'Uk3 l'amp@ (en)k@mpj'u:t3(de) St'Ern St'Ern@" \
1717
"drucker lampe computer stern sterne"
1818
test_phonemes en \
19-
" 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" \
19+
" 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" \
2020
"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"
2121
test_phonemes en-029 \
2222
" 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" \

‎tests/translate.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ test_phonemes en " Ekskla#m'eIS@N kw'EstS@n m'A@k" "⁉"
4343
test_phonemes en " Ekskla#m'eIS@N kw'EstS@n m'A@k r'eInboU" "⁉ 🌈"
4444

4545
# A list entry that uses '$text' to map to another list entry crashes 1.49.2 multi-word support:
46-
test_phonemes en " d'eIbju:tI2d" "débuted"
46+
test_phonemes en " d'eIbju:t@d" "débuted"
4747
test_phonemes en-US " d'eIbju:t#I#d" "débuted"

0 commit comments

Comments
 (0)