[1.28.04] Don't join [v][z] to a liquid [l][r][w][j] across a word boundary.

Changes voice variant file names in espeak_data/voices/!v  from !variant12 etc to !varnt12  for DOS 8 character filename limit.
Use a separate phoneme translation file for Swedish voice mbrola "sw2".
Updates languages dictionaries "af", "sv"


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@73 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-08-15 16:30:47 +00:00
parent eb7ff287d4
commit d4ff77a7d5
32 changed files with 602 additions and 309 deletions
+24 -24
View File
@@ -22,7 +22,7 @@
sk 29 125
cs 5 125
hr 19 129
mk 21 130
mk 3 130
sr 2 129
ru 38 126
it 17 117
@@ -49,15 +49,15 @@
2 b/bo base hi
2 b/bu base hi
2 b/xb base hi
16 d/d base base2 fi hi hu pl hr mk ru ro el sw
16 d/d_ base base2 fi hi hu pl hr mk ru ro el sw
17 d/dr base base2 fi hi hu pl hr mk ru ro el sw
15 d/d base base2 fi hi hu pl hr ru ro el sw
15 d/d_ base base2 fi hi hu pl hr ru ro el sw
16 d/dr base base2 fi hi hu pl hr ru ro el sw
1 d/tap ro
2 d/tap1 base
2 d/tap2 base
2 d/tap3 base
1 d/tap_i ro
14 d/xd base base2 fi hi hu pl hr mk ru ro el sw
13 d/xd base base2 fi hi hu pl hr ru ro el sw
2 d/xd_pzd pl ru
1 d/x_tap base
6 dzh/dzh base hi mk ru
@@ -189,8 +189,8 @@
2 r3/r_n base ru
1 r3/r_o base
11 r3/r_trill base af cy nl sk pt
3 r3/r_trill2 base hr mk
3 r3/r_trill2.wav base hr mk
2 r3/r_trill2 base hr
2 r3/r_trill2.wav base hr
8 r3/r_trill3.wav base af cy nl
3 r3/r_trill.wav base sk pt
1 r3/r_u base
@@ -240,7 +240,7 @@
1 ufric/tl# is
2 ufric/x base vi
4 ufric/x2 af nl pt
2 ufric/x_hr hr mk
1 ufric/x_hr hr
1 ustop/c base
5 ustop/k base en fr hi sw
10 ustop/k_ base base2 en fi fr hi hu sk el sw
@@ -257,7 +257,7 @@
7 ustop/p_unasp_ base2 fi hi hu sk la ro
6 ustop/t base en fr hi
8 ustop/t_ base en fr hi sk el
24 ustop/t_dnt base base2 en fi hi hu pl hr mk ru ro vi ++
22 ustop/t_dnt base base2 en fi hi hu pl hr ru ro vi sw
1 ustop/t_dnt2 vi
2 ustop/t_hi hi
4 ustop/t_pzd pl ru
@@ -305,7 +305,7 @@
1 vdiph/aau_4 vi
1 vdiph/ae fr_ca
1 vdiph/ae_2 en_n
8 vdiph/ai base2 eo sk hr mk it pt vi
7 vdiph/ai base2 eo sk hr it pt vi
2 vdiph/ai_2 cy
1 vdiph/ai_3 no
1 vdiph/ai_4 af
@@ -407,7 +407,7 @@
1 voc/zh_2 sk
2 voc/z_pzd base
2 voc/z_pzd_ base
15 vowel/@ base en en_us en_rp cy hi hr mk
14 vowel/@ base en en_us en_rp cy hi hr
1 vowel/@- base
4 vowel/& en_rp fi hi sv
4 vowel/0 base2 en hi pt
@@ -421,10 +421,10 @@
1 vowel/@_4 nl
2 vowel/8_2 en_us sv
1 vowel/8_3 zhy
16 vowel/a en_n cy de hu nl pl sk hr mk sr it la
14 vowel/a en_n cy de hu nl pl sk hr sr it la
4 vowel/a# base2 en_sc pt
7 vowel/a_2 base2 eo la pt pt_pt ro vi
5 vowel/a#_2 hr mk sv is sw
4 vowel/a#_2 hr sv is sw
7 vowel/a_3 en_sc fr cs is
12 vowel/a#_3 en en_n en_us en_wm de hi ru pt_pt vi zhy
4 vowel/a_4 en_wm el vi
@@ -440,7 +440,7 @@
2 vowel/aa_8 en_us
3 vowel/a_en en fr
1 vowel/@_bck hi
15 vowel/e base2 en en_n af cy eo fr hr mk it la pt ++
14 vowel/e base2 en en_n af cy eo fr hr it la pt pt_pt ++
2 vowel/e# en_sc
7 vowel/e_2 en_sc de hi it sv no
1 vowel/e_3 hu
@@ -452,9 +452,9 @@
1 vowel/ee#_2 sv
4 vowel/ee_3 af pt vi
3 vowel/ee_6 en_n sk sv
14 vowel/e_mid en_rp en_wm fr_ca hi hu sk cs hr mk it es pt_pt ++
13 vowel/e_mid en_rp en_wm fr_ca hi hu sk cs hr it es pt_pt no ++
10 vowel/e_mid2 af de fi nl sk ro el sw
2 vowel/@_fnt hr mk
1 vowel/@_fnt hr
1 vowel/@_hgh no
18 vowel/i base2 en_n en_rp en_wm cy eo fr hu pl it pt pt_pt ++
1 vowel/i# cy
@@ -463,13 +463,13 @@
4 vowel/i_4 fi hu it is
5 vowel/i_5 en_sc
3 vowel/i#_5 pt_pt ro
2 vowel/i_6 hr mk
1 vowel/i_6 hr
3 vowel/i_en en en_us vi
2 vowel/i_fnt hi
10 vowel/ii en_wm cy de fr_ca nl is zhy
3 vowel/ii# cy pl ru
1 vowel/ii_2 la
8 vowel/ii_3 en_rp fi hi sk hr mk sv no
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
5 vowel/@_low hi ro no
@@ -486,7 +486,7 @@
1 vowel/oe_4 sv
2 vowel/o_mid fr hu
9 vowel/oo en_sc de eo la es el sv no zhy
12 vowel/oo_1 en_n en_rp en_wm af fi sk hr mk vi
11 vowel/oo_1 en_n en_rp en_wm af fi sk hr vi
3 vowel/oo_2 en_sc cy cs
1 vowel/oo_3 af
3 vowel/oo_4 hi pl it
@@ -495,12 +495,12 @@
2 vowelr/aa_r en_sc
1 vowelr/oo_r en_sc
1 vowelr/o_r en_sc
5 vowelr/r-voc hi sk hr mk
4 vowelr/r-voc hi sk hr
2 vowelr/V3_r en en_sc
1 vowelr/V_r en
7 vowel/u en_n cy de eo fr cs la
5 vowel/u# en en_sc
6 vowel/u_2 fi fr sk hr mk ro
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
@@ -508,7 +508,7 @@
1 vowel/u_5 sw
3 vowel/u_6 en_rp pt_pt
1 vowel/u_7 vi
18 vowel/u_bck base2 cy fi fr_ca hi hu nl pl sk hr mk it ++
17 vowel/u_bck base2 cy fi fr_ca hi hu nl pl sk hr it pt ++
2 vowel/uu en en_wm
3 vowel/uu_2 base2 de la
1 vowel/uu_3 af
@@ -617,8 +617,8 @@
5 w/xw base
20 x/b base hi ro is
1 x/b_ base
12 x/d base en_us hi hr mk el is
14 x/d_ base base2 fi hi pl hr mk ru ro el is sw
10 x/d base en_us hi hr el is
13 x/d_ base base2 fi hi pl hr ru ro el is sw
21 x/d_dnt base base2 fi hi hu pl ru ro sw
6 x/d_pzd pl ru
4 x/dzh base hi
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+70
View File
@@ -0,0 +1,70 @@
// mbrola sw2 voice doesn't have [rs] and other retroflex consonants
0 l/2 NULL 0 l
0 l/ NULL 0 l
0 r/ NULL 0 r
0 r- NULL 0 r
0 R NULL 0 r
0 l- NULL 0 l
0 w/ NULL 0 w
0 j/ NULL 0 j
0 ; NULL 0 NULL
0 g- NULL 0 NULL
0 @- NULL 0 NULL
0 * NULL 0 r
0 S; NULL 0 C
0 sx NULL 0 S
0 S NULL 50 r s
0 s. NULL 50 r s
0 u- NULL 0 }:
0 Y: NULL 0 2:
0 y NULL 0 Y
0 8 NULL 0 u0
0 W NULL 0 2
0 E NULL 0 e
0 @ N 0 e
0 a2 NULL 0 a
0 E: r 0 {:
0 Y: r 0 9:
0 E r 0 {
0 W r 0 9
4 p VWL 0 ph
4 t VWL 0 th
4 k VWL 0 kh
// phonemes for English words
0 @2 NULL 0 @
0 @5 NULL 0 @
0 I2 NULL 0 I
0 V NULL 0 u0
0 aa NULL 0 a
0 0 NULL 0 A:
0 3 NULL 0 @
0 3: NULL 0 2:
0 aI NULL 60 a j
0 eI NULL 60 e j
0 OI NULL 60 O j
0 aU NULL 60 a U
0 oU NULL 0 o:
0 i@ NULL 60 i: @
0 e@ NULL 0 E:
0 o@ NULL 70 o: @
0 O@ NULL 70 O @
0 O: NULL 0 O
0 A@ NULL 0 A:
0 U@ NULL 60 U @
0 @L NULL 40 @ l
0 aI@ NULL 70 a @
0 aU@ NULL 70 A: u0
0 T VWL 0 th
0 T NULL 0 t
0 D NULL 0 z
0 w NULL 0 v
0 z NULL 0 s
0 tS NULL 50 t s
0 dZ NULL 50 d s
0 Z NULL 0 s
+1 -147
View File
@@ -1,150 +1,4 @@
phoneme @ // Schwa
vowel starttype (@) endtype (@)
formants vowel/@
length 140
endphoneme
phoneme @2 // Schwa (raised)
vowel starttype (@) endtype (@)
formants vowel/@_fnt
length 140
endphoneme
phoneme a
vowel starttype (a) endtype (a)
length 160
formants vowel/a
reduceto & 4
endphoneme
phoneme A // 'a' before 'r', doesn't reduce to [&]
vowel starttype (a) endtype (a)
length 160
formants vowel/a
endphoneme
phoneme &
vowel starttype (a) endtype (a)
length 140
formants vowel/a#_2
endphoneme
phoneme E
vowel starttype (e) endtype (e)
length 140
formants vowel/e_mid
endphoneme
phoneme e
vowel starttype (e) endtype (e)
length 140
formants vowel/e
endphoneme
phoneme i
vowel starttype (i) endtype (i)
length 120
formants vowel/i_6
linkout ;
reduceto I 4
endphoneme
phoneme I
vowel starttype (i) endtype (i)
length 120
formants vowel/ii_3
linkout ;
endphoneme
phoneme o
vowel starttype (o) endtype (o)
length 140
formants vowel/oo_1
endphoneme
phoneme u
vowel starttype (u) endtype (u)
length 140
formants vowel/u_bck
reduceto U 4
endphoneme
phoneme U
vowel starttype (u) endtype (u)
length 140
formants vowel/u_2
endphoneme
phoneme aI
vowel starttype (a) endtype (i)
length 250
formants vdiph/ai
endphoneme
phoneme t // dental variant of /t/
vls dnt stop
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_dnt%50
before _ ustop/t_dnt%35
switchvoicing d
endphoneme
phoneme d
vcd alv stop
vowelin f1=2 f2=1700 -300 300 f3=-100 80 amp=16
vowelout f1=2 f2=1700 -300 300 f3=-100 80
formants d/d+x/d%50
before _ d/d_+x/d_
before r d/dr+x/d%50
after _ NULL
after @ d/xd
lengthmod 5
switchvoicing t
endphoneme
phoneme x
vls vel frc
vowelin f1=0 f2=2300 200 400 f3=-100 80
vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20
length 100
lengthmod 3
wave ufric/x_hr%45
switchvoicing Q
endphoneme
phoneme r-
vowel starttype (@) endtype (@)
length 240
formants vowelr/r-voc
endphoneme
phoneme R
liquid
vowelin f1=0 f2=1600 -300 300 f3=-200 80
vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk
formants r3/r_trill2+r3/r_trill2.wav%65
trill
lengthmod 6
endphoneme
// Based on ph_croatian
phoneme k^
vls pal stop
+1 -1
View File
@@ -795,7 +795,7 @@ phoneme z
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_%80
before _ voc/z_+ufric/s_%85
lengthmod 6
switchvoicing s
endphoneme
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.