[1.39.39]

Windows SAPI5 installer: Remove the limit on the number of voices specified for inclusion in the Windows Registry.

voices.cpp:  Widen formant peaks F3 F4 F5.

Reduce slightly the difference in amplitude between stressed and unstressed vowels.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@208 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-12-12 13:33:52 +00:00
parent 81260ec416
commit 3096b7634d
40 changed files with 288 additions and 168 deletions
+31 -16
View File
@@ -20,7 +20,7 @@
hi 59 148
ta 17 151
hu 23 119
lv 28 125
lv 29 126
nl 28 126
pl 19 116
sk 28 134
@@ -33,7 +33,7 @@
la 21 121
es 9 123
es_la 1 123
ca 9 124
ca 11 125
pt 28 139
pt_pt 20 139
ro 36 146
@@ -52,7 +52,7 @@
rw 15 129
ko 18 158
da 15 133
sq 31 127
sq 35 130
ml 13 150
kn 15 150
bn 59 153
@@ -117,6 +117,7 @@ d/d [d] base
[d] el
[d] sw
[d] id
[d] sq
[d] bn
[d.] bn
[d`] om
@@ -138,6 +139,7 @@ d/d_ [d] base
[d] el
[d] sw
[d] id
[d] sq
[d] bn
[d.] bn
[d`] om
@@ -161,6 +163,7 @@ d/dr [*] base
[d] el
[d] sw
[d] id
[d] sq
[d] bn
[d.] bn
[d[] ga
@@ -186,6 +189,7 @@ d/xd [d] base
[d] el
[d] sw
[d] id
[d] sq
[d] bn
[d.] bn
[d[] ga
@@ -631,7 +635,8 @@ l/l_e [(e)] base
[(e)] en_klatt
l/L_eL_af [&] af
[&:] af
l/l_front [l] sq
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [(i)] base
[i] fr
[i:] fr
@@ -647,7 +652,7 @@ l/l_long [l] base
[l] fr
[l] la
[l;] ro
[l] sq
[L] sq
l/lo [(o)] base
[O] fr
[o] fr
@@ -661,7 +666,6 @@ l/l_o [(o)] base
[o2] fr
[(o)] en_klatt
l^/l_rfx [l.] hi
[l.] sq
[l.] bn
l/lu [(u)] base
[u] fr
@@ -687,7 +691,7 @@ l/tl [l] base
[l] ca
[l] pt
[l;] ro
[l] sq
[L] sq
l/xl [(@)] base
[(a)] base
[(e)] base
@@ -828,6 +832,7 @@ r3/r_trill.wav [R2] base
r3/r_u [(u)] base
[(u)] en_klatt
r3/r_uvl [r"] base
r3/r_uvl.wav [r"] base
r3/rx [*] base
[r/] base
[r/] af
@@ -914,6 +919,7 @@ r/xr [(@)] base
[o2] fr
[i:] fr
[u:] fr
[wA] fr
[A~] fr
ufric/ch [C] base
[J^] base
@@ -1184,7 +1190,7 @@ ustop/t_ [t] base
[t] sk
[t] el
[th] zh
[t2] sq
[t3] sq
[t.] bn
[t.h] bn
ustop/t_dnt [t] base
@@ -1203,11 +1209,15 @@ ustop/t_dnt [t] base
[t[] vi
[t] sw
[t`] ko
[t5] sq
[t] bn
[t[] ga
ustop/t_dnt2 [t[] vi
ustop/t_ejc [t`] om
ustop/t_hard [t2] sq
ustop/t_hard_ [t2] sq
ustop/t_hi [t] hi
[t5] sq
[t] bn
[th] bn
ustop/t_pzd [t;] pl
@@ -1253,7 +1263,7 @@ ustop/t_short [t] fr
[t] lv
[t] sk
[t] el
[t2] sq
[t3] sq
[t.] bn
ustop/tsh_pzd [tS;] zh
ustop/tsh_pzd_unasp [tS;] zh
@@ -1275,6 +1285,7 @@ ustop/ts_pzd3 [tS;] hr
[dZ;] hr
ustop/t_sr [d] sr
[t] sr
[t4] sq
ustop/ts_rfx [ts.] zh
ustop/ts_rfx_unasp [ts.] zh
ustop/ts_sr [tS;] sr
@@ -1297,6 +1308,7 @@ vdiph2/ei_2 [eI] en_rp
vdiph2/ei_3 [i:] en_wm
vdiph2/ei_4 [eI] en_us
[ei] zh
[eI] sq
vdiph2/eo [eo] ro
vdiph2/e[u [e[u] ro
vdiph2/i@ [i@] en_n
@@ -1439,7 +1451,6 @@ vdiph/ei [eI] base2
[eI] is
[eI] vi
[ei] zhy
[eI] sq
vdiph/eu [eU] base2
[eU] en
[eU] cy
@@ -1742,7 +1753,6 @@ vowel/a [a] en
[aa] en_wm
[a] cy
[a] de
[A] fr
[a] ta
[a:] hu
[a:] nl
@@ -1772,7 +1782,6 @@ vowel/a_2 [a] base2
[A@] en_wi
[aa] en_wi
[a] eo
[a] ca
[A] pt
[a] pt_pt
[a] ro
@@ -1824,6 +1833,7 @@ vowel/a_5 [a:] ta
[A] om
vowel/a_6 [a] fr
[a2] fr
[a] ca
[a:] vi
vowel/aa [a] fi
[A] fr_ca
@@ -1859,6 +1869,7 @@ vowel/aa_8 [0] en_us
vowel/aa_9 [a:] hi
[a:] bn
[a] ne
vowel/a_en [A] fr
vowel/@_bck [@] hi
[@/] hi
[@] zh
@@ -1954,6 +1965,7 @@ vowel/e_mid [E] en_rp
[E] it
[E] es
[E] ca
[E2] ca
[E] pt_pt
[E] no
[E] is
@@ -2096,12 +2108,12 @@ vowel/ii#_3 [I2] en_us
vowel/ii_4 [I] en
[I2] en
[I] en_us
vowel/ii_5 [I] en_wi
[I2] en_wi
[I] la
vowel/ii_5 [I] la
[i] zh
vowel/ii_6 [I] en_wm
[I2] en_wm
[I] en_wi
[I2] en_wi
[I] sr
[I] pt
[y] pt
@@ -2306,6 +2318,7 @@ vowel/u_bck [u] base2
[u] hr
[U] it
[u] it
[u] ca
[u] pt
[u:] sv
[u:] no
@@ -2360,6 +2373,7 @@ vowel/V_3 [V] en_rp
vowel/V_4 [V] en_sc
[V] da
vowel/V_6 [V] en_us
[a#] lv
vowel/y [y:] en
[y:] de
[y] fi
@@ -2456,7 +2470,6 @@ vwl_fr/@R3 [R] fr
[r] fr
[Q2] hy
vwl_fr/@R4 [R] fr
[r] fr
[r2] fr
[Q2] hy
vwl_fr/@R5 [r] fr
@@ -2581,6 +2594,7 @@ x/d [d] base
[d] el
[d] is
[d] id
[d] sq
[d.] bn
[d`] om
[d] en_klatt
@@ -2600,6 +2614,7 @@ x/d_ [d] base
[d] is
[d] sw
[d] id
[d] sq
[d] bn
[d.] bn
[d`] om
BIN
View File
Binary file not shown.
+14 -1
View File
@@ -6,7 +6,7 @@
phoneme a
vowel starttype (a) endtype (a)
length 180
formants vowel/a_2
formants vowel/a_6
reduceto a# 2
endphoneme
@@ -31,6 +31,12 @@ phoneme E
reduceto @ 2
endphoneme
phoneme E2 // don't reduce
vowel starttype (e) endtype (e)
length 180
formants vowel/e_mid
endphoneme
phoneme O
vowel starttype (o) endtype (o)
length 170
@@ -52,6 +58,13 @@ phoneme U
unstressed
endphoneme
phoneme u
vowel starttype (u) endtype (u)
length 160
formants vowel/u_bck
reduceto U 2
endphoneme
phoneme l
+1 -1
View File
@@ -22,7 +22,7 @@ phoneme @ // Schwa
length 130
endphoneme
phoneme @/ // Schwa, ebd of word
phoneme @/ // Schwa, end of word
vowel starttype (@) endtype (@)
formants vowel/@_6
unstressed
+2 -2
View File
@@ -40,7 +40,7 @@ endphoneme
phoneme I
vowel starttype (i) endtype (i)
length 140
formants vowel/ii_5
formants vowel/ii_6
linkout ;
endphoneme
@@ -48,7 +48,7 @@ phoneme I2
vowel starttype (i) endtype (i)
unstressed
length 140
formants vowel/ii_5
formants vowel/ii_6
linkout ;
endphoneme
+8 -7
View File
@@ -212,6 +212,7 @@ phoneme wA
formants vwl_fr/w_a
after l l/lo-10
before l/ DFT-10+l/l_a
before (r) DFT+r/xr
before r/2 DFT+vwl_fr/r_a
endphoneme
@@ -289,7 +290,7 @@ endphoneme
phoneme A // same as [a]
vowel starttype (a) endtype (a)
length 166
formants vowel/a
formants vowel/a_en
endphoneme
@@ -418,15 +419,15 @@ endphoneme
phoneme r
liquid rfx starttype (r) endtype (r)
vowelin f1=0 f2=1600 -300 300 f3=-200 80
vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk
vowelin f1=0 f2=1600 -300 300 f3=100 80
vowelout f1=1 f2=1600 -300 300 f3=100 80 brk
length 100
lengthmod 7
beforenotvowel r/2
formants vwl_fr/@R3+r3/rx%30
after @2 vwl_fr/@R5+r3/rx%40
after (u) vwl_fr/@R5+r3/rx%30
after (e) vwl_fr/@R4+r3/rx%20
after (e) vwl_fr/@R5+r3/rx%25
endphoneme
@@ -437,13 +438,13 @@ phoneme r2 // silent unless followed by vowel
length 100
lengthmod 7
beforenotvowel NULL
formants vwl_fr/@R4+r3/rx%15
formants vwl_fr/@R4+r3/rx%20
endphoneme
phoneme R // After consonnants
vcd frc
vowelin f1=0 f2=1600 -300 300 f3=-200 80
vowelin f1=0 f2=1600 -300 300 f3=100 80
length 100
lengthmod 7
beforenotvowel r/2
@@ -454,7 +455,7 @@ endphoneme
phoneme r/2 // variant of [r] when not preceding a vowel
liquid
vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk
vowelout f1=2 f2=1600 -300 300 f3=100 80 brk
length 100
lengthmod 2
formants r3/r_2+r3/rx%20
+6
View File
@@ -50,6 +50,7 @@ phoneme a
vowel starttype (a) endtype (a)
length 120
formants vowel/aa
reduceto a# 0
endphoneme
phoneme a:
@@ -58,6 +59,11 @@ phoneme a:
formants vowel/aa
endphoneme
phoneme a#
vowel starttype (a) endtype (a)
length 120
formants vowel/V_6
endphoneme
phoneme o
vowel starttype (o) endtype (o)
+3 -8
View File
@@ -215,7 +215,6 @@ phoneme (@) virtual
after ; j2/j2@
after w w/w@
after l l/l@
after L l/l@
after l^ l^/j2@
after #r r/r@-15
after r- r2/r2@
@@ -239,7 +238,6 @@ phoneme (a) virtual
after ; j2/j2a
after w w/wa
after l l/la
after L l/la
after l^ l^/j2a
after #r r/ra-15
after r- r2/r2a
@@ -263,7 +261,6 @@ phoneme (e) virtual
after ; j2/j2e
after w w/we
after l l/le
after L l/le
after l^ l^/j2e
after #r r/re-15
after r- r2/r2e
@@ -287,7 +284,6 @@ phoneme (i) virtual
after ; j2/j2i
after w w/wi
after l l/li-10
after L l/li
after l^ l^/j2i
after #r r/ri-15
after r- r2/r2i
@@ -312,7 +308,6 @@ phoneme (o) virtual
after ; j2/j2o
after w w/wo
after l l/lo
after L l/lo
after l^ l^/j2o
after #r r/ro-15
after r- r2/r2o
@@ -336,7 +331,6 @@ phoneme (u) virtual
after ; j2/j2u
after w w/wu
after l l/lu
after L l/lu
after l^ l^/j2u
after #r r/ru-15
after r- r2/r2u
@@ -437,8 +431,8 @@ endphoneme
phoneme r" // uvular trill
vcd uvl frc
formants r3/r_uvl+r3/r_uvl%75
before _ r3/r_uvl+r3/r_uvl%50
formants r3/r_uvl+r3/r_uvl.wav%75
before _ r3/r_uvl+r3/r_uvl.wav%50
lengthmod 6
endphoneme
@@ -1125,6 +1119,7 @@ endphoneme
phoneme L // Welsh "ll"
vls alv frc
starttype l endtype l
length 100
lengthmod 3
wave ufric/ll%80
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.