mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-12 00:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.31.03]

Browse Source 
lang=en-r: change to phoneme [t#] (reduced "t")
Added "consonants" attribute to voice files.
Minor change to intonation types 2 and 3.
lang=zh: adjust tone levels
lang=fr: adjust stressAmp, adjust consonant strengths.
Platform RISC_OS. Disable the "breath" attribute in voices because floating point is not allowed in callbacks.
Platform RISC_OS. Implement ListVoices()


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@132 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-01-27 11:26:03 +00:00
parent 0d2fa52994
commit e69ec3a676
43 changed files with 619 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/compile_report
+39 -9
View File
@@ -1,4 +1,4 @@
45 phoneme tables
46 phoneme tables
new total
base 98 98
base2 24 117
@@ -15,7 +15,7 @@
eo 13 110
jbo 4 111
fi 40 129
fr 38 122
fr 42 122
fr_ca 11 122
hi 50 134
ta 15 136
@@ -45,6 +45,7 @@
sw 14 107
th 50 141
id 14 119
ja 7 103
Data file Used by
b/b [b] base
@@ -83,6 +84,7 @@ d/d [d] base
[d[] base
[d] base2
[d] fi
[d] fr
[d] hi
[d.] hi
[d] hu
@@ -98,6 +100,7 @@ d/d_ [d] base
[d[] base
[d] base2
[d] fi
[d] fr
[d] hi
[d.] hi
[d] hu
@@ -115,6 +118,7 @@ d/dr [*] base
[d[] base
[d] base2
[d] fi
[d] fr
[d] hi
[d.] hi
[d] hu
@@ -128,6 +132,7 @@ d/dr [*] base
[d] sw
d/tap [*;] ro
d/tap1 [*] base
d/tap2 [t#] en_us
d/tap3 [*] base
d/tap4 [r] es
d/tap_i [*;] ro
@@ -135,6 +140,7 @@ d/xd [d] base
[d[] base
[d] base2
[d] fi
[d] fr
[d] hi
[d.] hi
[d] hu
@@ -146,6 +152,7 @@ d/xd [d] base
[d] sw
d/xd_pzd [d;] pl
[d;] ru
d/x_tap [t#] en_us
dzh/dzh [dZ] base
[dZ;] base
[dz;] base
@@ -192,11 +199,11 @@ envelope/p_fallrise [4] vi
envelope/p_level [1] vi
[3] zhy
[6] zhy
[44] zh
[55] zh
envelope/p_rise [3] vi
[2] zhy
[5] zhy
[44] zh
[35] zh
[4] th
envelope/vi_5 [5] vi
@@ -209,14 +216,17 @@ g2/xg [g-] base
[g] hi
g/g [g] base
[g] cy
[g] fr
[g] hi
[g] es
g/g_ [g] base
[g] cy
[g] fr
[g] hi
[g] es
g/xg [g] base
[g] cy
[g] fr
[g] es
h/h_ [h] base
[h] fi
@@ -303,6 +313,7 @@ l/_l [l] base
[l] en_wi
[l] af
[l/] de
[l] fr
[l] hu
[l] sk
[l] ru
@@ -353,6 +364,7 @@ l/tl [l] base
[l] en
[l] en_wi
[l] af
[l] fr
[l] hu
[l] sk
[l] ru
@@ -551,11 +563,14 @@ ufric/f_ [f] base
ufric/ll [L] base
[l#] is
ufric/s [s] base
[s] fr
[s] es
[s#] pt
ufric/s_ [s] base
[z] base
[s2] fi
[s] fr
[z] fr
[z2] fr
[z3] fr
[s2] hu
@@ -564,14 +579,17 @@ ufric/s_ [s] base
[z;] ro
ufric/s! [s] base
[s2] fi
[s] fr
[s2] hu
[s] es
[s#] pt
ufric/s_continue [s2] fi
[s2] hu
ufric/sh [S] base
[S] fr
[s#] pt_pt
ufric/sh_ [S] base
[S] fr
[s#] pt_pt
ufric/sh_pzd [S;] base
[S;] ro
@@ -753,6 +771,7 @@ ustop/t_pzd [t;] pl
ustop/tr [t] base
[t[] base
[t2] en
[t] fr
[t.h] hi
[t] ru
ustop/ts [ts] base2
@@ -1022,8 +1041,8 @@ vdiph/y#y_2 [Yy] af
[eoi] zhy
vdiph/y#y_3 [Y:] nl
vnasal/aa_n [A~] en
vnasal/aa_n2 [A~] fr
vnasal/aa_n3 [A~] af
[A~] fr
vnasal/a#_n [&~] pt
vnasal/a#u_n [&U~] pt
[&U~] pt_pt
@@ -1083,6 +1102,7 @@ voc/v_ [B] base
[v;] ro
[v] is
voc/vj [v] base
[v] fr
vocw/dh [D] base
[D] es
vocw/Q [Q] base
@@ -1100,10 +1120,12 @@ vocw/zh [Z] base
[Z;] ro
vocw/zh_rfx [z.] base
voc/z [z] base
[z] fr
[z2] fr
[z3] fr
[z;] ro
voc/z_ [z] base
[z] fr
[z2] fr
[z3] fr
[z;] ro
@@ -1131,7 +1153,6 @@ vowel/@ [@] base
[@4] hi
[@] th
vowel/@- [@-] base
[@-] fr
[r*] hr
vowel/& [a] en_rp
[&] fi
@@ -1148,8 +1169,7 @@ vowel/0_2 [0] en_n
vowel/0_3 [O] en_sc
[0] en_rp
[A] hu
vowel/@_2 [@] fr
[W] fr
vowel/@_2 [W] fr
vowel/@_3 [@] en_sc
[I] en_sc
[@2] en_sc
@@ -1187,6 +1207,7 @@ vowel/a [a] en_n
[a] th
[a:] th
[a] id
[a] ja
vowel/a# [a/] base2
[a2] en_sc
[a2] en_wi
@@ -1341,6 +1362,7 @@ vowel/e_mid [E] en_rp
[E] is
[E] id
[E2] id
[e] ja
vowel/e_mid2 [E] af
[E] de
[E2] de
@@ -1354,6 +1376,7 @@ vowel/e_mid2 [E] af
vowel/@_fnt [@] en_wi
[@2] en_wi
[@2] hr
vowel/@_fr [@] fr
vowel/@_hgh [@] hr
vowel/i [i] base2
[i:] en_n
@@ -1377,6 +1400,7 @@ vowel/i [i] base2
[i] sw
[i] th
[i:] th
[i] ja
vowel/i# [i] en_us
[i] en_rp
[y:] cy
@@ -1507,6 +1531,7 @@ vowel/oo [O:] en_sc
[O] th
[O:] th
[O] id
[o] ja
vowel/oo_1 [O:] en_n
[O:] en_rp
[O@] en_rp
@@ -1565,7 +1590,6 @@ vowel/u [u:] en_wi
vowel/u# [u-] en
[u:] en_sc
vowel/u_2 [u1] fi
[u] fr
[u] sk
[U] hr
[u] ro
@@ -1576,13 +1600,14 @@ vowel/u_4 [u:] en_n
vowel/u#_4 [U] en_sc
[u:] en_sc
vowel/u_5 [u] sw
vowel/u#_5 [u:] en_us
vowel/u_6 [U] pt_pt
[u] pt_pt
vowel/u#_6 [u:] en_us
vowel/u_7 [u] vi
vowel/u_bck [u] base2
[U] cy
[u] fi
[u] fr
[u] fr_ca
[u:] hi
[u:] hu
@@ -1615,6 +1640,7 @@ vowel/uu_bck [U] en_n
[U] pt
[U] no
[u] zhy
vowel/u_unr [u] ja
vowel/V [3] en_sc
vowel/V_2 [V] en
[a] af
@@ -1824,6 +1850,7 @@ x/b [b] base
x/b_ [b] base
x/d [d] base
[t#] en_us
[d] fr
[d.] hi
[d] hr
[d] el
@@ -1832,6 +1859,7 @@ x/d_ [d] base
[d[] base
[d] base2
[d] fi
[d] fr
[d] hi
[d.] hi
[d] pl
@@ -1870,10 +1898,12 @@ x/dz_pzd [dZ;] base
x/dz_pzd_ [J2] hi
x/g_ [g] base
[g] cy
[g] fr
[g] es
[g] is
x/g2 [g] base
[g] cy
[g] fr
[g] hi
[g] es
[g] is
phsource/d/tap2
BIN
View File
Binary file not shown.
phsource/d/tap4
BIN
View File
Binary file not shown.
phsource/ph_english_us
+12 -13
View File
@@ -27,7 +27,7 @@ endphoneme
phoneme a
vowel starttype (a) endtype (@)
length 200
length 210
formants vwl_en_us/a
reduceto a2 0
endphoneme
@@ -52,7 +52,7 @@ endphoneme
phoneme E
vowel starttype (e) endtype (e)
length 180
length 185
// formants vowel/ee_2
formants vwl_en_us/ee
reduceto I 0
@@ -161,7 +161,7 @@ endphoneme
phoneme o@
vowel starttype (o) endtype (@)
length 260
length 250
formants vwl_en_us/or
appendph r
endphoneme
@@ -178,8 +178,8 @@ endphoneme
phoneme u:
vowel starttype (u) endtype (u)
length 170
formants vowel/u#_5
// before l/2 vwl_en/u_L-40+l/L2_uL
formants vowel/u#_6
// formants vowel/u#_5
endphoneme
@@ -228,7 +228,7 @@ endphoneme
phoneme i@3
vowel starttype (i) endtype (@)
length 260
length 250
formants vwl_en_us/ir
appendph r
endphoneme
@@ -271,12 +271,11 @@ endphoneme
phoneme t# // reduced [t] as in "city"
vls alv stop
vowelin f1=0 f2=1700 -300 300 f3=-100 80
vowelout f1=0 f2=1700 -300 300 f3=-100 80
lengthmod 5
wave x/d%70
vcd alv stop
vowelin f1=1 f2=1700 -300 300 f3=-100 80
vowelout f1=2 f2=1700 -300 300 f3=-100 80
formants d/tap2+x/d%70
after @ d/x_tap
lengthmod 2
endphoneme
phsource/ph_french
+150 -94
View File
@@ -13,16 +13,7 @@ phoneme @
vowel starttype (@) endtype (@)
unstressed
length 170
formants vowel/@_2
endphoneme
phoneme @- // very short schwa
vowel nonsyllabic
starttype (@) endtype (@)
formants vowel/@-
unstressed
length 20
formants vowel/@_fr
endphoneme
@@ -80,8 +71,8 @@ endphoneme
phoneme u
vowel starttype (u) endtype (u)
length 170
formants vowel/u_2
length 160
formants vowel/u_bck
endphoneme
@@ -101,7 +92,8 @@ endphoneme
phoneme w
liquid
length 130
unstressed
length 100
beforenotvowel w/
lengthmod 7
formants w/w
@@ -128,7 +120,7 @@ endphoneme
phoneme A~
vowel starttype (a) endtype (a)
length 180
formants vnasal/aa_n3
formants vnasal/aa_n2
endphoneme
@@ -194,14 +186,74 @@ endphoneme
//===========
// uses the consonants in file "phonemes", unless overridden here
phoneme b
vcd blb stop
vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk
formants b/b+x/b%45
before _ b/b_+x/b%45
before (a) b/ba+x/b%45
before (@) b/b@+x/b%45
before (e) b/be+x/b%45
before (i) b/bi+x/b%45
before (o) b/bo+x/b%45
before (u) b/bu+x/b%45
before @- b/b@2+x/b%45
after _ NULL
after @ b/xb%45
lengthmod 5
switchvoicing p
endphoneme
phoneme d
vcd alv stop
vowelin f1=0 f2=1700 -300 300 f3=-100 80
vowelout f1=0 f2=1700 -300 300 f3=-100 80
formants d/d%30+x/d%30
before _ d/d_%30+x/d_%30
before r d/dr%60+x/d%60
after _ NULL
after @ d/xd%40
lengthmod 5
switchvoicing t
endphoneme
phoneme g
vcd vel stop
vowelin f1=2 f2=2300 200 300 f3=-300 80
vowelout f1=2 f2=2300 250 300 f3=-300 80 brk
formants g/g%30+x/g2%30
before _ g/g_+x/g_
after _ NULL
after @ g/xg%30
lengthmod 5
switchvoicing k
endphoneme
phoneme k
vls vel stop
vowelin f1=0 f2=2300 200 400 f3=-100 80
vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20
lengthmod 2
wave ustop/k%45 // reduce strength of noise burst
before _ ustop/k_%45
before r ustop/kr%45
before l ustop/kl%45
before (i) ustop/ki%45
switchvoicing g
endphoneme
phoneme l
liquid
length 100
lengthmod 7
// beforenotvowel l/
formants l/l
// after _ l/_l
// after t l/tl
after _ l/_l
after t l/tl
after l/ l/l_long // double l, make it longer
before (a) l/la
before (e) l/le
@@ -213,15 +265,31 @@ phoneme l
endphoneme
phoneme p
vls blb stop
vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11
vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22
lengthmod 2
wave ustop/p%45
before _ ustop/p_%45
before r ustop/pr%45
before R ustop/pr%45
before @- ustop/p_unasp%45
before l ustop/pl%45
switchvoicing b
endphoneme
phoneme r
vcd uvl frc
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
lengthmod 7
beforenotvowel r/
formants vwl_fr/@R%40
after t r/tr
before _ r3/r_
formants vwl_fr/@R%60
after t r/tr%60
before _ r3/r_%60
endphoneme
@@ -231,8 +299,8 @@ phoneme R
length 100
lengthmod 7
beforenotvowel r/
formants vwl_fr/@R%40
after r r/rr
formants vwl_fr/@R%60
after r r/rr%60
endphoneme
@@ -240,8 +308,34 @@ phoneme r/ // used for [r] when not preceding a vowel
vcd uvl frc
length 100
lengthmod 2 //
formants r3/r_+r3/rx
before n r3/r_n+r3/rx
formants r3/r_+r3/rx%60
before n r3/r_n+r3/rx%60
endphoneme
phoneme s
vls alv frc sibilant
vowelin f1=0 f2=1700 -300 300 f3=-100 80
vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
lengthmod 3
wave ufric/s%45
before _ ufric/s_%45
before p ufric/s!%45
before t ufric/s!%45
before k ufric/s!%45
switchvoicing z
endphoneme
phoneme S
vls pla frc sibilant
vowelin f1=0 f2=2100 100 300 f3=-100 80
vowelout f1=0 f2=2100 100 300 f3=-100 80
length 100
lengthmod 3
wave ufric/sh%45
before _ ufric/sh_%45
switchvoicing Z
endphoneme
@@ -250,11 +344,11 @@ phoneme t
vowelin f1=0 f2=1700 -100 100 f3=-100 80
vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20
lengthmod 2
wave ustop/t%50
before _ ustop/t_%40
before @- ustop/t%50
// before r ustop/tr
// before R ustop/tr
wave ustop/t%30
before _ ustop/t_%30
before @- ustop/t%30
before r ustop/tr%30
before R ustop/tr%30
switchvoicing d
endphoneme
@@ -265,8 +359,30 @@ phoneme t2 // silent unless followed by vowel
vowelin f1=0 f2=1600 -300 300 f3=-100 80
vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20
lengthmod 2
wave ustop/t
before _ ustop/t_
wave ustop/t%45
before _ ustop/t_%45
endphoneme
phoneme v
vcd lbd frc
vowelin f1=0 f2=1000 -300 -200 f3=-300 100
vowelout f1=0 f2=1000 -500 -300 f3=-300 60 len=10
lengthmod 6
formants voc/v+vocw/v%75
before (r) voc/vj+vocw/v%75
before _ voc/v_+vocw/v%75
switchvoicing f
endphoneme
phoneme z
vcd alv frc sibilant
vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50
formants voc/z+ufric/s_%45
before _ voc/z_+ufric/s_%45
lengthmod 6
switchvoicing s
endphoneme
@@ -274,8 +390,8 @@ phoneme z2 // silent unless followed by vowel
beforenotvowel NULL
vcd alv frc sibilant
vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50
formants voc/z+ufric/s_
before _ voc/z_+ufric/s_
formants voc/z+ufric/s_%45
before _ voc/z_+ufric/s_%45
lengthmod 6
endphoneme
@@ -284,68 +400,8 @@ phoneme z3 // "six" and "dix". [s] before pause, [z] before vowel, else []
beforenotvowel NULL
vcd alv frc sibilant
vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50
formants voc/z+ufric/s_
before _ voc/z_+ufric/s_
formants voc/z+ufric/s_%45
before _ voc/z_+ufric/s_%45
lengthmod 6
endphoneme
phoneme k
vls vel stop
vowelin f1=0 f2=2300 200 400 f3=-100 80
vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20
lengthmod 2
wave ustop/k%60 // reduce strength of noise burst
before _ ustop/k_
before r ustop/kr
before l ustop/kl
before (i) ustop/ki
switchvoicing g
endphoneme
phoneme v
vcd lbd frc
vowelin f1=0 f2=1000 -300 -200 f3=-300 100
vowelout f1=0 f2=1000 -500 -300 f3=-300 60 len=50
lengthmod 6
formants voc/v+vocw/v
before _ voc/v_+vocw/v
switchvoicing f
endphoneme
phoneme p
vls blb stop
vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11
vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22
lengthmod 2
wave ustop/p
before _ ustop/p_
before r ustop/pr%70
before R ustop/pr
before @- ustop/p_unasp
before l ustop/pl
switchvoicing b
endphoneme
phoneme b
vcd blb stop
vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk
formants b/b+x/b
before _ b/b_+x/b
before (a) b/ba+x/b
before (@) b/b@+x/b
before (e) b/be+x/b
before (i) b/bi+x/b
before (o) b/bo+x/b
before (u) b/bu+x/b
before @- b/b@2+x/b
after _ NULL
after @ b/xb
lengthmod 5
switchvoicing p
endphoneme
phsource/ph_zh
+4 -4
View File
@@ -5,7 +5,7 @@
phoneme 11 // tone: low level
stress
tone 15 10 envelope/p_fall NULL
tone 12 9 envelope/p_fall NULL
endphoneme
phoneme 21 // tone: low fall
@@ -20,12 +20,12 @@ endphoneme
phoneme 22 // tone: mid-low level
stress
tone 21 19 envelope/p_fall NULL
tone 22 20 envelope/p_fall NULL
endphoneme
phoneme 33 // tone: mid level
stress
tone 31 29 envelope/p_fall NULL
tone 32 30 envelope/p_fall NULL
endphoneme
phoneme 35 // tone: mid rise
@@ -35,7 +35,7 @@ endphoneme
phoneme 44 // tone: mid-high level
stress
tone 41 39 envelope/p_level NULL
tone 38 41 envelope/p_rise NULL
endphoneme
phoneme 51 // tone: high fall
phsource/phonemes
+6 -4
View File
@@ -594,13 +594,13 @@ endphoneme
phoneme ** // TEST flap after consonant
liquid alv
vowelout f1=3 f2=1700 -300 300 f3=-300 80 rms=35 len=15
vowelin f1=0 f2=1700 -300 300 f3=-300 80
vowelout f1=3 f2=1600 -300 300 f3=-300 80 rms=35 len=15
vowelin f1=0 f2=1600 -300 300 f3=-300 80
formants r3/@tap+r3/rx
vowelin f1=0 f2=1700 -300 300 f3=-400 80
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=1700 -300 300 f3=-300 80
vowelin f1=2 f2=1600 -300 300 f3=-300 80
before (a) r3/@tap+r3/rx
endphoneme
@@ -1270,3 +1270,5 @@ include ph_thai
phonemetable id base2
include ph_indonesian
phonemetable ja base
include ph_japanese
phsource/r3/@tap
BIN
View File
Binary file not shown.
phsource/r3/@tap_i
BIN
View File
Binary file not shown.
phsource/vdiph/8u
BIN
View File
Binary file not shown.
phsource/vdiph/aoo
BIN
View File
Binary file not shown.
phsource/vdiph/ooi_4
BIN
View File
Binary file not shown.
phsource/vdiph2/ei_4
BIN
View File
Binary file not shown.
phsource/vowel/V_6
BIN
View File
Binary file not shown.
phsource/vowel/aa_4
BIN
View File
Binary file not shown.
phsource/vowel/ee
BIN
View File
Binary file not shown.
phsource/vowel/i#_5
BIN
View File
Binary file not shown.
phsource/vowel/u#_3
BIN
View File
Binary file not shown.
phsource/vowel/u#_5
BIN
View File
Binary file not shown.
phsource/vowel/u_bck
BIN
View File
Binary file not shown.
phsource/vowel/u_unr
BIN
View File
Binary file not shown.
phsource/vowel/vowelchart.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

phsource/vwl_en_us/a
BIN
View File
Binary file not shown.
phsource/vwl_en_us/ir
BIN
View File
Binary file not shown.
phsource/vwl_en_us/or
BIN
View File
Binary file not shown.