diff --git a/dictsource/af_list b/dictsource/af_list index c5b07599..6b19298b 100755 --- a/dictsource/af_list +++ b/dictsource/af_list @@ -1,4 +1,4 @@ -//maintainer: Willem van der Walt +//maintainer: Willem van der Walt // email: wvdwalt@csir.co.za // tel: +27 12 8413996 // Meraka Institute, CSIR @@ -102,15 +102,19 @@ europa Y@r'o@pa portugal $1 pretoria prit'o@ria stellenbosch st%&l@mbOs +upington apiNt@n worcester v'ust@r // People names Abiméleg abin'e@lEx2 +abraham A:bram +alida al'ida allah %alA: André 'andreI annette an'Et +antoinette antun'Et aucamp @Ukamp benjamin bEndZ@m@n bester b'Est@r @@ -131,6 +135,7 @@ debora d@bo@ra der d@r deventer d'e@v@nt@r du $u +(du pisanie) du||pis'A:ni (du plessis) du||pl@s'i (du preez) d@||pr'e@ (du toit) d@||toI @@ -151,8 +156,10 @@ grange x2rA:nsi gustav gustaf haydn hAId@n helena hil'e@na -jacobus jako@bWs +hilde hild@ +ilse 'ilz@ jacques ZA:k +james _^_EN jane _^_EN jean ZA~n jesus ji:sWs @@ -170,7 +177,9 @@ levi le@fi louis luI louise luw'i:z louw l'@U -maria mar'ia +marie mA:ri +marius mA:riWs +martha marta martin m'A:rt@n michelle miS'&l michiel $2 @@ -197,10 +206,12 @@ schoor sko@r schutte skWt@ shakespeare _^_EN tania tanja +telemann te@l@man terblanche t@rblA:nS theron tr'On viljoen $2 villiers vIli@rs +violet _^_EN $capital marais mar'E: mandela mand'E:la celliers sIlj'e@ @@ -372,7 +383,6 @@ asook %as_o@k aspris $2 asseblief as@bl'if babelaas bab@lA:s -bedjie bE:ici beide beId@ belangriker b@laNr@k,Ir belangrikst@ b@laNr@kst@ @@ -401,8 +411,7 @@ dusver dWsf&r eenkeer $1 effense Ef@ns@ ekself %&ks'&lf -ekstra $1 - +ekstra Ekstra elders &ld@rs elite il'i:t enige e@nIx2@ @@ -418,6 +427,7 @@ finaliste $3 frontaal $2 frontale $2 +g'n x2In garages g@rA:dZ@s gawes x2A:v@s gee x2e@ @@ -441,6 +451,8 @@ hekke h&k@ helaas he@l'A:s here he@r@ hiernamaals hi:rn'A:mA:ls +hierso hi:rsO +hoera hur'A: hoewel huv'&l hokaai hOkAI hoofsaaklik $2 @@ -529,7 +541,6 @@ oorleef $2 oorsee $2 oorsese $2 oorspronklike $2 -oranje $2 patriotisme patri|ut'Ism@ penorent pEno@rEnt @@ -552,7 +563,7 @@ sedert se@d@rt sektore $2 skares skA:r@s skepsele skEps@l@ -s'n s'@n +s'n s@n $u sobere s'o@b@r@ sombere s'Omb@r@ sodra so@dr'A: @@ -577,13 +588,16 @@ totsiens $2 uitdagings YydA:x2@Ns uitdaging YydA:x2@N uiteindelik $2 +uiteraard Yyt@r_'A:rt vaarwel fA:rv'&l vanaf fanaf vandat $1 +vanne fan@ veraf f&r_af verafgeleë f&rafx2@le@@ verantwoordelikheid f@rantv'o@rd@l@keIt +verby f@rbeI verdere f&rd@r@ vere fe@r@ vererger f@r&rg@r @@ -600,11 +614,15 @@ vers f&:rs verste f&rst@ verte f&rt@ via via +volheid $1 +voluit fOl_Yyt volwassenes fOlv'as@n@s voorgee fo@rx2e@ +voorkeer $1 voorkom $2 voormalige fo@rm'A:l@x2@ voorsien $2 +voorwaar $2 vorendag $3 vorige fo@r@x2@ vrek fr&k @@ -614,6 +632,5 @@ waarskynlike $2 wangedrag vanx2@drax2 weergalm $2 weerklink $2 -weg v&x2 weggewens v&x2@v'E:ns diff --git a/dictsource/af_rules b/dictsource/af_rules index 86af7ec7..80efafe8 100755 --- a/dictsource/af_rules +++ b/dictsource/af_rules @@ -14,26 +14,36 @@ 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 + &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 i) a (_ %a // a short and unstressed in words ending in ia: laboratoria/millennia + &r) a (_ %a // short final a in words ending in -ra: infra/mantra/sentra, etc. + &dr) a (_ A: // exceptwrds ending in -dra: ingedra/oorgedra, etc. + &vr) a (_ A: // and wrds ending in -vra: oorgevra/uitgevra/vasvra, etc. + &t) a (_ %a // short final a: basta/delta/junta/pasta/many names a (C a C) a (Csier %a // (ge)finansier/kassier j) a (pan %a //japan first a sound and stress C) abie 'A:bi abo (C %abO // move default stress and fix a and o sounds: abominasie/abonnement/aborsie - _) a (bC %a // abdy/ablatief/ablusie/abstrak, etdc. + _) a (bC %a // abdy/ablatief/ablusie/abstrak, etc. + _) a (bba a // restore default stress: (ge)abba/abbamandjie, etc. + abse (s %apsE // fix stress and e sound: abses/-se @) adig 'A:d@x2 // misdadiger/gewelddadigheid/kragdadigheid C) adium A:diWm // compounds of stadium/radium + C) a (Cia_ A: // stadia and compounds/Nadia and similar admi (r %atm%i // move default stress: admiraal and compounds C) agie 'A:x2i agter (dogt %ax2t@r // move default stress: agterdogtig and derivitives + agter (oor %ax2t@r_ // move default stress: agteroor/-buig/-druk/-val, etc. &) agtig 'ax2t@x2 // this string almost always carries stress on a a (riA 'A: // akwarium/barium/estuarium/herbarium/seminaria @C) as (_ as // shorten final a of words ending in -as: rigtingvas/jonkmanskas, etc. C) asie 'A:si a (CAA %a + d) a (goggen %a //saterdagoggend and friends a (Cie A: // apies/middagslapie a (Cy %a a (CA A: @@ -48,7 +58,10 @@ C) a (tering %a //short unstressed a before tering formatering etc. except watering ai aI adres %adrEs // fix last e sound of adres as last part of compounds + alfabe (tK alfabE // fix stress and e sound: (vinger)alfabet/-te + alfabe (tA %alf%abe@ // fix stress and e sound: alfabeties/-e/alfabetiseer _) alle (C al@ // alledaags/e/allerhande + alma (nak %alm%a // move default stress: almanak/-ke and compounds _) alom (@ al?Om // shorten a sound: alombekend, etc. alu (minium %al%u // move stress: aluminium and compounds _) al (we %al // stress: alweer/alwetend/-heid @@ -60,8 +73,8 @@ appar (A %ap@r // apparaat/apparate and compounds appèl ap'&l appen (diC %apEn // appendiks/-e/appendix - _) ap (C %ap // april/apteek/apteker and compounds - _) app ap // restore default stress: appel and compounds + _) a (pC %a // april/apteek/apteker and compounds + _) app (A ap // restore default stress: appel and compounds area A:ria // are0+a/kiesareas a (siel %a // shorten a sound and move default stress: asiel and compounds assu (ran %as%W // move stress: assuransie and compounds @@ -89,6 +102,7 @@ afrikaner %afr%ikA:n@r // move stress to end: Afrikaner and compounds afrika A:frika //Stress and 1st a sound: Afrika and compounds: Afrikatale/-state... af (skuw %af // move default stress: afskuwelik and derivitives vs afsku + afstootl %afsto@tl // move default stress: afstootlik/-e/-heid/-ste af (sydig %af // fix stress: afsydig/-e/-heid afwesig %afve@s@x2 // to steer clear of pre- and suffixes af (wagten %af // move default stress: afwagtend/-e @@ -118,6 +132,7 @@ a (larm %a // shorten 1st a sound and fix stress: alarm and compounds _) al (ewig %al; // shorten 1st a sound and move default stress: alewig/-e algemeen 'alx2@m,e@n + a (liteit %a // short unstressed a before liteit: munisipaliteit and many similar alleen %ale@n // to handel stress in compounds with alleen alleni (g %ale@n@ // fix stress and e sound: allenig and derivitives, eg. allenigheid aller (gie %al&r // fix stress: allergies/-e @@ -152,6 +167,7 @@ augustus Ox2'WstWs avokado %af%ukA:du // stress and o sounds avokade %af%ukA:d@ // variant form of avokado + C) a (xA+ a // shorten a before x: taxi and compounds/praxi/saxofoon ay (_ _^_EN // words ending in ay are English ays (_ _^_EN // words ending in ays are English @@ -162,6 +178,7 @@ aangee (+ 'A:nx2e@ // see rule: _) aange (@P5 A:nx@ _) aange (@P5 'A:nx2@ // added stress mark to ensure stress on aan aandoenlik %A:ndunl@k // move default stress: aandoenlik and derivitives, vs. aandoen + aand (rok A:nt_ // fix d sound: aandrok/-ke/-kie aan (een %A:n? // stress and short break between slbs.: aaneen/-gestrengel aan (g A:n // aangaan/aangaap/aangroei/aangryp aan (hangig %A:n // move default stress: aanhangig vs. aanhang @@ -173,6 +190,7 @@ aan (sien %A:n // stress on 2nd slb aan (sien_N 'A:n // stress on 1st slb aan (skou A:n' // stress aanskou/lik + aansteekl %A:nste@kl // move default stress: aansteeklik/-e, vs. aansteek aanste (llerig A:nst'& // aanstellerig/-e|-heid aansterk 'A:nst&rk // aansterk/ing aan (stoot %A:n // stress on 2nd slb.: aanstootlik @@ -214,7 +232,7 @@ b b b (b b (_N p - b (eentjie+ b // exception to "bee" rule: beentjie/-s and compounds + b (eentjie++ b // exception to "bee" rule: beentjie/-s and compounds @) baarlik b'A:rl@k // move default stress: wonderbaarlik/-e/-heid/-ste band (A bant // fix t sound: bandomslag/-ontwerp/-opname band (e band // fix d sound: bandeverkoper moterbande etc. @@ -237,7 +255,7 @@ badjie baIci - baba b'A:ba + baba bA:ba ba (lans b%a // move default stress balan (seer b%al%an // move stress to -eer ba (ldadig b%a // move default stress: baldadig and derivitives @@ -288,7 +306,9 @@ by (voorb b%eI// move default stress .group be + _) be (_ b@ // words broken at end of line: be- be (amp b@? // fix e sound in compounds ending in beampte + beau b@U //Beaufortwes and others @) beeldig b'e@ld@x2 // denkbeeldig/voorbeeldig bei beI // beier/beitel _) be (@P2 b@ @@ -300,6 +320,7 @@ _) be (Cy b@ // bely/beny/betyds bes (ie_ be@s //sonbesie duinebesie etc. bes (ies_ be@s //sonbesies duinebesies etc. + bedjie bE:ici // (ge)bedjie/-s/bababedjie bed (k bEt // bedkassie/bedkaartjie/bedkatel/bedkussing bed (l bEt // bedlamp/bedliggie/dubbelbedlaken bed (rand bEt // fix e and first d sounds @@ -338,7 +359,7 @@ skrob) bering b'e@r@N // skrobbering beu (C bY@ // beur/beuke/beul - besig b'e@s@x2 + besig be@s@x2 bessie bEsi berg b&rx2 berge b&rg@ @@ -361,6 +382,7 @@ ch (l k // chloor and compounds ch (ro k chat _^_EN + ck k // ck pronounced as single k sound @) ci (_ s'i // plurals ending in -ci @) cel (_ _^_EN // words ending in cel is English @) cle (_ _^_EN // words ending in cle is English @@ -415,7 +437,7 @@ direk d%irEk // direk/-sie/-te/-theid/indirek... dirig (e d@r@x2 // fix stress and i sounds: dirigeer/dirigent and compounds diskre (s d@skrE // fix stress and e sound: diskresie/diskresionêre - divide (nd d@v@dE //dividende etc. + divide (nd d@v@dE //dividende etc. &) des (_ d@s d (_N t // dj c // palatal stop @@ -471,6 +493,7 @@ oo) d (A t? // fix d in compounds starting with brood/dood/lood/nood... followed by vowel karoo) d d // but Karoodorp/Karoodoring/Karoodistrik, etc. du (pliC du // duplikaat/dupliseer + duvet d%uveI: // duvet/-s/duvetoortreksel, etc. .group e e e@ @@ -480,12 +503,20 @@ CAC) e (rkK & // fix e sound: deurgewerk; exception to: CAC) e (CC C) e (mm++ E // geelkoperemmer/wateremmer CAnn) e (CA @ // banneling/sinnebeeld/spinnekop/-rak + 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 _) 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. sp) e (d @ // ekspedisie/gaspedaal/kwispedoor gev) e (gK & // fix e sound in compounds like buitegevegstelling/skietgevegte + And) e (lC @ // fix e sound: swendelfirma/vaandeldraer and similar + @k) e (lde_ @ // fix e sound: gekronkelde/(ge/ver)kreukelde + mp) e (lde_ @ // fix e sound: gemompelde/oorrompelde/verskrompelde and similar + @C) e (lk_ & // fix e sound: many compounds ending in kelk/melk + @C) e (lke_ & // fix e sound: many compounds ending in -elke: blomkelke, etc. ng) e (nd @ // fix e sound: dringends/dwingends/deurdringender C) e (pan @ //fix e sound: instrumentepaneel/kolepan/liefdepand @k) e (tt@+ E // menseketting/etikette @@ -516,6 +547,7 @@ Cy) e (CC @ // e sound in vryevalformasie/senulyersinrigting/vryerspaartjies C) ede (_ e@d@ // aandgebede/selftevrede C) edes (_ e@d@s // lofredes/hoofredes + j) e (k E // fix e sound: tjek and compounds/windjekker, etc. C) e (kamp+ @ // fix e sound: (krygs)gevangenekamp/soldatekamp and similar e (kono@ %E // 1st e: ekonome/ekonomie/ekonomies/ekonoom e (mosi %i // emosie/emosioneel, etc. @@ -524,6 +556,9 @@ u) eel 'e@l // words ending in ueel take stress on last slb @) eer 'e@r // this string most often has stress h) eer e@r // words containing heer take default stress: allesoorheersende + gel) eer e@r // words containing geleer take default stress: regsgeleerde + @k) eer e@r // words containing keer take default stress, except for: + ik) eer 'e@r // abdikeer/kommunikeer, etc. sf) eer e@r // sfeer at end of compounds does not take stress: atmosfeer, etc. sk) eer e@r // words kontaining skeer take default stress: af/glad/kort/raakgeskeer Cs) eer e@r // words containing seer (meaning pain) take default stress @@ -592,7 +627,7 @@ %C) e (C @ // (d)warrelwind/slakkepas ll) e (lK & // parallel/-le @s) e (l@ @ // e sound in words like borselkop/voedselaanvulling and many similar - @s) e (lfde '& //fix dieselfde + @s) e (lfde '& //fix dieselfde Cs) e (lf & // e sound in words like terselfdertyd/vanselfsprekend Cs) e (lle_ & // e sound in words like bloedselle/limfselle/stamselle/tronkselle AC) e (lh @ // e sound in words like edelheid/ydelheid/kreupelheid @@ -609,7 +644,9 @@ elagtig @l'ax2t@x2 // beuselagtig/e/heid/buffelagtig... ener (gi %En@r // energie/energiek/e ele (ment El@ // element/e/klankelement + m) e (lend @ // murmelend/wriemelende m) e (ling @ // versameling/insameling/stameling + &C) e (lrA @ // fix e sound: // kreukelrig/kriewelrig/kronkelrig/wankelrig/wankelry and similar _) eni (g 'e@n@ // enigeen/enigiemand/enigiets/eniggebore/enigermate C) e (ltjie @ // eltjie always @lki @@ -642,6 +679,8 @@ &) e (nde_ @ // fix penultimate e sound: sinkende/drinkende/klinkende &) e (ng_ E erf) e (nis @ //erfenis/kultuurerfenis/verderfenis + ooi) e (ns @ // fix e sound: compounds starting with nooiens + ooi) e (ntjie // drop e in nooientjie/-s and compounds &) e (r_ @ &) ers (_ @rs @@ -672,8 +711,8 @@ &) elikheid (_S8 @l@keIt // vriendelikheid/duidelikheid epi (deC %Ep%i // epidemie/-s/-e/epidermies/epidermis - K) erig @rIx2 - K) erige @rIx2@ + &K) erig @rIx2 + &K) erige @rIx2@ AA) erige @rIx2@ Ai) er (A @r // bakleierig/draaiery/mooierige k) es (_ @s // blankes/blinkes/krankes/dronkes/sterkes/swakkes @@ -682,6 +721,7 @@ _) er (k &r' // erkenbaar/erkenning _) er (v &r' // ervaar/ervare/ervarings/ervaringe &) ere (_S3 @r@ + @l) ere (_ e@r@ // fix e sound: staanlere/toonlere @) ery (_ @reI eti (ket %Et%i // shorten e sound and move stress: etiket/-te @@ -708,6 +748,7 @@ som) e (r @ //someraand and others. _ew) e (++ @ //ewewig, ewekansig etc. C) e (sk_ 'E // grotesk/burlesk/humoresk + _w) e (skus E // fix stress and e sound: (suid)weskus and compounds C) e (ske_ 'E // burleske/groteske C) e (sk@ @ // hondeskou/modeskou/erdeskottel/geleideskip/hardeskyf d) e (skun %E // but: deskundige and compounds @@ -747,6 +788,7 @@ p) e (talje @ // fix stress and 1st e sound: petalje and compounds 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. uik) e (rs @ //fix e in words containing uikers CoeC) e (C @ //fix e in boetedoening, boedelbelasting and many others orr) e (l @ //fix e in borrel, orrel, korrel in compounds @@ -759,8 +801,12 @@ e (nares_ @ //e always @ before nares werk) e (rs @ //fix werkers in compounds werkershuis etc. + Ceuw) e (l @ //gesneuwelde heuwelhang etc. v) e (nno @ //vennoot and friends - + ex (+ _^_EN // words containing ex are English + al) ex (and %Ekz //alexanderbaai, alexandria etc. + m) exik Eks%ik //mexiko mexikaans etc. + t) exas Eks@s //Texaskoors and may be others .group f @@ -805,6 +851,7 @@ .group g g x2 g (g + gala (si x2%alA: // move default stress: Galasiër/-s ga (lAC x2%a // galant/galery/galon/galop gal (joen x2%al // move default stress: galjoen/-e and compounds _) gh g @@ -942,6 +989,7 @@ iale (_ i'A:l@ // al normally stressed in words like bilabiale/koloniale, etc. iber (i@ %ibe@r // Liberië/Siberië/Liberiese/Siberiese/Iberiese ie i + ieë (K i:@ // knieë/vlieë/spieël/-tjie h) i (dro i //hidro in compounds _) in (a@ In_ //inasem inagneming etc. _) iese (C ,is@ // iesegrimmig and derivitives @@ -961,6 +1009,7 @@ ide (a %id%i // ideaal/ideale and compounds _) idi (o %id%i // idioom/idiome/idioot _) id (A %id // idille/idillies + &l) iker (C @k@r // fix i sound: menslikerwys/redelikerwyse, etc. illu (si %ily // illusie/-s/illusief _) immi (grA @m@ // fix stress and i sounds: immigrant/-e and compounds _) i (mmu %i // fix stress and i sound: immuun/immune/immuniteit @@ -991,6 +1040,7 @@ _em) i (r @ ië e@:@- // i followed by "deelteken e" iën i'En //i deelteken e n + iëteit %i@t'eIt // fix stress: (imk)piëteit/variëteit iee (C i'e@ // distansieer/finansieer/finansieel/prieel iële i'e@l@ // finansiële/potensiële @@ -1079,11 +1129,13 @@ C) iveer if'e@r // always takes stress C) iver (A if'e@r // always takes stress: aktiverende/motivering i (voor %i // move default stress: ivoor and compounds + ié 'i // pronounce dié/nié, etc. with stress + C) i (ësta %i // fiësta/siësta .group j j j j (j - + _) ja (cobA j%a // fix stress and a sound: Jacoba/Jacobus jakaranda j%ak%ar'anda //jakaranda and compounds jaloe (sie j%al%u // stress: jaloesie/beroepsjaloesie januarie j'any,A:ri @@ -1094,6 +1146,7 @@ johan juh'an johannes juh'an@s jonge jON@ // jongeling/jongeres + jong (etjie jON // fix e sound: jongetjie/-s junie j'uni julie j'uli @@ -1216,7 +1269,7 @@ ko (loni k%u // kolonie/-s/kolonialisme/koloniseer kolo (ssa k,Olu // move default stress: kolossaal/kolossale kolo (sK k%ulO // move default stress and fix 1st e sound: kolos/-se - kombuis kOmb'Yys + kombuis k%OmbYys // stress: kombuis/kombuistafel/sopkombuis ko (medi k%u // move default stress, correct o sound komi (tee k%Om@ kommen (ta k%Om@n // kommentaar/kommentator @@ -1279,6 +1332,8 @@ libe (ra l@b@ // liberaal/liberale/liberalis/-me ligen l@x2'En _) li (g lI // fix stress: liggaam/liggies/ligte + li (ga_ li // fix i sound: liga/vroueliga, etc. + _) li (gaC li // vix i sound: compounds starting with liga/ligatuur liggaamlik l@x2A:ml@k // stress liggaamlik/-e/-heid &) lik (_S3 l@k &) like (_S4 l@k@ @@ -1309,7 +1364,7 @@ m m m (m _) made (l m%A:d@ // move default stress: madeliefie/-s - ma (donna m%a // fix stress and 1st a sound: madonna/-s/-beeld/-lelie + _) ma (d m%a // fix stress and 1st a sound: madonna/-s/-beeld/-lelie/Madiba/Madras maga (syn m%ax2%a // magasyn and many compounds magi (stra m%ax2%i // magistraat and many compounds ma (ho m%a // mahoniehout/-lessenaar and similar @@ -1319,6 +1374,7 @@ man (da m%an //mandaat and compounds manier m@ni:r //manier and compounds manu (sk ,many + _) ma (rA m%a // short, unstressed a: Marietjie/Marina/Marinda/Marita/Maree/marog marine m%arin@ // marine and compounds ma (ritz m%a' // fix stress: Maritz/Pietermaritsburg marmelade m%arm@lA:d@ // fix stress and e sounds: marmelade and compounds @@ -1487,6 +1543,7 @@ nasionale naSEun'A:l@ n (_n //cause one n sound kan nie doen nie etc. + n (_n_ n // fix n in phrases like: afkappingsteken n neer (drukk n%e@r // move default stress: neerdrukkend/-e &) nele (_ n'e@l@ _) nes (ei nEs_ // fix 1st e sound: neseier/-s/-tjie/-s @@ -1515,6 +1572,10 @@ .group o o o@ + &C) o (_ %u // fix o at end of words: Marokko/(aanvang)saldo/risiko, etc. + bur) o (_ ,o@ // but: buro and compounds like arbeidsburo + rb) o (_ 'o@ // and daarbo/hierbo/waarbo + &s) o (_ o@ // and: sommerso/netso o (C O o (CA o@ mikr) o u // mikrogolf/mikroskakelaar/mikrorekenaar @@ -1530,6 +1591,7 @@ o (lim %o@ // move default stress: olimpies/-e o (lyC %o@ // move default stress: olyf and compounds/olywe olym (p %o@lIm // fix stress and y sound: Olympia/Olympus + oranje %o@ranj@ // fix stress and e sound in compounds: oranjeagtig/oranjekleur _) ordent %OrdEnt // move default stress: ordentlik/-e/-er/-ste/-heid orie o@ri oriu 'o@riW @@ -1658,6 +1720,7 @@ onheil ''OnheIl // stress: onheil/e/onheilbringer/onheilsvoorspelling onheil (ig %Onh'eIl // stress: onheilig/e onheil (spel %Onh%eIl // stress: onheilspellend/e + _) onnie Oni // onnie/-s; not on- prefix onreg (K Onr&x2 // stress: onreg/te/onregmatig on (regv++ %On // stress: onregverdig/e/heid on (skuld_N 'On // restore default stress: onskuld @@ -1800,6 +1863,7 @@ per (so p@r // persoon/persone perso (neel p%&rs%u // personeel and compounds pervers p@rf&rs // pervers/perversie + _) pe (trA_ pe@ // lengthen e sound: Petro/Petra _) pi (la p%i // move default stress: pilaar/pilare/pilatus pi (sto p@ // pistool/pistole and compounds pizza pitsa // fix zz sound: pizza and compounds @@ -1822,12 +1886,16 @@ _) pos (a pOs //posadres/posadministrasie _) post (K p'@Ust- //post where it means after _) post (u p%Ost // move default stress: postuur/posture/postuum and compounds of postuur + ra) pporte (rA p%Orte@ // fix stress and e sound: rapportering/rapporterende _) prak (tyk pr%ak // stress: praktyk and compounds + prefek prifEk // fix vowel sounds: prefek/-te/-tuur and compounds pre (lud pr@ // fix stress and e sound: prelude/-s/(ge)preludeer pre (mier pr@ // move default stress and fix e sound: premier and compounds pre (sA pr@ // president/presies/present pre (se_ pre@ // fix e sound of words ending in -prese primi (t pr@m@ // make i sounds schwa: primitief/primitiewe + prinsi (pA pr@ns@ // move default stress: prinsipaal/prinsipale/prinsipaals/prinsipieel/-ële + prinsipe (K pr@nsip@ // stress on 2nd slb.: prinsipe/-s ple (k pl& posisie puz'isi predi (kant pr%e@d@ // predikant and compounds @@ -1839,9 +1907,9 @@ prokie pro@k%i //sprokie and compounds proposi pr%Op@zi // stress, o and s sounds: (besigheids)proposisie/-si, etc. prosa pr'o@sa //prosa and compounds - proses (_ prus'Es //proses at end of word + proses pr%usEs // proses/versoeningsproses/strafproseswet - projek pruj'Ek + projek pr%ujEk proku (rA pr%Ok%y // prokureur and compounds/prokurasie prominen prOmin'En // prominent/e/prominensie propag ,prOpax2 @@ -1911,6 +1979,7 @@ rea (ks r%ia // reaksie/s/skokreaksie rea (C r%i%a // reageer/realis/me|ties re (bel r@ // move stress from 1st slb + recce rEki // fix e and c sounds: recce/-s re (dakC r@ // fix stress and e sound: redaksie/redakteur and compounds _) redel re@d@l //redelik and compounds _) rede (C re@d@ // redevoerder/redekawel and similar @@ -1924,6 +1993,7 @@ re (kru r@ // move stress from 1st slb _) re (la r@ // relaas/relase/relasie and compounds rele (van r@l@ // relevansie/relevant and derivitives + rem (_ rEm // handrem/kabeltrem/kragrem/noodrem/skyfrem/stadstrem/veiligheidsrem re (nA r@ // move stress from 1st slb.: renoster reper (kus r%e@p@r // stress: reperkussie/-s re (produ r%e@ // fix stress and e sound: reproduksie/reproduseer @@ -1967,6 +2037,7 @@ u) s (_ s // exceptions to rule: @@@) s (_S1 s sch S sh (_ S + _) sh S // sh at beginning of word pronounced like English sh sj S sjampanje S%ampanj@ // move default stress: sjampanje and compounds sjerrie SEri // fix e sound: sjerrie and compounds @@ -1981,6 +2052,7 @@ sinteties s@nte@tis // sinteties/e/fotosinteties/-e si (viel s@ // move default stress and fix i sound: siviel/-e s (iën S + selek (CA s@lEk //seleksie selekteer etc. sending (_ sEnd@N //fix sending at word end saamge (P6 s'A:mx2@ // saamgepers/-de/saamgetel/saamgeêet @@ -1992,6 +2064,7 @@ _) same (@P4 s'A:m@ // samekoms/sameswering samel (C sA:m@l // versamelde: see rule:_) same (@P4 s'A:m@ samen (+ sA:m@n // gesamentlik/-e + _) san (da s%an // move default stress: sandaal/-tjies/sandale _) sar (d s%ar // sardien/-blikkie/sardinies/sardyne sar (kA s%ar // move default stress: sarkasme/sarkasties/sarkoom sa (tir s%a // move default stress: satire/satiries/-e @@ -2007,6 +2080,7 @@ no) sele (_ s@l@ // e sounds in onnosele self (stan s%&lf // move default stress: selfstandig/-e/-heid seli (ba s%El%i // move default stress and fix e sound: selibaat/selibate + se (llin s%&' // stress on 'in: (met)gesellin/-ne/-netjie, etc. @) sel (wig s'&l // stress: (ver)eenselwig and derivitives _) semen (t s@mEn // sementtafel/blad/vierkant semi (na s%Em%i // seminaar/seminare/seminarium @@ -2041,11 +2115,13 @@ sker (muts sk%&r // move default stress: (ge)skermutsel/skermutseling/-e skilder (y sk@ld@r // move stress to y: skildery and compounds like skilderymuseum sko (lier sk%o@ // move default stress: skolier/-e + skyn (hei sk%eIn // move default stress: skynheilig/-e/-heid _) slag sl'ax2 sla (vin sl%a // move default stress and shorten a sound: slavin/-ne and compounds @) sering s'e@r@N // analisering/kategorisering @) ses (_ s@s // fix 2 slb. words ending in ses sodom (iet s,o@dOm // fix stress + so (ffleu s%u // move default stress and fix o sound: suffleur/soffleuse _) soie so@?i // soiets/soiemand _) sol (da s%Ol // move default stress: soldaat/soldate and compounds sol (dy s%Ol // fix stress: soldy and compounds @@ -2053,6 +2129,10 @@ so (lid s%O // konsolidasie/solidariteit so (natA s%u // move default stress and fix o sound: sonate/-s and compounds so (pra s%u // move default stress and fix o sound: sopraan/soprane + span (dab sp%an // move default stress: spandabel/-rig, etc. + span (jAA sp%an // move default stress: Spanjaard/-e/Spanjool + spartel spart@l // fix stress and e sound: spartel/-end/-ing + spek (takel sp%Ek // move default stress: spektakel/-s spelagtig sp&l'ax2t@x2 // skouspelagtig/e/heid/klugspelagtig e) spel (_ sp&l //klokkespel/snarespel/driespel/hokkiespel/puntespel/putjiespel C) spel (_ sp&l // many compounds ending in spel after consonant @@ -2061,6 +2141,7 @@ spoed (@ sput // spoedaflewering/spoedeisend/spoedorder spoed (ig spud // spoedig/-lik/-er/-ste _) spon (ta sp%On // move default stress: spontaan/spontane + spreekwoordeli spr%e@kvo@rd@l@ // move default stress: spreekwoordelik/-e, vs. spreekwoord sproke spro@k@ // see rule: pro (CA pr%u : aangesprokene/onbesproke, etc. self (_ s'&lf // myself/vanself // self s'&lf @@ -2100,14 +2181,21 @@ spesialis spESal'Is spesi (f sp%Es%I // spesifiek/spesifiseer @) spre (ken spr'e@ // stress: vanselfsprekend + _) ste (ri st%E // fix stress and e sound: steriel/-e/steriliteit + stimu (lA st@m%y // move default stress and fix i sound: stimuleer/stimulering/stimulasie + sub (li s%Wb // move default stress: subliem/-e + sub (stansie s%Wp // move default stress and fix b sound: substansie/-s/substansieel/-siële 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 (oos s%Yyt_ // move default stress and insert short break: suidoos/-te/-lik 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 su (saC s%u // fix stress and u sound: susan/-na/susara swag sv'ax2 swart (gal sw%art // move default stress: swartgallig + @) swem (_ swEm // fix e sound of compounds ending in swem: uitswem/wegswem... swerk sv&rk swinkel svINk@l @@ -2163,6 +2251,7 @@ t (_dN // final t, and next word starts with d A) tch _^_EN // clutch/pitch/bitch tabak tab'ak; + tafe (re t%af@ // fix vowel sounds: tafereel/taferele and compounds @) talig t'A:l@x2 // Anderstalig/tweetalig _) ta (ma t%a // tamatie and compounds _) ta (mb t%a // tamboer and compounds/tambotie and compounds @@ -2176,6 +2265,7 @@ t (ema++ t // compounds with tema tia (_ Sja + _) tibet t%ibEt // move default stress: Tibet/-aans/-e @) tief (_ t'if // alternatief/aktief/instinktief/(ak)kumulatief @) tiewe (_ t'iv@ // alternatiewe/aktiewe/instinktiewe/(ak)kumulatiewe ti (ra t%i // move default stress tiran tirade @@ -2195,8 +2285,10 @@ toereike t%ureIk@ // toereikend/heid toereken (b t%ur'e@k@n // ontoerekenbaar/heid/ontoerekenbaarheid toneel t%une@l + toegeef t%ux2e@f // move default stress: (on)toegeeflik/-e/-heid toege (wing t'ux2e@ // exception to _) toege (@P5 tux2@ _) toege (@P5 t'ux2@ + toe (kome t%u // move default stress: toekomende toe (laatba t%u // move default stress: (on)toelaatbaar/-bare/-baarheid toer (@ t%ur // move default stress: toeris/-te/compounds of toernooi toere tu:r@ // restore default stress @@ -2205,15 +2297,21 @@ @) toris (_ t'o@r@s // fix stress: pectoris/klitoris tra (dis tr%a// shorten and unstress 1st slb: tradisie/tradisioneel trag (ed tr%ax2 // move default stress: tragedie and compounds + tra (jek tr%a // move default stress and shorten a sound: trajek/-te + trap (soe tr%ap // move default stress: trapsoetjies/-e traw (a trav' // trawant/e/trawal &) treding tre@d@N // betreding/uittreding @) treer tr'e@r // this slb always takes stress; many words + tref (afs trEf_ // fix e sound and insert short pause: trefafstand/-e trek tr&k trekker tr&k@r // voortrekkerleier/Voortrekkerstraat/salaristrekkersvergadering @) trise (_ tr'is@ // aktrise and similar + _) trom (b tr%Om // move default stress: tromboon/trombone/trombose and compounds + _) trom (pet tr%Om // move default stress: trompet/-tte/-tter and compounds tro (tseer tr%O // stress: trotseer/getrotseer tro (tsering tr%O // move default stress + tru (spieë try // fix u sound: truspieël/-tjie/-s ttel t@l // many compounds of bottel/skottelgoed tuiglik t'Yyx2l@k // stress: werktuiglik/sintuiglik/-e/-heid tuimel tYym@l // tuimelend/tuimelaar/tuimelraam and compounds @@ -2230,11 +2328,14 @@ te (aa t@ // beroerteaanval/geboorteaanwas/lenteaand... teater t%iA:t@r // fix stress and e sound: teater and compounds tea (tra t%i%a // fix stress and vowel sounds: teatraal/teatrale + teen (argu t''e@n // forse stress on 1st slb.: teenargument/-e/-asie @C) te (gn t& //tegniek/iese and friends _) tekere t@ke@r@ // move default stress and correct e sounds - tele (C t%&l@ // telefoneer/telekommunikasie, etc. + _) teks (tu t%Eks // move default stress: tekstuur/teksture + _) tele (C t%&l@ // telefoneer/telekommunikasie, etc. @C) te (nk t& ++ //tenk and friends @C) te (C t@ /// + te (kkie+ tE // fix e sound: tekkie/-s/staptekkies and similar @C) te (lbord t& // krieket-/tennistelbord, etc. @C) te (k_ t& // tydsbestek/uitstek ap) teke te@k@ // apteke/apteker and compounds @@ -2258,6 +2359,7 @@ tern (e_ t'&rn // interne/eksterne _) ter (nA t@r // terneergedruk/ternouernood te (rrA t@ // terras/terrein/terreur and compounds + terra (c t&ra // fix stress and e sound: terracotta and compounds terror (is t%Er%ur // terroris/-te/-isme/-istiese _) ter (s t%&r // tersake/terselfdertyd/tersluiks/terstond/tersyde tese (_ t'e@s@ //sintese, and others @@ -2284,6 +2386,10 @@ te (l t& teltjie t@lki @) tel (o t@l // hartelose/besluiteloos/gedagtelose + &) tert (A t@rt // fix e sound: agtertoe/foltertuig/gietertuit/kilometertoelae/lastertaal/letterteken + &) tert (r t@rt // fix e sound: pleistertroffel/venstertralie/ystertralies/ystertrap + &s) tert (aan t&:rt // fix e sound: swa(w)elstertaandpak/-ke + &s) tert (e_ t&:rt // fix e sound: swa(w)elsterte/vissterte wa) tert t@rt &) tert t&rt &) tertjie t@rki @@ -2303,6 +2409,7 @@ tevrede t@fr'e@d@ as) terende (_ t'e@r@nd@ //kontrasterende ek) terende (_ t'e@r@nd@ //reflekterende respekterende + k) te (ring t'e@ //selektering, reflektering etc. n) terende (_ t'e@r@nd@ //konfronterende mensonterende pe) terende (_ t'e@r@nd@ //kompeterende @@ -2310,6 +2417,7 @@ ul) terende (_ t'e@r@nd@ //konsulterende resulterende ver) terende (_ t'e@r@nd@ //verterende in compounds C) te (tjie ti // fix e sound: holtetjie/groentetjies/laagtetjie, etc. + tewe (_ te@v@ // fix e sound: (agter/voor)stewe/tewe and compounds @@ -2339,6 +2447,8 @@ _) uitge (@P5 'Yytx2@ // words beginning with uitge have stress on 1st slb uitgewer 'Yytx2,e@v@r uitgewerk Yytx2@v&rk // uitgewerk and derivitives; see rule: uitgewer + uitgewerp Yytx2@v&rp // fix vowel sounds, see rule: uitgewer + uitke (n YytkE // mix e sound: uitken C) uiwer (A Yyv@r // huiwerend/suiweringsaanleg and similar compounds ulti (ma %Wlt%i // move default stress: ultimatum/-s u (ra %y // uraan and compounds/uranus @@ -2364,7 +2474,8 @@ _) van (@ f%an // (on)vanpas/vanjaar/vandag/vanaand/vanoggend and many similar _) vang (@ faN // vangwa, etc.; see rule: _) van (@ f%an vangen f'aN@n // gevangene/gevangenis/bevangenheid - vari (A v%ar%i // fix v sound and stress: variasie/-svarieer + vari (A v%ar%i // fix v sound and stress: variasie/-s/varieer + vati (kaan f%at%i // fix stress and shorten a sound: vatikaan and derivitives and compounds @) ve (_ _^_EN //words ending in ve is English veel (jar f%e@l // move default stress: veeljarig and derivitives A) ves (_ _^_EN // words ending in ves after vowel are English @@ -2372,11 +2483,17 @@ ve (l f& // maagvel, stress on 1st slb @) vel (A fe@l // aanbeveling/aanbevelingsbrief vele f'e@l@ + ven (dusie f@n // fix stress and e sound: vendusie and compounds ven (ster fe~n // nasalise ven (yn f@n // venyn/venynig ver f@r + veranda v@randa // fix stress and e sound: veranda and compounds + vere (sto fe@r@ // avoid ver prefix: verestoffer/-s 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 - ver (kyker f'&:r //verkyker and compounds + ver (kyker f'&:r //verkyker and compounds _) ver (@P3 f@r verant (w f@r%ant // (on)verantwoordelik/-heid/verantwoording verende f'e@r@nd@ @@ -2390,8 +2507,11 @@ ver (fris f@r // verfris and derivitives; see rule: verf (C f&rf verfyn f@rf'eIn verf (@ f&rf // verfkwas/-voorraad/-emmer and similar + _) verf (o f@rf // verfoei(lik)/verfomfaai/verfoes, etc.; see rule: verf + verf (rom f@rf // verfrommel/-de/-ing; see rule: verf verf f'&rf _) vergesog f'&:r;x2@sOx2 + _) verlangs f&:rlaNs // fix stress and e sound: verlangs/-e veronderste (l f@rOn@rst'& // stress: veronderstel/-ling _) verse (b f'&:rs@ C) verse (_ f&rs@ @@ -2412,6 +2532,8 @@ A) vis (asie vis // improvisasie A) vis (e@ vis' // v and i sounds: improviseer/reviseer/improviserend vis (ie vis // v and i sounds: visie/televisie + visite f@sit@ // fix stress and vowel sounds: visite/-kaartjie/-s + vita (mi v%it%a // move default stress: vitamine/-s/vitamientablet, etc. vis (uA v%iZ //visuele, visueel etc. vis (um vis // v and i sounds: visum @@ -2424,15 +2546,18 @@ vo (lle_ fO // exception to: vo (lC f%O volle (dig f%Ole@ // fix stress and e sound: (on)volledig/-e/-heid... vo (ller fO // exception to: vo (lC f%O + volles (_ fOl@s // fix stress and e sound: volles/passievolles, etc. vol (hou_ fOl // exception to: vo (lC f%O vol (maan fOl // exception to: vo (lC f%O + vol (r fOl // volrond/-rooi/-ryp: exception to: vo (lC f%O vol (ste_ fOl // exception to: vo (lC f%O + voltyds fOlteIts // voltyds/-e: exception to: vo (lC f%O volop f'Ol_Op // volop/volopbetaalde volume v%Olym@ // move default stress and fix o sound: volume and compounds volwasse fOlv'as@ // (on)volwassene/s/(on)volwassenheid vo (lC f%O // volledig/volmaakte/voltooi vol (g fOl // volgeling/volgende/volgorde - voren f'o@r@n // alvorens/vorendag/vorentoe + voren f'o@r@n // alvorens/vorentoe voog (dy f%o@x2 // fix stress: voogdy and compounds voorbar fo@rb'A:r // move default stress: voorbarig and derivitives _) voorbe (@P6 f'o@rb@ @@ -2448,7 +2573,7 @@ vooruit (strew fo@rYyt' // change stress voorwaard (_ f%o@rvA:rd // stress: (on)voorwaardelik vorm fOr@m - vreemde fr'e@md@ // vreemde/s/vreemdeling + 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 vrygewig freIx2'e@v@x2 // vrygewig/-e|-heid @@ -2467,14 +2592,18 @@ s) w w s) w (eek v // fix w sound: feesweek/kersweek/paasweek/vandeesweek/werksweek s) w (il v // fix w sound: groepswil/hemelswil/liefdeswil/korswil + s) w (yf v // fix w sound: viswyf/ganswyfie/mannetjieswyfie ens) w v + los) w v // fix w sound: (los)wikkel/woel/wriemel mis) w v // fix w sound: miswaas/misweer/miswurm ooC) w v // booswig/grootwild/ooswaarts/ out) w v // houtwerk/soutwater and similar + yd) w v // fix w sound: sluittydwerk/(wa)wydwakker weer (lê v%e@r // move default stress weer (leg w%e@r // move default stress: (on)weerlegbaar @) weg (_ v&x2 // blindweg/botweg and many similar spoor) weg v&x2 // fix e sound: spoorwegaanleg/-aansluiting/-amptenaar/-eiendom/-inkomste/-ongeluk... + welbehaaglik v%&lb@hA:x2l@k // move default stress: welbehaaglik/-e/-er/-ste @) wendig v'End@x2 // inwendig/noodwendig/uitwendig ge) were ve@r@ // fix e sound in compounds ending in gewere werk (stelli v%&rk // fix stress: bewerkstellig and derivitives @@ -2493,7 +2622,10 @@ @k) ware vA:r@ // breekware/blikware/lakware @s) ware vA:r@ // kruideniersware/bronsware/glasware/kombuisware bes) ware wA:r@ // geloofsbesware/gewetensbesware + @C) w (arm v // fix w sound: snikwarm/te @k) water vA:t@r // drinkwater/kalkwater/reukwater + wat (wond v%at // move default stress: watwonders/-e + _) wa (wy vA: // fix stress and a sound: // wawyd/wawydwakker, etc. weer (kaats v%e@r // move default stress: weerkaats/-in @) wekkend v'Ek@nt // stress on wekkend at end compounds @) wekkende v'Ek@nd@ // stress on wekkende at end compounds @@ -2551,18 +2683,21 @@ z (z t) z s // fix s sound: britz/fritz/hertz and similar - .group + @) 'tjie %ici // foto'tjie/ma'tjie, etc. + K) ék (_ '&k // fix e sound and stress: ék/gék ə @ // char.replacement for 'n _C) è (_ E // dè/nè ê e: + l) êer &:@r // fix ê sound: lêer and compounds ê (r &: êr (_ ''&:r // stress at end of wrds ending in êr: arbitrêr/dissiplinêr, etc. êre (_ ''&:r@ // stress of penultimate slb of wrds ending in êre: elementêre/dissiplinêre sk) êr (+ &:r // but wrds containing skêr follow normal stress: skaapskêr îe 3: ge) ë (rf & // oorgeëf/-de + ë (teit @ // fix stress and e sound: variëteit and compounds ïgnoreer ix2nur'e@r // geïgnoreer ï (n @ // geïnteresseerd be) ï (nC 'I // beïndruk/beïnvloed @@ -2594,7 +2729,7 @@ **) * (_ _:: + pl'Ws - _) ++ (_ pluspl'us + _) ++ (_ plWspl'Ws \+\+\+) + // ignore + after the first 3 __) - (_D minWs diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 861decbc..c46761de 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -243,9 +243,10 @@ Dictionary sv_dict I i: O o: U u- u: W y y: Y: -: ; b d f g h j -k l m n N p r s -S s. S; sx t v w z +: ; b B d f g h +j k l m n N p R +s S s. S; sx t v w +z Dictionary sw_dict diff --git a/dictsource/en_rules b/dictsource/en_rules index a7817ba6..f0c8d173 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -2714,7 +2714,7 @@ cl) ie (nt aI@ &) ier (y I2@r ier i@ - &) ier (_S2i @ + &) ier (_NS2i @ _h) ie (r aI@ pl) ier (_ aI@ _Cr) ier aI@ diff --git a/dictsource/es_list b/dictsource/es_list index 50ee0bc3..f85b4107 100644 --- a/dictsource/es_list +++ b/dictsource/es_list @@ -42,7 +42,9 @@ _0M4 _bil^'ones _1M4 'unbil^'on _0and i _dpt koma +//_roman Rom'ano +vi vi // not a Roman number // articles diff --git a/dictsource/sv_list b/dictsource/sv_list index 39c09126..8e184059 100755 --- a/dictsource/sv_list +++ b/dictsource/sv_list @@ -26,7 +26,7 @@ n En //o o: p pe: q ku- -r Er +r ER s Es t te: //u u- @@ -44,8 +44,8 @@ _. p'8Nkt _0 n'Ol _1 'Et _2 tv'o: -_3 tr'e: -_4 f'y:ra +_3 tR'e: +_4 f'y:Ra _5 f'Em _6 s'Eks _7 sx'u- @@ -54,26 +54,26 @@ _9 n'i:u: _10 t'i:;u: _11 'Elva _12 t'Olv -_13 tr'EtOn -_14 fj'u:rtOn +_13 tR'EtOn +_14 fj'u:RtOn _15 f'EmtOn _16 s'EkstOn _17 sx'8tOn -_18 'A:rtOn +_18 'A:RtOn _19 n'ItOn -_2X S;'u-gu: -_3X tr'Eti: -_4X f'Y:rtI -_5X f'Emti: -_6X s'Eksti: -_7X sx'8ti: -_8X 'Oti: -_9X n'Iti: -_0C h'8ndra +_2X S;'u-gO +_3X tR'EtI +_4X f'WRtI +_5X f'EmtI +_6X s'EkstI +_7X sx'8tI +_8X 'OtI +_9X n'ItI +_0C h'8ndRa _0M1 t'u-sEn -_0M2 mIlj'u:nEr +_0M2 mIlj'u:nER _1M2 mIlj'u:n -_0M3 bIlj'u:nEr +_0M3 bIlj'u:nER _1M3 bIlj'u:n _dpt p'8Nkt @@ -117,11 +117,11 @@ vår $u+ vårt $u+ våra $u+ er $u+ -ert e:rt $u+ +ert e:Rt $u+ era $u+ -erat E:rat $u+ -eran E:ran $u+ -deras de:ras $u+ +erat E:Rat $u+ +eran E:Ran $u+ +deras de:Ras $u+ // prepositions i i: $u $brk // in @@ -133,7 +133,7 @@ för $u $brk om $u $brk // about till $u $brk // to -från fr'o:n $u $brk // from +från fR'o:n $u $brk // from mot $u $brk // towards över $brk // over längs $brk // along @@ -161,8 +161,8 @@ som $u $pause // that, which // auxillary verbs (be, have, can, etc) -är 'E:r $u // is -var vA:r $u // was +är 'E:R $u // is +var vA:R $u // was har $u // has hade hadE $u // had @@ -176,7 +176,7 @@ ville $u // wanted to ska skA: $u // should, supposed to skulle $u bör $u // should, ought to -borde $u +borde b'u:RdE $u brukar $u // usually brukade $u // used to @@ -184,62 +184,95 @@ brukade $u // used to // some common adjectives and adverbs någon n,o:gOn $u // some något n,o:gOt $u -några n'o:gra $u +några n'o:gRa $u // MAIN WORD DICTIONARY //********************* andas andas -andras andras -arkiv 'arki:v +andras andRas +ange anje: +anger anje:R +anges anje:s +arkiv 'aRki:v av A:v $u bäste b'EstE betala b'Et'A:l,a betalt b'Et'A:lt -bort bOrt +bort bORt +bott b'Ut botten b'OtEn -bra brA: +bra bRA: dan dA:n dem dEm dig dEj -dra drA: -därför d'ErfY:r +dra dRA: +därför d'ERfY:R +egen e:gEn +egna e:gna emot Em'u:t +etc e:te:s'e: ett 'Et +far fA:R fem fEm -fram fr'am -framme fr'amE +fram fR'am +framme fR'amE +framåt fRamOt gemensam jEm'e:nsam gemensamt jEm'e:nsamt +greps gRe:ps +gripna gRi:pna ha hA: -har hA:r $u +har hA:R $u hej hEj +helt he:lt +heta he:ta honom hOnOm idag Id,A:g in In +inom InOm ja jA: jan jA:n -klar klA:r +klar klA:R +klas klA:s +kvar kvA:R log l'u:g mat mA:t men mEn mig mEj +måste m'Ost@ +måsten m'Ost@n +nvda Enve:de:A: +ont Unt ost Ust -program prUgr'am -redigera rEdIS;'e:ra +per pE:R +program pRUgR'am +redigera REdIS;'e:Ra +sade sA:dE +sades sA:dEs sex s'Eks sig sEj skolan sk'u:lan son so:n +sonen so:nEn +stad stA:d +staden stA:dEn +stadens stA:dEns stan stA:n -svar svA:r -tar tA:r +svar svA:R +tar tA:R ta tA: +togs t'u:gs tomt t'Umt tom t'Um torsdag t'u:SdA:g +tredje tR'e:djE +usa u-Es'A: +usas u-Es'A:s +usa:s u-Es'A:s vad vA:d $u -var vA:r $u +valt vA:lt +var vA:R $u vem vEm @@ -255,8 +288,10 @@ email _^_EN Explorer _^_EN firefox _^_EN frame _^_EN +gaim _^_EN graphic _^_EN heading _^_EN +headings _^_EN image _^_EN internet _^_EN jaws _^_EN @@ -272,7 +307,7 @@ no _^_EN office _^_EN one _^_EN online _^_EN -orca _^_EN +orca ORka password _^_EN read _^_EN software _^_EN diff --git a/dictsource/sv_rules b/dictsource/sv_rules index ed2ecda1..2ffc313a 100755 --- a/dictsource/sv_rules +++ b/dictsource/sv_rules @@ -11,20 +11,26 @@ a (rt_ A: a (vg A: a (r_ a - p)a (d_ a + a (s_ a + p) a (d_ a + k) a (d_ a + k) a (s_ a + k) a (ni a b) a (r_ A: + lt) a (t A: bb) a (r_ a a (CC a a (_ a &) a (_ a2 - a (re_ a + a (re a a (rn A: a (rna a l) a (rs A: + idr) a A: k) a (ta ,a m) a (j a om) a (t A: - _m) a (ter a + m) a (ter a st) a (rt A: gr) a (m a a (x a @@ -33,13 +39,16 @@ k) a (n a n) a (d a j) a (n a - r) a (de a + a (de a eg) a (n a er) a (d a + form) a (ti a er) a (t a - d) a (n_ a + d) a (n a st) a (t_ a tot) a (l 'A: + _gl) a (s A: + _gl) a (ss a v) a (ld A: v) a (rd A: sm) a (rt A: @@ -47,15 +56,15 @@ s) a (maC a ng) a (d a m) a (n a - t) a (t A: +// t) a (t A: ent) a (r A: a (t_ a ast ast - s) a (s_ a - s) a (d_ a - er) a (t_ a + s) a (s a + s) a (d a + er) a (t a åg) a (n a - t) a (n_ a + t) a (n a el) a (d a nn) a (n a mell) a (n a @@ -63,19 +72,41 @@ ansv) a (r A: ll) a (de a _v) a (nl A: - d) a (d_ a - tt) a (C_ a - dd) a (C_ a - arbet arbe:t + d) a (d a + ppd) a (t a + r) a (ba a + ass) a a + l) a (gl A: + _d) a (g A: + ik) a (ns 'A: + et) a (g 'A: + f) a (rt 'A: + f) a (rl 'A: + t) a (ti a + tt) a (C a + dd) a (C a + arbet aRbe:t + amerik amERIk + agera age:Ra + analy analy: + _) avta A:vtA: + _) avge A:vje: + alkohol alkUho:l .group b b b b (b + bevakn bEvA:kn + bredband bRe:dband + begrav bEgRA:v + begrip BEgR'i:p + beslag bEsl'A:g + beslagta bEsl'A:gtA: .group c c k - cc k - cc (A k: // ?? + cc ks + cc (A ks // ?? c (e s c (i s c (y s @@ -91,10 +122,20 @@ d d d (d dagen dA:gEn - disken dIskEn + daglig dA:glIg + diske dIskE djup j'u-p - djur j'u-r + djur j'u-R dum d8m + datorer dat'u:RER + dator dA:tOR + data dA:ta + databas dA:tabA:s + drogen dRo:gEn + droger dRo:gER + design _^_EN + download _^_EN + .group e e e: @@ -105,8 +146,11 @@ b) e (k E e (j E d) e (lv e: + d) e (ls e: + m) e (dde e: d) e (ln e: d) e (lt e: + l) e (dn e: d) e (bat E s) e (kund E ch) e (f E: @@ -116,7 +160,7 @@ &) es (_ Es &) en (_ En &) ens (_ Ens - &) er (_ Er + &) er (_ ER &) et (_S2 Et // ?? e (ve E t) e (lef E @@ -132,29 +176,56 @@ r) e (sul E r) e (sur E r) e (dak E + b) e (f E + b) e (k E + b) e (h E + b) e (s E + b) e (v E v) e (ta e: r) e (ta e: + r) e (dn e: + l) e (ta e: + e (nli e: + e (gent E pr) e (n E _) e (tik E r) e (ce E - + m) e (tod E + p) e (ri E + xtr) e (m e: +elek 'ElEk espeak _^_EN +ekonom 'Eku:n,O:m +erens ER'ans +esent Es'Ent +enhet e:nhe:t .group f f f f (f + familj fam'Ilj + formad fORmad .group g g g gg g g (e j g (i j + or) g (ar j + or) g (en j g (y j g (ä j g (ö j g (t k g (n N gj j + lä) g (e g + gjord ju:Rd + gani gan'I + garage gaR'A:S + glöm glWm + guide g'aId + guider g'aIdER group _^_EN .group h @@ -173,10 +244,15 @@ espeak _^_EN t) i (d i: skr) i (v i: v) i (sn i: + l) i (kna i: +ikon Ik'o:n + inne InE imag _^_EN .group j j j + java jA:va + jou (r sxU .group k k k @@ -191,11 +267,17 @@ espeak _^_EN _) k (i S; _) k (y S; _) k (ä S; + k (änd S; + k (änt S; + k (änn S; _) k (ö S; k (öp S; - karta kA:rta - kategori katEg,u:ri: + karta kA:Rta + kategori katEg,u:Ri: kalend kal'End + kommun kOm'u-n + kommunika kOm8nIka + kontor kOnt'u:R känsl S;Ensl .group l @@ -203,6 +285,11 @@ espeak _^_EN l (l lg (_ lj _) lj j +låg l'o:g +ljud j'u-d +ljug j'u-g +ligen lIgEn + lager lA:gER .group m m m @@ -212,21 +299,31 @@ espeak _^_EN medlem m'e:dlEm maga maga meny mEn'y: - minimera mIni:m'e:ra2 - maximera maksi:m'e:ra2 - motor m'u:tOr - motorer m'Otu:rEr + minimera mIni:m'e:Ra2 + maximera maksi:m'e:Ra2 + motor m'u:tOR + motorer m'Otu:RER model mOd'El musik mu-s'i:k + medvet me:dv'e:t + masken maskEn + maskera maske:Ra + mjuk mju-k + masker maskER + medborg me:dbORj + mobil mObi:l + modem mOde:m .group n n n n (n ng N + fu) ng (er ng n (k N network _^_EN - normal nOrmA:l - natur n'at'u-r + normal nORmA:l + natur n'at'u-R + nali nalI .group o o u: @@ -247,24 +344,47 @@ espeak _^_EN s) o (r 'O k) o (pi 'O f) o (rm 'O - pr) oj Usx + pr) oj Osx' o (ns U + nn) o (ns O ss) o (n O C) o (rs O k) o (rta O b) o (rt O - osparat u:spA:rat + rs) o (rd u: + o (rde o: + b) o (st u: + b) o (k u: + kr) o (k u: + kr) o (g u: + kr) o (n u: + f) o (tb u: + pr) o (v u: + osparat u:spA:Rat och 'Ok k) o (ns O pr) o (cent O p) o (lis O p) o (pu O + g) o (n O + sp) o (rt O + pp) o (rt O + upp) o (rt o: + l) o (n O + d) o (n O + k) o (d o: + _) o (j O + o (ni 'o: + operat OpERat .group p p p p (p + påstå po:sto: paket pak'e:t - parentes par@nt,e:s + parentes paR@nt,e:s + privat pRIvA:t + potatis pOt'A:tIs .group q q k @@ -272,15 +392,21 @@ espeak _^_EN qu kw .group r - r r + r R r) r rs s. - rsi (o rsx' + rsi (o Rsx' rsk s.k - rsk (i rsx + rsk (i Rsx rss s. - rg (_ rj - radera rad'e:ra + rg (_ Rj + radera Rad'e:Ra +rafik Raf'i:k +regel Re:gEl +resor R'e:sOR +rekord REk'o:Rd +risk RIsk +rubrik R8bR'i:k .group s s s @@ -292,15 +418,31 @@ espeak _^_EN sk (y sx sk (ä sx sk (ö sx + fi) s (k s + fu) s (k s skj sx stj sx + sio (n sx'u: ssio (n sx'u: - sport spOrt + spegel spe:gEl + segel se:gEl + spel spe:l select _^_EN säg sEj - sparat spA:rat - svarat svA:rat - + service sY:Rvi:s + spara spA:Ra + svara svA:Ra + slog sl'u:g + stått stOt + sverige svERjE + säkerhet s'E:k@Rh,e:t + skärm sx'ERm + segla se:gla + skolor sku:lOR + snegla sne:gla + spegla spe:gla + semest sEm'Est + sweden _^_EN .group t t t @@ -313,6 +455,9 @@ espeak _^_EN task _^_EN talsyntes t'A:lsynt,e:s tabell tab'El + tagit t'A:gIt + tangent tanjEnt + teknik tEkn'i:k .group u u u- @@ -325,12 +470,21 @@ espeak _^_EN u (CC 8 u (n 8 u (tl u- + sj) u (k u- r) u (m_ 8: - utmärk 'u-tm@rk + utmärk 'u-tm@Rk + b) u (tik 8 + v) u (x 8 + uppge 8pje: +upload _^_EN .group v v v v (v + varandra vaRandRa + varn vA:Rn + varan vA:Ran + verk vERk .group w w v @@ -345,6 +499,7 @@ espeak _^_EN .group y y y: y (CC y + s) y (nska y: .group z z s @@ -355,7 +510,13 @@ espeak _^_EN å (CC O tr) å (d 'o: v) å (r 'o: + r) å (k o: h) å (r 'o: + m) å (l o: + n) å (l o: + sk) å (l o: + h) å (l o: + h) å (ll O .group ä ä E: @@ -363,7 +524,16 @@ espeak _^_EN ä (r E: tr) ä (d E: v) ä (lk E: + l) ä (sn E: + v) ä (rd E: + sk) ä (rg E: l) ä (st E: + n) ä (tt E + v) ä (x E + n) ä (t E: + f) ä (rd E: + r) ä (k E: + ärl (d 'E:R .group ö @@ -371,19 +541,20 @@ espeak _^_EN ö (CC 'W f) ö (rd 'Y: ö (vr 'Y: + r) ö (m 'W .group é 'e: - % prOs'Ent - $ d'Olar + % pROs'Ent + $ d'OlaR + pl8s & _:'Ok @ sn'A:bElA: - / sn'e:dstrEk - € 'Evru: + / sn'e:dstREk + € 'EvRu: . p'8Nt @@ -395,7 +566,7 @@ espeak _^_EN C_) - (_D _ --) - - * sx'E:rna + * sx'E:Rna *) * (* ** **) * (_ _:: diff --git a/espeak-data/voices/!v/!variant1 b/espeak-data/voices/!v/!varnt1 similarity index 100% rename from espeak-data/voices/!v/!variant1 rename to espeak-data/voices/!v/!varnt1 diff --git a/espeak-data/voices/!v/!variant11 b/espeak-data/voices/!v/!varnt11 similarity index 100% rename from espeak-data/voices/!v/!variant11 rename to espeak-data/voices/!v/!varnt11 diff --git a/espeak-data/voices/!v/!variant12 b/espeak-data/voices/!v/!varnt12 similarity index 100% rename from espeak-data/voices/!v/!variant12 rename to espeak-data/voices/!v/!varnt12 diff --git a/espeak-data/voices/!v/!variant13 b/espeak-data/voices/!v/!varnt13 similarity index 100% rename from espeak-data/voices/!v/!variant13 rename to espeak-data/voices/!v/!varnt13 diff --git a/espeak-data/voices/!v/!variant14 b/espeak-data/voices/!v/!varnt14 similarity index 100% rename from espeak-data/voices/!v/!variant14 rename to espeak-data/voices/!v/!varnt14 diff --git a/espeak-data/voices/!v/!variant2 b/espeak-data/voices/!v/!varnt2 similarity index 100% rename from espeak-data/voices/!v/!variant2 rename to espeak-data/voices/!v/!varnt2 diff --git a/espeak-data/voices/!v/!variant3 b/espeak-data/voices/!v/!varnt3 similarity index 100% rename from espeak-data/voices/!v/!variant3 rename to espeak-data/voices/!v/!varnt3 diff --git a/espeak-data/voices/!v/!variant4 b/espeak-data/voices/!v/!varnt4 similarity index 100% rename from espeak-data/voices/!v/!variant4 rename to espeak-data/voices/!v/!varnt4 diff --git a/espeak-data/voices/!v/!variant5 b/espeak-data/voices/!v/!varnt5 similarity index 100% rename from espeak-data/voices/!v/!variant5 rename to espeak-data/voices/!v/!varnt5 diff --git a/espeak-data/voices/!v/!variant6 b/espeak-data/voices/!v/!varnt6 similarity index 100% rename from espeak-data/voices/!v/!variant6 rename to espeak-data/voices/!v/!varnt6 diff --git a/espeak-data/voices/mb/mb-sw2 b/espeak-data/voices/mb/mb-sw2 index 97039f7b..c632e263 100755 --- a/espeak-data/voices/mb/mb-sw2 +++ b/espeak-data/voices/mb/mb-sw2 @@ -3,5 +3,5 @@ language sv 8 gender female pitch 140 220 -mbrola sw2 sv_phtrans +mbrola sw2 sv2_phtrans diff --git a/espeak-data/voices/mb/mb-sw2-en b/espeak-data/voices/mb/mb-sw2-en index ae1fd384..f2033dc1 100755 --- a/espeak-data/voices/mb/mb-sw2-en +++ b/espeak-data/voices/mb/mb-sw2-en @@ -3,5 +3,5 @@ language en gender female pitch 140 220 -mbrola sw2 sv_phtrans +mbrola sw2 sv2_phtrans diff --git a/phsource/compile_report b/phsource/compile_report index 4d397f5e..3daa074a 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -22,7 +22,7 @@ sk 29 125 cs 5 125 hr 19 129 - mk 21 130 + mk 3 130 sr 2 129 ru 38 126 it 17 117 @@ -49,15 +49,15 @@ 2 b/bo base hi 2 b/bu base hi 2 b/xb base hi - 16 d/d base base2 fi hi hu pl hr mk ru ro el sw - 16 d/d_ base base2 fi hi hu pl hr mk ru ro el sw - 17 d/dr base base2 fi hi hu pl hr mk ru ro el sw + 15 d/d base base2 fi hi hu pl hr ru ro el sw + 15 d/d_ base base2 fi hi hu pl hr ru ro el sw + 16 d/dr base base2 fi hi hu pl hr ru ro el sw 1 d/tap ro 2 d/tap1 base 2 d/tap2 base 2 d/tap3 base 1 d/tap_i ro - 14 d/xd base base2 fi hi hu pl hr mk ru ro el sw + 13 d/xd base base2 fi hi hu pl hr ru ro el sw 2 d/xd_pzd pl ru 1 d/x_tap base 6 dzh/dzh base hi mk ru @@ -189,8 +189,8 @@ 2 r3/r_n base ru 1 r3/r_o base 11 r3/r_trill base af cy nl sk pt - 3 r3/r_trill2 base hr mk - 3 r3/r_trill2.wav base hr mk + 2 r3/r_trill2 base hr + 2 r3/r_trill2.wav base hr 8 r3/r_trill3.wav base af cy nl 3 r3/r_trill.wav base sk pt 1 r3/r_u base @@ -240,7 +240,7 @@ 1 ufric/tl# is 2 ufric/x base vi 4 ufric/x2 af nl pt - 2 ufric/x_hr hr mk + 1 ufric/x_hr hr 1 ustop/c base 5 ustop/k base en fr hi sw 10 ustop/k_ base base2 en fi fr hi hu sk el sw @@ -257,7 +257,7 @@ 7 ustop/p_unasp_ base2 fi hi hu sk la ro 6 ustop/t base en fr hi 8 ustop/t_ base en fr hi sk el - 24 ustop/t_dnt base base2 en fi hi hu pl hr mk ru ro vi ++ + 22 ustop/t_dnt base base2 en fi hi hu pl hr ru ro vi sw 1 ustop/t_dnt2 vi 2 ustop/t_hi hi 4 ustop/t_pzd pl ru @@ -305,7 +305,7 @@ 1 vdiph/aau_4 vi 1 vdiph/ae fr_ca 1 vdiph/ae_2 en_n - 8 vdiph/ai base2 eo sk hr mk it pt vi + 7 vdiph/ai base2 eo sk hr it pt vi 2 vdiph/ai_2 cy 1 vdiph/ai_3 no 1 vdiph/ai_4 af @@ -407,7 +407,7 @@ 1 voc/zh_2 sk 2 voc/z_pzd base 2 voc/z_pzd_ base - 15 vowel/@ base en en_us en_rp cy hi hr mk + 14 vowel/@ base en en_us en_rp cy hi hr 1 vowel/@- base 4 vowel/& en_rp fi hi sv 4 vowel/0 base2 en hi pt @@ -421,10 +421,10 @@ 1 vowel/@_4 nl 2 vowel/8_2 en_us sv 1 vowel/8_3 zhy - 16 vowel/a en_n cy de hu nl pl sk hr mk sr it la + 14 vowel/a en_n cy de hu nl pl sk hr sr it la 4 vowel/a# base2 en_sc pt 7 vowel/a_2 base2 eo la pt pt_pt ro vi - 5 vowel/a#_2 hr mk sv is sw + 4 vowel/a#_2 hr sv is sw 7 vowel/a_3 en_sc fr cs is 12 vowel/a#_3 en en_n en_us en_wm de hi ru pt_pt vi zhy 4 vowel/a_4 en_wm el vi @@ -440,7 +440,7 @@ 2 vowel/aa_8 en_us 3 vowel/a_en en fr 1 vowel/@_bck hi - 15 vowel/e base2 en en_n af cy eo fr hr mk it la pt ++ + 14 vowel/e base2 en en_n af cy eo fr hr it la pt pt_pt ++ 2 vowel/e# en_sc 7 vowel/e_2 en_sc de hi it sv no 1 vowel/e_3 hu @@ -452,9 +452,9 @@ 1 vowel/ee#_2 sv 4 vowel/ee_3 af pt vi 3 vowel/ee_6 en_n sk sv - 14 vowel/e_mid en_rp en_wm fr_ca hi hu sk cs hr mk it es pt_pt ++ + 13 vowel/e_mid en_rp en_wm fr_ca hi hu sk cs hr it es pt_pt no ++ 10 vowel/e_mid2 af de fi nl sk ro el sw - 2 vowel/@_fnt hr mk + 1 vowel/@_fnt hr 1 vowel/@_hgh no 18 vowel/i base2 en_n en_rp en_wm cy eo fr hu pl it pt pt_pt ++ 1 vowel/i# cy @@ -463,13 +463,13 @@ 4 vowel/i_4 fi hu it is 5 vowel/i_5 en_sc 3 vowel/i#_5 pt_pt ro - 2 vowel/i_6 hr mk + 1 vowel/i_6 hr 3 vowel/i_en en en_us vi 2 vowel/i_fnt hi 10 vowel/ii en_wm cy de fr_ca nl is zhy 3 vowel/ii# cy pl ru 1 vowel/ii_2 la - 8 vowel/ii_3 en_rp fi hi sk hr mk sv no + 7 vowel/ii_3 en_rp fi hi sk hr sv no 2 vowel/ii_4 en_rp 6 vowel/ii_en en en_n 5 vowel/@_low hi ro no @@ -486,7 +486,7 @@ 1 vowel/oe_4 sv 2 vowel/o_mid fr hu 9 vowel/oo en_sc de eo la es el sv no zhy - 12 vowel/oo_1 en_n en_rp en_wm af fi sk hr mk vi + 11 vowel/oo_1 en_n en_rp en_wm af fi sk hr vi 3 vowel/oo_2 en_sc cy cs 1 vowel/oo_3 af 3 vowel/oo_4 hi pl it @@ -495,12 +495,12 @@ 2 vowelr/aa_r en_sc 1 vowelr/oo_r en_sc 1 vowelr/o_r en_sc - 5 vowelr/r-voc hi sk hr mk + 4 vowelr/r-voc hi sk hr 2 vowelr/V3_r en en_sc 1 vowelr/V_r en 7 vowel/u en_n cy de eo fr cs la 5 vowel/u# en en_sc - 6 vowel/u_2 fi fr sk hr mk ro + 5 vowel/u_2 fi fr sk hr ro 1 vowel/u#_2 sv 2 vowel/u_3 en_us ro 1 vowel/u#_3 en_n @@ -508,7 +508,7 @@ 1 vowel/u_5 sw 3 vowel/u_6 en_rp pt_pt 1 vowel/u_7 vi - 18 vowel/u_bck base2 cy fi fr_ca hi hu nl pl sk hr mk it ++ + 17 vowel/u_bck base2 cy fi fr_ca hi hu nl pl sk hr it pt ++ 2 vowel/uu en en_wm 3 vowel/uu_2 base2 de la 1 vowel/uu_3 af @@ -617,8 +617,8 @@ 5 w/xw base 20 x/b base hi ro is 1 x/b_ base - 12 x/d base en_us hi hr mk el is - 14 x/d_ base base2 fi hi pl hr mk ru ro el is sw + 10 x/d base en_us hi hr el is + 13 x/d_ base base2 fi hi pl hr ru ro el is sw 21 x/d_dnt base base2 fi hi hu pl ru ro sw 6 x/d_pzd pl ru 4 x/dzh base hi diff --git a/phsource/j/_j b/phsource/j/_j index cef038a1..9597eb09 100644 Binary files a/phsource/j/_j and b/phsource/j/_j differ diff --git a/phsource/l/_l b/phsource/l/_l index 77345bf1..10504c17 100644 Binary files a/phsource/l/_l and b/phsource/l/_l differ diff --git a/phsource/mbrola/sv2 b/phsource/mbrola/sv2 new file mode 100644 index 00000000..2b813a97 --- /dev/null +++ b/phsource/mbrola/sv2 @@ -0,0 +1,70 @@ +// mbrola sw2 voice doesn't have [rs] and other retroflex consonants + +0 l/2 NULL 0 l +0 l/ NULL 0 l +0 r/ NULL 0 r +0 r- NULL 0 r +0 R NULL 0 r +0 l- NULL 0 l +0 w/ NULL 0 w +0 j/ NULL 0 j +0 ; NULL 0 NULL +0 g- NULL 0 NULL +0 @- NULL 0 NULL +0 * NULL 0 r + +0 S; NULL 0 C +0 sx NULL 0 S +0 S NULL 50 r s +0 s. NULL 50 r s +0 u- NULL 0 }: +0 Y: NULL 0 2: +0 y NULL 0 Y +0 8 NULL 0 u0 +0 W NULL 0 2 +0 E NULL 0 e +0 @ N 0 e +0 a2 NULL 0 a +0 E: r 0 {: +0 Y: r 0 9: +0 E r 0 { +0 W r 0 9 + +4 p VWL 0 ph +4 t VWL 0 th +4 k VWL 0 kh + + +// phonemes for English words +0 @2 NULL 0 @ +0 @5 NULL 0 @ +0 I2 NULL 0 I +0 V NULL 0 u0 +0 aa NULL 0 a +0 0 NULL 0 A: +0 3 NULL 0 @ +0 3: NULL 0 2: +0 aI NULL 60 a j +0 eI NULL 60 e j +0 OI NULL 60 O j +0 aU NULL 60 a U +0 oU NULL 0 o: +0 i@ NULL 60 i: @ +0 e@ NULL 0 E: +0 o@ NULL 70 o: @ +0 O@ NULL 70 O @ +0 O: NULL 0 O +0 A@ NULL 0 A: +0 U@ NULL 60 U @ +0 @L NULL 40 @ l +0 aI@ NULL 70 a @ +0 aU@ NULL 70 A: u0 +0 T VWL 0 th +0 T NULL 0 t +0 D NULL 0 z +0 w NULL 0 v +0 z NULL 0 s +0 tS NULL 50 t s +0 dZ NULL 50 d s +0 Z NULL 0 s + diff --git a/phsource/ph_macedonian b/phsource/ph_macedonian index d9b75063..fcfedb0c 100644 --- a/phsource/ph_macedonian +++ b/phsource/ph_macedonian @@ -1,150 +1,4 @@ -phoneme @ // Schwa - vowel starttype (@) endtype (@) - formants vowel/@ - length 140 -endphoneme - -phoneme @2 // Schwa (raised) - vowel starttype (@) endtype (@) - formants vowel/@_fnt - length 140 -endphoneme - - -phoneme a - vowel starttype (a) endtype (a) - length 160 - formants vowel/a - reduceto & 4 -endphoneme - - -phoneme A // 'a' before 'r', doesn't reduce to [&] - vowel starttype (a) endtype (a) - length 160 - formants vowel/a -endphoneme - - -phoneme & - vowel starttype (a) endtype (a) - length 140 - formants vowel/a#_2 -endphoneme - - -phoneme E - vowel starttype (e) endtype (e) - length 140 - formants vowel/e_mid -endphoneme - - -phoneme e - vowel starttype (e) endtype (e) - length 140 - formants vowel/e -endphoneme - - -phoneme i - vowel starttype (i) endtype (i) - length 120 - formants vowel/i_6 - linkout ; - reduceto I 4 -endphoneme - - -phoneme I - vowel starttype (i) endtype (i) - length 120 - formants vowel/ii_3 - linkout ; -endphoneme - - -phoneme o - vowel starttype (o) endtype (o) - length 140 - formants vowel/oo_1 -endphoneme - - -phoneme u - vowel starttype (u) endtype (u) - length 140 - formants vowel/u_bck - reduceto U 4 -endphoneme - - -phoneme U - vowel starttype (u) endtype (u) - length 140 - formants vowel/u_2 -endphoneme - - -phoneme aI - vowel starttype (a) endtype (i) - length 250 - formants vdiph/ai -endphoneme - - - - -phoneme t // dental variant of /t/ - vls dnt stop - vowelin f1=0 f2=1600 -300 300 f3=-100 80 - vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20 - lengthmod 2 - wave ustop/t_dnt%50 - before _ ustop/t_dnt%35 - switchvoicing d -endphoneme - - -phoneme d - vcd alv stop - vowelin f1=2 f2=1700 -300 300 f3=-100 80 amp=16 - vowelout f1=2 f2=1700 -300 300 f3=-100 80 - formants d/d+x/d%50 - before _ d/d_+x/d_ - before r d/dr+x/d%50 - after _ NULL - after @ d/xd - lengthmod 5 - switchvoicing t -endphoneme - - - -phoneme x - vls vel frc - vowelin f1=0 f2=2300 200 400 f3=-100 80 - vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20 - length 100 - lengthmod 3 - wave ufric/x_hr%45 - switchvoicing Q -endphoneme - -phoneme r- - vowel starttype (@) endtype (@) - length 240 - formants vowelr/r-voc -endphoneme - -phoneme R - liquid - vowelin f1=0 f2=1600 -300 300 f3=-200 80 - vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk - formants r3/r_trill2+r3/r_trill2.wav%65 - trill - lengthmod 6 -endphoneme +// Based on ph_croatian phoneme k^ vls pal stop diff --git a/phsource/phonemes b/phsource/phonemes index 98b9cf62..515eedc0 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -795,7 +795,7 @@ phoneme z vcd alv frc sibilant vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 formants voc/z+ufric/s_ - before _ voc/z_+ufric/s_%80 + before _ voc/z_+ufric/s_%85 lengthmod 6 switchvoicing s endphoneme diff --git a/phsource/voc/z b/phsource/voc/z index 87358563..bf2870e6 100644 Binary files a/phsource/voc/z and b/phsource/voc/z differ diff --git a/phsource/w/_w b/phsource/w/_w index cfde5014..49f7fccd 100644 Binary files a/phsource/w/_w and b/phsource/w/_w differ diff --git a/src/dictionary.cpp b/src/dictionary.cpp index e44a6cc8..056a3205 100755 --- a/src/dictionary.cpp +++ b/src/dictionary.cpp @@ -2650,6 +2650,9 @@ int Translator::LookupDict2(char *word, char *word2, char *phonetic, unsigned in return(0); } + // Find the first entry in the list for this hash value which matches. + // This corresponds to the last matching entry in the *_list file. + while(*p != 0) { next = p + p[0]; diff --git a/src/speak_lib.cpp b/src/speak_lib.cpp index 4b29d9b5..76794509 100644 --- a/src/speak_lib.cpp +++ b/src/speak_lib.cpp @@ -265,8 +265,8 @@ int GetFileLength(const char *filename) char *Alloc(int size) {//================== char *p; - if((p = (char *)malloc(size)) == NULL) - fprintf(stderr,"Can't allocate memory\n"); + if((p = (char *)malloc(size+1)) == NULL) + fprintf(stderr,"Can't allocate memory\n"); // I was told that size+1 fixes a crash on 64-bit systems return(p); } diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 6e025486..b33190cd 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.28.03 30.Jul.07"; +const char *version_string = "1.28.04 15.Aug.07"; const int version_phdata = 0x012801; int option_device_number = -1; diff --git a/src/synthesize.cpp b/src/synthesize.cpp index 1d98c42b..efaf669e 100755 --- a/src/synthesize.cpp +++ b/src/synthesize.cpp @@ -1087,6 +1087,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume) unsigned char *pitch_env=NULL; unsigned char *amp_env; PHONEME_TAB *ph; + PHONEME_TAB *prev_ph; #ifdef TEST_MBROLA if(mbrola_name[0] != 0) @@ -1263,7 +1264,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume) } } - if((next->type==phVOWEL) || (next->type==phLIQUID)) + if((next->type==phVOWEL) || ((next->type==phLIQUID)) && (next->newword==0)) // ?? test 14.Aug.2007 { StartSyllable(); if(p->synthflags & SFLAG_LENGTHEN) @@ -1317,6 +1318,10 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume) if(p->ph->phflags & phTRILL) modulation = 5; + prev_ph = prev->ph; +// if(p->newword) +// prev_ph = phoneme_tab[phonPAUSE]; // pronounce fully at the start of a word + if(!(p->synthflags & SFLAG_SEQCONTINUE)) { DoAmplitude(p->amp,NULL); @@ -1331,16 +1336,16 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume) if(next->type==phVOWEL) { StartSyllable(); - DoSpect(p->ph,prev->ph,next->ph,1,p,modulation); // (,)r + DoSpect(p->ph,prev_ph,next->ph,1,p,modulation); // (,)r } else if(prev->type==phVOWEL && (p->synthflags & SFLAG_SEQCONTINUE)) { - DoSpect(p->ph,prev->ph,next->ph,1,p,modulation); + DoSpect(p->ph,prev_ph,next->ph,1,p,modulation); } else { - DoSpect(p->ph,prev->ph,next->ph,1,p,modulation); + DoSpect(p->ph,prev_ph,next->ph,1,p,modulation); } break; diff --git a/src/voices.cpp b/src/voices.cpp index 0084f9dd..5c3c9df7 100755 --- a/src/voices.cpp +++ b/src/voices.cpp @@ -231,7 +231,6 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, const char*lea char vgender[80]; char vlanguage[80]; char languages[300]; // allow space for several alternate language names and priorities - char fname_buf[sizeof(path_home)+15]; unsigned int len; @@ -245,6 +244,7 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, const char*lea int gender; #ifdef PLATFORM_WINDOWS + char fname_buf[sizeof(path_home)+15]; if(memcmp(leafname,"mb-",3) == 0) { // check whether the mbrola speech data is present for this voice @@ -924,7 +924,7 @@ voice_t *LoadVoiceVariant(const char *vname, int variant) v = LoadVoice(buf,0); if((v != NULL) && (variant > 0)) { - sprintf(buf,"!variant%d",variant); + sprintf(buf,"!varnt%d",variant); // changed from !variant1 to !varnt1 to avoid 8 char filenames on DOS v = LoadVoice(buf,2); } return(v); @@ -1446,7 +1446,7 @@ espeak_ERROR SetVoiceByName(const char *name) if(variant > 0) { // apply a voice variant - sprintf(variant_name,"!variant%d",variant); + sprintf(variant_name,"!varnt%d",variant); LoadVoice(variant_name,2); }