diff --git a/dictsource/af_list b/dictsource/af_list index 1769bd4f..5cb1d0f8 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 @@ -91,6 +91,7 @@ brittanje $2 ceylon s@lOn china S'ina engeland 'EN@lant +kanada kanad%a kongo kONgu mesopotamië mEsuput'A:mi@ mosambiek musamb'ik @@ -116,6 +117,7 @@ bothma bOtma breytenbach breIt@nbax2 carl kA:r@L charles _^_EN +chopin S%OpA~ chris krIs christo krIstu christian krIstian @@ -137,6 +139,8 @@ george _^_EN gerhard x2&rart grange x2rA:nsi gustav gustaf +haydn hAId@n +helena hil'e@na jacobus jako@bWs jacques ZA:k jane _^_EN @@ -144,6 +148,7 @@ jean ZA~n jesus ji:sWs joey dZ@Ui john _^_EN +lategan lA:t@x2an le l@ leandra li'andra leroux l@ru @@ -155,10 +160,12 @@ louw l'@U maria mar'ia martin m'A:rt@n michiel $2 -mostert m'Ost@rt +mostert m'Ost@rt +mozart mo@tsart natasha n%at'aSa paul p@Ul paulus p@UlWs +philip fIl@p pierre p'e@r petrus pe@trWs phoebe fi:bi @@ -171,6 +178,7 @@ schalk sk'alk scheepers ske@p@rs schoor sko@r shakespeare _^_EN +tania tanja terblanche t@rblA:nS theron tr'On viljoen $2 @@ -235,6 +243,7 @@ omdat $pause sodat $pause voordat $pause nadat $pause +ofskoon $2 $pause totdat tOdat $pause as ,as $pause soos $pause @@ -334,7 +343,7 @@ bv beIf'o@rbe@lt aanbid $2 aanstaande $2 agenda ax2'Enda - aikôna %aik'O:na +algaande $2 algehele alx2@h,e@l@ alles al@s alternatiewe $4 @@ -358,7 +367,6 @@ betekenis b@te@k@n@s bewe be@v@ bewend be@v@nt bewering b@ve@rIN -biblioteek $4 bostaande b'o@stA:nd@ dadelik dA:d@lIk @@ -401,12 +409,12 @@ gomorra x2@mOra hallo h'Il,@U hanteer $2 +hardop hart?Op heeltemal he@lt@mal heengaan he@nx2A:n hek h&k hekke h&k@ helaas he@l'A:s -hele he@l@ here he@r@ hoewel huv'&l hoofsaaklik $2 @@ -416,8 +424,8 @@ idee $2 ietwat itvat ignoreer ix2no@r'e@r inagneming @nax2ne@m@N -inderdaad @nd@rd'A:t ingang Inx2aN +inkluis $2 intens @nt'Ens intensiteit $4 @@ -435,6 +443,7 @@ krediet kr@dit kritiek krIt'ik kultuur $2 kunsmatige kWnsm'A:t@x2@ +kwansuis $2 latere l'A:t@r@ lekker l&k@r @@ -472,7 +481,7 @@ numeri nWm@ri omtrent Omtr'Ent onbegrip $1 -onderstebo On@rst@b,o@ +onderweg $3 onderwyser $3 ongeag $1 ongeduld $1 @@ -491,6 +500,8 @@ onraad $1 onrus $1 oorkom $2 oorleef $2 +oorsee $2 +oorsese $2 oorspronklike $2 oranje $2 @@ -517,10 +528,8 @@ sobere s'o@b@r@ sombere s'Omb@r@ sodra so@dr'A: sogenaamde s'o@x2@n,A:md@ -soldaat $2 -soldate $2 -sononder sOn,On@r -sonop sOn,Op +sononder sOn_On@r +sonop sOn_Op sover so@f&r spesmaas $2 stabiel stab'il @@ -542,11 +551,7 @@ uiteindelik $2 vaarwel fA:rv'&l vanaf fanaf -vandag $2 -vandaan $2 -vanjaar $2 -vanoggend fan'Ox2@nt -vanuit fan'Yyt +vandat $1 veraf f&r_af verafgeleë f&rafx2@le@@ verantwoordelikheid f@rantv'o@rd@l@keIt @@ -571,6 +576,7 @@ voorgee fo@rx2e@ voorkom $2 voormalige fo@rm'A:l@x2@ voorsien $2 +vorendag $3 vorige fo@r@x2@ vrek fr&k diff --git a/dictsource/af_rules b/dictsource/af_rules index 00ad359d..89fa2698 100755 --- a/dictsource/af_rules +++ b/dictsource/af_rules @@ -13,6 +13,7 @@ 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. @) adig 'A:d@x2 // misdadiger/gewelddadigheid/kragdadigheid C) adium A:diWm // compounds of stadium/radium @@ -62,7 +63,9 @@ aangee (+ 'A:nx2e@ // see rule: _) aange (@P5 A:nx@ _) aange (@P5 'A:nx2@ // added stress mark to ensure stress on aan + aan (een %A:n? // stress and short break between slbs.: aaneen/-gestrengel aan (g A:n // aangaan/aangaap/aangroei/aangryp + aan (houden %A:n // move default stress: aanhoudend/-e aan (lok %A:n // move default stress: aanloklik/-heid aan (lok_N A:n // restore default stress: aanlok aan (sien %A:n // stress on 2nd slb @@ -72,7 +75,7 @@ aansterk 'A:nst&rk // aansterk/ing aan (stoot %A:n // stress on 2nd slb.: aanstootlik aan (stoot_N A:n // stress on 1st slb.: aanstoot - aan (trek %A:n // move default stress: aantreklik/-heid + aantreklik %A:ntr&kl@k // move default stress: aantreklik/-heid aan (trek_N A:n // restore default stress: aantrek aan (vaar %A:n // aanvaar/de/baar aan (vank A:n' // stress aanvanklik/e @@ -81,15 +84,20 @@ _) af (@P2 'af // afbreek/afdwaal/afdwing C) afel (@ A:f@l // compounds starting with tafel/ontrafeling/uitrafeling _) a (ffA %a // move default stress: affêre and compounds/affekteer + affro (nt %afr%O // fix stress: affronteer/-tasie afgee (+ 'afx2e@ // see rule: _) afge (@P4 afx2@ _) afge (@P4 'afx2@ // stress on 1st slb + _) 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 afrika A:frika //Stress and 1st a sound: Afrika and compounds: Afrikatale/-state... + 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 _) agterge (@P7 'ax2t@rx2@ agterna ax2t@rn'A: // agterna/-kyk/-loop/-sit/-staar + agter (uit %ax2t@r? // move default stress: agteruit/-boer/-gang/-ry... + _) agt (uur ax2t // restore default stress; exception to "tuur" rule: agtuur and compounds a (djie aI aan (djie AIN aan (tjie AIN @@ -109,6 +117,7 @@ alleen %ale@n // to handel stress in compounds with alleen alleni (g %ale@n@ // fix stress and e sound: allenig and derivitives, eg. allenigheid amandel am'and@l // amandel/s/-poeding/-tert... + ambu (l %amb%y // fix stress: ambulans and compounds/ambulant, etc. _) am (A %am // amorfe/amok/amortisasie/amalgamasie amer (ik %ame@r // Amerika/Amerikaner _) am (nA %am // amnestie/amnesie @@ -118,6 +127,7 @@ _) ar (gi %ar // argief and compounds/argiewe _) ar (giC %ar% // argitek and compounds _) arkad %arkA:d // arkade/arkadia + _) armes ar?m@s // fix e sound: armes/armesorg _) ar (om %ar // aroma/aromaties arres (_ %arEs // arres/huisarres arre (stA %ar@ // arrestasie/arresteer @@ -127,6 +137,7 @@ _) 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 + _) as (ke %as // move default stress: askeet/askete/asketies/askese assist %as@st // assistent/e/assisteer atten (C at'En // attent/heid/onattent/attensies @) ator (K 'A:tOr // katalisator/diktatorskap and many similar @@ -139,7 +150,7 @@ // The following are experimental nasalisation of aans: aans (_ 'A~ns aanse (_ 'A~ns@ - + .group an an (djie+ aIN ange (lier %aN@ // angelier/-e and compounds @@ -161,12 +172,14 @@ b b b (b b (_N p + b (eentjie+ b // exception to "bee" rule: beentjie/-s and compounds be (amp b@? // fix e sound in compounds ending in beampte @) beeldig b'e@ld@x2 // denkbeeldig/voorbeeldig bei beI // beier/beitel _) be (@P2 b@ @) be (C b@ C) be (rsie b'&: //kombersie etc. + @) 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. @) ba (ren b'A: // onrusbarend/opsienbarend and derivitives @@ -180,6 +193,7 @@ _) be (Cy b@ // bely/beny/betyds bes (ie_ be@s //sonbesie duinebesie etc. bes (ies_ be@s //sonbesies duinebesies etc. + bed (k bEt // bedkassie/bedkaartjie/bedkatel/bedkussing bed (l bEt // bedlamp/bedliggie/dubbelbedlaken bed (rand bEt // fix e and first d sounds bed (s bEt // bedsitkamer/bedsprei/gebedsdag @@ -209,6 +223,7 @@ bowen bo@v@n' // bowenal/bowendien brand (o brant? // brandoefening/brandoffer/sonbrandolie brasi (li br%asI // BrasiliëBrisiliaan/-s/-e + brav (A br%av // stress and v sound: bravade/bravo _) byge (@P4 b'eIx2@ by (kom@ b%eI // bykomende/bykomstige @@ -253,20 +268,26 @@ besem be@s@m besering =b@se@r@N // besering/s/kniebesering... beter b'e@t@r + bibli (oC b@bl%i:% // biblioteek and compounds/biblioteke/bibliofiel/bibliografie... bidd b'Id // biddag/aanbidding - bid b'It_ // biduur/aanbid + bid bIt_ // biduur/aanbid binne bIn@ // binnekom/binnelandse bi (sar b%i // move default stress: bisar/-re bla (tant bl%a // shorten 1st a and move default stress: blatant/-e/-heid @) ble (_ _^_EN // words ending in ble is English bloe (ddors@ bl%u // bloeddorstig and derivitives, but bloeddors + bo (botie b%u // fix stress and 1st o sound: bobotie and compounds boeke (t b%ukE //move default stress and fix 2nd e sound: boeket and compounds boere bur@ // many compounds with boere + bo (haai b%u // fix stress and o sound: bohaai and compounds + bo (he b%u // fix stress: boheems/boheme bok (ooi bOk_ // bokooi/e/ribbokooi/boerbokooi buiten (ge b'Yyt@n // buitengewoon/s/buitengewone/buitengemeen + buiten (t bYyt@n // restore default stress: buitentoe/buitentyds buiten bYyt@n' // buitendien/buitensporig buite b'Yyt@ // buitelandse/buitestander/buitew�eld bybel beIb@l // to correct pronunc. of e in compounds + byder (C@ b%eId@r // byderhand/-s/byderwets by (voorb b%eI// move default stress @@ -310,6 +331,7 @@ &) denis d@n@s // geskiedenisboek/kultuurgeskiedenis/belydenis/beduidenis de (press d%i // depressie/depressief/depressiewe @) derd (_ d@rt // verouderd/afgesonderd/gevorderd + _) der (duiC d%&r // move default stress: derduisende/derduiwel @) dderd (_ d@rt // ontredderd, se rule: dd d _) derge d&rx2@ // dergelik/-e deur (dring@ d%y@r // move default stress: deurdringend/-e @@ -338,11 +360,14 @@ de (ba d@ // debat/-te/debakel deba (tteer d@b%a // move default stress to end: debatteer debuut d@b'yt // debuut/-bundel/-vertoning + dee (moedig d%e@ // move default stress: deemoedig/-e/-er/-ste/-heid/-ing desember de@s'Emb@r digers d@x2@rs departe (ment d@p%art@ deposito d@pOsitu // stress and vowel sounds: deposito and compounds detail d'i:teIl + di (ssi d@ // move default stress: dissipel/-s + dissi (pl d@s@ // fix stress: dissipline/-s and compounds distri (bu d@str@ // distribusie/distribueer and compounds dis (trik d@s // stress: distrik/-te and compounds _) dode d'o@d@ //dodelik dodemars etc. @@ -351,6 +376,7 @@ dominee (_ d'o@m@ni domin (A dOmin' // domineer/dominering @) d (C t // oudste/benoudste/goudstad/steeds/Sweeds + @) ds (_ ts // fix d sound of wrds ending in -ds: buitentyds, etc. p) d (C d // oopdwing/koopdwang ver) d (C d // verdwyn; see rule: @) d (C t @) dd d // beddens/bedding @@ -374,6 +400,7 @@ e (C E CAC) e (CC @ // fix e sound: nalatenskap/wapenstilstand CAC) e (C% E // beesfilette/nougesette/onderbesette/voortgesette + 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 @C) e (bo @ // compounds with boek/boer/boog/boom/bol/bord/borsel/bos/ grondbonebotter/kamdebo... @@ -382,6 +409,7 @@ sp) e (d @ // ekspedisie/gaspedaal/kwispedoor gev) e (gK & // fix e sound in compounds like buitegevegstelling/skietgevegte + ng) e (nd @ // fix e sound: dringends/dwingends/deurdringender @k) e (tt@+ E // menseketting/etikette sp) e (lonk @ // spelonk/rowerspelonk/spelonkagtig etc. _k) e (ndh =E // but bekendheid/onbekendheid @@ -409,12 +437,14 @@ Cy) e (CC @ // e sound in vryevalformasie/senulyersinrigting/vryerspaartjies C) ede (_ e@d@ // aandgebede/selftevrede C) edes (_ e@d@s // lofredes/hoofredes + 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. hal) e (rC@ @ // uithalerperd/-skut/-speler and similar C) e (ndh =@ //asemrowendheid/beduidendheid/doeltreffendheid/dringendheid/voortvarendheid... u) eel 'e@l // words ending in ueel take stress on last slb @) eer 'e@r // this string most often has stress + sf) eer e@r // sfeer at end of compounds does not take stress: atmosfeer, etc. w) eer e@r // stress may vary in words containing weer: lugafweer/donderweer u) eer 'e@r // aktueer/konstrueer/salueer, etc. effek %e@fEk // move default stress and fix e sound: effek/-te/-tief @@ -424,6 +454,7 @@ nk) e (lb @ // onwankelbaar/skenkelbeen/sprinkelbesproeiing u) ele (+ 'e@l@ // words ending in uele take stress on penultimate slb _) ere e@r@ // ereamp/erediens/ererol/erevoorsitter + ere (ksiA %e@rE // fix stress and e sounds: ereksie/ereksionele u) ering 'e@r@N // aktuering/konstruering, etc. C) ersyds @rseIts // fix d and e sounds: enersyds/wedersyds, etc. ele (gant ,e@l@ // elegant/onelegant @@ -452,6 +483,8 @@ ei eI ey eI eu Y@ + eu (forie %Y@ // move default stress: eufories/-e + eufo (rie_N %Y@f%u // stress to end: euforie euntjie Y@iNci // seuntjie/reuntjie eë e@ // e deelteken-e &) e (_ @ @@ -482,9 +515,11 @@ blind) e (ling @ ind) e (ling e@ nd) e (ling @ + uiw) e (l@ @ // duiwelskind/suiwelprodukte and similar compounds _) eike 'eIk@ // many compounds with eike &) e (lC_ @ @m) e (ld & // aanmeld/voormeld + Csp) e (ld & // fix e sound: borsspeld/haakspeld/doekspeld, etc. elagtig @l'ax2t@x2 // beuselagtig/e/heid/buffelagtig... ener (gi %En@r // energie/energiek/e ele (ment El@ // element/e/klankelement @@ -534,6 +569,7 @@ eenge 'e@nx2@ _) een (stemm %e@n // move default stress: eenstemmig/-e/-heid _) een (ton %e@n // move default stress: eentonig + een (Cjie e@:iN // eendjie/Leentjie/steentjies _) een (voud@ %e@n // stress on 2nd slb: eenvoudig, but on 1st: eenvoud eerbied (A e@rb'id // eerbiedig/ing eerbiedw %e@rb%itv // eerbiedwaardig/eerbiedwekkend @@ -542,6 +578,7 @@ edjie 'E:ici etjie ici &) elik (_S4 @l@k + &) elike (_S5 @l@k@ // to go with suffixes elik/elikheid &) elikheid (_S8 @l@keIt // vriendelikheid/duidelikheid epi (deC %Ep%i // epidemie/-s/-e/epidermies/epidermis @@ -565,13 +602,15 @@ _op) e (n @ C) ensie (_ 'Ensi // many words ending in stressed ensie(s) C) ensies 'Ensis // forensiese -C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaardig - @C) ent (_ 'Ent // orent/student/topstudent - @C) ent (e_ 'Ent // plurals of some of the above + C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaardig + @C) ent (_ 'Ent // orent/student/topstudent + @C) ent (e_ 'Ent // plurals of some of the above C) er (tyd @r // tegelykertyd/kindertyd/indertyd _) etens 'e@t@ns // etenstyd/klok/tafel/uur pann) e (C @ //pannekoek and friends pann) e (tjie i //fix pannetjie/spannetjie etc. + elaar @lA:r //wandelaar, twyfelaar etc. + oord) elaar e@lA:r //beoordelaar and oordelaar/friends C) ewel (A e@v@l // prewelend/wrewelig/newelig/beneweling d) e (mons E% r) e (digering E @@ -600,7 +639,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _mens) e @ //mense at start of compounds _mens) e (k @ //force correct behaviour before k @kom) e (ns_ @ //fix words ending in komens - suid) e @ //suidekant, suidewind etc. + suid) e @ //suidekant, suidewind etc. @C) e (wa_ @ // goederewa/kolewa/ossewa/troepewa Ab) e (wa @ //bewaking/bewaring in compounds polisiebewaking @C) e (waen @ // plurals and diminutives of some of the above @@ -608,7 +647,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar wild) e @ //wilde in compounds wild) e (kA @ //wilde in compounds with k wildekomkommer etc. - will) e (m @ //willem, willemse etc. + will) e (C @ //willem, willemse etc./willekeur pp) e (C@+ @ // flapperend/snippermandjie/dopperkerk/poppekas... &) e (nk_ E // but kersgeskenk/verjaardaggeskenk @ks) e (ms @ // bliksems and compounds @@ -621,11 +660,14 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar 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 + intell) e (k %E //intellek, and friends eval (u %iv%al // evaluasie/evalueer/evaluering + CAt) e (gn & //fix e in mikrotegnologie and others + + werk) e (rs @ //fix werkers in compounds werkershuis etc. + v) e (nno @ //vennoot and friends - werk) e (rs @ //fix werkers in compounds werkershuis etc. - v) e (nno @ //vennoot and friends .group f @@ -651,6 +693,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _) for (se_ f'Or // stress back to 1st slb; se rule: _) for (C foto fo@tu fo (togra fo@ // move default stress: fotograaf and similar + fru (str fr%W // move default stress: frustrerend/-e fung (e f%WNx2 // fungeer/fungerende/fungering fynge (C feInx2@ // fyngebreekte/-kou/-kap/-maalde // f (w | //silent f before w @@ -664,6 +707,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar //re-enable following rule to get [g@] at end of words C) ge (_ g@ gene (_ x2e@n@ // gene/diegene + gene (rA x2@n@ // generaal/generasie/-s/genereer genre Z'A~nr@ //genre and compounds gese (_ x2'e@s@ //Portugese, and others @@ -715,16 +759,18 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar ge (olo x2i //geoloog etc. ge (ome x2i //geometries etc. gesels x2@s'&ls - generaal x2@n@r'A:l _) gade x2A:d@ // gadeslaan/gadegeslaan garage g@r'A:dZ @) gge (_ x2@ // logge/stugge godde (lo x2%Od@ // move default stress: goddelose/goddeloos + gods (dienstig x2%Ots // move default stress: godsdienstig/-e/-es/-heid A) gogie (_ x2ux2'i // demagogie/pedagogie A) gogies x2'o@x2is // demagogies/-e/pedagogies/-e A) goog (_ x2'o@x2 // demagoog/pedagoog + gor (dyn x2%Or // move default stress: gordyn and compounds A) goë x2'u@ // demagoë/pedagoë gra (niet x2r%a // move default stress and fix a sound: graniet and compounds + _) gri (mA x2r@ // grimas/grimeer/-middel and other compounds/grimering guerrilla g@r'Ila .group h @@ -738,11 +784,17 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar hard (lo hart // restore default stress: hardloop/hardloper hard (ste hart // restore default stress: (ge)hardste/-s @) hartig h'art@x2 // barmhartig/lighartigheid/lighartig... + hartseer hartse@r // restore default stress: hartseer and compounds + hart (stogte_ h%art // move default stress: hartstogtelik + hart (stogte_N hart // restore default stress: hartstogte heiden heId@n // heidene/heidense/heidendom + hekse (C hEks@ // fix 2nd e sound in compounds starting with hekse: heksebrousel, etc. + _) hele (K he@l@ // hele/helend/heler heli (kop h%&l%i // move default stress: helikopter and compounds hemde hEmd@ // naghemde/onderhemde/frokkiehemde hemel he@m@l // hemelblou/hemelhoog and many compounds with hemel _) her (@P3 h%&r + her (berg h&r // restore default stress: herberg/-e herder h'&rd@r her (eK he@r // here/herehuis/heretjie her (eni h%&r? // fix e sound and stress: herenig @@ -757,7 +809,8 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar hip (noCA h%ip // hipnose/hipnoties/hipnotiseer hister (e hist@r // histerektomie hister (i hist'e@r // histerie/histeries - histor hist,o@r + histor h%isto@r + histri (on h%istr%i // 1st i sound and stress: histrionies/-e/histrionisme/-isties hitler hitl@r // Hitler in compounds like Hitlersnorretjie hoog (dra h%o@x2 // stress: hoogdrawend and derivitives hor (los h%Or // horlosie and compounds @@ -771,9 +824,13 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar iale (_ i'A:l@ // al normally stressed in words like bilabiale/koloniale, etc. iber (i@ %ibe@r // Liberië/Siberië/Liberiese/Siberiese/Iberiese ie i + h) i (dro i //hidro in compounds _) iese (C ,is@ // iesegrimmig and derivitives ieus i'Y@s // this ending always takes stress C) i (g @// figuur/figure/stoksielsaligalleenA + ps) i (gA i // i sound in words like psigiater/psigoloog, etc. + s) i (gC I // stress: sigverlies/opsigte + sw) i (g I // stress: (ge)swig i (tief @ i (tiew @ def) i (n @ @@ -784,6 +841,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _) idi (o %id%i // idioom/idiome/idioot _) id (A %id // idille/idillies illu (si %ily // illusie/-s/illusief + _) inder (C @nd@r // inderdaad/inderhaas/indertyd in (diens @n //indienstreding/indiensopleiding/indiensplasing in (een @n // ineengedoke/ineengekrimp/ineenstorting and many similar insi (dent @ns@ // insident/e/insidentjie @@ -855,9 +913,11 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar iër (@ i'e@r // kopiëring/subsidiërende AC) is (_ 'Is // aktivis/humanis/kommunis/pianis/solis/violis/kompromis en) is (K @s // stress: beduidenis/bekentenis/gevangenis, etc. + kris) is @s // fix stress: krisis and compounds pol) is (_ @s // polis and compounds ar) is (_ =@s // but sekretaris/argivaris/kommissaris litar) is 'Is // but militaris + vuil) is @s // stress: vuilis/tuinvuilis AC) iste (_ 'Ist@ // aktiviste/humaniste/kommuniste/pianiste/soliste/violiste @C) isties 'Istis // kommunisties/liberalisties/humanisties @) iseer is'e@r // analiseer/kategoriseer @@ -893,6 +953,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar j (j jakaranda j%ak%ar'anda //jakaranda and compounds + jaloe (sie j%al%u // stress: jaloesie/beroepsjaloesie januarie j'any,A:ri jeans _^_EN jeep _^_EN // English pronunciation @@ -918,6 +979,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar kabinet k%ab%inEt // kabinet/drankkabinet/kabinetsvergadering kade (t k%adE // shorten 1st a and move default stress: kadet and compounds kake (C kA:k@ // kakebeen/skakelaar/skakelbord/skakelfunksie + kalahari kalah'A:ri // stress: Kalahari/-sand/-woestyn ka (lAnC k%a // kalender and compounds/kalant/kalander and compounds kali (b k%ali // kaliber/kalibrasie/kalibreer kalmeer kalm'e@r // kalmeer/gekalmeer @@ -961,15 +1023,16 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar karakter kar'akt@r _er) ken kEn // E sound in erkEn ken (merken k%En + @) keurig k'Y@r@x2 // kieskeurig/noukeurig/(on)willekeurig and derivitives _) ki (ta k%i // move default stress: kitaar and compounds klere kl'e@r@ kklere =kl'e@r@ knip (A knIp? // knipogie/geknipoog/ - kollega kul'e@x2a //kollega and compounds ko (kon k%u // fix 1st o sound and move default stress: kokon and compounds kommando k%umandu // move stress, fix o sounds: kommando and compounds ko (pie@ k%u // kopiereg/kopie koe (rA k%u // koerier/koerasie/koerant and compounds + kort (stond k%Ort // move default stress: kortstondig/-e/-heid koever (t k%uf&r // koevert/-e/-jie and compounds kollege k'OlidZ // kollege/onderwyskollege kolleges (_ k'OlidZ@s // kolleges/onderwyskolleges @@ -977,6 +1040,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _) kollek kul'Ek // kollekte/kollektebord/kolleksie kollekteer kulEkt'e@r // kollekteer/gekollekteer koeël kul + kollega k%ule@x2%a // kollega/-s and compounds kolonel kOl@n'&l ko (loni k%u // kolonie/-s/kolonialisme/koloniseer kolo (ssa k,Olu // move default stress: kolossaal/kolossale @@ -996,6 +1060,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar konsist k%Ons@st // konsistorie and compounds/konsistensie konsul (A k%Ons%Wl // konsulaat/konsulate/konsulêr kon (sul kOn // restore default stress: konsul and compounds + _) kop (on kOp? // fix o sound: koponder/koponderstebo _) kor (dA k%Or // kordaat/kordon korpo (raal k%Orp@ // move default stress: korporaal/-s/-strepe/onderkorporaal koö k%o@O // koördinasie/koöpsie, etc. @@ -1017,6 +1082,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar .group l l l l (l + laborator l%ab@-r%at'o@r //laboratorium and compounds _) la (kon l%a // lakoniek/lakonies/lakonisme _) lang (d l%aN // langdradig/langdurig and their derivitivs _) lapel l%ap'&l //lapelwapen etc. @@ -1045,7 +1111,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar &) likes (_S5 l@k@s &) liker (_S5 l@k@r &) likste (_S6 l@kst@ - liter (A l@t@r //literatuur and others, but literbottel + liter (A l@t@r //literatuur and others, but literbottel linker lINk@r // blinkertjies/many compounds with linker and klinker @) ll (_N _^_EN // Words ending in -ll are English @@ -1057,13 +1123,16 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar lering (_ l'e@r@N //isolering distilering correct @ to e@ and force stress lokomo ,lukumu' //lokomotief and friends lug (A lWx2? // lugaanval/lugafweer/lugopname + luid (rugt l%Yyd // move default stress: luidrugtig/-e/-heid luite (nant l%Yyt@ // fix e sound and move default stress: luitenant and compounds + lusern l%us&:r@n // fix stress and vowel sounds: lusern and many compounds @) lusti (g l'Wst@ // move default stress: strydlustig/lewenslustig and many similar .group m m m m (m + _) made (l m%A:d@ // move default stress: madeliefie/-s 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 @@ -1186,9 +1255,9 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _) na (C_ n'a //three-letter words starting with na na ( n%a_ // naef/naewe/nawiteit nami (bi n%amI // Namibië/Namibiese - na (tal ,na' //natal and compounds + na (tal ,na' //natal and compunds _) n (AA n // for words starting with naa, etc. - namakwa n%amakw%a //namakwa and compounds + namakwa n%amakw%a //namakwa and compounds nasio naSiu _) nag (C n'ax2 _) nag (raad n'A:x2 //nagraads and compounds @@ -1209,7 +1278,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar nazi nA:tsi // Nazi and compounds neu (tr n%Y@ // move default stress: neutraal/neutrale - + ni (ggie nI // niggie/-tjie/-s/kleinniggie... &) ning (_S4 n@N nning n@N // prevent nn in words like orwinning, see: &) ning (_S4 n@N _) nage (@P4 n'A:x2@ @@ -1224,7 +1293,6 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar normaal nOrm'A:l // normaal/normaalweg/abnormaal nostal (gie_N n%Ost%al // stress on last slb.: nostalgie no (stalgie n%O // stress on 2nd slb.: nostalgies - nou (keu n%@U // noukeurig/-e/-heid/onnoukeurig no (velle n%u // move default stress and fix o sound november no@f'Emb@r // fix 1st e sound and stress: November and compounds ntere (ss nt;r@' // interessant/interesseer/geïnteresseerd @@ -1239,7 +1307,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar o (CA o@ mikr) o u // mikrogolf/mikroskakelaar/mikrorekenaar o (terap u // psigo-/fisioterapeut - ob (sku %Op // obskuur/obskure/obskuriteit + _) ob (s %Op // obskuur/obskure/obskuriteit/obsessie/obseen oefen uf@n// oefenbroekie/oefeningboek/liggaamsoefeninge C) ogig _o@x2@x2 // bruinogig/grootogig/skuinsogig C) oetel ut@l // troeteldier/-naam/vertroeteling/vroetelend/boeteling @@ -1255,6 +1323,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar C) o (CAA %u b) o (CAA o@ //fix o in bobeen, bobaas etc. C) o (Cy %u + b) o (lyC o@ // bolyf/bolywe; exception to rule: C) o (Cy %u C) o (Ciee %o@ // assosieer/harmonieer/folieer fil) o (@ u% oo o@ @@ -1274,8 +1343,8 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar ondjie OINci ontjie OINci ontering %Onte@r@N //ontering in compounds montering etc. - onvoor (s %Onf%o@r //stress: onvoorsiens, onvoorstelbaar etc. - onvoor (w %Onf%o@r //stress: onvoorwaardelik etc. + onvoor (s %Onf%o@r //stress: onvoorsiens, onvoorstelbaar etc. + onvoor (w %Onf%o@r //stress: onvoorwaardelik etc. offi (sier %Of@ // move default stress: offisier and compounds ograaf ux2r'A:f // biograaf/demograaf/fotograaf ografie ux2raf'i // biografie/demografie/fotografie @@ -1332,12 +1401,13 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar onheil Onh%eIl // stress: onheil/e/onheilbringer onheil (ig %Onh'eIl // stress: onheilig/e onheil (spel %Onh%eIl // stress: onheilspellend/e - onreg 'Onr&x2 // stress: onreg/te + onreg (K Onr&x2 // stress: onreg/te/onregmatig on (regv+ %On // stress: onregverdig/e/heid on (skuld_N 'On // restore default stress: onskuld _) ont (@P3 %Ont ont (d@ %On // remove t sound: ontdaan/belastingontduiking/ontdooi onteenseg Onte@ns'&x2 // onteenseglik/e + _) ontel %Ont&l // ontelbaar/ontelbare/ontelbaarheid on (toe %On // ontoereikend/heid on (tyd %On // ontydig and derivitives _) on (wAs 'On // onwis/onwys @@ -1356,17 +1426,19 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar onder (duim %On@r // exception to default stress rule onder (hor %On@r // exception to default stress rule: onder (rig %On@r // exception to default stress rule + onder (soeken %On@r // move default stress: ondersoekend/-e onder (skA %On@r // exception to default stress rule + onderstebo %On@rst@bo@ // fix stress: onderstebo/koponderstebo onder (steu %On@r // exception to default stress rule: ondersteun/-ing/-ers onder (vin %On@r // exception to default stress rule: ondervind/ondervinding _) onderge (@P7 'On@rx2@ ontevrede Ont@fr'e@d@ - oombliklik o@mbl'Ikl@k // stress: oombliklik/e oorbluf o@rbl'Wf // stress: oorbluf/te oor (blyw %o@r // move default stress: oorblywend/-e oorbodig o@rb'o@d@x2 // stress: oorbodig/-e/-heid + _) oor (dag %o@r // move default stress: oordag/-te oordrewe o@rdr'e@v@ // stress: oordrewe/oordrewenheid oor (dink %o@r // move default stress oor (doen %o@r // move default stress @@ -1391,7 +1463,8 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar opgee (+ 'Opx2e@ // see rule: _) opge (@P4 Opx2@ _) opge (@P4 'Opx2@ // stress on 1st slb &C) op (ig 'o@p // wanhopig/voorlopige - opper Op@r // oppergesag/wese/vlak/man + opper Op@r // oppergesag/wese/vlak/man + opsetlik %OpsEtl@k // move default stress: opsetlik/-e/-heid optel Opt&l _) op (@P2 'Op // opeet/opeis/optredes/opoffering open o@p@n // open/opening/e/s @@ -1399,12 +1472,14 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar oper (A %o@p@r // operasie/operateur/opereer opera (_ 'o@p@ra // stress: opera/operas opinie o@p'ini // opinie/-s + op (nuut %Op // move default stress: opnuut op (offer Op // fix o sound: selfopperende, etc. oppon (A %Op@n // opponent/opponeer op (roerig %Op // oproerig/-e/-heid, but oproer op (sienb %Op // opsienbare/opsienbarend opti (mA %Opt%i // optimis/-me/-te/-ties/optimaal op (winde %Op // move default stress: opwindend and derivitives + _) or (ga %Or // move default stress: orgaan/organe organisasie Orx2anis'A:si @) oties 'o@tis // antibioties/eksoties/eroties/neuroties ower (@ o@v@r // lowergroen/betowerend/dowerig/compounds of owerheid @@ -1425,6 +1500,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar pakistan p%ak%istan //first a and stress pakke (t p%akE // pakket/-te and compounds panga paNga // fix g sound: panga/-s + _) pan (to p%an // move default stress: pantoffel and compounds/pantoen papaja pap'AIa //papaja and compounds pam (C p%am // move default stress: pamflet/pampoen/pampoentjies and compounds pam (pa pam // restore default stress: pampas and compounds @@ -1434,7 +1510,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar pa (pier p%a // papier and compounds parle (ment p%arl@ // move default stress and fix e sound: parlement and compounds, eg. pa (tat p@ // patat/warmpatat/wurgpatat - patie (_ p%at'i //words ending in patie has stress at end + a sound + patie (K p%at'i //words ending in patie has stress at end + a sound/simpatiek 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 @@ -1489,16 +1565,15 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar posisie puz'isi predi (kant pr%e@d@ // predikant and compounds prinse (s pr@nsE // prinses/-se|-sie/-s - privaat prif'A:t + priv (a@ pr%if // privaat/private pro (blA pr%u // probleem/probleme profesie prOf@s'i // fix vowel sounds and move stress pro (CA pr%u // probeer/produk/proses/professie/provinsie - prokie pro@k%i //sprokie and compounds + prokie pro@k%i //sprokie and compounds prosa pr'o@sa //prosa and compounds proses (_ prus'Es //proses at end of word projek pruj'Ek - proku (rA pr%Ok%y // prokureur and compounds/prokurasie prominen prOmin'En // prominent/e/prominensie propag ,prOpax2 @@ -1551,6 +1626,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar reg (ist r@x2 // registrasie/-nommer/register/bevolkingsregister regverdig r&x2f'&rd@x2 // regverdig/onregverdige/regverdigheid - verwyder uit af_list re (kru r@ // move stress from 1st slb + _) re (la r@ // relaas/relase/relasie and compounds rele (van r@l@ // relevansie/relevant and derivitives re (nA r@ // move stress from 1st slb.: renoster repu (t r%Epy // move stress from 1st slb @@ -1571,6 +1647,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar ribbe (tj r'Ibi ritu (A r@t%y // ritueel/rituele/ritualisties _) rol (A rOl? // oprolaksie/roloorvleueling + roetine r%utin@ // stress: roetine/-basis/-besoek/-kontrole... _) roode r'o@d@ //roodepoort and other names roman rum'an @@ -1596,6 +1673,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _) ri (g rI // stress on 1st slb.: rigting/-loos/-vas, etc. rond (r rOnt // grondreuk/grondrel/rondreis/-rol/-ry rugby r'Wgbi + ru (moer r%W // fix stress and u sound: rumoer/-ig/-heid &) rele (_ r'e@l@ rondom rOnt_%Om // rondom/rondomheen/rondomstaner rolprent rOlprEnt // rolprent/rolprentvertoning and other compounds @@ -1614,7 +1692,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar sjokolade SOk@l'A:d@ // sjokolade and compounds s (japie s // dorpsjapie/plaasjapie/stadsjapie @) sj (aar sj // diensjaar/lewensjaar/begrotingsjaar - @) sj (are sj // apartheidsjare/oesjare + @) sj (aCA sj // apartheidsjare/oesjare/beroepsjaloesie sigare (t s@x2%arE // fix vowel sounds and move default stress sig (a@ s@x2 // sigaar/sigare/sigaardosie siklu (s siklW // siklus and many compounds @@ -1630,7 +1708,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar salon salOn // eetsalon/haarkappersalon _) 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 + samen (+ sA:m@n // gesamentlik/-e sa (tir s%a // move default stress: satire/satiries/-e _) sede se@d@ // sede/-s|-preek seker se@k@r // versekering/sekerheid/onsekerheid/sekere @@ -1665,10 +1743,12 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar sker (muts sk%&r // move default stress: (ge)skermutsel/skermutseling/-e sko (lier sk%o@ // move default stress: skolier/-e _) 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 _) 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 so (lie s%O // stress and o sound: solied/-e so (lid s%O // konsolidasie/solidariteit @@ -1714,13 +1794,15 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar spesialis (A spESialis spesialis spESal'Is spesi (f sp%Es%I // spesifiek/spesifiseer - @) spre (kend spr'e@ // stress: vanselfsprekend + @) spre (ken spr'e@ // stress: vanselfsprekend stan (da st%an // standaard/-e/standardisering standerd (@ st%and@rt // compounds starting with standerd staties st'A:tis steding ste@d@N // besteding and compounds wor) stel st@l //worstel e sound in compounds @) stel (iC st@l // eersteling/gunsteling/wellusteling/worsteling/eerstelig and compounds + @) ste (llen st'& // belangstellendes/gerusstellend/regstellende/teleurstellend + teen) ste (llen st& // restore default stress: teenstellend @) stelik st@l@k // oostelik/christelik/beestelik ste (l st& apo) stel st@l // apostel and compounds @@ -1754,6 +1836,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar struikel str'Yyk@l // struikelblok/struikelaar/struikelend stu (deer st%y // move default stress 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. sukses s%WksEs // sukses/suksesse/suksesvol/reusesukses su (mmier s%W // move default stress: sumier/-e @@ -1767,52 +1850,17 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar t (t t (_dN // final t, and next word starts with d A) tch _^_EN // clutch/pitch/bitch + tabak tab'ak; @) talig t'A:l@x2 // Anderstalig/tweetalig _) ta (ma t%a // tamatie and compounds _) ta (mb t%a // tamboer and compounds/tambotie and compounds + _) tande (C@ t''and@ // fix e sound: tandebeker/-pasta/-poeier/-trekker _) tant (e tA~nt // nasalise taverne t%af&rn@ // fix stress and 1st e sound: taverne and compounds - te (_ t@ //fix ligte, berigte and others - te (aa t@ // beroerteaanval/geboorteaanwas/lenteaand... - _) tekere t@ke@r@ // move default stress and correct e sounds - tele (C t%&l@ // telefoneer/telekommunikasie, etc. - @C) te (nk t& ++ //tenk and friends - @C) te (C t@ /// - @C) te (lbord t& // krieket-/tennistelbord, etc. - @C) te (k_ t& // tydsbestek/uitstek - ap) teke te@k@ // apteke/apteker and compounds - te (oC t%i% // teologie/-loog/-logies/teorie/teoreties + @C) t (eny t // to enable rule: @C) eny (_ @n'eI - tempera ,tEmp@-r%a //temperatuur, temperament etc. - teks (+ tEks // compounds with teks adver) t (e t' // advertensie/afdeling/agent t (ema++ t // compounds with tema - tent (_ tEnt //suurstoftent and others - te (oo t@ // geboorteoorskot/kosteoorweging/siekteoorsaak/terroristeoorlog - _) teraarde t%&r?A:rd@ // move default stress and fix e sounds: teraardebestelling/-s - n) terie t@r'i // galanterie/infanterie and compounds - _) tering te@r@N // tering and compounds - tesou (rie t%Es%u //tesourie and compounds - moles) tering te@r@N // molestering/kindermolestering - _) ter (l t@r // move default stress: terloops/-e - @) term (_ t&r@ // correct pronunciation of e - @) terme (_ t&rm@ // correct pronunciation of 1st e - tern (K t'&:r@-n //lantern ekstern etc. - tern (e_ t'&rn // interne/eksterne - _) ter (nA t@r // terneergedruk/ternouernood - te (rrA t@ // terras/terrein/terreur 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 - tesi (s te@s@ // tesis/-se and compounds - A) teur t'Y@r // outeur/ouditeur/operateur - k) teur t'Y@r // akteur/inspekteur - tabak tab'ak; - teen (stryd t%e@n // move default stress: teenstrydig/-e/-heid - teen (woor t%e@n // teenwoordig/heid/verteenwoordiging - _) te (we t@ // move default stress and fix 1st e sound: teweeg/tewerkstelling - _) tewens te@v@ns // fix both e sounds - tevore t@f'o@r@ // tevore/vantevore tia (_ Sja @) tief (_ t'if // alternatief/aktief/instinktief/(ak)kumulatief @@ -1823,31 +1871,104 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar _) tj (ie tS ui) tj tj // uitjaag/uitjou/uitjubel ui) tjie ci // beskuitjie/fluitjie/ruitjie/uitjie, etc. - @) teken te@k@n - teken (A te@k@n // compounds of betekenis/tekening - tekor t@k'Or // deelteken/koppelteken/litteken/handtekening/ondertekende _) th (@@ t _) th _^_EN // if only one vowel character @) th (_N _^_EN + + @) tion (_ _^_EN //words ending in tion is English + @) tions (_ _^_EN //words ending in tions is English + toegank t%ux2'aNk // toeganklik/heid + toenemen tun'e@m@n //toenemend/e/er + toereike t%ureIk@ // toereikend/heid + toereken (b t%ur'e@k@n // ontoerekenbaar/heid/ontoerekenbaarheid + toneel t%une@l + toege (wing t'ux2e@ // exception to _) toege (@P5 tux2@ + _) toege (@P5 t'ux2@ + + toer (@ t%ur // move default stress: toeris/-te/compounds of toernooi + toere tu:r@ // restore default stress + toe (vallig t%u // exception to default stress rule + toi (let t%OI // move default stress: toilet and compounds + tra (dis tr%a// shorten and unstress 1st slb: tradisie/tradisioneel + trag (ed tr%ax2 // move default stress: tragedie and compounds + traw (a trav' // trawant/e/trawal + &) treding tre@d@N // betreding/uittreding + @) treer tr'e@r // this slb always takes stress; many words + + trek tr&k + trekker tr&k@r // voortrekkerleier/Voortrekkerstraat/salaristrekkersvergadering + @) trise (_ tr'is@ // aktrise and similar + tro (tseer tr%O // stress: trotseer/getrotseer + tro (tsering tr%O // move default stress + ttel t@l // many compounds of bottel/skottelgoed + tuimel tYym@l // tuimelend/tuimelaar/tuimelraam and compounds + tuin (ier t%Yyn // move default stress: tuinier and compounds + tussen tWs@n // tussenin/tussenbeide/tussenganger + tuur t'yr + @) ty (dig t'eI // gelyktydig/vroegtydig + + +.group te + te (_ t@ //fix ligte, berigte and others + 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 + @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. + @C) te (nk t& ++ //tenk and friends + @C) te (C t@ /// + @C) te (lbord t& // krieket-/tennistelbord, etc. + @C) te (k_ t& // tydsbestek/uitstek + ap) teke te@k@ // apteke/apteker and compounds + te (oC t%i% // teologie/-loog/-logies/teorie/teoreties + tempera ,tEmp@-r%a //temperatuur, temperament etc. + teks (+ tEks // compounds with teks + tent (_ tEnt //suurstoftent and others + te (oo t@ // geboorteoorskot/kosteoorweging/siekteoorsaak/terroristeoorlog + _) teraarde t%&r?A:rd@ // move default stress and fix e sounds: teraardebestelling/-s + n) terie t@r'i // galanterie/infanterie and compounds + _) tering te@r@N // tering and compounds + tesou (rie t%Es%u //tesourie and compounds + moles) tering te@r@N // molestering/kindermolestering + _) ter (l t@r // move default stress: terloops/-e + @) term (_ t&r@ // correct pronunciation of e + @) terme (_ t&rm@ // correct pronunciation of 1st e + tern (K t'&:r@-n //lantern ekstern etc. + tern (e_ t'&rn // interne/eksterne + _) ter (nA t@r // terneergedruk/ternouernood + te (rrA t@ // terras/terrein/terreur 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 + tesi (s te@s@ // tesis/-se and compounds + A) teur t'Y@r // outeur/ouditeur/operateur + k) teur t'Y@r // akteur/inspekteur + teen (stryd t%e@n // move default stress: teenstrydig/-e/-heid + teen (woor t%e@n // teenwoordig/heid/verteenwoordiging + _) te (we t@ // move default stress and fix 1st e sound: teweeg/tewerkstelling + _) tewens te@v@ns // fix both e sounds + tevore t@f'o@r@ // tevore/vantevore + + @) teken te@k@n + teken (A te@k@n // compounds of betekenis/tekening + tekor t@k'Or // deelteken/koppelteken/litteken/handtekening/ondertekende tenaar t@nA:r tes (_ t@s &) tel (_S3 t@l - ttel t@l // many compounds of bottel/skottelgoed teleur t@lY@r // teleur/teleurstelling/teleurgesteld &) tels (_S4 t@ls - sleu) tel t@l //sleutel in compounds + sleu) tel t@l //sleutel in compounds tel t&l teltjie t@lki @) tel (o t@l // hartelose/besluiteloos/gedagtelose - wa) tert t@rt + wa) tert t@rt &) tert t&rt &) tertjie t@rki @) ter (tyd t@r // mettertyd/pinkstertyd/toentertyd - _) toege (@P5 t'ux2@ - _) tege (CA t@x2@ // tegemoet/tegemoetkom/tegemoetkomende/tegemoetgekom/tegelyk _) terug (@P5 t@-r'Wx2 _) terugge (@P7 t@-r'Wx2@ @@ -1859,55 +1980,29 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar tera (pA tEra' // terapie/terapeutterapeuties _) tereg t@r&x2 // teregwysing/teregstelling/tereghelp/tereg _) tever (@ t@f@r - tevrede t@fr'e@d@ - as) terende (_ t'e@r@nd@ //kontrasterende - ek) terende (_ t'e@r@nd@ //reflekterende respekterende - - n) terende (_ t'e@r@nd@ //konfronterende mensonterende - pe) terende (_ t'e@r@nd@ //kompeterende - i) terende (_ t'e@r@nd@ //presipiterende moniterende - ul) terende (_ t'e@r@nd@ //konsulterende resulterende - ver) terende (_ t'e@r@nd@ //verterende in compounds - - @) tion (_ _^_EN //words ending in tion is English - @) tions (_ _^_EN //words ending in tions is English - toegank t%ux2'aNk // toeganklik/heid - toenemen tun'e@m@n //toenemend/e/er - toereike t%ureIk@ // toereikend/heid - toereken (b t%ur'e@k@n // ontoerekenbaar/heid/ontoerekenbaarheid - toneel t%une@l - toege (wing t'ux2e@ // exception to _) toege (@P5 tux2@ - toer (@ t%ur // move default stress: toeris/-te/compounds of toernooi - toere tu:r@ // restore default stress - toe (vallig t%u // exception to default stress rule - tra (dis tr%a// shorten and unstress 1st slb: tradisie/tradisioneel - trag (ed tr%ax2 // move default stress: tragedie and compounds - traw (a trav' // trawant/e/trawal - &) treding tre@d@N // betreding/uittreding - @) treer tr'e@r // this slb always takes stress; many words - - trek tr&k - trekker tr&k@r // voortrekkerleier/Voortrekkerstraat/salaristrekkersvergadering - @) trise (_ tr'is@ // aktrise and similar - tro (tseer tr%O // stress: trotseer/getrotseer - tro (tsering tr%O // move default stress - tuimel tYym@l // tuimelend/tuimelaar/tuimelraam and compounds - tussen tWs@n // tussenin/tussenbeide/tussenganger - tuur t'yr - @) ty (dig t'eI // gelyktydig/vroegtydig + tevrede t@fr'e@d@ + as) terende (_ t'e@r@nd@ //kontrasterende + ek) terende (_ t'e@r@nd@ //reflekterende respekterende + n) terende (_ t'e@r@nd@ //konfronterende mensonterende + pe) terende (_ t'e@r@nd@ //kompeterende + i) terende (_ t'e@r@nd@ //presipiterende moniterende + ul) terende (_ t'e@r@nd@ //konsulterende resulterende + ver) terende (_ t'e@r@nd@ //verterende in compounds .group u + u y u (C W u (CA y uu y ui Yy - uiwe Yyv@ //druiwesap and many others + uiwe Yyv@ //druiwesap and many others uie (C Yy@ // graansuierdiens/kruiersloon/kuiergas/luierbroekie/sluierdoek/suierklep/getuienis uy Yy uit (bund %Yyt // move default stress: uitbundig and derivitives + uit (dagen %Yy // move default stress: uitdagend/-e uit (druk %Yyt // move default stress uit (druk_N Yyt uit (drukking_ Yyt // but default stress: @@ -1938,9 +2033,12 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar v (v @) vaardig f'A:rd@x2 // diensvaardig/hulpvaardig/onboetvaardig/strydvaardig uit) vaardig fA:rd@x2 // but uitvaardig + vagina vax2ina // fix v sound and shorten a sound: vagina/-s + vagin (A@ v%ax2%in // move default stress: vaginale and similar vakansie f@k'ansi + _) 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 - van (pas f%an // fix stress: onvanpas/-te @) 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 @@ -2018,6 +2116,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar voort (v@@ f%o@rt // voortvarend/voortvlugtige _) vooruit fo@r'Yyt // vooruit/vooruitsig/vooruitbeplanning vooruit (strew fo@rYyt' // change stress + voorwaard (_ f%o@rvA:rd // stress: (on)voorwaardelik vorm fOr@m vreemde fr'e@md@ // vreemde/s/vreemdeling vriendi (n frind'I // vriendin/vriendinne/vriendinnetjies @@ -2042,6 +2141,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar 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... + @) 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 w (ese_ v //words ending in wese @@ -2081,6 +2181,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar @) wesigheid v'e@s@x2eIt // aanwesigheid/afwesigheid weten (C ve@t@n // wetenskap/-lik/-e and compounds/compounds of geweten- wêrel (d v'&:r@l + wh _^_EN // words containing wh are English wiking vikiN // fix i sounds wn _^_EN // names containing town/Brackendowns/Brown @@ -2089,6 +2190,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar @) ws (_N _^_EN @) w (_N _^_EN @) werste vIrst@ + woe (styn v%u // move default stress: woestyn and compounds wolke vOlk@ // nimbuswolke/wolkekrabber woorde vo@rd@ @@ -2107,14 +2209,14 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar .group - êre (_ '&&:r@ // hulle always take stress - - ə @ // char.replacement for 'n _C) è (_ E // dè/nè ê e: ê (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 ïgnoreer ix2nur'e@r // geïgnoreer @@ -2123,7 +2225,7 @@ C) ensie (_ @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar ïsol %is%ul // geïsoleer/-d ô O: ûe W@ // brûe/rû - + // punctuation ! _:eItrup_: !) ! diff --git a/dictsource/de_list b/dictsource/de_list index 93b1d9da..854ede6d 100644 --- a/dictsource/de_list +++ b/dictsource/de_list @@ -5,15 +5,51 @@ // 1. Change ['i:] to [=I@] at end of word -// Letters -//======== +// Characters +//=========== // 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. +// Include a _ before a character if it's name should only be +// spoken when "speak punctuation" option is on. + _. pUnkt _, kOma +€ OY*o: +£ paUnd +% p@-*o:ts'Ent +& Unt +@ kl'ame:*,af@ +# nUm3 ++ plUs += glaIC +~ tIld@ +\ bEkslES + +_| paIp +_: d'Op@lp,UNkt +_; St@-*'ICpUNkt +__ ,Unt3St@-*'IC +_- b'IndEst@-*,IC +_! 'aUs_|@-*,u:fe:ts,aIC@n +_? f@-*'Age:ts,aIC@n +_' 'apOst@-*,Of +_" 'anf,y:*UNsts,aIC@n +_/ S@-*'Egst@-*IC +_( kl'am3||_|'aUf +_) kl'am3||ts'u: +_{ g@Sv'aIft@kl'am3||_|'aUf +_} g@Sv'aIft@kl'am3||ts'u: +_[ 'EkIg@kl'am3||_|'aUf +_] 'ECIg@kl'am3||ts'u: +_< klaIn3 +_> g@-*Ws3 +_` g@-*A:v +_^ sI*kUmflEks +_— g@d'ank@nSt@-*,IC + // Numbers //======== diff --git a/dictsource/de_rules b/dictsource/de_rules index fbb014b4..01d85638 100644 --- a/dictsource/de_rules +++ b/dictsource/de_rules @@ -1079,13 +1079,22 @@ é e: ée 'e: é (_ 'e: + æ E + ø W + ç s + č tS + š S + ž Z + , (D kOma - / slaS - % p@-*o:ts'Ent - $ dOl@ - € OY*o: - £ paUnd + $ dOl'A: . pUnkt . (. _: \.) . + + * StE*n + *) * (* + ** + **) * (_ _:: + diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 390cf355..a9e16284 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -159,8 +159,8 @@ o: u u: y Y y: Y: : b c C d dZ f g h j J k l m n N -n^ p R s S s2 t tS -ts v z Z +n^ p R R2 s S s2 t +tS ts v z Z Dictionary it_dict diff --git a/dictsource/en_list b/dictsource/en_list index c761eafe..c8847247 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -960,6 +960,7 @@ holster hoUlst3 holy hoUlI2 homepage hoUmpeIdZ hominem h0mInEm +hopi hoUpi: horizontal $3 hospitable h0sp'It@b@L hostage h0stIdZ diff --git a/dictsource/en_rules b/dictsource/en_rules index 0ab3a572..6a995510 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -563,7 +563,7 @@ f) all (a al f) all (ib al _C) all (ow al - h) all (w O:l + h) all (C O:l sm) all O:l st) all O:l t) all O:l @@ -4227,8 +4227,9 @@ _) re (dC rE _) re (dr r%i: _) re (eduP2 r%i: - _) re (eqP2 r%i: + _) re (emP2 r%i: _) re (enP2 r%i: + _) re (eqP2 r%i: _) re (exP2 r%i: referend rEf@r'End re (fug rE diff --git a/dictsource/fr_list b/dictsource/fr_list index f3b08b74..94960bee 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -179,7 +179,7 @@ mbrola Em'bRola mlle mad@mwaz'El mme mad'am mr m@sj'Y -p.s pOstkRipt'Om +p.s pOftkRipt'Om ratp 'ER:'a:t'e:p'e s.t.p s'il:t'@:pl'E s.v.p s'il:v'u:pl'E @@ -318,7 +318,8 @@ où $pause // auxillary verbs (be, have, can, etc) suis $u+ $verb -est E $u+ +est Et2 $u+ +d'est d'Est sommes $u+ êtes $u+ sont $u+ @@ -356,8 +357,13 @@ y i:gR'Ek $atend scient si bénéficient benefisi $verb -président pRezidA~t2 +président pRezid'A~ président pRezidt2 $verb +résident Rezid'A~ +résident Rezidt2 $verb +évident evid'A~ +évident evidt2 $verb +couvent k'uvt2 $verb // MAIN WORD DICTIONARY @@ -387,6 +393,20 @@ fils fis mars maRs pays pEi pourcent puRs'A~ +absent abs'A~ +ardent ard'A~ +prudent pRyd'A~ +imprudent E~pRyd'A~ +discident disid'A~ +accident aksid'A~ +occident Oksid'A~ +l'occident lOksid'A~ +orient Orj'A~ +l'orient lOrj'A~ +secret sYkR'E +secrets sYkR'E + + sens sA~s c'est sEt2 $u qu'à ka diff --git a/dictsource/hu_rules b/dictsource/hu_rules index 246fd6d8..f13aaab5 100644 --- a/dictsource/hu_rules +++ b/dictsource/hu_rules @@ -200,6 +200,7 @@ szamue) ly lli A) r (A R C) r (A R r (C R + r (ó_ R2 rr RR _) richa (rd RiCa: diff --git a/dictsource/pt_list b/dictsource/pt_list index d97594fe..03f190ad 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -515,21 +515,21 @@ _é ,e&g'udU a a $atend e E $atend // assume letter-e at end of sentence o O $atend -à ,agR'avi $atend -é ,e||&g'udU $atend +à a $atend +é E $atend -á ,a||&g'udU -â ,a||sirkuNfl'EksU -ã ,atS'iU -ç s,esed'elj& -è ,egR'avi -ê ,e||sirkuNfl'EksU -í ,i&g'udU -ó ,o&g'udU -ô ,o||sirkuNfl'EksU -õ ,otS'iU -ú ,u&g'udU -ü ,utR'em& +_á ,a||&g'udU +_â ,a||sirkuNfl'EksU +_ã ,atS'iU +_ç s,esed'elj& +_è ,egR'avi +_ê ,e||sirkuNfl'EksU +_í ,i&g'udU +_ó ,o&g'udU +_ô ,o||sirkuNfl'EksU +_õ ,otS'iU +_ú ,u&g'udU +_ü ,utR'em& // some common adjectives and adverbs diff --git a/phsource/n/na b/phsource/n/na index 0ee44ef6..fa24b78e 100644 Binary files a/phsource/n/na and b/phsource/n/na differ diff --git a/phsource/n/ne b/phsource/n/ne index 21d9d98d..86500b48 100644 Binary files a/phsource/n/ne and b/phsource/n/ne differ diff --git a/phsource/n/ni b/phsource/n/ni index dbecc6ff..561b331f 100644 Binary files a/phsource/n/ni and b/phsource/n/ni differ diff --git a/phsource/n/no b/phsource/n/no index 9a027754..68e3c39d 100644 Binary files a/phsource/n/no and b/phsource/n/no differ diff --git a/phsource/n/nu b/phsource/n/nu index b32d6dd8..f52d3f13 100644 Binary files a/phsource/n/nu and b/phsource/n/nu differ diff --git a/phsource/ph_english b/phsource/ph_english index e4acf646..92805c63 100644 --- a/phsource/ph_english +++ b/phsource/ph_english @@ -175,7 +175,7 @@ endphoneme phoneme U - vowel starttype (u) endtype (u) + vowel starttype (o) endtype (o) length 150 formants vowel/uu endphoneme diff --git a/phsource/ph_english_n b/phsource/ph_english_n index 187e7a21..b8a8e357 100644 --- a/phsource/ph_english_n +++ b/phsource/ph_english_n @@ -54,7 +54,7 @@ endphoneme phoneme U - vowel starttype (u) endtype (u) + vowel starttype (o) endtype (o) length 150 formants vowel/u endphoneme diff --git a/phsource/ph_english_rp b/phsource/ph_english_rp index c0794c78..25c5873c 100644 --- a/phsource/ph_english_rp +++ b/phsource/ph_english_rp @@ -99,7 +99,7 @@ endphoneme phoneme U - vowel starttype (u) endtype (u) + vowel starttype (o) endtype (o) length 150 formants vowel/o-_3 endphoneme diff --git a/phsource/ph_english_us b/phsource/ph_english_us index 44e7d0e2..4634bdd1 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -127,7 +127,7 @@ endphoneme phoneme U - vowel starttype (u) endtype (u) + vowel starttype (o) endtype (o) length 150 formants vowel/8_2 endphoneme diff --git a/phsource/ph_hungarian b/phsource/ph_hungarian index a3374bdd..407c5d91 100644 --- a/phsource/ph_hungarian +++ b/phsource/ph_hungarian @@ -8,7 +8,7 @@ endphoneme phoneme i: vowel starttype (i) endtype (i) - length 200 + length 220 formants vowel/i // linkout ; endphoneme @@ -27,7 +27,7 @@ endphoneme phoneme e: vowel starttype (e) endtype (e) - length 240 + length 250 formants vowel/e_3 endphoneme @@ -114,7 +114,7 @@ phoneme t // dental variant of /t/ vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20 lengthmod 2 wave ustop/t_dnt%50 - before _ ustop/t_dnt%35 + before _ ustop/t_dnt%45 switchvoicing d endphoneme diff --git a/phsource/ph_russian b/phsource/ph_russian index a803aad7..8e41b319 100755 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -75,7 +75,7 @@ phoneme t vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20 lengthmod 2 wave ustop/t_dnt%60 - before _ ustop/t_dnt%30 + before _ ustop/t_dnt%35 before r ustop/tr switchvoicing d endphoneme diff --git a/phsource/phonemes b/phsource/phonemes index 5642638c..0d56d376 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -911,7 +911,7 @@ phoneme t[ // dental variant of /t/ vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20 lengthmod 2 wave ustop/t_dnt%50 - before _ ustop/t_dnt%25 + before _ ustop/t_dnt%35 before r ustop/tr switchvoicing d[ endphoneme @@ -1235,5 +1235,8 @@ phonemetable sw base include ph_swahili -//phonemetable f_en base +//phonemetable basef base +//include pf + +//phonemetable f_en basef //include pf_english diff --git a/phsource/voc/dh b/phsource/voc/dh index 0b34b3f1..68a35ffc 100644 Binary files a/phsource/voc/dh and b/phsource/voc/dh differ diff --git a/phsource/voc/dh_ b/phsource/voc/dh_ index e32347b9..3c327985 100644 Binary files a/phsource/voc/dh_ and b/phsource/voc/dh_ differ diff --git a/phsource/voc/v b/phsource/voc/v index e4a9570c..7b372399 100644 Binary files a/phsource/voc/v and b/phsource/voc/v differ diff --git a/phsource/voc/v_ b/phsource/voc/v_ index 532650c0..b9f3ae08 100644 Binary files a/phsource/voc/v_ and b/phsource/voc/v_ differ diff --git a/phsource/voc/z_ b/phsource/voc/z_ index f9710b8e..c60f6d34 100644 Binary files a/phsource/voc/z_ and b/phsource/voc/z_ differ diff --git a/phsource/voc/z_pzd b/phsource/voc/z_pzd index a573abe3..964d041e 100644 Binary files a/phsource/voc/z_pzd and b/phsource/voc/z_pzd differ diff --git a/phsource/voc/z_pzd_ b/phsource/voc/z_pzd_ index ac3c3746..1f2befc0 100644 Binary files a/phsource/voc/z_pzd_ and b/phsource/voc/z_pzd_ differ diff --git a/phsource/voc/zh_ b/phsource/voc/zh_ index 43ce5b60..22cf876b 100644 Binary files a/phsource/voc/zh_ and b/phsource/voc/zh_ differ diff --git a/phsource/w/wo b/phsource/w/wo index 6add06ef..17325930 100644 Binary files a/phsource/w/wo and b/phsource/w/wo differ diff --git a/phsource/w/wu b/phsource/w/wu index 42ddee2c..82576dde 100644 Binary files a/phsource/w/wu and b/phsource/w/wu differ diff --git a/src/espeakedit.cpp b/src/espeakedit.cpp index d13e7de4..47cb51ac 100755 --- a/src/espeakedit.cpp +++ b/src/espeakedit.cpp @@ -139,16 +139,6 @@ extern void VoiceReset(int control); CompileInit(); exit(0); } - if(strcmp(param,"--lex=ru")==0) - { - if(LoadPhData() != 1) - { - fprintf(stderr,"Failed to load phoneme data\n"); - exit(1); - } - CompareLexicon(MENU_LEXICON_RU); - exit(0); - } } gui_flag = 1; @@ -531,8 +521,8 @@ void MyFrame::OnSpeak(wxCommandEvent& event) case MENU_SPEAK_VOICE: transldlg->ReadVoice(); - if(voicedlg != NULL) - voicedlg->WriteParams(); +// if(voicedlg != NULL) +// voicedlg->WriteParams(); SetVoiceTitle(voice_name); break; } diff --git a/src/main.h b/src/main.h index 4b9d5640..067cc092 100755 --- a/src/main.h +++ b/src/main.h @@ -86,7 +86,7 @@ class MyChild: public wxMDIChildFrame void OnSaveAs(wxCommandEvent& event); void OnSaveSelect(wxCommandEvent& event); void OnSavePitchenv(wxCommandEvent& event); - void OnVoiceDlg(wxCommandEvent& event); +// void OnVoiceDlg(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; diff --git a/src/menus.cpp b/src/menus.cpp index 820a1527..a3a60d8e 100755 --- a/src/menus.cpp +++ b/src/menus.cpp @@ -41,8 +41,8 @@ wxMenuBar *MakeMenu(int type) // FILE MENU file_menu = new wxMenu; - file_menu->Append(MENU_SPECTRUM, _T("&Open")); - file_menu->Append(MENU_SPECTRUM2, _T("O&pen2")); + file_menu->Append(MENU_SPECTRUM, _("&Open")); + file_menu->Append(MENU_SPECTRUM2, _("O&pen2")); // file_menu->Append(MENU_PROSODY, _T("&Prosody window")); if(type==0) { @@ -50,89 +50,89 @@ wxMenuBar *MakeMenu(int type) else if(type==1) { - file_menu->Append(SPECTSEQ_SAVE, _T("&Save")); - file_menu->Append(SPECTSEQ_SAVEAS, _T("Save &As")); - file_menu->Append(SPECTSEQ_SAVESELECT, _T("Save Selection")); + file_menu->Append(SPECTSEQ_SAVE, _("&Save")); + file_menu->Append(SPECTSEQ_SAVEAS, _("Save &As")); + file_menu->Append(SPECTSEQ_SAVESELECT, _("Save Selection")); // file_menu->Append(SPECTSEQ_SAVEPITCH, _T("Save Pitch &Envelope")); - file_menu->Append(SPECTSEQ_CLOSE, _T("&Close")); + file_menu->Append(SPECTSEQ_CLOSE, _("&Close")); // file_menu->Append(MENU_CLOSE_ALL, _T("Close &All")); } else if(type==2) { - file_menu->Append(SPECTSEQ_SAVE, _T("&Save")); - file_menu->Append(SPECTSEQ_SAVEAS, _T("Save &As")); + file_menu->Append(SPECTSEQ_SAVE, _("&Save")); + file_menu->Append(SPECTSEQ_SAVEAS, _("Save &As")); // file_menu->Append(SPECTSEQ_SAVEPITCH, _T("Save Pitch &Envelope")); - file_menu->Append(SPECTSEQ_CLOSE, _T("&Close")); + file_menu->Append(SPECTSEQ_CLOSE, _("&Close")); // file_menu->Append(MENU_CLOSE_ALL, _T("Close &All")); } - file_menu->Append(MENU_QUIT, _T("&Quit")); + file_menu->Append(MENU_QUIT, _("&Quit")); // SPEAK_MENU speak_menu = new wxMenu; - speak_menu->Append(MENU_SPEAK_TRANSLATE, _T("&Translate")); - speak_menu->Append(MENU_SPEAK_RULES, _T("Show &Rules")); - speak_menu->Append(MENU_SPEAK_TEXT, _T("&Speak")); + speak_menu->Append(MENU_SPEAK_TRANSLATE, _("&Translate")); + speak_menu->Append(MENU_SPEAK_RULES, _("Show &Rules")); + speak_menu->Append(MENU_SPEAK_TEXT, _("&Speak")); speak_menu->AppendSeparator(); - speak_menu->Append(MENU_SPEAK_FILE, _T("Speak &file")); - speak_menu->Append(MENU_SPEAK_PAUSE, _T("&Pause")); - speak_menu->Append(MENU_SPEAK_STOP, _T("St&op")); + speak_menu->Append(MENU_SPEAK_FILE, _("Speak &file")); + speak_menu->Append(MENU_SPEAK_PAUSE, _("&Pause")); + speak_menu->Append(MENU_SPEAK_STOP, _("St&op")); // VOICE MENU voice_menu = new wxMenu; - voice_menu->Append(MENU_SPEAK_VOICE, _T("Select &Voice")); + voice_menu->Append(MENU_SPEAK_VOICE, _("Select &Voice")); // DATA MENU data_menu = new wxMenu; - data_menu->Append(MENU_COMPILE_PH, _T("Compile &phoneme data")); - data_menu->Append(MENU_COMPILE_DICT, _T("Compile &dictionary")); - data_menu->Append(MENU_COMPILE_MBROLA, _T("Compile &mbrola phonemes list")); + data_menu->Append(MENU_COMPILE_PH, _("Compile &phoneme data")); + data_menu->Append(MENU_COMPILE_DICT, _("Compile &dictionary")); + data_menu->Append(MENU_COMPILE_MBROLA, _("Compile &mbrola phonemes list")); // OPTIONS MENU paths_menu = new wxMenu; - paths_menu->Append(MENU_PATH1, _T("Phoneme data source")); - paths_menu->Append(MENU_PATH2, _T("Dictionary data source")); - paths_menu->Append(MENU_PATH3, _T("Synthesized sound WAV file")); + paths_menu->Append(MENU_PATH1, _("Phoneme data source")); + paths_menu->Append(MENU_PATH2, _("Dictionary data source")); + paths_menu->Append(MENU_PATH3, _("Synthesized sound WAV file")); speak_menu->AppendSeparator(); - paths_menu->Append(MENU_PATH4, _T("Voice file to modify formant peaks")); + paths_menu->Append(MENU_PATH4, _("Voice file to modify formant peaks")); option_menu = new wxMenu; - option_menu->Append(MENU_PATHS, _T("Set &paths"), paths_menu); - option_menu->Append(MENU_PARAMS, _T("Speed")); + option_menu->Append(MENU_PATHS, _("Set &paths"), paths_menu); + option_menu->Append(MENU_PARAMS, _("Speed")); // TOOLS vowelchart_menu = new wxMenu; - vowelchart_menu->Append(MENU_VOWELCHART1, _T("From compiled phoneme data")); - vowelchart_menu->Append(MENU_VOWELCHART2, _T("From list of formants")); - vowelchart_menu->Append(MENU_VOWELCHART3, _T("From directory of vowel files")); + vowelchart_menu->Append(MENU_VOWELCHART1, _("From compiled phoneme data")); + vowelchart_menu->Append(MENU_VOWELCHART2, _("From list of formants")); + vowelchart_menu->Append(MENU_VOWELCHART3, _("From directory of vowel files")); lexicon_menu = new wxMenu; - lexicon_menu->Append(MENU_LEXICON_RU, _T("Russian (lexicon.dict)")); - lexicon_menu->Append(MENU_LEXICON_DE, _T("German")); + lexicon_menu->Append(MENU_LEXICON_RU, _("Russian (lexicon.dict)")); + lexicon_menu->Append(MENU_LEXICON_DE, _("German")); tools_menu = new wxMenu; - tools_menu->Append(MENU_VOWELCHART, _T("Make &Vowels Chart"), vowelchart_menu); + tools_menu->Append(MENU_VOWELCHART, _("Make &Vowels Chart"), vowelchart_menu); // tools_menu->Append(MENU_LOAD_WAV, _T("Analyse WAV file")); - tools_menu->Append(MENU_LEXICON, _T("Compare &Lexicon"), lexicon_menu); - tools_menu->Append(MENU_TO_UTF8, _T("Convert file to &UTF8")); - tools_menu->Append(MENU_COUNT_WORDS, _T("Count word &frequencies")); - tools_menu->Append(MENU_TEST , _T("Test (temporary)")); + tools_menu->Append(MENU_LEXICON, _("Compare &Lexicon"), lexicon_menu); + tools_menu->Append(MENU_TO_UTF8, _("Convert file to &UTF8")); + tools_menu->Append(MENU_COUNT_WORDS, _("Count word &frequencies")); + tools_menu->Append(MENU_TEST , _("Test (temporary)")); // tools_menu->Append(MENU_TEST2 , _T("Test2")); // HELP MENU help_menu = new wxMenu; - help_menu->Append(MENU_ABOUT, _T("&About")); + help_menu->Append(MENU_ABOUT, _("&About")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, _T("&File")); - menu_bar->Append(speak_menu, _T("&Speak")); - menu_bar->Append(voice_menu, _T("&Voice")); - menu_bar->Append(option_menu, _T("&Options")); - menu_bar->Append(tools_menu, _T("&Tools")); - menu_bar->Append(data_menu, _T("&Compile")); - menu_bar->Append(help_menu, _T("&Help")); + menu_bar->Append(file_menu, _("&File")); + menu_bar->Append(speak_menu, _("&Speak")); + menu_bar->Append(voice_menu, _("&Voice")); + menu_bar->Append(option_menu, _("&Options")); + menu_bar->Append(tools_menu, _("&Tools")); + menu_bar->Append(data_menu, _("&Compile")); + menu_bar->Append(help_menu, _("&Help")); return(menu_bar); } // end of MakeMenu diff --git a/src/options.cpp b/src/options.cpp index f0c11c72..bf419d56 100755 --- a/src/options.cpp +++ b/src/options.cpp @@ -45,7 +45,6 @@ wxString path_spectload2; wxString path_pitches; wxString path_wave; wxString path_speech; -wxString path_voices; wxString path_phsource; wxString path_dictsource; wxString path_speaktext; @@ -162,7 +161,6 @@ void ConfigInit() pConfig->Read(_T("/pitchpath"),&path_pitches,basedir+_T("/pitch")); pConfig->Read(_T("/wavepath"),&path_wave,wxEmptyString); pConfig->Read(_T("/speechpath"),&path_speech,wxEmptyString); - pConfig->Read(_T("/voicepath"),&path_voices,basedir+_T("/voices")); pConfig->Read(_T("/voicename"),&string,wxEmptyString); strcpy(voice_name,string.mb_str(wxConvLocal)); pConfig->Read(_T("/phsource"),&path_phsource,basedir+_T("/phsource")); @@ -189,7 +187,6 @@ void ConfigSave(int exit) pConfig->Write(_T("/pitchpath"),path_pitches); pConfig->Write(_T("/wavepath"),path_wave); pConfig->Write(_T("/speechpath"),path_speech); - pConfig->Write(_T("/voicepath"),path_voices); pConfig->Write(_T("/voicename"),wxString(voice_name,wxConvLocal)); pConfig->Write(_T("/phsource"),path_phsource); pConfig->Write(_T("/dictsource"),path_dictsource); diff --git a/src/options.h b/src/options.h index dc492546..6131611b 100755 --- a/src/options.h +++ b/src/options.h @@ -32,7 +32,6 @@ extern void ConfigSetPaths(); extern wxString path_spectload; extern wxString path_spectload2; extern wxString path_pitches; -extern wxString path_voices; extern wxString path_phsource; extern wxString path_dictsource; extern wxString path_modifiervoice; diff --git a/src/phoneme.h b/src/phoneme.h index c987d70b..d2c9c29c 100755 --- a/src/phoneme.h +++ b/src/phoneme.h @@ -85,7 +85,7 @@ #define phPLACE 0xf0000 #define phPLACE_pla 0x60000 -#define N_PHONEME_TABS 50 // number of phoneme tables +#define N_PHONEME_TABS 100 // number of phoneme tables #define N_PHONEME_TAB 256 // max phonemes in a phoneme table #define N_PHONEME_TAB_NAME 32 // must be multiple of 4 diff --git a/src/setlengths.cpp b/src/setlengths.cpp index a44cfbe3..ad66fd5b 100755 --- a/src/setlengths.cpp +++ b/src/setlengths.cpp @@ -186,6 +186,7 @@ void SetParameter(int parameter, int value, int relative) case espeakPITCH: if(new_value > 99) new_value = 99; + if(new_value < 0) new_value = 0; embedded_value[EMBED_P] = new_value; break; diff --git a/src/speak.cpp b/src/speak.cpp index 844bf5c5..0282d6c1 100755 --- a/src/speak.cpp +++ b/src/speak.cpp @@ -202,7 +202,6 @@ void DisplayVoices(FILE *f_out, char *language) static void PitchAdjust(int pitch_adjustment) {//========================================== int ix, factor; - extern unsigned char pitch_adjust_tab[100]; voice->pitch_base = (voice->pitch_base * pitch_adjust_tab[pitch_adjustment])/128; @@ -228,8 +227,16 @@ static void init_path(void) HKEY RegKey; unsigned long size; unsigned long var_type; + char *env; unsigned char buf[100]; + if((env = getenv("espeak-path")) != NULL) + { + sprintf(path_home,"%s/espeak-data",env); + if(GetFileLength(path_home) == -2) + return; // an espeak-data directory exists + } + buf[0] = 0; RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\Tokens\\eSpeak", 0, KEY_READ, &RegKey); size = sizeof(buf); @@ -238,6 +245,15 @@ static void init_path(void) sprintf(path_home,"%s\\espeak-data",buf); #else + char *env; + + if((env = getenv("ESPEAK-DATA-PATH")) != NULL) + { + snprintf(path_home,sizeof(path_home),"%s/espeak-data",env); + if(GetFileLength(path_home) == -2) + return; // an espeak-data directory exists + } + snprintf(path_home,sizeof(path_home),"%s/espeak-data",getenv("HOME")); if(access(path_home,R_OK) != 0) { diff --git a/src/speak_lib.cpp b/src/speak_lib.cpp index c0323813..7c444fc8 100644 --- a/src/speak_lib.cpp +++ b/src/speak_lib.cpp @@ -283,6 +283,7 @@ static void init_path(const char *path) HKEY RegKey; unsigned long size; unsigned long var_type; + char *env; unsigned char buf[100]; if(path != NULL) @@ -290,6 +291,14 @@ static void init_path(const char *path) sprintf(path_home,"%s/espeak-data",path); return; } + + if((env = getenv("espeak-path")) != NULL) + { + sprintf(path_home,"%s/espeak-data",env); + if(GetFileLength(path_home) == -2) + return; // an espeak-data directory exists + } + buf[0] = 0; RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Speech\\Voices\\Tokens\\eSpeak", 0, KEY_READ, &RegKey); size = sizeof(buf); @@ -299,12 +308,21 @@ static void init_path(const char *path) sprintf(path_home,"%s\\espeak-data",buf); #else + char *env; + if(path != NULL) { snprintf(path_home,sizeof(path_home),"%s/espeak-data",path); return; } + if((env = getenv("ESPEAK-DATA-PATH")) != NULL) + { + snprintf(path_home,sizeof(path_home),"%s/espeak-data",env); + if(GetFileLength(path_home) == -2) + return; // an espeak-data directory exists + } + snprintf(path_home,sizeof(path_home),"%s/espeak-data",getenv("HOME")); if(access(path_home,R_OK) != 0) { diff --git a/src/spectdisplay.cpp b/src/spectdisplay.cpp index 6cd44b03..9e564432 100755 --- a/src/spectdisplay.cpp +++ b/src/spectdisplay.cpp @@ -1007,7 +1007,7 @@ void InitSpectrumDisplay() menu_spectdisplay->Append(207,_T("Hide Interpolation CTRL+SHIFT+Q")); menu_spectdisplay->Append(205,_T("Zero Peaks CTRL+Z")); menu_spectdisplay->Append(210,_T("Toggle Marker"),menu_markers); - menu_spectdisplay->Append(211,_T("Apply the formant adjustments from current voice")); + menu_spectdisplay->Append(211,_T("Apply the formant adjustments from a voice file")); menu_spectdisplay->AppendSeparator(); menu_spectdisplay->Append(208,_T("Play Selected Frame F1")); menu_spectdisplay->Append(209,_T("Play All F2")); diff --git a/src/synthdata.cpp b/src/synthdata.cpp index e31c4e57..725e01c2 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.26.09 20.Jun.07"; +const char *version_string = "1.26.10 23.Jun.07"; const int version_phdata = 0x012601; int option_device_number = -1; diff --git a/src/synthesize.cpp b/src/synthesize.cpp index f71ee06f..ef12fa5e 100755 --- a/src/synthesize.cpp +++ b/src/synthesize.cpp @@ -67,8 +67,6 @@ static voice_t *new_voice=NULL; int n_soundicon_tab=0; SOUND_ICON soundicon_tab[N_SOUNDICON_TAB]; -#define RMS1 16 // -#define RMS2 20 // 16 - 20 #define RMS_GLOTTAL1 35 // vowel before glottal stop #define RMS_START 28 // 14 - 30 diff --git a/src/synthesize.h b/src/synthesize.h index 84bf1fb7..55ceab9b 100755 --- a/src/synthesize.h +++ b/src/synthesize.h @@ -150,6 +150,8 @@ extern unsigned char env_fall[128]; extern unsigned char env_rise[128]; extern unsigned char env_frise[128]; +#define MAX_PITCH_VALUE 101 +extern unsigned char pitch_adjust_tab[MAX_PITCH_VALUE+1]; // queue of commands for wavegen #define WCMD_AMPLITUDE 1 diff --git a/src/translate.cpp b/src/translate.cpp index 37ffcf51..22da2e96 100755 --- a/src/translate.cpp +++ b/src/translate.cpp @@ -287,7 +287,7 @@ const unsigned short *charsets[N_CHARSETS] = { // use this table if vowel is not the last in the word static unsigned char length_mods_en[100] = { /* a , t s n d z r N <- next */ - 100,120,100,105, 95,110,110,100, 95, 100, /* a <- next2 */ + 100,120,100,105,100,110,110,100, 95, 100, /* a <- next2 */ 105,120,105,110,125,130,135,115,125, 100, /* , */ 105,120, 75,100, 75,105,120, 85, 75, 100, /* t */ 105,120, 85,105, 95,115,120,100, 95, 100, /* s */ @@ -846,6 +846,8 @@ strcpy(phonemes2,phonemes); // if(found || (dictionary_flags2 != 0)) // prefix_flags = 1; // ?? this looks wrong + if((found==0) && (dictionary_flags2 != 0)) + prefix_flags = 1; } if(found == 0) { diff --git a/src/voicedlg.cpp b/src/voicedlg.cpp index 2d6e8b47..a3b0be55 100755 --- a/src/voicedlg.cpp +++ b/src/voicedlg.cpp @@ -188,11 +188,11 @@ void VoiceDlg::OnCommand(wxCommandEvent& event) break; case VD_LOAD: - Load(); +// Load(); break; case VD_SAVE: - Save(); +// Save(); break; case VD_USEPITCH: @@ -260,6 +260,7 @@ void VoiceDlg::OnSpin(wxSpinEvent& event) ReadParams(); } +#ifdef deleted void VoiceDlg::Save() {//================== int pk; @@ -326,7 +327,7 @@ void VoiceDlg::Load() SetSpinCtrl(voicedlg->vd_pitch2,pitch2); ReadParams(); } // end of VoiceDlg::Load - +#endif void VoiceDlg::SetFromSpect(SpectSeq* spect) {//========================================= diff --git a/src/wavegen.cpp b/src/wavegen.cpp index 39e6103e..4706a11a 100755 --- a/src/wavegen.cpp +++ b/src/wavegen.cpp @@ -144,7 +144,7 @@ int wcmdq_tail=0; // pitch,speed, int embedded_default[N_EMBEDDED_VALUES] = {0,50,170,100,50, 0,50, 0,170,0,0,0,0,0}; -static int embedded_max[N_EMBEDDED_VALUES] = {0,99,360,300,99,99,99, 0,360,0,0,0,0,4}; +static int embedded_max[N_EMBEDDED_VALUES] = {0,0x7fff,360,300,99,99,99, 0,360,0,0,0,0,4}; #define N_CALLBACK_IX N_WAV_BUF-2 // adjust this delay to match display with the currently spoken word int current_source_index=0; @@ -303,7 +303,7 @@ static unsigned char wavemult[N_WAVEMULT] = { // set from y = pow(2,x) * 128, x=-1 to 1 -unsigned char pitch_adjust_tab[100] = { +unsigned char pitch_adjust_tab[MAX_PITCH_VALUE+1] = { 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 86, 87, 88, @@ -316,7 +316,7 @@ unsigned char pitch_adjust_tab[100] = { 174,176,179,181,184,186,189,191, 194,197,199,202,205,208,211,214, 217,220,223,226,229,232,236,239, - 242,246,249,252 }; + 242,246,249,252, 254,255 }; int WavegenFill(int fill_zeros); @@ -1440,6 +1440,7 @@ void SetEmbedded(int control, int value) int command; int ix; int factor; + int pitch_value; command = control & 0x1f; if((control & 0x60) == 0x60) @@ -1462,7 +1463,10 @@ void SetEmbedded(int control, int value) case EMBED_P: case EMBED_T: // adjust formants to give better results for a different voice pitch - factor = 256 + (25 * (embedded_value[EMBED_P] - 50))/50; + if((pitch_value = embedded_value[EMBED_P]) > MAX_PITCH_VALUE) + pitch_value = MAX_PITCH_VALUE; + + factor = 256 + (25 * (pitch_value - 50))/50; for(ix=0; ix<=5; ix++) { wvoice->freq[ix] = (wvoice->freq2[ix] * factor)/256; @@ -1521,6 +1525,7 @@ void SetPitch(int length, unsigned char *env, int pitch1, int pitch2) int x; int base; int range; + int pitch_value; #ifdef LOG_FRAMES f_log=fopen("log-espeakedit","a"); @@ -1547,7 +1552,12 @@ f_log=NULL; pitch2 = x; } - base = (wvoice->pitch_base * pitch_adjust_tab[embedded_value[EMBED_P]])/128; + if((pitch_value = embedded_value[EMBED_P]) > MAX_PITCH_VALUE) + pitch_value = MAX_PITCH_VALUE; + if(pitch_value < 0) + pitch_value = 0; + + base = (wvoice->pitch_base * pitch_adjust_tab[pitch_value])/128; range = (wvoice->pitch_range * embedded_value[EMBED_R])/50; // compensate for change in pitch when the range is narrowed or widened diff --git a/windows/make_espeak.iss b/windows/make_espeak.iss index 0de7f772..e4629b1d 100755 --- a/windows/make_espeak.iss +++ b/windows/make_espeak.iss @@ -2,12 +2,13 @@ [Setup] AppName=eSpeak -AppVerName=eSpeak version 1.26 +AppVerName=eSpeak version 1.26.10 DefaultDirName={pf}\eSpeak DefaultGroupName=eSpeak OutputBaseFilename=setup_espeak Compression=lzma SolidCompression=yes +ShowLanguageDialog=auto [InstallDelete] Type: files; Name: "{app}\espeak.dll" @@ -35,6 +36,36 @@ Root: HKLM; Subkey: "Software\Microsoft\Speech\Voices\Tokens\eSpeak_5"; Flags: d Root: HKLM; Subkey: "Software\Microsoft\Speech\PhoneConverters\Tokens\eSpeak"; Flags: deletekey uninsdeletekey +[Languages] +Name: "en"; MessagesFile: "compiler:Default.isl" +Name: "af"; MessagesFile: "compiler:Languages\Afrikaans.isl" +Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "de"; MessagesFile: "compiler:Languages\German.isl" +Name: "el"; MessagesFile: "compiler:Languages\Greek.isl" +Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "fr"; MessagesFile: "compiler:Languages\French.isl" +Name: "hr"; MessagesFile: "compiler:Languages\Croatian.isl" +Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "it"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl" +Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl" +Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl" +Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl" + +[CustomMessages] +v1=Select which voices to install +v2=or press Enter to accept defaults +v3=Enter voice names, eg: (for Portuguese) pt, or with a variant, eg: pt+13 + +pt.v1=Seleccione as vozes que pretende instalar +pt.v2=ou precione enter para aceitar as predefinidas. +pt.v3=Introduza os nomes das vozes, ex: (Brazil) pt (ou Portugal) pt-pt, ou com outras caractersticas, ex: pt+13 + + [Code] var @@ -81,6 +112,13 @@ begin $41: Result := 'sw'; $52: Result := 'cy'; end; + + // is there a match on the full language code? + case language of + $816: Result := 'pt-pt'; + $81a: Result := 'sr'; + $c1a: Result := 'sr'; + end; end; @@ -123,6 +161,7 @@ begin 'ro': value := $418; 'ru': value := $419; 'sk': value := $41b; + 'sr': value := $81a; 'sv': value := $41d; 'sw': value := $441; 'vi': value := $42a; @@ -283,10 +322,8 @@ var begin // Create the language selection page lang := ActiveLanguage; - Page := CreateInputQueryPage(wpSelectDir, - 'Select which voices to install', 'or press Enter to accept defaults', - 'Enter voice names, eg: (for Portuguese) pt, or with a variant, eg: pt+13'); - + Page := CreateInputQueryPage(wpSelectDir,CustomMessage('v1'),CustomMessage('v2'),CustomMessage('v3')); + // Add items (False means it's not a password edit) Page.Add('', False); Page.Add('', False); diff --git a/windows/make_espeakedit.iss b/windows/make_espeakedit.iss index 095f111a..f713c3bb 100755 --- a/windows/make_espeakedit.iss +++ b/windows/make_espeakedit.iss @@ -1,13 +1,14 @@ [Setup] AppName=eSpeakEdit -AppVerName=eSpeakEdit version 1.26 +AppVerName=eSpeakEdit version 1.26.10 DefaultDirName={pf}\eSpeak DefaultGroupName=eSpeak OutputBaseFilename=setup_espeakedit Compression=lzma SolidCompression=yes DirExistsWarning=no +ShowLanguageDialog=auto [Files] Source: "espeakedit.exe"; DestDir: "{app}" @@ -18,4 +19,25 @@ Source: "docs\*"; DestDir: "{app}\docs"; Flags: recursesubdirs ;Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme +[Languages] +Name: "en"; MessagesFile: "compiler:Default.isl" +Name: "af"; MessagesFile: "compiler:Languages\Afrikaans.isl" +Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "de"; MessagesFile: "compiler:Languages\German.isl" +Name: "el"; MessagesFile: "compiler:Languages\Greek.isl" +Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "fr"; MessagesFile: "compiler:Languages\French.isl" +Name: "hr"; MessagesFile: "compiler:Languages\Croatian.isl" +Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "it"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl" +Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl" +Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl" +Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl" + +