mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.39.04]

Browse Source 
Reduce pause when announcing punctuation.
Fix crash for list of numbers in some languages, eg: "22,23,24,25,26,27..."
Recognise XLL (etc) is not a valid Roman number.
espeak_Cancel(), reset punctuation echo.
Don't permanently change option_phoneme_input after using [[ ]] internally.
lang=af: Only recognise word "'n" as [@] when followed by a space. 


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@193 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-09-20 01:02:37 +00:00
parent 37753d29f4
commit a7bb7cb6b4
26 changed files with 349 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dictsource/af_list
+24 -4
View File
@@ -151,13 +151,14 @@ _roman rum'eIns@
alaska al'aska
algerië alx2'e@re@:@-
antwerpen antv&rp@n
asië A:si@
babilon babilOn
bangladesh baNglad'ES
bastille bast'il
bellevue b&lvju:
berlyn $2
bermuda $2
bethlehem bEt_liEm
boedapest budapEst
boekarest bukarEst
bonnievale _^_EN
brittanje $2
@@ -174,6 +175,7 @@ colesberg ko@lsb&rx2
constantia $2
christiana kr@stij'A:na
damaskus d@maskWs
doebaai $2
duitswes dYytsv'Es
ermelo &rm@lo@
franschhoek frA~nsh'uk
@@ -199,6 +201,8 @@ kenia ki:nia
kimberley kimb@rli
kongo kONgu
knysna neIsna
kuruman kuruman
kwa kwa $u $only // KwaZulu, etc.
lesotho l@sutu
limpopo l@mpo@po@
macedonië mas@d'o@ni@
@@ -209,6 +213,7 @@ mauritius mOr'iSjWs
milaan $2
mesopotamië mEsuput'A:mi@
montagu mOnt@ky
moreletapark mOr@l,Etap'ark
moorreesburg mur'e@sbWrx2
mosambiek musamb'ik
(thaba nchu) tab'A:||ntSu
@@ -220,6 +225,8 @@ pelindaba p&l@nd'A:ba
portugal $1
potchefstroom pOtSIfstr'o@m
robertson _^_EN
sahara sah'A:ra
secunda s@kunda
senekal se@n@kal
singapoer siNgapur
soweto suw'E:tu
@@ -233,12 +240,13 @@ upington apiNt@n
vesuvius v@su:viWs
viëtnam vj'Etnam
wallonië val'o@ni@
washington _^_EN
wellington wEliNt@n
wolseley wulsli
worcester v'ust@r
uganda ug'anda
zimbabwe zI:mb'ab_wE
zulu zulu // Kwazulu-Natal
// People names
@@ -262,6 +270,7 @@ blomerus blum'e@rWs
botha bo@ta
bouwer b@U@r
brian _^_EN
bredenkamp bre@d@nkamp
breytenbach breIt@nbax2
brouwer bruw'&:r
caesar siz@r
@@ -288,6 +297,7 @@ darwin _^_EN
david _^_EN
debora d@bo@ra
debussy d@bus'i:
(de la) d@||la $u // de la Rey/de la Bat, etc.
der d@r
derick dErik
deventer d'e@v@nt@r
@@ -387,6 +397,7 @@ michiel $2
mike _^_EN
miriam mIri@m
mohammed muh'am@t
morné mOrn'eI
mostert m'Ost@rt
mouton mut'On
mozart mo@tsart
@@ -473,9 +484,12 @@ khumalo kum'A:lu
zuma zu:ma
// Other proper names
absa absa
boeing _^_EN
centaurus $2
checkers tSEk@rs
chrysler kraIsl@r
ferrari f@rA:ri
martini mart'i:ni
wimpy wImpi
@@ -595,7 +609,7 @@ my $u $verbf
jou $u $verbf
hom $u $verbf
haar $u $only $verbf
se Es@ $capital
se Es@ $capital
dis $u
@@ -620,6 +634,7 @@ aggressie $2
agterstevoor $4
agterweë $3
algaande $2
alge alx2@
algehele alx2@h,e@l@
allegro al'Egru
alles al@s
@@ -657,6 +672,7 @@ bourgeoisie _^_FR
cabernet kab@rn'eI
camembert kam@mb'&:r
camouflage kamufl'A:Z
casino kas'i:n@U
charisma kar'Isma
chemikalieë $3
crescendo kr@SEndu
@@ -795,6 +811,7 @@ misbruik $2 $verb
misbruikte $2
miskien $2
misterie m@ste@ri
(modus operandi) m,o@dWs||o@p@r'andi
monsieur _^_FR
motore mo@t'o@r@
motor mo@t@r
@@ -822,7 +839,9 @@ normale nOrm'A:l@
numeri nWm@ri
oeuvre W:vr@
oftewel Oft@v&l
omgeef $2
ommekeer Om@ke@r
omrede $2
omtrent Omtr'Ent
onbegrip $1
@@ -835,6 +854,7 @@ onderwyser $3
ondeug $1 $only
ondeugde $1 $only
onding $1
oneer On_e@r $only
ongeag $1
ongeduld $1
ongeloof $1
@@ -844,6 +864,7 @@ ongerief $1
ongewens $1
ongewensde $3
ongewoons $1
onguns $1
onkunde $1
onmag $1
onmin $1
@@ -981,7 +1002,6 @@ vrek fr&k
waarskynlik $2
waarskynlike $2
wangedrag vanx2@drax2
watwo vatvo@
watwou vatv@U
weergalm $2
dictsource/af_rules
+155 -27
View File
@@ -18,7 +18,7 @@
a A:
AC) a (_ %a // short final a in words like: Eva/Pieta/(su)sara
%C) a (_ %a // short final a in words like: Bella/Betta/gogga
s) ate (l %at@ //satelliet and compounds
s) ate (l %at@ //satelliet and compounds
C) a (rina %a //unstressed short a in carina tarina etc.
&b) a (_ %a // short final a: mamba and compounds/marimba/hamba
&d) a (_ %a // short, unstressed a after d at end of word: soda/padda... and compounds
@@ -84,11 +84,13 @@
a (CA A:
_) aka %ak@ //akademie etc.
akkedi %ak@dI //akkedis and compounds
akkommo (d %ak%Om@ // fix stress and vowel sounds: akkommodasie/akkommodeer/-derend
a (kkoord %a // move default stress: akkoord/-e and compounds
akku (ra %ak%y // move default stress: akkuraat/akkurate
ako (Ciet %ak%u // fix stress and vowel sounds: akoliet/akoniet and compounds
akro (ba %akr%u // move default: akrobaat/-bate/-baties
ak (syn %ak // move default stress: aksyns and compounds
aktuari (A %akt%y%ar%i // fix stress and vowel sounds: aktuarieel/-ële
akwama (ryn %akw%am%a // move default stress: akwamaryn and compounds
_) a (kwat %a // move default stress: akwaties/-e
akware (l %akw%ar& // fix stress and e sound: akwarel/-le
@@ -178,7 +180,7 @@
af (hank %af // move default stress: afhanklik/-e/-heid, etc.
_) af (komstig %af // move default stress: afkomstig
afrik (aan %afr%ik // exception to af prefix and move stress to end
afrikaner %afr%ikA:n@r // move stress to end: Afrikaner and compounds
afrikane (K %afr%ikA:n@ // move stress to end: Afrikaner and compounds
afrika A:frika //Stress and 1st a sound: Afrika and compounds: Afrikatale/-state...
af (sigte %af // move default stress: afsigtelik/-e/-heid
af (skuw %af // move default stress: afskuwelik and derivitives vs afsku
@@ -245,6 +247,7 @@
ar (seen %ar
ar (tikel %ar // stress: artikel and compounds
artiku %art%ik%y // stress and vowel sounds: artikulasie/artikuleer
_) a (sië A: // fix stress and a sound: Asië/-r/-rs
_) a (strA %a // astrant/astrale/astraal
artille (rie %art@l@ // stress and vowel sounds: artillerie and compounds
asem A:s@m // asemgehaal/asemhaling/asemteug/ontwaseming
@@ -413,6 +416,7 @@
brand (r brant // fix d sound: sonbrandroom/brandroos, etc.
brasi (li br%asI // BrasiliëBrisiliaan/-s/-e
brav (A br%av // stress and v sound: bravade/bravo
bron (A@ brOn_ // fix o sound, pause: bronaar/-adres/-olie/hulp-/waterbronontwikkeling
bro (sju br%O // move default stress: brosjure/-s and compounds
_) byge (@P4 b'eIx2@
by (kom@ b%eI // bykomende/bykomstige
@@ -440,6 +444,7 @@
balsem bals@m // correct e sound in derivitives like balseming
bara (k bar'a
bar (bA b%ar // barbaar/barbare and derivitives/barbier and compounds
bastion bastiOn // -tion not English: bastion/-s and compounds
batte (ry b%at@ // move default stress: battery/-e and compounds: batterysuur...
bibli (oC b@bl%i:% // biblioteek and compounds/biblioteke/bibliofiel/bibliografie...
@@ -453,6 +458,7 @@
bi (sar b%i // move default stress: bisar/-re
bi (za b%i // move default stress: bizar/-re
blad (A blat_ // fix d sound: blad(aar/-afdruk/-artikel/-ontwerp/-uitleg)
_) bla (me bl%a // fix e sound: blamerend/-e/blamering
bla (tant bl%a // shorten 1st a and move default stress: blatant/-e/-heid
_) blik (A blIk_ // fix i sound: blikaspaai/blikemmer/-s/blikoopmaker/-s/blikoor/blikore
bloe (ddors@ bl%u // bloeddorstig and derivitives, but bloeddors
@@ -474,6 +480,7 @@
bosch (_ bOs // Rondebosch/Stellenbosch
bo (tanie b%o@ // stress on 2nd slb.: botanies/-e
bota (nie_N b%o@t%a // stress on 3rd slb.: botanie
boulevard bul@vard // boulevard/-s
_) bowe b''o@v@ // fix e sound in compounds: boweaards/bowemaans/bowetoon
_) breda br@dA: // move default stress: (van )Breda/Bredasdorp
bril (jant br@l // move default stress: briljant/-e/-heid/-ste
@@ -519,6 +526,7 @@
bes (ie_ be@s //sonbesie duinebesie etc.
bes (ies_ be@s //sonbesies duinebesies etc.
son) be (sie be@ // fix e sound in compounds with sonbesie: sonbesiebos, etc.
beste (k b@st& // fix e sound: bestekopname and many compounds of bestek
bed (h bEt // fix stress, e sound and d sound: bedhoek/bedhok, etc.
bedjie bE:ici // (ge)bedjie/-s/bababedjie
bed (k bEt // bedkassie/bedkaartjie/bedkatel/bedkussing
@@ -535,6 +543,7 @@
bede (str be@d@ // fix stress and e sounds: bedestring/-e and compounds
bedev be@d@f // bedevaart and compounds
beger (A b@x2e@r // begerig/begerend and compounds
behep b@hEp // fix e sound: mags-/seksbehepte/-heid and similar
bek (f b&k // fix stress and e sound: bekfluitjie/-s/-musiek, etc.
bek (m b&k // fix e sound: geelbekmalmot/langbekmaande/skeerbekmuis
bekk (+ b&k // exception to be (C%+ bE
@@ -598,8 +607,10 @@
ch x2
_) ch x2
chalet S%aleI // chalet/-s/bergchalet
cha (risma k%a // fix stress and ch and 1st a sounds: charismaties/-e
chau (C S%@U // chauffeer/chauffeur/-s/chauvinis/-me/-ties
ch (ol k //cholera, cholestrol etc.
cholesterol k%OlEst@-r%Ol // cholesterol and many compounds
ch (l k // chloor and compounds
ch (ro k
chat _^_EN
@@ -629,6 +640,7 @@
daniël dA:ni@l // fix stress: Daniël(skuil)
dani (gh d'A:n@ // -hoedanigheid/hoedanighede/onderdanigheid
@) dant d'ant // dant takes stress: kommandant/pruimedant
de (flasi d%e@ // fix e sound: deflasie(beleid)/deflasionêr/deflasionisties
de (gradA d,e@ // fix e sound: degradasie/degradeer/-ering
@) d (eis t_ // fix d sound, insert pause: skuldeiser/grondeise and many compounds
de (kaan d@ // fix stress and e sound: dekaan/-skap
@@ -636,6 +648,7 @@
_) de (klass de@ // deklassifikasie/gedeklassifiseer
de (klinA d%E // fix 1st e sound: deklinasie/deklineer/-nering and compounds
_) dele (gA d@l@ // fix stress and e sounds: delegeer/delegasie
@) de (ment d@ // fix e sound: amendement/bombardement/rendement
de (moCr d%E // demokraat/demokrasie/-ë/demokraties/demografie
demone d%imo@n@ // fix stress and vowel sounds: demone and compounds, eg. demonegeloof
de (moon d%i // fix stress and e sound: demoon and compounds
@@ -650,15 +663,18 @@
@) dend (er d@nd // beduidender/behoudender
_) den (dri d%En // dendriet/-e/dendrities/-e
@) dend (ste d@nt // beduidendste/behoudendste
&) de (ne_ d@ // fix penultimate e sound: af-/uitgetredenes/aangehoudenes and similar
_) denim d''En@m // fix e sound in denim and compounds
&) denis d@n@s // geskiedenisboek/kultuurgeskiedenis/belydenis/beduidenis
denk dENk // fix e sound: bronsgedenkbeeld/nadenke/teenbedenking/vrydenker
denken (d d''ENk@n // fix stress and e sound: anders-/edel-/na-/vry-/weldenkend
@) dente (@ dEnt@ // fix connecting e in compounds like studenteoptog/-opvoering
skan) dina d@n'A: //skandinawiese etc.
deodo (rant d%i%ud%u // fix vowel sounds and stress: deodorant/-e and compounds
deodo (rant d%i%ud%u // fix vowel sounds and stress: deodorant/-e and compounds
de (press d%i // depressie/depressief/depressiewe
de (puta d%E // fix e sound: deputasie/-s and compounds
@) derd (_ d@rt // verouderd/afgesonderd/gevorderd
twee) derde d&:rd@ // fix e sounds: tweederdemeerderheid/-deel
_) der (duiC d%&r // move default stress: derduisende/derduiwel
@C) derm (K d&r@-m // fix e sound of derm in compounds: nersdermklier/slukdermsiekte, etc.
@) dderd (_ d@rt // ontredderd, se rule: dd d
@@ -666,6 +682,7 @@
desibel dEsib&l // fix vowel sounds: desibel/-s
de (skun d%E //deskundig/e in compounds
_) des (po d%Es // move default stress: despoot/despote
_) destabili (s d%e@st%ab%il%i // fix vowel sounds: destabilisasie/-seer/-sering
de (strukt d%e@ // fix e sound: destruktief/destruktiewe
deto (nA d%Et%u // fix e and o sounds and stress: detonasie/detoneer/detonering
deur (aar d%y@r_ // move default stress: deuraar/-de
@@ -700,6 +717,7 @@
dina (miet d%in%a // stress to 3rd slb.: dinamiet and compounds
dina (stie d%in%a // move default stress: dinastie/-ë
di (nee d@ // fix stress and i sound: dinee and compounds
dingaan d@NgA:n // fix stress and g sound: Dingaan(sdag)
dino (sou d%in%u // move default stress: dinosourus/-se and compounds
di (ploma d@ // move default stress: diploma/-s and compounds/diplomaat
direk d%irEk // direk/-sie/-te/-theid/indirek...
@@ -732,7 +750,7 @@
desember d%e@sEmb@r
digers d@x2@rs
departe (ment d@p%art@
deposito d@pOsitu // stress and vowel sounds: deposito and compounds
deposito d@po@situ // stress and vowel sounds: deposito and compounds
depot (_ dEp%u // fix vowel sounds, drop t: (bus-/goedere)depot/-s, etc.
detail d'i:teIl
detai (lleer d%i:t%eI // fix stress: (ge)detailleer(d/-e)
@@ -741,6 +759,7 @@
distri (bu d@str@ // distribusie/distribueer and compounds
_) dis (t d@s // stress: distrik/-te and compounds/distansie/distinksie/distorsie/distraksie
distel dIst@l // restore default stress: distel and compounds
di (visie d@ // fix 1st i sound: divisie/-s and compounds
_) dode d'o@d@ //dodelik dodemars etc.
doel (tref d%ul // move default stress: doeltreffend/-e/-ste
doktor (K dOkt@r // make 2nd o schwa: doktor/doktorsgraad
@@ -769,6 +788,7 @@
@) d (eteC_ t // aand-/oggendetes/grondeter
djie ci // bokbaardjie/bordjie/boordjie/perdjie/tydjie
doeane d%uA:n@ // fix stress and e sound: doeane(-beampte/-gelde/-kantoor...)
do (ssier d%O // move default stress: dossier/-e and compounds
@) d (r d // but oordrewe/oordrom
san) d (r t // fix d sound: sandrif/-randjie/-rivier/-ruiter
han) d (r t // fix d sound: handreiking/-reling/-rug
@@ -800,8 +820,12 @@
CAC) e (CC @ // fix e sound: nalatenskap/wapenstilstand
CAC) e (C% E // beesfilette/nougesette/onderbesette/voortgesette
narkos) e (C @ // fix e sound: narkosedood/-gas/-masker/-middel/-rekords, etc.
ooi) e (C @ // fix e sound: dooiepunt/ooievaar and similar
@C) e (af @_ // fix e sound: doodseise-/manne-/ongevalle-/troepeafdeling/slakkeafval
@C) e (mag @ // fix e sound: derdemag and compounds
C) e (marie @ //anemarie, lisemarie etc.
n) eke (_ @k@ //anneke Heineke etc.
@k) e (raad @ // fix e sound: lekeraadslid/praktykeraad
CACp) e (rl @ // fix e sound: werperligte/wimperloos
CAC) e (rr @ // fix e sound: koperring/-rooi/nederryn/somerreën/-rok/superrealis/syferrekenaar...
@C) e (reekK @ // fix e sound: duine-/rotsereeks
@@ -842,15 +866,20 @@
C) e (man @ // e sound: briewemandjie/derdemannetjie/dowemansdeur/semantiek/semanties/Weideman
C) e (mm++ E // geelkoperemmer/wateremmer
CAnn) e (CA @ // banneling/sinnebeeld/spinnekop/-rak
ies) e (b @ // fix e sound: dinamiesebinding/ekonomiesebemagtiging
&At) e (be@ @ // fix e sound: batebestuur/sekuriteitebeurs/soldateberoep, etc.
Aw) e (bA @ // fix e sound: briewebesteller/diewebende/newebedoeling/skewebek/stywebeen
@C) e (bo @ // compounds with boek/boer/boog/boom/bol/bord/borsel/bos/ grondbonebotter/kamdebo...
@C) e (bu @ // briewebus/ereburger/novellebundel/urinebuis/woedebui
@C) e (by @ // fix e sound: statebybel/-s
_) edel e@d@l // fix 2nd e sound: edelgas/-steen/-stene/-metaal and many similar
ies) e (f @ // fix e sound: mediesefondsbetaling/-bydrae and similar
_) epi (C %Ep%i //episode and others
halw) e (K @ // fix e sound: halwemaan/halwerweë/halwes
liefd) e (C @ // fix e in compounds starting with liefde: -blyk/-daad/-diens/-gawe/-groete/-werk, etc.
@C) edans @dA~ns // fix e sound: elwe-/klompe-/volkspele-/windedans/-e/-er
@C) e (dien @ // fix e sound: afgodedienaar/bode-/briewe-/geheime-/logistieke-/vriendediens/-te
mal) e (dy @ // fix e sound: vermaledy/-de and other derivitives
sp) e (d @ // ekspedisie/gaspedaal/kwispedoor
@C) ederm @d&r@-m_ // fix e sounds: blindederm/-ontsteking/-operasie, etc.
@@ -929,6 +958,7 @@
j) e (k E // fix e sound: tjek and compounds/windjekker, etc.
C) e (kamp+ @ // fix e sound: (krygs)gevangenekamp/soldatekamp and similar
@d) e (klas @ // fix e sound: tweede/derdeklas and compounds
@C) e (kom@ @ // fix e sound in compounds: rassismekommissie/griewe-/middele-/name-/portefeuljekomitee
@d) e (kr @ // fix e sound: vriendekring/-e
e (klipK %e@ // fix stress and e sound: eklips/eklipties
e (kono@ %E // 1st e: ekonome/ekonomie/ekonomies/ekonoom
@@ -936,6 +966,7 @@
ekse (llenC %Eks@ // fix 2nd e sound: eksellensie/-s/eksellent/-e
ekspli (siet %Ekspl@ // fix stress and i sound: eksplisiet/-e
_) ekster (K Ekst@r // restore default stress: ekster/-s and compounds
_) ekstern %Ekst&r@-n
ekstre (mis %Ekstr@ // move default stress: ekstremis/-te/-ties
ekstra (K Ekstra // ekstra/-s
ekstro (ver %Ekstr%u // fix stress and o sound: ekstrovers/-e/-vert
@@ -1018,7 +1049,7 @@
eu Y@
C) eue Y@@ // fix e sound: compounds and derivitives of leuen/vleuel/geheue/teuel, etc.
eu (forie %Y@ // move default stress: eufories/-e
eufo (rie_N %Y@f%u // stress to end: euforie
eufo (rie_N %Y@f%o@ // stress to end: euforie
C) e (uit @_ // fix e and ui sounds: akteuitmaker/druiweuitvoer/woedeuitbarsting and many similar
euntjie Y@iNci // seuntjie/reuntjie
eë e@ // e deelteken-e
@@ -1026,6 +1057,7 @@
m) e (nis @ // geheimenis(vol)/verdoemenis
C) e (toe_ @ // binnetoe/buitetoe
e (gK &
@C) e (groep @ // fix e sound: beelde-/vriendegroep
_) ega (l %e@x2A: // stress: egalig/-e
_) e (gipt %e@ // move default stress: Egipte/Egiptenaar/Egipties
C) ektomie 'Ektumi // histerektomie/vasektomie
@@ -1042,10 +1074,15 @@
ACd) e (le_ e@
los) e (s @
@C) ess (_ _^_EN // English words ending in -ess in Afrikaans text
eis) e (be @ // fix e sound: eisebetalings and similar compounds
eis) e (st @ // fix e sound: eisestaat/-state
e (lK &
%C) e (C @ // (d)warrelwind/slakkepas
%C) e (gg & // fix e sound: kabellegging/niksseggend/-e/-heid
%C) e (tt+ E // fix e sound: (enkelveel)lettergrepige/koppelletter/krulletter/spannette
ldd) e (lgAC & // fix e sound: skulddelger/-ging/-sfonds
ll) e (lK & // parallel/-le
ll) e (ser e@ // fix e sound: Bybel-/ontspanningsverhaal-/rolleser/-s
&s) e (l@ @ // e sound in words like borselkop/voedselaanvulling and many similar
tronks) e (l & // fix e sound: tronksel/-selletjie
@s) e (lfde '& //fix dieselfde
@@ -1136,8 +1173,10 @@
@C) e (reë @ // fix e sound: geelperskereën/tropereën, etc.
@d) e (rnst+ & // but fix e sound in doodernstig/-e
&t) e (r@ @
iënt) e (r@n e@ // fix e sound: lewensoriëntering/-rende
&b) e (s@ @
rw) e (s @ // fix e sound: larwes/afsterwes/(van der )Merwes
rw) e (se_ e@ // fix e sound: rekenaar-/waterwese and similar
eskader %EskA:d@r // fix stress and 1st e sound: (lug)eskader)bevelvoerder and similar compounds
eska (pade %Esk@ // fix stress and a sound: eskapade/-s and compounds
essen (si %isEn // fix e sounds: essensie/essensieel/essensiële
@@ -1193,6 +1232,7 @@
ewig (du %e@v@x2 // move default stress: ewigdurend/-e/-heid
ewighei (d e@v@x2,eI // ewigheid/hewigheid/stewigheid/ewigheidjie
C) e (winkel @ // fix e sound: juwelewinkel and similar
evolus EvOl'ys // evolusie/devolusie/revolusie
C) ewy (C @veI // alewyn/compounds of brandewyn/sekondewyser
_op) e (n @
@@ -1206,7 +1246,7 @@
pr) ent (++ Ent // default stress for compounds of prent/-e
pr) entjie E:iNk%i //fix prentjie
@s) ent (rA Ent // winkelsentrum/studentesentrum, etc.
C) er (tyd @r // tegelykertyd/kindertyd/indertyd
@C) er (tyd @r // tegelykertyd/kindertyd/indertyd, but spertyd
_) etens 'e@t@ns // etenstyd/klok/tafel/uur
pann) e (C @ //pannekoek and friends
pann) e (tjie i //fix pannetjie/spannetjie etc.
@@ -1260,6 +1300,7 @@
interpr) e (teer @' //stress and e sound interpreteer
_) e (ks %E //move default stress in words starting with eks
_C) e (on_ 'i //Leon, Deon etc.
@C) e (oor @_ // fix e sound: boekbeoordelaar/klasseoorheersing/tarieweoorlog/waardeoordeel
CoeC) e (C+ @ //fix e in boetedoening, boedelbelasting and many others
toed) e (ling e@ // fix e sound: (personeel)toedeling and similar
CoeC) e (tjie i // fix e sound: (water)poeletjie/(garing)spoeletjie/groenetjies, etc.
@@ -1304,6 +1345,7 @@
fa (ta@ f%a //fix stress and 1st a sound: fatale/fatalis/-me/-te/-ties
fat (soen f%at // move default stress: (on)fatsoen(lik)
februarie fe@bry,A:ri
fede (ra f%Ed@ // fix stress and e sounds: federaal/-ale/-asie
feite feIt@ // fix 2nd e sound: feitebepaling/-bevinding/-bron/-fout/-kennis/-lik
@) fel (end f@l // betwyfelend/skuifelend/weifelend
@) fel (ing f@l // betwyfeling/skuifeling/weifeling
@@ -1325,6 +1367,7 @@
fla (mi fl%a // move default stress: flamink/-e and compounds
fla (grant fl%a // shorten 1st a and move default stress: flagrant/-e
flambo (jant fl%amb%u // move default stress: flambojant/-e/-heid
fleb (otomie fl%Eb // fix stress and e sound: flebotomie
flo (re fl%u // move default stress, correct o sound: florerend
flori (ssA fl%o@r@ // move default stress: florissant/-e
flu (we fl%y // move default stress: fluweel/fluwele and compounds
@@ -1344,6 +1387,7 @@
foto fo@tu
fo (togra fo@ // move default stress: fotograaf and similar
_) fran (CisCA fr%an // fix stress and a sound: Fransiskus/Franciscus/Francisca
fre (kwen fr%i // fix stress and 1st e sound: frekwensie/-s and compounds
freud frOId // Freud/Freudiaans/-e
front (A fr%Ont // fix stress and e sound: konfronterend/-e/konfrontering
fru (str fr%W // move default stress: frustrerend/-e
@@ -1442,6 +1486,7 @@
_) gebede x2@be@d@ // fix stress and vowel sounds: gebedeboek/-e/-tafel/-s
K) gele (_ x2e@l@ // fix stress and e sound: (eier)gele
_) geler x2e@l@r // stress and 1st e sound: geler/gelerig
gemel (d x2@m&l // fix e sound: bo-/bowe-/laas-/meergemeld/-e
gems x2Ems // fix e sound: (baster)gemsbok/-bul/-ooi, etc.
gene (_ x2e@n@ // gene/diegene
gene (alo x2%e@n%i // fix vowel sounds: genealogie/-s/-e, etc.
@@ -1486,6 +1531,7 @@
gewel x2e@v@l //gewel/huis/muur etc.
gewer (_ x2e@v@r // gewer and many compounds ending in gewer
slag) gewer x2e@v@r // fix e sound: verslaggewerbank/verslaggewertjie, etc.
werk) ge (wer x2e@ // fix e sound: werkgewerfonds/-kontrak and similar compounds
gewing x2e@v@N // begewing/vergewing
bur) ger g@r
gee (+ x2e@
@@ -1495,7 +1541,7 @@
gei (+ x2eI // geil and derivitives/geiser/geit/-e
ge (kskeer x2& // gekskeer/gekskeerder/gekskeerdery
geld x2&lt
gelde x2&ld@
gelde (K x2&ld@
geldi x2&ld@
geldjie x2'&lci
_) gelykeni (s x2@l'eIk@n@ // gelykenis/se
@@ -1580,7 +1626,9 @@
hermafro (di h%&rm%afr%u // move default stress: hermafrodiet/-e
_) her (manK h&r // restore default stress: Herman(n)
herme (lyn h%&rm@ // fix stress and 2nd e sound: hermelyn and compounds
he (roïe h%e@ // fix e sound, no pause: heroïes/-e
hero (ïen h%e@r%uw // fix stress and vowel sounds: heroïen and compounds
he (rrie h& // restore default stress: herrie and compounds
hersen h&rs@n // restore default stress and fix 2nd e sound: hersenskim/-me/-mig/hersenskudding
hertog h&rtOx2 // restore default stress: hertog and derivitives
@@ -1593,7 +1641,7 @@
_) helde h'&ld@ // heldedade/heldedood/heldemoed...
&) hede (_ he@d@
he (g h&
g) heid eIt // traagheid/leegheid/droogheid/stugheid
heid (_S4 heIt
herinner h&r'In@r // herinner/-ing/-e|s
hia (sint h%ij%a // fix stress: hiasint/-e and compounds
_) hi (bis h%i // move default stress: hibiskus/-se and compounds
@@ -1644,6 +1692,7 @@
h) i (dro i //hidro in compounds
_) i (ko %i // move default stress: ikoon/ikone
_) in (aCemP2 'In_ //inasem/inademing, etc.
C) in (asem _@n // fix i sound, pause: rookinaseming and similar
self) in (C@ _@n // selfingenome/-nheid/selfinkeer, etc.
_) in (a@P2 In // inakkuraat/inaktief/inaktiwiteit
_) in (oe In_ // fix i sound, pause: inoefen/-oes and derivitives
@@ -1682,6 +1731,7 @@
in (doena @n // move default stress: indoena/-s
indwing Indw@N // fix d sound: indwing/-ing
in (een @n // ineengedoke/ineengekrimp/ineenstorting and many similar
_) in (ent ''In_ // fix stress, i sound, pause: inent/-ing
in (fek @n // move default stress: infeksie/-s and compounds
infor (ma @nf%Or // move default stress: informant/-e/informasie
in (formeP2 'In // fix e sound: informele
@@ -1713,6 +1763,7 @@
intrig (e@ @ntr%ix2 // stress and vowel sounds: intrigeer/intrigerende/intrigering
innuendo @ny:|'End@U // innuendo('s)
invalide @nv%alid@ // stress and v sound: invalide and compounds
in (werkingst @n // move default stress: inwerkingstelling and compounds
C) ie (r i: //ier long in most cases, exceptions below:
g) ie (rig i // short ie: gierig/-e/-heid
@@ -1774,6 +1825,7 @@
&C) ikend @k@nt // grinnikend/runnikend/sanikend
&C) ikende @k@nd@ // grinnikende/runnikende/sanikende
ingenieur @nx2@n'y@r
insurgen (s @ns%Wrx2En // fix stress and e sound: (teen)insurgensie and compounds
inten (s @ntEn // move default stress
in (tussen @n // move default stress
_) iri (s ir@ // restore stress on 1st slb.: iris/-se
@@ -1889,6 +1941,7 @@
kkelende (_ k@l@nd@
kelner k&ln@r // fix 2nd e sound in compounds like kelnerbaadjie, etc.
kelner (in k%&ln@r // move default stress: kelnerin/-ne/-netjie
ke (nnAK kE // fix e sound: boek-/markkenner/-kennis
kera (miek k%&r%a // move default stress: keramiek and compounds
n) kerend (_ k@r@nt //hunkerend and others
n) kerende (_ k@r@nd@ //hunkerende and others
@@ -2012,10 +2065,12 @@
kanfer kA~nf@r_ // fix e sound: kanferboom/-bos/-hout/-olie, etc.
kanfer (foel k%A~nf@r // move default stress: kanferfoelie and compounds
kanni (ba k%an%i // move default stress: kannibaal/kannibale/kannibalisme
_) kano (vaar k%ano@ // fix stress and vowel sounds: kanovaarder/vaart, etc.
kan (tien k%an // move default stress: kantien and compounds
_) kan (to@ k%an move default stress: kantoor/kantore and compounds
kant (onder kant_ // kantonderklere/-onderrok, etc.
ka (paCeC k%a // move default stress and shorten 1st a sound: kapabel/-e/kapater
kapa (siteit k%ap%a // shorten a sounds: kapasiteit/-e and compounds
kape (l k%ap& // move default stress and fix e sound: kapel and compounds
kape (la@ k%ap@ // fix e sound: kapelaan/kapelane and compounds
kaper (jol k%ap@r // fix stress and a sound: kaperjolle and compounds
@@ -2117,6 +2172,7 @@
konferen k%Onf@rEn // konferensie/-s/perskonferensie/-s
konfer (e k%Onf@r // fix e sound: (ge)konfereer/konferering
kongo (K k,ONgu // stress: kongolees/-lese
kong (otomie k%ONg // fix stress: kongotomie
koning (in k%o@n@N // fix stress: koningin/-ne and compounds
_) konka (K kONka // fix stress: konka/-s/-vure
konnekteer kOnEkt'e@r // (ge)konnekteer
@@ -2130,6 +2186,7 @@
konstabel k%OnstA:b@l // (hof/hoof/verkeers)konstabel/-s, etc.
konsul (A k%Ons%Wl // konsulaat/konsulate/konsulêr
kon (sul kOn // restore default stress: konsul and compounds
konsul (tant k%Ons%Wl // fix stress: konsultant/-e and compounds
_) kontra (KP6 k'Ontra // kontra is prefix
kontra (diks k%Ontr%a // move default stress: kontradiksie/-s
_) kontrak k%Ontrak // move default stress: kontraksie/kontrak and compounds
@@ -2145,6 +2202,7 @@
kort (sigtig k%Ort // move default stress: kortsigtig/-e/-heid
kosme (tiek k%Osm@ // move default stress: kosmetiek and compounds
kos (met k%Os // move default stress: kosmeties/-e
koste kOst@ // fix e sound in compounds: kostemodel/-ontleding/laekostelugdiens
kos (tu k%Os // move default stress: kostuum and compounds
kou (sa@ k%@U // move default stress: kousaal/-ale
koö k%o@O // koördinasie/koöpsie, etc.
@@ -2168,6 +2226,7 @@
lang (werp l%aN // move default stress: langwerpig/-e/-heid
lank (moe l%aNk // move default stress: lankmoedig/-e/-heid
_) lan (sA l%an // move default stress: lanset/-te/lanseer/-ering/lansier
lapar (otomi l%ap%ar // fix stress and a sounds: laparotomie
_) lapel l%ap'&l //lapelwapen etc.
lapel (_ l%ap'&l //baadjielapel etc.
la (tent l%a // fix stress and a sound: latent/-e
@@ -2176,6 +2235,7 @@
C) le (_ _^_EN // words ending in consonant followed by le are English
l) le (_ l@ // but: brille/pille, etc.
&) lede (_S4 le@d@
ver) lede (K le@d@ // fix compounds like apartheidsverlede
lede (C le@d@ // ledemate/ledegeld/ledelys
lede (kant l%e@d@ // move default stress: ledekant and compounds
leding (_ le@d@N //fix ontleding and others
@@ -2225,21 +2285,25 @@
lino (leum l@no@ // fix stress and i sound: linoleum and compounds, e.g. linoleumvloere
li (riek l@ // fix stress and i sound: liriek/-e
_) lito (C l%it%u // fix stress and o sound: several compounds beginning with lito-
lit (otomie l%it // move default stress: litotomie
_) lit (ograf l%it // to accommodate litografie/-grafies
@) ll (_N _^_EN // Words ending in -ll are English
lobola l%ObO:la // fix stress and vowel sounds: lobola and compounds
loboto (mie l%ub%Ot%u // fix stress and o sounds: lobotomie
lo (kalA l%u // fix stress and o sound: lokale/ontvangslokale, etc.
lom (bardie l%Om // move default stress: Lombardies/-e
_) lore (C@ lo@r@ // fix e sound: verloregaan/verloregoederekantoor/Verlorerivier
_) losge (@P5 l'Osx2@
_) losies l%us'is //losies at start always means "to stay"
&) lm (K l@-m
lisensie l@s'E:nsi
lisensie l@sE:ns%i
lisensi (eer l@s%Ens%i // fix stress and vowel sounds: (on)gelisensieer/-de
lering (_ l'e@r@N //isolering distilering correct @ to e@ and force stress
lokomo ,lukumu' //lokomotief and friends
losbandi (g l%Osband@ // fix stress and d sound: losbandig/-e/-er
lou (rier l%@U // move default stress: lourier/-krans, etc.
lug (A lWx2? // lugaanval/lugafweer/lugopname
_) lug (C l''Wx2 // force stress on 1st slb.: lugbombardement and similar
luid (rugt l%Yyd // move default stress: luidrugtig/-e/-heid
luite (nant l%Yyt@ // fix e sound and move default stress: luitenant and compounds
luksa (lig l%Wks'A: // move default stress: (wel)geluksalig/-e/-heid
@@ -2307,6 +2371,7 @@
masker mask@r // fix e sound: maskerafdruk/-agtig/ontmaskering
masker (ade m%ask@r // move default stress: maskerade/-s
maso (chis m%as%u // fix vowel sounds: masochis/-te/-ties/-e/-isme
mastekto (m m%astEkt%u // fix stress and vowel sounds: mastektomie and compounds
matemati (CA m%at@m%at%i // fix stress and vowel sounds: matematikus/-ci
materi (A@ m%at%e@r%i // materiaal/materiale/materiële/materieel
materie (+ m%ate@r%i // stress and vowel sounds: materie and many compounds
@@ -2317,8 +2382,8 @@
@) matig m'A:t@x2 // doelmatig/gelykmatig/regmatig; matig takes stress in compounds
// mc _^_EN // The mac names does not work
mme (C m@
mme (tjie mi // lemmetjie/stemmetjie and similar
CA) mme (C m@
CA) mme (tjie mi // lemmetjie/stemmetjie and similar
middagete m'Idax2_e@t@ // middagete/s
middel mId@l // middellyf/middelpunt/middelste/bemiddelend
middel (jari m@d@l // move default stress: middeljarig and derivitives
@@ -2363,7 +2428,6 @@
mis (vorm m@s // stress on 2nd slb
mo (biel mo@' // move default stress: (im)mobiel/-e
_) mode m''o@d@ // fix e sound: modeontwerper/-maker, etc.
modee m@d'e@ //akkommodeer
mode (l m%o@d& // fix stress and e sound: model/-le and compounds
mode (lle@ m%Od@ // fix stress and e sound: modelleer/modellering
modern m%ud&r@-n
@@ -2388,6 +2452,7 @@
mo (pani m%u // fix stress and o sound: mopani/-boom/-hout/-wurm/mopanies
_) mor (C@ m%Or // move default stress: morbied/morfien/mortier
mor (fose m%Or // fix stress: morfose/metamorfose/-s
morf (otomie m%Orf // move default stress: morfotomie
_) morr (i mOr // restore default stress: morrig/morrie/-doring
_) mors (@ mOrs // restore default stress: morsaf/morsdood/morsig
mosa (ïek m%o@s%a // move default stress: mosaïek and compounds
@@ -2491,7 +2556,8 @@
y) n (g n // fyngoud/hooflyngesprek/langtermyngroei/kaplyngrens
ë) n (g n // split -ng-: reëngeluid/-geur/-gogga/-gordel/seëngebed
&) n (gat n // split "ng": mangat/-e/woongat/-e/opwengat/-e
ng (eer Nx2 // diftongeer/gedistingeerde/rangeer and compounds
ng (eeR Nx2 // diftongeer/gedistingeerde/rangeer and compounds
ngees nx2e@s // split n/g: leuen-/span-/sportman-/wengees
n (_g N
ng (ent Nx2 // kontingent/tangent and derivitives
CA) nger N@r // compounds of vinger/slinger; hangertjie/hongersnood/langeraad/swangerskap/tengerste
@@ -2546,6 +2612,7 @@
ner (veu n%&r // move default stress: nerveus/-e
@C) nes (_ nEs // fix final e sound: doringnes/aasvoëlnes/kalkoennes/hamerkopnes/reiernes/kiewietnes
_) net (o nEt_ // fix o sound: netonderrok/-klere
net (werk nEt // fix e sound in compounds: kern-/rugsteun-/selfoon-/teen-/telefoon-/vastelynnetwerk
neute nY@t@ // fix connecting e sound: neutedop/neutekraker
neu (tr n%Y@ // move default stress: neutraal/neutrale
_) nguni Ngu:ni // Nguni/-beeste/-tale
@@ -2587,7 +2654,7 @@
november n%o@fEmb@r // fix 1st e sound and stress: November and compounds
ntere (ss nt;r@' // interessant/interesseer/geïnteresseerd
n (tjie N // breintjie/fonteintjie/kleintjie
oe) ng n;x2 //soengroet, pensioengewend etc.
oe) n (g n; //soengroet, pensioengewend etc.
nuanse (K n%yans@ // move default stress: nuanse/-s and compounds
nuan (seer n%y%an // fix stress: (ge)nuanseer/-d
nuus (kierig n%ys // move default stress: nuuskierig/-heid
@@ -2606,6 +2673,7 @@
&s) o (_ o@ // and: sommerso/netso
o (C O
o (CA o@
risik) o %u // fix o sound in compounds like: risikobeheer/-fonds
gr) o (nd O: //lengthen o ind compounds with grond
mikr) o u // mikrogolf/mikroskakelaar/mikrorekenaar
oase %u_A:s@ // oase/-s and compounds
@@ -2799,8 +2867,11 @@
ort (osko %Ort // fix 2nd o sound and stress: ortoskopies/-e
ose (a %o@S%i // fix stress and s and e sounds: oseaan/oseane and compounds
@) oties 'o@tis // antibioties/eksoties/eroties/neuroties
@) otomie (_N %o@t%um'i // fix o sounds and stress of medical terms: laparotomie, etc.
@) otomie (ë %o@t%um'i: // fix o sounds and stress of plurals of medical terms: leukotomieë/nefrotomieë, etc.
oux 'u //in surnames like tredoux, leroux etc.
_) o (va@ %o@ // move default stress: ovaal/ovale/ovaalvormig
ovari (otomi %o@v%A:r%i // fix stress, v and vowel sounds: ovariotomie
ovu %Ov%y // fix stress, o and v sounds: ovulasie/ovuleer
ower (@ o@v@r // lowergroen/betowerend/dowerig/compounds of owerheid
ower (spelig %o@v@r // move default stress: owerspelig/-e
@@ -2871,13 +2942,16 @@
_) onge (@P4 Onx2@
_) ongees %Onx2%e@s // ongeesdriftig; see rule: _) onge (@P4 Onx2@
onge (diert Onx2@ // restore default stress for ongedierte/-s
ongel (dig %Onx2&l // fix e sound: ongeldig/-e/-heid
_) ongeloofli (k Onx2@l'o@fl@ // to avoid "lik" suffix retranslation of "ongeloof"
@) onge (luk@ o~Nx2@ // fix n/g: padongelukkefonds and similar compounds
onge (luk_ o~Nx2@ // ongeluk/verkeersongeluk, etc.
onge (lukke_ o~Nx2@ // ongelukke/verkeersongelukke, etc.
onge (lukkie o~Nx2@ // ongelukkie/-s
onge (luks o~Nx2@ // ongeluksvoël, etc.
ongemakli (k Onx2@m'akl@ // to avoid "-lik" suffix retranslation
ongeriefli (k Onx2@r'ifl@ // to avoid "-lik" suffix retranslation
ongeva (l o~Nx2@fa // fix stress: ongeval/-le
onder On@r
onder (bre %On@r // move default stress: onderbreek/onderbreking
onder (broke %On@r // move default stress: (on)onderbroke(nheid)
@@ -2899,6 +2973,7 @@
onder (soeken %On@r // move default stress: ondersoekend/-e
_) onder (skA %On@r // exception to default stress rule
onder (skeid_N On@r // restore default stress: onderskeid
onder (skryC %On@r // move default stress: onderskryf/-we/-wing
onderstebo %On@rst@bo@ // fix stress: onderstebo/koponderstebo
onder (steu %On@r // exception to default stress rule: ondersteun/-ing/-ers
onder (stre %On@r // move default stress: onderstreep/-te/onderstreping
@@ -2971,7 +3046,7 @@
oor (sigt %o@r // move default stress: oorsigtelik/oorsigtig/-e
_) oor (skadu %o@r // move default stress: oorskadu/-wing
_) oor (skat %o@r // move default stress: oorskat/-te/-ting
oor (skrei %o@r // stress: oorskrei/-ding snd compounds
oor (skry %o@r // stress: oorskry/-ding and compounds
oor (spronk %o@r // move default stress: (on)oorspronklik and compounds
_) oor (stelp %o@r // move default stress: oorstelp/-ing
_) oor (stromi %o@r // move default stress: oorstroming and compounds
@@ -2998,17 +3073,19 @@
pak (A pak? // pakesel/pakos/verpakafdeling
pakistan p%ak%istan //first a and stress
pakke (t p%akE // pakket/-te and compounds
pale (stA p%al@ // fix stress and a sound: Palestina/Palestyn and derivitives
pale (t p%alE // fix stress and a sound: palet/-te and compounds
palin (dro p%al@n // fix stress and a sound: palindroom/-drome/-dromies
_) palja (K palj''a // fix stress on -jas: (ge)paljas/paljasse/paljasagtig/-e
pal (miet p%al // move default stress: palmiet and compounds
panado p@nA:d@U: // fix stress and vowel sounds: panado/-'s
panama pan@ma // shorten a sounds: Panamahoed/-kanaal
_) pan (dem p%an // move default stress: pandemie/-s and compounds
pande (mie p%ande@ // move default stress: pandemie/-s and compounds
_) pan (do p%an // move default stress: pandoer/-e/Pandora/pandok
pa (nele p%a // shorten a sound: panele and compounds
panga paNga // fix g sound: panga/-s
_) pan (geC pan // split n/g: pangebraaide/-geroosterde/-gesig/-geweer
pankrea paNkr%i%a // fix 2nd a sound: pankreas and compounds
pano (ram p%an%u // fix stress and vowel sounds: panorama/panoramies
_) pan (to p%an // move default stress: pantoffel and compounds/pantoen
papaja p%ap'A:ia //papaja and compounds
@@ -3033,6 +3110,7 @@
para (C ,para //paralel, paragraaf etc.
parade (K p@rA:d@ // parade and compounds
_) par (C@ p%ar // (ge)parkeer/parkeerplek/party(keer/maal...)/parfuum/parmantig
parke (raad park@ // fix stress and e sound: Parkeraad(slid, etc.)
pars (C pars // restore default stress: parsbalie/-kuip/-tyd, etc.
_) pas (AA pas // pasaangeër/pasoortreding
pas (op p%as // pasop/pasoppens
@@ -3094,6 +3172,7 @@
per (seel p%&r // move default stress: perseel and compounds
per (sepsi p@r // fix stress and 1st e sound: persepsie/-s and compounds
per (so p@r // persoon/persone
pers (om p&rs_ // fix e sound, pause: persombudsman/-ne and compounds
perso (neel p%&rs%u // personeel and compounds
pervers p@rf&rs // pervers/perversie
pe (tieter p@ // fix stress and 1st e sound: petieterig/-e/-heid
@@ -3120,6 +3199,7 @@
planete pl%ane@t@ // move default stress and fix a sound: planete and compounds like planetebaan
plant (aardi pl%ant_ // fix stress and insert short break: plantaardig/-e
_) pla (ta pl%a // move default stress: plataan/-boom/platane
platinum (A plA:tinWm_ // fix u sound, pause in compounds like: platinumaandele/-erts
plei (dooi pl%eI // (slot)pleidooi/-e
plesier pl@s'i:r
plig plIx2 // fix i sound: dienspligontduiker/pliguitvoering
@@ -3129,7 +3209,9 @@
pol (fyn p%Ol // move default stress: polfyntjie/-s
po (liep p%u // fix stress and o sound: poliep/-e/-agtig and compounds of poliep
po (liesman pu // fix o sound: poliesman/-ne
_) polis (K p''o@l@s // fix stress and o sound: polis/-dokument and similar
polisie p%ulis%i
polisi (eer p%ul%is%i // fix stress and o sound: polisieer and derivitives
polisië p%ul%is%i;e@ // fix stress and o sound: (gemeenskaps)polisiëring(sforum) and similar
poli (tAAC p%Ol@ // politiek/politoer and compounds
polities p%ulit%is // fix stress and o sound: polities/-e
@@ -3182,10 +3264,13 @@
pro (blA pr%u // probleem/probleme
proble (mati pr%Obl@ // fix vowel sounds: problematies/-e/problematiek
profesie prOf@s'i // fix vowel sounds and move stress
profit (e pr%Of@t // fix stress and vowel sounds: profiteer/-tering
pro (gram pr%u // fix stress and o sound: program/-e/ontwikkelingsprogram
pro (CA pr%u // probeer/produk/proses/professie/provinsie
produk (A pr%udWk_ // fix u sound, pause: produkopsies/-uitstalling, etc.
professio (n pr%uf%ES%i%u // fix stress and vowel sounds: professioneel/-nele/-naliteit
prokie pro@k%i //sprokie and compounds
proletari (a pr%Ol@t%ar%i // fix stress and vowel sounds: proletariaat and compounds
promenade pr%Om@nA:d@ // fix stress and vowel sounds: promenade/-dek/-konsert, etc.
promisku pr%Om@sky // fix stress and o sound: promisku/-e/-íteit
promulg (e pr%Om%Wlx2 // fix stress and vowel sounds: promulgeer/-gering
@@ -3280,6 +3365,7 @@
rond (r rOnt // grondreuk/grondrel/rondreis/-rol/-ry
rondom rOnt_%Om // rondom/rondomheen/rondomstaner
rondom (tali r%Ont%Om // fix stress and d sound: rondomtalie/-s/rondomtaliemeul, etc.
roos (kleuri r%o@s // move default stress: rooskleurig/-e/-er
roulette r%ulEt // fix stress and vowel sounds: roulette/-speler/-tafel
ru (briek r%W // move default stress: rubriek/-skrywer, etc.
rugby rWgbi
@@ -3299,7 +3385,9 @@
redeneer r@d@n'e@r // redeneer/geredeneer/beredeneer/beredeneerde
reden (ACA r@d@n' // redenasie/s
rede (ry r%e@d@ // move default stress: redery/-e and compounds
_) redi (gA r%Ed%i // redigeer/geredigeer/-de/ongeredigeerde
_) redig (A r%Ed%ix2 // redigeer/geredigeer/-de/ongeredigeerde
refer (a r%Ef@r // fix stress and e sound: referaat/-rate and compounds
referen (dA r@f@rEn // fix stress and e sounds: referendum and compounds
reflek (C r%iflEk // fix 1st e sound: refleksie/reflekteer
refor (m r@f%Or // gereformeerde/reformering/reformasie
re (frein r@ // move default stress: refrein/-e
@@ -3313,7 +3401,9 @@
reg (ist r@x2 // registrasie/-nommer/register/bevolkingsregister
regle (ment r@x2l@ // fix stress and e sounds: reglement/-e and compounds
regverdig r&x2f'&rd@x2 // regverdig/onregverdige/regverdigheid - verwyder uit af_list
rekla (mA r@kla // fix e sound: reklamatories/-e/reklamasie
reklame r@klA:m@ // fix stress and e sounds: reklame and many compounds
rekla (meer r@kla // fix stress and vowel sounds: (ge)reklameer(der)
re (kru r@ // move stress from 1st slb
_) re (la r@ // relaas/relase/relasie and compounds
rele (van r@l@ // relevansie/relevant and derivitives
@@ -3350,6 +3440,7 @@
reserwe r@z'&rv@
s) rede re@d@ // bestaansrede/feesrede
reg r&x2
re (groep r@ // fix e sound: luuksegoedere-/volkeregroep/-e
re (gresK r@ // fix stress and 1st e sound: regres/-sie/-sief
rehabilit r%i%ab%il%it // rehabilitasie(program)/rehabiliteer/rehabilitering
reke (nA re@k@ // rekenaar/sakrekenaar/rekenaarprogram/hoofrekene
@@ -3359,6 +3450,7 @@
reger (A r@x2e@r // regering/regerende
re (sensA r@ // resensie/-s/resenseer/resensent
reser (v r@s@r // fix stress and e sounds: (ge)reserveer/reservering
re (sessie r@ // fix stress and e sound: resessie/-s and compounds
respek r@spEk
respek (teer r@sp%Ek // stress to end
&) rele (_ r'e@l@
@@ -3374,10 +3466,8 @@
s (s
@@@) s (_S1 s // to correctly handle plural s
i) s (_ s // exceptions to rule: @@@) s (_S1 s
se (_ s@ //the word se and some ending in se
._) se (_ s@ //Se at start of sentence.
se (_ s@ //the word se and some ending in se
._) se (_ s@ //Se at start of sentence.
sangeres s%aN@rEs //sangeres and compounds: opera-/popsangeres
o) s (_ s // exceptions to rule: @@@) s (_S1 s
@@ -3407,6 +3497,7 @@
sili (nd s@lI // silinder(s)/silinderkoppe
si (napK s@ // fix stress and i sound: sinaps/-esinapties
_) si (noC s@ // fix stress and i sound: sinode and compounds/sinops/sinop;ties
sino (niem s,in%u // fix stress and vowel sounds: sinoniem/-e
sin (takC s@n // move default stress: sintaksis/sintakties
sinteties s@nte@tis // sinteties/e/fotosinteties/-e
si (viel s@ // move default stress and fix i sound: siviel/-e
@@ -3418,6 +3509,7 @@
sekste (t s%EkstE // fix stress and 2nd e sound: sekstet/-te
selek (CA s@lEk //seleksie selekteer etc.
sending (_ sEnd@N //fix sending at word end
@C) se (re_ se@ // fix penultimate e sound: bed-/brand-/keel-/kop-/kruip-/maag-/mond-/pitsere
seroto (ni s%Er@t%u // fix stress and vowel sounds: serotonien(vlakke, etc.)
sitrus s'itr%Ws_ //i sound and stress in compounds
@@ -3434,6 +3526,7 @@
sal (mander s%al // fix stress: salmander/-s/klipsalmander
salo (n s%alO // eetsalon/haarkappersalon
sal (peter s%al // move default stress: salpeter and compounds
samari (ta s%am%ar%i // fix stress and a sounds: samaritaan/-tane
_) sam (b s%am // move default stress: sambok/-kke/sambreel/sambrele and compounds
_) same (@P4 s'A:m@ // samekoms/sameswering
_) same (hA@ s%A:m@ // stress: (on)samehangend/samehorig/-e/-heid, but samehang
@@ -3459,6 +3552,7 @@
seker se@k@r // versekering/sekerheid/onsekerheid/sekere
se (ko s@ // sekond/sekonde/sekondes/sekondant
sekre (ta s@kr@
sekretari (A s@kr@t%ar%i // fix stress and vowel sounds: sekretariaat/sekretarieel/-ële
_) se (kre s@ // fix e sound: (ge)(kon)sekreer/sekreet/sekresie
se (ku s@ // sekuriteit/sekuur
seku (l s%Ek%y // sekulër/sekulariseer
@@ -3570,7 +3664,9 @@
spoed (@ sput // spoedaflewering/spoedeisend/spoedorder
spoed (ig spud // spoedig/-lik/-er/-ste
_) spon (ta sp%On // move default stress: spontaan/spontane
_) sport (@@@ sp''Ort_ // force stress on 1st slb.: sportadministrasie/-konfederasie
spreekwoordeli spr%e@kvo@rd@l@ // move default stress: spreekwoordelik/-e, vs. spreekwoord
springbok spr''INbOk // fix o sound: Springbokafrigter/-agterspeler; fix stress: Springbokklere
sproke spro@k@ // see rule: pro (CA pr%u : aangesprokene/onbesproke, etc.
self (_ s'&lf // myself/vanself
K) sewe (C s'e@v@ // sewejarige/standerdseweklas
@@ -3636,11 +3732,13 @@
sub (ti s%Wp // stress and b sound: subtiel/-ste/subtiliteit
sugges s%Wx2Es // suggestie/suggestief/suggestiewe
@) sug (tig s'Wx2 // eersugtig/onbaatsugtig/onselfsugtig, etc.
suid (-afrik s%Yyt // fix stress: Suid-Afrika/-kaanse/-kaner/-s
suid (oos s%Yyt_ // move default stress and insert short break: suidoos/-te/-lik
suite swit@ // fix -ui-sound: suite/-s and compounds
sukses s%WksEs // sukses/suksesse/suksesvol/reusesukses
_) su (meri s%u // fix stress and u sound: sumeries/-e
su (mmier s%W // move default stress: sumier/-e
superintendent s,upr@nt%EndEnt // fix stress and vowel sounds: superintendent and compounds
surro (ga s%Wr%u // fix stress and o sound: surrogaat/surrogate and compounds
su (saC s%u // fix stress and u sound: susan/-na/susara
_) sw sw // fix w sound: words beginning with sw-: swerweling/swetend
@@ -3676,6 +3774,7 @@
wor) stel st@l //worstel e sound in compounds
ste (land st@ // fix e sound: vasteland and several compounds
@) stel (iC st@l // eersteling/gunsteling/wellusteling/worsteling/eerstelig and compounds
&) stele (fo st&l@ // fix e sound in compounds: huis-/werkstelefoon/-fone
@) ste (llen st'& // belangstellendes/gerusstellend/regstellende/teleurstellend
saam) ste (llen st& // restore default stress: saamstellend/-e
teen) ste (llen st& // restore default stress: teenstellend
@@ -3692,6 +3791,7 @@
chri) stene (_ st@n@ //fix christene and compounds
@) stel (o st@l //bewusteloos/lustelose/rusteloosheid/kosteloos
mAre) ste (r st& // fix e sound: more/môrester/-re
stereo (ti st%e@r%i%u // fix stress and vowel sounds: stereotiep/-tipe/-tipeer
sterf (K st&rf // fix e sound: uitsterf/weg(ge)sterf/kindersterfte
@) sterkt st&rkt // compounds ending in sterkte
stero (ïed st%e@r%u; // fix stress and vowel sounds: steroïed/-e
@@ -3719,6 +3819,8 @@
storm stOr@-m
stout (moedi st%@Ut // move default stress: stoutmoedig/-e/-heid
@) straat (_S6 strA:t // Vermeulen/Maréstraat and similar
strab (otomi str%ab // fix stress and 1st o sound: strabotomie
straf (regte str%af // move default stress: strafregtelik/-e
strand (o strant_ // fix d sound and insert pause: strandoord/-e
strategie str%at@x2i // fix stress and vowel sounds: strategie and compounds
strategies str%ate@x2is // fix stress and vowel sounds: strategies/-e
@@ -3755,6 +3857,7 @@
_) tant (e tA~nt // nasalise: tante/-tjie/-s
tantes tA~nt@s // nasalise and fix e sound: tantes
tanza (ni t%anzA: // move default stress: Tanzanië/-r/Tanzaniese
tapisse (ri t%ap@s@ // move default stress: tapisserie/-ë
taren (ta t%ar@n // fix stress and 1st a sound: tarentaal/tarentale
ta (rief t%a // fix stress and a sound: tarief and compounds: (advertensie)tarief(vasstelling)
@@ -3764,7 +3867,7 @@
@C) t (eny t // to enable rule: @C) eny (_ @n'eI
adver) t (e t' // advertensie/afdeling/agent
@) t (ema++ t // compounds with tema
@) t (emaK++ t // compounds with tema
tia (_ Sja
tiara t%iA:ra // stress: tiara/-s
@@ -3803,6 +3906,7 @@
toepaslik t%upasl@k // move default stress: toepaslik/-e/-heid
toereike t%ureIk@ // toereikend/heid
toereken (b t%ur'e@k@n // ontoerekenbaar/heid/ontoerekenbaarheid
_) toe (wenKP3 t'u // fix e sound: toewen/-k/-s/-sing
borg) tog tOx2_ // fix o sound: borgtogaansoek/-e/-er
toneel t%une@l
tonele t%une@l@ // fix o sound: tonele and compounds
@@ -3811,21 +3915,29 @@
_) toege (@P5 t'ux2@
toe (kome t%u // move default stress: toekomende
toe (laatba t%u // move default stress: (on)toelaatbaar/-bare/-baarheid
toe (riste@ t%u // move default stress: toeristebedryf/-sentrum and similar
toer (n t%ur // move default stress: compounds of toernooi
toere (_ tu:r@ // restore default stress
toi (let t%OI // move default stress: toilet and compounds
tokke (lo t%Ok@ // move default stress: tokkelos/-sie/tokkelok and compounds
tok (tokk t%Ok // move default stress: toktokkie/-s/-spelery, etc.
_) to (na t%o@ // fix stress and o sound: tonaal/tonale
_) top (A t''Op_ // fix o sound: topaandeel/-offisier/-universiteit, etc.
_) top (aas t%up // fix stress and o sound: topaas and compounds
_) top (ase t%up // fix stress and o sound: topase
_) top (ogra t%o@p // fix stress and o sound: topografies and derivitives
_) top (olo t%o@p // fix stress and o sound: topologies and derivitives
@) toris (_ t'o@r@s // fix stress: pectoris/klitoris
_) tos (ka t%Os // move default stress: Toskaanse/Toskane
tradi (si tr%adi // shorten and unstress 1st slb: tradisie/tradisioneel/kunstradisie...
trag (ed tr%ax2 // move default stress: tragedie and compounds
trage (otomi tr%A:x2%i // fix e sound: trageotomie
tra (jek tr%a // move default stress and shorten a sound: trajek/-te
_) trak (ta tr%ak // move default stress: traktaat/traktate
_) trans (@P5 tr%ans // transatlanties/transformasie/transoranje/Transvaal, etc.
_) trans (aksie tr%ans // remove small break: transaksie/-s and compounds
transendent (A tr%ans%End%Ent // fix stress and vowel sounds and remove short break: transendenteel/-tele/-taal
transito tr%ansit%u // trans not prefix: transitorooftog and similar
transport tr%anspOrt // fix stress: transport and compounds
trap (soe tr%ap // move default stress: trapsoetjies/-e
traw (a trav' // trawant/e/trawal
@@ -3853,6 +3965,7 @@
tro (tsering tr%O // move default stress
truk (aats tryk // default stress: trukaatser/-s
tru (spieë try // fix u sound: truspieël/-tjie/-s
tru (stee tr%W // move default stress: trustee and compounds
ttel t@l // many compounds of bottel/skottelgoed
tuiglik t'Yyx2l@k // stress: werktuiglik/sintuiglik/-e/-heid
tuin (ier t%Yyn // move default stress: tuinier and compounds
@@ -3878,6 +3991,7 @@
teks (tiel t%Eks // move default stress: tekstiel and compounds
_) teks (tu t%Eks // move default stress: tekstuur/teksture
_) tele (C t%&l@ // telefoneer/telekommunikasie, etc.
@) tele (fo t&l@ // fix e sounds: kantoortelefoon/-fone and similar
@) tele (gra t&l@ // fix e sound in compounds: riem-/spoedtelegram/veldtelegraaf, etc.
teleks t&lEks // fix stress and vowel sounds: teleks and compounds
_) teler te@l@r // fix stress and vowel sounds: teler/-s/-y/-svereniging, etc.
@@ -3890,12 +4004,14 @@
@C) te (k_ t& // tydsbestek/uitstek
ap) tek (A te@k // apteke/apteker/aptekie and compounds
te (oC t%i% // teologie/-loog/-logies/teorie/teoreties
@) te (op t@ // fix e sound: boeteoplegging/renteopbrengs
nie) te (min t@ // fix e sound: (des)nietemin
tempera ,tEmp@-r%a //temperatuur, temperament etc.
temper tEmp@r // fix 2nd e sound: temperend/tempering
tempo (_ tEmp%u // fix e sound of compounds ending in -tempo
teks (+ tEks // compounds with teks
tempel tEmp@l // fix e sounds: afgodtempel/Hindoetempel/kultuurtempel/tempelbewaarder/tempeldienaar
ten (otomie t%En // fix e sound: tenotomie
tent (_ tEnt //suurstoftent and others
ten (takel t%En // move default stress: tentakel/-s
tente (_ tEnt@ // (suurstof-/wa-)tente and similar
@@ -3966,7 +4082,7 @@
@) ter (tyd t@r // mettertyd/pinkstertyd/toentertyd
_) tege (CA t@x2@ // tegemoet/tegemoetkom/tegemoetkomende/tegemoetgekom/tegelyk
_) terug (@P5 t@-r'Wx2
_) terug (P5 t@-r'Wx2
_) terugge (@P7 t@-r'Wx2@
teruggee (+ t@r'Wx2e@ // see rule: _) terugge (@P7 t@-r'Wx2@
@) tele (_ t'e@l@
@@ -4080,11 +4196,13 @@
veel (duid f%e@l // move default stress: veelduidig/-e/veelduidend/-e
veel (jar f%e@l // move default stress: veeljarig and derivitives
veel (s@@ f%e@l // move default stress: veel(seggend/sellig/sinnig/soortig/stemmig/sydig)
veg (een f&x2_ // fix e sound: vegeenheid/-eenhede
A) ves (_ _^_EN // words ending in ves after vowel are English
ve (l f& // maagvel, stress on 1st slb
@) vel (A fe@l // aanbeveling/aanbevelingsbrief
vele f'e@l@
ven (detta v%En // fix stress and v sound: vendatta and compounds
ven (dusie f@n // fix stress and e sound: vendusie and compounds
vene (siA v@ni: // Venesië/Venesiese
ven (ster fe~n // nasalise
@@ -4096,11 +4214,12 @@
vere (sto fe@r@ // avoid ver prefix: verestoffer/-s and compounds
verversing f@rf'&rs@N //verversing and compounds
vere (_ fe@r@ // fix e sound: vere and compounds ending in vere
vete (ra f%Et@ // fix stress and e sounds: veteraan/-ane and compounds
vi (o f%i // move default stress: viool and compounds/viole
vio (letK f%i%u // move default stress: violet/-te/-kleurige, etc.
_) vi (ri v@ // fix stress and v and i sounds: viriel/-eviriliteit
virtu v@rtS%y //virtueel virtuose etc. fix v and t sounds and assure lack of stress
v (iruK v // fix v sound: virus/-se and many compounds
viru (K virW // fix v sound: virus/-se and many compounds
vitri (oel f%itr%i // fix stress and v sound: (blou/groen/koper/sink)vitrioel
viëtna (me vj%Etn%a // fix stress and v and vowel sounds: Viëtnamees/-nese
ver (kyker f'&:r //verkyker and compounds
@@ -4124,12 +4243,15 @@
vergete f@rx2'e@t@ // vergeterig/vergetelheid
_) vergewe f@rx2e@v@ // vergewe/vergewend/-e
vering f'e@r@N //motivering preservering etc.
ver (reik f&:r // fix stress and e sound: verreikend/-e
@) vers (_ f&rs // teksvers/slotvers/kindervers and similar
vers (album f&:rs_ // fix e sound: versalbum/-s
@) vers (e_ f&rs // plurals of words like the above
_) versf f''&rsf // fix stress and e sound: versfragment/-e
ver (sie_ f&:r //words ending in versie
ver (sies_ f&:r //words ending in versies
vers (panor f&:rs // fix stress and e sound: verspanorama/-s
ver (spring f''&:r // fix stress and e sound: verspring/-er/-kompetisie
verf (i f@rf //verfilm and compounds
ver (flenC f@r // verflenter and derivitives/verflens; see rule: verf (C f&rf
ver (fris f@r // verfris and derivitives; see rule: verf (C f&rf
@@ -4146,6 +4268,7 @@
_) verse (b f'&:rs@
C) verse (_ f&rs@
KA) verse (_ v'&rs@
versifi (C v%&rs%if%i // fix stress and v and e sounds: (di)versifiseer/-sering/-kasie and compounds
vers (r f&rs // fix stress and e sound: versreël/-rym/-ritme
_) veronge (@P7 f@r'O:Nx2@
verbete f@rb'e@t@ // verbete/verbetenheid
@@ -4172,7 +4295,7 @@
A) vis (e@ vis' // v and i sounds: improviseer/reviseer/improviserend
visen (te f@s@n // fix vowel sounds: visenteer/-tering and compounds
vis (ie vis // v and i sounds: visie/televisie
vis (ier f@s // fix v and i sounds: visier/-e/kanonvisier, etc.
K) vis (ier f@s // fix v and i sounds: visier/-e/kanonvisier, etc.
visi (oen v%is%i // fix stress and v sound: visioen/-e and compounds
visite f@sit@ // fix stress and vowel sounds: visite/-kaartjie/-s
vita (mi v%it%a // move default stress: vitamine/-s/vitamientablet, etc.
@@ -4223,7 +4346,7 @@
_) voor (komA f%o@r // move default stress: voorkomende/voorkomer/voorkoming and compounds
voor (sie f%o@r // move default stress: voorsien/-ing
voorskrifteli (k f%o@rskrIft@l@ // move default stress: voorskriftelik/-e/-heid
voorspe (l fo@rsp'& // voorspel/voorspelling/voorspelbaar/onvoorspelbaar
voorspe (lK fo@rsp'& // voorspel/voorspelling/voorspelbaar/onvoorspelbaar
voor (sk fo@r // voorskiet/voorskot/voorskrif/voorskryf
voorstedeli (k f%o@rste@d@l@ // move default stress: voorstedelik/-e vs voorstede
voort (duren f%o@r_ // fix stress and drop t: voortdurend/-e
@@ -4240,6 +4363,7 @@
vreemde fre@md@ // vreemde/s/vreemdeling
vreesaan (ja fr%e@s?%A:n // fix stress: vreesaanjaend/-e/vreesaanjagend/-e
vriendi (n frind'I // vriendin/vriendinne/vriendinnetjies
vrot (eier frOt_ // fix stress, o sound, stress: vroteier/-speletjie
vrygewig freIx2'e@v@x2 // vrygewig/-e|-heid
vry (messel fr%eI // move default stress: Vrymesselaar and compounds
vry (moed fr%eI // move default stress: vrymoedig/-e/-heid
@@ -4274,6 +4398,7 @@
&s) w (eefs v // fix w sound: compounds like -sweefsel/tuisweefstof, etc.
@s) w (enn v // fix w sound: beurs-/groeps-/klas-/naas-/pryswenner/-wennende
_) web vEb //webadres/se, webarea etc.
AAs) w (enk v // fix w sound: kombuis-/nuus-/sweiswenk/-e
plaas) w (erC v // fix w sound: plaaswerf/-werwe
s) w (ou v // fix w sound: bamboeswoud/keerkringswoud and similar
s) w (r v // fix w sound: skeepswrak/sielswroeging/aardswreedheid
@@ -4351,6 +4476,7 @@
@t) w (and v // fix w sound: bloedvatwand/grotwand/hartwand
C) wag vax2 // fix w sound: bokwagter/skildwag and compounds/veldwagter
k) wagga wax2a // fix w sound: kwagga/bergkwagga, etc.
wange (drag vanx2@ // (jeug)wangedrag and similar
wankel (moed v%aNk@l // move default stress: wankelmoedig/-e/-heid
wanordeli (k v%an_Ord@l@ // move default stress: wanordelik/-e/-heid
wan (stalt v%an // move default stress: wanstaltig/-e/-heid
@@ -4449,6 +4575,7 @@
z z
z (z
t) z s // fix s sound: britz/fritz/hertz and similar
zambesi z%ambe@s%i // fix stress and e sound: Zambesi(rivier)
zebra ze@bra // fix vowel sounds: zebra/-strepe
.group
@@ -4460,7 +4587,8 @@
K) é (CK '!E // extra stress: hét/nét and similar
éé '!e@ // extra stress: één, etdc.
ék (_ '!&k // ekstra stress: ék/plék
ə @ // char.replacement for 'n
_) ə (_ @ // char.replacement for 'n
_') n (A n //try fixing 'nee' etc.
_C) è (_ E // dè/nè
ê e:
dictsource/dict_phonemes
+18 -5
View File
@@ -109,8 +109,8 @@ o O oI u
* ** : b B d D f
g j J J^ k l m n
N n^ p Q r R s t
T tS v v# w x z
N n^ p Q r R R2 s
t T tS v v# w x z
Dictionary fi_dict
@@ -128,9 +128,9 @@ S s2 t v Z
Dictionary fr_dict
@ @- @2 a A a2 A~ e
E E~ i i: o O o2 O2
O~ u u: W W2 w^i wA W~
y Y
E E2 E~ i i: o O o2
O2 O~ u u: W W2 w^i wA
W~ y Y
: ; b c d dZ f g
h j k l m n N n2
@@ -469,3 +469,16 @@ oi ong ou u ui yu
b c d f g h j k
l m n N p r s t
tS v w z
Dictionary ml_dict
a a: aI aU e E e: i
I i: l- o o: r- u u:
V y
: b c ch d d. dZ f
g h j J k kh l l.
m n N n. n^ p ph R
R2 s s. S; t t. t.h th
tS v w z z.
dictsource/en_list
+4 -2
View File
@@ -1483,6 +1483,7 @@ overage oUv@r-eIdZ
overly oUv3lI2
overt oUv'3:t
overtly oUv'3:tlI2
overturn $3
oxen 0ks@n
padre pA:dreI
@@ -1995,6 +1996,7 @@ untidy Vnt'aIdI2
untie Vnt'aI
unty Vnt'aI // for untying
unwind Vnw'aInd
unwise $2
unwound Vnw'aUnd
update $1 $onlys
update $verb
@@ -2315,8 +2317,8 @@ Toulouse tu:l'u:z
Tripoli trIp@lI2
Ukraine ju:kr'eIn
Ural ju:@r@L
Utah ju:tA:
?3 Utah ju:tO:
Utah ju:t2A:
?3 Utah ju:t2O:
Utrecht ju:trECt
Vancouver $2
Vegas veIg@s
dictsource/en_rules
+11 -7
View File
@@ -1,6 +1,6 @@
// ***************************************************************************
// * Copyright (C) 2005 to 2007 by Jonathan Duddington *
// * Copyright (C) 2005 to 2008 by Jonathan Duddington *
// * email: jonsd@users.sourceforge.net *
// * *
// * This program is free software; you can redistribute it and/or modify *
@@ -1004,7 +1004,7 @@
&) at (eer_ @t
g) at (eau at
p) atrol a2troUl
?3 p) at (r eIt
?3 p) at (riA eIt
fr) at (ern a2t
c) atego atIg@
c) atego (ric atIg'0
@@ -1647,7 +1647,7 @@
@) e (ctive 'E
_) eco (s i:koU
econo (m Ik'0n@
econo (mic Ek@n'0
econo (mic i:k@n'0
&) ecy (_ @sI2
ee i:
ee (m 'i:
@@ -1672,7 +1672,7 @@
l) egion i:dZ@n
egy (pt i:dZI
n) e (gro i:
eh (_ eI
eh (K eI
ei eI
_) ei aI
c) ei i:
@@ -1699,7 +1699,7 @@
ep (ox I2p
e (qual i:
_) e (qua i:
e (quat I2
_) e (quat I2
fr) e (q i:
_s) e (que i:
e (quip I2
@@ -2094,6 +2094,7 @@
&) eous (_ =i@s
th) eo (@ I2@
th) eo (r i@
th) eo (cracy I'0
th) eo (logy I'0
th) eo (logis I'0
eover oUv@
@@ -2208,6 +2209,7 @@
s) er (van 3:
ery (_ @rI2
ery @rI
ery (A 3j
_v) ery ErI2
_ev) ery rI2
qu) ery i@rI2
@@ -3434,6 +3436,7 @@
o (bstin 0
o (bt %0
o (bu %0
o (by_ oU
f) o (cA oU
ff) o (cA @
_l) o (cA oU
@@ -3568,6 +3571,7 @@
ox (ide '0ks
oxy 0ksI
oy OI
oy (A_ 'OI
d) o (zen V
_) o (zo oU
o (zy_ oU
@@ -3976,6 +3980,7 @@
&l) ous (_ @s
&) ous (_ @s
&) ousy (_ @sI2
&m) ous (_ @s
&n) ous (_ @s
_) out (@P3 %aUt // prefix out
c) ou (si V
@@ -4799,11 +4804,10 @@
_) un (@P2 %Vn // prefix
_) un (AP2 %Vn // prefix
_) unn %Vnn
_) un (u %Vn
@) un (al 'ju:n
une (_ ju:n
?3 d) une (_ u:n
j) une (_ u:n
j) un (A u:n
l) une (_ u:n
r) une (_ u:n
?3 t) une (_ u:n
dictsource/es_list
+27 -1
View File
@@ -26,6 +26,8 @@ _stk b'a*Ra // ??
_tld t'ilde
// names of symbols
_. punto
_, koma
@@ -351,6 +353,29 @@ alguna $u
// If a letter has a "word" pronunciation which is different from its
// "letter" name, then include the letter name here, with the letter
// prefixed by a _ character.
b be
c Te
d de
f Efe
g xe
h atSe
j xOta
k ka
l Ele
m Eme
n Ene
ñ En^e
p pe
q ku
r E**e
s Ese
t te
v uBe
w ,uBe||d'OBle
x Ekis
z TEta
_a a
a a $atend
_o o
@@ -360,7 +385,8 @@ x Ekis
_y ,ig**'iEQa
y ,ig**'iEQa $atend
ch tSe
ll Ejje
ll EJ^e
?2 ll Ej:e
á 'a||aTEntw'aDa
é 'e||aTEntw'aDa
í 'i||aTEntw'aDa
dictsource/es_rules
+2 -29
View File
@@ -9,7 +9,6 @@
.L02 b d g n m // change [s] to [z] before these
.group a
_) a (_ a
a a
ai aI
ay (K aI
@@ -19,7 +18,6 @@
.group b
_) b (_ be
b B
_) b b
m) b b
@@ -29,14 +27,12 @@
b (uA b
.group c
_) c (_ Te
c k
c (Y T // ce, ci
ch tS
.group d
_) d (_ de
d D
_) d d
m) d d
@@ -44,7 +40,6 @@
.group e
_) e (_ e
e e
e (CK E
e (r E
@@ -58,12 +53,10 @@
.group f
_) f (_ 'Efe
f f
.group g
_) g (_ xe
g Q
_) g g
m) g g
@@ -73,12 +66,10 @@
.group h
_) h (_ 'atSe
h // silent
.group i
_) i (_ i
i i
i (A J^
C) i (A j
@@ -87,29 +78,24 @@
.group j
_) j (_ x'Ota
j x
.group k
_) k (_ ka
k k
.group l
_) l (_ Ele
l l
ll J^
?2 A) ll (A j:
.group m
_) m (_ Eme
m m
.group n
_) n (_ Ene
n n
n (b m
n (v m
@@ -121,7 +107,6 @@
.group o
_) o (_ o
o o
o (CK O
o (r O
@@ -133,21 +118,18 @@
.group p
_) p (_ pe
p p
p (t p:
.group q
_) q (_ ku
q k
qu k
.group r
_) r (_ E**e
r R
_) r R
_) r R2
r (_ *
r (t **
A) r (A **
@@ -156,22 +138,19 @@
m) r (A R
n) r (A R
s) r (A R
rr *R
rr *R2
.group s
_) s (_ Ese
s s
&) s (_S1 s
.group t
_) t (_ te
t t
.group u
_) u (_ u
u u
u (A w
u (y_ w
@@ -182,7 +161,6 @@
.group v
_) v (_ uBe
v B
_) v v#
?1 m) v b
@@ -199,12 +177,10 @@
.group w
_) w (_ ,uBe||d'OBle
w w
.group x
_) x (_ Ekis
x ks
?1 A) x (A Qs
x (_ =Qs
@@ -212,7 +188,6 @@
.group y
_) y (_ ,ig**'iEQa
y i
_) y J
_m) y J
@@ -223,7 +198,6 @@
.group z
_) z (_ TEta
z T
?2 z (L02 z
@@ -237,7 +211,6 @@
ú ''u
ü u
ñ n^
_)ñ (_ En^e
$ d'Olar
dictsource/fr_list
+17 -17
View File
@@ -112,7 +112,7 @@ _# djEz
_' apOstrOf
_( 'uvr@-parA~t'Ez
_) f'Erm parA~t'Ez
_* astErisk:
_* asterisk:
_, virgyl
_- tirE
_. _|pw%E~
@@ -125,13 +125,13 @@ _> syperjWr
_? pwE~dE~terogasj'O~
_[ uvr@-_kroSE
_\ b'aksl'aS
_] f'Erm_kroS'E
_] f'E2rm_kroS'E
_^ sirkOnflEks
__ sulin^e
_` aks'A~_gr'av
_{ uvr_akOlad
_| bar
_} f'Erm_akOl'ad
_} f'E2rm_akOl'ad
² pw^is'A~s||d'Y
@@ -250,25 +250,25 @@ avh aveaS
bd boulevard $text
cci $abbrev
cio $abbrev
ctrl kO~tRo2l $pause
ctrl control $text $pause
dept depart@mA~
edf $abbrev
etc etsetera
ghz ZigaErts
ghz ZigaE2rts
hmm h@m
hz _!Erts
hz _!E2rts
ibm $abbrev
ide $abbrev
ip $abbrev
jaws dZ'O2wz
kde $abbrev
kg kilogRam
khz kiloErts
khz kiloE2rts
km kilomEtr
kw kilowat
m. m@sjY
mbrola EmbRola
mhz megaErts
mhz megaE2rts
mlle mad@mwAzEl
mme madam
mr m@sjY
@@ -553,10 +553,10 @@ tunis tynis
//*********************
(1 er) pr@mjer2
(1 ers) pr@mi;'ez2
(1 ère) pr@mi;'Er
(1 ères) pr@mi;'Erz2
(1 èrement) pr@mi;'Er@-mA~
(1 ers) pr@mjez2
(1 ère) pr@mjEr
(1 ères) pr@mjErz2
(1 èrement) pr@mjEr@-mA~
monsieur m@sjY
@@ -566,7 +566,7 @@ montréal mO~real
(qu'est ce que) kEsk@ $u
absent absA~
admin admin
airbus Erbys
airbus E2rbys
auvent ovA~
bien bjE~n2 $u+
bis bis
@@ -577,7 +577,7 @@ campus kA~pys
(chef d'oeuvre) chédeuvre $text
choeur kWr
cocus coky
dernier dErnjer2
dernier dE2rnjer2
éloquent ElokA~t2
fier fier $verb
fuel fjul
@@ -623,7 +623,7 @@ rut ryt
scorbut skOrbyt
scout skut
stout staut
uppercut ypErkyt
uppercut ypE2rkyt
ut yt
zut zyt
@@ -683,7 +683,7 @@ emacspeak Emakspi:k
end _^_en
epson EpsOn
espeak @spi:k
ethernet etErnEt
ethernet etE2rnEt
exit egzit
(file zilla) fa2jl||zija
from _^_en $u+
@@ -731,7 +731,7 @@ yes _^_en
constations kO~statjO~z2
contentions kO~tA~tjO~z2
dations datjO~z2
désertions dezErtjO~z2 $verb
désertions dezE2rtjO~z2 $verb
exploitions EksplwAtjO~z2
heurtions hWrtjO~z2
partions partjO~z2
dictsource/fr_rules
+3 -3
View File
@@ -23,7 +23,7 @@
// 2006-11-18 Gilles Casse <gcasse@oralux.org>
//
// Updated: 2008-09-13 Michel Such <michel.such@free.fr>
// Updated: 2008-09-16 Michel Such <michel.such@free.fr>
//
// Letter classes:
@@ -204,8 +204,6 @@ _) ç' (P2v s
// Define use of the final 'e' in french
e (_
qu) e (_ =@-
qu) e (s_ =@-
elqu) e =@-
uisqu) e =@
rsqu) e =@
@@ -486,6 +484,7 @@ _) ç' (P2v s
%C) e (mA // actuellement guillemets
ct) e (ment @
rC) e (ment @
g) e (rie
AC) e (ment
u) e (ment @-
ul) e (CA
@@ -502,6 +501,7 @@ _) ç' (P2v s
Cr) eamer i:mWr
Cl) eaner i:nWr
Ack) et (_ Et
eïn (_ 'Ein
// group e: English section
phsource/compile_report
+25 -5
View File
@@ -1,4 +1,4 @@
51 phoneme tables
52 phoneme tables
new total
base 98 98
base2 24 117
@@ -19,6 +19,7 @@
fr_ca 11 134
hi 51 135
ta 17 138
ml 13 137
hu 23 114
nl 28 121
pl 18 111
@@ -503,12 +504,15 @@ r3/r#_ [r#] is
r3/r_2 [r/] fr
r3/r_a [(a)] base
r3/r_e [(e)] base
[E] fr
r3/r_i [(i)] base
[i] fr
r3/r_n [r/] base
[r/] fr
[r/] ru
r3/r_o [(o)] base
[O] fr
[O2] fr
r3/r_ru [R4] ru
r3/r_ru2 [R4] ru
r3/r_trill [R2] base
@@ -602,15 +606,11 @@ r/xr [(@)] base
[(i)] base
[(o)] base
[(u)] base
[O] fr
[W] fr
[Y] fr
[a] fr
[e] fr
[i] fr
[u] fr
[y] fr
[W2] fr
[a2] fr
[i:] fr
[u:] fr
@@ -1247,6 +1247,7 @@ vowel/@ [@] base
[@] en_rp
[V] cy
[@4] hi
[@] ml
[@] sq
vowel/@- [@-] base
[r*] hr
@@ -1344,6 +1345,7 @@ vowel/a#_3 [a2] en
[3] de
[@] de
[a] hi
[a] ml
[a#] ru
[&] pt_pt
[&/] pt_pt
@@ -1354,6 +1356,7 @@ vowel/a_4 [a/] el
vowel/a_5 [a] fr
[a2] fr
[a:] ta
[a:] ml
[a/] it
[a] la
[a] sv
@@ -1404,6 +1407,8 @@ vowel/e [e] base2
[E:] fr
[e] ta
[e:] ta
[e] ml
[e:] ml
[e] hr
[e/] it
[e:] la
@@ -1505,6 +1510,7 @@ vowel/i [i] base2
[i] eo
[I] fr
[i:] ta
[i:] ml
[i:] hu
[i] it
[i] pt_pt
@@ -1539,6 +1545,7 @@ vowel/i#_5 [y] pt_pt
[i/] pt_pt
[y] ro
vowel/i_6 [i] ta
[i] ml
[i] hr
[i] tr
[i] ku
@@ -1564,6 +1571,7 @@ vowel/ii [I] en_rp
[i] zhy
[I] ku
vowel/ii# [Y] cy
[y] ml
[Y] ru
[I] ku
vowel/ii_2 [i] zh
@@ -1613,6 +1621,8 @@ vowel/o [o] base2
[o] hi
[o] ta
[o:] ta
[o] ml
[o:] ml
[o] it
[o/] it
[O] la
@@ -1718,6 +1728,8 @@ vowel/u [u:] en_wi
[U] fr
[u] ta
[u:] ta
[u] ml
[u:] ml
[u:] cs
[U] la
[u] id
@@ -1890,6 +1902,8 @@ vwl_en_us/or [O:] en_us
[o@] en_us
[O:] en_sc
vwl_en_us/ur [U@] en_us
vwl_fr/r_@ [W] fr
[W2] fr
vwl_fr/@R [x] pt_pt
vwl_fr/@R2 [R] fr_ca
vwl_fr/@R3 [R] fr
@@ -1897,6 +1911,12 @@ vwl_fr/@R3 [R] fr
[r2] fr
vwl_fr/@R4 [r] fr
[r2] fr
vwl_fr/r_a [a] fr
[a2] fr
vwl_fr/r_e [E2] fr
vwl_fr/ri [i] fr
vwl_fr/r_u [u] fr
vwl_fr/r_y [y] fr
vwl_fr/w_a [wA] fr
vwl_hi/A [a:] hi
vwl_hi/l-voc [l-] jbo
phsource/l^/l^
BIN
View File
Binary file not shown.
phsource/ph_english_us
+1 -1
View File
@@ -33,7 +33,7 @@ endphoneme
phoneme a
vowel starttype (a) endtype (@)
vowel starttype (e) endtype (@)
length 210
formants vwl_en_us/a
before n vnasal/ee_n2
phsource/ph_french
+11 -7
View File
@@ -31,7 +31,7 @@ phoneme a
formants vowel/a_5
after l l/la-15
before l/ DFT-20+l/xl
before r/ DFT-30+r/xr
before r/ DFT+vwl_fr/r_a
reduceto a2 1
endphoneme
@@ -42,7 +42,7 @@ phoneme a2
formants vowel/a_5
after l l/la-15
before (r) DFT-20+r/xr
before r/ DFT-20+r/xr
before r/ DFT+vwl_fr/r_a
endphoneme
@@ -63,6 +63,7 @@ phoneme E
formants vowel/e_mid
after l l/le-15
before l/ DFT-20+l/xl
before r/ DFT+r3/r_e
reduceto E2 1
endphoneme
@@ -72,7 +73,7 @@ phoneme E2
length 175
formants vowel/e_mid
after l l/le-15
before r/ DFT-20
before r/ DFT+vwl_fr/r_e
endphoneme
@@ -82,6 +83,7 @@ phoneme i
formants vowel/i_3
linkout ;
after l l/li-15
after (r) vwl_fr/ri
before l/ DFT-20+l/L1_iL-80
before (r) DFT+r/xr
before r/ DFT+r3/r_i
@@ -143,7 +145,7 @@ phoneme u
after l l/lu-20
before l/ DFT-20+l/L1_uL-80
before (r) DFT+r/xr
before r/ DFT-20+r/xr
before r/ DFT-20+vwl_fr/r_u
endphoneme
@@ -163,6 +165,7 @@ phoneme y
formants vowel/y_2
after l l/lu-20
before l/ DFT-20+l/L1_uL-80
before (r) vwl_fr/r_y
before r/ DFT+r/xr-30
endphoneme
@@ -183,7 +186,7 @@ phoneme W
formants vowel/@_5
after l l/l@-20
before l/ DFT-40+l/xl+15
before r/ DFT-20+r/xr
before r/ DFT+vwl_fr/r_@
reduceto Y 1
endphoneme
@@ -194,7 +197,7 @@ phoneme W2 // same as W but don't reduce
formants vowel/@_3
after l l/l@-20
before l/ DFT-40+l/xl+15
before r/ DFT-20+r3/r_@
before r/ DFT+vwl_fr/r_@
endphoneme
@@ -295,6 +298,7 @@ phoneme b
vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk
formants b/b+x/b%70
before _ b/b_+x/b_
before R b/b+x/b_
after _ NULL
after @ b/xb%50
lengthmod 5
@@ -437,7 +441,7 @@ endphoneme
phoneme R // for beginning of words
vcd pal frc
vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40
vowelin f1=0 f2=800 -50 50 f3=-100 100
length 100
lengthmod 7
beforenotvowel r/
phsource/phonemes
+3
View File
@@ -1190,6 +1190,9 @@ include ph_hindi
phonemetable ta hi
include ph_tamil
phonemetable ml hi
include ph_malayalam
phonemetable hu base
include ph_hungarian
phsource/voc/j
BIN
View File
Binary file not shown.
phsource/vowel/ii#
BIN
View File
Binary file not shown.
src/espeakedit.cpp
+1
View File
@@ -265,6 +265,7 @@ wxSashLayoutWindow *win;
f_trans = stdout;
option_ssml = 1;
option_phoneme_input = 1;
// if(LoadVoice(voice_name,0) == NULL)
src/numbers.cpp
+2 -2
View File
@@ -780,7 +780,7 @@ int Translator::TranslateRoman(char *word, char *ph_out)
else
repeat = 0;
if((prev==5) || (prev==50) || (prev==500))
if((prev > 1) && (prev != 10) && (prev != 100))
{
if(value >= prev)
return(0);
@@ -1353,7 +1353,7 @@ int Translator::TranslateNumber_1(char *word, char *ph_out, unsigned int *flags,
if(Lookup("_dpt2",buf1))
strcat(ph_out,buf1);
if(c == langopts.decimal_sep)
if((c == langopts.decimal_sep) && isdigit(word[n_digits+1]))
{
Lookup("_dpt",buf1);
strcat(ph_out,buf1);
src/readclause.cpp
+6 -5
View File
@@ -511,7 +511,7 @@ const char *Translator::LookupSpecial(const char *string, char* text_out)
SetWordStress(phonemes,flags[0],-1,0);
DecodePhonemes(phonemes,phonemes2);
sprintf(text_out,"[[%s]]",phonemes2);
option_phoneme_input = 1;
option_phoneme_input |= 2;
return(text_out);
}
return(NULL);
@@ -589,13 +589,14 @@ const char *Translator::LookupCharName(int c)
DecodePhonemes(phonemes,phonemes2);
sprintf(buf,"[[%s]] ",phonemes2);
}
option_phoneme_input |= 2;
}
else
{
strcpy(buf,"[[(X1)(X1)(X1)]]");
option_phoneme_input |= 2;
}
option_phoneme_input = 1;
return(buf);
}
@@ -806,9 +807,9 @@ int Translator::AnnouncePunctuation(int c1, int c2, char *buf, int bufix)
}
else
{
sprintf(p,"%s %s %d %s %s [[______]]",
sprintf(p,"%s %s %d %s %s",
tone_punct_on,punctname,punct_count,punctname,tone_punct_off);
option_phoneme_input = 1;
return(CLAUSE_COMMA);
}
}
else
@@ -836,7 +837,7 @@ int Translator::AnnouncePunctuation(int c1, int c2, char *buf, int bufix)
if(iswspace(c2) && strchr_w(punct_stop,c1)!=NULL)
return(punct_attributes[lookupwchar(punct_chars,c1)]);
return(CLAUSE_COMMA);
return(CLAUSE_SHORTCOMMA);
} // end of AnnouncePunctuation
#define SSML_SPEAK 1
src/speak.cpp
+1
View File
@@ -490,6 +490,7 @@ int main (int argc, char **argv)
option_waveout = 0;
option_wordgap = 0;
option_endpause = 1;
option_phoneme_input = 1;
option_multibyte = espeakCHARS_AUTO; // auto
f_trans = stdout;
src/speak_lib.cpp
+1
View File
@@ -1065,6 +1065,7 @@ ESPEAK_API espeak_ERROR espeak_Cancel(void)
}
SHOW_TIME("espeak_Cancel > LEAVE");
#endif
embedded_value[EMBED_T] = 0; // reset echo for pronunciation announcements
return EE_OK;
} // end of espeak_Cancel
src/synthdata.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.39 08.Sep.08";
const char *version_string = "1.39.04 19.Sep.08";
const int version_phdata = 0x013900;
int option_device_number = -1;
src/synthesize.cpp
+2
View File
@@ -1510,6 +1510,8 @@ int SpeakNextClause(FILE *f_in, const void *text_in, int control)
}
n_phoneme_list = 0;
WcmdqStop();
embedded_value[EMBED_T] = 0;
return(0);
}
src/tr_languages.cpp
+8 -1
View File
@@ -42,11 +42,12 @@
#define L_jbo 0x6a626f // jbo Lojban
#define L_zhy 0x7a6879 // zhy
// start of unicode pages for character sets
#define OFFSET_GREEK 0x380
#define OFFSET_CYRILLIC 0x420
#define OFFSET_DEVANAGARI 0x900
#define OFFSET_TAMIL 0xb80
#define OFFSET_MALAYALAM 0xd00
#define OFFSET_KOREAN 0x1100
@@ -711,6 +712,7 @@ SetLengthMods(tr,3); // all equal
break;
case L('t','a'): // Tamil
case L('m','l'): // Malayalam
{
static const short stress_lengths_ta[8] = {200, 200, 210, 210, 0, 0, 230, 230};
static const unsigned char stress_amps_ta[8] = {18,18, 18,18, 20,20, 22,22 };
@@ -722,6 +724,11 @@ SetLengthMods(tr,3); // all equal
tr->langopts.stress_rule = 0;
tr->langopts.stress_flags = 0x10004; // use 'diminished' for unstressed final syllable
tr->letter_bits_offset = OFFSET_TAMIL;
if(name2 == L('m','l'))
{
tr->letter_bits_offset = OFFSET_MALAYALAM;
}
tr->langopts.param[LOPT_WORD_MERGE] = 1; // don't break vowels betwen words
memset(tr->letter_bits,0,sizeof(tr->letter_bits));
src/translate.cpp
+25 -5
View File
@@ -55,7 +55,7 @@ int option_sayas = 0;
int option_sayas2 = 0; // used in translate_clause()
int option_emphasis = 0; // 0=normal, 1=normal, 2=weak, 3=moderate, 4=strong
int option_ssml = 0;
int option_phoneme_input = 1; // allow [[phonemes]] in input
int option_phoneme_input = 0; // allow [[phonemes]] in input
int option_phoneme_variants = 0; // 0= don't display phoneme variant mnemonics
int option_wordgap = 0;
@@ -367,6 +367,9 @@ int IsAlpha(unsigned int c)
if((c >= 0xb81) && (c <= 0xbe5))
return(1); // Tamil vowel signs and other signs
if((c >= 0xd01) && (c <= 0xd57))
return(1); // Malayalam vowel signs and other signs
if((c >= 0x300) && (c <= 0x36f))
return(1); // combining accents
@@ -1938,7 +1941,7 @@ int Translator::TranslateChar(char *ptr, int prev_in, unsigned int c, unsigned i
if(!iswalpha(prev_in))
{
if((c == '\'') && (next_in == 'n'))
if((c == '\'') && (next_in == 'n') && isspace(ptr[1]))
{
// n preceded by either apostrophe or U2019 "right single quotation mark"
ptr[0] = ' '; // delete the n
@@ -2010,6 +2013,7 @@ void *Translator::TranslateClause(FILE *f_text, const void *vp_input, int *tone_
int letter_count = 0;
int space_inserted = 0;
int syllable_marked = 0;
int decimal_sep_count = 0;
char *word;
char *p;
int j, k;
@@ -2030,6 +2034,7 @@ void *Translator::TranslateClause(FILE *f_text, const void *vp_input, int *tone_
embedded_ix = 0;
embedded_read = 0;
option_phoneme_input &= 1; // clear bit 1 (temporary indication)
if((clause_start_char = count_characters) < 0)
clause_start_char = 0;
@@ -2264,6 +2269,7 @@ if((c == '/') && (langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(prev_ou
}
}
}
if(iswdigit(prev_out))
{
if(!iswdigit(c) && (c != '.') && (c != ','))
@@ -2272,6 +2278,13 @@ if((c == '/') && (langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(prev_ou
space_inserted = 1;
}
}
else
{
if(prev_in != ',')
{
decimal_sep_count = 0;
}
}
if((c == '[') && (next_in == '[') && option_phoneme_input)
{
@@ -2455,10 +2468,17 @@ if((c == '/') && (langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(prev_ou
{
}
else
if((prev_out != ' ') && !iswdigit(prev_out) && (prev_out != langopts.decimal_sep)) // TEST2
if((prev_out != ' ') && !iswdigit(prev_out))
{
c = ' ';
space_inserted = 1;
if((prev_out != langopts.decimal_sep) || ((decimal_sep_count > 0) && (langopts.decimal_sep == ',')))
{
c = ' ';
space_inserted = 1;
}
else
{
decimal_sep_count = 1;
}
}
else
if((prev_out == ' ') && IsAlpha(sbuf[ix-2]) && !IsAlpha(prev_in))
src/translate.h
+1 -1
View File
@@ -170,7 +170,7 @@
#define CLAUSE_VOICE 0 + 0x24000
#define CLAUSE_PERIOD 35 + 0x80000
#define CLAUSE_COMMA 20 + 0x41000
#define CLAUSE_SHORTCOMMA 15 + 0x41000
#define CLAUSE_SHORTCOMMA 5 + 0x41000
#define CLAUSE_QUESTION 35 + 0x82000
#define CLAUSE_EXCLAMATION 40 + 0x83000
#define CLAUSE_COLON 30 + 0x40000