[1.39.04]

Reduce pause when announcing punctuation.
Fix crash for list of numbers in some languages, eg: "22,23,24,25,26,27..."
Recognise XLL (etc) is not a valid Roman number.
espeak_Cancel(), reset punctuation echo.
Don't permanently change option_phoneme_input after using [[ ]] internally.
lang=af: Only recognise word "'n" as [@] when followed by a space. 


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@193 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-09-20 01:02:37 +00:00
parent 37753d29f4
commit a7bb7cb6b4
26 changed files with 349 additions and 123 deletions
+25 -5
View File
@@ -1,4 +1,4 @@
51 phoneme tables
52 phoneme tables
new total
base 98 98
base2 24 117
@@ -19,6 +19,7 @@
fr_ca 11 134
hi 51 135
ta 17 138
ml 13 137
hu 23 114
nl 28 121
pl 18 111
@@ -503,12 +504,15 @@ r3/r#_ [r#] is
r3/r_2 [r/] fr
r3/r_a [(a)] base
r3/r_e [(e)] base
[E] fr
r3/r_i [(i)] base
[i] fr
r3/r_n [r/] base
[r/] fr
[r/] ru
r3/r_o [(o)] base
[O] fr
[O2] fr
r3/r_ru [R4] ru
r3/r_ru2 [R4] ru
r3/r_trill [R2] base
@@ -602,15 +606,11 @@ r/xr [(@)] base
[(i)] base
[(o)] base
[(u)] base
[O] fr
[W] fr
[Y] fr
[a] fr
[e] fr
[i] fr
[u] fr
[y] fr
[W2] fr
[a2] fr
[i:] fr
[u:] fr
@@ -1247,6 +1247,7 @@ vowel/@ [@] base
[@] en_rp
[V] cy
[@4] hi
[@] ml
[@] sq
vowel/@- [@-] base
[r*] hr
@@ -1344,6 +1345,7 @@ vowel/a#_3 [a2] en
[3] de
[@] de
[a] hi
[a] ml
[a#] ru
[&] pt_pt
[&/] pt_pt
@@ -1354,6 +1356,7 @@ vowel/a_4 [a/] el
vowel/a_5 [a] fr
[a2] fr
[a:] ta
[a:] ml
[a/] it
[a] la
[a] sv
@@ -1404,6 +1407,8 @@ vowel/e [e] base2
[E:] fr
[e] ta
[e:] ta
[e] ml
[e:] ml
[e] hr
[e/] it
[e:] la
@@ -1505,6 +1510,7 @@ vowel/i [i] base2
[i] eo
[I] fr
[i:] ta
[i:] ml
[i:] hu
[i] it
[i] pt_pt
@@ -1539,6 +1545,7 @@ vowel/i#_5 [y] pt_pt
[i/] pt_pt
[y] ro
vowel/i_6 [i] ta
[i] ml
[i] hr
[i] tr
[i] ku
@@ -1564,6 +1571,7 @@ vowel/ii [I] en_rp
[i] zhy
[I] ku
vowel/ii# [Y] cy
[y] ml
[Y] ru
[I] ku
vowel/ii_2 [i] zh
@@ -1613,6 +1621,8 @@ vowel/o [o] base2
[o] hi
[o] ta
[o:] ta
[o] ml
[o:] ml
[o] it
[o/] it
[O] la
@@ -1718,6 +1728,8 @@ vowel/u [u:] en_wi
[U] fr
[u] ta
[u:] ta
[u] ml
[u:] ml
[u:] cs
[U] la
[u] id
@@ -1890,6 +1902,8 @@ vwl_en_us/or [O:] en_us
[o@] en_us
[O:] en_sc
vwl_en_us/ur [U@] en_us
vwl_fr/r_@ [W] fr
[W2] fr
vwl_fr/@R [x] pt_pt
vwl_fr/@R2 [R] fr_ca
vwl_fr/@R3 [R] fr
@@ -1897,6 +1911,12 @@ vwl_fr/@R3 [R] fr
[r2] fr
vwl_fr/@R4 [r] fr
[r2] fr
vwl_fr/r_a [a] fr
[a2] fr
vwl_fr/r_e [E2] fr
vwl_fr/ri [i] fr
vwl_fr/r_u [u] fr
vwl_fr/r_y [y] fr
vwl_fr/w_a [wA] fr
vwl_hi/A [a:] hi
vwl_hi/l-voc [l-] jbo
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -33,7 +33,7 @@ endphoneme
phoneme a
vowel starttype (a) endtype (@)
vowel starttype (e) endtype (@)
length 210
formants vwl_en_us/a
before n vnasal/ee_n2
+11 -7
View File
@@ -31,7 +31,7 @@ phoneme a
formants vowel/a_5
after l l/la-15
before l/ DFT-20+l/xl
before r/ DFT-30+r/xr
before r/ DFT+vwl_fr/r_a
reduceto a2 1
endphoneme
@@ -42,7 +42,7 @@ phoneme a2
formants vowel/a_5
after l l/la-15
before (r) DFT-20+r/xr
before r/ DFT-20+r/xr
before r/ DFT+vwl_fr/r_a
endphoneme
@@ -63,6 +63,7 @@ phoneme E
formants vowel/e_mid
after l l/le-15
before l/ DFT-20+l/xl
before r/ DFT+r3/r_e
reduceto E2 1
endphoneme
@@ -72,7 +73,7 @@ phoneme E2
length 175
formants vowel/e_mid
after l l/le-15
before r/ DFT-20
before r/ DFT+vwl_fr/r_e
endphoneme
@@ -82,6 +83,7 @@ phoneme i
formants vowel/i_3
linkout ;
after l l/li-15
after (r) vwl_fr/ri
before l/ DFT-20+l/L1_iL-80
before (r) DFT+r/xr
before r/ DFT+r3/r_i
@@ -143,7 +145,7 @@ phoneme u
after l l/lu-20
before l/ DFT-20+l/L1_uL-80
before (r) DFT+r/xr
before r/ DFT-20+r/xr
before r/ DFT-20+vwl_fr/r_u
endphoneme
@@ -163,6 +165,7 @@ phoneme y
formants vowel/y_2
after l l/lu-20
before l/ DFT-20+l/L1_uL-80
before (r) vwl_fr/r_y
before r/ DFT+r/xr-30
endphoneme
@@ -183,7 +186,7 @@ phoneme W
formants vowel/@_5
after l l/l@-20
before l/ DFT-40+l/xl+15
before r/ DFT-20+r/xr
before r/ DFT+vwl_fr/r_@
reduceto Y 1
endphoneme
@@ -194,7 +197,7 @@ phoneme W2 // same as W but don't reduce
formants vowel/@_3
after l l/l@-20
before l/ DFT-40+l/xl+15
before r/ DFT-20+r3/r_@
before r/ DFT+vwl_fr/r_@
endphoneme
@@ -295,6 +298,7 @@ phoneme b
vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk
formants b/b+x/b%70
before _ b/b_+x/b_
before R b/b+x/b_
after _ NULL
after @ b/xb%50
lengthmod 5
@@ -437,7 +441,7 @@ endphoneme
phoneme R // for beginning of words
vcd pal frc
vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40
vowelin f1=0 f2=800 -50 50 f3=-100 100
length 100
lengthmod 7
beforenotvowel r/
+3
View File
@@ -1190,6 +1190,9 @@ include ph_hindi
phonemetable ta hi
include ph_tamil
phonemetable ml hi
include ph_malayalam
phonemetable hu base
include ph_hungarian
BIN
View File
Binary file not shown.
Binary file not shown.