mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-06 07:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into build

Browse Source 
Conflicts:
	src/compiledata.cpp
This commit is contained in:
Reece Dunn
2010-12-19 17:04:24 +00:00
parent e75d60f622 b89d8bde63
commit fa1e735d12
63 changed files with 7484 additions and 2676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/compile_report
+50 -16
View File
@@ -1,4 +1,4 @@
66 phoneme tables
68 phoneme tables
new total
base 107 107
consonants 9 115
@@ -21,7 +21,7 @@ consonants 9 115
fr-ca 11 140
hi 59 150
ta 21 153
hu 24 121
hu 25 122
lv 29 125
nl 25 126
pl 22 120
@@ -66,6 +66,8 @@ consonants 9 115
ht 11 140
az 10 127
ak 8 109
am 8 123
wo 18 118
Data file Used by
b/b [b] base
@@ -338,27 +340,34 @@ l/_l [l] base
[l/] fr
[l] hu
[l] zh
l/l_ [l/] base
l/l_ [l] base
[l/] base
[l/3] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [hæy] base
l/l@ [há] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/L1_aL [l/] base
l/L1_aL [l] base
[l/] base
[l/] de
l/L1_eL [l/] base
l/L1_eL [l] base
[l/] base
[l/] de
l/L1_iL [l/] base
l/L1_iL [l] base
[l/] base
[l/] de
l/L1_@L [l/] base
l/L1_@L [l] base
[l/] base
[l/] de
l/L1_oL [l/] base
l/L1_oL [l] base
[l/] base
[l/] de
l/L1_uL [l/] base
l/L1_uL [l] base
[l/] base
[l/] de
l/L2_aL [l/2] base
l/L2_eL [l/2] base
@@ -370,14 +379,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 [hæy] base
l/la [há] base
[l#] base
[l] fr
[l/2] fr
[K] nso
l/l_a [l/3] base
[l/] fr
l/le [hæy] base
l/le [há] base
[l#] base
[l] fr
[l/2] fr
@@ -388,7 +397,7 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
l/li [hæy] base
l/li [há] base
[l#] base
[l] fr
[l/2] fr
@@ -401,7 +410,7 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
l/lo [hæy] base
l/lo [há] base
[l#] base
[l] fr
[l/2] fr
@@ -409,7 +418,7 @@ l/lo [h
l/l_o [l/3] base
[l/] fr
l^/l_rfx [l.] base
l/lu [hæy] base
l/lu [há] base
[l#] base
[l] fr
[l/2] fr
@@ -730,6 +739,7 @@ ustop/k_unasp [k] base
[k] sq
ustop/k_unasp_ [k] zh
ustop/null [?] base
[t2] hu
ustop/p [p] base
[p2] fr
[p] zhy
@@ -1209,6 +1219,8 @@ vowel/@ [@] base
[@] hy
[@] ml
[@] sl
[@] wo
[@:] wo
vowel/@- [@-] base
[r*] hr
vowel/& [a] en-rp
@@ -1285,6 +1297,7 @@ vowel/a [a] base
[a] id
[a] sl
[a] bg
[a] am
vowel/a# [a] base2
[a/] base2
[a#] en-sc
@@ -1292,6 +1305,7 @@ vowel/a# [a] base2
[&] sr
[a#] rw
[a/] rw
[a] wo
vowel/a_2 [a] base2
[a] en-wi
[A:] en-wi
@@ -1305,6 +1319,7 @@ vowel/a_2 [a] base2
[a] da
[a] rw
vowel/a#_2 [A] nl
[a:] nl
[a#] pl
[&] hr
[a] sv
@@ -1355,6 +1370,7 @@ vowel/a_5 [a:] ta
[a:] ml
vowel/a_6 [a] ca
[a:] vi
[a:] wo
vowel/a_7 [a] en
[a] fr
[a] ht
@@ -1428,6 +1444,8 @@ vowel/e [e] base
[e:] ml
[e] ne
[e] sl
[e] wo
[e:] wo
vowel/e# [I] en-sc
vowel/e_2 [eI] en-sc
[e:] de
@@ -1474,6 +1492,8 @@ vowel/ee_3 [&] af
vowel/ee_4 [E] sq
vowel/ee_5 [E] en
[E] ak
[E] wo
[E:] wo
vowel/ee_6 [&] sk
[E3] sv
[E] ku
@@ -1521,6 +1541,7 @@ vowel/e_mid2 [E] af
[e] bg
[e] nso
[e] az
[e] am
vowel/@_fnt [@] en-wi
[@2] en-wi
[@2] hr
@@ -1553,12 +1574,15 @@ vowel/i [i] base
[i] prs
[i] nso
[i] ak
[i] am
[i:] wo
vowel/i# [y:] cy
vowel/i_2 [i2] de
[i:] de
[i] nl
[i:] la
[i:] sv
vowel/i#_2 [y] am
vowel/i_3 [i] af
[i:] sk
vowel/i_4 [i] fi
@@ -1640,6 +1664,7 @@ vowel/ii_6 [I] en-wm
[i/] pt
[i] is
[I] sq
[i] wo
vowel/ii_en [i] en
[i] sq
vowel/ii_final [i] en-us
@@ -1652,12 +1677,13 @@ vowel/@_low [@] en-rp
[V] hi
[@2] hi
[@] ro
[@2] no
[a#] no
[@] id
[V] ne
[@/] ne
[@] pa
[V] pa
[@] am
vowel/@_low2 [@/] en-us
[@2] en-us
vowel/o [o] base2
@@ -1685,6 +1711,8 @@ vowel/o [o] base2
[o:] pa
[o] sl
[o] ak
[o] wo
[o:] wo
vowel/o_2 [o:] cy
[o:] hi
[o:] hu
@@ -1697,6 +1725,7 @@ vowel/o-_2 [V] en-n
vowel/o_3 [oU] en-sc
vowel/o-_3 [U] en-rp
vowel/o-_4 [o] ro
[o] am
vowel/o_5 [O] nl
[O] da
vowel/o_6 [O:] nl
@@ -1735,6 +1764,8 @@ vowel/oo [o] base
[O] id
[o] prs
[o] bg
[O] wo
[O:] wo
vowel/oo_1 [O:] en-n
[O:] en-rp
[O@] en-rp
@@ -1798,6 +1829,7 @@ vowel/u [u] base
[u:] ml
[u] prs
[u] ak
[u:] wo
vowel/u# [u:] en-sc
[Y] tr
vowel/u_2 [u1] fi
@@ -1808,6 +1840,8 @@ vowel/u_2 [u1] fi
[u] tr
[u] sl
[u] bg
[u] am
[u] wo
vowel/u#_2 [u-] sv
vowel/u#_3 [U] ta
[U:] ta
phsource/j2/j2@
BIN
View File
Binary file not shown.
phsource/j2/j2e
BIN
View File
Binary file not shown.
phsource/mbrola/hu1
+1
View File
@@ -26,6 +26,7 @@ volume 32
0 N NULL 0 n
0 C NULL 0 x
0 s2 NULL 0 s
0 t2 NULL 0 t
// map English phonemes to Hungarian
phsource/ph_dutch
+5 -1
View File
@@ -78,7 +78,11 @@ phoneme a:
vowel starttype #a endtype #a
length 210
IF thisPh(isUnstressed) THEN
FMT(vowel/a#_4)
IF thisPh(isWordEnd) THEN
FMT(vowel/a#_2)
ELSE
FMT(vowel/a#_4)
ENDIF
ENDIF
FMT(vowel/a)
endphoneme
phsource/ph_hungarian
+12
View File
@@ -123,6 +123,18 @@ phoneme t // dental variant of /t/
endphoneme
phoneme t2
// changes to pause when followed by [t], so the [t][ becomes [t:]
vls dnt stop
lengthmod 2
IF nextPh(t) THEN
WAV(ustop/null, 0)
ELSE
ChangePhoneme(t)
ENDIF
endphoneme
phoneme d
vcd dnt stop
voicingswitch t
phsource/ph_norwegian
+1 -1
View File
@@ -15,7 +15,7 @@ phoneme @ // close schwa
FMT(vowel/@_4)
endphoneme
phoneme @2 // open schwa
phoneme a# // open schwa
vowel starttype #@ endtype #a
unstressed
length 120
phsource/ph_tamil
+2 -2
View File
@@ -66,14 +66,14 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 160
length 130
FMT(vowel/o)
endphoneme
phoneme o:
vowel starttype #o endtype #o
length 280
length 300
FMT(vowel/o)
endphoneme
phsource/phonemes
+21
View File
@@ -423,6 +423,21 @@ phoneme l
ChangePhoneme(l/)
ENDIF
IF nextPh(isNotVowel) THEN
// in case the next phoneme is no longer a vowel, in pass=2
PrevVowelEndings
VowelEnding(l/L1_@L, -60)
VowelEnding(l/L1_aL, -40)
VowelEnding(l/L1_eL, -30)
VowelEnding(l/L1_iL, -30)
VowelEnding(l/L1_oL, -40)
VowelEnding(l/L1_uL, -40)
EndSwitch
FMT(l/l_)
RETURN
ENDIF
CALL vowelstart_l
IF prevPh(#@) THEN
@@ -1822,3 +1837,9 @@ include ph_azerbaijani
phonemetable ak base
include ph_akan
phonemetable am base2
include ph_amhari
phonemetable wo base
include ph_wolof
phsource/vowel/i#_2
BIN
View File
Binary file not shown.