Changes to languages: en, en-r.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@102 d46cf337-b52f-0410-862d-fd96e6ae7743

phsource/compile_report

@@ -1282,9 +1282,9 @@ vowel/i_5       [i:] en_sc
 vowel/i#_5      [y] pt_pt
                 [i/] pt_pt
                 [y] ro
-vowel/i_6       [i] hr
+vowel/i_6       [i:] en_us
+                [i] hr
 vowel/i_en      [i:] en
-                [i:] en_us
                 [i] vi
 vowel/i_fnt     [i] hi
                 [i:] hi
@@ -1576,8 +1576,8 @@ vwl_en_us/ii    [I] en_us
 vwl_en_us/ir    [i@] en_us
                 [i@] en_sc
 vwl_en_us/oo    [O] en_us
-vwl_en_us/oor   [O@] en_us
 vwl_en_us/or    [O:] en_us
+                [O@] en_us
                 [o@] en_us
                 [O:] en_sc
 vwl_en_us/ur    [U@] en_us
@@ -1663,7 +1663,6 @@ w/wi            [(i)] base
                 [i] zhy
 w/wi2           [i:] en
                 [i:] en_n
-                [i:] en_us
                 [i:] en_sc
                 [i:] en_rp
                 [i2] de

phsource/ph_english_us

@@ -21,7 +21,7 @@ phoneme 3    //  Schwa, used for rhotic schwa in American
   unstressed
   linkout r-
   beforevowel @
-  length 200
+  length 210
 endphoneme
 
 
@@ -156,19 +156,16 @@ endphoneme
 
 phoneme 3:
   vowel  starttype (@)  endtype (@)
-  length 190
-//  formants vwl_en_us/@r_us2
+  length 220
   formants vwl_en_us/3_us
-//  reduceto @  0
   linkout r-
 endphoneme
 
 
 phoneme i:
   vowel  starttype (i)  endtype (i)
-  length 150
-  formants vowel/i_en
-  after w w/wi2
+  length 160
+  formants vowel/i_6
   linkout ;
 endphoneme
 
@@ -185,7 +182,8 @@ endphoneme
 phoneme O@
   vowel  starttype (o)  endtype (@)
   length 270
-  formants vwl_en_us/oor
+//  formants vwl_en_us/oor
+  formants vwl_en_us/or
   appendph r
 endphoneme
 
@@ -208,7 +206,7 @@ endphoneme
 
 phoneme u:
   vowel  starttype (u)  endtype (u)
-  length 160
+  length 170
   formants vowel/u#_5
 //  before l/2 vwl_en/u_L-40+l/L2_uL
 endphoneme
@@ -237,7 +235,7 @@ endphoneme
 
 phoneme eI
   vowel  starttype (e)  endtype (i)
-  length 235
+  length 220
 //  formants vdiph/eei_2
   formants vwl_en_us/ei
 endphoneme

phsource/phonemes

@@ -481,6 +481,7 @@ phoneme j
   beforenotvowel j/
   formants NULL
   after _ j/_j
+  after v NULL
   lengthmod 7
 endphoneme