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

[1.39.11]

Browse Source 
Fix problem in *_rules files.  Conditional rules could cause corrupt phoneme strings.
Voice files, "replace" command using an "unstressed" phoneme now ensures the syllable is unstressed.
lang: us, pronunciation changes, use new phonemeeeeeeeee [@/] (at end of words) and [O].
lang: fr, pronunciation changes.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@197 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-10-13 14:47:46 +00:00
parent 72cf85ec8e
commit 64154064cb
22 changed files with 980 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/compile_report
+23 -23
View File
@@ -3,8 +3,8 @@
base 100 100
base2 24 119
en 51 146
en_n 30 146
en_us 35 146
en_n 31 146
en_us 36 147
en_sc 39 148
en_rp 34 146
en_wm 30 146
@@ -15,7 +15,7 @@
eo 13 112
jbo 4 113
fi 40 131
fr 55 137
fr 54 137
fr_ca 11 137
hi 51 137
ta 17 140
@@ -382,7 +382,6 @@ l/l_@ [(@)] base
[@] fr
[W] fr
[Y] fr
[@2] fr
[W2] fr
l/l@ [(@)] base
[W] fr
@@ -555,6 +554,7 @@ r3/r_ [r/] base
[r/] af
[r/] ru
r3/r_@ [(@)] base
[@2] fr
r3/r#_ [r#] is
r3/r_2 [r/2] fr
r3/r_a [(a)] base
@@ -567,6 +567,7 @@ r3/r_n [r/] base
[r/] ru
r3/r_o [(o)] base
[O] fr
[O2] fr
r3/r_ru [R4] ru
r3/r_ru2 [R4] ru
r3/r_sr [r.] bn
@@ -596,7 +597,6 @@ r3/rx [*] base
[r/] af
[R] fr
[r] fr
[R2] fr
[r2] fr
[r/2] fr
[R] fr_ca
@@ -616,7 +616,6 @@ r/r [r] base
[r-] base
[r] en_sc
[r] de
[r2] fr
r/_r [r] base
[r] en_sc
[r.] bn
@@ -638,7 +637,6 @@ r/rr [r/] base
[r/] af
[r] de
[r] fi
[r/2] fr
[r2] nl
[r] ru
[r/] ru
@@ -647,14 +645,11 @@ r/rr [r/] base
r/ru [(u)] base
r/tr [r] base
[r] en_sc
[R] fr
[R2] fr
[r.] bn
r/trr [r/] base
[r/] af
[r] de
[r] fi
[r/2] fr
[r2] nl
[r] ru
[r/] ru
@@ -674,7 +669,6 @@ r/xr [(@)] base
[o] fr
[u] fr
[y] fr
[@2] fr
[a2] fr
[o2] fr
[i:] fr
@@ -1385,10 +1379,11 @@ vowel/3_3 [3:] en_rp
vowel/3_en [3:] en
[e@] en_wm
[3:] af
vowel/@_4 [@] nl
vowel/@_4 [@] en_us
[@] nl
[@] no
vowel/@_5 [W] fr
vowel/@_6 [@] en_us
vowel/@_6 [@/] en_us
vowel/8 [o-] zh
vowel/8_2 [U] en_us
[8] sv
@@ -1478,7 +1473,8 @@ vowel/aa [a] fi
[A] no
[A:] no
[aa] zhy
vowel/aa# [0] en_wi
vowel/aa# [O] en_us
[0] en_wi
[a2] fi
[a] ku
vowel/aa_2 [A:] en
@@ -1487,8 +1483,7 @@ vowel/aa_2 [A:] en
[A] zh
vowel/aa_3 [A:] af
[A] sq
vowel/aa_4 [O] en_us
[O:] en_us
vowel/aa_4 [O:] en_us
[A:] sv
[O] vi
vowel/aa_5 [A:] en_n
@@ -1616,7 +1611,8 @@ vowel/e_mid2 [E] af
vowel/@_fnt [@] en_wi
[@2] en_wi
[@2] hr
vowel/@_fr [@2] fr
vowel/@_fr [3] en_n
[@2] fr
vowel/@_hgh [@] fr
[@] hr
vowel/i [i] base2
@@ -1707,10 +1703,10 @@ vowel/ii_3 [I] cy
[I] no
[I] tr
[I] bn
vowel/ii#_3 [I2] en_us
vowel/ii_4 [I] en
[I2] en
[I] en_us
[I2] en_us
vowel/ii_5 [I] en_wi
[I2] en_wi
[I] la
@@ -2030,9 +2026,10 @@ vwl_en_us/ar [A:] en_us
vwl_en_us/ee [E] en_us
vwl_en_us/er [e@] en_us
vwl_en_us/ir [i@3] en_us
vwl_en_us/oor [O@] en_us
vwl_en_us/or [O:] en_us
[o@] en_us
vwl_en_us/oor [0] en_us
[O:] en_us
[O@] en_us
vwl_en_us/or [o@] en_us
[O:] en_sc
vwl_en_us/ur [U@] en_us
vwl_fr/r_@ [W] fr
@@ -2041,12 +2038,15 @@ vwl_fr/@R [x] pt_pt
vwl_fr/@R2 [R] fr_ca
vwl_fr/@R3 [R] fr
[r] fr
[r2] fr
vwl_fr/@R4 [R] fr
[r] fr
[r2] fr
vwl_fr/@R5 [R2] fr
vwl_fr/@R5 [r] fr
vwl_fr/r_a [a] fr
[a2] fr
[wA] fr
vwl_fr/r_e [E] fr
[E2] fr
vwl_fr/r_u [u] fr
vwl_fr/r_y [y] fr
vwl_fr/w_a [wA] fr
phsource/mbrola/en1
+1
View File
@@ -3,6 +3,7 @@
0 a2 NULL 0 @
0 @2 NULL 0 @
0 @5 NULL 0 @
0 @/ NULL 0 @
0 3 NULL 0 @
0 I2 NULL 0 I
0 i NULL 0 I
phsource/mbrola/us
+1
View File
@@ -1,6 +1,7 @@
0 a2 NULL 0 @
0 @2 NULL 0 @
0 @5 NULL 0 @
0 @/ NULL 0 @
0 3 NULL 0 r=
0 I2 NULL 0 I
0 a NULL 0 {
phsource/mbrola/us3
+1
View File
@@ -1,6 +1,7 @@
0 a2 NULL 0 @
0 @2 NULL 0 @
0 @5 NULL 0 @
0 @/ NULL 0 @
0 3 NULL 0 r=
0 I2 NULL 0 I
0 a NULL 0 {
phsource/ph_english_n
+9
View File
@@ -4,6 +4,15 @@
// VOWELS
//*******************************************************************
phoneme 3 // Schwa, used for rhotic schwa in American
vowel starttype (@) endtype (@)
formants vowel/@_fr
unstressed
linkout r-
beforevowel @
length 140
endphoneme
phoneme a
vowel starttype (a) endtype (a)
phsource/ph_english_us
+19 -7
View File
@@ -16,6 +16,13 @@ endphoneme
phoneme @ // Schwa
vowel starttype (@) endtype (@)
formants vowel/@_4
unstressed
length 130
endphoneme
phoneme @/ // Schwa, ebd of word
vowel starttype (@) endtype (@)
formants vowel/@_6
unstressed
@@ -64,7 +71,7 @@ phoneme E
vowel starttype (e) endtype (e)
length 195
formants vwl_en_us/ee
reduceto I 0
reduceto I2 0
endphoneme
@@ -73,6 +80,7 @@ phoneme I
length 160
formants vowel/ii_4
linkout ;
reduceto I2 0
endphoneme
@@ -80,13 +88,14 @@ phoneme I2
vowel starttype (i) endtype (i)
unstressed
length 160
formants vowel/ii_4
formants vowel/ii#_3
linkout ;
endphoneme
phoneme i // optional variant of [I] for end of words
vowel starttype (i) endtype (i)
unstressed
length 170
formants vowel/ii_final
linkout ;
@@ -97,6 +106,7 @@ phoneme 0
vowel starttype (a) endtype (a)
length 200
formants vowel/aa_8
before r vwl_en_us/oor
reduceto @ 0
endphoneme
@@ -151,16 +161,18 @@ endphoneme
phoneme O:
vowel starttype (a) endtype (a)
length 220
length 210
formants vowel/aa_4
before r vwl_en_us/or
// formants vowel/aa_4
before r vwl_en_us/oor
// before r vwl_en_us/or
reduceto @ 0
endphoneme
phoneme O@
vowel starttype (o) endtype (@)
length 260
length 250
formants vwl_en_us/oor
// formants vwl_en_us/or
appendph r
@@ -178,7 +190,7 @@ endphoneme
phoneme O
vowel starttype (a) endtype (a)
length 200
formants vowel/aa_4
formants vowel/aa#
reduceto @ 0
endphoneme
@@ -206,7 +218,7 @@ endphoneme
phoneme aI
vowel starttype (a) endtype (i)
length 235
length 250
formants vdiph/aae
endphoneme
phsource/ph_french
+32 -55
View File
@@ -21,8 +21,7 @@ phoneme @2
vowel starttype (@) endtype (@)
length 150
formants vowel/@_fr
before l/ DFT+l/l_@
before (r) DFT+r/xr
before (r) DFT+r3/r_@
endphoneme
@@ -32,6 +31,7 @@ phoneme a
formants vowel/a_5
after l l/la-15
before l/ DFT+l/l_a
before r/2 DFT-40+vwl_fr/r_a
reduceto a2 1
endphoneme
@@ -42,7 +42,8 @@ phoneme a2
formants vowel/a_5
after l l/la-15
before l/ DFT+l/l_a
before (r) DFT-20+r/xr
before (r) DFT+r/xr
before r/2 DFT+vwl_fr/r_a
endphoneme
@@ -73,6 +74,7 @@ phoneme E2
formants vowel/e_mid
after l l/le-15
before l/ DFT+l/l_e
before r/2 DFT-20+vwl_fr/r_e
endphoneme
@@ -135,7 +137,7 @@ phoneme O2 // Like O but no reduceto
formants vowel/o_mid
after l l/lo-10
before l/ DFT+l/l_o
// before r/2 DFT+r3/r_o
before r/2 DFT+r3/r_o
endphoneme
@@ -189,7 +191,7 @@ phoneme W
formants vowel/@_5
after l l/l@-20
before l/ DFT-20+l/l_@
before r/2 DFT+20+vwl_fr/r_@
before r/2 DFT+vwl_fr/r_@
reduceto Y 1
endphoneme
@@ -210,6 +212,7 @@ phoneme wA
formants vwl_fr/w_a
after l l/lo-10
before l/ DFT-10+l/l_a
before r/2 DFT+vwl_fr/r_a
endphoneme
@@ -298,11 +301,11 @@ endphoneme
phoneme b
vcd blb stop
vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk
vowelout f1=0 f2=1000 -500 -300 f3=-300 80
formants b/b+x/b%70
before _ b/b_+x/b_
before l/ b/b_+x/b_
before R2 b/b_+x/b_
before R b/b_+x/b_
after _ NULL
after @ b/xb%50
lengthmod 5
@@ -315,7 +318,7 @@ phoneme d
vowelout f1=0 f2=1700 -300 300 f3=-100 80
formants d/d+x/d%40
before _ d/d_+x/d_%50
before R2 d/dr+x/d%50
before R d/dr+x/d%50
before r/2 d/dr+x/d%50
after _ d/d+x/d%50
after (@) d/xd
@@ -344,7 +347,7 @@ phoneme k
lengthmod 2
wave ustop/k%40 // reduce strength of noise burst
before _ ustop/k_
before R2 ustop/kr%45
before R ustop/kr%45
before r/2 ustop/kr%45
before l ustop/kl%45
before l/ ustop/kl%45
@@ -354,7 +357,7 @@ endphoneme
phoneme l
liquid pal palatal
liquid
length 100
lengthmod 7
beforenotvowel l/
@@ -366,7 +369,7 @@ endphoneme
phoneme l/ // used for [l] when not before a vowel
liquid pal palatal
liquid
length 100
lengthmod 7
formants l/l_
@@ -389,12 +392,12 @@ 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 brk
vowelout f1=0 f2=1000 -500 -350 f3=-300 80
lengthmod 2
wave ustop/p%50
after _ ustop/p%70
before _ ustop/p_%70
before R2 ustop/pr%75
before R ustop/pr%30
before @- ustop/p_unasp%60
before l ustop/pl%30
before l/ ustop/pl%30
@@ -415,15 +418,14 @@ endphoneme
phoneme r
liquid rfx starttype (r) endtype (r)
vowelin f1=0 f2=1000 -200 200 f3=-100 100 len=40
vowelout f1=0 f2=1200 -200 200 f3=-100 100 len=20
vowelin f1=0 f2=1600 -300 300 f3=-200 80
vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk
length 100
lengthmod 7
beforenotvowel r/2
formants vwl_fr/@R3+r3/rx%30
after (e) vwl_fr/@R4+r3/rx%15
after (u) vwl_fr/@R4+r3/rx%15
// after wA vwl_fr/@R4+r3/rx%20
after @2 vwl_fr/@R5+r3/rx%40
after (e) vwl_fr/@R4+r3/rx%20
endphoneme
@@ -435,51 +437,26 @@ phoneme r2 // silent unless followed by vowel
lengthmod 7
beforenotvowel NULL
formants vwl_fr/@R4+r3/rx%15
after k vwl_fr/@R3-60
after p vwl_fr/@R3-60
after t vwl_fr/@R3-40
before _ r/r
endphoneme
phoneme R // for beginning of words
vcd rfx flp
vowelin f1=0 f2=1000 -200 200 f3=-100 80 len=40
vowelout f1=0 f2=1200 -200 200 f3=-100 100 len=20
phoneme R // After consonnants
vcd frc
vowelin f1=0 f2=1600 -300 300 f3=-200 80
length 100
lengthmod 7
beforenotvowel r/2
formants vwl_fr/@R3-20+r3/rx%25
before (u) vwl_fr/@R4-20+r3/rx%25
after k r/tr
after p r/tr
after t r/tr
endphoneme
phoneme R2 // After consonnants
vcd rfx frc
vowelin f1=0 f2=1000 -200 200 f3=-100 100 len=40
length 100
lengthmod 7
beforenotvowel r/2
formants vwl_fr/@R5-20+r3/rx%25
after k r/tr
after p r/tr
after t r/tr
formants vwl_fr/@R3+r3/rx%20
after t vwl_fr/@R4
endphoneme
phoneme r/2 // variant of [r] when not preceding a vowel
vcd rfx frc
vowelout f1=0 f2=1800 -100 100 f3=-100 100
liquid
vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk
length 100
lengthmod 2
formants r3/r_2+r3/rx%40
after _ r/rr
after t r/trr
after p r/trr
after k r/trr
formants r3/r_2+r3/rx%20
before n r3/r_n
beforevowel r
endphoneme
@@ -518,7 +495,7 @@ phoneme t
lengthmod 2
wave ustop/t_short%50
before _ ustop/t_%40
before R2 ustop/t_short%50
before R ustop/t_short%50
before r/2 ustop/t_short%50
switchvoicing d
endphoneme
@@ -549,11 +526,11 @@ endphoneme
phoneme v
vcd lbd frc
vowelin f1=0 f2=1000 -300 -200 f3=-300 100 len=0
vowelout f1=0 f2=1000 -300 -2300 f3=-300 100 len=10
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%75
before (r) voc/vj+vocw/v%75
before R voc/vj+vocw/v%75
before _ voc/v_+vocw/v
switchvoicing f
endphoneme
phsource/vdiph/aae
BIN
View File
Binary file not shown.
phsource/vowel/aa_3
BIN
View File
Binary file not shown.
phsource/vowel/aa_4
BIN
View File
Binary file not shown.
phsource/vowel/ii#_3
BIN
View File
Binary file not shown.
phsource/vowel/u_3
BIN
View File
Binary file not shown.