mahta.fetrat
/
HomoFast-eSpeak-Persian
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

[1.45.47] 

Fixed crash on re-initializing libespeak.

lang=hu, experimental, if the last two words of a clause (before punctuation) both have capital letters, then make the last word unstressed.  This is useful for people names, but may be wrong for other cases.

lang=en-us, distinguish phonemes [aI@] and [aI3] (compare "diet", "tired").

lang=de, fix automatic devoicing of word-final 'b', 'd', 'g'.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@276 d46cf337-b52f-0410-862d-fd96e6ae7743
master
jonsd 13 years ago
parent
d18532991a
commit
f68774298b
30 changed files with 2116 additions and 263 deletions
Split View Show Diff Stats
  1. 27
    27
      dictsource/da_list
  2. 282
    82
      dictsource/da_rules
  3. 1
    1
      dictsource/de_list
  4. 23
    23
      dictsource/dict_phonemes
  5. 10
    9
      dictsource/en_list
  6. 19
    19
      dictsource/en_rules
  7. 92
    38
      dictsource/fi_list
  8. 44
    7
      dictsource/fi_rules
  9. 1445
    4
      dictsource/hu_list
  10. 7
    1
      dictsource/hu_rules
  11. 18
    15
      dictsource/nl_list
  12. 7
    3
      dictsource/nl_rules
  13. 48
    10
      dictsource/ru_list
  14. 2
    1
      espeak-data/voices/fr
  15. 15
    14
      phsource/compile_report
  16. 2
    1
      phsource/mbrola/us
  17. 2
    1
      phsource/mbrola/us3
  18. 7
    0
      phsource/ph_english
  19. 7
    0
      phsource/ph_english_n
  20. 7
    0
      phsource/ph_english_rp
  21. 7
    0
      phsource/ph_english_sc
  22. 10
    4
      phsource/ph_english_us
  23. 8
    0
      phsource/ph_english_wm
  24. 5
    0
      phsource/ph_finnish
  25. 3
    0
      phsource/ph_german
  26. BIN
      phsource/vwl_en_us/ai@
  27. 2
    2
      src/readclause.cpp
  28. 2
    1
      src/synthdata.cpp
  29. 13
    0
      src/translate.cpp
  30. 1
    0
      src/translate.h

+ 27
- 27
dictsource/da_list View File

@@ -151,11 +151,11 @@ _12o tVlfd3 // 12. tolvte
_2Xo t'yv@n@ // 25.
_3Xo tr'&#ft@ //36.
_4Xo fWV'tyv@n@ // 42.
_5Xo halt*'Esenstyv@n@ // 52.
_5Xo h&lt*'Esenstyv@n@ // 52.
_6Xo tr'Esenstyv@n@ // 62.
_7Xo h&lfj'&rsenstyv@n@ // 72.
_8Xo firsenstyv@n@ // 82.
_9Xo half'Emsenstyv@n@ // 95.
_9Xo h&lf'Emsenstyv@n@ // 95.

// function words

@@ -362,25 +362,24 @@ warrior _^_EN

// PB names
august OgOsd $capital
austin _^_EN $alt
bailey _^_EN $alt
bbc _^_EN $alt
boston _^_EN $alt
bronx _^_EN $alt
boyle _^_EN $alt
austin _^_EN
bailey _^_EN
bbc _^_EN
boston _^_EN
bronx _^_EN
boyle _^_EN
cyrus _^_EN
cia _^_EN $alt
cia _^_EN
fox _^_EN
leroy _^_EN $alt
luke _^_EN $alt
mansfield _^_EN $alt
mahoney _^_EN $alt
montreal _^_EN $alt
oregon _^_EN $alt
leroy _^_EN
luke _^_EN
mansfield _^_EN
mahoney _^_EN
montreal _^_EN
oregon _^_EN
piccadilly _^_EN
reynolds _^_EN $alt
//purvis _^_EN
white _^_EN $alt
reynolds _^_EN
white _^_EN

// PB French words
croquis _^_FR
@@ -581,7 +580,6 @@ hydrant $alt
ignorant $alt
immigrant $alt
imposant $alt
//infant $alt
informant $alt
injuriant $alt
insinuant $alt
@@ -1157,12 +1155,11 @@ monoman $alt2
morian $alt2
mytoman $alt2
narkoman $alt2
//norman $alt2
nymfoman $alt2
obsidian $alt2
ocean $alt2
oktan $alt2
Oman $alt2
oman $alt2
organ $alt2
orkan $alt2
osman $alt2
@@ -1194,7 +1191,6 @@ Taiwan $alt2
talisman $alt2
tarlatan $alt2
tartan $alt2
//timian $alt2
titan $alt2
tukan $alt2
tulipan $alt2
@@ -1521,6 +1517,7 @@ evidens $alt
excellens $alt
filipens $alt
fluorescens $alt
flatulens $alt
fosforescens $alt
frekvens $alt
imens $alt
@@ -2159,7 +2156,6 @@ etik $alt
eugenik $alt
excentrik $alt
fabrik $alt
//falkeblik $alt
folkloristik $alt
fonetik $alt
fysik $alt
@@ -2862,7 +2858,7 @@ monogami $alt
origami oreg'ami $alt
pandemi $alt
polygami $alt
salami sal'&mi $alt
salami s&l'&mi $alt
socionomi $alt
sodomi $alt
stomi $alt
@@ -2911,7 +2907,6 @@ dessin des'EN $alt
dioxin $alt
disciplin $alt
doktrin $alt
//(drive-in) drajv'in $alt
dusin $alt
endokrin $alt
endorfin $alt
@@ -5429,6 +5424,7 @@ ynkværdig $alt
ærefrygtig $alt
ærgerrig $alt
ærværdig $alt
øjeblikkelig $alt
ømfindtlig $alt
ømtålelig $alt
ømtålig $alt
@@ -5824,6 +5820,7 @@ amper $alt
amputer $alt
analogiser $alt
analysere $alt
psykoanalysere $alt
angliser $alt
animer $alt
annekter $alt
@@ -6412,6 +6409,7 @@ invalidere $alt
inventer $alt
inverter $alt
invester $alt
geninvester $alt
inviter $alt
involver $alt
ioniser $alt
@@ -6965,6 +6963,7 @@ ratihaber $alt
rationaliser $alt
rationere $alt
reager $alt
afreager $alt
reaktiver $alt
realiser $alt
reassumer $alt
@@ -8951,6 +8950,7 @@ bastion $alt
benediktion $alt
billion $alt
centralisation $alt
centurion $alt
cirkulation $alt
citation $alt
civilisation $alt
@@ -10673,6 +10673,7 @@ prosektor $alt
protektor $alt
radiator $alt
reaktor $alt
rektor $alt
receptor $alt
recitator $alt
reflektor $alt
@@ -11128,12 +11129,11 @@ egne a:in@
enter entV
ide id'e // idea
idé id'e // idea
//igen igen
tune tun3 $capital // PB Tune lufthavn - not "tune a car" [tjune]
ny ny // new
også Vs@ // also
idet id'e // in so far as
(rub og stub) R'Ob||V||sd'Ob
slags sl'ags // sort, type
tre tr'e // the number 3
rejicere rejis'eV // PB should not be pronounced [raje]
rejicerer rejis'eV // PB

+ 282
- 82
dictsource/da_rules
File diff suppressed because it is too large
View File


+ 1
- 1
dictsource/de_list View File

@@ -408,7 +408,7 @@ apple _^_EN
association _^_EN
baseball _^_EN
bbc _^_EN
beat _^_EN
beat _^_EN $only
browser _^_EN
byte _^_EN
camcorder _^_EN

+ 23
- 23
dictsource/dict_phonemes View File

@@ -53,7 +53,7 @@ p r s S t T v w
x z


Dictionary da_dict 2011-07-21
Dictionary da_dict 2011-10-24

& &# 0 3 @ @- a A
aI e E i o O u V
@@ -63,22 +63,22 @@ W W# y Y
dZ f g h j J k l
l/2 l/3 m n N p r R
R3 s S t T tS v w
x z Z
x Z


Dictionary hu_dict 2011-10-07
Dictionary hu_dict 2011-10-24

a A a: E e: i i: o
o: u u: Y y y: Y:

- : b c C d dZ dz
f g h j J k l m
n n^ p r R R2 s S
s2 t t2 tS ts v w z
Z
f g h j J k l l^
m n n^ p r R R2 s
S s2 t t2 tS ts v w
z Z


Dictionary de_dict 2011-06-14
Dictionary de_dict 2011-10-16

3 @ @- a A A: aI aU
A~ E E2 E: e: EI i I
@@ -102,14 +102,14 @@ p Q r R s s; t T
ts v x z


Dictionary en_dict 2011-09-27
Dictionary en_dict 2011-10-24

0 3 3: @ @- @2 @5 @L
a a# A: A@ aa aI aI@ aU
aU@ A~ E e: e@ eI i I
I# I2 i: i@ i@3 IR O O:
o: O@ o@ OI oU O~ U u:
U@ V VR
a a# A: A@ aa aI aI3 aI@
aU aU@ A~ E e: e@ eI i
I I# I2 i: i@ i@3 IR O
O: o: O@ o@ OI oU O~ U
u: U@ V VR

: ; ? b C d D d#
dZ f g h j k l l#
@@ -140,16 +140,16 @@ N n^ p Q R R2 s S
t T tS v v# w x z


Dictionary fi_dict 2009-05-01
Dictionary fi_dict 2011-10-14

& &i &y a a2 ai au e
ei eu ey i I ie iu iy
o oi ou u ui uo Y y
Yi yi Yy yY
& &i &y a ai au e ei
eu ey i I ie iu iy o
oi ou u ui uo Y y Yi
yi Yy yY

: b d f g h j k
l m n N p r s S
s2 t v w Z
l m n N p r R s
S s2 t v w Z


Dictionary fr_dict 2011-08-14
@@ -327,7 +327,7 @@ k l m n p R s S
t tS v w x


Dictionary nl_dict 2011-09-12
Dictionary nl_dict 2011-10-14

8 @ @- a A a: A~ e
E e# E2 e: EI eU i I
@@ -404,7 +404,7 @@ ts; v v; w w2 x z Z
z; Z;


Dictionary ru_dict 2011-03-25
Dictionary ru_dict 2011-10-24

8 @- a A e E E# E%
E2 i I I# I3 I^ ja ju

+ 10
- 9
dictsource/en_list View File

@@ -262,7 +262,7 @@ U+302 s3:kVmflEks_
U+303 tIld@_
U+304 makr0n_
U+306 brEv_
U+308 daI@ri:sI2s
U+308 daI3ri:sI2s
U+30a rINg_
U+31e a#pr'0ksIm@nt_
U+325 rINg_
@@ -1176,7 +1176,7 @@ fetus fi:t@s
fi f,aI // as in "hi-fi"
fiasco fi:'askoU
fiat fi:@t
fiery faI@rI
fiery faI3rI
finale fI2nA:li
finance faInans $only
finance $verb
@@ -1384,7 +1384,7 @@ insect $1
insert Ins3:t $onlys
insert Ins'3:t $verb
insightful $2
inspire Insp'aI@
inspire Insp'aI3
instal Inst'O:l // instalment
installation Inst@l'eIS@n
instinctive $2
@@ -1408,7 +1408,7 @@ intray IntreI
intro $1
irate aIr'eIt
iris aIrIs
iron aI@n
iron aI3n
irony aIr@nI
isosceles aIs'0s@li:z
itinerary aIt'In@r@rI
@@ -1803,7 +1803,7 @@ pioneer paI@n'i@3
pious paI@s
pipette pIp'Et
piquant pi:k@nt
piracy paI@r@si
piracy paI3r@si
piranha p@rA:n@
pirate paIr@t
pisces paIsi:z
@@ -2305,7 +2305,7 @@ twas tw0z
twilight twaIlaIt
twos tu:z
typo taIpoU
tyr taI@
tyr taI3

ukulele ju:k@l'eIli
ultraviolet $3
@@ -2378,8 +2378,8 @@ vineyard vInj3d
vinyl vaInI2l
viola vaI'oUl@
violin $2
virus vaI@r@s
viral vaI@r@L
virus vaI3r@s
viral vaI3r@L
visa vi:z@
visit vIzI2t
voila vwal'a
@@ -3502,13 +3502,14 @@ like laIk $strend2
?3 current k'3@nt
?3 depot di:poU
?3 detail $2
?3 dialog daI@lO:g
?3 dialog daI|@lO:g
?3 envelope A:nv@loUp
?3 err e@
?3 fortune fO@tS@n
?3 garage ga#rA:Z
?3 herb 3:b
?3 hurricane h3:@keIn
?3 inquiry Inkw@ri
?3 investigative Inv,EstI2g'eItIv
?3 laboratory labr@tO:ri
?3 launch lA:ntS

+ 19
- 19
dictsource/en_rules View File

@@ -1391,7 +1391,7 @@
or) ch (i k
chlo (r klo@
chloro kl,o@roU
choir kwaI@
choir kwaI3
ch (ol k
choly k@l%I
ch (ond k
@@ -1557,7 +1557,7 @@
dged (_ dZd
dg (i dZ
dg (y dZ
_) dir (_ daI@
_) dir (_ daI3
we) dne (sd n
dt (_ t
?3 &) du (CA dZu:
@@ -2819,7 +2819,7 @@
.group ia
XC) ia aI|@
&) iac (_ =Iak
C) iar aI@
C) iar aI3
?8 C) iar aIa#
iar (iC Iar
&) iary =j@r%I
@@ -2830,7 +2830,7 @@
@) ian (cy I|@n
l) iais I|eIz
p) ia (no Ia
f) ia (b aI@
f) ia (b aI|@
r) ia (b I2@
t) ia (b I2@
&) iage (_ I2dZ
@@ -2851,7 +2851,7 @@
ill) ia (nt I@
al) ia (nt I@
_p) ia (nA i@
iar aI@
iar aI3
@l) iar (_ i@3
iara (_ I'A:r@
iarch I2A@k
@@ -2907,9 +2907,9 @@
ier (a I'e@r
&) ier (_NS2i 3
&) ier's (_NS4i 3z
_h) ie (r aI@
pl) ier (_ aI@
_Cr) ier aI@
_h) ie (r aI3
pl) ier (_ aI3
_Cr) ier aI3
ier (c i@3
ierre (_ I2e@
ie (t aI@
@@ -3236,20 +3236,20 @@
.group ir
_) ir (a I2r
ir (a_ 'i@r
ir (able 'aI@
ir (able 'aI3
m) ir (ac Ir
sp) iral aI@r@L
sp) iral aI3r@L
@) ir (ation Ir
ir (at %aIr
ir (ate =i@r
ire aI@
ir (ee aI@
ire aI3
ir (ee aI3
?8 ire aIa#
s) ir (en aI@
s) ir (en aI3
c) ire (n aIr@
ir (ect %aIr
ir (ety aIr
irer (_ aI@r3
irer (_ aI3r3
ir 3:
?5 ir IR
@C) ir (_ i@3
@@ -3263,13 +3263,13 @@
g) ir (o aIr
_C) ir (o_ aIr
@) ir (o_ 'i@r
_) iron aI@n
_) iron aI3n
iron (A aIr'0n
v) iro (n aIr@
p) ir Ir
_p) ira (c aI@
p) ire aI@
des) ir aI@
_p) ira (c aI3
p) ire aI3
des) ir aIr
_) irre (C ,IrI
irr (econ I2r
_) irr (egu I2r
@@ -3280,7 +3280,7 @@
_) ir (rA I
ir (ro I
ir (ru I
iry (_ aI@rI
iry (_ aI3rI


.group is

+ 92
- 38
dictsource/fi_list View File

@@ -59,23 +59,23 @@ _: kaksoispiste
% prosent:i
_( alkusulku
_) lop:usulku
_[ alkuhaka2
_] lop:uhaka2
_[ alkuhaka
_] lop:uhaka
_{ alkua:lto
_} lop:ua:lto
_< p'ienempIk'uin
_> s'u:rempIk'uin
_- vi:va2
__ ala2vi:va2
_- vi:va
__ alavi:va
+ plus $max3
* asteriski $max3
= 'yht&k'uin $max3
% prosent:I $max3
/ kaut:a2
/ kaut:a
\ keno
€ euro
£ punta2
¤ valu:t:a2
£ punta
¤ valu:t:a
& _et
@ _&t
~ tilde
@@ -98,7 +98,7 @@ _5 v'i:si
_6 k'u:si
_7 s'eitsem&n
_8 k'ahdeksan
_9 'yhdeks&m
_9 'yhdeks&n
_10 k'ymmenen
_11 'yksitoista
_12 k'aksitoista
@@ -114,16 +114,16 @@ _3X k'olmekymment&
_4X n'elj&kymment&
_5X v'i:sikymment&
_6X k'u:sikymment&
_7X s'eitsem&nk,ymment&
_8X k'ahdeksank,ymment&
_9X 'yhdeks&mk,ymment&
_7X s'eitsem&Nk,ymment&
_8X k'ahdeksaNk,ymment&
_9X 'yhdeks&Nk,ymment&
_0C s'ata:_
_1C s'ata
_0M1 t'uhat:a
_1M1 t'uhat // no '1' before thousand
_0M2 m'iljo:na:
_1M2 m'iljo:na
_0M3 m'iljardi
_0M3 m'iljardia
_1M3 m'iljardi
_0M4 b'iljo:na:
_1M4 b'iljo:na
@@ -143,7 +143,7 @@ te $u
he $u
ne $u

itse $u $double // reflexive pronoun
itse $u+ $double // reflexive pronoun

tämä $u+ // this
tämän $u+
@@ -222,7 +222,7 @@ ja $u $pause // and
entä $u $pause // and
tai $u $pause // or
vai $u $pause
mutta $u $pause // but
mutta $u+ $pause // but

// negative

@@ -237,7 +237,7 @@ eivät $u


// auxillary verbs
olla $u // to be
olla $u $double // to be
olen $u
olet $u
on $u
@@ -267,12 +267,12 @@ lienee $u
lienemme $u
lienette $u
lienevät $u
liene $u
liene $u $double
lienneet $u


// some common adjectives and adverbs
vähän $u // some
vähän $u+ // some

// words that cause doubling
kiinni $double
@@ -284,6 +284,7 @@ tuore $double
aihe $double
aste $double
kone $double
ihme $double // miracle. Common in spoken Finnish of Helsinki.
laite $double
lause $double
luode $double
@@ -294,6 +295,7 @@ purje $double
tunne $double
vene $double
virhe $double
virke $double // sentence (full one, unlike lause)

aja $double
auta $double
@@ -304,33 +306,85 @@ pure $double
syö $double
tule $double

// Pronunciation exceptions
// Verb base forms and passive present connegatives
ajeta $double // passive connegative
auteta $double // connegative
mennä $double // base form and connegative
oteta $double // connegative
pueta $double // connegative
pukea $double // base form
purra $double // both
syödä $double // both
tulla $double // both

// No doubling, ends in -sti
kasti kastI // Adverbs that end in –sti cause doubling of the following consonant. These are some other words that end in –sti and therefore they don’t double the following consonant.
kesti kestI
kosti kostI
kyösti kyYstI
pelasti pelastI
pianisti pianistI
posti postI
puristi puRIstI
pysti pystI
päästi p&:stI
rasti RastI
risti RistI
ryösti RyYstI
varasti vaRastI
viulisti viulIstI

// No doubling, ends in –lle
galle galle
hille hille
nalle nalle
kalle kalle
pelle pelle
polle polle
promille pRomIlle
sirkuspelle siRkuspelle
ville ville
wille ville

// No doubling, ends in –nne
Anne anne $capital
hanne hanne
janne janne
manne manne
marianne maRIanne
susanne susanne

// No doubling, ends in –tse
konfutse konfutse
kungfutse kuNfutse


ok oo_,ko:
// ok _^_EN // Translates to english o'kay.
okay okei

// Jogurtti (also: jugurtti or jukurtti)
yoghurt jogurtti
yogurt jogurtti
// Pronunciation exceptions

ok 'o:_,ko:
okay okei
yoghurt jogurt:i
yogurt jogurt:i


// Abbreviations

abc 'a:,be:,se:
os o:&s: $dot
ad a:de: $dot // anno Domini, Herran vuonna
ca 'se:a: $dot // circa
em e:,&m $dot
ekr 'e:,ko:,&r $dot // ennen Kristuksen syntymää
etc et_setera $dot // et cetera, ym., jne.
ym ynn&_mu:ta $dot // ynnä muuta (etc)
eg esimerkiksi $dot // exempli gratia, esimerkiksi
jne 'ji,&n,e: $dot // ja niin edelleen
(à la) 'ala $dot // jonka mukaan
ky ko:y: $dot // kommandiittiyhtiö
oy o:y: // osakeyhtiö
nro numero $dot
abc $abbrev
adhd $abbrev
os $abbrev $dot
ad $abbrev $dot // anno Domini, Herran vuonna
ca $abbrev $dot // circa
em $abbrev $dot
ekr $abbrev $dot // ennen Kristuksen syntymää
etc et_setera $dot // et cetera, ym., jne.
ym ynn&_mu:ta $dot // ynnä muuta (etc)
eg esimerkiksi $dot // exempli gratia, esimerkiksi
jne $abbrev $dot // ja niin edelleen
(à la) 'ala $dot // jonka mukaan
ky $abbrev $dot // kommandiittiyhtiö
oy $abbrev // osakeyhtiö
nro numero $dot




+ 44
- 7
dictsource/fi_rules View File

@@ -2,11 +2,16 @@
// This file is UTF-8 encoded


// NOTE: aii, auu, eii etc. are pronounced [a|i:], [a|u:] and [e|i],
// but aaii, aauu and eeii must be pronounced [a:i:], [a:u:] and [e:i:].

.group a
a a
aa a:
ai ai
aii a|i: // naiivi
au au
auu a|u:

&) a (lla_ %a

@@ -17,7 +22,9 @@
ä &
ää &:
äi &i
äii &|i:
äy &y
äyy &|y:

&) ä (lla_ %&

@@ -31,6 +38,7 @@
c k
c (i s
c (e s // Pronounce c as s. Mostly foreign words such as celcius, center, cervantes, cezanne.
c (y s
cc k: // Utter cc as k. This includes rebecca, accord, puccini etc.

K) ch (r k
@@ -47,12 +55,16 @@
e e
ee e:
ei ei
eii e|i: // fenoliftaleiini
eu eu
euu e|u:
ey ey
eyy e|y:

&) e(lla_ %e
&) e(llä_ %e


.group f
f f

@@ -70,8 +82,11 @@
i i
ii i:
iu iu
iuu i|u:
ie ie
iee i|e: // dieetti
iy iy
iyy i|y:

// iä ii& // Improve the i in iä words. Eg. ryhmiä (ryhmä), äitiä.
// ia iia // Improve the i in ia words. Eg. mattia, lattia.
@@ -103,7 +118,7 @@
.group n
n n
ng N:
ng (_ N
ng (K N // ng is [N] also when followed by a consonant
n (p m
n (_p m
n (k N
@@ -117,9 +132,12 @@
o o
oo o:
oi oi
oii o|i: // heroiini
ou ou
ouu o|u:

symb) o (l oo // double the o in symboli. Include inflections and compound words.
symb) o (l o: // double the o in symboli. Include inflections and compound words.
symb) o (loi o // symboloida with short o



@@ -127,7 +145,9 @@
ö Y
öö Y:
öi Yi
öii Y|i:
öy Yy
öyy Y|y:



@@ -140,7 +160,7 @@

kam) p (anj p: // double the p in kampanja. Include inflections and compound words.

sam) p (oo p: // double the p in sampoo. Include inflections and compound words.
// sam) p (oo p: // double the p in sampoo. Include inflections and compound words. ”Sampoon” is an inflected form of the word ”sampo” and has a short p. It is not wrong to pronounce sampoo as [s'ampo:] either. Don’t double the p.
sham) p (o p: // double the p in shampo. Include inflections and compound words.


@@ -157,14 +177,19 @@
s s
ss ss2 // [s2] is a continuation for [s]
K) sh S
@) sh (an_ sh
@) sh (än_ sh // preesens+hän and similar ones with sh as separate sounds


K) sch S // Schmitt

@) sti (_ sti_X1 // double the initial consonant of the next word
A) sti (_ sti_X1 // double the initial consonant of the next word only when the –sti ending is preceded by a vowel (e.g. ”teksti” does not double)


.group t
t t
tt t:
tz ts // German names. Instead of former [tts]

@) tse (_ tse_X1 // double the initial consonant of the next word

@@ -173,7 +198,11 @@
u u
uu u:
ui wi
_) ui ui
_j) ui ui // [ui] sounds better than [wi] when stressed. Especially <jui> at the beginning of the word sounds bad if pronounced [jwi]
uii u|i:
uo uo
uoo u|o:


.group v
@@ -193,24 +222,32 @@
y y
yy y:
yi yi
yii y|i:
yö yY
yöö y|Y:



.group z
z ts
zz t:s
zz ts // pizza
K) zh Z

pi) zza tsa // Pronounce pizza as pitsa. Include inflections and compound words.


.group
å o
åå o:
ü y
üü y:
š S
ž Z

$ dollarin
$ dollarin
__) - (_D mi:nus
A_) - (_D _
C_) - (_D _




+ 1445
- 4
dictsource/hu_list
File diff suppressed because it is too large
View File


+ 7
- 1
dictsource/hu_rules View File

@@ -148,7 +148,7 @@ hierar) ch (i h
stri) ch (el h:
ar) ch (ív h
ar) ch (ivál h
ar) ch (itektúr h
ar) ch (itektú h
ma) ch (iná h
oligar) ch h
legpe) ch (es h:
@@ -306,6 +306,8 @@ standar) d (jegy d
máso) d (szaká d //For example másodszakács, másodszakáccsá words need spokening single d phoneme before s phoneme
_ná) d (söv d //for example nádsövénnyé word
dt (sz t:
miliár) d (szor d
tér) d (sérül d

.group dz
fogó) dz (kod ts
@@ -1285,6 +1287,9 @@ házasi) ts (a tS:
_pázsi) t (sz t
fejeze) t (sor t
_o) ttj (ár tj
_spor) t (cél t
pó) t (selejt t
diva) t (cikk t

.group tj
C) tj c
@@ -1773,6 +1778,7 @@ magyará) z (kod s
ro) zszs (em Z:
_gő) z (süvölt z
ezkö) z (sor z
wal) z (er ts

.group
$ dolla:R2

+ 18
- 15
dictsource/nl_list View File

@@ -363,21 +363,24 @@ websites _^_EN
weekend _^_EN


// verbs where -ent is not a stressed ending
bakent $alt
effent $alt
jegent $alt
kerstent $alt
ketent $alt
loochent $alt
oefent $alt
opent $alt
regent $alt
rekent $alt
stevent $alt
tekent $alt
wapent $alt
zegent $alt
// verbs where -ent, -ene, -enen is not a stressed ending
baken $alt
effen $alt
jegen $alt
kersten $alt
keten $alt
loochen $alt
oefen $alt
open $alt
regen $alt
reken $alt
schepen $alt
steven $alt
teken $alt
wapen $alt
zegen $alt
trokken $alt
zeten $alt


// words where -er is not a stressed verb ending

+ 7
- 3
dictsource/nl_rules View File

@@ -151,6 +151,7 @@
ds (_N ts
d (st t
// _) de (CC@P2 d@ // Used a lot in family names
_) de (geen d@ // degene, degenen
_) de (zelf d@


@@ -207,19 +208,22 @@
&) e (ment @
&) e (nissen_ @

&) en (_S2qd @n // double the previous vowel
KAC) en (_S2e @n
&) en (_S2qd @n
KAC) en (_S2e @n // flag 'e' means double the previous vowel
and) en (_S2 @n
el) en (_+S2qd @n
er) en (_+S2qd @n

&) en (e_$p_altS3e =@n@ // flag 'e' means double the previous vowel
&) en (en_$p_altS4e =@n@n
&) en (t_$p_altS3e =@nt

&) ens (_S3q @ns
ll) en (_S3 @n
&) end (_ @nd
&) ende (_S1 @
&) enden (_S2 @n
eden e:d@n
&) ent (_$w_alt =@nt
@) ent (_ 'Ent
@) ent (e_ 'Ent
@) ent (en_ 'Ent

+ 48
- 10
dictsource/ru_list View File

@@ -28,7 +28,7 @@ _10 d;'es;It;
_11 Od;'innVttsVt;
_12 dv;In'AttsVt;
_13 tR;In'AttsVt;
_14 tS;It'y@-*nVttsVt;
_14 ts;It'y@-*nVttsVt;
_15 p;Itn'AttsVt;
_16 SE#stn'AttsVt;
_17 s;Imn'AttsVt;
@@ -41,30 +41,67 @@ _5X p;Vd;d;Is;'jat
_6X SE2z;d;d;Is;'jat
_7X s;'emd;E2s;Vt
_8X v'os;E2md;E2s;Vt
_9X d;evIn'ostO
_9X d;E2v;In'ostO
_0C st'o
_2C dv;'es;t;I
_3C tr;'ista
_4C tS;It'yr;E2sta
_4C ts;It'yr;E2sta
_5C p;,It;s'ot
_6C S,E#s;t;s'ot
_7C s;,Ims'ot
_8C vOs;Ims'ot
_9C devits'ot
_1MA1 t'ys;ItS;V // no '1' before thousand
_0MA1 t'ys;ItS;i
_0M1 t'ys;VtS;
_9C dev;Vts'ot
_1MA1 t'ys;Its;V // no '1' before thousand
_0MA1 t'ys;Its;i
_0M1 t'ys;Vts;
_1MA2 m;,IlI;'on
_0MA2 m;,IlI;'ona
_0M2 m;,IlI;'onof
_1MA3 m;,IlI;'art
_0MA3 m;,IlI;'arda
_0M3 m;,IlI;'artof
_0M3 m;,IlI;'ardof
_dpt _:'i_: // start of decimal fraction
_dpt2 _d;Is;'atYx // end of decimal fraction

// characters
№ номер $text

// symbols
@ sob'aka
# reS'Etka $max3
$ d'ollar
% prVts'Ent $max3
^ kr'ySka
& ampers'and
* zvezd'a $max3
+ pl'jus $max3
= ravn'o $max3
/ sl'ES $max3
\ bEksl'ES $max3
_- def'is
_ podtS;'8rk $max3
~ t'ilda
№ n'omer


_( 'otkrkrug
_) z'akrkrug
_| v'ert
_{ 'otkrfigur
_} z'akrfigur
_[ 'otkrkvadrat
_] z'akrkvadrat
_> b'ol;SE
_< m'en;SE
_« 'otkr uglof
_» z'akr uglof
_! v'oskl;
_? vopr'os
_. t'otS;ka
_, zVpit'aja
_` akts'Ent
_" kVv'ytS;ka
_' ap'ostrVf
_; t'otS;kzap
_: dvVet'otS;ie


// prepositions
@@ -170,3 +207,4 @@ _с Es

// exceptions
радио r'ad;Io


+ 2
- 1
espeak-data/voices/fr View File

@@ -1,5 +1,6 @@
language fr
name french
language fr-fr
language fr
gender male

dictrules 1

+ 15
- 14
phsource/compile_report View File

@@ -3,20 +3,20 @@
base 107 107
consonants 10 116
base2 26 123
en 52 152
en-n 32 152
en-us 38 153
en-sc 39 154
en-rp 33 152
en-wm 30 152
en-wi 30 152
en 53 153
en-n 33 153
en-us 39 154
en-sc 40 155
en-rp 34 153
en-wm 31 153
en-wi 30 153
af 39 136
cy 29 132
de 41 139
eo 13 114
jbo 2 114
nci 3 123
fi 40 133
fi 41 133
et 47 139
fr 59 140
fr-ca 11 140
@@ -394,7 +394,7 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
l/l@ [h–] base
l/l@ [haþ] 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 [haþ] 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 [haþ] 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 [haþ] 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 [haþ] 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 [haþ] base
[l#] base
[l] fr
[l/2] fr
@@ -2279,6 +2279,7 @@ vwl_en_us/3_us [3] en-us
vwl_en_us/3_us2 [3:] en-us
vwl_en_us/a [a] en-us
vwl_en_us/ai@ [aI@] en-us
vwl_en_us/ai3 [aI3] en-us
vwl_en_us/ar [A:] en-us
[A@] en-us
vwl_en_us/aU@ [aU@] en-us

+ 2
- 1
phsource/mbrola/us View File

@@ -15,7 +15,8 @@
0 g- NULL 0 NULL
0 x NULL 0 k_h
0 @- NULL 0 NULL
0 aI@ NULL 60 AI r
0 aI@ NULL 60 AI @
0 aI3 NULL 60 AI r=
0 aU@ NULL 75 aU r



+ 2
- 1
phsource/mbrola/us3 View File

@@ -15,7 +15,8 @@
0 g- NULL 0 NULL
0 x NULL 0 k
0 @- NULL 0 NULL
0 aI@ NULL 60 AI r
0 aI@ NULL 60 AI @
0 aI3 NULL 60 AI r=
0 aU@ NULL 75 aU r



+ 7
- 0
phsource/ph_english View File

@@ -429,6 +429,13 @@ phoneme aI@
endphoneme


phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme


phoneme aU@
vowel starttype #a endtype #@
length 280

+ 7
- 0
phsource/ph_english_n View File

@@ -255,6 +255,13 @@ phoneme aI@
endphoneme


phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme


phoneme aU@
vowel starttype #a endtype #@
length 280

+ 7
- 0
phsource/ph_english_rp View File

@@ -269,6 +269,13 @@ phoneme aI@
endphoneme


phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme


phoneme aU@
vowel starttype #a endtype #@
length 270

+ 7
- 0
phsource/ph_english_sc View File

@@ -344,6 +344,13 @@ phoneme aI@
endphoneme


phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme


phoneme @L
vowel starttype #@ endtype l
ipa əl

+ 10
- 4
phsource/ph_english_us View File

@@ -313,15 +313,21 @@ endphoneme
phoneme aI@
vowel starttype #a endtype #@
length 300
ipa aɪəɹ
IF nextPhW(r-) THEN
ipa aɪə
ENDIF
ipa aɪə
IfNextVowelAppend(r-)
FMT(vwl_en_us/ai@)
endphoneme


phoneme aI3
vowel starttype #a endtype #@
length 300
ipa aɪɚ
IfNextVowelAppend(r-)
FMT(vwl_en_us/ai3)
endphoneme


phoneme aU@
vowel starttype #a endtype #@
length 300

+ 8
- 0
phsource/ph_english_wm View File

@@ -241,6 +241,14 @@ phoneme aI@
endphoneme


phoneme aI3
vowel starttype #a endtype #@
length 280
ChangePhoneme(aI@)
endphoneme



phoneme aU@
vowel starttype #a endtype #@
length 280

+ 5
- 0
phsource/ph_finnish View File

@@ -237,6 +237,11 @@ endphoneme



phoneme r
import_phoneme base/R
endphoneme


phoneme R2 // this is [R2], but shorter
liquid
trill

+ 3
- 0
phsource/ph_german View File

@@ -408,6 +408,7 @@ endphoneme

phoneme b
vcd alv frc sibilant
voicingswitch p
IF nextPh(l2) THEN
ChangePhoneme(p)
ENDIF
@@ -416,6 +417,7 @@ endphoneme

phoneme d
vcd alv stop
voicingswitch t
IF nextPh(l2) THEN
ChangePhoneme(t)
ENDIF
@@ -424,6 +426,7 @@ endphoneme

phoneme g
vcd vel stop
voicingswitch k
IF nextPh(l2) THEN
ChangePhoneme(k)
ENDIF

BIN
phsource/vwl_en_us/ai@ View File


+ 2
- 2
src/readclause.cpp View File

@@ -1432,8 +1432,8 @@ void SetVoiceStack(espeak_VOICE *v, const char *variant_name)
sp->voice_age = v->age;
sp->voice_gender = v->gender;

if(memcmp(variant_name, "!v/", 3) == 0)
variant_name += 3;// strip variant directory name
if(memcmp(variant_name, "!v", 2) == 0)
variant_name += 3;// strip variant directory name, !v plus PATHSEP
strncpy0(base_voice_variant_name, variant_name, sizeof(base_voice_variant_name));
memcpy(&base_voice, &current_voice_selected, sizeof(base_voice));
}

+ 2
- 1
src/synthdata.cpp View File

@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"

const char *version_string = "1.45.45 07.Oct.11";
const char *version_string = "1.45.47 24.Oct.11";
const int version_phdata = 0x014500;

int option_device_number = -1;
@@ -176,6 +176,7 @@ void FreePhData(void)
phoneme_tab_data=NULL;
phoneme_index=NULL;
phondata_ptr=NULL;
tunes=NULL;
}



+ 13
- 0
src/translate.cpp View File

@@ -1436,6 +1436,18 @@ if(dictionary_flags2[0] & FLAG_ABBREV)
dictionary_flags[0] &= ~FLAG_PAUSE1;
}

if(tr->translator_name == L('h','u'))
{
// lang=Hungarian, If the last two words of a clause have capital letters (eg. a person name), unstress the last word.
if((wflags & (FLAG_LAST_WORD | FLAG_FIRST_UPPER | FLAG_ALL_UPPER | FLAG_FIRST_WORD)) == (FLAG_LAST_WORD | FLAG_FIRST_UPPER))
{
if(((wtab[-1].flags & (FLAG_FIRST_UPPER | FLAG_ALL_UPPER)) == FLAG_FIRST_UPPER) && ((tr->clause_terminator != 0x90028) || (wflags & FLAG_HAS_DOT)))
{
ChangeWordStress(tr,word_phonemes,3);
}
}
}

if((wflags & FLAG_HYPHEN) && (tr->langopts.stress_flags & S_HYPEN_UNSTRESS))
{
ChangeWordStress(tr,word_phonemes,3);
@@ -1461,6 +1473,7 @@ if(dictionary_flags2[0] & FLAG_ABBREV)
ChangeWordStress(tr,word_phonemes,3);
}


// dictionary flags for this word give a clue about which alternative pronunciations of
// following words to use.
if(end_type & SUFX_F)

+ 1
- 0
src/translate.h View File

@@ -183,6 +183,7 @@

// Punctuation types returned by ReadClause()
// bits 0-7 pause x 10mS, bits 12-14 intonation type,
// bits12-14 intonation type
// bit 15- don't need space after the punctuation
// bit 19=sentence, bit 18=clause, bits 17=voice change
// bit 16 used to distinguish otherwise identical types

Write Preview
Loading…
Cancel
Save