diff --git a/dictsource/an_rules b/dictsource/an_rules
index cf0c3537..932eadfb 100755
--- a/dictsource/an_rules
+++ b/dictsource/an_rules
@@ -181,6 +181,8 @@
qu (é k
qu (í k
qu ('A k
+ qu ('hA k
+
.group r
r r
diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index a6b9d4ca..c5f18696 100644
--- a/dictsource/dict_phonemes
+++ b/dictsource/dict_phonemes
@@ -85,15 +85,15 @@ p r R R2 s S t tS
v w x X z
-Dictionary en_dict 2013-12-20
+Dictionary en_dict 2014-01-21
-0 0# 3 3: @ @- @2 @5
-@L a a# A: A@ aa aI aI3
-aI@ aU aU@ A~ e E E# e:
-e@ eI i I I# I2 i: i@
-i@3 IR n- o O O: o: O@
-o@ OI oU O~ u U u: U@
-V VR
+0 0# 02 3 3: @ @- @2
+@5 @L a a# A: A@ aa aI
+aI3 aI@ aU aU@ A~ e E E#
+e: e@ eI i I I# I2 i:
+i@ i@3 IR n- o O O: o:
+O@ o@ OI oU O~ u U u:
+U@ V VR
* : ; ? b C d D
d# dZ f g h j k l
@@ -116,7 +116,7 @@ s S t tS ts v x z
Z
-Dictionary ta_dict 2013-12-20
+Dictionary ta_dict 2014-01-18
a a: aI aU e E e: i
I i: o o: u U u2 u:
@@ -293,7 +293,7 @@ n^ p r R R2 s S t
tS ts v z Z
-Dictionary pt_dict 2013-12-20
+Dictionary pt_dict 2014-01-21
& &/ &U~ &~ @ @- a A
aI aU e E eI EI eU EU
@@ -409,6 +409,19 @@ r r. s S t t# t. t.#
tS tS# v w ~
+Dictionary or_dict 2013-12-26
+
+& @ @- a a~ e e~ i
+i: i~ l- o O o: O~ o~
+r- u u: u~ V
+
+* : b b# d d# d. d.#
+dZ f g g# h H j J
+J# k k# l m n N n.
+p p# r r. s S t t#
+t. t.# tS tS# v w
+
+
Dictionary te_dict 2013-11-23
a a: aI aU e E e: i
@@ -494,7 +507,7 @@ t# tS ts ts# v w x z
Z
-Dictionary an_dict 2013-12-19
+Dictionary an_dict 2013-12-23
a aI aU e E e# eI eU
i o O oI u U
@@ -795,7 +808,7 @@ r r. s S t t# t. t.#
tS tS# v w X ~
-Dictionary gu_dict 2013-12-21
+Dictionary gu_dict 2014-01-21
@ @- @2 @3 a a: aI aI~
aU aU~ e E e: e~ i I
diff --git a/dictsource/en_list b/dictsource/en_list
index b6672b10..5c70237e 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -12,12 +12,12 @@
// ?3 General American
// ?!3 Not General American
// ?5 split [3:] er [3:], ir [IR], ur [VR]
-// ?6 'one' = [wVn], 'of' = [Vv]
+// ?6 'one' = [wVn], 'of' = [Vv] (now uses phoneme [02])
// ?7 Scottish
// ?8 Use full vowel, not schwa in some word endings
-// $alt1 use strong ending (-an, -ance, -ative, -table, -eria, -et, -inal, -ier -or -ored, -s)
-// $alt2 use weak ending (ace, ain, an, ard, ate, ery, ess, ile, men, on, ot)
+// $alt1 use strong ending (-an, -ance, -ative, -table, -eria, -et, -inal, -ier -mouth -or -ored, -s)
+// $alt2 use weak ending (ace, ain, an, ard, ate, ell, ery, ess, ile, ine, men, on, ot)
// $alt3 use weak first vowel, a->[a#], e->[@], o->[0#]
// $alt4 separate 'h', not 'th' 'ph'; [t2] not [t]
// $alt5 remove only 's' from plural (-ies)
@@ -454,8 +454,7 @@ U+32f n,0nsI2l'abI2k
//_0 zero $text // TEST
_0 z'i@roU
-_1 w'0n
-?6 _1 w'Vn
+_1 w'02n
_2 t'u:
_3 Tr'i:
_4 f'o@
@@ -602,6 +601,7 @@ ltd lImI2tI2d
//mc m@k $combine // combine with the following word
mhz mEg@h3:ts
mit $abbrev $allcaps
+mmorpg $abbrev
motd $abbrev
mpaa $abbrev
msaa $abbrev
@@ -828,6 +828,7 @@ amen ,A:m'En $onlys
?3 amen a#mEn // amenable
?3 amen ,eIm'En $onlys
?3 amo amoU
+amish A:mIS
amok a#m0k
amoral eIm'0r@L
amount a#maUnt
@@ -849,7 +850,7 @@ anise anIs
anniversary anIv'3:s@ri
anomaly a#n0m@li
anon a#n0n
-anonymous a#n0n@m@s
+anonymity an@n'ImI2ti
another a#nVD3
ante anti:
antecedent antIs'i:d@nt
@@ -915,6 +916,7 @@ armslength ,A@mzl'ENT
aroma a#roUm@
arouse a#raUz
asbestos asb'Est@s
+asparagus a#spar@g@s
arsenal A@s@n@L
arsenic A@snIk
ascertain as3teIn
@@ -945,7 +947,7 @@ aussie 0zi
austere O:st'i@3
authority a#T0rI2ti
authoritative O:T'0rI2t@tIv
-?3 authoritative a#T'Or@t2eIt2Iv
+?3 authoritative a#T'O@I#t2eItIv
autism O:t2Iz@m
autograph O:t@graf
auto O:toU
@@ -1040,12 +1042,14 @@ blasé blA:z'eI
bleh blEh
blockade bl0k'eId
blouse blaUz
+bludgeon $alt2
bluest blu:@st
bluish blu:IS
blurry bl3:rI
?5 blurry blVRrI
boardmember $1
boing bOIN
+bologna b@loUni
bolognese b0l@n'eIz
bombard $2
bombardier b0mb3d'i@3
@@ -1205,7 +1209,7 @@ chassis Sasi
chateau SatoU
chemise S@mi:z
chevrolet SEvr@l'eI
-chianti kjanti
+chianti kjA:nti
chic Si:k
chiffron SIfr0n
chihuahua tSI2wA:w@
@@ -1340,7 +1344,8 @@ construct $verb
consummate $1
contemplative $2
content $1 $onlys
-content $verb $past
+content $verb
+content $past
contest k0nt2Est $onlys
contest $verb
context $1
@@ -1380,6 +1385,7 @@ corrugate k0r@geIt
corsage kO@s'A:Z
cosmos k0zm0s
?3 cosmos k0zmoUs
+cottonmouth $alt1
cougar ku:g3
counteract $3
countered kaUnt3d
@@ -1395,6 +1401,7 @@ coyote kaI'oUti
creature kri:tS3
?3 cremate kri:meIt
crescendo kr@SEndoU
+?3 cretin kri:?n-
crevasse kr@vas
crisis kraIsIs
crises kraIsi:z
@@ -1404,6 +1411,7 @@ crochet kroUS'eI
croissant kwA:sA~
crooked krUkId
cuckoo kUku:
+(cum laude) kUml'aUdi
cupboard kVb@d
cupholder $alt4
curate kjU@reIt
@@ -1421,6 +1429,7 @@ cypress saIpr@s
dahlia deIli:@
dais deIIs
dandelion dandI2laI@n
+darnedest dA@nd@st
ddu DI $only // Welsh
de d@ $only
(de jure) deIdZ'U@ri
@@ -1433,6 +1442,7 @@ debut deIbju:
?3 debut deIb'ju:
decade dEkeId
decaf di:kaf
+decedent dI#si:d@nt
decent di:s@nt
decibel dEsI#b@L
declaration dEkl@'reIS@n
@@ -1665,6 +1675,7 @@ exalt Egz'0lt
excuses Ekskj'u:sI#z
execute EksI2kju:t // not $2
executable $3
+exes EksI#z
exile $1
exit EgzIt // exiting
exodus Eks@d@s
@@ -1691,7 +1702,8 @@ eyrie i@ri
facade f@sA:d
façade f@sA:d
-facetious $alt3
+facet fasEt
+facetious fa#si:S@s
faculty fak@Lt2i
faeces fi:si:z
fahrenheit far@nhaIt
@@ -1707,9 +1719,7 @@ fatigue $alt3
fathom faD@m
faux foU
(faux pas) f,oU||p'A:
-favorite feIv@-rI2t // sp.
favourite feIv@-rI2t
-favorites feIv@-rI2ts // sp.
favourites feIv@-rI2ts
fedora fI2d'o@r@
feisty faIsti
@@ -1812,6 +1822,7 @@ genre Z0nr@
gentlemen dZEnt@Lm@n
genuine dZEnju:I#n
geo dZi:oU
+geometry dZi;'0m@tri
geode dZi:oUd
geologist $2
geyser gi:z3
@@ -1836,6 +1847,7 @@ gorilla g3rIl@
gospel g0sp@L
gossamer g0s@m3
goto goUtu:
+goalmouth $alt1
gourmand gU@mA:nd
gourmet gU@meI
graduate $alt2
@@ -1909,6 +1921,7 @@ heroin hEroUIn
heroism hEroUIz@m
heroine hEroUIn
herpes h3:pi:z
+heterogenous hEtroUdZ'i:n@s
hiatus haI'eIt@s
hideout haIdaUt
hindus hIndu:z
@@ -1916,6 +1929,7 @@ hiphop $alt4
hiya haIa#
hmmm h'@m
hmpf h'@mpf
+hola _^_ES
holistic $alt3
holme hoUm
holster hoUlst3
@@ -2019,6 +2033,7 @@ insult $2
insult $1 $onlys
intake Int2eIk
intel Int2El
+(inter alia) Int3||'eIli@
interim $1
intermediate Int3m'i:di@t
interment I2nt3:m@nt
@@ -2056,6 +2071,7 @@ jacuzzi dZ@ku:zi
jagged dZagI#d
jaguar dZagwA@
jalapeno hA:l@p'eIn;oU
+jalopy $alt3
japan dZ@pan
jasmine dZazmIn
jedi dZEdaI
@@ -2073,10 +2089,12 @@ jumbalaya dZVmb@l'aI|@
kaput $alt3
karaoke karI'oUki
karate k@rA:ti
+katar $alt3
kayak kaIak
kebab k@bab
?3 kebab k@bA:b
kefir ki:f3
+kerosene kEr@si:n
?3 khaki kaki
kilo ki:loU
kilometer kIl'0mI2t3
@@ -2102,7 +2120,8 @@ labor leIb3
labored leIb@d
laborer leIb@r3
laborious $alt3
-labyrinth lab3rInT
+labyrinth lab3InT
+labyrinthine lab3'InTi:n
lascivious $alt3
lager lA:g3
lagoon $alt3
@@ -2121,6 +2140,7 @@ latrine $alt3
latte lA:t2eI
?3 launch lA:ntS
lava lA:v@
+lavender lav@nd3
le l@_| $only
lead li:d
leafy li:fi
@@ -2180,6 +2200,7 @@ lorenz l0r@nts
los ,l0s $only
losing lu:zIN // misspell
?3 lost lOst
+loudmouth $alt1
lukewarm lu:kwO@m
lullaby lVl@baI
lunatic lu:n@tIk
@@ -2206,6 +2227,7 @@ maintain $2
maintainer $2
majora $alt3
majority m@dZ0rI2ti
+makeup meIkVp
malicious $alt3
malinger $alt3
mall mal
@@ -2227,9 +2249,9 @@ manure m@njU@
maraud m@rO:d
marauder m@rO:d3
marcel mA@s'El
-marquee mA@k'i:
margarine mA@dZ3ri:n
?3 margarine mA@dZ3r@n
+marquee mA@k'i:
maroon $alt3
marquis mA@rk'i:
marshall mA@S@L
@@ -2249,6 +2271,7 @@ mediaeval mEdI'i:v@L
medicine mEds@n
?3 medicine mEd@s@n
meh mE
+melamed mEl@mEd
melee mEleI
?3 melee meIleI
memento $alt3
@@ -2271,6 +2294,7 @@ metastable $alt1
mezzanine mEz@ni:n
miaou mi:'aU
miaow mi:'aU
+miasma maI'azm@
mic maIk
mica maIk@
microorganism maIkroU'O@g@nIz@m
@@ -2399,6 +2423,7 @@ notwithstanding $3
noway noUweI
nowhere noUwe@
?3 nuance nu:0ns
+numbly nVmli
oases oU'eIsi:z
oasis oU'eIsI2s
@@ -2414,7 +2439,6 @@ obsolete 0bs@li:t
obstacle 0bst@k@L
occupier 0kju:paI|3
occult $alt3
-oceanic oUSI'anIk
ocelot 0s@l0t
ochre oUk3
o'clock @kl0k
@@ -2445,6 +2469,7 @@ opposer @poUz3
orange 0rI2ndZ
ordeal O@d'i@l
oregano 0rIg'A:noU
+organelle O@g@n'El
orion 0r'aI@n
ornate $2
orphan O@f@n // orphaned
@@ -2508,11 +2533,13 @@ papyrus pa#paIr@s
parabola p@rab@l@
paralysis p@ral@sIs
parameter p@ramI2t3
+paramour para#mU@
parasite par@saIt
paren $alt3 // "parenthesis"
-parental $alt3
+parental p3Ent@L
pariah p@raI@
parole $alt3
+parrot par@t // -ed -ing
passenger pasI2ndZ3
passerby pas3b'aI
passersby pas3zb'aI
@@ -2520,6 +2547,7 @@ passersby pas3zb'aI
pasted peIstI#d
pasting peIstIN
pastry peIstri
+paradise par@daIs
partake $2
pate pat2eI
?3 patent pat@nt
@@ -2666,6 +2694,7 @@ proceed $only
produce pr0dju:s $noun $only
progeny pr0dZ@ni
?3 programmable $2
+prognosis pr0gn'oUsIs
progress proUgrEs $only
?3 progress pr0grEs $only
progress $verb
@@ -2690,7 +2719,7 @@ psychotic saIk'0tIk
pud pUd // and pudding
punative pju:n@tIv
puny pju:ni
-purist pju:r-Ist
+purist pjU@Ist
purport $2
purportedly $2
puree pjU@reI
@@ -2818,6 +2847,7 @@ resell ri:s'El
reservation rEz3v'eIS@n
reservoir rEz3vwA@
resin rEzIn
+résistance reIzIst'A~ns
?3 respite rEspI2t
restive rEstIv
respiration rEspI#r'eIS@n
@@ -2870,6 +2900,7 @@ saboteur sab@t'3:
?5 saboteur sab@t'VR
sabre seIb3
sachet saSeI
+saccharine sak3In
sacred seIkr@d
sacrifice sakrI2faIs
sadistic $alt3
@@ -2887,6 +2918,7 @@ salmon sam@n
?3 salon $alt3
saloon $alt3
san ,san $only
+sanguine $alt2
sardine $2
sassafras sasa#fras
satanic $alt3
@@ -2896,6 +2928,7 @@ saudi saUdi
saute sO:teI
?3 savant sa#vA:nt
savagery savIdZri
+sayonara saI|@n'A@@
says sEz
scaly skeIlI
scalpel skalp@L
@@ -3058,6 +3091,7 @@ strychnine str'Ikni:n
sterile stEraIl
stomata stoUm@t@
storytelling stO:rItElIN
+strategic str@ti:dZIk
stringed strINgd
stripy straIpI
stygian stIdZi@n
@@ -3225,7 +3259,9 @@ triceratops traIs'Er@t0ps
tricycle traIsIk@L
trilogy trIl@dZi
trio tri:oU
+triplicate $alt2
trisquel trIsk'El
+triumphant $2
trois twA:
trophy troUfi
troubadour tru:b@do@
@@ -3240,6 +3276,7 @@ turnkey t3:nki:
?5 turnkey tVRnki:
tuna tju:n@
?3 tuna tu:n@
+tunafish tu:n@fIS
twas tw0z
twilight twaIlaIt
twos tu:z
@@ -3297,6 +3334,7 @@ useful ju:sf@L
utan u:t'an
utensil ju:t'Ens@L
+vaccine $2
valet valeI
?3 valet val'eI
valise va#li:s
@@ -3330,7 +3368,8 @@ vicar vIk3
videoconference v'Idi:oU||k'0nfr@ns
videotape v'Idi:oUt2,eIp
vigilante vIdZI2l'anti
-vignette vInj'Et
+vignet vI2njEt
+vignette vI2njEt
villi vIlaI
vineyard vInj3d
vinyl vaInI#l
@@ -3369,6 +3408,7 @@ webpage wEbpeIdZ
wehrmacht ve@maxt
website wEbsaIt
weekend $2
+whatnot w02tn0t
wheelbarrow w'i:l_b,aroU
wherewithal we@wIDO:l
whew fju:
@@ -3391,6 +3431,7 @@ wind waInd $verb
winded wIndI#d
winged wINd
wino waInoU
+wiretap $alt4
wither wID3 // not with+er
without $2
wordprocessor $2
@@ -3545,7 +3586,7 @@ Bideford bIdIf@d
Bogota b0g@t'A:
?3 Bogota boUg@t'A:
Bogotá bogota $text
-Bologna b@loUn;@
+Bologna b@loUn;@ $capital
?3 Boston bOst@n
Bucharest bu:ka#r'Est
Budapest bu:d@p'Est
@@ -3764,6 +3805,7 @@ Sabattus $alt3
Sahel sA:h'El
Saigon saIg'0n
Santiago santI'A:goU
+Sarajevo sara#j'eIvoU
Savannah $alt3
Savoy $alt3
Seattle si:'at@L
@@ -3895,6 +3937,7 @@ Bernard b3:n@d
Betsy bEtsi
Betsey bEtsi
Bjarne bjA@n@
+Blanche blA:nS
Boris b0rIs
Bremen brEm@n
Brianna brI'an@
@@ -3914,6 +3957,7 @@ Cecilia sI2si:li@
Cesar seIz'A@
Circe s3:si
Charlotte SA@l@t
+Cheney tSeIni
Cher Se@
Cheri Se@r'i:
Cherie Se@r'i:
@@ -3965,6 +4009,7 @@ Dylan dIl@n
Ebenezar Eb@n'i:z3
Edith i:dIT
Eduardo Edw'A@doU
+Einín Eni:n
Elijah I2laIdZ@
Elise I2li:z
Elisabeth I2lIz@b@T
@@ -3975,7 +4020,7 @@ Emerson Em3s@n
Emily EmI2li
Emma Em@
Emmy Emi
-Einín Eni:n
+Enrique Enr'i:keI
Esther Est3
Etheridge ET@-rIdZ
Etienne EtI'En
@@ -3989,6 +4034,7 @@ Freda fri:d@
Fírinne fi:rIn;@
Gareth gar@T
Gary gari
+Georgina dZO@'dZi:n@
Geraint gEraInt
Gerhard ge@hA@t
Gillespie gI2lEspi
@@ -4031,11 +4077,13 @@ Jacob dZeIk@b
Jacques Zak
Jamal dZa#m0l
Jamie dZeImi
+Janine dZ@ni:n
Jared dZar@d
Jarrad dZar@d
Jerald dZe@r@Ld
Jesse dZEsi
Jesus dZi:z@s
+Joachim dZoU@kIm
Jonah dZoUn@
Jorge ho@heI
José hoUs'eI
@@ -4057,6 +4105,7 @@ Leann li:'an
Leanne li:'an
(Le ann) li:'an
Lenore lEn'o@
+Leola li:'oUl@
Leon li:0n
Leonard lEn3d
Leroy li:rOI
@@ -4095,6 +4144,7 @@ Matthew maTju:
Maurice m0rIs
Mavis meIvIs
Megan mEg@n
+Melinda $alt3
Mellisa $alt3
Mellissa $alt3
Melissa $alt3
@@ -4109,6 +4159,7 @@ Mindy mIndi
Minerva mI2n3:v@
Mirabel mIr@bEl
Misha mi:S@
+Mitchell $alt2
Moet moU'Et
Moët moU'Et
Mohamed mohammad $text
@@ -4214,6 +4265,7 @@ Vanessa $alt3
Vernon $alt2
Wallace w0lI#s
Wally w0li
+Wilhelmina wIlh@lm'i:n@
?3 William wIlj@m
Yerevan jEr@v'an
Yves i:v
@@ -4223,10 +4275,12 @@ Zoe zoUi
Acura akjUr@
Advil advIl
Andromeda andr'0mId@
+Aquino a#ki:noU
Asimov azI#m0f
Assad a#sA:d
Atropos atr@p0s
Avery eIv3i
+Baumer baUm3
Bede bi:d
Beethoven beIt2oUv@n
Beowulf beI@wUlf
@@ -4239,6 +4293,7 @@ Campbell kamb@l
Capone ka#poUn
Carnegie kA@n@gi
Chartier SA@ti'eI
+Cialis si:'alI#s
Cohen koU@n
Connolly $1
Cortez $2
@@ -4252,6 +4307,9 @@ Dante dA:nt2eI
Deslauriers dI2lo@rIeI
Deveraux dEv3roU
Digiorno dI#Zo@noU
+Dillard $alt2
+Dimaggio dI#mA:ZIoU
+(Di maggio) dI#mA:ZIoU
Disney dIzni
?3 Dolby doUlbi
Dolce d0ltSeI
@@ -4259,7 +4317,9 @@ Donatello d0n@t'EloU
Dulles dVl@s
Dvorak d@-vo@Zak
Emory Em3ri
+exxon Eks0n
Ferguson f3:g@s@n
+Fernandes f3nA:ndEs
Fleming flEmIN
Folger foUldZ3
Forrester f0rI#st3
@@ -4267,6 +4327,7 @@ Foushee fu:S'eI
Gaia gaI|@
Gallagher gal@g3
Genghis dZENgIs
+Ghandhi gandi
Gibson gIbs@n
Godzilla g0dz'Il@
Goliath $alt3
@@ -4282,6 +4343,7 @@ Iscariot $2
Jacobi dZa#koUbi
Jerrard dZ3rA@d
Jimenez hIm'EnEz
+Jonese dZoUnz // Joneses
Kawasaki kaU|@s'A:ki
Kendell kEnd@L
Khrushchev kru:StSEf
@@ -4289,14 +4351,15 @@ Klein klaIn
Kroger kroUg3
Kyocera kaI|@s'i@r@
Lamaze la#mA:z
-Laurell $2
Lussier lVsIeI
Mackenna m@kEn@
Mackenzie m@kEnzi
Maguire m@gwaI3
+Malone $alt3
Medusa $alt3
Michelangelo maIk@L'andZ@loU
Microsoft maIkr@s0ft
+Minet mI2neI
Monet moUn'eI
Montague m0nt2@gju:
Mossad moUs'A:d
@@ -4312,6 +4375,7 @@ Patel $alt3
Perez p3rEz
Pérez pErEz
Perrier pErI'eI
+?3 Peugeot pju:Z'oU
Pokemon poUkeIm0n
Pompadour p0mpa#do@
Porsche po@S
@@ -4333,6 +4397,7 @@ Rodrigues r0dr'i:gEz
Rojas roUhA:s
Roosevelt roUz@vElt
Ruiz ru:'i:z
+Sachs saks
Sanchez santSEz
Shakur Sa#kU@
Sturgis st3:dZIs
@@ -4380,8 +4445,7 @@ zune zu:n
// COMMON WORDS
//*************************************************************************
-(no one) 'noU'w0n
-?6 (no one) 'noU'wVn
+(no one) 'noU'w02n
(no longer) n,oU||l'0Ng3
(no more) n'oU,mo@
@@ -4393,21 +4457,18 @@ so ,soU $strend2
//prepositions
// these should be stressed at the end of a sentence
-of 0v $u $only
-?6 of Vv $u $only
+of 02v $u $only
(of a) @v@ $nounf
(of an) @v@n $nounf
-(of which) 0vwItS $2 $pause
-(of the) %%0vD@2 $nounf
-?6 (of the) %VvD@2 $nounf
-?6 (of which) VvwItS $2 $pause
+(of which) 02vwItS $2 $pause
+(of the) %%02vD@2 $nounf
for fO@ $u
(for a) f3@ $nounf
(for an) f3@n $nounf
(for the) f3D@2 $nounf
-(for a while) f@@||w'aIl
-(for one) fO@w0n $2 $atend
+(for a while) f3@||w'aIl
+(for one) fO@w02n $2 $atend
to t@5 $verbf // @ change to U before vowel
(to be) t@b%i $pastf
@@ -4420,8 +4481,7 @@ to tu: $u $allcaps
at at $nounf $only $u
(at a) %at@ $nounf
-(at once) a#t_w0ns
-?6 (at once) a#t_wVns
+(at once) a#t_w02ns
(at will) a#t_w'Il
(at & t) 'eIt2i:@nt'i:
@@ -4594,6 +4654,7 @@ got %g0t $strend2 $pastf $only
go ,goU $strend2 $only
goes %goUz $strend2 $only
+goeth goU@T $u+
going ,goUIN $strend2 $only
gone %g0n $strend2 $only
?3 gone %gOn $strend2 $only
@@ -4603,6 +4664,7 @@ do du: $verbf
(do not) du:n0t $verbf $u2+
does dVz $verbf
(does not) dVzn0t $verbf $u2+
+doth dVT $u+
don't doUnt $verbf
doesn't dVz@nt $verbf
doesnt dVz@nt $verbf
@@ -4630,6 +4692,7 @@ you're %jO@
they're %DeI3
it'd %It@d
that'd %Dat@d
+(that's it) Dats'It
there'd %De@d
I'll aIl $u $verbf
@@ -4704,10 +4767,10 @@ their De@ $u $nounf $only
theirs De@z
none nVn
-noone noUw0n
-anyone EnIw0n
-everyone EvrIw0n
-someone sVmw0n
+noone noUw02n
+anyone EnIw02n
+everyone EvrIw02n
+someone sVmw02n
//conjunctions
@@ -4730,8 +4793,7 @@ thus DVs $pause
though ,DoU
whenever wEnEv3 $u2 $pause
whoever hu:Ev3 $2
-whatever w0tEv3 $2 $pause
-?3 whatever wVtEv3 $2 $pause
+whatever w02tEv3 $2 $pause
while w,aIl $brk $strend
whilst w,aIlst $pause
@@ -4759,21 +4821,18 @@ any ,Eni $nounf $only
many mEni $nounf
(many of) mEnI|@v
some ,sVm $nounf $unstressend $only
-(some one) sVmw0n
-?6 (some one) sVmwVn
-one w0n $nounf $onlys $unstressend
-ones w0nz $only $unstressend
+(some one) sVmw02n
+one w02n $nounf $onlys $unstressend
+ones w02nz $only $unstressend
this DIs $u+ $nounf $verbsf
-(this one) D'Isw,0n $verbsf
-?3 (this one) D'Isw,Vn $verbsf
+(this one) D'Isw,02n $verbsf
that Dat $u $nounf $strend2 $verbsf
(that a) ,Dat@ $nounf
(that an) ,Dat@n $nounf
(that it) ,Da#tIt $verbsf
-(that was) Da#t||w0z $atend
-(that one) D'atw,0n
-?3 (that one) D'atw,Vn
+(that was) Da#t||w02z $atend
+(that one) D'atw,02n
(that the) %DatD@2
(that has been) Da#tha#zbIn $u+
(that's been) Da#tsbIn $u+
@@ -4785,6 +4844,7 @@ there've De@v $u
(there is) De@'Iz $atend
(there be) De@b'i:
(there was) D%e@w,0z $strend
+?3 (there was) D%e@w,Vz $strend
(there were) D%e@,w3: $strend
than Da#n $u $only
@@ -4820,16 +4880,6 @@ like laIk $strend2
-// ?6 'one' = [wVn], 'of' = [Vv]
-?6 noone noUwVn
-?6 anyone EnIwVn
-?6 everyone EvrIwVn
-?6 someone sVmwVn
-?6 (some one) sVmw0n
-?6 one wVn $nounf $onlys $unstressend
-?6 ones wVnz $only $unstressend
-
-
// General American
agile $alt2
docile $alt2
diff --git a/dictsource/en_rules b/dictsource/en_rules
index 34e3bf9c..52f3c409 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -24,7 +24,7 @@
// ?3 General American
// ?!3 Not General American
// ?5 split [3:] er [3:], ir [IR], ur [VR]
-// ?6 'one' = [wVn], 'of' = [Vv]
+// ?6 'one' = [wVn], 'of' = [Vv] (now uses phoneme [02])
// ?7 Scottish
// ?8 Use full vowel, not schwa in some word endings
@@ -38,7 +38,7 @@
.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
+.L10 graph log met scop // scientific endings
.replace
@@ -53,9 +53,10 @@
-) a (- a#
_) a (- 'eI
_) a (-half a#
- X) a ($w_alt3+++++ a#
+ X) a ($w_alt3++++++ a#
sw) a (B 0
a (Be# eI
+ a (Beu a
w) a (Be# eI
a (Cee+ a
a (BeCo_ a
@@ -153,7 +154,7 @@
irr) a (tio a
a (tion 'eI
_r) a (tion a
- n) a (tional a
+ _n) a (tional a
@) a (tious 'eI
n) a (tur eI
n) a (tura a
@@ -357,6 +358,7 @@
.group ad
_) ad (@ a#d
_) add ad
+ _) add (end a#d
_) add (ict a#d
_) add (itio a#d
_) add (r a#d
@@ -525,6 +527,7 @@
aise (_ 'eIz
_c) ais (l aS // 'caislin'
@l) ais (_ eI
+ ai (sC_ eII
portr) ai (t I#
.group al
@@ -779,6 +782,7 @@
_) anna an@
_) an (oi a#n
_) anom a#n0m
+ _) anony (m a#n0n@
&) an (_ @n
&) an (_$w_alt1+ an
&) an (_$w_alt2+ @n
@@ -1016,13 +1020,13 @@ propag) an (d 'an
z) are (_ 'A@reI
%C) ared (_ 3d
%C) aring (_ 3rI2N
- area e@ri@
+ area 'e@ri@
arest (_ e@r@st
ar (en ar
p) are (nthe @rE
c) ar (eer ar
c) are (C@ e@
- p) ar (ent e@r
+ p) aren (t e@r@n
pp) ar (enC ar
sp) ar (enC ar
ar' (nt A@
@@ -1053,7 +1057,7 @@ propag) an (d 'an
p) ar (i ar
p) ar (in e@
&) ar (in_ @r
- _kat) ar @r
+ _kat) ar (@ @r
v) ar (iA e@r
@) ar (ity ar
ar (iu+ 'e@r
@@ -1477,6 +1481,7 @@ _it_separ) ate (_ @t
cc (i ks
co) cc (i_ k
cc (inA_ tS
+ va) cc (in ks
c (aes s
caco (ph ka#k'0
_) cement sI2mEnt
@@ -1495,14 +1500,13 @@ _it_separ) ate (_ @t
_) ce (lest s@
c (elt k
c (ellL03_ tS'
- cial (_ S@L
-?8 cial (_ Sa#l
- cial S@l
- cian (_ S@n
- cian Si@n
+ &) cia (X S@
+?8 &) cia (X Sa#
+ &) cial S@L
+ &) cian Si@n
cius (_ S@s
cia (lity SIa
- cia (b Si@
+ &) cia (b Si@
_) cia (ra ki@
ma) c (in k
ciph (er saIf
@@ -1601,6 +1605,7 @@ _it_separ) ate (_ @t
_) co (ag k%oU
coa (les k%oU@
coa (lit koU@
+ _) co (chair koU
_) co (con k,oU
_) co (depenP2 k,oU
_) co (eCP2 k,oU
@@ -1769,6 +1774,7 @@ _it_separ) ate (_ @t
dt (_ t
?3 &) du (CA dZu:
@) du (al_ dZu:
+ @) du (alis dZu:
du (cat dZu:
@) dum (_ =d@m
?3 _) du (o du:
@@ -1810,6 +1816,7 @@ _it_separ) ate (_ @t
de (finit dE
de (flat d%i:
de (feren dE
+ _) defragment di:fragm'Ent
de (ft dE
_) de (g@ dI2
_) de (hyd ,di:
@@ -1880,6 +1887,7 @@ _it_separ) ate (_ @t
deter dI2t3:
deter (i dI2ti@r
detest dI2tEst
+ _) de (tB dE
_) de (th d%i:
de (ton dE
de (tou di:
@@ -1995,6 +2003,7 @@ _it_separ) ate (_ @t
@@) eble (_ @b@L
cel) e (bra @
e (bria i:
+ _) e (bulli %I
t) ech (_ Ek
m) e (chanic I
sp) e (cia E
@@ -2030,6 +2039,8 @@ _it_separ) ate (_ @t
@) e (gic 'i:
l) egion i:dZ@n
l) e (git @
+ _) ego i:goU
+ _) ego (t Eg@
n) e (got I2
int) e (gra I
n) e (gro i:
@@ -2145,6 +2156,7 @@ _it_separ) ate (_ @t
w) ear (y i@3
y) ear (n 3:
eas (an Ez
+ f) eas (an i:z
eas (en Ez
easo (n i:z@
easur EZ3
@@ -2242,7 +2254,7 @@ _it_separ) ate (_ @t
eig (n eI
eig (er_ aIg
n) eil i:l
- ei (m_ aI
+ ei (m aI
@) ei (n_ i:
ei (nate I
@) ei (ne i:
@@ -2255,7 +2267,7 @@ _it_separ) ate (_ @t
th) ei (sC i:I
_s) eis (m aIz
eis (e aIz
- ei (ster aI
+ eister aIst3
f) ei (t_ I
f) ei (te I // for 'add e' to 'forfeit' etc.
h) ei (t_ aI
@@ -2268,9 +2280,9 @@ _it_separ) ate (_ @t
.group el
_) el (A %Il
- _) ele (ctro %Il,E
- _) ele (ctrol %IlE
- _) ele (ctron ElE
+ _) electro %Il,EktroU
+ _) elect (rol %ElEkt
+ _) elect (ron ElEkt
_) ele (g ElI
_) elem ElIm
_) ele (p ElI
@@ -2289,6 +2301,7 @@ _it_separ) ate (_ @t
&C) eller (_ @l3
t) eller (_+ El3
&C) eler (_ @l3
+ &) ell (_$w_alt2 @L
@) elli (_ 'ElI
&) elling @lI2N
&) eling @lI2N
@@ -2372,6 +2385,7 @@ _it_separ) ate (_ @t
&) ency (_ @ns%i
ency (cli %EnsI
k) en (d_ En
+ s) en (d_ En
t) en (d_ En
en (dA_ 'En
_) en (d En
@@ -2487,7 +2501,7 @@ _it_separ) ate (_ @t
@@) eo (_ 'eIoU
g) eo I20
_g) eo (gr I0
- _g) eo (lo IO
+ _g) eo (log IO
_g) eo ,i:%oU
_g) eor O@
eoa (_ i@
@@ -2542,6 +2556,7 @@ _it_separ) ate (_ @t
cam) era @-r@
XC) err Er
erred (_ '3:d
+ errer (_ '3:r3
er (_ 3:
er (B_ 3:
_c) ere (br 3ri:
@@ -2646,7 +2661,7 @@ _it_separ) ate (_ @t
_v) ery ErI2
qu) ery i@rI
_x) er (o i@r
- z) er (o+ i@r
+ _z) er (o+ i@r
_C) er (o_ i@r
er (rA E
err (_N e@
@@ -2873,6 +2888,7 @@ _it_separ) ate (_ @t
f (f
fa (ciA feI
+ _) face feIs
fa (miliar f@
er) fed (_ fEd
_) fi (tz@ fI2
@@ -3057,6 +3073,7 @@ _it_separ) ate (_ @t
i (bilit I
b) i (ble_ aI
@) ible (_S4ev @b@L
+ @) ibles (_S5ev @b@Lz
@) ibly (_S4efv @bl%I
i (bo_ i:
v) i (br aI
@@ -3101,6 +3118,7 @@ _it_separ) ate (_ @t
_) idea aId'i@
f) i (del I2
i (deo I
+ i (deol aI
_s) i (der aI
i (der+_ aI
i (der_+ aI
@@ -3258,6 +3276,7 @@ _it_separ) ate (_ @t
pl) ier (_ aI3
_Cr) ier aI3
ier (c i@3
+ iere (_ i'e@
ierre (_ I2e@
ie (t aI@
&) ie (t_ i@
@@ -3531,6 +3550,7 @@ _it_separ) ate (_ @t
f) in (a aIn
@g) in (a_ aIn
ch) in (a aIn
+ ph) in (a_ 'i:n
b) in (a_ 'i:n
k) in (a_ 'i:n
l) in (a_ 'i:n
@@ -3545,13 +3565,14 @@ _it_separ) ate (_ @t
h) in (d_ aIn
@) inda (_ 'Ind@
h) in (dB aIn
+ ine (_$w_alt2 In
sh) in (i aIn
@f) ini (te In@
beh) in (d aIn
k) in (d aIn
k) in (dl In
k) in (dr In
- k) in (derg In
+ k) in (derC In
bl) in (d aIn
m) in (d aIn
_r) in (d aIn
@@ -3745,6 +3766,7 @@ _it_separ) ate (_ @t
@@) it (an_ =It
?3 &) itary (_ @tEr%I // military
&) ita (tive_ I#teI
+ _) ite (m aIt@
gran) it (e It
nfin) it (e It
ur) it (e It
@@ -3752,6 +3774,7 @@ _it_separ) ate (_ @t
quis) it (e It
&) it (e_ It
&) it (e_N aIt
+ rguer) it 'i:t
&) ites (_ aIts
ites (_$w_alt2S1 s
pos) ites (_ Its
@@ -3828,6 +3851,7 @@ _it_separ) ate (_ @t
j dZ
j (j
_) ja (mai dZa#
+ jager jeIg3
_) jere (C dZEr@
_) jes (ui dZEz
_) jiha (d dZI2hA:
@@ -4007,10 +4031,11 @@ multip) ly laI
mono (ga m@n'0
mo (noto m@
_) mono m0noU
- mon (opol m@n
+ mon (opolL02 m@n
mon (ox mVn
@) most (_S4 moUst
&) mouth (_ m@T
+ &) mouth (_$w_alt1 maUT
_) multi mVltI
_) multi (@@P5 m,VltI
@@ -4199,6 +4224,7 @@ multip) ly laI
_) o (ccasi @
_) o (cclu @
ocean oUS@n
+ ocean (ic oUSIan
X) o (ct 0
occur @k3:
?5 occur @kVR
@@ -4346,6 +4372,7 @@ multip) ly laI
ol (ar oUl
@@) ol (ar 'oUl
h) ol (ar 0l
+ _c) ol (b oUl
m) ole (st @lE
c) olor Vl3
c) ol (our Vl
@@ -4441,7 +4468,7 @@ multip) ly laI
@@) on (_ @n
@) on (_$w_alt2 @n
?8 @) on (_++ 0n
- %C) on (_ @n
+ &%C) on (_ @n
&b) on (_ @n
&c) on (_ @n
Cd) on (_ @n
@@ -4451,7 +4478,7 @@ multip) ly laI
&s) on (_ @n
&t) on (_ @n
&tr) on (_ 0n
- hl) on (_ @m
+// hl) on (_ @n
nl) on (_ @n
el) on (_ @n
&m) on (_ @n
@@ -4460,7 +4487,7 @@ multip) ly laI
dr) on (_ @n
or) on (_ 0n
cr) on (_ 0n
- @x) on (_ @n
+ &x) on (_ @n
phot) on @n
pers) on @n
pers) on (i '0n
@@ -4477,10 +4504,8 @@ multip) ly laI
_l) on (don Vn
&C) oned (_S2v d
&C) oning (_S3v I2N
- _) one w0n
- _) once (_ w0ns
-?6 _) one wVn
-?6 _) once (_ wVns
+ _) one w02n
+ _) once (_ w02ns
g) on (e 0n
&) on (er_ @n
ph) on (eti @n
@@ -4615,6 +4640,7 @@ multip) ly laI
f) ore (to %o@
@) or (iti 0r
@) or (ity 0r
+ _fav) orit 3I#t
_) or (iC 0r
@t) ore (_ 3
st) ore (_ o@
@@ -4685,6 +4711,7 @@ multip) ly laI
?3 r) oss Os
?3 c) os (t Os
?3 fr) os (t Os
+ cl) oset 0zI#t
h) ost (_ oUst
gh) ost oUst
m) ost oUst
@@ -4723,7 +4750,7 @@ multip) ly laI
othe (rap+ oUTE
l) oth (i oUD
l) oth (ian oUD
- n) otic (A oUtI2s
+ n) otice oUtI2s
m) ot (iv oUt
r) ot (o oUt
pr) oto (C oUtoU
@@ -5049,7 +5076,7 @@ multip) ly laI
per (fun p3
per (fus p3
per (su p3
- _) perus (e p3ru:z
+ _) perus p3ru:z
_) peri (Be pErI2
.group pr
@@ -5096,6 +5123,7 @@ multip) ly laI
_) pre (sco prE
_) pre (scr pr%I
_) pre (st prE
+ _) pre (suppP3 pr,i:
_) pre (u pr%i:
_) prev (al prEv
_) pre (vio pri:
@@ -5604,6 +5632,7 @@ multip) ly laI
_) to (nn tV
t (ooth t2
@) town (_S4 taUn
+ _) trans (nP5 trans
_) tri (A traI
_) trie traI
_) tri (CA traI
@@ -5621,8 +5650,8 @@ multip) ly laI
_) tsu tsu:
tt (i_ =t
tt (ia_ t
-?3 &) ten (_ ?n-
-?3 &) tten (_ ?n-
+// ?3 &) ten (_ ?n-
+// ?3 &) tten (_ ?n-
Xe) ttin (_ ?n // gettin, lettin
?3 &) tton ?n-
_) two tu:
@@ -5721,7 +5750,7 @@ multip) ly laI
?3 _sta) tu (to tS@
c) tu (al_ =tSu:
r) tue (_ tSu:
-?3 tu (la_ tS@
+?3 tu (la tS@
@) tu (lat =tSU
?3 tu (Ant tSu:
?3 tu (Ancy tSu:
@@ -5882,6 +5911,8 @@ contin) u ju:
usurp ju:z'3:p
?5 usurp ju:z'VRp
b) us (y Iz
+ _sh) u (tC V
+ _sh) u (to V
b) u (tch U
r) u (th u:
_l) u (ther u:
@@ -6023,6 +6054,7 @@ contin) u ju:
?5 urr (_ VR
?3 urr 3:
C) ur (A jUr
+ C) ur (a_ 'jU@
l) ur (A+ U@
t) ur (A j@r
r) ur (A+ U@r
@@ -6067,7 +6099,7 @@ contin) u ju:
?3 _) vibra (t v'aIbreI
video vIdI2%oU
vide (ogr vIdI2
- &s) ville (_S5 vIl
+ &s) ville (_S6 zvIl
vivi (@ vIvI
viv (_ vaIv
@@ -6088,7 +6120,7 @@ contin) u ju:
C) west w'Est
we (w wi:
where we@
- what w0t
+ what w02t
which wItS
who (_ hu:
who (d hu:
@@ -6120,6 +6152,7 @@ contin) u ju:
_) xy zaI
_) x (Y z
c) x (_ Eks // ? filetypes
+ t) x (_ Eks
xio (n kS@
xious =kS@s
xas (_ =ks@s
@@ -6241,8 +6274,7 @@ contin) u ju:
y (the_ aI
st) y (re aI
C) yx (_ Iks
- t) yone (_ Iw'0n
-?6 t) yone (_ Iw'Vn
+ t) yone (_ Iw'02n
t) ytwo (_ It'u:
t) yfour (_ If'o@
t) yfive (_ If'aIv
diff --git a/dictsource/gu_list b/dictsource/gu_list
index 704fc18a..eaa4ea9c 100755
--- a/dictsource/gu_list
+++ b/dictsource/gu_list
@@ -116,7 +116,8 @@ _97 s@t:'a:n.u~
_98 Vt.#:'a:n.u~
_99 n@vv'a:n.u~
-_0C s'O:
+_0C s'o:
+_2C b'Vs'o:
_0M1 h@J,a:r
_0M2 l'a:kh
_0M3 k@ro:r.V
@@ -143,9 +144,9 @@ _dpt _d@s@ml'o:_
ટ t.@
ઠ t.#@
ડ d.@
-ડ઼ r.@
+ડ઼ @r.@
ઢ d.#@
-ણ n.@ // retroflex n.@
+ણ h@n.@ // retroflex n.@
ત t@
થ th@
દ d@
diff --git a/dictsource/gu_rules b/dictsource/gu_rules
index 7626edbe..1003da4c 100755
--- a/dictsource/gu_rules
+++ b/dictsource/gu_rules
@@ -146,6 +146,7 @@
ૈ (ઁ aI~
ૈઁ (_ aI~
+
.group ૉ
ૉ O
@@ -161,6 +162,7 @@
ૌં aU~
ૌઁ (_ aU~
+
.group ૢ // vowel sign l
ૢ l-
@@ -196,6 +198,9 @@
ગ઼ QV
ગ઼ (B Q
+ ગ્ગ g:V // GG -> g:
+ ગ્ગ (B g:
+
.group ઘ
ઘ g#V
ઘ (B g#
@@ -210,18 +215,32 @@
ચ (B c
ચ (્ય c:
+ ચ્ચ c:V // cc -> c:
+ ચ્ચ (B c:
+
+
+ ચ્છ c#:V // c#c# -> c#:
+ ચ્છ (B c#:
+
+
.group છ
છ c#V
છ (B c#
+ છ્છ c#:V // c#c# -> c#:
+ છ્છ (B c#:
+
.group જ
જ JV
જ (B J
જ઼ zV
જ઼ (B z
-
- જ્ઞ gjV
- જ્ઞ (B gj
+
+ જ્જ J:V // JJ -> J:
+ જ્જ (B J:
+
+ જ્ઞ gr.V // ??
+ જ્ઞ (B gr.
.group ઝ
ઝ J#V
@@ -254,12 +273,22 @@
ડ d.V
ડ (B d.
+ ડ્ડ d.:V // d. d. -> d.:
+ ડ્ડ (B d.:
+
+ ડ્ઢ d.#:V // d#d# -> d#:
+ ડ્ઢ (B d.#:
+
ડ઼ r.V
ડ઼ (B r.
.group ઢ
ઢ d.#V
ઢ (B d.#
+
+ ઢ્ઢ d.#:V // d.#d.# -> d.#:
+ ઢ્ઢ (B d.#:
+
ઢ઼ r.hV // nukta (should retroflex flap)
ઢ઼ (B r.h // nukta
@@ -276,18 +305,34 @@
ત્ત t:V // tt -> t:
ત્ત (B t:
+ ત્થ t#:V // t#:t#: -> t#:
+ ત્થ (B t#:
+
+
.group થ
થ t#V
થ (B t#
+ થ્થ t#:V // t#t# -> t#:
+ થ્થ (B t#:
+
.group દ
દ dV
દ (B d
+ દ્દ d:V // dd -> d:
+ દ્દ (B d:
+
+ દ્ધ d#:V // d#d# -> d#:
+ દ્ધ (B d#:
+
.group ધ
ધ d#V
ધ (B d#
+ ધ્ધ d#:V // d#d# -> d#:
+ ધ્ધ (B d#:
+
.group ન
ન nV
ન (B n
@@ -442,7 +487,7 @@
.group o
o _^_EN
- D__) of (__D me
+ D__) of (__D me
diff --git a/dictsource/or_list b/dictsource/or_list
new file mode 100755
index 00000000..e4a7c5de
--- /dev/null
+++ b/dictsource/or_list
@@ -0,0 +1,210 @@
+
+// Translation rules for Oriya
+// Prepared by Him Prasad gautam (Kathmandu, Nepal).
+// This file is UTF8 encoded
+
+// Numbers
+// Oriya numbers are changed to latin characters before translation
+
+_0 S'u:nj@-
+_1 'e'k'o
+_2 d'ui
+_3 t'ini
+_4 tS'ari
+_5 p'antSO
+_6 tS#'o
+_7 S'ato
+_8 'at.#O
+_9 n'VO
+
+_10 d'oSO
+_11 'ega*:O
+_12 b'a*O
+_13 t'ewrO
+_14 tS'Oud'O
+_15 p'VndV*'O
+_16 S'ohVl-'O
+_17 S'VtV*,O
+_18 'V:t.#V*,O
+_19 'unew,iS
+
+_20 k'or.i,e
+_21 'eko,iS
+_22 b'aiS
+_23 t'ewiS
+_24 tS'obiS
+_25 p'VtSiS
+_26 tS#'VbiS
+_27 S'Vtew,iS
+_28 'Vt.#ew,iS
+_29 'V:nVt,iriS
+
+_30 t'iriS
+_31 'ekVt,iriS
+_32 b'V:tiS
+_33 t'ewtiS
+_34 tS'Vut,iriS
+_35 p'V,i~tir,iS
+_36 tS#'V:tiS
+_37 SV'i~tir,iS
+_38 'V:t.#Vt,iriS
+_39 'V:nVtS,aliS
+
+_40 tS'al-,iS
+_41 'ekVtS,al-,iS
+_42 b'VjV,al-,iS
+_43 t'ewjV,al-,iS
+_44 tS'Vur,al-,iS
+_45 pV'i~tSal-,iS
+_46 tS#'VjV,al-,iSO
+_47 S'VtVtS,al-,iS
+_48 'V:t.#'VtS,al-,iS
+_49 V:n'VntSaS
+
+_50 p'V:tSaS
+_51 'ekab,Vn
+_52 b'aun
+_53 t'ewpVn
+_54 tS'V:ub,Vn
+_55 p'V:ntSab,Vn
+_56 tS#'V:pVn
+_57 S'Vtab,Vn
+_58 'V:t.#ab,Vn
+_59 'V:nVS'Vt.#i
+
+_60 S'at.#i,e
+_61 'ekVS,Vt.#i
+_62 b'aSVt.#,i
+_63 t'ewSVt.#,i
+_64 tS'VuS,Vt.#i
+_65 pV'O~SVt.#,i
+_66 tS#'V:SVt.#,i
+_67 S'V:tVS,Vt.#i
+_68 'Vr.VS,Vt.#i
+_69 'V:n'VstVr'i
+
+_70 S'V:tur,i
+_71 ek'V:stVr,i
+_72 b'astVr,i
+_73 t'ewstVr,i
+_74 tSV'ustVr,i
+_75 pVntS'VstVr,i
+_76 tS#V'VstVr,i
+_77 S'V:t'VstVr,i
+_78 'V:t.#'VstVr,i
+_79 'V:na,VSi
+
+_80 'V:,Si
+_81 'eka,V:Si
+_82 b'VjV,aVS,i
+_83 t'ewjV,aVS,i
+_84 tS'V:ur,aVS,i
+_85 p'V:ntSa,VSi
+_86 tS#'VjV,aVS,i
+_87 S'Vta,VSi
+_88 'V:t.#a,VSi
+_89 'V:nan,Vbew
+
+_90 n'Vbew
+_91 'ekan,Vbew
+_92 b'V:jV,anVb,ew
+_93 t'ewjV,anVb,ew
+_94 tS'Vur,anVb,ew
+_95 p'VntSan,Vbew
+_96 tS#'V:jV,anVb,ew
+_97 S'Vtan,Vbew
+_98 'V:t.#an,VbewVn'ewSVt,o
+_99 'V:n'ewSVt,o
+
+
+_0C S'Vho
+_0M1 h'VJa*,O
+_0M2 l'Vk#k#O
+_0M3 k'ot.i
+_0M4 'VrVb
+_0M5 k#'VrVb
+_dpt _d@s@ml'o:_
+
+
+
+// Single consonants
+କ kO
+ଖ k#O
+ଗ gO
+ଘ g#O
+ଙ 'uNgO~
+ଚ tSO
+ଛ tShO // [h] to distinguish from [tS]
+ଜ JO
+ଝ J#O
+ଞ 'iNO~
+ଟ t.O
+ଠ t.#O
+ଡ d.O
+ଢ d.#O
+ଣ n.'O
+ତ tO
+ଥ t#O
+ଦ dO
+ଧ d#O
+ନ n'O
+ପ pO
+ଫ fO // or [p#O] ?
+ବ bO
+ଭ b#O
+ମ mO
+ୟ Oj
+ଯ dZ'O
+ର rO
+ଡ଼ r.O
+ଡ଼ r.O // (d. + nukta)
+ଢ଼ hr.O
+ଢ଼ hr.O // (d#. + nukta)
+ଲ lO
+ଵ vO
+ଶ t,aleboS:'O
+ଷ m,ud#en:oS:'O
+ସ d,onteS:'O
+ହ hO
+
+// full vowels
+ଅ O
+ଆ a
+ଇ hrOS:o'i
+ଈ d'i:rg#o'i
+ଉ hrOS:o'u
+ଊ d'i:rg#o'u
+ଋ ri
+// lri
+ଏ e $u+ // word 'it'
+ଐ oj $u+ // word 'that'
+ଓ o $u+ $brk // 'and'
+_ଏ e
+_ଐ oj
+_ଓ o
+ଔ ow
+
+// combining vowel signs
+ା 'akar
+ି hrOS:o'ikar
+ୀ d'i:rg#ikar
+ୁ hrOS:oukar
+ୂ d'i:rg#'ukar
+ୃ r'ikar
+େ 'ekar
+ୈ 'ojkar
+ୋ 'okar
+ୌ 'owkar
+
+// signs
+୍ 'hVl'VntO
+ଂ 'OnuSSOr
+ଃ b'iSOrgo
+ଁ tS'Ondrobindu
+଼ b'indu
+
+$ d.Olar
+
+// Punctuation
+। dVn.d.V
+_, koma
diff --git a/dictsource/or_rules b/dictsource/or_rules
new file mode 100755
index 00000000..9e50bee3
--- /dev/null
+++ b/dictsource/or_rules
@@ -0,0 +1,335 @@
+// Pronounciation rule for Oriya.
+// Prepared by Him Prasad gautam (Kathmandu, Nepal).
+// This file is UTF8 encoded
+
+// letter groups:
+// A vowel letters and vowel signs
+// B vowel signs and Halant a ୍
+// C consonants
+// Y vowel letters and vowel signs
+
+
+
+.replace
+ ୦ 0
+ ୧ 1
+ ୨ 2
+ ୩ 3
+ ୪ 4
+ ୫ 5
+ ୬ 6
+ ୭ 7
+ ୮ 8
+ ୯ 9
+
+ଡ଼ ଡ଼ // can be ଡ plus nukta
+ଢ଼ ଢ଼ // can be ଢ plus nukta
+
+
+// Vowels
+
+.group ଅ
+ ଅ V
+ ଅଁ O~
+
+.group ଆ
+ ଆ a
+ ଆଁ a~
+
+.group ଇ
+ ଇ i
+ ଇଁ i~
+
+.group ଈ
+ ଈ i
+ ଈଁ i~
+
+.group ଉ
+ ଉ u
+ ଉଁ u~
+
+.group ଊ
+ ଊ u:
+ ଊଁ u~
+
+.group ଋ
+ ଋ ru
+ ଋଁ ru~
+
+.group ଌ
+ ଌ l-r'i
+
+.group ଏ
+ ଏ e
+ ଏଁ e~
+
+.group ଐ
+ ଐ oj
+ ଐଁ o~j
+
+.group ଓ
+ ଓ o
+ ଓଁ o~
+
+.group ଔ
+ ଔ ow
+ ଔଁ o~w
+
+// Vowel Signs
+
+.group ା
+ C) ା a
+ C) ାଁ a~
+
+.group ି
+ C) ି i
+ C) ିଁ i~
+
+.group ୀ
+ C) ୀ i
+ C) ୀଁ i~
+
+
+.group ୁ
+ C) ୁ u
+ C) ୁଁ u~
+
+.group ୂ
+ C) ୂ u:
+ C) ୂଁ u~:
+
+.group ୃ
+ C) ୃ r'u
+ C) ୃଁ r'u~
+
+.group େ
+ C) େ e
+ C) େଁ e~
+ C) େ ew
+
+.group ୈ
+ C) ୈ oj
+ C) ୈଁ o~j
+
+.group ୋ
+ C) ୋ o
+ C) ୋଁ o~
+
+.group ୌ
+ C) ୌ ow
+ C) ୌଁ o~w
+
+// Consonants
+
+.group କ
+ କ kV
+ କ (B k
+ କ୍ଷ k#k#V // or [k#:] ?
+ କ୍ଷ (B k#k#
+
+.group ଖ
+ ଖ k#V
+ ଖ (B k#
+
+.group ଗ
+ ଗ gV
+ ଗ (B g
+
+.group ଘ
+ ଘ g#V
+ ଘ (B g#
+
+.group ଙ
+ ଙ NV
+ ଙ (B N
+
+.group ଚ
+ ଚ tSV
+ ଚ (B tS
+
+.group ଛ
+ ଛ tS#V
+ ଛ (B tS#
+
+.group ଜ
+ ଜ JV
+ ଜ (B J
+
+ ଜ୍ବ JV
+ ଜ୍ବ (B J
+ ଜ୍ଞ ggo~
+ ଜ୍ଞ (B gg
+
+.group ଝ
+ ଝ J#V
+ ଝ (B J#
+
+.group ଞ
+ ଞ nV
+ ଞ (B n
+
+.group ଟ
+ ଟ t.V
+ ଟ (B t.
+
+.group ଠ
+ ଠ t.#V
+ ଠ (B t.#
+
+.group ଡ
+ ଡ d.V
+ ଡ (B d.
+ ଡ଼ r.V // nukta
+ ଡ଼ (B r.
+
+.group ଢ
+ ଢ d.#V
+ ଢ (B d.#
+ ଢ଼ hr.V
+ ଢ଼ (B hr.
+
+.group ଣ
+ ଣ nV // should be [n.] if adjacent to t. or d. ?
+ ଣ (B n
+
+.group ତ
+ ତ tV
+ ତ (B t
+ ତ (_ to
+
+.group ଥ
+ ଥ t#V
+ ଥ (B t#
+
+.group ଦ
+ ଦ dV
+ ଦ (B d
+
+.group ଧ
+ ଧ d#V
+ ଧ (B d#
+
+.group ନ
+ ନ nV
+ ନ (B n
+
+.group ପ
+ ପ pV
+ ପ (B p
+
+.group ଫ
+ ଫ p#V
+ ଫ (B p#
+
+.group ବ
+ ବ bV
+ ବ (B b
+
+.group ଭ
+ ଭ b#V
+ ଭ (B b#
+
+.group ମ
+ ମ mV
+ ମ (B m
+
+.group ୟ
+ ୟ jV
+ _) ୟ (B j
+ ୟ (_ jo
+
+.group ଯ
+ ଯ dZV
+ ଯ (B dZ
+ ଯ଼ jV // nukta
+ _) ଯ଼ (B j
+ ଯ଼ (B
+ ୍) ଯ (_ :O // double the previous consonant
+ ୍) ଯ (B_ :
+ ୍) ଯ (C &
+ ୍) ଯା & //
+
+.group ର
+ ର rV
+ ର (B r
+
+.group ଲ
+ ଲ lV
+ ଲ (B l
+
+.group ଳ// long la
+ ଳ l-V
+ ଳ (B l-
+
+.group ଵ
+ ଵ wV
+ ଵ (B w
+
+.group ଶ
+ ଶ SV // or [s] ?
+ ଶ (B S
+ ଶ (୍ଲ s
+
+.group ଷ
+ ଷ SV
+ ଷ (B S
+
+.group ସ
+ ସ SV // or [s] ??
+ ସ (B S
+ ସ (୍ଥ s
+ ସ (୍ତ s
+ ସ (୍ଯ s // ସମସ୍ଯା
+ _) ସ୍ବ SV // shb
+ _) ସ୍ବ (B S
+
+.group ହ
+ ହ hV
+ ହ (B h
+ ହ (_ ho
+
+.group ହ୍ବ
+ ହ୍ବ vV
+ ହ୍ବ (B v
+
+.group
+ t
+
+.group ଡ଼ // can be ଡ plus nukta
+ ଡ଼ r.V
+ ଡ଼ (B r.
+
+.group ଢ଼ // can be ଢ plus nukta
+ ଢ଼ hr.V
+ ଢ଼ (B hr.
+ ଢ଼ (_ hr.o
+
+.group ଁ
+ C) ଁ O~ // candrabindu, nasalize the previous vowel/Consonants
+
+.group ଂ
+ A) ଂ N // anusvara/onushshor
+ C) ଂ N // anusvara/onushshor
+
+.group ଃ // visarga/bishorgo
+ ଃ // doubles the following consonant
+ ଃ (_ H
+
+.group ୍ // virama/hoshonto
+ C) ୍
+
+.group ଼
+ ଼ // nukta, modifies a consonant
+
+.group
+ // obsolete letters
+ ଋ r-
+ ୠ r-
+ ଌ l-
+ ୡ l-
+ ୃ r-
+ ୄ r-
+ ୢ l-
+ । p'urn.'oV'iram
+ ୣ l-
+
diff --git a/dictsource/pt_list b/dictsource/pt_list
index 5c11a639..2abc5594 100755
--- a/dictsource/pt_list
+++ b/dictsource/pt_list
@@ -671,7 +671,6 @@ acertos $alt2
acocho $alt2 $noun
acordo $alt $verb
acervo $alt2
-adepto $alt
adorno $alt $verb
aeroporto $alt2
aflore $alt
@@ -683,7 +682,6 @@ ameba $alt
amores $alt2
amorno $alt
amuleto $alt2
-ampere $alt
ampola $alt2
ampulheta $alt2
anchova $alt2
@@ -710,6 +708,7 @@ axé aSE
azeda $alt $verb
azedo $alt $verb
bairro b'aIxU
+baitola $alt2
banquete $alt2
barreto $alt2
bastonete $alt2
@@ -756,6 +755,7 @@ carrapeta $alt2
carroça $alt
casebre $alt
cateto $alt2
+catequeses $alt
catorze $alt2
cebola $alt2
cedro $alt
@@ -772,7 +772,6 @@ checam $alt
choco $alt2 $noun
choça $alt
chofer $alt
-
choro $alt2 $noun
chovesse $alt2
chupeta $alt2
@@ -819,6 +818,7 @@ corvos $alt
costeleta $alt2
coto $alt2
cotovelo $alt2
+cozem $alt
cratera $alt
crede $alt2
credo $alt
@@ -832,7 +832,8 @@ desconfortos $alt2
desconsolo $alt2 $noun
descontrole $alt2 $noun
descordo $alt
-desemprego $alt2
+descorno $alt
+ desemprego $alt2
desemprego $alt $verb
desespero $alt2
desespero $alt $verb
@@ -865,10 +866,12 @@ dogma $alt
dores $alt2
dorminhoco $alt2
dorminhocos $alt
+doso $alt
doze $alt2
dueto $alt2
edson $alt
elixir eliSir
+emborco $alt
emprego $alt2
emprego $alt2 $noun
encasqueta $alt
@@ -877,7 +880,7 @@ endereço $alt $verb
enforco $alt
engordo $alt
enredo $alt $verb
-enrosco $alt $verb
+enrosco $alt2 $noun
ensosso $alt2
enterro $alt2 $noun
entorto $alt
@@ -891,7 +894,6 @@ erro $alt2
erro $alt $verb
esboço $alt $verb
escopeta $alt2
-
escova $alt2
escova $alt $verb
escovo $alt
@@ -899,6 +901,7 @@ esforço $alt $verb
esforços $alt
esgoto $alt2
esgoto $alt $verb
+espectro $alt
esperma $alt
espeto $alt2 $noun
espoleta $alt2
@@ -906,6 +909,7 @@ esposa $alt2
esqueleto $alt2
ester $alt
estilete $alt2
+estocolmo $alt
estojo $alt2
estorno $alt $verb
estorvo $alt $verb
@@ -917,17 +921,18 @@ europa $alt
europeia $alt
?2 ex es
exagero $alt $verb
+ exegeses $alt
exorto $alt
explore $alt
falangeta $alt2
farofa $alt
farolete $alt2
+fatora $alt
felisteia $alt
fezes $alt
filete $alt2
?1 fixe fiSy
flerte $alt2 $noun
-flexora $alt2
foda $alt2 $verb
fodo $alt2
fogo $alt2
@@ -976,6 +981,7 @@ grosso $alt2
groso $alt
gueto $alt2
hemorroida $alt
+hidreto $alt2
hoje $alt2
homero $alt
horrores $alt2
@@ -996,6 +1002,7 @@ laser l'eIzer
lasers l'eIzers
lembrete $alt2
lepra $alt
+leses $alt
leste $alt2 $verb
?2 lhe l^y
licores $alt2
@@ -1005,6 +1012,8 @@ lodo $alt2
logro $alt
lopes $alt
macete $alt2
+maioneses $alt
+manopla $alt
maniçoba $alt
marieta $alt2
mariposa $alt2
@@ -1035,6 +1044,7 @@ namoro $alt2 $noun
naquela $nounf
naquele $alt2 $nounf
nervo $alt2
+nitreto $alt2
nojo $alt2
novelo $alt2
odisseia $alt
@@ -1044,7 +1054,7 @@ olho $alt2 $noun
olhos $alt
onomatopeia $alt
opereta $alt2
-ordens $alt
+orno $alt
osso $alt2
ostra $alt2
outorgo $alt
@@ -1132,6 +1142,7 @@ rola $alt2 $noun
roleta $alt2
rolete $alt2
rolo $alt2 $noun
+rose $alt2
roseta $alt2
rota $alt2
rota $alt $noun
@@ -1189,6 +1200,7 @@ torre $alt2 $noun
torres $alt2
torro $alt
toso $alt
+totens $alt
transtorno $alt $verb
traqueia $alt
travesso $alt2
@@ -1199,15 +1211,19 @@ troco $alt2 $noun
tropa $alt
tropeço $alt2 $noun
trombeta $alt2
+ureia $alt
vanessa $alt2
vareta $alt2
vera $alt
verbete $alt2
+verborreia $alt
verde $alt2
vileta $alt2
voga $alt
xarope $alt
xereta $alt2
+xerox S'E*Oks
+xeroxes $alt
zelo $alt2 $noun
zorra $alt2
diff --git a/dictsource/pt_rules b/dictsource/pt_rules
index cb01521b..cd38bed3 100755
--- a/dictsource/pt_rules
+++ b/dictsource/pt_rules
@@ -1,4 +1,4 @@
-// translation rules Brazilian
+ // translation rules Brazilian
// This file is UTF-8 encoded
// Options
@@ -77,6 +77,7 @@
áC) a (C@ &
áCC) a (C@ &
éC) a (C@ &
+ éCC) a (C@ &
í) a (CA_ &
íC) a (C@ &
íCC) a (C@ &
@@ -388,6 +389,7 @@ respond) e (L06_ e
eg) e (L07_ e // elegeste, etc.
_@o) e (L07_ e // doeste, etc.
_cr) e (L07_ e
+ _val) e (L07_ e
bat) e (L07_ e // re- com-
ced) e (L07_ e // pro- con- su-
met) e (L07_ e // meteste, cometeste, etc.
@@ -407,6 +409,7 @@ respond) e (L06_ e
_remo) e (L07_ e
_sofr) e (L07_ e
screv) e (L07_ e // e- in- ree- pre- de-
+_absorv) e (L07_ e
_atrev) e (L07_ e
_corro) e (L07_ e
_troux) e (L07_ E
@@ -492,6 +495,7 @@ s_colh) e (res_ E
_cr) e (scL02_ E
_p) e (scL03_ E
_m) e (sclL04 E
+ dioc) e (ses_ E
_d) e (spL02_ E
_p) e (squL02_ E
_refr) e (squL02_ E
@@ -575,9 +579,11 @@ _entorp) e (çL03_ e
_apazi) gu (e gw
_ar) gu (i gw
averi) gu (e gw
+ bilin) gu (A gw
+ _biri) gu (i_ gw
enxa) gu (e gw
i) gu (idade gw
- lin) gu (e gw
+ _lin) gu (A gw
lin) gu (i gw
_min) gu (e gw
_pin) gu (im_ gw
@@ -585,7 +591,8 @@ _apazi) gu (e gw
_sa) gu (i gw
san) gu (ín gw
san) gu (in gw
- tin) gu (i gw
+ stin) gu (A gw
+ xtin) gu (A gw
?1 n) gu (A gw // eg: língua, etc.
?1 man) gu (ei g // mangueira
?1 gu (ém_ g // eg: alguém, ninguém, etc...
@@ -880,6 +887,9 @@ _pormen) o (L05_ O
_sal) o (brL03_ o
_) o (cL03_ o
_barr) o (cL03_ o
+ _ecl) o (dL03_ o
+ _expl) o (dL03_ o
+ _impl) o (dL03_ o
_m) o (fL01_ O
_m) o (fL02_ O
_af) o (fL04_ O
@@ -891,15 +901,19 @@ _pormen) o (L05_ O
_t) o (lL03_ o
_f) o (lgL04_ O
_emp) o (lgL04_ O
+ _arr) o (lhL03_ O
+ _enr) o (lhL03_ O
_) o (lhL04_ O
m) o (lhL04_ O
emb) o (lsL04_ O
_env) o (ltL03_ o
_esC) o (pA_ o
+ antr) o (pL03_ o
_s) o (prL04_ O
_al) o (prL04_ O
_ass) o (prL04_ O
_) o (ptL04_ O
+ flex) o (rA_
p) o (rL02_ o
_dev) o (rL02_ O
_apav) o (rL02_ O
@@ -907,6 +921,7 @@ _pormen) o (L05_ O
_impl) o (rL02_ O
_ad) o (rL04_ O
_ma@) o (r_ O
+ o (rdens_ O
_@um) o (re_ o
f) o (rmL03_ O
c) o (rrL01_ o // incorra, corra, etc.
@@ -915,19 +930,23 @@ _pormen) o (L05_ O
@p) o (rtL03_ O // importo, etc.
a_c) o (rte_ o
ortos (_ O*@-t=Us# // tortos, mortos, etc.
+ _abs) o (rvL01_ o
t) o (rçL03_ o // con-
+ _c) o (sL01_ o
+ _desc) o (sL01_ o
+ enr) o (scL03_ O
_r) o (snL04_ O
_c) o (spL02_ O
- _enr) o (squL02_ O
+ enr) o (squL02_ O
ossos (_ Os=Us# // nossos, grossos, etc.
p) ostos (_ Ost=Us# // dispostos etc.ortos (_ 'O*@-tUs
- _gar) o (tL03_ o
- _mar) o (tL03_ o
_escr) o (tL03_ o
+ _Gar) o (tL03_ o
zig) o (to_ o
_ch) o (vL01_ o
pr) o (vL03_ O
ovos (_ Ov=Us# novos, povos, etc.
+_ortod) o (xL03_ O
_g) o (zL04_ O
_alm) o (çL01_ O
_esb) o (çL01_ O
@@ -1178,12 +1197,14 @@ _abaca) x (i S
_ca) x (A S
_co) x (A S
_coe) x (A z
+_esdrA) x (ul S
_e) x (u_ S
_fa) x (i S
_fle) x (a S
gra) x (A S
_he) x (A z
?2 _he) x (A ks
+_lagarti) x (A S
_li) x (A S
_lu) x (A S
_mar) x ks
@@ -1194,6 +1215,7 @@ _abaca) x (i S
_o) x (A S
_o) x (i ks
_o) x (í ks
+ _pe) xo (to_ So
pi) x (A S
_pro) x (A S
_pra) x (A S
diff --git a/dictsource/ta_list b/dictsource/ta_list
index 9e04bfb5..c3c9a4b1 100644
--- a/dictsource/ta_list
+++ b/dictsource/ta_list
@@ -115,7 +115,7 @@ U+bf9 ru:ba:j
® pVdivU
© p'VdippUrimaI
• t'o:t.t.a:
-… v'id.UnilaI
+_… v'id.UnilaI
¡ t'VlaIki:z.||v'ijVppU
¿ t'VlaIki:z.||k'e:l.vi
× d'Vd.VvaI
@@ -126,6 +126,20 @@ U+bf9 ru:ba:j
→ v'VlVdVmbU
■ k'VrUn^dZVdU*Vm
● v'Vt.t.Vm
+† kuttUva:l.
+‡ 'irVt.t.aI||k'uttUva:l.
+
+௰ pVttU
+௱ nu:RU
+௲ a:jirVm
+௳ na:l.
+௴ ma:dVm
+௵ a:n.d.U
+௶ pVt.RU
+௷ vVrVvU
+௸ m'e:lirUppVdU||p'o:l
+௺ ;en.n.UrU
+
_sup m'e:lez.UttU
@@ -259,6 +273,7 @@ _8Co ;en.n.u:R
_#ம் a:m // ordinal suffix
_#ல் il
+_#இல் il
_#வது a:vVdU
_#வதும் a:vVdUm
_#வதுமாக a:vVdUma:gV
@@ -270,6 +285,7 @@ _#ஆவதுமாக a:vVdUma:gV
_#-ம் a:m // ordinal suffix with hyphen
_#-ல் il
+_#-இல் il
_#-வது a:vVdU
_#-வதும் a:vVdUm
_#-வதுமாக a:vVdUma:gV
@@ -279,6 +295,12 @@ _#-ஆவது a:vVdU
_#-ஆவதும் a:vVdUm
_#-ஆவதுமாக a:vVdUma:gV
+// The உ sound at the end of a number should sound as இ,
+// if it is followed by லும் or -லும்.
+_#லும் ilUm
+_#-லும் ilUm
+
+
// English words
tamil தமிழ் $text
@@ -294,7 +316,6 @@ tamil தமிழ் $text
பண்தம் $alt
பவனி $alt
பாபா $alt
-போகம் $alt
போதனை $alt
பூகம்பம் $alt
பங்கம் $alt
@@ -415,6 +436,8 @@ tamil தமிழ் $text
பனியா $alt
பாம் $alt
போத $alt
+பொம்ம $alt
+புகாரி $alt
// initial த as [d]
@@ -586,7 +609,6 @@ tamil தமிழ் $text
பப pVpV
-தீப் di:p
டிரேயின் t.re:jn
பைக் baIk
பைக்கில் baIkkIl
@@ -601,4 +623,5 @@ tamil தமிழ் $text
புட் fud.
உப்ப ubbV
ஜென் zen
+சோப்ரா tSo:pra:
diff --git a/dictsource/ta_rules b/dictsource/ta_rules
index 0bfdd2d7..20d145aa 100644
--- a/dictsource/ta_rules
+++ b/dictsource/ta_rules
@@ -87,7 +87,7 @@
.L15 மீல்ஸ கிளாஸ பாட்டில டிக்கெட் டாஸ
// words after பாதிக்கும்
-.L16 மேல மேற் குறை
+.L16 மேல மேற் குறை அதிக
// words after செல்லக் [tSellVg] செல்லப் [tSellVb] செல்லத் [tSellVd]
.L17 குழந்தை கிளி குட்டி கழுதை குதிரை குரங்க
@@ -624,9 +624,16 @@ _மன்மதக்) க (ுகை g
_) காஜ (ியாபாத ga:z
_) க (ிலானி g
_) க (ாயத்ரி g
+ _) க (ாரேஜ g
+ _) க (ாந்தீய g
+ _) கேக் (வாட ge:k
+ _) க (ுருவென g
+ _) க (ேட்டிற் g
//endsort
//sort
+ _யு) க் (ரைன k
+ உ) க் (ரைன k
_தலை) க (ீழ் g
_காட்டுமன்னார்) க (ோயில k
_கோபி) க kV#
@@ -1396,6 +1403,9 @@ _வெனி) ச (ுவேல z
_) சாருக (ேசி tSa:rUk
அஜாத) ச (த்துரு tSV
இமா) ச (ல tSV
+ _) சுவிட்ஜ (ர்லாந்த svid.zV
+ _) ச (ுக்லா _ s.
+ _) ச (ுக்லாவ s.
//endsort
@@ -1438,6 +1448,11 @@ _வெனி) ச (ுவேல z
_) ஜ (ூலு z
_) ஜ (ெனித் z
_) ஜ (ெராக்ஸ z
+ நியூ) ஜ (ிலாந்த z
+_ஸ்விட்) ஜ (ர்லாந்த zV
+ _) ஜ (ென்னை z
+ _) ஜ (ென்னின z
+ _) ஜ (ென்னில z
//endsort
@@ -2272,9 +2287,16 @@ _) தீர்க்க (_சுமங்கலி di:rggV
_) த (டிக்கிற dV
_) த (ன்வந்திரி dV
_) த (ேவ்டியா t
+ _) தீ (ப்_ d
+ _) தீ (ப்_ப t
//endsort
//sort
+_சக்கிரவர்) த்த (ினி tt
+_சக்கரவர்) த்த (ினி tt
+_சக்ரவர்) த்த (ினி tt
+ _சுமி) த் (ர t
+ ஆ) த் (ரேய t
_ஆஸ்) தி (ர t
_கபூர்) த (லா tV
அகர்) த (லா tV
@@ -2888,10 +2910,6 @@ _டெட்_) ப (ாடி b
_) ப (ாதிக்குமெ b
_) ப (ாதிக்கும்_ b
_) ப (ாதிக்கும்_L16 p
- _) ப (ாதிக்கும்_குறை p
- _) ப (ாதிக்கும்_மேற் p
- _) ப (ாதிக்கும்_மேற்பட்ட_ p
- _) ப (ாதிக்கும்_மேல p
_) ப (ாதிச்ச b
_) ப (ாதித்த b
_) ப (ாதிப்படை b
@@ -3744,9 +3762,47 @@ _பெனசீர்_) ப (ுட்டோ b
_) ப (ிக்ஷ b
_) ப (ுல்_ஷிட் b
_) ப (ாதாம b
+ _) ப (ாரக் b
+ _) ப (க்குன bV
+ _) ப (ந்தன bV
+ _) ப (ுட்டோ b
+ _) ப (ுஹாரி b
+ _) ப (ுகாரிய b
+ _) ப (ாதிக்கத் b
+ _) பத் (வா fVt
+ _) ப (ிட்டர f
+ _) ப (ிட்டிங் f
+ _) ப (ாகனிய f
+ _) புட்ட (ிங் pud.d.
+ _) ப (ோகம b
//endsort
//sort
+_கெளம்) ப (ுற b
+ _கிளம்) ப (ுற b
+ _திரும்) ப (ுற b
+ ப (ொருட்டு_ p
+_வெண்) ப (ொங்க p
+_வெண்) ப (ுகை p
+_வெண்) ப (ஞ்ச pV
+_வெண்) ப (ளிங்க pV
+ ஆமாம்) ப (ா p
+ இதன்) ப (ாட p
+ அதன்) ப (ாட p
+L03வர்கள்) ப (ாட p
+ L03வர்) ப (ாட p
+ L03வள்) ப (ாட p
+ L03வன்) ப (ாட p
+ உன்) ப (ாட p
+ என்) ப (ாட p
+ _தன்) ப (ாட p
+ _மீன்) ப (ிடி p
+ _கவி) ப (ாட p
+ ஆ) ப் (ரிக்க f
+_தென்னா) ப் (ரிக்க f
+ _ஷெல்) ப fV#
+ _சல்) ப (ர fV
+ _மாய) ப்ப (ிம்ப bb
_) ப் (ளோர f
_) பு (ளோர f
_) பயர்ப (ாக்ஸ fVjVrf
@@ -3769,7 +3825,7 @@ _பெனசீர்_) ப (ுட்டோ b
_சாஹி) ப்ப bbV#
_சாகி) ப்ப bbV#
_நற்) ப (ூமி b
- _முழு) ப்ப (ல bb
+ _முழு) ப்ப (ல b_b
_மன) ப்ப (ிம்ப bb
_மர) ப்ப (ொம்மை bb
_நீர்) ப pV#
@@ -4621,7 +4677,8 @@ _சந்தேக) ப்ப (ுத்தி bb
_மி) ஸ (ோரம z
_மி) ஸாப (ர்பூர za:fV
_மி) ஸ (ாஃபர்பூர z
-
+ _மு) ஸாப (ர za:fV
+ _மு) ஸ (ாஃபர z
.group ஹ
ஹ HV
diff --git a/docs/dictionary.html b/docs/dictionary.html
index 5ffa8ba4..fc4274d5 100644
--- a/docs/dictionary.html
+++ b/docs/dictionary.html
@@ -255,6 +255,10 @@ Note, that matching characters in the <pre> part do not affect the syllabl
| # |
(English specific) change the next "e" into a special character "E" |
+
+ | $noprefix |
+ Only use this rule if the word is not a retranslation after removing a prefix. |
+
$w_alt
$w_alt2
$w_alt3 |
Only use this rule if the word is found in the *_list file with the $alt, $alt2 or $alt3 attribute respectively. |
diff --git a/espeak-data/voices/en-us b/espeak-data/voices/en-us
index d61ff5cf..6846aa8b 100755
--- a/espeak-data/voices/en-us
+++ b/espeak-data/voices/en-us
@@ -9,7 +9,7 @@ phonemes en-us
dictrules 3 6
option reduce_t 1
-stressLength 140 120 190 170 0 0 255 290
+stressLength 140 120 190 170 0 0 255 300
stressAmp 17 16 19 19 19 19 21 19
replace 03 I i
diff --git a/phsource/compile_report b/phsource/compile_report
index f8074445..c8af3dc2 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -4,13 +4,13 @@
base 109 109
consonants 11 119
base2 26 125
- en 55 157
- en-n 33 157
- en-us 39 157
- en-sc 41 159
- en-rp 34 157
- en-wm 31 157
- en-wi 30 157
+ en 56 158
+ en-n 33 158
+ en-us 40 158
+ en-sc 42 160
+ en-rp 34 158
+ en-wm 32 158
+ en-wi 30 158
af 39 138
cy 29 134
ga 30 134
@@ -83,7 +83,7 @@ consonants 11 119
dv 14 149
te 18 149
si 24 155
- gu 5 151
+ gu 7 151
as 12 152
or 12 152
mni 11 152
@@ -2267,6 +2267,7 @@ vowel/o [o] base2
[o:] wo
[o] te
[o:] te
+ [o:] gu
[o] as
[o] or
[o] mni
@@ -2558,6 +2559,7 @@ vowel/V_2 [V] en
[V] ru
[V#] ru
[V] ku
+ [V] gu
vowel/V_3 [V] en-rp
[@] hi
[V] hi
@@ -2569,6 +2571,7 @@ vowel/V_4 [V] en-sc
[V] hi
[V] da
[?V] da
+ [V] gu
vowel/V_6 [V] en-us
[a#] lv
vowel/y [y] base2
diff --git a/phsource/ph_english b/phsource/ph_english
index b6a09105..9f359075 100644
--- a/phsource/ph_english
+++ b/phsource/ph_english
@@ -287,6 +287,13 @@ phoneme 0# // [@] in unstressed syllables
endphoneme
+phoneme 02 // becomes V in en-us
+ vowel starttype #o endtype #o
+ length 140
+ ChangePhoneme(0)
+endphoneme
+
+
phoneme V
vowel starttype #a endtype #@
length 140
diff --git a/phsource/ph_english_sc b/phsource/ph_english_sc
index c3d04e8c..0fc864b6 100644
--- a/phsource/ph_english_sc
+++ b/phsource/ph_english_sc
@@ -135,6 +135,13 @@ phoneme 0
endphoneme
+phoneme 02 // becomes V in en-us
+ vowel starttype #o endtype #o
+ length 140
+ ChangePhoneme(V)
+endphoneme
+
+
phoneme V
vowel starttype #a endtype #@
length 140
diff --git a/phsource/ph_english_us b/phsource/ph_english_us
index ae086e43..d05abc1e 100644
--- a/phsource/ph_english_us
+++ b/phsource/ph_english_us
@@ -8,7 +8,7 @@ phoneme 3 // Schwa, used for rhotic schwa in American
vowel starttype #@ endtype #@
ipa ɚ
unstressed
- length 200
+ length 210
IfNextVowelAppend(r-)
FMT(vwl_en_us/3_us)
endphoneme
@@ -125,6 +125,13 @@ phoneme 0
endphoneme
+phoneme 02 // becomes V in en-us
+ vowel starttype #o endtype #o
+ length 140
+ ChangePhoneme(V)
+endphoneme
+
+
phoneme V
vowel starttype #a endtype #@
length 170
diff --git a/phsource/ph_english_wm b/phsource/ph_english_wm
index eb61edff..9141d27e 100644
--- a/phsource/ph_english_wm
+++ b/phsource/ph_english_wm
@@ -65,6 +65,13 @@ phoneme 0
endphoneme
+phoneme 02 // becomes V in en-us
+ vowel starttype #o endtype #o
+ length 140
+ ChangePhoneme(V)
+endphoneme
+
+
phoneme V
vowel starttype #o endtype #o
ipa ʊ
diff --git a/phsource/ph_gujarati b/phsource/ph_gujarati
index 3e2da38e..a5feaa87 100755
--- a/phsource/ph_gujarati
+++ b/phsource/ph_gujarati
@@ -32,3 +32,49 @@ phoneme aU~
endphoneme
+phoneme V
+ vowel flag1 starttype #@ endtype #@
+ length 140
+
+ IF thisPh(isWordStart) THEN
+ FMT(vowel/V_2)
+ RETURN
+ ENDIF
+
+ IF thisPh(isNotStressed) THEN
+ length 130
+
+ IF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
+ ChangePhoneme(NULL)
+ ENDIF
+
+ IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
+ IF nextPhW(isNotVowel) AND nextPh(isWordEnd) THEN
+ // don't delete schwa before a word-final consonant
+ ELSE
+ ChangePhoneme(NULL)
+ ENDIF
+ ENDIF
+
+ IF prevPh(isPalatal) AND NOT nextPh(H) THEN
+ ChangePhoneme(@3)
+ ELSEIF prevPh(r) THEN
+ ChangePhoneme(@2)
+ ELSE
+ ChangePhoneme(@)
+ ENDIF
+ ENDIF
+
+ IF prevPh(w) THEN
+ FMT(vowel/V_4)
+ ENDIF
+
+ FMT(vowel/V_2)
+endphoneme
+
+phoneme o:
+ vowel long starttype #o endtype #o
+ length 227
+ FMT(vowel/o)
+endphoneme
+
diff --git a/src/compiledict.cpp b/src/compiledict.cpp
index 10cc427a..cbe7985f 100644
--- a/src/compiledict.cpp
+++ b/src/compiledict.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005 to 2013 by Jonathan Duddington *
+ * Copyright (C) 2005 to 2014 by Jonathan Duddington *
* email: jonsd@users.sourceforge.net *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -51,6 +51,7 @@ static char letterGroupsDefined[N_LETTER_GROUPS];
MNEM_TAB mnem_rules[] = {
{"unpr", 0x01},
+ {"noprefix", 0x02}, // rule fails if a prefix has been removed
{"w_alt1", 0x11},
{"w_alt2", 0x12},
diff --git a/src/dictionary.cpp b/src/dictionary.cpp
index 709816d0..71d3fbc7 100644
--- a/src/dictionary.cpp
+++ b/src/dictionary.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005 to 2013 by Jonathan Duddington *
+ * Copyright (C) 2005 to 2014 by Jonathan Duddington *
* email: jonsd@users.sourceforge.net *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -2165,6 +2165,13 @@ static void MatchRule(Translator *tr, char *word[], char *word_start, int group_
{
match.end_type = SUFX_UNPRON; // $unpron
}
+ else if(command == 0x02) // $noprefix
+ {
+ if(word_flags & FLAG_PREFIX_REMOVED)
+ failed = 1; // a prefix has been removed
+ else
+ add_points = 1;
+ }
else if((command & 0xf0) == 0x10)
{
// $w_alt
@@ -3604,7 +3611,7 @@ int RemoveEnding(Translator *tr, char *word, int end_type, char *word_copy)
int end_flags;
const char *p;
int len;
- static char ending[12];
+ char ending[50];
// these lists are language specific, but are only relevent if the 'e' suffix flag is used
static const char *add_e_exceptions[] = {
@@ -3642,7 +3649,7 @@ int RemoveEnding(Translator *tr, char *word, int end_type, char *word_copy)
}
// remove bytes from the end of the word and replace them by spaces
- for(i=0; i