Browse Source

Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
master
Reece H. Dunn 10 years ago
parent
commit
e4a4ca28e1

+ 52
- 14
dictsource/en_list View File

@@ -18,12 +18,12 @@
// ?8 Use full vowel, not schwa in some word endings


// $alt1 use strong ending (-age, -an, -ance, -ate, -ative, -table, -ed, -eria, -et, -inal, -ier -mouth -on -or -ored, -ose, -s -y)
// $alt1 use strong ending (-age, -an, -ance, -ate, -ative, -table, -ed, -eria, -et, -i ,-inal, -ier -mouth -on -or -ored, -ose, -s -y)
// $alt2 use weak ending (ace, ain, an, ar*, ard, ate, ath, ell, ery, ess, et, ie, ile, ine, men, on, ot)
// $alt3 use weak first vowel, a->[a#], e->[@], o->[0#]
// $alt4 separate 'h', not 'th' 'ph' 'sh'; [t2] not [t]
// $alt5 remove only 's' from plural (-ies -is)
// $alt6 use strong first vowel (a-> [eI], e->[i:], i->[aI])
// $alt6 use strong first vowel (a-> [eI], e->[i:], i->[aI] y->[aI])
// $alt7 for the word "to", with $verbf, check that verb doesn't have 's' suffix


@@ -551,6 +551,7 @@ _90o n'aInti@
aaa $abbrev
abc $abbrev
ac $abbrev
acsi $abbrev
adf $abbrev
adhd $abbrev
adsl $abbrev
@@ -569,9 +570,12 @@ aph $abbrev
api $abbrev
apr apr@
asap $abbrev
aspca $abbrev
astm $abbrev
ati $abbrev
atk $abbrev
atm $abbrev
atsc $abbrev
atv $abbrev
avc $abbrev
avg $abbrev
@@ -584,6 +588,7 @@ ces $abbrev
cet $abbrev
cia $abbrev
cio $abbrev
ctia $abbrev
ctrl k@ntroUl
dept dI2pA@tm@nt
diy $abbrev
@@ -597,7 +602,7 @@ eff $abbrev
eg fO@Egz'aamp@L $only
(e . g .) fO@Egz'aamp@L
ept $abbrev
ersb $abbrev
esrb $abbrev
espn $abbrev
est $abbrev
etc Et'sEtr@
@@ -614,6 +619,7 @@ hiv $abbrev
ibm $abbrev
ibmtts $abbrev
icmp $abbrev
ietf $abbrev
iidc $abbrev
iis $abbrev
ie aIi:_! $pause $only
@@ -655,6 +661,7 @@ nypd $abbrev
nypsd $abbrev
nyse $abbrev
nyt $abbrev
ocd $abbrev
ocr $abbrev
odf $abbrev
oecd $abbrev
@@ -762,14 +769,15 @@ abstract a#bstr'akt $verb
academe a#kad@mi
acapela aka#p'El@
access aksEs
accompli a#k0mpl'i:
accouchement a#ku:SmO~
accusation akju:z'eIS@n
acer eIs3
acetylene a#sEt@li:n
accurate $alt2
accursed a#k3:sI#d
?5 accursed a#kVRsI#d
accuses a#kju:zI#z
accusation akju:z'eIS@n
acer eIs3
acetylene a#sEt@li:n
ached eIkt
achille a#kIli:
aching eIkIN
@@ -884,6 +892,7 @@ amok a#m0k
amoral eIm'0r@L
amore a#mo@reI
amount a#maUnt
amour a#mU@
amply amplI $verbf
amuck a#mVk
anal eIn@L
@@ -942,7 +951,7 @@ apropos apr@p'oU
appal a#pO:l
appall a#pO:l
appaloosa ap@l'u:s@
apparal $alt3
apparel a#par@L
apparatus ap@r'eIt@s
?3 apparatus ap@r'at@s
appropriate a#proUprI|@t
@@ -1095,6 +1104,7 @@ bifurcate $1
bigot bIg@t // -ed
bijou bi:Zu:
bikini bIk'i:ni
bikiny bIk'i:ni // -ed
binman bInman
bio baIoU
biome baIoUm
@@ -1227,7 +1237,7 @@ canonical $alt3
cantilever kantI#li:v3
canton kant0n
canvas kanv@s
capish ka#pi:S
capische ka#pi:S
capita kapIt@
capitol kapIt@L
capri ka#pri:
@@ -1242,8 +1252,10 @@ careen $alt3
career $alt3
caress k@rEs
carole kar@L
carotid $alt3
carouse ka#raUz
carpel kA@p@l
cartel kA@t'El
cascade $alt3
cashier kaS'i@3
cashmere kaSmi@3
@@ -1258,8 +1270,7 @@ catarrh k@tA@
caterer $alt6
cathedral $alt3
catholic kaTlIk
carotid $alt3
cartel kA@t'El
catsup katS@p
cavalier $alt1
caveat kavIat
?3 caveat kavIA:t
@@ -1433,6 +1444,7 @@ concise k0#ns'aIs
conclave $1
concourse $1
concubine $1
conde k0ndi
conduct $1
conduct $verb
cone koUn
@@ -1640,7 +1652,7 @@ diabetes daI|@b'i:ti:z
diablo di:'A:bloU
diabolo daI'ab@loU
diagnose $3
?3 dialog daI|@lO:g
//?3 dialog daI|@lO:g
dialysis daI'al@sIs
diameter daI'amI2t3
diaper daIp3
@@ -2290,6 +2302,7 @@ july dZu:l'aI
jumbalaya dZVmb@l'aI|@

kabaddi $alt3
kaboom $alt3
kalian kalj'A:n
kaput $alt3
karaoke karI'oUki
@@ -2593,8 +2606,6 @@ mujaheddin mUdZ@hId'i:n
multitude $1
multiplexer $1
mundane $2
murmur m3:m3
?5 murmur mVRm3
museum mju:z'i@m
muslim mUzlIm
mutate mju:t'eIt
@@ -2683,6 +2694,7 @@ ochre oUk3
o'clock @kl0k
octave 0ktIv
october 0kt'oUb3
octopi $alt1
oem oUi:'Em
oeuvre 3:vr@
?5 oeuvre VRvr@
@@ -2860,6 +2872,7 @@ pecan pI#kA:n
piecemeal p'i:sm,i:l
pier pi@3
pigheaded $2
pigpen $alt1
pigsty pIgstaI
pilau $2
pilot paIl@t
@@ -2886,6 +2899,7 @@ plaid plad
?3 plateau $2
platoon $alt3
playa plaI@
playpen $alt1
playtest $alt1
plaza plA:z@
plebeian pl@b'i:@n
@@ -3216,6 +3230,7 @@ satanic $alt3
satiric $alt3
saucepan sO:sp@n
saudi saUdi
saur saU3
saute sO:teI
?3 savant sa#vA:nt
savagery savIdZri
@@ -3331,6 +3346,7 @@ sir s,3: $only
?5 sir s,VR $only
site saIt // for sited
ski ski:
skier ski:3
skies skaIz
skied ski:d
skua sku:@
@@ -3361,6 +3377,7 @@ son sVn
sonar soUnA@
sonny sVnI
sooth su:D
sope soUpeI
souffle su:fl'eI
soundbite saUndbaIt
souvenir su:v@n'i@3
@@ -4044,11 +4061,13 @@ Eyjafjalla eIja#fjatla#
Faroe fe@roU
Faroes fe@roUz
Fermanagh f3:m'an@
Fayetteville feI@tvIl
Flores flo@rIz
Folkestone foUkstoUn
Fuego fweIgoU
Gabon gab0n
?3 Gabon ga#boUn
Galle gA:l@
Galveston galvI#st@n
Geneva dZ@ni:v@
Gdansk g@-dansk
@@ -4190,6 +4209,7 @@ Mineola mIni:'oUl@
Minneapolis mIni:'ap@lI2s
Minnesotan mI2nI2soUt@n
Missouri mIz'U@ri
Missouria mIz'U@ri@
Mizoram mI2zoUram
Mojave moUh'A:vi
Monaco m0n@koU
@@ -4223,8 +4243,10 @@ Niagara naI'agr@
Niagra naI'agr@
Nineveh nInIv@
Nocera noUs'i@r@
Nogales noUg'A:l@s
Noumea nu:m'eI@
Oahu oU'A:hu:
Oceania oUSI'A:ni@
Ochiltree 0k@Ltri
Oklahoma oUkla#h'oUm@
Ohio oUh'aIoU
@@ -4235,6 +4257,7 @@ Oman oUm'an
Oregon 0rI2g@n
Oriya O:r'i:@
Ottawa 0ta#w@
Ouagadougou $3
Ozark oUzA@k
Pacific $alt3
Pakhtunkhwa p@xtUnkwA:
@@ -4426,6 +4449,7 @@ Ares e@ri:z
Arianna arI'A:n@
Arnold A@n@Ld
Astley astli
Ayane eI'an
Baez baI'Ez
Bambi bambi:
Barack ba#rA:k
@@ -4446,6 +4470,7 @@ Brien braI@n
Caiseal kaS@L
Camille ka#mi:l
Candace kandIs
Carissa $alt3
Carol kar@L
Caroline kar@laIn
Calliope ka#laI@pi
@@ -4585,6 +4610,7 @@ Isaac aIs@k
Isabel Iz@bEl
isabela Iz@b'El@
Isaiah aIz'aI@
?3 Isaiah aIz'eI@
Isobel Iz@bEl
Isla aIl@
Isiah aIz'aI@
@@ -4638,6 +4664,7 @@ Loinnir lVni@
Lois loUIs
Louis lu:i
Louise lu:w'i:z
Luciano lu:tS'A:noU
Luigi lu:'i:dZi
Luis lu:Is
Lupe lu:peI
@@ -4701,9 +4728,11 @@ Naomi neI'oUmi
Napoleon $alt3
Natalie nata#li
Natasha $alt3
Nathalie nat@li
Nathan $alt6
Nathaniel $alt3
Neville nEvIl
Nicci nIki
Nicholas nIk@l@s
Nicola nIk@l@
Nicole $2
@@ -4807,6 +4836,7 @@ Wallace w0lI#s
Wally w0li
Wilhelmina wIlh@lm'i:n@
?3 William wIlj@m
Wyatt waI|@t
Yerevan jEr@v'an
Yves i:v
Yvonne $2
@@ -4844,6 +4874,7 @@ Cohen koU@n
Compton k0mpt@n
Connelly k0n@li
Connolly $1
Coor kU@
Corazon kO@r@z0n
Cortez $2
Cthulhu k@-Tu:l#u:
@@ -4853,6 +4884,7 @@ Damocles dam@kli:z
(da vinci) da#vIntSi
Dante dA:nt2eI
?3 Datsun dA:ts@n
Decatur dI#keIt3
Degas deIgA: $capital
Desiree dI2zi@reI
?3 Desiree dEz@r'eI
@@ -4868,9 +4900,11 @@ Dolce d0ltSeI
Dolittle du:lIt@L
Donatello d0n@t'EloU
Douglass $alt2
Drysdale $alt6
Dulles dVl@s
Dupuis du:pw'i:
Dvorak d@-vo@Zak
Earp 3:p
Emory Em3ri
exxon Eks0n
Ferguson f3:g@s@n
@@ -4886,6 +4920,8 @@ Gandhi gA:ndi
Garcia gA@si@
?3 Garcia gA@s'i:a#
Genghis dZENgIs
geico gaIkoU
gevalia dZ@vA:li@
Ghandhi gA:ndi
Gibson gIbs@n
Godzilla g0dz'Il@
@@ -5003,6 +5039,7 @@ Ruiz ru:'i:z
Sachs saks
Sanchez santSEz
?3 Sara se@r@
Scalia ska#li:@
scheherazade S@hEr@zA:d
Seymour si:mo@
Shakur Sa#kU@
@@ -5509,7 +5546,8 @@ wherever $text whereever


an a#2n $nounf $only $u
(a la) ,ala
(a la) ,A#la
(à la) ,A#la
the D@2 $only $nounf
(a while) a#||waIl // no pause
(the while) D@2||waIl

+ 14
- 3
dictsource/en_rules View File

@@ -118,6 +118,7 @@
sw) a (g a
a (hA_ 'A:
ah (K A:
ah (y ah
ahr (_N A@
&) ah (_ @
m) a (hog @
@@ -354,7 +355,6 @@
m) acro (@ akr@
ac (rum_ 'eIk
_) ac (t ak
ac (tory 'ak
actu (A aktSu:
ac (ture 'ak
ac (um ak
@@ -2114,7 +2114,6 @@ _it_separ) ate (_ @t
cel) e (bra @
e (bria i:
_) e (bulli %I
t) ech E2k
m) e (chanic I
sp) e (cial E
sp) e (cies i:
@@ -2286,6 +2285,7 @@ _it_separ) ate (_ @t
l) eath ED
br) ea (th E
br) eath (e i:D
&) ea (te_ i:eI
cr) ea (t i:'eI
cr) ea (tic i:a
gr) ea (t eI
@@ -2497,6 +2497,7 @@ _it_separ) ate (_ @t

.group en
_) en (@ %En
en (_$w_alt1 En
chick) en In
en (a_ 'i:n
en (al_ i:n
@@ -2913,6 +2914,7 @@ _it_separ) ate (_ @t
et (itor 'Et
_) et (r I2t
m) etre i:t3
om) eter (_ =It3
m) etry (_ =@tr%i
&) ett (_ I2t
subn) et E2t
@@ -3174,6 +3176,7 @@ _it_separ) ate (_ @t
.group i
i I
i (_ i
i (_$w_alt1 aI
ntell) i I
_) i' %aI
X) i ($w_alt6+++ aI
@@ -4917,6 +4920,8 @@ multip) ly laI
or (um_ 'o@r
&) ory (_ @ri
?3 @@At) ory (_ ,o:ri
ct) ory (_ =@ri
ct) orily (_ =@r@li
_st) ory o@ri

.group os
@@ -5020,7 +5025,8 @@ multip) ly laI
d) ouch u:S
b) ou (d u:
ou (f u:
d) ou (g V
_d) ou (gK V
d) ou (g u:
r) ouge u:Z
_) ough O:
ough (t O:
@@ -5909,6 +5915,7 @@ multip) ly laI
t (ap_ t2
ie) t (ary_ t2
A) tch tS
tech t2E2k
@) tek (_S3 tEk
_) tele tElI2
_) tera tEr@
@@ -5990,6 +5997,7 @@ multip) ly laI
n) th (er+ T
therap TEr@p
th (erm+ T
_) thermo T3:moU#
ca) th (eri T
_e) th (er T
th (ern_ D
@@ -6074,6 +6082,7 @@ multip) ly laI

.group u
u V
X) u (Cy_ u:
man) u ju:
_sol) u (C ju:
u (CA ju:
@@ -6370,6 +6379,7 @@ contin) u ju:
&g) ur (_ 3
&h) ur (_ 3
&m) ur (_ 3
murm) ur 3
&p) ur (_ U@
sp) ur (_ 3:
?5 sp) ur (_ VR
@@ -6509,6 +6519,7 @@ contin) u ju:
y (C_ I
y (CC I
XoB) y (@+ I
X) y ($w_alt6+ aI
_) y (C@ I
_) y (n@ V
_) y (s@ V

+ 9
- 0
dictsource/es_list View File

@@ -152,6 +152,7 @@ _16o DeTimos'Ekst
_17o DeTimos'Eptim
_18o DeTimOkt'aB
_19o DeTimonoB'en
_20o Bix'Esim
_2Xo Bix'Esim
_3Xo trix'Esim
_4Xo kwaDrax'Esim
@@ -162,6 +163,14 @@ _8Xo Oktox'Esim
_9Xo nonax'Esim
_0Co TEnt'Esim
_1Co TEnt'Esim
_2Co duTEnt'Esim
_3Co triTEnt'Esim
_4Co kwaDriNxEnt'Esim
_5Co kiNxEnt'Esim
_6Co seksTEnt'Esim
_7Co sep:tiNxEnt'Esim
_8Co OktiNxEnt'Esim
_9Co noniNxEnt'Esim
_0M1o mil'Esim



+ 121
- 18
dictsource/it_list View File

@@ -1,5 +1,5 @@
// This file is UTF-8 encoded
// Updated 2014 August 18 by Chris, Christian Leo M, <[email protected]>
// Updated 2014 october 22 by Chris, Christian Leo M, <[email protected]>

// $alt change [e] or [o] in the stressed syllable to [E] or [O]
// $alt2 change [E] or [O] in the stressed syllable to [e] or [o]
@@ -291,7 +291,7 @@ _16 s'editSi
_17 ditSas:'Et:e
_18 ditS'Ot:o
_19 ditSann'ove
_2X v'entj
_2X v'entI
_21 v'ent'uno
_23 ventit@-*'e
_24 ventikw'at:@-*o
@@ -321,6 +321,46 @@ _dpt v'i@-*gola
_0Z3 mill'ezimi // 1000ths
_roman @-*Om'ano

// ordinal numbers
_#º 'Ezimo // ordinal suffix
_#ª 'Ezima
_x#º o // suffix for 1 - 10
_x#ª a

_1ox p@-*im
_2ox sekond
_3ox tE@-*ts
_4ox kw2a:@-*t
_5ox kw2int
_6ox sEst
_7ox sEt:im
_8ox ot:av
_9ox non
_10ox d'EtSim

_1o un
_2o du
_3o t@-*e
_4o kw2at:@-*
_5o tSinkw2
_6o sEj
_7o sEt:
_8o Ot:
_9o nOv
_20o vent
_30o t@-*'ent
_40o kua*'a:nt
_50o tSinkw2'ant
_60o sess'ant
_70o set:'ant
_80o ot:'ant
_90o nov'ant
_0Co tSEnt
_0M1o mil
_1M1o mil



// abbreviations

abc a||bi||tS'i
@@ -344,7 +384,7 @@ ipa i||pI||'a:
mr mIster $hasdot $dot
nvda $abbrev
ocr o||tSi||'ER*e $only
ok ok'eI
ok ok'eI $only
olp o||el:e||p'i
omg o||em:e||dZ'i
prof $hasdot $dot
@@ -356,13 +396,14 @@ srl $abbrev
st $dot
uic u||i||tS'i
uk $abbrev
unicef $1
url u||eR*e||'El:e $only
usb $abbrev
www v,u||_vu||_v'u
xml iks||em:e||'El:e

// articles
i $u+ $only
i $u+ $only $nounf
il $u $only $nounf
la $u+ $only
le $u+ $only
@@ -646,25 +687,31 @@ backup bek'ap
bancomat $1
banner $1 $onlys
barbecue _^_FR
beat _^_en $only
beep b'i:p
beige b'E:Z
bestseller b'Est[_||s'el:e@-*
birthday b'e/:rt[||d,ei
bitter $1
blackout bl'Ek'aUt
blues bl'u:z
boiler $1
bonjour b,O:_Z'u:r // _^_fr
boom bum
bordeaux _^_FR
boutique but'i:k
boxer $1
braille b@-*ail:
brandy b@-*'E:ndI
bricolage b@-*ikol'aZ
browser b@-*'a:UzE@-*
buffer b'afe@-*
bouquet _^_FR
bulldozer $2
bunker $1
business _^_EN
by b'aI $only
bye _^_EN
byte _^_EN
camper $1
caterpillar $1
@@ -699,6 +746,7 @@ corner $1
couscous k,us||k'us
cover $1
cracker $1
club kl'a/:b $onlys
database datab'Eiz
deejay _^_EN
default _^_EN
@@ -745,11 +793,15 @@ freezer f@-*'idzE@-*
fuji fu:ZI
gangster $1
garage gaR'aZ
general $1 $onlys
generation dZeneR'ES@n $onlys
geyser g'aIzE@-*
ginger $1
gmail dZI||m'eil
girl _^_EN
google _^_EN
green g@-*i:n $onlys
guinness g'ines:
hacker 'ake@-*
hamburger hamb'u@-*ge@-*
happy _^_EN
@@ -759,7 +811,8 @@ hitler $1
home hO:m
hospital $1 $alt
hotel $2
hunter $1
hunter 'ha/nte@-* $onlys
hunt _^_en $only
iceberg 'aIs||b,e@-*g
impeachment imp'itSm,ent[
installer inst'a:l:e@-*
@@ -784,6 +837,7 @@ killer $1
lady l'E:dI
laser $1
leader lidE@-*
league _^_en
line l'aIn $only
live l'aIv
login l'Og||In
@@ -810,6 +864,7 @@ mister $1 $onlys
mixer $1
monitor $1 $onlys
monsieur _^_FR
motor $1 $alt $onlys
mouse maus
new _^_EN
newsletter njuzl:'et:e@-*
@@ -819,7 +874,7 @@ nomination nomIn'eSon
nonchalance non_Sal'ans
nylon n'aIlon
office _^_EN
one w'a/n $onlys
one w'a/n $onlys $capital
online ,on||l'aIn
order $1
oscar $1
@@ -833,14 +888,14 @@ performer $2
play pl'EI
player pl'eIE@-*
pointer $1
poker $1
poker $1 $alt
portacontainer $4
poster $1 $onlys
power p'a:|we@-*
premier $1
privacy p@-*'aivazi
project p@-*'odZet
provider p@-*ov'aide@-*
provider p@-*ov'aide@-* $onlys
pullover $2
puzzle p'atsol
python _^_EN
@@ -848,16 +903,19 @@ quechua k'etSua
radar $1 $onlys
raider $1
ranger @-*'endZe@-*
reader @-*'idE@-*
reader @-*'i:dE@-*
recorder $2 $onlys
reporter $2 $onlys
reportage @-*epo@-*t'a:Z
revolver $2
residence @-*'Ezidens $onlys
revolver $2 $onlys
rockefeller @-*Okf'el:e@-*
rocker $1
router @-*'ute@-*
round @-*'awnd $onlys
router @-*'u:te@-*
routine @-*Ut'iN
rover $1 $only
saver _^_en $onlys
scanner $1
schiller $1
schopenhauer _^_EN
@@ -866,6 +924,7 @@ scuter $1
scorpion $1 $onlys
scotch sk'OtS
screen sk@-*'i:n
screenreader sk@-*'i:n||@-*'i:de@-*
seller $1 $onlys
server $1 $onlys
setter $1 $onlys
@@ -874,6 +933,7 @@ shaker $1
shampoo S'a:mpo
shuttle S'a/tOl
sky sk'aI
single s'ing,Ol $onlys
sister $1 $onlys
sitar $1 $only
sitter $1 $onlys
@@ -885,6 +945,7 @@ smiley _^_EN
snack _^_EN
software s'Oft[_we@-*
sonar $1 $only
streaming _^_EN
street _^_EN
souvenir suvEn'i@-*
spanish _^_EN
@@ -946,8 +1007,9 @@ wireless _^_EN
wow w'a:u
writer v@-*'aIte@-*
yahoo _^_EN
yacht j'Ot[
yoghourt 'jogurt
zoom dz'u:m
zoom dz:'u:m
zoster $1

rock'n'roll @-*,Oken@-*'o:l
@@ -1454,7 +1516,6 @@ vacuolo $3
vagin $2
vegano $2
veget $1 $alt
vergini $1
vernic $2
vesciche $2
vestiboli $2
@@ -1468,6 +1529,7 @@ vocaboli $2
voragini $2
vuot vu'O:t

cos'è koz'E
l'ancora l'ankoRa
(in balia) in||bal'i:a
(principi attivi) p@-*intS'i:pI||at:'ivI
@@ -1501,6 +1563,7 @@ amsterdam $1
atene $2
avezzano $3
azerbaijan a@-*dz,eb,ajdZ'an
azerbaigian $5
azzano $2
barbagia ba/@-*b'adZa/
barisciano $3
@@ -1525,9 +1588,10 @@ brooklyn b@-*'u:klin
brusciano $2
bruxelles b@-*uks'El:
bruzzano $2
bucarest $1
bucciano $2
bulgare $1
cagliari $1
cagliari k:'al^,a/RI
calestano $3
calizzano kalits:'ano
calvizzano $3
@@ -1535,6 +1599,7 @@ cambridge _^_EN
camerun $1
campidano $3
campobassano $4
canyon k'EnIon
caporciano $3
caracas $2
carbognano $3
@@ -1608,12 +1673,14 @@ hamas $2
haiti a'i:ti
haitian aiti'an
hawaii aw'a:i:
helsinki $1
hollywood _^_EN
huligano $3
ilbono $2
imperia $2
indonesia $3
indostano $3
janeiro Zan'E:iRo
jerzu j'E@-*tsu
jonio j'Onio
jugoslav jugozl'a/v
@@ -1627,6 +1694,7 @@ laterano $3
leverano $3
libano $1
liberia $2
liverpool l'ive@-*pul
lizzano lits:'ano
longano $2
lungadige $2
@@ -1677,6 +1745,7 @@ muzzano $2
napoli $1
nazzano $2
nevano $2
newyorkes nI,u||io@-*k'Ez
niger $1
nizzano nits:'ano
nocciano $2
@@ -1733,6 +1802,7 @@ rofrano $2
rognano $2
rosciano $2
rossano $2
rotterdam $1
rotoplano $3
rozzano $2
rusticiano $3
@@ -1824,8 +1894,11 @@ alejandro _^_ES
alessia $2 $capital
alexander $3
alzeimer alts'aime@-*
alzheimer alts'aIme@-*
amelia $2 $alt2
amerigo $2
amicis $2
anderson $1
andreina and@-*e'i:na
andromeda $2
anita $2
@@ -1841,6 +1914,7 @@ brandon b@-*'Endon
brian b@-*'aian
caino ka'i:nO
camilleri $3
carey _^_en
carmelo $2
cassano $2
catia k'a:tia
@@ -1850,9 +1924,11 @@ charlie tS'a@-*li
charlotte Sa@-*l'Ot
chevalier _^_FR
chopin Sop'EN
churchill _^_en
christie k@-*'istI
christofer $1
christopher $1
chrysler _^_EN
danilo $2
debor $1 $alt
deborah $1 $alt2
@@ -1870,6 +1946,7 @@ felicita $2
ferrero $2
francisco f@-*ans'isko
françois f@-*,a/NsU'a
frederic $1
galilei galil'E:j
garcía _^_ES
gavino $2
@@ -1912,9 +1989,11 @@ luciano $2
ludovic $3
luigi lu'i:dZI
luigia lU'i:dZa
manolo ma/n'Olo
manzon m,andz'On
margaret $1 $only
margareth $1 $only
maria m,a/R'i:a
mariah $2
mariangel $3
mariapaola maRIap'aola
marilyn m'E:r*ilIN
@@ -1923,7 +2002,7 @@ michael m'aIkOl
michelangel $3
mike _^_EN
monroe m'On||r,ow
morrissette m,OR*iz'Et[
morissette m'ORIsEt[
mozilla m,o|dz'il:a
murgia $1
nancy n'E:nsI
@@ -1940,9 +2019,11 @@ piernicola $3
pierpaol pje@-*p'aUl
poirot puaR'o
potter $1 $onlys
presley p@-*'e:zleI
ray @-*'eI
rizzo @-*'its:O
rizzoli @-*its:'OlI
rocky @-*'Oki
roger $1 $alt
ryanair @-*'aIaneR
sandoval $3
@@ -1965,6 +2046,7 @@ stefano $1
steven st'iven $onlys
tamara $2
taylor t'EIlo@-*
tiffany $1
tyson t'aIzon
wagner v'agnE@-*
vainer v'aIne@-* $only
@@ -1982,6 +2064,7 @@ zaccaria $3

// Unit of measure

ampere $2 $alt2
millesim $alt
millimetr $2
millilitr $2
@@ -2022,6 +2105,8 @@ accadere $3 $alt2
accampano $2
accecano $2
accechino $2
accelerano atS:'E:l,eRano
acceler atS:'E:l,ER
accentuano $2
accertano $2
accettino $2
@@ -2086,6 +2171,7 @@ alloggino $2
allontanino $3
allontano al:ont'ano
alter $1
alterano $1
alzano $1
alzino $1
amano $1
@@ -2147,7 +2233,7 @@ attirano $2
attirino $2
attonit $2
augura $1
augurano $3
augurano $1
auguro $1
aumentino awm'Entino
auspicano $1
@@ -2203,6 +2289,7 @@ causano $1
celebr $1
celebrano $1
censurano $2
censurati $3
chiaccherano $1
chiamano $1
chiamino $1
@@ -2407,6 +2494,7 @@ esitano $1
espatriano $2
esplicitano $2
esplod $2
esplodano $2
esplorano $2
esprimano $2
espugnano $2
@@ -2417,6 +2505,8 @@ evaporano $2
evidenziano $3
evit $1
evitano $1
evoc $1
evochi $1
fantasticano $2
faticano $2
fatturano $2
@@ -2696,12 +2786,13 @@ mugugnano $2
muoiano $2
muoviti $2
mutano $1
naquero $1
narrano $1
nauseano $1
navig $1
navigano $1
navighi $1
necessita $2
necessit $2
necessitano $2 $alt
negal $1
neglige negl'idZe
@@ -2725,6 +2816,7 @@ orizzontarono oRidz:ONt'a:ROno
oscillano $2
ospitano $1 $alt
ossequiano $2 $alt
osservino $2
ossidano $1
ossigenano $2
ostacolano $2
@@ -2759,6 +2851,7 @@ pesano $1
pettegol $2
pettinano $1
piac pj'atS
piantano $1
pigia $1
pigiano $1
pignorano $2
@@ -2866,6 +2959,7 @@ replicano $1
reputa $1
reputano $1
respirano $2
restaurano $2
riabbandono $4
riabbono $3 $alt2
riabbottono $4
@@ -3102,6 +3196,7 @@ situano $1
sloggiano $1
smascher $1
sniffano $1
snodano $1
socializzino $3
soddisfano $2
soddisfino $2
@@ -3382,13 +3477,16 @@ batterlo $1
cancellami $2
carical $1
cercasi $1
compil $2
comunical $2
contattaci $2
contattami $2
copial $1 $alt
curati $2
costituitosi $4
dedical $1
digitalo $1
dirigerl $2
dirigersi $2
distrugerne $2
domandatel $3
@@ -3397,6 +3495,7 @@ giuravi $2
guardaci $1
guidaci $1
impostaci $2
insegnagli $2 $alt
intonaci $2
invaghitosi $3
lasciataci $2
@@ -3425,7 +3524,10 @@ regalavi $3
restatene $1
riceverne $2
ricordati $2
rieccoci $2
rieccomi @-*i'e:k:Omi
rieccoti $2
rieccol $2
rincorrerl $2
ripeterl $2
ripetersi $2
@@ -3446,6 +3548,7 @@ spoglial $1 $alt
spogliati $1 $alt
stabilitosi $3
svuotalo $2 $alt2
trattasi $1
usal 'u:za/l
vendesi $1 $alt
verificatasi $4

+ 38
- 68
dictsource/it_listx View File

@@ -1233,7 +1233,7 @@ diaconia $4
diadem $alt
diagnosi $1
dialett $alt
dialisi $2
dialisi dI'a:lizi
diametr $1
diapason $1
diarchia $3
@@ -1285,7 +1285,6 @@ discotec $alt
discredit $2 $alt2
disistim $3
dislessia $3
disonesta $4
dispareunia $5
dispari $1
dispendi $alt
@@ -1709,8 +1708,6 @@ forcine $2
forcol $alt2
forfor $1 $alt2
forgia $1
fori $alt $only
fori $2
formic $2
forn $alt2
forr $alt2
@@ -1738,17 +1735,15 @@ franchigia $2
franciacort $alt2
francoboll $alt2
frassin $1
fraternita $4
frattemp $alt
freccette $alt2
fredd $alt2
fren $alt2
frigia $1
frod $alt
frode $alt
frumenzi $alt
fruscii f@-*uS'i:j
fruscio f@-*uS'i:o
fruscio f@-*uS'i:o
fruttosi $alt
fucile $2
fucine $2
@@ -1783,7 +1778,6 @@ garofan $2
garzon $2
gasdott $alt2
gaudenzi $alt
ge $alt
gebel $alt
gec $alt
gemin $1
@@ -1840,7 +1834,7 @@ giuria $2
gladiol $2
glaucofane $3
gleb $alt
glia l^'i:a
glia gl'i:a
glicemiche glitS'emike
glicemie glitSem'i;e
glicerin glitSe*'in
@@ -1864,7 +1858,6 @@ glucosi $alt
gluteo $1
gnom $alt
gnome $alt
gogo $2 $alt
gol $alt
golasecc $alt2
goleador $4
@@ -1915,7 +1908,6 @@ guspini $1
gutei $2
hellas $2
heracleopolis $3 $alt2
herve $2
hieron $2
hiroshima $3
honore $3
@@ -1955,10 +1947,13 @@ imenofor $3
imenotteri $alt
imol $1
imperfett $alt
imperi $2
impet $1
impieg $alt
implicit $2
incazzati inkats:'ati
incendi $alt
incerti $2 $alt
incentr $alt
incivil intSiv'il
incognit $2 $alt
@@ -1978,7 +1973,8 @@ indomit $2
inedia $alt
inedit $2
inett $alt
infamia $2
infamie $2
infamia $2
infantil $3
infedele $alt2
infer $1
@@ -2097,7 +2093,6 @@ kore $2
krakow $2
kurumb $1
labar $1
lacche $2 $alt
lachete $alt
laconi $1
laigueglia $alt
@@ -2134,7 +2129,7 @@ lemn $alt
lemure $1 $alt
lemuri $1 $alt
lena $alt2
leo $alt2
leo $alt
leon $alt2
leonzi $alt
leopold $alt
@@ -2160,10 +2155,7 @@ leuc $1
leuci $1
levanz $1 $alt
leve $alt
levita $3
liber $1
liber $1
liberi $1
licantrop $2
licomede $alt
liet $alt
@@ -2175,8 +2167,7 @@ limassol $3 $alt2
limen $1
limin $1
limitrof $2
limon $2
limone $alt
limon $2 $alt2
limousine limuz'iN
linfonod $3 $alt
linguine $1
@@ -2248,13 +2239,13 @@ malag $1
malapen $alt2
malavoglia $alt
malcesine $2 $alt2
male $alt
malebolge $alt
malesia $2 $alt
malessere $alt
malevol $alt
malia $2
malinconia $4
malinconia $4
malinconie malinkon'iE
malincuore $alt
mallare $1
mallofagi $2
@@ -2566,6 +2557,7 @@ naumachia $4
nausea $1
nausee $1
nauseo $1
ndrangheta $1
neb $alt
nebul $alt2
necchi $alt
@@ -3035,6 +3027,7 @@ poe $alt
poem $alt
poet $alt
poggi $alt
poggiagomit $3
pol $alt
polarimetr $3
polc $alt
@@ -3130,6 +3123,7 @@ prensile $alt
prepost $alt2
presbite $1 $alt
presbiter $2
presenil p@-*e||sen'il
presepi $alt
press $alt
prestit $1
@@ -3553,6 +3547,7 @@ semibreve $alt
semicerchi $alt2
semidi $3
semin $1 $alt2
semini $2 $noun
semiopac semIop'ak
semirett $alt
semol $1
@@ -3601,6 +3596,7 @@ sfoglia $alt
sfregi $alt
sgomber $1
sguizzare zgwIts:'aRe
shh hS:_
sibari $1
sidereo $2
siepe $alt
@@ -3800,6 +3796,8 @@ subconsci $alt
subfebbril $3
subito $1
suddiacon $2
sudicia $1
sudicio $1
suddit $1
sudest $2
sudicie $1
@@ -3846,11 +3844,8 @@ tartaree $2
tartareo $2
tartari $1
tassametr $2
tassi $2
tatar $1
tatari $1
taurianov $alt
te $alt
tec $alt
technicolor $alt
teck $alt
@@ -3860,12 +3855,11 @@ teco $alt2
tedofor $2
teetet $alt
tegol $1
tegu $2
teista tE'ista
teistiche te'Istike
tel $alt2
telecamer $3
telef $1
telefax $1
telefilm $3
telefon $2 $alt
telegon $2 $alt
@@ -3880,7 +3874,6 @@ temi $alt
temistocle $2
temnospondili $alt
temp $alt
tempe $alt
temper $1 $alt
temperie $2
tempi $alt
@@ -3888,7 +3881,6 @@ templ $alt
tempor $alt
tempor $1
tempr $alt
temu $2
tenebr $1 $alt
tened $1 $alt
tenera $1 $alt
@@ -3932,7 +3924,7 @@ teser $1
tesi $alt
tespi $alt
tessile $alt
testimone $alt
testimon $alt
tetan $1 $alt
tetraedr $alt
tetraetil $4
@@ -3982,13 +3974,13 @@ ton $alt
toni $alt
tonn $alt2
top $alt
tora $2
torb $alt2
torbid $alt2
torbole $alt2
torchiarol $3
tord $alt2
torn $alt2
tornei to@-*n'E:I
tornabuoni $alt
tornarecci $alt
torni $alt2
@@ -4001,8 +3993,7 @@ tosse $alt2
tot $alt
totan $1
totem $alt
toto $alt
toto $2
toto $2 $alt
totogol $3
tournee $alt2
trabea $1
@@ -4030,20 +4021,17 @@ tredicesim $alt
tredici $alt2
tremil $2
trentaduesim $alt
trentasei $3
trentenni $alt
trentasei t@-*entas'EI
trentenn $alt
trentesim $alt
treppiede $alt
tres $alt
treppied $alt
tres $alt
tresette $alt
tressette $alt
tresette t@-*es'Et:e
treveri $1 $alt
treves $alt
treviri $1
trevisan $3
triac $1
triade $1
triathlon $1
tribu $2
tricesim $alt
@@ -4073,7 +4061,6 @@ troclea $1
trombocitopenia $6
trot $alt
trov $alt
trovarobe $alt
truffaldine $3
tuber $1
tunisi $1
@@ -4090,7 +4077,6 @@ tuttosport $3
tutu $2
ubbriac $3
ubbriache ub:@-*I'ake
uberta $3
ubold $alt
ubriac $3
ucronia $3
@@ -4133,50 +4119,42 @@ valsassin $2
valsecc $alt2
valsesia $2 $alt
vandal $1
vandali $1
varen $alt2
varenn $alt2
vate $2
vazzol $2
vecchia $alt
vedov $1
vegli $alt
veicol vE'ikol
vel $alt2
vel $alt2
velen $alt2
velletri $alt2
velocipede $3
velociped $3
ven $alt2
venaria $3
venceslao $3
vendit $1
venere $alt
vener $1 $alt
venet $1 $alt
veneti $1 $alt
ventenni $alt
ventenn $alt
ventesim $alt
ventiquattresim $alt
ventisette $alt
ventisette ventis'Et:e
ventol $alt
ventre $alt
ventriloqua $2
ventriloque $2
ventriloqui $2 $only
ventriloquo $2
venusta $3
vepre $alt
ver $alt2
ver $alt2
verde $alt2
verd $alt2
verg $alt2
vergine $alt2
verne $2
vergin $1 $alt2
verolanuov $alt
veroli $1
verosimil veRo||s'imil
vertebr $1
vertebre $1
vertov $1
verz $alt2
verzegnis $alt
@@ -4224,15 +4202,11 @@ visit $1
vitrea $1
vitree $1
vitreo $1
vitreo $1
vittoria $alt2
viveri $1
vo $alt
vobbia $alt
vocii votS'i:j
vodk $alt
voglia $alt2
voivod $alt
volere $2 $alt2
volg $alt
voll $alt2
@@ -4245,25 +4219,22 @@ volv $alt
vomer $1
vomit $1
vosgi $alt
vot $alt
voti $alt
vot $alt2
vulture $1
wattor $alt2
wilanow $3
wuchereria $3
xenia $3
xenoglossia $4
xilem $alt
yahweh $2
yahweh jav'E
yaounde $4
yod $alt
yog $alt
zagar $1
zagarol $3
zaira dza'i:Ra
zambesi $alt
zambes $alt
zandobbi $alt
zane $2 $alt
zanobi $alt
zapotechi $alt
zarevic $alt
@@ -4282,17 +4253,16 @@ zet $alt
zeugm $1
zevi $alt
ziggurat $1
zigote $alt
zigot $alt
zigotteri $alt
zingar $1
zizzanie dzidz:'anie
zoccol $alt
zoe $alt
zon $alt
zone $alt2
zoofilia $4
zoppia $2
zoppie dzop:'i:e
zoppol $alt
zuccari $1
zuccher $1
zuccher dz:'U_k:eR

+ 4
- 3
dictsource/it_rules View File

@@ -1,6 +1,6 @@
// Italian translation rules
// This file is UTF-8 encoded
// Last update: 2014 August 18 by Chris <[email protected]>
// Last update: 2014 October 22 by Chris <[email protected]>
// letter groups
// A any vowel
// C any consonant
@@ -78,12 +78,13 @@
_) c' (P2t tS
@@A) ce (A_ =tSE
ciano (_ =tSano // verbs
cciano (_ =tS:ano // verbs
cciano (_ =tS:ano
chiano (_ =kiano
A) cchiano (_ =k:iano // verbs
A) cchiano (_ =k:iano
ceder (L04_ tS'Ede@-* // Pron.s verbs
cceder (L04_ tS:'Ede@-*
in) cer (L04_ =tSe@-*
cuocer (L04_ kU'OtSe@-*
_L04Z) capit (A_ k'a:p,it
_L04Z) capit (ano_ k'a:p,it
correr (L04_ k'o:R*eR

+ 3
- 2
dictsource/pt_list View File

@@ -674,7 +674,6 @@ jamais $u+ $verbf
// $alt changes stressed [e] or [o] phoneme to open [E] or [O]
// $alt2 changes stressed [E] or [O] phoneme to close [e] or [o]

abordo $alt
aborto $alt $verb
abortos $alt2
absorta $alt2
@@ -754,7 +753,6 @@ bolero $alt
bolo $alt2
bolo $alt $verb
borboleta $alt2
bordo $alt
borra $alt2 $noun
boto $alt2 $noun
boxe $alt
@@ -860,6 +858,7 @@ crimeia $alt
decoreba $alt
decoro $alt2 $noun
degelo $alt2
desacerto $alt2
desaforo $alt2
desamores $alt2
desapego $alt2
@@ -1195,6 +1194,7 @@ remoem $alt
remorso $alt
renovo $alt $verb
represa $alt2
represes $alt
retorno $alt $verb
reveses $alt
rigores $alt2
@@ -1287,6 +1287,7 @@ trocha $alt2
troco $alt2 $noun
tropa $alt
tropeço $alt2 $noun
tropeços $alt2
trombeta $alt2
ureia $alt
vanessa $alt2

+ 1
- 0
dictsource/pt_rules View File

@@ -982,6 +982,7 @@ _redar) gu (A gw
_ortod) o (xL08_ O
_arr) ox (A OS
_B) o (jo_ o
b) o (rdo_ O
C) o (smA_ O
_g) o (zL04_ O
_alm) o (çL01_ O

+ 5
- 2
dictsource/ta_rules View File

@@ -695,6 +695,7 @@ _மன்மதக்) க (ுகை g
_கோபி) க kV#
_ஸ்டா) க kV#
_ஜமாய்) க kV#
_சு) க(ி_சிவ k
_வெங்) கட kVt.V#
அலை) க (டல kV
_முட்) க (டிகார gV
@@ -840,7 +841,6 @@ _தொன்ம) க (ால k
ஆ) க (ாஷ k
_கல்) க (ி k
வால்மீ) க (ி k
_சு) கி (_சிவ k
_ம) க (ிந்த H
மோ) க (ினி H
_ம) க (ிமை H
@@ -1725,6 +1725,7 @@ _செண்) டிமெண்ட t.imen.t.V#
_) டி (யூப t.
_) டி (யூஷன t.
_ராஷ்) டி (ர t.
இராஷ்) டி (ர t.
_மL06ாராஷ்) டி (ர t.
_) டிரக் t.rVk
_) டி (ரங் t.
@@ -2101,7 +2102,7 @@ _லெஃப்) ட் (ல t.
_) த (னுச dV
_) த (னுர dV
_) த (னுஷ dV
_ஜன்_) த (ன் d
_ஜன்_) த (ன் dV
_) த (ன்மந்திரி dV
_) த (ன்ய dV
_) த (ன்ராஜ dV
@@ -3833,6 +3834,7 @@ _பெனசீர்_) ப (ுட்டோ b
_) ப (ேட்ஸ்மேன b
_) ப (ேதமி b
_) ப (ேதமு b
_) ப (ேதம் b
_) ப (ேதி b
_) பேனட் be:nVt.
_) ப (ேனர b
@@ -4795,6 +4797,7 @@ _வெளி) ப்பி (ரகார pp
_மலை) ப்பி (ரசங்க pp
_மலை) ப்பி (ரசங்க pp
_சண்ட) ப்பி (ரசண்ட pp
_தலை) ப்பி (ரசவ pp
L03) ப்பிரச (ார pprVtS
_கை) ப்பி (ரசுர pp
_துண்டு) ப்பி (ரசுர pp

+ 35
- 0
phsource/ph_aragon View File

@@ -28,3 +28,38 @@ phoneme O
FMT(vowel/oo_4)
endphoneme



phoneme k
vls vel stop
lengthmod 2
voicingswitch g
Vowelin f1=0 f2=2300 200 400 f3=-100 80
Vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20

IF nextPh(isPause2) THEN
WAV(ustop/k_)
ELIF nextPh(#i) OR nextPh(;) THEN
WAV(ustop/ki_unasp2, 30)
// ELIF nextPh(isRhotic) THEN
// WAV(ustop/kr)
// ELIF nextPh(l) THEN
// WAV(ustop/kl)
ENDIF
WAV(ustop/k_unasp2, 25)
endphoneme


phoneme t
vls dnt stop
lengthmod 2
voicingswitch d
Vowelin f1=0 f2=1600 -300 300 f3=-100 80
Vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20
IF nextPh(isPause2) THEN
WAV(ustop/t_dnt, 25)
ENDIF
WAV(ustop/t_unasp3, 50)
endphoneme



+ 4
- 4
phsource/ph_english_us View File

@@ -137,7 +137,7 @@ endphoneme

phoneme 0
vowel starttype #a endtype #a
length 200
length 220
ipa ɑː
ChangeIfDiminished(@)
IF nextPh(r) THEN
@@ -171,7 +171,7 @@ endphoneme

phoneme A:
vowel starttype #a endtype #a
length 200
length 220
IF nextPhW(r) THEN
FMT(vwl_en_us/aar)
ENDIF
@@ -208,7 +208,7 @@ endphoneme

phoneme i:
vowel starttype #i endtype #i
length 170
length 180
IfNextVowelAppend(;)
FMT(vowel/i_en)
endphoneme
@@ -216,7 +216,7 @@ endphoneme

phoneme O:
vowel starttype #o endtype #o
length 200
length 220
ChangeIfDiminished(@)
IF nextPhW(r) THEN
FMT(vwl_en_us/oor)

+ 3
- 3
phsource/ph_german View File

@@ -344,9 +344,9 @@ phoneme r // note, following consonant must be 'ustop/t_' not 'ustop/tr' etc.
IF prevPhW(isVowel) THEN
ChangePhoneme(R)
ELSE
IF prevPhW(t) OR prevPhW(p) OR prevPhW(k) THEN
PauseBefore 40
ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) THEN
IF prevPhW(t) THEN
PauseBefore 30
ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) OR prevPhW(k) OR prevPhW(p) THEN
PauseBefore 15
ELSE
InsertPhoneme(@-)

+ 0
- 35
phsource/ph_spanish View File

@@ -157,38 +157,3 @@ phoneme r
endphoneme




phoneme k
vls vel stop
lengthmod 2
voicingswitch g
Vowelin f1=0 f2=2300 200 400 f3=-100 80
Vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20

IF nextPh(isPause2) THEN
WAV(ustop/k_)
ELIF nextPh(#i) OR nextPh(;) THEN
WAV(ustop/ki_unasp2, 50)
// ELIF nextPh(isRhotic) THEN
// WAV(ustop/kr)
// ELIF nextPh(l) THEN
// WAV(ustop/kl)
ENDIF
WAV(ustop/k_unasp2, 50)
endphoneme


phoneme t
vls dnt stop
lengthmod 2
voicingswitch d
Vowelin f1=0 f2=1600 -300 300 f3=-100 80
Vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20
IF nextPh(isPause2) THEN
WAV(ustop/t_unasp3, 30)
ENDIF
WAV(ustop/t_unasp3, 60)
endphoneme



BIN
phsource/ustop/k_unasp2.wav View File


+ 4
- 2
src/dictionary.cpp View File

@@ -1191,6 +1191,7 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
If 'tonic' is set (>= 0), replace highest stress by this value.

control: bit 0 This is an individual symbol, not a word
bit 1 Suffix phonemes are still to be added
*/

unsigned char phcode;
@@ -1577,11 +1578,12 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
break;
}

if((stressflags & S_FINAL_VOWEL_UNSTRESSED) && (vowel_count > 2) && (max_stress_input < 3) && (vowel_stress[vowel_count - 1] == 4))
if((stressflags & S_FINAL_VOWEL_UNSTRESSED) && ((control & 2) == 0) && (vowel_count > 2) && (max_stress_input < 3) && (vowel_stress[vowel_count - 1] == 4))
{
// Don't allow stress on a word-final vowel
// Only do this if there is no suffix phonemes to be added, and if a stress position was not given explicitly
if(phoneme_tab[final_ph]->type == phVOWEL)
{
// don't allow stress on a word-final vowel
vowel_stress[vowel_count - 1] = 1;
vowel_stress[vowel_count - 2] = 4;
}

+ 1
- 1
src/synthdata.cpp View File

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

const char *version_string = "1.48.12 01.Nov.14";
const char *version_string = "1.48.13 04.Nov.14";
const int version_phdata = 0x014801;

int option_device_number = -1;

+ 1
- 0
src/tr_languages.cpp View File

@@ -1076,6 +1076,7 @@ SetLengthMods(tr,3); // all equal
tr->langopts.param[LOPT_REDUCE] = 1; // reduce vowels even if phonemes are specified in it_list
tr->langopts.param[LOPT_ALT] = 2; // call ApplySpecialAttributes2() if a word has $alt or $alt2
tr->langopts.numbers = NUM_SINGLE_VOWEL | NUM_OMIT_1_HUNDRED |NUM_DECIMAL_COMMA | NUM_ROMAN | NUM_DFRACTION_1 | NUM_ROMAN_CAPITALS | NUM_ROMAN_AFTER;
tr->langopts.numbers2 = NUM2_NO_TEEN_ORDINALS;
tr->langopts.accents = 2; // Say "Capital" after the letter.
SetLetterVowel(tr,'y');
}

+ 9
- 2
src/translate.cpp View File

@@ -861,6 +861,7 @@ int TranslateWord(Translator *tr, char *word_start, int next_pause, WORD_TAB *wt
int wmark;
int was_unpronouncable = 0;
int loopcount;
int add_suffix_phonemes = 0;
WORD_TAB wtab_null[8];

// translate these to get pronunciations of plural 's' suffix (different forms depending on
@@ -1465,6 +1466,12 @@ if(end_type & SUFX_UNPRON)

/* determine stress pattern for this word */
/******************************************/
add_suffix_phonemes = 0;
if(end_phonemes[0] != 0)
{
add_suffix_phonemes = 2;
}

prefix_stress = 0;
for(p = prefix_phonemes; *p != 0; p++)
{
@@ -1516,9 +1523,9 @@ if(end_type & SUFX_UNPRON)
else
{
if(prefix_phonemes[0] == 0)
SetWordStress(tr, phonemes, dictionary_flags, -1, 0);
SetWordStress(tr, phonemes, dictionary_flags, -1, add_suffix_phonemes);
else
SetWordStress(tr, phonemes, dictionary_flags, -1, 0);
SetWordStress(tr, phonemes, dictionary_flags, -1, add_suffix_phonemes);
#ifdef PLATFORM_WINDOWS
sprintf(word_phonemes, "%s%s%s", unpron_phonemes, prefix_phonemes, phonemes);
#else

Loading…
Cancel
Save