en: use '@' instead of 'I' for the ROSES vowel in en and en-GB.

phsource/ph_english

@@ -275,16 +275,11 @@ endphoneme
 
 
 phoneme I#   // used for [I] which may be [@] in some accents
-  vwl  starttype #i  endtype #i
+  vwl  starttype #@  endtype #@
   unstressed
-  length 130
-  
-  IF MbrolaSynth THEN
-    ChangePhoneme(I)
-  ENDIF
 
   IfNextVowelAppend(;)
-  ChangePhoneme(I2)
+  ChangePhoneme(@)
 endphoneme
 
 

phsource/ph_english_n

@@ -59,6 +59,20 @@ 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

phsource/ph_english_rp

@@ -72,6 +72,7 @@ phoneme I
   FMT(vowel/ii)
 endphoneme
 
+
 phoneme I2
   vwl  starttype #i  endtype #i
   unstressed
@@ -81,6 +82,20 @@ 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

phsource/ph_english_wi

@@ -60,6 +60,20 @@ 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

phsource/ph_english_wm

@@ -53,6 +53,20 @@ 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

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 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@"
+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@"
 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@"
 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@"
 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

@@ -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'oUzI2z r'abIt f'eIs pr'aIs tS'OIs g'oUt m'aUT b'aaT kl'0T m'Ili@n dI2v'aIdI2d" \
+	" 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" \
 	"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" \

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:tI2d" "débuted"
+test_phonemes en " d'eIbju:t@d" "débuted"
 test_phonemes en-US " d'eIbju:t#I#d" "débuted"