mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-15 01:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.42.42]

Browse Source 
Don't recognize space as a thousands separator if it's tab, newline, or multiple spaces.
Don't recognuze space as a thousands separator if not followed by exactly 3 digits.

Unrecognized HTML tags should not add a space (eg. <font> <b> inside a word).

lang=hu: fixes for when numbers are ordinal.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@236 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2010-02-13 11:14:41 +00:00
parent 20f52f0301
commit 2698461aa4
69 changed files with 2050 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/compile_report
+35 -19
View File
@@ -1,4 +1,4 @@
58 phoneme tables
59 phoneme tables
new total
base 99 99
consonants 9 107
@@ -15,12 +15,13 @@ consonants 9 107
de 32 126
eo 13 111
jbo 2 111
nci 3 120
fi 40 130
fr 56 138
fr 55 138
fr_ca 11 138
hi 58 145
ta 20 148
hu 23 115
hu 24 116
lv 29 122
nl 24 119
pl 20 113
@@ -45,7 +46,7 @@ consonants 9 107
ru 39 130
vi 41 136
zhy 41 133
zh 62 150
zh 64 150
sw 12 108
tr 18 123
ku 18 124
@@ -81,6 +82,7 @@ d/d [d] base
[d] base2
[d] fi
[d] fr
[d] hu
[d] pl
[d;] pl
[d] hr
@@ -91,6 +93,7 @@ d/d_ [d] base
[d] fi
[d] fr
[d.] hi
[d] hu
[d] pl
[d;] pl
[d] hr
@@ -103,6 +106,7 @@ d/dr [*] base
[d] fr
[d.] hi
[dh.] hi
[d] hu
[d] pl
[d;] pl
[d] hr
@@ -122,6 +126,7 @@ d/xd [d] base
[d.] hi
[dh] hi
[dh.] hi
[d] hu
[d] pl
[d] hr
[d] sr
@@ -238,23 +243,32 @@ j2/j2o [;] base
j2/j2u [;] base
j2/xj2 [;] base
j/_j [j] base
[j] zh
j/j_ [j] base
[j] de
[j] zh
j/j@ [j] base
[j] de
[j] zh
j/ja [j] base
[j] de
[j] zh
j/je [j] base
[j] de
[j] zh
j/ji [j] base
[j] de
[j] zh
j/jo [j] base
[j] de
[j] zh
j/_j_short [j] de
j/ju [j] base
[j] de
[j] zh
j/xj [j] base
[j] de
[j] zh
klatt/b [b] base
klatt/bh [B] base
klatt/dz_pzd [J] base
@@ -299,6 +313,7 @@ l/_l [l] base
[l] fr
[l/] fr
[l] hu
[l] zh
l/l_ [l/] base
[l/3] base
[l/] fr
@@ -306,7 +321,7 @@ l/l_@ [l/3] base
[W] fr
[Y] fr
[l/] fr
l/l@ [] base
l/l@ [] base
[L] base
[W] fr
[Y] fr
@@ -333,14 +348,14 @@ l/L2_oL [l/2] base
l/L2_uL [l/2] base
l/l_3 [l/] de
l/l_4 [ll] sq
l/la [] base
l/la [] base
[L] base
[a] fr
[l] fr
l/l_a [l/3] base
[l/] fr
[wA] fr
l/le [] base
l/le [] base
[L] base
[l] fr
l/l_e [l/3] base
@@ -349,22 +364,23 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [] base
l/li [] base
[L] base
[l] fr
[l] zh
l/l_i [l/3] base
[l/] fr
[i] sq
l/l_long [l] base
[l] fr
l/lo [] base
l/lo [] base
[L] base
[l] fr
l/l_o [l/3] base
[l/] fr
[o2] fr
l^/l_rfx [l.] base
l/lu [] base
l/lu [] base
[L] base
[l] fr
[w^i] fr
@@ -495,12 +511,12 @@ r3/r_trill.wav [R2] base
[r*] sr
[x] pt
r3/r_uvl [r"] base
[r] fr
[r/2] fr
r3/r_uvl.wav [r"] base
r3/rx [*] base
[r/] base
[r/] af
[r] fr
[r/2] fr
[R] fr_ca
[x] pt_pt
[*;] ro
@@ -1407,6 +1423,7 @@ vowel/e_mid2 [E] af
[E2] de
[E:] de
[e] jbo
[e] nci
[e] fi
[E] nl
[e] sk
@@ -1486,7 +1503,8 @@ vowel/i_en [i:] en
vowel/i_fnt [i:] en_wi
[i:] hi
[i] pa
vowel/ii [I] en_n
vowel/ii [I] en
[I] en_n
[I2] en_n
[I] en_rp
[I2] en_rp
@@ -1855,24 +1873,21 @@ vwl_fr/r@ [r] fr
vwl_fr/@R [x] pt_pt
vwl_fr/_r2 [r] fr
vwl_fr/@R2 [R] fr_ca
vwl_fr/ra [r] fr
vwl_fr/ra [a] fr
vwl_fr/r_a [r/2] fr
vwl_fr/r_a~ [A~] fr
vwl_fr/rA~ [A~] fr
vwl_fr/re [r] fr
vwl_fr/r_e [r/2] fr
vwl_fr/ri [i] fr
[r] fr
vwl_fr/ri [r] fr
vwl_fr/r_i [r/2] fr
vwl_fr/ro [r] fr
vwl_fr/r_o [o] fr
[o2] fr
[r/2] fr
vwl_fr/ru [r] fr
[u] fr
vwl_fr/r_u [r/2] fr
vwl_fr/ry [y] fr
[w^i] fr
vwl_fr/ry [w^i] fr
vwl_fr/r_y [y] fr
vwl_fr/tr [r] fr
vwl_fr/w_a [wA] fr
@@ -1984,6 +1999,7 @@ x/d_ [d] base
x/d_dnt [d[] base
[d] base2
[d] fi
[d] hu
[d] pl
x/d_pzd [d;] pl
x/dzh [J] base
phsource/d/xd
BIN
View File
Binary file not shown.
phsource/d/xdz
BIN
View File
Binary file not shown.
phsource/m/m_
BIN
View File
Binary file not shown.
phsource/mbrola/id1
+2 -2
View File
@@ -17,12 +17,13 @@ volume 32
0 l- NULL 0 l
0 w/ NULL 0 w
0 j/ NULL 0 j
0 a/ NULL 0 V
2 ; i 0 NULL
0 ; NULL 0 NULL
0 - NULL 0 NULL
0 g- NULL 0 NULL
0 @- NULL 0 NULL
0 * NULL 0 r
0 * NULL 0 NULL
0 R2 NULL 0 r
0 R NULL 0 r
@@ -40,4 +41,3 @@ volume 32
0 R NULL 0 r
0 x NULL 0 h
phsource/n^/n^@
BIN
View File
Binary file not shown.
phsource/n^/n^a
BIN
View File
Binary file not shown.
phsource/n^/n^e
BIN
View File
Binary file not shown.
phsource/n^/n^i
BIN
View File
Binary file not shown.
phsource/n^/n^o
BIN
View File
Binary file not shown.
phsource/n^/n^u
BIN
View File
Binary file not shown.
phsource/ph_english
+3
View File
@@ -164,6 +164,9 @@ phoneme I
vowel starttype #i endtype #i
length 130
IfNextVowelAppend(;)
IF nextPhW(isVel) THEN
FMT(vowel/ii)
ENDIF
FMT(vowel/ii_2)
endphoneme
phsource/ph_french
+15 -31
View File
@@ -1,7 +1,7 @@
//====================================================
// French
//====================================================
// Updated 2009-10-13 Michel Such <michel.such@free.fr>
// Updated 2010-02-09 Michel Such <michel.such@free.fr>
phoneme #l virtual
// Used for l and l/
@@ -31,7 +31,7 @@ phoneme r
NextVowelStarts
VowelStart(vwl_fr/r@)
VowelStart(vwl_fr/ra)
VowelStart(NULL)
VowelStart(vwl_fr/re)
VowelStart(vwl_fr/ri)
VowelStart(vwl_fr/ro)
@@ -43,23 +43,17 @@ phoneme r
ELIF prevPhW(p) OR prevPhW(k) THEN
FMT(vwl_fr/tr)
ELIF prevPhW(t) THEN
FMT(vwl_fr/tr) addWav(r3/r_uvl,30)
FMT(vwl_fr/tr) addWav(r3/rx,30)
ENDIF
IF thisPh(isWordStart) THEN
IF prevPh(isVowel) OR prevPh(isPause) OR prevPh(#l) OR prevPh(r/2) THEN
FMT(vwl_fr/_r)
ENDIF
FMT(vwl_fr/_r2) addWav(r3/r_uvl, 25)
FMT(vwl_fr/_r2) addWav(r3/rx, 15)
ENDIF
FMT(vwl_fr/r) addWav(r3/r_uvl,25)
endphoneme
phoneme R // First letter of a word
import_phoneme fr/r
lengthmod 0
FMT(vwl_fr/r) addWav(r3/rx,25)
endphoneme
@@ -94,7 +88,7 @@ phoneme r/2 // variant of [r] when not preceding a vowel
EndSwitch
IF prevPh(isVowel) THEN
FMT(vwl_fr/r_) addWav(r3/r_uvl, 30)
FMT(vwl_fr/r_) addWav(r3/rx, 30)
ELIF prevPh(m) OR prevPh(n) THEN
FMT(r3/r_n)
ENDIF
@@ -193,6 +187,9 @@ phoneme a
VowelStart(l/la, -15)
ENDIF
IF prevPh(#r) THEN
VowelStart(vwl_fr/ra)
ENDIF
FMT(vowel/a_6)
endphoneme
@@ -231,10 +228,6 @@ phoneme i
IfNextVowelAppend(;)
IF prevPh(#r) THEN
VowelStart(vwl_fr/ri, -30)
ENDIF
FMT(vowel/i_2)
endphoneme
@@ -318,11 +311,7 @@ phoneme u
length 170
IF nextPh(i) THEN
Length 50
ENDIF
IF prevPh(R) THEN
VowelStart(vwl_fr/ru, -10)
Length 50
ENDIF
FMT(vowel/u_bck2)
@@ -340,10 +329,6 @@ phoneme y
vowel starttype #u endtype #u
length 170
IF prevPh(#r) THEN
VowelStart(vwl_fr/ry)
ENDIF
IF nextPh(l/) THEN
VowelEnding(l/l_y, -30)
ENDIF
@@ -425,13 +410,12 @@ endphoneme
phoneme A~
vowel starttype #a endtype #a
length 190
IF prevPh(#r) THEN
VowelStart(vwl_fr/rA~)
ENDIF
IF nextPh(r/2) THEN
VowelEnding(vwl_fr/r_a~)
ENDIF
IF prevPh(#r) THEN
VowelStart(vwl_fr/rA~)
ENDIF
FMT(vnasal/aa_n4)
endphoneme
@@ -553,7 +537,7 @@ phoneme g
FMT(g/g_) addWav(x/g_)
ENDIF
FMT(g/g) addWav(x/g, 20)
FMT(g/g) addWav(x/g, 20)
endphoneme
@@ -721,7 +705,7 @@ phoneme z
vcd alv frc sibilant
voicingswitch s
lengthmod 6
Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50
Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50
IF nextPh(isPause2) THEN
FMT(voc/z_) addWav(ufric/s_, 45)
phsource/ph_hungarian
+25 -2
View File
@@ -104,6 +104,12 @@ phoneme ts
endphoneme
phoneme dz
import_phoneme consonants/dz
voicingswitch ts
endphoneme
phoneme t // dental variant of /t/
vls dnt stop
lengthmod 2
@@ -117,12 +123,29 @@ phoneme t // dental variant of /t/
endphoneme
phoneme d // dental variant of /d/
import_phoneme base/d[
phoneme d
vcd dnt stop
voicingswitch t
lengthmod 5
Vowelin f1=2 f2=1500 -300 300 f3=-150 80
Vowelout f1=2 f2=1500 -300 300 f3=-150 80
IF PreVoicing THEN
FMT(d/xd)
ENDIF
IF nextPh(isPause2) THEN
FMT(d/d_) addWav(x/d_dnt)
ELIF nextPh(r) THEN
FMT(d/dr) addWav(x/d_dnt, 110)
ENDIF
FMT(d/d) addWav(x/d_dnt, 110)
endphoneme
phoneme c
import_phoneme consonants/c2
voicingswitch J
phsource/ph_romanian
+1 -1
View File
@@ -1,6 +1,6 @@
//====================================================
// Romanian - based on Italian
// Romanian
//====================================================
// Vowels
phsource/ph_tamil
+8 -2
View File
@@ -71,7 +71,10 @@ endphoneme
phoneme u
vowel starttype #u endtype #u
length 110
ChangeIfNotStressed(U)
IF prevPhW(isVel) THEN
ELSE
ChangeIfNotStressed(U)
ENDIF
FMT(vowel/u_6)
endphoneme
@@ -84,7 +87,10 @@ endphoneme
phoneme u:
vowel starttype #u endtype #u
length 260
ChangeIfNotStressed(U:)
IF prevPhW(isVel) THEN
ELSE
ChangeIfNotStressed(U:)
ENDIF
FMT(vowel/u_6)
endphoneme
phsource/ph_zh
+40 -1
View File
@@ -1,4 +1,4 @@
//based on "phonemes"
//====================================================
// Tone Numbers
//====================================================
@@ -101,6 +101,45 @@ phoneme N
endphoneme
phoneme l
liquid
lengthmod 2
CALL vowelstart_l
IF nextPhW(#i) THEN
VowelStart(l/li)
ENDIF
FMT(l/_l)
endphoneme
phoneme j
liquid palatal
lengthmod 1
IF nextPh(isVowel) THEN
NextVowelStarts
VowelStart(j/j@)
VowelStart(j/ja)
VowelStart(j/je)
VowelStart(j/ji)
VowelStart(j/jo)
VowelStart(j/ju)
EndSwitch
VowelEnding(j/xj, -30)
FMT(j/_j)
ELSE
// no vowel follows
Vowelout len=70
FMT(j/j_)
ENDIF
endphoneme
phoneme p
vls blb stop
phsource/phonemes
+12 -4
View File
@@ -567,7 +567,7 @@ phoneme m
VowelStart(m/mu)
EndSwitch
IF thisPh(isNotVowel) AND nextPhW(isLiquid) THEN
IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
FMT(m/mj)
ELIF prevPh(isPause) THEN
FMT(m/_m)
@@ -596,7 +596,7 @@ phoneme n
VowelStart(n/nu)
EndSwitch
IF thisPh(isNotVowel) AND nextPhW(isLiquid) THEN
IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
FMT(n/nj)
ELIF prevPh(isPause) OR prevPh(n) THEN
FMT(n/_n)
@@ -626,7 +626,7 @@ phoneme n.
VowelStart(n/nu)
EndSwitch
IF thisPh(isNotVowel) AND nextPhW(isLiquid) THEN
IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
FMT(n/nj)
ELIF prevPh(isPause) OR prevPh(n.) THEN
FMT(n/_nr)
@@ -658,6 +658,11 @@ phoneme n^
IF prevPh(isPause) THEN
FMT(n^/_n^)
ELIF nextPh(isNotVowel) THEN
IF nextPhW(n^) THEN
Length 75
ELIF prevPhW(n^) THEN
Length 100
ENDIF
FMT(n^/n^_)
ENDIF
endphoneme
@@ -686,7 +691,7 @@ phoneme N
VowelEnding(nn/inn, -40)
ENDIF
IF thisPh(isNotVowel) AND nextPhW(isLiquid) THEN
IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
FMT(nn/nnj)
ELIF prevPh(isPause) THEN
FMT(nn/_nn)
@@ -1521,6 +1526,9 @@ include ph_esperanto
phonemetable jbo eo
include ph_lojban
phonemetable nci base2
include ph_nahuatl
phonemetable fi base
include ph_finnish
phsource/vdiph2/eo
BIN
View File
Binary file not shown.
phsource/vwl_fr/@R3
BIN
View File
Binary file not shown.
phsource/vwl_fr/@R4
BIN
View File
Binary file not shown.
phsource/vwl_fr/@R5
BIN
View File
Binary file not shown.
phsource/vwl_fr/_r
BIN
View File
Binary file not shown.
phsource/vwl_fr/_r2
Executable
BIN
View File
Binary file not shown.
phsource/vwl_fr/r@
Executable
BIN
View File
Binary file not shown.
phsource/vwl_fr/ra
BIN
View File
Binary file not shown.
phsource/vwl_fr/re
BIN
View File
Binary file not shown.
phsource/vwl_fr/ri
BIN
View File
Binary file not shown.
phsource/vwl_fr/ro
BIN
View File
Binary file not shown.
phsource/vwl_fr/ru
BIN
View File
Binary file not shown.
phsource/vwl_fr/xr
BIN
View File
Binary file not shown.