Browse Source

Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
master
Reece H. Dunn 12 years ago
parent
commit
d9e0cbd4c2
11 changed files with 326 additions and 161 deletions
  1. 134
    86
      dictsource/en_list
  2. 72
    37
      dictsource/en_rules
  3. 2
    0
      dictsource/ka_list
  4. 65
    13
      dictsource/pt_list
  5. 5
    3
      dictsource/pt_rules
  6. 2
    2
      phsource/ph_english_us
  7. 13
    1
      phsource/ph_georgian
  8. 3
    0
      phsource/phonemes
  9. 26
    17
      src/dictionary.cpp
  10. 3
    1
      src/readclause.cpp
  11. 1
    1
      src/synthdata.cpp

+ 134
- 86
dictsource/en_list View File

@@ -1,5 +1,4 @@


// You can use the en_extra file, rather than this one
// to add your own pronunciation definitions.

@@ -17,7 +16,7 @@
// ?7 Scottish
// ?8 Use full vowel, not schwa in some word endings

// $alt use strong ending
// $alt1 use strong ending (-table, -inal)
// $alt2 use weak ending
// $alt3 use weak first vowel, a->[a#], e->[@], o->[0#]

@@ -345,17 +344,22 @@ _90o n'aInti@

abc $abbrev
ac $abbrev
adfs $abbrev
adf $abbrev
(a . k . a .) aka#_!
agpl $abbrev
agm $abbrev
ai $abbrev
amd $abbrev
aol $abbrev
api $abbrev
apr apr@
asap $abbrev
ati $abbrev
atm $abbrev
awol eIw0l
bvld bUl@vA@d
ceo $abbrev
cet $abbrev
cia $abbrev
cio $abbrev
ctrl k@ntroUl
@@ -376,15 +380,19 @@ hmm h@m
hiv $abbrev
(http ://) eItSt2i:t2i:'pi:_
ibm $abbrev
ibmtts $abbrev
id $abbrev
ie aIi:_! $pause $only
i.e aIi:_! $pause
imo $abbrev
irc $abbrev
irs $abbrev
itx $abbrev
(km ²) skw,e@kIl'0mIt3z
lapd $abbrev
lbs paUndz
LBS $abbrev
lotr $abbrev
ltd lImI2tI2d
//mc m@k $combine // combine with the following word
mhz mEg@h3:ts
@@ -397,16 +405,20 @@ nypd $abbrev
nypsd $abbrev
nyse $abbrev
nyt $abbrev
oecd $abbrev
oem $abbrev
ok $abbrev
omg $abbrev
os $abbrev
otoh $abbrev
pcie $abbrev
pcmcia $abbrev
riaa $abbrev
riscos rIskoUEs
rnib $abbrev
sae $abbrev
scsi skVzi
ssip $abbrev
st s@nt
th T
thu T3: // Thursday
@@ -417,6 +429,7 @@ ui $abbrev
uk $abbrev
un $abbrev $allcaps
unhcr $abbrev
upnp $abbrev
url $abbrev
usa $abbrev
usb $abbrev
@@ -458,7 +471,6 @@ abbey abi
abdomen abd@m@n
abed a#bEd
abet a#bEt
abhor a#bho@
abler eIbl3
ablest eIbl@st
ability a#bIl@ti
@@ -474,6 +486,7 @@ abstemious a#bst'i:mi@s
abstract abstrakt $only
abstract a#bstr'akt $verb
academe a#kad@mi
acapela aka#p'El@
access aksEs $onlys
access aksEs $verb
accouchement a#ku:SmO~
@@ -540,14 +553,12 @@ aisle aI@l
ajar a#dZA@
ajax eIdZaks
aka aka#
akin $2
alas a#l'as
albeit O:lb'i:It
alfalfa alf'alf@
alias eIli@s
alibi al@baI
alibis al@baIz
alkali alk@laI
allay a#leI
allegiance a#li:dZ@ns
allele a#li:l
@@ -568,6 +579,7 @@ altogether ,O:lt@gED3
always O:lweIz
aluminium aljUm'Ini@m
alzheimer altsaIm3
?3 alzheimer A:ltshaIm3
amaryllis am@r'IlIs
amass a#mas
ambassador a#mbas@d3
@@ -670,11 +682,12 @@ attaches a#tatSI#z
attorney a#t3:ni
?5 attorney a#tVRni
attribute atrIbju:t
attribute $2 $verb
attribute $alt3 $verb
au ,oU
aubergine oUb3Zi:n
auger O:g3
augmentation O:gmEnt'eIS@n
august O:g@st
aurora $2
aussie 0zi
austere O:st'i@3
@@ -723,11 +736,11 @@ bass beIs
baste beIst
bastion basti@n
batman batman
?3 baton ba#t0n
battalion ba#tali@n
bazaar ba#zA@
?3 baton $alt3
battalion $alt3
bazaar $alt3
bedouin bEdu:I#n
beize beIZ
beige beIZ
belisha b@l'i:S@
bely bI2laI
beryl bEr@L
@@ -753,7 +766,7 @@ bison baIs@n
?!3 bitumen bItSu:m@n
bizarre bI#z'A@
bizzare bI#z'A@
blanc blO~nk
blanc blA~nk
blancmange bl@m0nZ
blase blA:z'eI
blasé blA:z'eI
@@ -804,8 +817,7 @@ buses bVsI#z
busily bIzI2lI $verbf
buxom bVks@m

cabal ka#bal
?3 cabal ka#bA:l
cabal $alt3
cabaret kab@reI
cabernet kab3n'eI
cabinet kabI#n@t
@@ -813,14 +825,15 @@ cabriolet kabri:@l'eI
cach kaS // cached
cachet kaSeI
cacti kaktaI
cadet ka#dEt
cadet $alt3
cadre kA:d3
caesar si:z3
cafe kafeI
cahoot ka#hu:t
cajole ka#dZoUl
cahoot $alt3
cajole $alt3
cajun keIdZ@n
caldera k0ld'e@r@
caliche ka#li:tSi
calix keIlIks
calv kA:v // for calved, calving
?3 calv kav // for calved, calving
@@ -840,7 +853,7 @@ canton kant0n
canvas kanv@s
capita kapIt@
capitol kapIt@L
caprice ka#pr'i:s
caprice ka#pri:s
carafe ka#raf
caramel kar@mEl
caravan kar@van
@@ -849,23 +862,24 @@ carburetor kA@b@r'Et3
career k@r'i@3
caress k@rEs
carpel kA@p@l
cascade $2
cascade $alt3
cashier kaS'i@3
cashmere kaSmi@3
?3 cashmere kaZmi@3
cassette ka#sEt
catastrophe ka#tastr@f%i
casino $alt3
cassette $alt3
catastrophe $alt3
catarrh k@tA@
caterer keIt3r3
cathedral $alt3
catholic kaTlIk
carotid ka#r0tI#d
carotid $alt3
cavalier $3
caveat kavIat
?3 caveat kavIA:t
caviar kavIA@
caviare kavIA@
cavort ka#v'O@t
cavort $alt3
cedar si:d3
celebrity $alt3
celidh keIli
@@ -901,6 +915,7 @@ chiffron SIfr0n
chihuahua tSI2wA:w@
chimera kaIm'i@r@
chimpanzee $3
chipotle tSI2poUtleI
chisel tSIz@L
chloroplast $1
chocolate tS0kl@t
@@ -1012,10 +1027,10 @@ contralto k@ntr'altoU
contraption k@ntr'apS@n
contrary k0ntr@rI
?3 contrary k0ntre@ri
contrast k0ntr'ast $verb
contrite k0ntr'aIt
contrast $2 $verb
contrite $2
controversy $1
conven k0nv'i:n // convened
conven k0#nv'i:n // convened
convent k0nv@nt
converse $1 $only
converse $verb
@@ -1104,7 +1119,7 @@ demolish dI2m0lIS
demon di:m@n
demoness di:m@nEs
demo dEmoU
demonstrative $2
demonstrative $alt3
dengue dEngi
denier dI2naI3
denouement deIn'u:mO~
@@ -1163,7 +1178,7 @@ disused dIs'ju:zd
divan dI2van
doable du:@b@L
doctrine d0ktrI2n
doctrinal d0ktr'aIn@L
doctrinal $alt1
doer du:3
dogged d0gI#d
doin du:In
@@ -1193,6 +1208,7 @@ early 3:lI
eavesdrop i:vzdr0p
ebay i:beI
ebook i:bUk
echelon ES@l0n
ecommerce 'i:k,0m3:s
eden i:d@n
edict i:dIkt
@@ -1245,9 +1261,12 @@ ere e@ $only
eros i@r0s
err 3:
errand Er@nd
escallop Esk'A:l@p
escapism Esk'eIpI2z@m
escargot I2sk'A@goU
eschelon ES@l0n
escort Esk'O@t $verb
escutcheon $2
eskimo $1
espionage EspI@nA:Z
essential I2sEnS@L
@@ -1300,9 +1319,9 @@ familiar f@mIli@3
famine famIn
farewell $2
fasten faas@n
fatigue fa#ti:g
fatigue $alt3
fathom faD@m
(faux pas) f'oU||p'A:
(faux pas) f,oU||p'A:
favorite feIv@-rI2t // sp.
favourite feIv@-rI2t
favorites feIv@-rI2ts // sp.
@@ -1328,7 +1347,7 @@ fishnet fISnEt
fiord fi:O@d
fix fIks // for fixer
flaccid flasId
flagellum fla#dZEl@m
flagellum $alt3
flamenco fla#mENkoU
flexible flEksIb@L
flier flaI3
@@ -1343,7 +1362,6 @@ foreshadow $2
foreshorten $2
forestall fo@st'O:l
foretell fo@t'El
forever $2
forewarn $2
formid fO@m'Id // formidable
formica fO@m'aIk@
@@ -1358,6 +1376,8 @@ frigate frIg@t
fringer frIndZ3 // infringer
fringing frIndZIN
frontend fr'Vnt,End
frontier frVnti@3
?3 frontier frVnt'i@3
frontpage fr'Vntp,eIdZ
fruition fru:'IS@n
frustrate $2
@@ -1372,7 +1392,7 @@ futon fu:t0n
gala gA:l@
galaxy gala#ksi
galileo galI2l'eIoU
galore ga#lo@
galore $alt3
garish ge@rIS
gases gasI#z
gauche goUS
@@ -1409,7 +1429,7 @@ gourmand gU@mA:nd
gourmet gU@meI
graduate gradju:@t
graduate gradju:eIt $verb
graffiti gra#fi:ti
graffiti $alt3
gredient gri:di@nt // ingredient
grenade gr@neId
griffon grIf@n
@@ -1421,7 +1441,7 @@ gui gu:i $onlys
guinea gIni
gurus gu:ru:z

habitual $2
habitual $alt3
haggis hagIs
haha hA:h'A:
halleluiah halI2'lu:j@
@@ -1512,8 +1532,6 @@ impi $1
impinging Imp'IndZIN
implacable Impl'ak@b@L
imprecise ImprIs'aIs
impregnable Impr'Egn@b@L
impregnate $2
inanimate In'anIm@t
inappropriate ,Ina#proUpri@t
incense Ins'Ens $verb
@@ -1592,7 +1610,7 @@ jour ZU@ // french
jukebox dZu:kb0ks
july dZu:l'aI

kaput ka#pUt
kaput $alt3
karate k@rA:ti
kebab k@bab
?3 kebab k@bA:b
@@ -1601,7 +1619,7 @@ hiatus haI'eIt@s
kilo ki:loU
kilometer kIl'0mI2t3
kilter kIlt3
kinetic kI#nEtik
kinetic kI#nEtIk
kiosk ki:0sk
kiwi ki:wi:
knavish neIvIS
@@ -1695,7 +1713,7 @@ luxury lVkS3ri
lychee li:tSi:

macabre m@kA:br@
macademia mak@d'eImi@
macadamia mak@d'eImi@
machete ma#SEti
machismo ma#tSIzmoU
madame mad@m
@@ -1732,12 +1750,11 @@ marcel mA@s'El
marquee mA@k'i:
margarine mA@dZ3ri:n
?3 margarine mA@dZ3r@n
marijuana marI2w'A:n@
marquis mA@rk'i:
marshall mA@S@L
martinet $3
massage masA:Z
?3 massage ma#sA:Z
?3 massage ma#sA:Z
mausoleum mO:s@'li:@m
mayhem meIhEm
meant mEnt
@@ -1751,6 +1768,7 @@ melee mEleI
melon mEl@n
memento $alt3
memo mEmoU
memorial $alt3
menagerie m@n'adZj@ri
ménage meIn'A:Z
menus mEnju:z
@@ -1761,8 +1779,7 @@ merest mi@r@st
meringue m@raN
metabolic mEt@b'0lIk
metaphor mEt@fO@
metallic m@t'alIk
metastable $alt
metastable $alt1
miaou mi:'aU
miaow mi:'aU
mic maIk
@@ -1774,6 +1791,8 @@ midterm m'Idt,3:m
mildew mIldju:
mileage maIlI2dZ
milestone maIlstoUn
milieu mi:lj3:
?3 milieu mi:l'ju:
militia m@lIS@
minibus mInIbVs
mining maInIN // not mini
@@ -1795,6 +1814,7 @@ misted mIstI#d
mister mIst3
mitre maIt3
mixer mIks3
moccasin m0k@sI#n
mocha moUk@
modem moUdEm
?3 modem moUd@m
@@ -1839,13 +1859,13 @@ naif naI'i:f
naïve naI'i:v
naivete naI'i:v@teI
naked neIkI#d
narrate na#reIt
narrative nar@tIv
nasa nasa#
nascent neIs@nt
nativity $2
nativity $alt3
natural natS@r@L
nauseam nO:zi@m
navajo nav@hoU
navajo nA:v@hoU
nazi nA:tsI
nearby $2 $atend
necklace nEkl@s
@@ -1970,7 +1990,7 @@ pageant padZ@nt
pajama $alt3
paltry pO:ltrI
panacea pana#s'i:@
panache $2
panache $alt3
pancreas pankri@s
papaya pa#paI;@
parabola p@rab@l@
@@ -1979,7 +1999,7 @@ parameter p@ramI2t3
parasite par@saIt
paren pa#rEn // "parenthesis"
pariah p@raI@
parole pa#r'oUl
parole $alt3
passenger pasI2ndZ3
passerby pas3b'aI
passersby pas3zb'aI
@@ -2162,7 +2182,7 @@ rascal raask@L
ratatouille rat@t'u:I
?!3 rather rA:D3
rationale raS@n'al
raton ra#t0n
raton $alt3
ravenous rav@n@s
ravine r@vi:n
rawest rO:@st
@@ -2208,6 +2228,7 @@ refund ri:fVnd $noun
reg rEdZ
regal ri:g@L
regime reIZ'i:m
?3 regina rI#dZi:n@
region ri:dZ@n // & regional
reign reIn
reiki reIki:
@@ -2243,7 +2264,7 @@ reservation rEz3v'eIS@n
reservoir rEz3vwA@
resin rEzIn
restive rEstIv
respiration rEspI2r'eIS@n
respiration rEspI#r'eIS@n
respiratory rI2spIr@t@rI
?3 respiratory rEspr@to:ri
respite rEspaIt
@@ -2296,8 +2317,8 @@ salad sal@d
salami $alt3
saline seIlaIn
?3 saline seIli:n
?3 salon sa#l0n
saloon sa#lu:n
?3 salon $alt3
saloon $alt3
san ,san $only
sardine $2
satan seIt@n
@@ -2348,7 +2369,7 @@ sens sEns // for sensible
sentient sEnti@nt
sequester $2
sequine si:kwI2n
series si@3ri:z
series si@3riz
serenade sErI2n'eId
serene s@ri:n
sergeant sA@dZ@nt
@@ -2396,6 +2417,7 @@ ski ski:
skies skaIz
skied ski:d
skua sku:@
skyrocket sk'aIr,0kIt
slavish sleIvIS
snooker snu:k3
sofa soUf@
@@ -2513,28 +2535,33 @@ teargas ti@3gas
techy tEki
teddybear t'EdIb,e@
telemetry t@lEm@tri
telephony tEl'Ef@ni
telepathy t@lEp@Ti
telephony t@l'Ef@ni
telephonist t@l'Ef@nIst
ten tEn // untenable
tennis tEnI#s
tequila t@ki:l@
termini t3:mInaI
terrain t@reIn
terrific t3rIfIk
testes tEsti:z
tobacco $2
telephon tElI2foUn // for telephoning
temperature tEmprI2tS3
temporary tEmpr@rI
?!3 temporary tEmpr@rI
thereof ,De@'0v
thereon ,De@'0n
thereto ,De@'tu:
thermos T3:m@s
thermostable $alt
thermostable $alt1
thesis Ti:sIs
theta Ti:t@
tho DoU $only
thousand TaUz@nd
throughout $2
thursday T3:zdeI
tidal taId@L
tidy taIdi
tierra tI'e@r@
tikka ti:k@
tilde tIld@
timetable taImteIb@L
@@ -2569,6 +2596,7 @@ treatise tri:tIz
triage tri:A:Z
tribunal traIb'ju:n@L
triceratops $2
tricycle traIsIk@L
trilogy trIl@dZi
trio tri:oU
trisquel trIsk'El
@@ -2674,6 +2702,7 @@ vinyl vaInI2l
viola vaI'oUl@
violin $2
viral vaI3r@L
virginal $alt1
visa vi:z@
vitamin vIt@mI#n
?3 vitamin vaIt@mI#n
@@ -2722,7 +2751,7 @@ wordprocess $2
workshy w3:kSaI
workstation w'3:kst,eIS@n
?5 workstation w'VRkst,eIS@n
worktable $alt
worktable $alt1
wound wu:nd
wound waUnd $past
(wound down) w,aUnd||'daUn
@@ -2824,6 +2853,7 @@ Antarctica $2
Antigua ant'i:g@
Antilles ant'Ili:z
Apennine ap@naIn
Arabia $alt3
Armageddon A@ma#g'Ed@n
Arkansas A@k@nsO:
Atlantis atl'antIs
@@ -2852,8 +2882,8 @@ Bucharest bu:ka#r'Est
Budapest bu:d@p'Est
Buenos bweIn0s
Burundi bUr'Undi
Brazil bra#zIl
Cadiz $2
Brazil $alt3
Cadiz $alt3
Cairo kaIroU
Calcutta $2
Canada kan@d@
@@ -2869,16 +2899,16 @@ Cincinnati sInsIn'ati
Cologne k@loUn
Colorado k0l3r'A:doU
Colombia k@lVmbi@
Columbus $2
Columbus $alt3
Congo k0NgoU
Connecticut k@nEtI2k@t
Copenhagen koUp@nh'eIg@n
Cruz kru:z
Cyprus saIpr@s
Dahomey $2
Dahomey $alt3
Dallas dal@s
Damascus da#mask@s
Dakota da#koUt@
Damascus $alt3
Dakota $alt3
Danish deInIS
Delhi dEli
(Des moines) d@mOIn
@@ -2918,7 +2948,7 @@ Ipanema Ipa#n'i:m@
Israeli Izr'eIli
Istanbul ,Ist,anb'Ul
Italia It'alI2@ // Italian(s)
Jakarta $2
Jakarta $alt3
Jerusalem dZ@ru:s@l@m
Johannesburg $2
Kalgoorlie kalgU@li
@@ -2948,12 +2978,12 @@ Lvov l@-v0v
Madagascar mad@g'ask3
Madras m@draas
Madrid m@drId
Malawi ma#lA:wi
Malawi $alt3
Maldives mO:ld'i:v
Mali mA:li
Mandalay $3
Manhatten $2
Manila ma#nIl@
Manila $alt3
Massachusetts $3
Maya maI@
Mayan maI@n
@@ -2965,6 +2995,7 @@ Miami maI'ami
Michigan mISIg@n
Milan $2
Mindanao mInd@n'aU
Mineola mIni:'oUl@
Minneapolis mIni:'ap@lI2s
Missouri mIz'U@ri
Mojave moUh'A:vi
@@ -2990,7 +3021,7 @@ Ohio oUh'aIoU
Omaha oUma#hA:
Oman oUm'an
Oregon 0rI2g@n
Pacific pa#sIfIk
Pacific $alt3
Palestine pal@staIn
Palestinia pal@st'Ini:@
Panama pan@mA:
@@ -3017,7 +3048,7 @@ Sahel sA:h'El
Saigon saIg'0n
Santiago santI'A:goU
Savannah $alt3
Savoy sa#vOI
Savoy $alt3
Seattle si:'at@L
Seoul soUl
Seville s@vIl
@@ -3037,18 +3068,23 @@ Sumatran su:m'A:tr@n
Suriname sU@rIn'am
Taipei t,aIp'eI
Taiwan taI'wA:n
Tawakoni ta#wA:k@ni
Tblisi t@-bli:si
Tehran te@r'A:n
(tel aviv) t,El||a#v'i:v
Tenerife tEn3r'i:f
Tennessee tEn@s'i:
Texas tEks@s
Tblisi t@-bli:si
Toronto t@r0ntoU
Tijuana ti@w'A:n@
Tikal tI2kA:l
Timor ti:mo@
Tokyo toUkIoU
Toronto t@r0ntoU
Toulouse tu:l'u:z
?3 Tunisia tu:n'i:Z@
Tripoli trIp@li
tuareg twA@rEg
Uighur wi:gU@
Ural ju:@r@L
Utah ju:t2A:
?3 Utah ju:t2O
@@ -3097,11 +3133,13 @@ Alison alIs@n
Allyson alIs@n
Alycen alIs@n
Alyssa a#lIs@
Amanda $2
Amanda $alt3
Amos eIm0s
Amy eImi
Andre 0ndreI
Anita a#ni:t@
Andrea andri@
Andreas A:ndr'eI@s
Anita $alt3
Anthony ant@ni
Anton ant0n
Aoife i:f@
@@ -3109,7 +3147,7 @@ Aoiffe i:f@
Archibald A@tSIbO:ld
Archie A@tSi
Ares e@ri:z
Arianna arI'an@
Arianna arI'A:n@
Astley astli
Baez baI'Ez
Bambi bambi:
@@ -3122,8 +3160,6 @@ Bernard b3:n@d
Betsy bEtsi
Betsey bEtsi
Bjarne bjA@n@
Bjorn bjO@n
Bjørn bj3:n
Boris b0rIs
Brianna brI'an@
Brien braI@n
@@ -3149,6 +3185,7 @@ Chris krIs
Cleo kli:oU
Cloe kloUi
Colleen $2
Conan koUn@n
Connell k0n@l
Connie k0ni
Connor k0n3
@@ -3165,6 +3202,7 @@ Delia di:li@
Denise d@ni:s
Dennis dEnI#s
Derek dErIk
Devin dEvIn
Di daI $capital
Dinah daIn@
Dmitri d@mi:tri
@@ -3181,6 +3219,7 @@ Dvina d@vi:n@
Dylan dIl@n
Edith i:dIT
Eduardo Edw'A@doU
Elijah I2laIdZ@
Elise I2li:z
Elisabeth I2lIz@b@T
Elizabeth I2lIz@b@T
@@ -3245,7 +3284,7 @@ José hoUs'eI
Jose hoUs'eI
Judy dZu:di
Karen kar@n
Karene ka#ri:n
Karene $alt3
Katherine kaTrI2n
Katie keIti
Katrina $alt3
@@ -3288,12 +3327,13 @@ Marian mari@n
?3 Mario mA@rIoU
Margaret mA@gr@t
Marilyn mar@lI2n
Matilda ma#tIld@
Matilda $alt3
Matthew maTju:
Maurice m0rIs
Mavis meIvIs
Megan mEg@n
Mellisa $alt3
Mellissa $alt3
Melissa $alt3
Michele mI2SEl
Michelle mI2SEl
@@ -3311,10 +3351,10 @@ Muhammad mohammad $text
Moira mOIr@
Montgomery m0ntg'0m@ri
Nadia nA:dj@
Nadine neIdi:n
Nadine neId'i:n
Nadja nA:dj@
Natalie nata#li
Natasha $2
Natasha $alt3
Nathan neIT@n
Neville nEvIl
Nicholas nIk@l@s
@@ -3347,15 +3387,15 @@ Roderick r0drIk
Roni r0ni
Rosario roUz'A@rIoU
Russell rVs@L
Sabina sa#bi:n@
Sabina $alt3 //sa#bi:n@
Sabine sa#b'i:n
Samantha s@manT@
Samantha sa#manT@
(Santa claus) s'ant@||kl'O:z
Saoirse si@S@
Sarah se@r@
Seamus SeIm@s
Sean SO:n
Sebastian $2
Sebastian $alt3
Sheila Si:l@
Simon saIm@n
Sinead SI2neId
@@ -3382,7 +3422,8 @@ Tracy treIsi
Triani tri:'ani
Trina tri:n@
Tricia trIS@
Vanessa va#nEs@
Vanessa $alt3
Wallace w0lI#s
Wally w0li
Yves i:v
Yvonne $2
@@ -3396,12 +3437,16 @@ Beowulf beI@wUlf
Bogart boUgA@t
Boswell b0zwEl
Buchanan bju:k'an@n
Cabrillo ka#bri:oU
Campbell kamb@l
Carnegie kA@n@gi
Cohen koU@n
Cthulhu k@-Tu:l#u:
Chrysler kraIsl3
(da vinci) da#vIntSi
Dante dA:nt2eI
Deslauriers dI2lo@rIeI
Deveraux dEv3roU
Disney dIzni
Dolce d0ltSeI
Dvorak d@-vo@Zak
@@ -3412,7 +3457,10 @@ Gibson gIbs@n
Guinness gInIs
Hades heIdi:z
Hamilton ham@Lt@n
Jacobi dZa#koUbi
Kendell kEnd@L
Kyocera kaI|@s'i@r@
Lamaze la#mA:z
Mackenna m@kEn@
Mackenzie m@kEnzi
Medusa m@du:s@
@@ -3420,7 +3468,7 @@ Michelangelo maIk@L'andZ@loU
Montague m0nt2@gju:
Mozart moUtsA@t
Niro ni@roU
Patel pa#tEl
Patel $alt3
Perez p3rEz
Primavera pri:m@v'e@r@
Prentice prEnt2Is

+ 72
- 37
dictsource/en_rules View File

@@ -35,6 +35,8 @@
.L03 a i o u // vowel, not 'e'
.L05 c g k
.L06 s z
.L07 b d g m n r bE dE lE nE // before voiced s in -sman
.L08 t d s z n x // dental, drop [j] before [u:]

.L10 grap log met scop // scientific endings

@@ -114,7 +116,7 @@
m) a (jes a
m) a (jor_ eI
m) a (jore eI
_) a (k@ a#
_) a (ki a#
@) a (ki_ 'a
@) ak (ia ak
aku (_ 'A:ku:
@@ -313,7 +315,7 @@
acne aknI
acou (st a#ku:
ac (quie ,a
_) acre eIk@
_) acre eIk3
mass) acre @k3
_) ac (ri ak
ac (ro ak
@@ -448,7 +450,7 @@
m) ag (enta @dZ
agh (_ @
agio (_ 'A:dZIoU
t) agi (o eIdZj
t) agi (o eIdZ
_) ag (l@ a#g
&) ag (on_ @g
dr) agon ag@n
@@ -519,6 +521,7 @@
_) alexan alIgz'aan
_) alfa alf@
_) al (g al
_) algo (r alg@
&) al (iBe @l
&) al (iBati @l
al (ia eIl
@@ -532,7 +535,6 @@
&) ali (sC_ @lI
&) al (isCic @l
_) al (k al
C) al (k O:
_) all (@ a#l
_) all (C@P3 O:l
_) all (a al
@@ -583,6 +585,7 @@
b) al (d+ O:l
b) al (k O:l
f) al (k 0l
alkali ak@laI
b) all (K O:l
&b) all (er_ O:l
_c) al (e al
@@ -593,7 +596,7 @@
?3 h) al (f a
s) al (f 0l
@) algia (_ 'aldZ@
g) al (i_ 'A:l
al (i_ 'A:l
al (ity 'al
p) al (et al
qu) al (@ 0l
@@ -605,7 +608,9 @@
qu) al (m A:
equ) al @l
ch) al (k O:
t) al (k O:
w) al (C 0l
w) al (k O:
all (_ O:l
aller (_ O:l3
allers (_ O:l3z
@@ -700,6 +705,7 @@
.group an
@) ana (_ 'A:n@
_c) an (adi a#n
_) an (aem a#n
ph) an (age @n
C) an (c aan
c) an (c an
@@ -871,6 +877,7 @@
arr (_ A@
_) arr (@ a#r
_) arr (ant ar
_n) arr (at a#r
_) arr (o ar
_) arro (g ar@
ar (i_ 'A:r
@@ -929,6 +936,7 @@
&) ar (dy_ 3
h) ar (dy_ A@
are e@
z) are (_ 'A@reI
%C) ared (_ 3d
%C) aring (_ 3rI2N
area e@ri@
@@ -945,6 +953,7 @@
ar (iaC_ 'e@
ar (ia_ 'e@
@) arily (_ 'Er@l%I
?3 @) arily (_ 'e@r@l%I
ch) ar (it ar
ph) ar (i ar
m) ar (i @r
@@ -1037,7 +1046,7 @@
cl) ass (iC as
ass (ag as
&v) ass (_ @s
ass (et as
_) ass (et as
_) ass (h as
ass (on as
ass (u @S
@@ -1222,6 +1231,7 @@
b b
_) bh b
_) b (L01Y b // allow _bl _br
_) bj (A bj
_) brz (e brz

b (b
@@ -1271,6 +1281,7 @@
beha (v bI2heI
belly bElI2
be (mu bI2
_) be (na bE
_) bene bEnI
benevo b@nEv@
_) be (o beI
@@ -1381,6 +1392,7 @@
cism (_ sIz@m
c (ish k
e) cua kwa
_) cu (o kw
_) cwm kUm
czech tSEk

@@ -1418,7 +1430,6 @@
ba) che tS@
tra) ch k
cre) ch S
e) ch (el S
cli) ch S
fi) ch S
ni) ch S
@@ -1479,6 +1490,7 @@
colle (gi k@li:
co (llis k@
co (llid k@
collo (quiA k@loU
co (llu k@
co (loss k@
_) co (m@ k@
@@ -1501,7 +1513,7 @@
co (mmerce k0
co (mmodor k0
common k0m@n
commun k0mju:n
commun k0#mju:n
commun (a k@mju:n
commun (ic k@mju:n
co (mmuta k0
@@ -1544,6 +1556,7 @@
_) co (ngre k0
?3 _) congress k0ngr@s
congru k0ngru:
_) con (k k0#n
_) co (ni k0
_) co (njug k0
_) co (njur kV
@@ -1564,16 +1577,16 @@
_) co (nsul k0
_) co (nsult k%0#
_) co (ntact k0
_) co (ntempl k0
_) co (ntempl k0#
_) co (ntext k0
co (ntine k0
_) co (ntour k0
_) co (ntrA k0
_) co (ntrA k0#
_) contra (C@P6 k,0ntr@
_) contrast k0ntraast
_) contrast k0#ntraast
contrac (t k%0#ntrak
contrar k%0#ntre@
_) co (ntrib k0
_) co (ntrib k0#
_) co (ntrov k,0
co (ntrol+ k@
conva (l k0nv@
@@ -1583,7 +1596,7 @@
_) co (nw k0
_) copy k0pI
_) copoly k'oUp,0lI
coro (ll k0r0
coro (ll k0#r0
co (rrect k@
correspo k,0rIsp'0
_) co (rri k0
@@ -1624,6 +1637,7 @@
_) du (p du:
?!3 du (pl dju:
dur (A djU@
?3 dur (A dU@
dur (_ djU@
ce) dure dZ3
_) dye daI
@@ -1738,6 +1752,7 @@
_) dia daI|@
_) dia (gon daI'a
_) dia (l daI@
_) diamond daI@m@nd
_) dia (n daI'a
dicho (t daIk'0
di (chro daI
@@ -2122,8 +2137,8 @@
?8 &) el (s_ El
ela (_ 'El@
ella (_ 'El@
&C) eller (_ @l@
&C) eler (_ @l@
&C) eller (_ @l3
&C) eler (_ @l3
@) elli (_ 'ElI
&) elling @lI2N
&) eling @lI2N
@@ -2181,6 +2196,8 @@
sph) em @m
sph) em (e 'i:m
&) em (y_ @m
yst) em @m
yst) em (i Em

.group en
_) en (@ %En
@@ -2426,7 +2443,7 @@
&) er (oCe_ =@r
er (se 3:
v) er (sal '3:
@) er (sial '3:
@) ersi (al '3:S
@) er (sy 3:
er (sib 3:
er (sif 3:
@@ -2541,7 +2558,7 @@
_m) et (ic @t
etry (_S2 rI
etries (_S4 rIz
@) et (_ I2t
&) et (_ I2t
&Ar) et (_ @t
rk) et It
ll) et (_ It
@@ -2919,6 +2936,7 @@
iza (tion aIzeI
?3 iza (tion @zeI
ize (_ aIz
ial) ize (_S3 aIz
ize (d_ aIz
i (zen I2
iz (er_ aIz
@@ -2936,7 +2954,7 @@
&) iary =j@r%I
&l) iary =i@r%I
_) ian i@n
@) ia (_ =i|@
&) ia (_ =i|@
@@) ia (_ =i@
@) ian (cy I|@n
l) iais I|eIz
@@ -3028,6 +3046,7 @@
&) ie (t_ i@
@) ie (th i@
iesta i:'Est@
iessa i:'Es@
ie (tt I2'E
@) iety 'aI@t%I
l) ieu u:
@@ -3118,7 +3137,8 @@
im (portu ,Im
impo (ten Imp@
_) im (pre@P2 %Im
im (pregna ,Im
impreg Impr'Eg
impreg (nat ImprEg
im (presa ,Im
im (provis Im
im (pulse_ Im
@@ -3248,6 +3268,7 @@
adm) ini InI
m) iniatur InItS3
m) inera (l In@r@
in (al_$w_alt 'aIn
&m) in (al_ =In
f) in (a aIn
@g) in (a_ aIn
@@ -3357,8 +3378,7 @@
ir (able 'aI3
m) ir (ac Ir
sp) iral aI3r@L
@) ir (ation Ir
ir (at %aIr
@) ir (ation I#r
ir (ate =i@r
consp) ira (t Ir@
ire aI3
@@ -3412,6 +3432,7 @@
v) is (coun aI
v) is (it Iz
_d) is (e I2s
ial) ise (_S3 aIz
ise (_ aIz
ise (d_ aIz
is (er+_ aIz
@@ -3538,7 +3559,8 @@

jokull (_S6 j3:ku:th
jökull (_S6 j3:ku:th
juan hwA:n
_) juan hwA:n
juan w'A:n

.group k
k k
@@ -3692,6 +3714,7 @@
mEntary (_ m'Ent@r%I
_) meta (@ m,Et@
_) metal (C mEt@L
_) metall (ic m@tal
metabo m@t'ab0
_) meta (llu m%Eta
_) mobile moUbaIl
@@ -3850,7 +3873,7 @@
oar o@
oar (_ o@
cr) o (at oU
o (ba oU
X) o (ba oU
t) o (bacc @
o (bed oU
_r) o (ber 0
@@ -3878,7 +3901,7 @@
l) o (cat %oU
_) o (ccasi @
_) o (cclu @
_) o (ct 0
X) o (ct 0
occur @k3:
?5 occur @kVR
occurr @k3:
@@ -4006,7 +4029,6 @@
p) o (tenti @
b) o (th oU
betr) oth oUD
?3 m) o (th O
?3 cl) o (th O
cl) othe oUD
tr) othe oUD
@@ -4259,12 +4281,14 @@
nt) or (_ o@
vent) or (_ 3
y) or (k O@
&) or (ation @r
or (arL02 3r
&) or (ation 3r
_) ora (to 0r@
@) or (ca_ 'O@
w) orce (st U
&f) or (d_ 3
ore o@
&) or (ene_ 3
or (esis O@
oresc @r'Es
ora (cl 0r@
@@ -4302,7 +4326,7 @@
?3 or (r O:
bb) or (n 3
f) oreign 0r@n
f) or (ever O@
f) or (ever 3
f) or (gAt 3
_f) org (Av @g
fl) or (i 0r
@@ -4667,7 +4691,6 @@
per (sis p3
persever p3:sIv'i@3
per (sp p3
perspi (ra p3:sp@
per (su p3
per (tai p3
per (tu p3
@@ -4918,10 +4941,11 @@
re (solu rE
re (son rE
re (stl rE
re (stro rE
res (ult rI2z
re (tail ri:
re (tic rE
re (tina rE
re (ti rE
_) re (tir rI2
re (trib rE
retro (P5 r,EtroU // prefix
re (vel rE
@@ -5019,7 +5043,7 @@
w) se z
Co) s (Er z
Co) s (En z
r) s (d z
e) s (d z
_) se (clu sI2
secur sI2kjU@
self (_ 'sElf
@@ -5055,13 +5079,13 @@
A) sion Z@n
?8 C) sion SVn
?8 A) sion ZVn
a) sin (_ s@n
ai) sin (_ z@n
u) sin (_ z@n
A) s (itiv z
_) size (C@ saIz
a) s (m z
o) s (m z
L07) s (mAn_ z
_) socie (t s@saI@
_) soma (li s@mA:
pri) s (o z
@@ -5196,7 +5220,7 @@
tion (al S=@-n
&) tious S=@s
AC) tive (_ =tIv
s) t (l
s) t (l ?
to (morr t@
_) to (nn tV
t (ooth t2
@@ -5210,7 +5234,7 @@
_) tri (g trI
_) tri (ni trI
_) tri (vi trI
_) tri (xA trI
_) tri (xA trI
tsch tS
tse (_ tsi
_) tsk t'@sk
@@ -5221,8 +5245,12 @@
_sta) tu tSu:
?3 _sta) tu (to tS@
c) tu (al_ =tSu:
r) tue (_ tSu:
?3 tu (la_ tS@
@) tu (lat =tSU
?3 tu (Ant tSu:
?3 tu (Ancy tSu:
tu (ous tSu:
@) tur (A tS@r
@) tur (al_ tS=@r
@) tur (y tS@r
@@ -5311,6 +5339,8 @@
val) u ju:
u (a ju:
l) u (a u:
?3 L08) u (a u:
contin) u ju:
_g) ua wA:
_l) u (a u:
r) u (aC+ u:
@@ -5354,7 +5384,7 @@
g) u (i w
r) u (i u:
s) u (i u:
?3 t) u (i u:
?3 L08) u (i u:
u (ki_ 'u:
_) u (krain %ju:
ll) u (l ju:
@@ -5388,6 +5418,7 @@
u (ly u:
d) u (ly ju:
z) u (l_ 'u:
um (_ @m
vol) u (m ju:
u (ma_ 'u:
h) u (man ju:
@@ -5434,10 +5465,11 @@
.group ue
ue ju:
uee ju:i:
?3 L08) ue u:
l) ue u:
r) ue u:
_s) ue u:
?3 t) ue u:
?3 _L08) ue (l u:@
_C) ue (l ju:@
_CC) ue (l u:@
ue (n ju:@
@@ -5649,6 +5681,7 @@
xis (_ =ksIs
xu (a =kSu:
lu) x (ur gZ
?3 lu) xu (r gZU@
xure (_ kS%U@

.group y
@@ -5834,7 +5867,8 @@
?8 Ening (_ EnI2N
Ene (_ i:n
Ened (_ @nd
E (nt_ @
En (g @n
E (nt @
E (ning E
E (nti 'E
E (ntu 'E
@@ -5962,6 +5996,7 @@
ë E
ï i:
ö 3:
ör 3:
ü u:
ç s
ß s

+ 2
- 0
dictsource/ka_list View File

@@ -115,6 +115,8 @@ _ე e
ჸ elifi
უ u

v _^_EN // not 'roman'
x _^_EN

% prots#enti $max3
+ pliusi $max3

+ 65
- 13
dictsource/pt_list View File

@@ -314,12 +314,12 @@ umas $u $nounf
// pronouns
eu $u+ $verbf
tu $u+
você vos'e $u+
você vose $u2+
ele 'ely $u+
ela $u+
nós $u+
vós $u+
vocês $u+
vocês $u2+
eles $u+
elas $u+

@@ -646,13 +646,14 @@ governo gov'ernU $noun

abacaxi abakaSy
abordo $alt
aborto $alt $verb
aborto $alt $verb
acerto $alt2 $noun
acertos $alt2
acervo $alt2
adepto $alt
adereço $alt2
adore $alt
adorno $alt $verb
albatrozes $alt
alcateia $alt
alferes $alt
@@ -665,16 +666,19 @@ ameba $alt
amores $alt2
anoiteça $alt2
anoiteço $alt2
apego $alt2
apego $alt2 $noun
apelo $alt $verb
aposto $alt $verb
apreço $alt2
aperto $alt2 $noun
apoio $alt $verb
apoio $alt $verb
aprendeste $alt2
aprovo $alt
arredores $alt
arremesso $alt2 $noun
arroz $alt2
assembleia $alt
aterro $alt2 $noun
atmosfera $alt
atrozes $alt
austera $alt
@@ -690,10 +694,14 @@ bezerro $alt2
bilhete $alt2
boca $alt2
bochecha $alt2
bojo $alt2
boleia $alt
bolero $alt
bolo $alt2
bolo $alt $verb
borboleta $alt2
bordo $alt
boto $alt2 $noun
bromelha $alt
cabeça $alt2
cabresto $alt2
@@ -703,16 +711,18 @@ caderneta $alt2
camiseta $alt2
cantora $alt2
caractere $alt
caramelo $alt
careta $alt2
carreta $alt2
casebre $alt
castelo $alt
cateto $alt2
catorze $alt2
cebola $alt2
cefaleia $alt
cerca $alt $verb
cerco $alt $verb
cesta $alt
cesta $alt2
chamego $alt2
chefe $alt
chinelo $alt
@@ -729,9 +739,12 @@ comodo $alt2
comera $alt2
comeres $alt2
comeste $alt2
concerto $alt2 $noun
concordo $alt
conforto $alt $verb
conheceste $alt2
conheço $alt2
consolo $alt2 $noun
contivermos $alt
copa $alt
copo $alt
@@ -761,7 +774,7 @@ descordo $alt
descova $alt2
desespero $alt2 $noun
desfecho $alt2
desprezo $alt $verb
desprezo $alt $verb
deva $alt2
devo $alt2
deveras $alt
@@ -771,14 +784,20 @@ discordo $alt
dissermos $alt
dobro $alt2 $noun
doce $alt2
doutoras $alt2
droga $alt
duelo $alt
dueto $alt2
elixir eliSir
elo $alt
emprego $alt2 $noun
encosto $alt $verb
endereço $alt2
endereço $alt $verb
enforco $alt
engordo $alt
enumerem $alt
enredo $alt $verb
enredo $alt $verb
enterro $alt2 $noun
envelope $alt
envolto $alt2
@@ -787,10 +806,12 @@ epopeia $alt
eritreia $alt
erro $alt2 $noun
erros $alt2
esboço $alt $verb
escopeta $alt2
escroto $alt2
esforço $alt $verb
esforço $alt $verb
esforços $alt
esgoto $alt2 $noun
esperma $alt
espeto $alt2 $noun
espiroqueta $alt2
@@ -803,12 +824,16 @@ estiveres $alt
estivermos $alt
estrela $alt2
estrofe $alt
estorno $alt $verb
estorvo $alt $verb
etiqueta $alt2
europa $alt
exagero $alt $verb
expeça $alt2
expeço $alt2
explore $alt
faceta $alt2
farelo $alt
farofa $alt
febre $alt
feitora $alt2
@@ -851,6 +876,7 @@ grozo $alt $verb
hoje $alt2
houvermos $alt
ideia $alt
insonoro $alt
joga $alt
jogam $alt
jogos $alt
@@ -867,6 +893,7 @@ maleta $alt2
mantiverdes $alt
mantiveres $alt
mantivermos $alt
marmelo $alt
marreta $alt2
martelo $alt
merda $alt
@@ -895,6 +922,7 @@ muita mw'iNt&
mulheres $alt
mureta $alt2
mutreta $alt2
namoro $alt2 $noun
naquele $alt2
negra $alt2
negro $alt2
@@ -902,23 +930,28 @@ novos $alt
obstetra $alt
obsoleta $alt2
obsoleto $alt2
pbvivera $alt
obtivermos $alt
odisseia $alt
onu $1
opereta $alt2
ordens $alt
osso $alt2
ostra $alt2
ovos $alt
pachorra $alt2
padeceste $alt2
paexa paeSa
pangeia $alt
palacete $alt2
palheta $alt2
pangeia $alt
pantera $alt
paralelo $alt
parede $alt2
pastora $alt2
pedra $alt
pelego $alt2
pelo $alt $verb
perde $alt
perdem $alt
perede $alt2
@@ -932,6 +965,7 @@ piloto $alt2
pirueta $alt2
plateia $alt
plebeia $alt
polca $alt
porcos $alt
porrete $alt2
porra $alt2
@@ -948,29 +982,39 @@ provo $alt
puder $alt
punheta $alt
puserdes $alt
quarteto $alt2
quinteto $alt2
quisermos $alt
recomeço $alt2 $noun
recordo $alt
recorto $alt
rede $alt2
redor $alt
reembolso $alt $verb
reforços $alt
refresco $alt $verb
reforço $alt $verb
refresco $alt $verb
reitora $alt2
relevo $alt2 $noun
remorso $alt
reprovo $alt
resolve $alt
resolvem $alt
rixa x'iS&
rocha $alt
rock $alt
rogas $alt
rolo $alt2 $noun
saleta $alt2
sarjeta $alt
severa $alt
severo $alt
seborreia $alt
seco $alt2 $noun
selo $alt $verb
secos $alt2
selo $alt $verb
selvagem seUv'aZeIN
sexteto $alt2
?1 senhora $alt2
sesta $alt2
sincera $alt
@@ -991,18 +1035,26 @@ sorvete $alt2
sossego $alt2 $noun
souberdes $alt
soubermos $alt
suborno $alt $verb
sufoco $alt2 $noun
sugere $alt
sugerem $alt
suporto $alt
suor swOr
tapete $alt2
tempero $alt $verb
tempero $alt2 $noun
teta $alt2
tetra $alt
tiver $alt
tivera $alt
tiveres $alt
tivermos $alt
tocha $alt
toga $alt
tola $alt2
tolo $alt2
topo $alt $verb
torno $alt $verb
torres $alt2
tortos $alt
traqueia $alt

+ 5
- 3
dictsource/pt_rules View File

@@ -216,6 +216,8 @@
@s) e (rAm_ E
sp) e (rA_ E
sp) e (rAm_ E
f) e (re_ E
f) e (rem_ E

e (rgA_ E
e (rgAm_ E
@@ -391,15 +393,13 @@ _reconh) e (çL03_ e
_sup) e (rL04_ E
_imp) e (rL03_ E
_temp) e (rL04_ E
_tol) e (rL04_ E
_esp) e (ssL03_ e
_l) e (ssL02_ e
_perd) e (L05_ e
_rend) e (L06_ e
_atend) e (L06_ e
_pen) e (trL04_ E
_Xref) e (rL02_ E
_desf) e (rL02_ E
_conf) e (rL02_ E
_reit) e (rL03_ E
par) e (çL01_ e // pareça, apareça
_arref) e (çL01_ e
@@ -859,6 +859,7 @@ _desenv) o (lvL02_ O
r) u (_A u
u (A_ 'u

u (am_ 'u
u (em_ 'u
ui uI
ui (_ 'uI
@@ -943,6 +944,7 @@ _desenv) o (lvL02_ O
mo) x (a S
_o) x (A S
_o) x (i ks
_o) x (í ks
pi) x (A S
_pro) x (A S
_pra) x (A S

+ 2
- 2
phsource/ph_english_us View File

@@ -130,7 +130,6 @@ phoneme 0
ChangeIfDiminished(@)
IF nextPh(r) THEN
ChangePhoneme(O:)
// FMT(vwl_en_us/oor)
ENDIF
FMT(vowel/aa_8)
endphoneme
@@ -366,7 +365,8 @@ phoneme t
voicingswitch d
lengthmod 2

IF prevPhW(isVowel) OR prevPhW(n) THEN
// IF prevPhW(isVowel) OR prevPhW(n) THEN
IF prevPhW(isVowel) THEN // test, don't reduce [t] after [n]
IF nextPhW(isVowel) AND nextPh(isUnstressed) THEN
IF next2Ph(n) AND next2Ph(notWordStart) THEN
ELSE

+ 13
- 1
phsource/ph_georgian View File

@@ -113,10 +113,22 @@ phoneme k
import_phoneme consonants/k-
endphoneme

phoneme q
vls uvl stop
lengthmod 2
Vowelin f1=1 f2=1700 0 200 f3=-300 80 gpaus f4 rms=30
Vowelout f1=1 f2=1700 -100 200 f3=-300 80 f4 rms=35

IF nextPh(#i) THEN
WAV(ustop/q2_i, 40)
ENDIF
WAV(ustop/q2, 48)
endphoneme



phoneme Q
import_phoneme base/Q"
import_phoneme base/r"
endphoneme

phoneme r

+ 3
- 0
phsource/phonemes View File

@@ -1727,6 +1727,9 @@ include ph_kannada
phonemetable ml hi
include ph_malayalam

phonemetable ur hi
include ph_urdu


phonemetable hu base
include ph_hungarian

+ 26
- 17
src/dictionary.cpp View File

@@ -1495,21 +1495,24 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
stress = 3;


if((stressflags & 0x1000) && (vowel_count == 2))
if(unstressed_word == 0)
{
// Two syllable word, if one syllable has primary stress, then give the other secondary stress
if(vowel_stress[1] == 4)
vowel_stress[2] = 3;
if(vowel_stress[2] == 4)
vowel_stress[1] = 3;
}
if((stressflags & 0x1000) && (vowel_count == 3))
{
// Two syllable word, if one syllable has primary stress, then give the other secondary stress
if(vowel_stress[1] == 4)
vowel_stress[2] = 3;
if(vowel_stress[2] == 4)
vowel_stress[1] = 3;
}

if((stressflags & 0x2000) && (vowel_stress[1] < 0))
{
// If there is only one syllable before the primary stress, give it a secondary stress
if((vowel_count > 2) && (vowel_stress[2] >= 4))
if((stressflags & 0x2000) && (vowel_stress[1] < 0))
{
vowel_stress[1] = 3;
// If there is only one syllable before the primary stress, give it a secondary stress
if((vowel_count > 3) && (vowel_stress[2] >= 4))
{
vowel_stress[1] = 3;
}
}
}

@@ -2873,13 +2876,15 @@ int TransposeAlphabet(Translator *tr, char *text)
int max;
const char *map;
char *p = text;
char *p2 = text;
char *p2;
int all_alpha=1;
int bits;
int acc;
int pairs_start;
const short *pairs_list;
char buf[N_WORD_BYTES];

p2 = buf;
offset = tr->transpose_min - 1;
min = tr->transpose_min;
max = tr->transpose_max;
@@ -2926,8 +2931,8 @@ int TransposeAlphabet(Translator *tr, char *text)
acc=0;
bits=0;

p = text;
p2 = text;
p = buf;
p2 = buf;
while((c = *p++) != 0)
{
if((pairs_list = tr->frequent_pairs) != NULL)
@@ -2958,9 +2963,13 @@ int TransposeAlphabet(Translator *tr, char *text)
*p2++ = (acc << (8-bits));
}
*p2 = 0;
return((p2 - text) | 0x40); // bit 6 indicates compressed characters
strcpy(text, buf);
return((p2 - buf) | 0x40); // bit 6 indicates compressed characters
}
else
{
return(strlen(text));
}
return(p2 - text);
} // end of TransposeAlphabet



+ 3
- 1
src/readclause.cpp View File

@@ -85,8 +85,9 @@ static const unsigned short punct_chars[] = {',','.','?','!',':',';',
0x055e, // Armenian question
0x055b, // Armenian emphasis mark

0x0b1b, // Arabic ;
0x061b, // Arabic ;
0x061f, // Arabic ?
0x06d4, // Arabic .

0x0f0d, // Tibet Shad
0x0f0e,
@@ -133,6 +134,7 @@ static const unsigned int punct_attributes [] = { 0,

CLAUSE_SEMICOLON, // Arabic ;
CLAUSE_QUESTION, // Arabic question mark
CLAUSE_PERIOD, // Arabic full stop

CLAUSE_PERIOD+0x8000, // Tibet period
CLAUSE_PARAGRAPH,

+ 1
- 1
src/synthdata.cpp View File

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

const char *version_string = "1.46.32 30.Jan.13";
const char *version_string = "1.46.33 08.Feb.13";
const int version_phdata = 0x014631;

int option_device_number = -1;

Loading…
Cancel
Save