[1.25.04] Windows, look in Registry to find location of dictsource.

Add lang=is Icelandic.
Adopt Phoneme [R] from experimental Croatian [R2].
lang=hu, add vowel_pause.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@20 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-05-23 10:34:28 +00:00
parent e40539b00b
commit ae4ae76802
31 changed files with 1113 additions and 161 deletions
+42 -43
View File
@@ -1,39 +1,39 @@
34 phoneme tables
new total
base 92 92
en 52 139
en_n 29 139
en_us 36 139
en_sc 39 141
en_rp 34 139
en_wm 30 139
af 37 123
cy 30 118
de 28 115
eo 16 104
fi 40 123
base 93 93
en 52 140
en_n 29 140
en_us 36 140
en_sc 39 142
en_rp 34 140
en_wm 30 140
af 37 124
cy 30 119
de 28 116
eo 13 105
fi 40 124
fr 33 115
fr_ca 11 115
hi 49 127
hu 26 111
nl 25 112
pl 17 103
sk 25 120
cs 5 120
hr 26 132
ru 36 120
it 28 112
es 6 112
pt 25 127
pt_pt 17 127
ro 36 136
el 8 112
sv 25 114
no 29 118
is 32 117
vi 41 129
zh_yue 32 120
sw 14 101
hi 49 128
hu 24 110
nl 25 113
pl 17 104
sk 26 121
cs 5 121
hr 25 131
ru 36 121
it 28 114
es 6 114
pt 25 129
pt_pt 17 129
ro 36 138
el 8 114
sv 25 115
no 29 119
is 32 118
vi 41 130
zh_yue 32 121
sw 14 102
3 b/b base hi ro
2 b/b_ base hi
@@ -177,36 +177,35 @@
1 r2/r2i base
1 r2/r2o base
1 r2/r2u base
7 r3/r_ base af cy eo fr pl ru
6 r3/r_ base af cy fr pl ru
1 r3/r_@ base
1 r3/r#_ is
1 r3/r_a base
1 r3/r_e base
1 r3/r_i base
6 r3/r_n base cy eo fr pl ru
5 r3/r_n base cy fr pl ru
1 r3/r_o base
2 r3/r_test1.wav hu hr
2 r3/r_test2.wav hu hr
3 r3/r_trill base eo it
4 r3/r_trill2 hu hr
3 r3/r_trill.wav base eo it
3 r3/r_trill base sk it
2 r3/r_trill2 base hr
2 r3/r_trill2.wav base hr
3 r3/r_trill.wav base sk it
1 r3/r_u base
28 r3/rx base af cy eo fr fr_ca pl ru pt_pt ro is
26 r3/rx base af cy fr fr_ca pl ru pt_pt ro is
2 r3/rz_cs sk
2 r3/@tap base
2 r3/@tap_i base
7 r/r base en_sc de fr hu it
5 r/_r base en_sc fr hu it
17 r/r_ base en_sc af cy de eo fi fr hu nl pl ru ++
16 r/r_ base en_sc af cy de fi fr hu nl pl ru it ++
1 r/r@ base
1 r/ra base
1 r/re base
1 r/ri base
1 r/ro base
29 r/rr base af cy de eo fi nl pl ru it ro no ++
26 r/rr base af cy de fi nl pl ru it ro no sw
1 r/ru base
15 r/tr base en_sc fr hu it
57 r/trr base af cy de eo fi nl pl ru it ro sv ++
51 r/trr base af cy de fi nl pl ru it ro sv no ++
11 r/xr base
1 ufric/ch base
3 ufric/f base de ro
BIN
View File
Binary file not shown.
+1
View File
@@ -5,6 +5,7 @@
0 @5 NULL 0 @
0 3 NULL 0 @
0 I2 NULL 0 I
0 i NULL 0 I
0 a NULL 0 {
0 aa NULL 0 {
0 0 NULL 0 Q
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+2 -11
View File
@@ -184,20 +184,11 @@ phoneme x
switchvoicing Q
endphoneme
phoneme R2 // test
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_test1.wav%140
trill
lengthmod 6
endphoneme
phoneme R3 // test
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_test2.wav%140
formants r3/r_trill2+r3/r_trill2.wav%65
trill
lengthmod 6
endphoneme
-33
View File
@@ -85,39 +85,6 @@ endphoneme
// CONSONANTS
//===========
phoneme r
liquid
length 100
lengthmod 7
beforenotvowel r/
trill
formants r/rr
after _ r/rr
after t r/trr p r/trr k r/trr
before _ r/r_
endphoneme
phoneme r/ // used for [r] when not preceding a vowel
liquid
length 100
lengthmod 2 //
formants r3/r_+r3/rx
before n r3/r_n+r3/rx
after _ r/rr
after t r/trr p r/trr k r/trr
endphoneme
phoneme R
liquid
vowelin f1=0 f2=1700 -300 300 f3=-300 80
vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk
beforenotvowel r/
formants r3/r_trill+r3/r_trill.wav%50
trill
lengthmod 6
endphoneme
phoneme ts
+2 -21
View File
@@ -33,7 +33,7 @@ endphoneme
phoneme A
vowel starttype (a) endtype (a)
length 160
length 140
formants vowel/0_3
endphoneme
@@ -135,7 +135,7 @@ phoneme d // dental variant of /d/
vowelin f1=2 f2=1500 -300 300 f3=-150 80
vowelout f1=2 f2=1500 -300 300 f3=-150 80
formants d/d+x/d_dnt%110
before _ d/d_+x/d_dnt%80
before _ d/d_+x/d_dnt%100
before r d/dr+x/d_dnt%110
after _ NULL
after @ d/xd
@@ -202,23 +202,4 @@ phoneme s2 // second part of geminated [s:]
endphoneme
phoneme R2 // test
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_test1.wav%140
trill
lengthmod 6
endphoneme
phoneme R3 // test
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_test2.wav%140
trill
lengthmod 6
endphoneme
+266
View File
@@ -0,0 +1,266 @@
//=========================================================
// Icelandic
//=========================================================
phoneme : // Lengthen previous vowel by "length"
virtual
length 110
endphoneme
// Vowels
//=======
phoneme i
vowel starttype (i) endtype (i)
length 130
formants vowel/i_4
linkout ;
endphoneme
phoneme I
vowel starttype (i) endtype (i)
length 130
formants vowel/ii
linkout ;
endphoneme
phoneme e
vowel starttype (e) endtype (e)
length 130
formants vowel/e_e
reduceto E 4
endphoneme
phoneme E
vowel starttype (e) endtype (e)
length 130
formants vowel/e_mid
endphoneme
phoneme a
vowel starttype (a) endtype (a)
length 130
formants vowel/a_3
reduceto & 4
endphoneme
phoneme &
vowel starttype (@) endtype (@)
length 130
formants vowel/a#_2
endphoneme
phoneme o
vowel starttype (o) endtype (o)
length 130
formants vdiph2/o_oo
reduceto O 4
endphoneme
phoneme O
vowel starttype (o) endtype (o)
length 130
formants vowel/oo_5
endphoneme
phoneme u
vowel starttype (u) endtype (u)
length 130
formants vowel/u_bck
endphoneme
phoneme y
vowel starttype (i) endtype (i)
length 130
formants vowel/yy_4
endphoneme
phoneme W
vowel starttype (@) endtype (@)
length 130
formants vowel/y#_3
endphoneme
phoneme aI
vowel starttype (a) endtype (i)
length 170
formants vdiph/ai_7
endphoneme
phoneme eI
vowel starttype (e) endtype (i)
length 170
formants vdiph/ei
endphoneme
phoneme aU
vowel starttype (a) endtype (u)
length 170
formants vdiph/au_4
endphoneme
phoneme oU
vowel starttype (o) endtype (u)
length 170
formants vdiph/ou_3
endphoneme
phoneme oU2 // long version for óf
vowel starttype (o) endtype (u)
length 230
formants vdiph/ou_3
endphoneme
phoneme Yy
vowel starttype (@) endtype (i)
length 150
formants vdiph/y#i_2
endphoneme
// Consonants
//===========
phoneme m#
vcd blb nasal
// starttype m endtype m
vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk
length 100
lengthmod 6
formants NULL
before _ m/m#_
endphoneme
phoneme n#
vcd alv nasal
starttype n endtype n
vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk
length 100
lengthmod 6
formants NULL
before _ n/n#_
endphoneme
phoneme n^#
vcd pal nasal palatal
vowelout f1=3 f2=2300 300 400 f3=100 80 brk rate
length 100
lengthmod 6
formants NULL
before _ n^/n^#_
endphoneme
phoneme N#
vcd vel nasal
starttype N endtype N
vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk
length 100
formants NULL
before _ nn/nn#_
lengthmod 6 // longer than 'n'
endphoneme
phoneme l#
vls alv frc
length 100
lengthmod 3
wave ufric/ll%25
endphoneme
phoneme tl#
vls alv stop
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 ufric/tl#%50
endphoneme
phoneme r#2
vls alv frc
vowelin f1=0 f2=1700 -300 300 f3=-300 80
vowelout f1=0 f2=1700 -300 250 f3=-300 80 rms=20
lengthmod 2
wave r3/rx%90
endphoneme
phoneme r# // used for [r] when not preceding a vowel
liquid
length 100
lengthmod 2 //
formants r3/r#_+r3/rx
// before n r3/r_n+r3/rx
endphoneme
phoneme c
vls vel stop
vowelin f1=0 f2=2700 200 400 f3=300 80 rate len=60
vowelout f1=0 f2=2700 300 400 f3=300 80 rms=20
lengthmod 2
wave ustop/ki
switchvoicing g
endphoneme
phoneme b
vls blb stop
vowelout f1=2 f2=1000 -500 -300 f3=-300 80 brk
vowelin f1=2 f2=1000 -300 -200 f3=-200 80 rms=30
lengthmod 5
wave x/b
before _ x/b_
endphoneme
phoneme d
vls alv stop
vowelin f1=2 f2=1700 -300 300 f3=-100 80
vowelout f1=2 f2=1700 -300 300 f3=-100 80
lengthmod 5
wave x/d%80
before _ x/d_
endphoneme
phoneme g
vls vel stop
vowelin f1=2 f2=2300 200 300 f3=-300 80
vowelout f1=2 f2=2300 250 300 f3=-300 80 brk
lengthmod 5
wave x/g2%150
before _ x/g_
endphoneme
phoneme v // no fricative noise
vcd lbd frc
vowelin f1=1 f2=900 -300 -300 f3=-100 100
vowelout f1=1 f2=900 -500 -300 f3=-100 60 len=50
lengthmod 6
formants voc/v
before _ voc/v_
switchvoicing f
endphoneme
+2 -2
View File
@@ -151,7 +151,7 @@ phoneme r
endphoneme
phoneme R2
phoneme R2x
liquid starttype r endtype r
length 100
lengthmod 7
@@ -164,7 +164,7 @@ phoneme R2
endphoneme
phoneme R
phoneme R3x
liquid
vowelin f1=0 f2=1700 -300 300 f3=-300 80
vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk
+11
View File
@@ -107,6 +107,17 @@ phoneme r:
formants vowelr/r-voc
endphoneme
phoneme R
liquid
vowelin f1=0 f2=1700 -300 300 f3=-300 80
vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk
formants r3/r_trill+r3/r_trill.wav%50
trill
lengthmod 6
endphoneme
phoneme R^ // Czech r-caron
vcd pla frc sibilant
vowelin f1=0 f2=1700 -300 300 f3=-300 80
+12 -1
View File
@@ -380,6 +380,15 @@ 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
phoneme R2 // this is [R] from Slovak/Czech
liquid
vowelin f1=0 f2=1700 -300 300 f3=-300 80
vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk
@@ -388,6 +397,8 @@ phoneme R
lengthmod 6
endphoneme
phoneme l
liquid
length 100
@@ -526,7 +537,7 @@ endphoneme
phoneme n^
vcd pal nasal palatal
vowelout f1=3 f2=2300 300 400 f3=100 80 brk rate
vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate
length 100
lengthmod 4
formants NULL
Binary file not shown.