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