Merge branch 'master' into build

phsource/compile_report

@@ -3,13 +3,13 @@
     base 107  107
 consonants  10  116
    base2  26  123
-      en  50  150
-    en-n  32  150
-   en-us  37  151
-   en-sc  39  152
-   en-rp  33  150
-   en-wm  30  150
-   en-wi  30  150
+      en  52  152
+    en-n  32  152
+   en-us  38  153
+   en-sc  39  154
+   en-rp  33  152
+   en-wm  30  152
+   en-wi  30  152
       af  39  136
       cy  29  132
       de  41  139
@@ -959,6 +959,7 @@ vdiph2/ie       [i@] en-wi
 vdiph2/ie_2     [ie] lv
 vdiph2/ii@      [i@] en
                 [i@3] en
+                [i@] en-us
                 [ja] ru
 vdiph2/ii@_3    [i@] vi
 vdiph2/iioo     [io] zh
@@ -1341,7 +1342,8 @@ vowel/@_2       [@] vi
                 [@] sq
                 [V] sq
                 [@/] sq
-vowel/@_3       [@] en-sc
+vowel/@_3       [@#] en
+                [@] en-sc
                 [I] en-sc
                 [@2] en-sc
                 [@5] en-sc

phsource/ph_dutch

@@ -87,14 +87,14 @@ endphoneme
 
 phoneme a   // ?? suggested by aegis, but seems too short
   vowel starttype #a endtype #a
-  length 140
+  length 150
   FMT(vowel/a_2)
 endphoneme
 
 
 phoneme A
   vowel starttype #a endtype #a
-  length 140
+  length 150
   IF thisPh(isUnstressed) THEN
     FMT(vowel/a#_2)
   ENDIF

phsource/ph_english

@@ -224,6 +224,14 @@ phoneme I2
   FMT(vowel/ii_4)
 endphoneme
 
+phoneme I#   // used for [I] which may be [@] in some accents
+  vowel  starttype #i  endtype #i
+  unstressed
+  length 130
+  IfNextVowelAppend(;)
+  ChangePhoneme(I2)
+endphoneme
+
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype #i  endtype #i
   ipa ɪ
@@ -483,3 +491,10 @@ phoneme e:
 endphoneme
 
 
+phoneme @#   // TEST: [@] which is slightly more 'front'
+  vowel  starttype #i  endtype #i
+  unstressed
+  length 130
+  FMT(vowel/@_3)
+endphoneme
+

phsource/ph_english_us

@@ -279,6 +279,13 @@ phoneme e@
 endphoneme
 
 
+phoneme i@
+  vowel  starttype #i  endtype #@
+  length 250
+  FMT(vdiph2/ii@)  // don't append [r] before a vowel
+endphoneme
+
+
 phoneme i@3
   vowel  starttype #i  endtype #@
   length 280