[1.31.04] lang=zh: adjusted phonemes

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

dictsource/en_rules

             Eme (_       i:m
             Ensk (_      'Ensk
             En (_        @n
+?8          En (_        En
             En (atA      @n
             E (ndous     E
             Ener (_      _n@
             Ening (_     _nI2N
+?8          Ening (_     EnI2N
             Ene (_       i:n
             Ened (_      @nd
             E (nt_       @

dictsource/fr_list

 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated 2008-01-25  Michel Such  <michel.such@free.fr>
+// Updated 2008-01-29 Michel Such  <michel.such@free.fr>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
 _51	sE~k'A~te:E~
 _6X	swas'A~t
 _61	swas'A~te:E~
-_7X	swas'A~t:d'is
+_7X	swas'A~t:d'iz3
 _71	swas'A~te:O~z
 _72	swas'A~t:d'uz
 _73	swas'A~t:tR'Ez
 _79	swas'A~t:d'izn'@f
 _8X	k'atR@v'E~
 _80	k'atR@v'E~z2
-_9X	k'atR@v'E~d'is
+_9X	k'atR@v'E~d'iz3
 _91	k'atR@v'E~:O~z
 _92	k'atR@v'E~:d'uz
 _93	k'atR@v'E~:tR'Ez
 
 
 // conjonctions
-mais	$u $brk
+mais	$u
 ou	u $u $brk
 et	e $u $brk
-donc	$u $brk
+donc	$u
 or	$u $brk
-ni	$u $brk
+ni	$u
-car	$u $brk
+car	$u
-soit	$u $brk
+soit	$u
-cependant  $u $brk
+cependant  $u
-néanmoins  $u $brk
+néanmoins  $u
-toutefois  $u $brk
+toutefois  $u
-
+comme	   $u
-
+dont	   dO~t2 $u
-comme	   $u $brk
+lorsque	   $u
-dont	   dO~t2 $u $brk
+puisque	   $u
-lorsque	   $u $brk
+quand	   $u
-puisque	   $u $brk
+que	   $u
-quand	   $u $brk
-que	   $u $brk
 qui	   $u $verbf
-quoique	   $u $brk
+quoique	   $u
-si	   $u $brk
+si	   $u
 
 // pronouns
 je	$u $verbf
 au	$u $brk
 aux	$u $brk
 
-dans	$u+ $brk
+dans	$u
-sur	$u+ $brk
+sur	$u
-par	$u+ $brk
+par	$u
-pour	$u+
+pour	$u
-en	$u+
+en	$u
 (en effet) A~nEf'E $brk
 
-vers	$u+ $brk
+vers	$u
-avec	$u+ $brk
+avec	$u
-sans	$u+ $brk
+sans	$u
-sous	$u+ $brk
+sous	$u
-entre	$u+ $brk
+entre	$u $brk
-contre	$u+ $brk
+contre	$u $brk
 
 durant	$brk
 
 scient           si
 bénéficient      benefisi $verb
 concurrent       kO~kyR'A~
+content          kO~t@-t2 $verb
 couvent          k'uvt2  $verb
 dessus          d@sy
 dessous          d@su
 
 monsieur         m@sjY
 montréal         mO~Real
-(n'est ce pas)   nEspa
+(n'est ce pas)   n'Es@-||p'az2
 (qu'est ce que)  kEsk@ $u
 (cent un)        s'A~||W~
 (cent unième)    s'A~||ynj'Em
 discident     disidA~
 fils	      fis
 imprudent     E~pRydA~
-juin	      ZuE~
+juin	      ZyE~
 mars	      maRs
 occident      OksidA~
 orient        ORjA~
 player    		plEj'@r
 reader          Ri:d@R
 redhat		REdat
+release	rili:z
 schubert	SubER
 screamer		skri:m@r
 (search & destroy) s@:rS_||end_||dEsstrOj
 wright		_^_EN
 writer		rajt@r
 yacht		jot
+yes		jEs $brk
 
 
 // tions (tjO~ instead of sjO~)

dictsource/fr_rules

 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated: 2008-01-25  Michel Such  <michel.such@free.fr>
+// Updated: 2008-01-29 Michel Such  <michel.such@free.fr>
 //
 //	* The rules are based on Cicero TTS.
 //
 		el (_       El		// caramel
 		em (me      a		// femme patiemment
 		em (b       A~		// décembre
-		em (m       A~		// emmencher
+		em (m       A~		// emmancher
 		em (p       A~
 		en (_       A~		// en
 		en (hA      A~n		// enharmonique
 
 	al)	en (t_      A~		// talent équivalent
 	xcell)	en (t_      A~		// excellent
+	nn)	en (t_      t2		// prennent, viennent, sonnent
 
 	mm)	en (t_      A~
 	em)	en (t_      A~		// vitement
 	_CC) 	e (_        @-
 	_qu) 	e (_        @		// que
 
-	@Cr) 	e (_C       @-		// quatre pattes
 	CC) 	e (_C       @-
-	ch) 	e (_C       @-
+	CC) 	es (_C       @-
+	-j) 	e (_       @-
 	gu) 	e (_C       @-
+	gu) 	es (_C       @-
 	qu) 	e (_C       @-
+	qu) 	es (_C       @-
 
 	 	e (_       		// montre
 

dictsource/zh_rules

        a (DngK	A
 
     y) a	iA
-    y) ao	iAu
+    y) ao	Au
-    y) a1o	iAu55
+    y) a1o	Au55
-    y) a2o	iAu35
+    y) a2o	Au35
-    y) a3o	iAu214
+    y) a3o	Au214
-    y) a4o	iAu51
+    y) a4o	Au51
     y) a (DnK	iE
     y) a (DngK	iA
 
        ia	iA
        ia (DnK	iE
        ia (DngK	iA
-       iao	iAu
+       iao	jAu
        ie	iE
        io (DngK 	y
        iu 	iou 
 
 .group u
        u        u
-       ua	uA  //ua uan uang, and uan should be more different from uang
+       ua	wA  //ua uan uang, and uan should be more different from uang
        ua (DnK	ua
-       ua (DngK ua
+       ua (DngK wA
        uai	uai
        ua1i	uai55
        ua2i	uai35
     n) ve	yE //üe
 
 .group w
-       wa	wuA //wa wan wang
+       wa	wA  //wa wan wang
-       wai	wuai
+       wai	wai
-       wa1i	wuai55
+       wa1i	wai55
-       wa2i	wuai35
+       wa2i	wai35
-       wa3i	wuai214
+       wa3i	wai214
-       wa4i	wuai51
+       wa4i	wai51
-       wei	wuei
+       wei	wei
-       we1i	wuei55
+       we1i	wei55
-       we2i	wuei35
+       we2i	wei35
-       we3i	wuei214
+       we3i	wei214
-       we4i	wuei51
+       we4i	wei51
        we	wu@ //wen weng
-       wo	wuo
+       wo	wo
        wu	wu
 
 .group x
 .group y
        y	j //before a o e i
        y (u	//NULL before u
-       yo (DngK	y
+       yo (DngK	yu
        y (K     i    // foreign words
 
 .group z

espeak-data/voices/en/en-n

 
 stressLength 160 150  180 180  220 220  290 290
 
+replace 00 i@3 i@
 replace 03 N n
 

espeak-data/voices/en/en-r

 dictrules 3 6
 option 12 1       // reduce [t]
 
-stressLength 145 125 170 170 0 0 265 280
+stressLength 145 125 170 170 0 0 270 290
 stressAmp  17 16  20 20  20 22  23 20
 
 //replace 03 I  i
 //replace 03 I2 i
+

espeak-data/voices/en/en-rp

 
 phonemes en_rp
 replace 00  o@  O@
+replace 00 i@3 i@
 replace 03 I i
 replace 03 I2 i
 replace 03 @ a2

espeak-data/voices/en/en-wi

 replace 00 D d
 replace 00 T t[
 replace 00 U@ o@
+replace 00 i@3 i@
 replace 03 @ a2
 replace 03 3 a2
 

espeak-data/voices/en/en-wm

 
 replace 00 h NULL
 replace 00 o@ O@
+replace 00 i@3 i@
 dictrules 6
+intonation 4
+stressAdd 0 0 0 0 0 0 0 20

espeak-data/voices/la

 // flags=0100001 (no automatic secondary stress + don't stres monosyllables)
 // unstressed_wd1=0
 // unstressed_wd2=2
-charset ISO-8859-4
 
+// short gap between words
+words 2
+
+// Note: The Latin voice needs long vowels to be marked with macrons

phsource/compile_report

       is  32  123
       vi  42  136
      zhy  40  131
-      zh  61  145
+      zh  62  146
       sw  14  107
       th  50  141
       id  14  119
                 [n] zh
 n/n_            [n] base
                 [n;] ro
-                [n] zh
 n/n@            [(@)] base
 n/n#_           [n#] is
 n^/n^a          [(a)] base
                 [n.] base
                 [n^] base
                 [n;] ro
+n/n_long_       [n] zh
 nn/_nn          [N] base
                 [N] en
                 [N] zh
                 [r/] fr
                 [r/] ru
 r3/r_@          [(@)] base
-r3/r#_          [r#] is
+r3/r#_          [r/] fr
+                [r#] is
 r3/r_a          [(a)] base
 r3/r_e          [(e)] base
 r3/r_i          [(i)] base
 r/tr            [r] base
                 [r] en_sc
                 [r] fr
+                [r/] fr
                 [R] pt_pt
 r/trr           [r/] base
                 [r/] af
                 [c] hu
 ustop/t_sr      [d] sr
                 [t] sr
+                [t] zh
 ustop/ts_rfx    [ts.] zh
 ustop/ts_rfx_unasp  [ts.] zh
 ustop/ts_sr.wav  [tS;] sr
                 [dZ;] sr
 ustop/ts_unasp  [ts] zh
-ustop/t_unasp   [t] zh
+ustop/t_unasp   [t] th
-                [t] th
 vdiph/0i        [OI] pt
                 [OI] grc
                 [OI] vi
 vdiph2/ea       [ea] ro
 vdiph2/ei_3     [i:] en_wm
 vdiph2/ei_4     [eI] en_us
+                [ei] zh
 vdiph2/eo       [eo] ro
 vdiph2/e[u      [e[u] ro
 vdiph2/i@       [i@] en_n
                 [ie] fi
                 [ia] th
                 [i:a] th
+vdiph2/ie_2     [iE] zh
 vdiph2/ii@      [i@] en
                 [i@3] en
 vdiph2/ii@_3    [i@] vi
                 [ua] zh
 vdiph2/o_oo     [o@] en_wi
                 [o] is
+                [o] zh
 vdiph2/u-@      [y@] vi
                 [y:a] th
 vdiph2/u#@      [U@] en_sc
 vdiph2/y#@      [Y@] af
                 [y@] zh
 vdiph2/yu       [yU] nl
-                [y] zh
+                [yu] zh
 vdiph2/y-y#     [yY] fi
 vdiph/8u        [oU] en_us
                 [ou] zh
 vdiph/aau_4     [aU] vi
 vdiph/ae        [E:] fr_ca
                 [aI] la
-                [ai] zh
 vdiph/ae_2      [aI] en_n
 vdiph/ai        [aI] base2
                 [aI] en_wi
 vdiph/ai_4      [aI] af
 vdiph/ai_5      [aI] de
 vdiph/ai_6      [aI] en_rp
+                [ai] zh
 vdiph/ai_7      [aI] en_sc
                 [aI2] en_sc
                 [aI] is
                 [eI] is
                 [eI] vi
                 [ei] zhy
-                [ei] zh
 vdiph/eu        [eU] base2
                 [eU] en
                 [eU] cy
 vnasal/o_n      [o~] hi
                 [o~] pt
 vnasal/o_n2     [o~] af
-vnasal/o_n3     [O~] fr
+                [O~] fr
 vnasal/oo_n     [O~] en
 vnasal/oo_n2    [O~] hi
                 [O~] pl
                 [@:] th
 vowel/@_4       [@] nl
                 [@] no
+vowel/8         [o-] zh
 vowel/8_2       [U] en_us
                 [8] sv
 vowel/8_3       [eo] zhy
                 [i] ta
                 [i] hr
                 [i] id
+vowel/i#_7      [i[] zh
 vowel/i_en      [i:] en
                 [i:] fr
                 [i] vi
 vowel/ii_5      [I] en_wi
                 [I2] en_wi
                 [I] la
+                [i] zh
 vowel/ii_6      [I] en_wm
                 [I2] en_wm
                 [I] sr
                 [o] pt_pt
                 [o] grc
                 [o:] sv
-                [o] zh
-                [u] zh
                 [o] th
                 [o:] th
                 [o] id
-vowel/o-        [o-] zh
 vowel/o_2       [o:] cy
                 [o:] hi
                 [o:] hu
 vowel/o-_4      [o] ro
 vowel/o_5       [O] nl
 vowel/o_6       [O:] nl
+vowel/o_7       [u] zh
 vowel/oe        [W] en
                 [W] af
                 [W] de
                 [u:] ta
                 [u:] cs
                 [U] la
-                [u] zh
                 [u] th
                 [u:] th
                 [u] id
                 [u:] no
                 [u] is
                 [u] zhy
+                [u] zh
 vowel/u_bck2    [u:] la
 vowel/u_fnt     [u:] en_rp
 vowel/uu        [U] en
                 [y] nl
                 [y] la
                 [yu] zhy
-                [y] zh
 vowel/y#        [Y:] en
                 [3:] en_wm
                 [Y:] de
 vowel/y_2       [y] fr
                 [y"] fr
                 [y:] la
+                [y] zh
 vowel/y#_2      [Y] hu
                 [Y:] sv
 vowel/y_3       [y] af
 vwl_en_us/ii    [I] en_us
                 [I2] en_us
 vwl_en_us/ir    [i@3] en_us
-                [i@] en_sc
+                [i@3] en_sc
 vwl_en_us/oor   [O@] en_us
 vwl_en_us/or    [O:] en_us
                 [o@] en_us
 vwl_zh/eng      [eng] zhy
 vwl_zh/iaa      [iA] zh
 vwl_zh/iaau     [iAu] zh
-vwl_zh/i_dnt    [i[] zh
-vwl_zh/iee      [iE] zh
 vwl_zh/ing      [ing] zhy
 vwl_zh/iou      [iou] zh
 vwl_zh/i_rfx    [i.] zh
                 [w] pt_pt
 w/wa            [(a)] base
 w/we            [(e)] base
+                [w] fr
 w/wi            [(i)] base
                 [i] vi
                 [i] zhy

phsource/ph_english_sc

 endphoneme
 
 
-phoneme i@
+phoneme i@3
   vowel  starttype (i)  endtype (@)
   length 220
   formants vwl_en_us/ir
-//  formants vdiph2/i@_2
   appendph r
 endphoneme
 

phsource/ph_english_wi

 
 
 phoneme 0
-  vowel  starttype (o)   endtype (o)
+  vowel  starttype (a)   endtype (a)
   length 140
   formants vowel/aa#
 endphoneme
 
 
 phoneme 3:
-  vowel  starttype (@)  endtype (@)
+  vowel  starttype (o)  endtype (o)
   length 240
   formants vowel/oo_4
   linkout r-

phsource/ph_english_wm

 
 phoneme eI
   vowel  starttype (@)  endtype (i)
-  length 230
+  length 240
   formants vdiph/@i_3
 endphoneme
 
 
 
 phoneme e@
-  vowel  starttype (e)  endtype (@)
+  vowel  starttype (@)  endtype (@)
   length 240
   formants vowel/3_en
   linkout r-

phsource/ph_french

 phoneme w
   liquid
   unstressed
-  length 100
+  length 120
   beforenotvowel w/
   lengthmod 7
   formants w/w
+  before (e) w/we
   after _ w/_w
 endphoneme
 
 phoneme O~
   vowel  starttype (o)  endtype (o)
   length 180
-  formants vnasal/o_n3
+  formants vnasal/o_n2
 endphoneme
 
 
 
 
 phoneme r
-  vcd uvl frc
+  vcd uvl frc starttype r endtype r
   vowelin f1=0  f2=800 -100 100  f3=-400 100
   vowelout f1=0  f2=800 -100 100  f3=-400 100 len=0 rms=20
   length 100
 
 
 phoneme R
-  vcd uvl frc
+  vcd uvl frc starttype r endtype r
   vowelin f1=0  f2=800 -100 100  f3=-400 100
   length 100
   lengthmod 7
 
 
 phoneme r/   // used for [r] when not preceding a vowel
-  vcd uvl frc
+  vcd uvl frc starttype r endtype r
   length 100
   lengthmod 2   //
-  formants r3/r_+r3/rx%60
+  formants r3/r#_+r3/rx%60
+  after t  r/tr%60
   before n   r3/r_n+r3/rx%60
+  before _ r3/r_%60
 endphoneme
 
 
   lengthmod 6
 endphoneme
 
+

phsource/ph_zh

 
 phoneme 55   //  tone: high level
   stress
-  tone 50 50 envelope/p_level NULL
+  tone 55 50 envelope/p_level NULL
 endphoneme
 
 //====================================================
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave  ustop/t_unasp
+  wave  ustop/t_sr%10
 endphoneme
 
 phoneme th
 phoneme n
   vcd alv nasal
   vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk
-  length 30
   lengthmod 2
   formants n/_n
-  before _ n/n_
+  before _ n/n_long_
   before (i) n/ni
 endphoneme
 
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave ustop/ts_unasp
+  wave ustop/ts_unasp%50
 endphoneme
 
 phoneme tsh
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave ustop/ts
+  wave ustop/ts%60
 endphoneme
 
 phoneme ts.
 
 phoneme N //should be more different from n
   vcd vel nasal
-  length 10
+  vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
   formants NULL
   before _ nn/nn_
   after _ nn/_nn
 phoneme ai
   vowel starttype (a) endtype (i)
   length 250
-  formants vdiph/ae
+  formants vdiph/ai_6
 endphoneme
 
 phoneme Au
 
 phoneme @
   vowel  starttype (@)  endtype (@)
-  length 230
+  length 200
   formants vowel/3_2%120
   before N vowel/@_bck
 endphoneme
 phoneme ei
   vowel starttype (e) endtype (i)
   length 250
-  formants vdiph/ei
+  formants vdiph2/ei_4
 endphoneme
 
 phoneme i
   length 250
   formants vowel/i
   before N vowel/ii_2
+  before n vowel/ii_5
 endphoneme
 
 phoneme i[ //after ts tsh s
   vowel  starttype (i)  endtype (i)
   length 250
-  formants vwl_zh/i_dnt
+  formants vowel/i#_7
 endphoneme
 
 phoneme i. //after ts. ts.h s. z.
 phoneme iE
   vowel  starttype (i)  endtype (e)
   length 250
-  formants vwl_zh/iee
+  formants vdiph2/ie_2
 endphoneme
 
 phoneme io
 phoneme o
   vowel starttype (o) endtype (o)
   length 250
-  formants vowel/o
+  formants vdiph2/o_oo
 endphoneme
 
 phoneme o-
   vowel  starttype (o)  endtype (o)
   length 250
-  formants vowel/o-
+  formants vowel/8
 endphoneme
 
 phoneme ou
 phoneme u //try more before N
   vowel starttype (u) endtype (u)
   length 250
-  formants vowel/u
+  formants vowel/u_bck
-  before N vowel/o
+  before N vowel/o_7
 endphoneme
 
 phoneme uA
 
 phoneme uo
   vowel starttype (u) endtype (o)
-  length 250
+  length 280
   formants vwl_zh/uo
 endphoneme
 
-phoneme y  //try more before N
+phoneme y
+  vowel  starttype (i)  endtype (i)
+  length 250
+  formants vowel/y_2
+endphoneme
+
+phoneme yu  //try more before N
   vowel  starttype (i)  endtype (u)
   length 250
-  formants vowel/y
+  formants vdiph2/yu
-  before N vdiph2/yu
 endphoneme
 
 phoneme y&

phsource/phonemes

   lengthmod 8            // longer than 'n'
 endphoneme
 
-phoneme **    //   TEST flap after consonant
+phoneme **    //   TEST flap
   liquid alv
   vowelout f1=3 f2=1600 -300 300  f3=-300 80 rms=35 len=15
-  vowelin f1=0  f2=1600 -300 300  f3=-300 80
+  vowelin f1=2  f2=1600 -300 300  f3=-300 80
-  formants r3/@tap+r3/rx
+  formants r3/@tap+r3/rx%50
   vowelin f1=3  f2=1600 -300 300  f3=-300 80
   before (i) r3/@tap_i+r3/rx
   before (e) r3/@tap_i+r3/rx
-  vowelin f1=2  f2=1600 -300 300  f3=-300 80
-  before (a) r3/@tap+r3/rx
 endphoneme
 
 

src/intonation.cpp

    20, 25,   32, 24,  drops_0, 4, 3,   5, oflow_less, NULL, 14, 8, 0},
 
    {PITCHrise, 30, 20,  PITCHfall, 19, 14,              // 8 pitch raises at end of sentence
-   20, 25,   34, 22,  drops_0, 3, 3,   5, oflow, NULL, 24, 30, 0},
+   20, 25,   34, 22,  drops_0, 3, 3,   5, oflow, NULL, 20, 26, 0},
 
    {PITCHfrise, 35,11, PITCHfrise2, 32,10,              // 9 comma
    20, 25,   34, 20,  drops_0, 3, 3,   5, oflow, NULL, 19, 24, 0},

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.31.03  26.Jan.08";
+const char *version_string = "1.31.04  30.Jan.08";
 const int version_phdata  = 0x013100;
 
 int option_device_number = -1;
 		{
 			// lookup formant transition for the following phoneme
 
-			if(*match_level == 0)
+			if((*match_level == 0) || (next_ph->type == phNASAL))
 			{
 				LookupSound(next_ph,this_ph,1,NULL,1);
 				seq_len_adjust += FormantTransition2(frames,nf,vowel_transition[2],vowel_transition[3],next_ph,which);