[1.45.40]

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@271 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2011-08-25 08:21:54 +00:00
parent d3e0b8f510
commit a0316a462b
17 changed files with 168 additions and 64 deletions
+16 -11
View File
@@ -21,7 +21,7 @@ consonants 10 116
fr 59 140
fr-ca 11 140
hi 57 148
ta 22 151
ta 23 152
kn 17 148
ml 21 151
hu 25 122
@@ -69,7 +69,7 @@ consonants 10 116
ht 11 140
az 10 127
ak 8 109
am 8 123
am 14 112
wo 18 118
dv 14 148
te 16 148
@@ -394,7 +394,7 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [hÁú] base
l/l@ [h1ô] base
[l#] base
[l] fr
[l/2] fr
@@ -428,7 +428,7 @@ l/L2_oL [l/2] base
l/L2_uL [l/2] base
l/l_3 [l/] de
l/l_4 [ll] sq
l/la [hÁú] base
l/la [h1ô] base
[l#] base
[l] fr
[l/2] fr
@@ -436,7 +436,7 @@ l/la [h
[K] tn
l/l_a [l/3] base
[l/] fr
l/le [hÁú] base
l/le [h1ô] base
[l#] base
[l] fr
[l/2] fr
@@ -448,7 +448,7 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [hÁú] base
l/li [h1ô] base
[l#] base
[l] fr
[l/2] fr
@@ -462,7 +462,7 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [hÁú] base
l/lo [h1ô] base
[l#] base
[l/2] fr
[K] nso
@@ -472,7 +472,7 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
l/lu [hÁú] base
l/lu [h1ô] base
[l#] base
[l] fr
[l/2] fr
@@ -804,6 +804,7 @@ ustop/k_asp [kh] consonants
[kh] zh
[kh] tn
ustop/k_asp2 [k#] ka
ustop/k_ejc [k`] am
ustop/ki [k] base
[k] base2
[c] af
@@ -881,6 +882,7 @@ ustop/p_unasp [p] base
[p] zh
[p] sq
[p] da
[p`] am
ustop/p_unasp_ [p-] consonants
[p] base2
[p] fr
@@ -901,6 +903,7 @@ ustop/t_ [t] base
[t] lv
[t] sk
[th] zh
[t`] am
ustop/t_dnt [t] base
[t[] base
[t] base2
@@ -915,6 +918,7 @@ ustop/t_dnt2 [t] base2
[d] kn
ustop/t_hi [t[] base
[t] et
[t`] am
ustop/t_pzd [c] base
[t^] et
[t;] pl
@@ -952,6 +956,7 @@ ustop/t_short_ [t] fr
ustop/tsh_pzd [tS;] zh
ustop/tsh_pzd_unasp [tS;] zh
ustop/tsh_sr [tS] sr
ustop/tsh_unasp [tS`] am
ustop/ts_pzd [tS;] base
[Jh] hi
[tS;] ru
@@ -1460,7 +1465,6 @@ vowel/a [a] base
[a] zh
[a] id
[a] sl
[a] am
vowel/a# [a] base2
[a/] base2
[a#] en-sc
@@ -1546,6 +1550,7 @@ vowel/a_5 [a:] ta
[a] tn
vowel/a_6 [a] ca
[a:] vi
[a] am
[a:] wo
vowel/a_7 [a] en
[a] fr
@@ -1674,6 +1679,7 @@ vowel/ee_2 [E] cy
[E] pa
vowel/ee#_2 [E-] sv
[E#] sq
[@] am
[e] tn
vowel/ee_3 [&] af
[&:] af
@@ -1778,7 +1784,6 @@ vowel/i [i] base
[i] prs
[i] nso
[i] ak
[i] am
[i:] wo
[i:] dv
[i:] te
@@ -1817,6 +1822,7 @@ vowel/i_6 [i] hi
[i] tr
[i] ku
[i] id
[i] am
[i] dv
[i] te
[i] si
@@ -1905,7 +1911,6 @@ vowel/@_low [@] en-rp
[@/] ne
[@] pa
[V] pa
[@] am
[@] si
vowel/@_low2 [@/] en-us
[@2] en-us
+6 -3
View File
@@ -350,9 +350,12 @@ phoneme t
voicingswitch d
lengthmod 2
IF prevPh(isVowel) OR prevPh(n) THEN
IF nextPh(isVowel) AND nextPh(isUnstressed) AND thisPh(notWordStart) AND nextPh(notWordStart) THEN
ChangePhoneme(t#)
IF prevPhW(isVowel) OR prevPhW(n) THEN
IF nextPhW(isVowel) AND nextPh(isUnstressed) THEN
IF next2Ph(n) AND next2Ph(notWordStart) THEN
ELSE
ChangePhoneme(t#)
ENDIF
ENDIF
ENDIF
+6 -2
View File
@@ -29,13 +29,12 @@ endphoneme
phoneme V# // omit if the next phoneme is a vowel
vowel starttype #@ endtype #@
length 130
IF nextPhW(isVowel) THEN
IF nextPhW(isVowel) OR nextPhW(#) THEN
ChangePhoneme(NULL)
ENDIF
ChangePhoneme(V)
endphoneme
phoneme a:
vowel starttype #a endtype #a
length 300
@@ -155,3 +154,8 @@ phoneme : // Lengthen previous vowel by "length"
length 50
endphoneme
phoneme # // a NULL phoneme for 'virama'
virtual
ChangePhoneme(NULL)
endphoneme
+2 -2
View File
@@ -1425,7 +1425,7 @@ endphoneme
phoneme q
vls uvl stop
lengthmod 2
Vowelin f1=1 f2=1700 0 200 f3=-300 80 paus f4 rms=30
Vowelin f1=1 f2=1700 0 200 f3=-300 80 gpaus f4 rms=30
Vowelout f1=1 f2=1700 -100 200 f3=-300 80 f4 rms=35
IF nextPh(isPause2) THEN
@@ -1860,7 +1860,7 @@ include ph_azerbaijani
phonemetable ak base
include ph_akan
phonemetable am base2
phonemetable am base
include ph_amhari
phonemetable wo base
Binary file not shown.