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

Merge branch 'upstream' into development

Browse Source 
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-03-21 14:42:57 +00:00
parent 8d6fac1c28 2f2eee48a2
commit 1ee6f3cbbc
25 changed files with 229 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dictsource/en_list
+18 -17
View File
@@ -61,6 +61,7 @@ a eI $atend
// use the $accent attribute here to force the use of the
// accent table when speaking the name of the character.
à $accent $atend // this can be a word
á $accent $atend
ç $accent
é $accent
ê $accent
@@ -3214,7 +3215,7 @@ Korean kOr'i:@n
Kosovo k0s@voU
Kuala kwA:la#
Lagos leIg0s
Lebanon lEba#n@n
Lebanon lEb@n0n
Leipzig laIpsIg
Leone li:'oUn
Lesotho l@s'u:tu:
@@ -3908,8 +3909,8 @@ would $u+ $verbf $only $strend2
(would have) w%Udh%a#v $pastf
(would have) wUdhav $pastf $atend
(would have to) wUdhavt@5 $u2 $verbf $strend2
(wouldn't have) wUdnt@v $u1 $pastf $strend2
(wouldn't have to) ,wUdntavt@5 $verbf $strend2
(wouldn't have) wUd@-nt@v $u1 $pastf $strend2
(wouldn't have to) ,wUd@-ntavt@5 $verbf $strend2
won't woUnt $u+ $verbf $strend2 $only
wouldst $u+
(won't have) woUnta#v $pastf $u1
@@ -3920,18 +3921,18 @@ must $verbf
(must have) mVsta#v $pastf $1
(must have) mVsthav $pastf $atend
(must have to) m,Vstavt@5 $pastf
mustn't mVsnt $verbf
(mustn't have) mVsntha#v $pastf $u1+
(mustn't have to) m'Vsnthavt@5 $pastf
mustn't mVs@-nt $verbf
(mustn't have) mVs@-ntha#v $pastf $u1+
(mustn't have to) m'Vs@-nthavt@5 $pastf
shall ,Sal $verbf $only $strend2
shalt ,Salt $verbf $only
should ,SUd $verbf $only $strend2
(should have) SUd@v $pastf $u1+
(should have to) SUdhavt@5 $u2 $verbf $strend2
shouldn't ,SUdnt $verbf $strend2 $only
(shouldn't have) SUdnth@v $pastf $u1+
(shouldn't have to) 'SUdntavt@5 $verbf $strend2
shouldn't ,SUd@-nt $verbf $strend2 $only
(shouldn't have) SUd@-nth@v $pastf $u1+
(shouldn't have to) 'SUd@-ntavt@5 $verbf $strend2
shalln't ,SA:nt $verbf $strend2
shan't ,SA:nt $verbf $strend2
@@ -3947,9 +3948,9 @@ could %kUd $verbf $strend2 $only
(could have) ,kUda#v $pastf
(could have) kUdhav $pastf $atend
(could have to) kUdhavt@5 $u2 $verbf $strend2
couldn't ,kUd@nt $verbf $strend2
(couldn't have) kUd@nt@v $pastf $u1+
(couldn't have to) 'kUd@ntavt@5 $verbf $strend2
couldn't ,kUd@-nt $verbf $strend2
(couldn't have) kUd@-nt@v $pastf $u1+
(couldn't have to) 'kUd@-ntavt@5 $verbf $strend2
may meI $verbf $strend2
(may have) meIha#v $pastf $u1+
@@ -3980,9 +3981,9 @@ had ,had $atend
(had it) h,adI2t
(had them) h,adDEm
having ,havIN $strend2 $pastf $only
haven't hav@nt $pastf
hadn't had@nt $pastf
hasn't haz@nt $pastf
haven't hav@-nt $pastf
hadn't had@-nt $pastf
hasn't haz@-nt $pastf
get %gEt $strend2 $pastf $only
getting ,gEtIN $strend2 $pastf $only
@@ -4088,8 +4089,8 @@ his hIz $u $nounf $only $strend2
her h3: $u $nounf $only
hers h3:z $u $strend2
its Its $u $nounf
our aU@ $u $nounf $onlys
?3 our aU3 $u $nounf $onlys
our aU@ $u $nounf $only
?3 our aU3 $u $nounf $only
your jO@ $u $nounf $only
?6 your jU@ $u $nounf $only
their De@ $u $nounf $only
dictsource/en_rules
+4 -2
View File
@@ -3827,7 +3827,8 @@
nk Nk
?7 nk nk // ?? Scottish
n (kn n
n't nt
n't @-nt
A) n't nt
E) n (_ @n
B) n (_ @n
g) n (ing+ n
@@ -4847,7 +4848,7 @@
pro (vid pr@
pro (viden pr0
pro (vis pr@
pro (voc pr@
pro (voc pr%0#
pro (vok pr@
pro (sec pr0
pro (fil proU
@@ -6042,6 +6043,7 @@
χ tS'aI_
ψ ps'aI_
ω 'oUmIg@_
?3 ω oUm'eIg@_
ώ 'oUmIg@_
ό 'oUmIkr0n_
dictsource/es_list
+1
View File
@@ -338,6 +338,7 @@ ll 'El^e
é 'e||aTEntw'aDa
í 'i||aTEntw'aDa
_ó 'o||aTEntw'aDa
ó 'o||aTEntw'aDa $atend
ú 'u||aTEntw'aDa
ü ,uDj'ErEsis
dictsource/ga_list
+2 -1
View File
@@ -37,11 +37,12 @@ y waI
z zEd
_á eI||f0d[@
_é i:||f0d[@
_í aI||f0d[@
_ó o:||f0d[@
_ú ju:||f0d[@
_#32 spA:s
_cap m'o:r
// accent names
dictsource/hu_rules
+10 -8
View File
@@ -462,6 +462,7 @@ shetlan) d (szige d
vé) d (jeggy d
své) d (zseb d
csalá) d (szer d
szaba) d (sajt d
.group dz
fogó) dz (kod ts
@@ -820,12 +821,12 @@ _megsz) í (vatta i
szabad) ítsz its:
sz) í (vemészt i:
vesz) ítsz i:ts:
progressz) í (ve i:
sz) í (vemel i:
sz) í (vere i:
sz) í (veré i:
sz) í (verő i:
sz) í (vevő i:
progressz) í (ve i:
sz) í (vemel i:
sz) í (vere i:
sz) í (veré i:
sz) í (verő i:
sz) í (vevő i:
.group j
j j
@@ -1177,7 +1178,8 @@ _tetszé) s S
kolbászo) s S
feldolgozá) s S
_ki) s (szín S
kérdé) s S
kérdé) s S
végzé) s S
.group ss
ssz ss2
@@ -1713,7 +1715,7 @@ szállodá) ssz Ss
visszaélé) ssz Ss
esé) ssz (erű Ss
webe) ssz Ss
beleve) ssz (en s:
beleve) ssz (en s:
.group sz
dictsource/nl_list
+4
View File
@@ -1544,6 +1544,10 @@ spektakel $2
tegennatuur $4
travestie $3
verderop $3
verre vEr@
verrekijker vEr@kEIk@r
verste vErst@
verte vErt@
volledig $2
vrouwengek $alt3
waarschijnlijk $2
dictsource/nl_rules
+4 -2
View File
@@ -258,6 +258,7 @@
nd) es (_S1 s
rd) es (_S1 s
gt) es (_S1 s
wt) es (_S1 s
es (ie_ e:z
@) essen (_S5qd 'Es@n
@) eres (_S4qd @r'Es
@@ -738,8 +739,8 @@ _) inn (@P2 'I // ?? inneren
u (x 8
uu y
ui Wy
uw yU
uw (_ yU
uw (A yw
uw (K yU
_) uit (@P3 'Wyt
uul (_ 'yl // from -ule
@@ -759,6 +760,7 @@ _) inn (@P2 'I // ?? inneren
_) ver (@P3 v@r
_) ver (sie_ vEr
_) verder vErd@r
_) verge (@P5 vErg@
_) verge (le v@rQ'e:
_) voort (@P5 v'O:rt