[1.29] lang=en, minor changes to phonemes [I] [V] [aI] [eI]

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

phsource/compile_report

@@ -10,7 +10,7 @@
    en_wm  30  144
       af  38  128
       cy  29  122
-      de  32  123
+      de  33  123
       eo  13  108
       fi  40  127
       fr  34  118
@@ -36,7 +36,7 @@
       no  28  122
       is  32  121
       vi  41  133
-     zhy  33  125
+     zhy  40  129
       sw  14  105
 
   3  b/b            base hi ro
@@ -95,6 +95,7 @@
   1  j/je           base
   1  j/ji           base
   1  j/jo           base
+  1  j/_j_short     de
   1  j/ju           base
   6  j/xj           base
   1  l^/j2@         base
@@ -157,14 +158,14 @@
   1  n/ni           base
   1  nn/inn         base
   4  n/nj           base ro
-  3  nn/_nn         base en zhy
-  3  nn/nn_         base en zhy
+  2  nn/_nn         base en
+  2  nn/nn_         base en
   1  nn/nn@         base
   1  nn/nn#_        is
   1  nn/nna         base
   1  nn/nne         base
   1  nn/nni         base
-  2  nn/nnj         base zhy
+  1  nn/nnj         base
   1  nn/nno         base
   1  nn/nnu         base
   1  n^/n^o         base
@@ -242,20 +243,20 @@
   4  ufric/x2       af nl pt
   1  ufric/x_hr     hr
   1  ustop/c        base
-  5  ustop/k        base en fr hi sw
+  6  ustop/k        base en fr hi zhy sw
  10  ustop/k_       base base2 en fi fr hi hu sk el sw
- 14  ustop/ki       base base2 en af fi fr hi hu sk mk is sw
- 11  ustop/kl       base base2 en fi fr hi hu sk el sw
- 12  ustop/kr       base base2 en fi fr hi hu sk el sw
- 10  ustop/k_unasp  base base2 fi hi hu sk el
-  3  ustop/p        base fr hi
+ 15  ustop/ki       base base2 en af fi fr hi hu sk mk is zhy ++
+ 12  ustop/kl       base base2 en fi fr hi hu sk el zhy sw
+ 14  ustop/kr       base base2 en fi fr hi hu sk el zhy sw
+ 11  ustop/k_unasp  base base2 fi hi hu sk el zhy
+  4  ustop/p        base fr hi zhy
   3  ustop/p_       base fr hi
   1  ustop/percus10 base
  10  ustop/pl       base base2 fi fr hi hu sk la ro
   9  ustop/pr       base base2 fi hi hu la ro
   9  ustop/p_unasp  base base2 fi fr hi hu sk la ro
   7  ustop/p_unasp_ base2 fi hi hu sk la ro
-  6  ustop/t        base en fr hi
+  7  ustop/t        base en fr hi zhy
   8  ustop/t_       base en fr hi sk el
  22  ustop/t_dnt    base base2 en fi hi hu pl hr ru ro vi sw
   1  ustop/t_dnt2   vi
@@ -312,17 +313,16 @@
   2  vdiph/ai_5     de la
   1  vdiph/ai_6     en_rp
   5  vdiph/ai_7     en_sc is
-  1  vdiph/ai_en    en
+  1  vdiph/ai_en2   en
   3  vdiph/au       en af vi
   1  vdiph/au#      en_sc
   2  vdiph/au_2     en_us zhy
   1  vdiph/au_3     en_rp
   6  vdiph/au_4     base2 cy eo sk it is
   1  vdiph/ee-e     hi
-  4  vdiph/eei      en de pt vi
+  5  vdiph/eei      en de nl pt vi
   3  vdiph/eei_2    en_us eo fi
   2  vdiph/eei_3    en_rp sk
-  1  vdiph/eei_4    nl
   3  vdiph/eeu      pt vi zhy
   2  vdiph/eeu_2    la pt_pt
   2  vdiph/eeu_3    en_n en_wm
@@ -469,9 +469,8 @@
  10  vowel/ii       en_wm cy de fr_ca nl is zhy
   3  vowel/ii#      cy pl ru
   1  vowel/ii_2     la
-  7  vowel/ii_3     en_rp fi hi sk hr sv no
-  2  vowel/ii_4     en_rp
-  6  vowel/ii_en    en en_n
+  8  vowel/ii_3     en en_rp fi hi sk hr sv no
+  7  vowel/ii_4     en en_n en_rp
   5  vowel/@_low    hi ro no
  11  vowel/o        base2 en en_wm de hi it la pt_pt sv
   4  vowel/o_2      cy hi hu no
@@ -503,7 +502,7 @@
   5  vowel/u_2      fi fr sk hr ro
   1  vowel/u#_2     sv
   2  vowel/u_3      en_us ro
-  1  vowel/u#_3     en_n
+  1  vowel/u_4      en_n
   2  vowel/u#_4     en_sc
   1  vowel/u_5      sw
   3  vowel/u_6      en_rp pt_pt
@@ -514,8 +513,8 @@
   1  vowel/uu_3     af
   2  vowel/uu_4     fi sv
   7  vowel/uu_bck   fr_ca hi hu pt no zhy
-  2  vowel/V        en en_sc
-  3  vowel/V_2      af ru
+  1  vowel/V        en_sc
+  4  vowel/V_2      en af ru
   3  vowel/V_3      en_rp hi vi
   1  vowel/V_4      en_sc
   6  vowel/y        en de fi hu nl zhy
@@ -601,6 +600,11 @@
   1  vwl_ru/u#u     ru
   1  vwl_sv/r_sv3   sv
   1  vwl_zh/aang    zhy
+  1  vwl_zh/ang     zhy
+  1  vwl_zh/eng     zhy
+  1  vwl_zh/ing     zhy
+  1  vwl_zh/ng      zhy
+  1  vwl_zh/oeng    zhy
   1  vwl_zh/ong     zhy
   1  vwl_zh/ung     zhy
   2  w/w            base fr

phsource/ph_dutch

@@ -104,7 +104,7 @@ endphoneme
 phoneme EI
   vowel starttype (a) endtype (i)
   length 210
-  formants vdiph/eei_4
+  formants vdiph/eei
 endphoneme
 
 phoneme Wy

phsource/ph_english

@@ -136,7 +136,7 @@ endphoneme
 phoneme I
   vowel  starttype (i) endtype (i)
   length 130
-  formants vowel/ii_en
+  formants vowel/ii_4
   linkout ;
 endphoneme
 
@@ -144,15 +144,15 @@ phoneme I2
   vowel  starttype (i)  endtype (i)
   unstressed
   length 140
-  formants vowel/ii_en
+  formants vowel/ii_4
   linkout ;
 endphoneme
 
 
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype (i)  endtype (i)
-  length 220
-  formants vowel/ii_en
+  length 140
+  formants vowel/ii_3
   linkout ;
 endphoneme
 
@@ -168,7 +168,7 @@ endphoneme
 phoneme V
   vowel  starttype (a)  endtype (@)
   length 140
-  formants vowel/V
+  formants vowel/V_2
   reduceto @  0
 endphoneme
 
@@ -241,7 +241,7 @@ endphoneme
 
 phoneme O
   vowel  starttype (o)  endtype (o)
-  length 150
+  length 200
   formants vowel/oo_en
   reduceto @  0
 endphoneme
@@ -272,7 +272,7 @@ endphoneme
 phoneme aI
   vowel  starttype (a)  endtype (i)
   length 230
-  formants vdiph/ai_en
+  formants vdiph/ai_en2
 endphoneme
 
 

phsource/ph_english_n

@@ -25,14 +25,14 @@ endphoneme
 phoneme I
   vowel  starttype (i) endtype (i)
   length 130
-  formants vowel/ii_en
+  formants vowel/ii_4
   linkout ;
 endphoneme
 
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype (i)  endtype (i)
   length 220
-  formants vowel/ii_en
+  formants vowel/ii_4
   linkout ;
 endphoneme
 
@@ -64,7 +64,7 @@ phoneme I2
   vowel  starttype (i)  endtype (i)
   unstressed
   length 140
-  formants vowel/ii_en
+  formants vowel/ii_4
   linkout ;
 endphoneme
 
@@ -156,7 +156,7 @@ endphoneme
 phoneme u:
   vowel  starttype (u)  endtype (u)
   length 200
-  formants vowel/u#_3
+  formants vowel/u_4
   before _  vwl_en_n/u_
   before l/2 vwl_en/u_L-40+l/L2_uL
 endphoneme

phsource/ph_german

@@ -69,7 +69,7 @@ endphoneme
 
 phoneme O
   vowel starttype (o) endtype (o)
-  length 140
+  length 120
   formants vowel/oo
   before * DFT+40
 endphoneme
@@ -248,6 +248,17 @@ phoneme l/    // used for [l] when not before a vowel
   beforevowel l
 endphoneme
 
+phoneme j
+  liquid
+  palatal
+  length 100
+  beforenotvowel j/
+  formants NULL
+  after _ j/_j_short
+  lengthmod 7
+endphoneme
+
+
 
 // This is actually the ENGLISH "rolling r". For german, we now use * in the dictionary,
 // so this phoneme will only be used in english words in german texts.

phsource/ph_zh_yue

@@ -63,27 +63,53 @@ phoneme c  // [tS]
   switchvoicing dZ
 endphoneme
 
-
-phoneme ng   // synonym for [N]
-  vcd vel nasal
-  starttype N  endtype N
-  vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
-  length 100
-  formants NULL
-  after _ nn/_nn
-  before _ nn/nn_
-  before (r) nn/nnj
-  lengthmod 8            // longer than 'n'
+phoneme k
+  vls vel stop
+  vowelin f1=0  f2=2300 200 300  f3=-200 80
+  vowelout f1=0 f2=2300 300 400  f3=-200 80  rms=20
+  lengthmod 2
+  wave ustop/k
+  before _ NULL
+  before r ustop/kr
+  before R ustop/kr
+  before @- ustop/k_unasp%70
+  before l ustop/kl
+  before (i) ustop/ki
+  switchvoicing g
 endphoneme
 
+phoneme p
+  vls blb stop
+  vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 rms=30
+  vowelout f1=0  f2=1000 -500 -350  f3=-300 80 rms=22
+  lengthmod 2
+  wave ustop/p
+  before _ NULL
+endphoneme
 
+phoneme t
+  vls alv stop
+  vowelin f1=0  f2=1700 -300 300  f3=100 80
+  vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  wave ustop/t
+  before _ NULL
+  lengthmod 2
+endphoneme
+
+//phoneme ng   // synonym for [N]
+//  vcd vel nasal
+//  starttype N  endtype N
+//  vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
+//  after _ nn/_nn
+//  before _ nn/nn_
+//  before (r) nn/nnj
+//  lengthmod 8            // longer than 'n'
+//endphoneme
 
 //====================================================
 //  Vowels and Diphtnongs
 //====================================================
 
-
-
 phoneme aa
   vowel starttype (a) endtype (a)
   length 230
@@ -102,14 +128,18 @@ phoneme aau
   formants vdiph/aau_2
 endphoneme
 
+phoneme ang
+  vowel starttype (a) endtype (a)
+  length 220
+  formants vwl_zh/ang
+endphoneme
+
 phoneme aang
   vowel starttype (a) endtype (a)
   length 270
   formants vwl_zh/aang
 endphoneme
 
-
-
 phoneme a
   vowel  starttype (@)  endtype (@)
   length 150
@@ -128,7 +158,6 @@ phoneme au
   formants vdiph/au_2
 endphoneme
 
-
 phoneme e
   vowel starttype (e) endtype (e)
   length 220
@@ -141,13 +170,18 @@ phoneme ei
   formants vdiph/ei
 endphoneme
 
+phoneme eng
+  vowel starttype (e) endtype (e)
+  length 220
+  formants vwl_zh/eng
+endphoneme
+
 phoneme eu
   vowel starttype (e) endtype (u)
   length 260
   formants vdiph/eeu
 endphoneme
 
-
 phoneme i
   vowel  starttype (i)  endtype (i)
   length 190
@@ -158,13 +192,28 @@ phoneme i
   linkout ;
 endphoneme
 
+phoneme ing
+  vowel starttype (i) endtype (i)
+  length 220
+  formants vwl_zh/ing
+endphoneme
+
 phoneme iu
   vowel starttype (i) endtype (u)
   length 200
   formants vdiph2/iu
 endphoneme
 
-
+phoneme ng   // synonym for [N]
+  vowel starttype ng  endtype ng
+//  vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
+  length 350
+  formants vwl_zh/ng
+  beforevowel N
+//  before (@) vnasal/
+//  before o vnasal/nn-
+//  lengthmod 8
+endphoneme
 
 phoneme o
   vowel starttype (o) endtype (o)
@@ -172,6 +221,12 @@ phoneme o
   formants vowel/oo
 endphoneme
 
+phoneme oeng
+  vowel starttype (o) endtype (e)
+  length 280
+  formants vwl_zh/oeng
+endphoneme
+
 phoneme oi
   vowel starttype (o) endtype (i)
   length 200
@@ -185,7 +240,7 @@ phoneme ou
 endphoneme
 
 phoneme ong
-  vowel starttype (o) endtype (o)
+  vowel starttype (o) endtype (o) 
   length 220
   formants vwl_zh/ong
 endphoneme
@@ -231,8 +286,6 @@ phoneme eoi
   formants vdiph/y#y_2
 endphoneme
 
-
-
 phoneme yu
   vowel  starttype (u)  endtype (u)
   length 220