diff --git a/dictsource/af_list b/dictsource/af_list index fcf35f3f..d7c97093 100755 --- a/dictsource/af_list +++ b/dictsource/af_list @@ -221,6 +221,7 @@ sunnyside _^_EN swellendam $3 tunisië $2 turkye $2 +ulundi ul'undi upington apiNt@n vesuvius v@su:viWs viëtnam vj'Etnam @@ -379,6 +380,7 @@ pierre p'e@r petronella pe@trun'&la petrus pe@trWs phoebe fi:bi +quixote kix2'OtE rachmaninoff rax2m'aninOf rebekka r@bEka renée r@neI @@ -391,6 +393,7 @@ roux r'u ruda ruda rupert rup@rt salomo sA:l@mo@ +samuel sA:my@l sandra sandra schalk sk'alk scheepers ske@p@rs @@ -416,6 +419,7 @@ theo tiu theron tr'On thys teIs toerien $2 +totius to@SiWs trudie trudi versfeld f&rsf< victoria _^_EN @@ -423,6 +427,7 @@ viljoen $2 villiers vIli@rs vincent _^_EN violet _^_EN $capital +visagie fis'A:x2i william _^_EN yolande jul'and@ yvonne iv'On @@ -846,6 +851,7 @@ rinkink $2 rooipers roIp&:rs roterende rut'e@r@nd@ rukkerig rWk@r@x2 +rymelary reIm@lar'eI salami sal'A:mi salute sal'yt@ @@ -873,8 +879,10 @@ sonop sOn_Op sonore sun'o@r@ sover so@f&r staccato $2 +stilswye $1 suburbia sWb'Wrbija +tanga taNga tenminste $2 terdeë $2 terug t@-rWx2 @@ -941,3 +949,4 @@ weggewens v&x2@v'E:ns welaf v&l_af weleer v&l_'e@r wysgere veIsx2e@r@ + diff --git a/dictsource/af_rules b/dictsource/af_rules index 77cb6986..1c5615df 100755 --- a/dictsource/af_rules +++ b/dictsource/af_rules @@ -436,7 +436,7 @@ bo (botie b%u // fix stress and 1st o sound: bobotie and compounds boeke (tK b%ukE //move default stress and fix 2nd e sound: boeket and compounds boepens b''upe~ns // fix stress, nasal e: boepens and compounds - boere bur@ // many compounds with boere + boere bu:r@ // many compounds with boere boer (in b%ur // move default stress: boerin/-ne boe (tseer b%u // move default stress: boetseer and compounds bo (haai b%u // fix stress and o sound: bohaai and compounds @@ -596,6 +596,7 @@ dani (gh d'A:n@ // -hoedanigheid/hoedanighede/onderdanigheid @) dant d'ant // dant takes stress: kommandant/pruimedant de (gradA d,e@ // fix e sound: degradasie/degradeer/-ering + @) d (eis t_ // fix d sound, insert pause: skuldeiser/grondeise and many compounds de (kaan d@ // fix stress and e sound: dekaan/-skap de (kane d@ // fix stress and 1st e sound: (universiteits)dekane _) de (klass de@ // deklassifikasie/gedeklassifiseer @@ -628,6 +629,7 @@ @) dderd (_ d@rt // ontredderd, se rule: dd d _) derge d&rx2@ // dergelik/-e desibel dEsib&l // fix vowel sounds: desibel/-s + de (skun _d%E //deskundig/e in compounds _) des (po d%Es // move default stress: despoot/despote de (strukt d%e@ // fix e sound: destruktief/destruktiewe deto (nA d%Et%u // fix e and o sounds and stress: detonasie/detoneer/detonering @@ -724,6 +726,7 @@ hon) d (C t // fix d sound: hondriem/-reuk/-ruik oo) d (r t // fix d sound: broodrooster/doodryp/loodreg/noodroep win) d (r t // fix d sound: windrigting/-s and compounds/windreën + @) d (ruim t // fix d sound: end-/pad-/voorraadruimte/tydruimtelik p) d (C d // oopdwing/koopdwang ver) d (C d // verdwyn; see rule: @) d (C t @) dd d // beddens/bedding @@ -971,6 +974,7 @@ C) eue Y@@ // fix e sound: compounds and derivitives of leuen/vleuel/geheue/teuel, etc. eu (forie %Y@ // move default stress: eufories/-e eufo (rie_N %Y@f%u // stress to end: euforie + C) e (uit @_ // fix e and ui sounds: akteuitmaker/druiweuitvoer/woedeuitbarsting and many similar euntjie Y@iNci // seuntjie/reuntjie eë e@ // e deelteken-e &) e (_ @ @@ -1077,6 +1081,7 @@ e (r & Ank) e (r@ @ // ankerpaal/kankerlyer/donkerbril rp) e (rCC @ // fix e sound: ontwerpersbaadjie/purperkleurig, etc. + purp) e (r @ // fix e sound: purperband/-koors/-rooi/-suur/-wind _rasp) e (r @ // fix e sound in rasper- compounds: raspertong/-vyl, etc./rasperend lew) e (ns @ @@ -1150,7 +1155,7 @@ @C) ent (K 'Ent // orent/student/presidentsrede @C) ent (e_ 'Ent // plurals of some of the above en) ent (_ Ent // restore default stress: koppenent/voetenent - pr) ent (+ Ent // default stress for compounds of prent + pr) ent (++ Ent // default stress for compounds of prent/-e @s) ent (rA Ent // winkelsentrum/studentesentrum, etc. C) er (tyd @r // tegelykertyd/kindertyd/indertyd _) etens 'e@t@ns // etenstyd/klok/tafel/uur @@ -1168,7 +1173,6 @@ @C) e (sker_ 'E // fix stress and e sound: grotesker/pikaresker _w) e (skus E // fix stress and e sound: (suid)weskus and compounds &C) e (sk@ @ // hondeskou/modeskou/erdeskottel/geleideskip/hardeskyf - d) e (skun %E // but: deskundige and compounds @d) e (s@ @ // bejaardesorg/heidesoorte/hondesiekte/modesiek/tandestokkie/tersydestelling/vredesluiting @d) esi (ma %Es%i // duodesimaal/heksadesimale @d) e (se_ 'e@ // Kanadese/nadese, etc. @@ -1418,6 +1422,7 @@ gewel x2e@v@l //gewel/huis/muur etc. gewer (_ x2e@v@r // gewer and many compounds ending in gewer + slag) gewer x2e@v@r // fix e sound: verslaggewerbank/verslaggewertjie, etc. gewing x2e@v@N // begewing/vergewing bur) ger g@r gee (+ x2e@ @@ -1435,7 +1440,7 @@ ge (ogra x2i //geografie etc. ge (olo x2i //geoloog etc. ge (ome x2i //geometries etc. - gesels x2@s'&ls + gesels x2@s&ls A) ge (tjie x2i // fix e sound: (graad)negetjie/-s @C) gewens x2@ve~ns @@ -1802,6 +1807,9 @@ kera (miek k%&r%a // move default stress: keramiek and compounds n) kerend (_ k@r@nt //hunkerend and others n) kerende (_ k@r@nd@ //hunkerende and others + kerk (_ k&rk // fix e sound: (plat-/riet)dakkerk, etc. + kerke (_ k&rk@ // fix e sound: barokkerke and similar + kerkie (K k&rki // fix e sound: (plat-/riet)dak-/barokkerkie/-s kerker k&rk@r // fix e sounds: gekerkerde/inkerkering/kerkermuur, etc. flik) kerkers k@rk&:rs // fix e sounds: flikkerkers/-e weder) ker (A k'e@r // wederkerend/wederkerig @@ -1931,6 +1939,7 @@ _) kar (b k%ar // move default stress: karba/karbol/karbonkel and their compounds kar (be kar // restore default stress: karbestuurder/-s/-besitter, etc. kar (does k%ar // move default stress: kardoes and compounds + karme (naadj k%arm@ // fix stress and e sound: karmenaadjie and compounds karmosyn k%arm%useIn // fix stress and o sound: karmosyn and compounds kar (nuffel k%ar // move default stress: (ge)karnuffel/-de kara (koel k%ar%a // fix stress and a sounds: karakoel and compounds @@ -1970,7 +1979,7 @@ koe (plet k%u // move default stress: koeplet/-te/-vorm koka (ï k%o@k%a // move default stress: kokaïen/kokaïne and compounds ko (ketK k%u // fix stress and o sound: koket/-te/koketterig - kokke (C k%Ok@ // move default stress: kokkedoor/kokkerot/kokkewiet + _) kokke (C k%Ok@ // move default stress: kokkedoor/kokkerot/kokkewiet ko (kon k%u // fix 1st o sound and move default stress: kokon and compounds kol (jan k%Ol // move default stress: koljander and compounds ko (lom k%u // fix stress and 1st o sound: kolom/-me and compounds @@ -2238,6 +2247,8 @@ mis (plaas m@s // stress on 2nd slb mis (rabel m@s // stress on 2nd slb mis (reken m@s // stress on 2nd slb: misreken/-ing + mi (ssie mi // fix i sound: (trans)missie and compounds + mi (ssiel m@ // fix stress and i sound: missiel and compounds mister (ieus m@ste@r // stress at end mis (tiek m@s mis (troos m@s // mistroostig @@ -2489,6 +2500,9 @@ _) ob (s %Op // obskuur/obskure/obskuriteit/obsessie/obseen C) o (dium o@ // fix stress and o sound: jodium/podium/rodium and their compounds oefen uf@n// oefenbroekie/oefeningboek/liggaamsoefeninge + oe (r_ u: //long oe sound before r at end of words + oe (re_ u: //long oe sound for words ending in oere + _) oewer uv@r // fix e sound: oewerbewoner/-boer/-eienaar/-reg, etc. C) ogig _o@x2@x2 // bruinogig/grootogig/skuinsogig C) oetel ut@l // troeteldier/-naam/vertroeteling/vroetelend/boeteling @@ -2600,7 +2614,7 @@ _) om (skr %Om // move default stress: omskryf/omskrewe _) om (sluier %Om // move default stress: omsluier and derivitives _) om (sluit %Om // move default stress: omsluit/-ing - omstandigh Omst'and@x2 // to steer clear of prefixes and suffixes + omstandigh %Omstand@x2 // to steer clear of prefixes and suffixes om (swerC %Om // move default stress: omswerf/omswerwing/-e om (vatt %Om // move default stress: omvattend and derivitives _) omver %Omf&r // omver/omvergooi/omverwerp @@ -2915,6 +2929,8 @@ tem) perde (_ p@rd@ //words ending in temperde _) perd (r p&:rt // fix e and d sounds: perdry/-kringe/-kuns/-sport, etc. @) pere (_ pe@r@ // compounds ending in pere indicating the fruit + p) pere (_ p@r@ // fix penultimate e sound: dappere + ry) pere (_ p@r@ // fix penultimate e sound: rypere skam) pere (_ p@r@ ?? shorten 1st e in ending perfek p@rfEk // perfek/-te/-sie/-sionis perife (rA@ p%Er@f@ // fix stress and vowel sounds: periferie/-ë/periferaal/-ale @@ -2965,23 +2981,28 @@ pof (add pOf_ // fix o sound: (konings)pofadder/-s pol (fyn p%Ol // move default stress: polfyntjie/-s po (liep p%u // fix stress and o sound: poliep/-e/-agtig and compounds of poliep - polisie pul'isi + po (liesman pu // fix o sound: poliesman/-ne + polisie p%ulis%i poli (tAAC p%Ol@ // politiek/politoer and compounds polities p%ulit%is // fix stress and o sound: polities/-e pol (vy p%Ol // move default stress: polvy/-e and compounds + pomelo p%ume@l%u // fix stress and o sounds: pomelo(sap/-drankie...) _) pon (dok p%On // move default stress: pondok/-ke/-kie popu ,pOpy _) por (C %pOr //portret portaal etc. + porse (lein p%Ors@ // fix stress and e sound: porselein and compounds por (sie pOr // restore default stress: porsie/-s/-tjie portu (ge p%Ort%y // fix stress: Portugees/Portugese _) 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 + _) poten (C p%utEn // fix stress and vowel sounds: potent/-e/potensie poten (sia p%o@t%En // fix e sound: potensiaal/potensiale and compounds pot (sier p%Ot // move default stress: potsierlik/-e/-heid poësie p%u:@zi // bieg/natuurpoësie/poëversameling, etc. poë (tA p%u:e@ // poëties/-e/poëte ra) pporte (rA p%Orte@ // fix stress and e sound: rapportering/rapporterende + prakti (syn pr%akt%i // move default stress: praktisien and compounds and plural _) 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 @@ -2989,6 +3010,7 @@ pre (nata pr,e@ // fix e sound: prenataal/-tale pre (sA pr@ // president/presies/present pre (se_ pre@ // fix e sound of words ending in -prese + presiden (C pr@s@dEn // fix vowel sounds: president/presidensie/presidensieel/-ële presta (sie pr@stA: // fix stress of prestasie in compounds: leerling/onderprestasie/prestasiebeurs presteer pr@ste@r // fix stress for presteer in compounds: onderpresteerder/teenpresteer/toppresteerder preten (si pr@te~n // fix stress and e sounds: pretensie/(on)pretensieus/-e @@ -3028,7 +3050,9 @@ protest ,prOt@st proto (C pro@tu // protokol/prototipe provi (and pr%o@v%i // fix stress and v sound: proviand/-meester, etc. + pseudo sY@d%u // drop p sound: pseudo and compounds ps (igA s // psigologie/kinderpsigoloog + psige (delie s%ix2@ // move default stress: psigedelies/-e _) psalm p@sal@m // schwa between p and s psalmis p@s%al@mIs // move default stress: psalmis/-te @@ -3059,6 +3083,7 @@ radika (le radik'A: radikaa radik'A: radio rA:di;u:- + radi (olo@ r%A:d%i // fix stress: radioloog/-loë/-logie, etc. raffinade (r r%af%in%ad@ // fix stress and 2nd a sound: raffinadery/-e and compounds rake (t rak'E // raket/te/tennisraket ram (pokker r%am // move default stress: rampokker/-s/-ig @@ -3093,6 +3118,7 @@ rivier r@fi:r _) ri (g rI // stress on 1st slb.: rigting/-loos/-vas, etc. ron (dawel r%On // move default stress: rondawel/-s/-tjie + rond (borst r%Ont // move default stress: rondborstig/-e rond (r rOnt // grondreuk/grondrel/rondreis/-rol/-ry rondom rOnt_%Om // rondom/rondomheen/rondomstaner rondom (tali r%Ont%Om // fix stress and d sound: rondomtalie/-s/rondomtaliemeul, etc. @@ -3119,6 +3145,7 @@ re (frein r@ // move default stress: refrein/-e C) re (gat r@ // fix e sound: fregat/-te and compounds/harregat reggae rEgeI // reggae(musiek/-sanger..., etc.) + reg (hoekig r%&x2 // move default stress: reghoekig/-e regime (_ r@Zi:m // regime/-s and compounds regi (ment r@x2@ // fix stress and e and i sounds: regement/-e and compounds reg (ist r@x2 // registrasie/-nommer/register/bevolkingsregister @@ -3243,10 +3270,13 @@ sara (se s%ar%a // move default stress: saraseen and compounds/sarasene _) sar (d s%ar // sardien/-blikkie/sardinies/sardyne sar (kA s%ar // move default stress: sarkasme/sarkasties/sarkoom + sarko (fa s%ark%u // fix stress and o sound: sarkofaag/sarkofage sa (rong s%a // fix stress and a sound: sarong/-s + sa (tanie s%A: sa (tir s%a // move default stress: satire/satiries/-e sa (turnu s%a // fix stress and a sound: saturnus and compounds _) schu (C Su // fix u sound: Schubert/Schultz/Schumann/Schumacher + _) sedan s@dan // fix stress and e sound: sedan/-s/sedanmotor, etc. _) sede se@d@ // sede/-s|-preek se (duk s@ // fix stress and e sound: seduksie/-s/seduktief sei (soen s%eI // move default stress: seisoen and compounds @@ -3264,6 +3294,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 + selle (tjie s&li // fix e sound: (rooi/wit)bloedselletjies, etc. @) sellig s'&l@x2 // move default stress: een-/twee-/...-/meer-/veelsellig/-e se (llin s%&' // stress on 'in: (met)gesellin/-ne/-netjie, etc. sello (fa s%&l@ // fix stress and vowel sounds: sellofaan and compounds @@ -3278,6 +3309,7 @@ _) se (ni@ s@ // fix stress and e sound: seniel/-e/seniliteit _) senior s''i:ni@r // default stress; fix vowl sounds: senior and compounds starting with senior senior (itei s%i:n%i%Or // fix vowel sounds: senioriteit + sen (suur s%En // move default stress: sensuur and compounds _) sen (tra@ s%En // exception to default stress rule: sentraal/sentrale _) ser (e@ s@r // fix stress and 1st e sound: sereen/serene sere (moni s%Er@ // seremonie/-meester/huwelikseremonie/seremonieel @@ -3294,10 +3326,11 @@ simbi (oC s@mb%i // move default stress: simbiose/simbioties simp (to s@m // move default stress and drop p: simptoom/simptome/simptomaties si (nnig s'I // sinnig in compounds has stress: dubbelsinnig/geheimsinnig/kranksinnig - siniste (r s@nIst@ // sinister/sinistere/sinisters + sinist (Ar s@nIst // sinister/sinistere/sinisters/sinistêr/-e sipre (K s%iprE // fix stress and i sound: sipres/-se/bergsipres/sipresboom sirene s@re@n@ // move default stress and fix vowel sounds: sirene/-s/-lied/-sang si (troen s@ // move default stress: sitroen and compounds + sitrus s'itr%Ws_ //i sound and stress in compounds skade skA:d@ // elik suffix rule breaks a sound of (on)skadelik skadu skA:dy // skaduagtig/skadutjie skaker (ing sk%ake@r // skakering/-s/kleurskakering @@ -3493,6 +3526,7 @@ @) stiek st'ik // statistiek/akoestiek/artistiek and many similar @) sties =st%is // statisties/akoesties/artisties and many similar sti (let st%i // move default stress: stilet/-te/stiletto + stil (swy st@l // move default stress: stilswy(g)end/-e sti (pulA st@ // stipuleer/stipulering/stipulasie stof (o stOf? // fix 1st o sound: stofomslag/-omslae/stofopskoppery stok (A stOk? // stokagtig/stokinsek/stokoud @@ -3516,6 +3550,7 @@ t (_dN // final t, and next word starts with d A) tch _^_EN // clutch/pitch/bitch tabak t%abak; + taber (nakel t%ab@r // fix stress and a sound: tabernakel/-s and compounds ta (blet t%a // move default stress: tablet/-te and compounds tablo (Z t%ablo@ // fix stress and o sound: tablo/-'s tafe (re t%af@ // fix vowel sounds: tafereel/taferele and compounds @@ -3529,6 +3564,7 @@ tamele (tj t%am@lEi // fix stress and vowel sounds: tameletjie/-s _) tand (a tant_ // fix d sound and insert pause: tandarts/-e and compounds _) tande (C@ t''and@ // fix e sound: tandebeker/-pasta/-poeier/-trekker + _) tant (e tA~nt // nasalise: tante/-tjie/-s tantes tA~nt@s // nasalise and fix e sound: tantes tapisse (ri t%ap@s@ // move default stress: tapisserie/-ë @@ -3561,6 +3597,7 @@ tj (ie c _) tj (ie tS re) tjie ici // fix e sound: portretjies/sigaretjie + straa) t (j t // split tj sound: straat(jas/-joggie/-jonge/-joernaal) ui) tj tj // uitjaag/uitjou/uitjubel ui) tjie ci // beskuitjie/fluitjie/ruitjie/uitjie, etc. _) th (@@ t @@ -3618,6 +3655,7 @@ triomf (ant tr%i%Omf // move default stress: triomfantlik/-e tri (omf tr%i // move default stress: triomf/-boog/-lied/-tog, etc. @) trise (_ tr'is@ // aktrise and similar + @) trises (_ tr'is@s // fix stress: aktrises/redaktrises trivia trIvij%a // trivia and compounds: musiektrivia, etc. troglo (die tr%Ox2l%u // fix stress and 2nd o sound: troglodiet/-e and compounds _) trom (b tr%Om // move default stress: tromboon/trombone/trombose and compounds @@ -3665,6 +3703,7 @@ nie) te (min t@ // fix e sound: (des)nietemin tempera ,tEmp@-r%a //temperatuur, temperament etc. temper tEmp@r // fix 2nd e sound: temperend/tempering + tempo (_ tEmp%u // fix e sound of compounds ending in -tempo teks (+ tEks // compounds with teks tempel tEmp@l // fix e sounds: afgodtempel/Hindoetempel/kultuurtempel/tempelbewaarder/tempeldienaar tent (_ tEnt //suurstoftent and others @@ -3827,6 +3866,7 @@ vagina vax2ina // fix v sound and shorten a sound: vagina/-s vagin (A@ v%ax2%in // move default stress: vaginale and similar vakansie f@kansi + vaka (ture f%ak@ // fix stress and a sounds: vakature and compounds va (ku v%a // fix stress and v sound: vakuum and compounds/vakume/evakueer vak (unie fak_ // restore default stress, insert short pause: vakunie and compounds va (llei f%a // fix stress and a sound: vallei/-e and compounds @@ -3946,7 +3986,10 @@ vodka vOtka // fix v sound and a sound in compounds: vodka/-bottel, etc. @) voerig f'ur@x2 // breedvoerig/uitvoeriger vo (ka f%u // fix stress and o sound: vokaal/vokale and compounds + vol (b fOl // restore default stress: volbaard/-bloed, etc. + vol (bring f%Ol // move default stress: volbring/-ing volk fOlk + volke fOlk@ // fix e sound: volkebeskrywing/-kundige/-reg vol (eindig f%Ol_ // fix o sound: voleindig(ing) vol (kome f%Ol vo (llA_ fO // volle/vollê/Volla - exception to: vo (lC f%O @@ -3968,6 +4011,7 @@ vo (lC f%O // volledig/volmaakte/voltooi vol (g fOl // volgeling/volgende/volgorde vol (groei f%Ol // fix stress: (on)volgroeid/-e/-es + _) vo (me f%u // fix stress and o sound: vomeer/-mering voren f'o@r@n // alvorens/vorentoe voog (dy f%o@x2 // fix stress: voogdy and compounds voor (afgaan f%o@r_ // move default stress: voorafgaan/-de/-s @@ -3990,6 +4034,7 @@ vorm fOr@m vorsti (n fOrst'I // fix stress: vorstin/-ne/-netjie and compounds vrede fre@d@ // fix e sound: tevredegestel/tevredener/vredemaker + vrede (liew fr%e@d@ // move default stress: vredeliewend/-e 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 @@ -3999,6 +4044,7 @@ vry (posti fr%eI // move default stress: vrypostig/-e/-heid vry (wil fr%eI // vrywillig/-lik|-heid vuldig f'Wld@x2 // sorgvuldig/veelvuldig/vermenigvuldig and variants + _) vul (gaat f%Wl // move default stress: Vulgaat and compounds vul (ka f%Wl // move default stress: vulkaan/vulkane/vulkanies vy (andig f%eI // move default stress: vyandig/-e/-heid vér f&:r // fix e sound: ver when stressed @@ -4064,7 +4110,9 @@ spoor) weg v&x2 // fix e sound: spoorwegaanleg/-aansluiting/-amptenaar/-eiendom/-inkomste/-ongeluk... _) wegge (C@P5 v'&x2@ // prefix: weggeja and similar weife (l veIf@ // fix e sound: weifelloos/-lose/-loosheid + _) weke (C ve@k@ // fix 2nd e sound: wekelang/-e welbehaaglik v%&lb@hA:x2l@k // move default stress: welbehaaglik/-e/-er/-ste + _) wel (edel v%&l_ // fix e sound and stress, insert pause: weledel/-e welf (_ v&lf // fix e sound: omwelf/oorwelf wel (skape v%&l // move default stress: welskape/-nheid wel (spreken v%&l // move default stress: welsprekend/-e @@ -4080,6 +4128,7 @@ wed (ren vEt // fix e and d sounds: (perde)wedren and other compounds @C) w (eë v // fix w sound: duikweë/staatsweë/uitweë, etc. t) w w + @d) w (aar v // fix w sound: skuldwaarborg/-waarskuwing/standaardwaarskuwing/veldwaarneming @C) w (aarde_ v // fix w sound in many compounds ending in -waarde bes) w (aarde w // but: gewetensbeswaarde, etc. s) w (ater v // fix w sound: Augrabieswaterval/gebiedswaters/opwaswater/varswater, etc. @@ -4097,6 +4146,7 @@ C) wag vax2 // fix w sound: bokwagter/skildwag and compounds/veldwagter k) wagga wax2a // fix w sound: kwagga/bergkwagga, etc. wankel (moed v%aNk@l // move default stress: wankelmoedig/-e/-heid + wanordeli (k v%an_Ord@l@ // move default stress: wanordelik/-e/-heid wan (stalt v%an // move default stress: wanstaltig/-e/-heid wan (trouig v%an // move default stress: wantrouig/-e wapen vA:p@n // fix problems with compounds and derivitives of wapen: ontwapening/wapengeweld @@ -4106,6 +4156,7 @@ bes) ware wA:r@ // geloofsbesware/gewetensbesware @C) w (arm v // fix w sound: snikwarm/te @s) was (K vas // fix w sound: ertswassery/kerswas/kombuiswasbak + wa (spore vA: // fix a sound: (osse-/perde-)waspore and similar @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. diff --git a/dictsource/de_list b/dictsource/de_list index b4cbaa31..4ba91c73 100644 --- a/dictsource/de_list +++ b/dictsource/de_list @@ -509,6 +509,7 @@ ebendaher e:b@ndah'e:r ebendahin e:b@ndah'In einander aIn'and3 einerlei aIn@*laI +einher aInh'e:r einig aInIC $only einige aInIg@ $u+ einiges aInIg@s $u+ diff --git a/dictsource/de_rules b/dictsource/de_rules index ab0c1719..0728fd5b 100644 --- a/dictsource/de_rules +++ b/dictsource/de_rules @@ -38,6 +38,7 @@ ai aI ay aI au aU + auh (_ aU ab (t_ A:p ag (t_ A:k @@ -348,6 +349,7 @@ _) e (ff %E l) e (g_ 'e: + eih (_ aI _) eil (aP3 'aIl _) eil (fP3 'aIl _) ein (@P3 _!'aIn diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 4733a3ce..1497fae9 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -383,8 +383,8 @@ t tS ts tS; v x z Z Dictionary id_dict -@ a aI aU e E i o -O u +@ a aI aU e E E2 i +o O u * : ? b d dZ f g h j k l m n N n^ @@ -421,3 +421,10 @@ I o u U y h j J k l m n p q r R s S t tS v w x z Z + + +Dictionary da_dict + +@- O V + +d n p diff --git a/dictsource/en_rules b/dictsource/en_rules index c6c23f47..e47a3f65 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -3095,6 +3095,7 @@ v) iv (al 'aIv ive (ness Iv _al) iv (e aIv + n) iv (e_ aIv _arr) iv (e aIv dr) iv (e_ aIv contr) iv (e 'aIv @@ -3113,6 +3114,7 @@ dr) iv (er aIv sh) iv (er Iv v) iv (e aIv + w) iv (e_ aIv XCC) iv (en Iv iv (or_ aIv @@ -3288,7 +3290,7 @@ mis (tres mIs mi (sta mI2 micr (o maIkr - micro (CC@ maIkr@ + micro (CC@ maIkr0 micro (CA@ maIkroU _) mi (nAr maI _) mi (nera mI @@ -4348,6 +4350,7 @@ s (cious sc (ept sk mu) sc (l s + @) scopy (_ =sk@pI2 m) s (i z a) s (el_ z m) s (y z diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 03efaf82..73f44e5b 100755 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -4,7 +4,7 @@ // 2006-11-18 Gilles Casse // -// Updated: 2008-05-27 Michel Such +// Updated: 2008-06-04 Michel Such // // * The rules are based on Cicero TTS. // Y @@ -23,6 +23,8 @@ aî E // maître aim (K W~ // faim ain (K W~ // pain + ai (_ e // dirai ferai... + ais (_ Ez2 // dirais ferais... f) ai (sA @ // faisons faisan a (ill a a (ils_ a @@ -629,6 +631,7 @@ _) half _^_en i i // cri X) i (a i // fiancer, fiable + _r) i (A i // rien ie (ment i // remerciement balbutiement C) ien (t_ i dév) ien (t_ i diff --git a/dictsource/id_list b/dictsource/id_list index 85f9e1f0..0c1b897a 100644 --- a/dictsource/id_list +++ b/dictsource/id_list @@ -139,3 +139,13 @@ adalah $u sebagai $u bahwa $u per p@r $u + + +// exceptions +// (use phoneme [E2] for an unstressed 'e' which does not reduce to [@] ) + +bebek bEbE2? +becek bEtSE2? +bekas $2 +perang $2 + diff --git a/dictsource/id_rules b/dictsource/id_rules index 5ea33ea8..2d7cbd22 100644 --- a/dictsource/id_rules +++ b/dictsource/id_rules @@ -69,7 +69,7 @@ n n ng N ny n^ - nj n^ +// nj n^ .group o o o diff --git a/dictsource/zh_list b/dictsource/zh_list index 5f0e6e82..212d1e50 100644 --- a/dictsource/zh_list +++ b/dictsource/zh_list @@ -1874,7 +1874,7 @@ $textmode 竹 zhu2 對 dui4 感 gan3 -儿 r5 +儿 er2 棚 peng2 壺 hu2 鶉 chun5 diff --git a/docs/languages.html b/docs/languages.html index 17414292..00267706 100644 --- a/docs/languages.html +++ b/docs/languages.html @@ -73,7 +73,7 @@ The variants are +m1 +m2 +m3 +m4 +m5 for male voices, The available voice variants can be listed with:
   espeak --voices=variant

3.4 Other Languages

-The eSpeak speech synthesizer does text to speech for the following additional langauges. +The eSpeak speech synthesizer does text to speech for the following additional languages.

    diff --git a/docs/voices.html b/docs/voices.html index 41d4df18..b4d166d7 100644 --- a/docs/voices.html +++ b/docs/voices.html @@ -166,7 +166,7 @@ don't have their own tone statement.

    dictrules  <list of rule numbers>
    -Gives a list of conditional dictionary rules which are applied for this voice. Rule numbers are in the range 0 to 31 and are specific to a language dictionary. They apply to rules in the langauge's _rules dictionary file and also its _list exceptions list. +Gives a list of conditional dictionary rules which are applied for this voice. Rule numbers are in the range 0 to 31 and are specific to a language dictionary. They apply to rules in the language's _rules dictionary file and also its _list exceptions list. See dictionary.html.

    diff --git a/phsource/compile_report b/phsource/compile_report index a82f150b..fd90fb55 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -1,4 +1,4 @@ -49 phoneme tables +50 phoneme tables new total base 98 98 base2 24 117 @@ -49,6 +49,7 @@ id 15 119 rw 15 124 ko 18 145 + da 15 128 Data file Used by b/b [b] base @@ -414,11 +415,13 @@ n^/n^#_ [n^#] is n/_n [n] base [n;] ro [n] zh + [n] da n/n_ [n] base [n2] fr [n;] ro n/n@ [(@)] base n/n#_ [n#] is + [n] da n^/n^a [(a)] base n/na [(a)] base n^/n^e [(e)] base @@ -431,6 +434,7 @@ n/nj [n] base [n.] base [n^] base [n;] ro + [n] da n/n_long_ [n] zh nn/_nn [N] base [N] en @@ -463,16 +467,13 @@ r2/r2u [(u)] base r3/r_ [r/] base [r/] af [r] fr - [r/] fr [r/] ru r3/r_@ [(@)] base -r3/r#_ [r/] fr - [r#] is +r3/r#_ [r#] is r3/r_a [(a)] base r3/r_e [(e)] base r3/r_i [(i)] base r3/r_n [r/] base - [r/] fr [r/] ru r3/r_o [(o)] base r3/r_ru [R4] ru @@ -501,7 +502,6 @@ r3/r_u [(u)] base r3/rx [*] base [r/] base [r/] af - [r/] fr [R] fr_ca [r/] ru [x] pt_pt @@ -513,6 +513,7 @@ r3/@tap [**] base [r] ko r3/@tap2 [**] base [r] ko +r/a_ [r] da r/r [r] base [r-] base [r] en_sc @@ -546,7 +547,6 @@ r/ru [(u)] base r/tr [r] base [r] en_sc [r] fr - [r/] fr r/trr [r/] base [r/] af [r] de @@ -1245,6 +1245,7 @@ vowel/a_2 [a] base2 [a] ro [a:] vi [a] rw + [a] da vowel/a#_2 [&] hr [a2] sv [&] is @@ -1258,6 +1259,7 @@ vowel/a_3 [a] en_sc [a:] la [a] is [A] zh + [A] da vowel/a#_3 [a2] en [a2] en_n [a2] en_us @@ -1333,6 +1335,7 @@ vowel/e [e] base2 [e] rw [e#] rw [e] ko + [e] da vowel/e# [I] en_sc [I2] en_sc vowel/e_2 [eI] en_sc @@ -1364,6 +1367,7 @@ vowel/ee_2 [E] en [E2] nl [E] zh [E#] ku + [&] da vowel/ee#_2 [E-] sv vowel/ee_3 [&] af [&:] af @@ -1389,6 +1393,7 @@ vowel/e_mid [E] en_rp [E] tr [E] id [E2] id + [E] da vowel/e_mid2 [E] af [E] de [E2] de @@ -1445,6 +1450,7 @@ vowel/i_4 [i] fi [i] hu [I] it [i] is + [i] da vowel/i_5 [i:] en_sc vowel/i#_5 [y] pt_pt [i/] pt_pt @@ -1533,6 +1539,7 @@ vowel/o_2 [o:] cy [o:] la [o:] no [o] ko + [o] da vowel/o-_2 [V] en_n [V] en_wm vowel/o_3 [oU] en_sc @@ -1541,11 +1548,13 @@ vowel/o-_3 [U] en_rp vowel/o_4 [oU] en_n vowel/o-_4 [o] ro vowel/o_5 [O] nl + [O] da vowel/o_6 [O:] nl vowel/o_7 [o] ku vowel/oe [W] en [W] af [W] de + [W] da vowel/oe_2 [W] no [W] tr vowel/oe_4 [W] sv @@ -1580,6 +1589,7 @@ vowel/oo_1 [O:] en_n vowel/oo_2 [0] en_sc [O] cy [o] cs + [0] da vowel/oo_3 [O] af vowel/oo_4 [O] base2 [0] en_wm @@ -1695,6 +1705,7 @@ vowel/V_3 [V] en_rp [V] ta vowel/V_4 [V] en_sc [@:] vi + [V] da vowel/V_6 [V] en_us vowel/y [y:] en [y:] de @@ -1729,6 +1740,7 @@ vowel/y_5 [y:] sv [y] ku vowel/yy [y"] fr_ca [y] no + [Y] da vowel/yy_3 [y] sv vowel/yy_4 [y] de [y] hu diff --git a/phsource/mbrola/de2 b/phsource/mbrola/de2 new file mode 100644 index 00000000..be24daaf --- /dev/null +++ b/phsource/mbrola/de2 @@ -0,0 +1,66 @@ +0 I ; 0 i: +0 3 VWL 60 6 R + +0 b VWL 0 b +0 b NULL 0 p +0 d VWL 0 d +0 d NULL 0 t +0 g VWL 0 g +0 g NULL 0 k +0 z VWL 0 z +0 z NULL 0 s + +0 l/2 NULL 0 l +0 l/ NULL 0 l +0 r/ NULL 0 6 +0 r- NULL 0 R +0 l- NULL 0 l +0 w/ NULL 0 U +0 j/ NULL 0 j +0 ; NULL 0 NULL +0 g- NULL 0 NULL +0 @- NULL 0 NULL +0 * j 0 6 +0 * NULL 0 R + +0 E2 NULL 0 E +0 y NULL 0 Y +0 W NULL 0 9 +0 A: NULL 0 a: +0 A NULL 0 a: +0 Y: NULL 0 2: +0 OI NULL 0 OY +0 3 NULL 0 6 +0 _| NULL 0 _ +0 pF NULL 0 pf +0 r NULL 0 R + +0 eI NULL 60 E j +0 oU NULL 0 o: +0 W~ NULL 0 E~ +0 A~ NULL 0 a~ +0 O~ NULL 0 o~ + +// phonemes for English words +0 @L NULL 50 @ l +0 @2 NULL 0 @ +0 @5 NULL 0 @ +0 a2 NULL 0 @ +0 I2 NULL 0 I +0 aa NULL 0 a +0 V NULL 0 a: +0 0 NULL 0 O +0 3: NULL 0 @ +0 i@ NULL 60 i: @ +0 i@3 NULL 60 i: @ +0 e@ NULL 60 E @ +0 o@ NULL 70 o: 6 +0 O@ NULL 70 O 6 +0 O: NULL 0 O +0 A@ NULL 70 a: 6 +0 U@ NULL 60 U @ +0 aI@ NULL 70 aI @ +0 aU@ NULL 70 aU @ + +0 dZ NULL 0 tS +0 w NULL 0 v diff --git a/phsource/nn/nn_ b/phsource/nn/nn_ index d2a2d2b0..5e2a5b0c 100644 Binary files a/phsource/nn/nn_ and b/phsource/nn/nn_ differ diff --git a/phsource/ph_afrikaans b/phsource/ph_afrikaans index 0592a144..82cfeffb 100755 --- a/phsource/ph_afrikaans +++ b/phsource/ph_afrikaans @@ -51,7 +51,7 @@ endphoneme phoneme u // short OE vowel starttype (u) endtype (u) - length 140 + length 110 formants vowel/uu_3 endphoneme @@ -84,7 +84,7 @@ endphoneme phoneme A: // long A vowel starttype (a) endtype (a) - length 230 + length 280 formants vowel/aa_3 endphoneme @@ -98,7 +98,7 @@ endphoneme phoneme i // long I vowel starttype (i) endtype (i) - length 130 + length 100 formants vowel/i_3 linkout ; endphoneme diff --git a/phsource/ph_french b/phsource/ph_french index c6c0fc5e..78eaafb5 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -325,18 +325,15 @@ phoneme R after r r/rr%60 endphoneme - -phoneme r/ // used for [r] when not preceding a vowel +phoneme r/ // variant of [r] when not preceding a vowel vcd uvl frc starttype r endtype r length 100 - lengthmod 2 // - formants r3/r#_+r3/rx%60 - after t r/tr%60 - before n r3/r_n+r3/rx%60 - before _ r3/r_%60 + lengthmod 7 // + formants NULL endphoneme + phoneme s vls alv frc sibilant vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/phonemes b/phsource/phonemes index 7067c5c3..1047bfae 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -1281,3 +1281,6 @@ include ph_kinyarwanda phonemetable ko hi include ph_korean + +phonemetable da is +include ph_danish diff --git a/phsource/vdiph/8u b/phsource/vdiph/8u index 6b9bf432..618ca5d5 100644 Binary files a/phsource/vdiph/8u and b/phsource/vdiph/8u differ diff --git a/phsource/vowel/aa_3 b/phsource/vowel/aa_3 index 994aaa6c..937fff73 100644 Binary files a/phsource/vowel/aa_3 and b/phsource/vowel/aa_3 differ diff --git a/src/espeak.cpp b/src/espeak.cpp index 19b5b35b..581c31ec 100644 --- a/src/espeak.cpp +++ b/src/espeak.cpp @@ -67,7 +67,7 @@ static const char *help_text = "\t = is omitted, all punctuation is spoken.\n" "--split=\"\"\n" "\t Starts a new WAV file every . Used with -w\n" -"--voices=\n" +"--voices=\n" "\t List the available voices for the specified language.\n" "\t If is omitted, then list all voices.\n" "-k \n" diff --git a/src/speak.cpp b/src/speak.cpp index fa0e04bb..f8645e2f 100755 --- a/src/speak.cpp +++ b/src/speak.cpp @@ -101,7 +101,7 @@ static const char *help_text = "\t = is omitted, all punctuation is spoken.\n" "--split=\"\"\n" "\t Starts a new WAV file every . Used with -w\n" -"--voices=\n" +"--voices=\n" "\t List the available voices for the specified language.\n" "\t If is omitted, then list all voices.\n" "-k \n" diff --git a/src/speak_riscos.cpp b/src/speak_riscos.cpp index 6ff133a0..9426bb1a 100644 --- a/src/speak_riscos.cpp +++ b/src/speak_riscos.cpp @@ -130,7 +130,7 @@ static const char *help_text = "--punct=\"\"\n" "\t Speak the names of punctuation characters during speaking. If\n" "\t = is omitted, all punctuation is spoken.\n" -"--voices=\n" +"--voices=\n" "\t List the available voices for the specified language.\n" "\t If is omitted, then list all voices.\n" "-k \n" diff --git a/src/synth_mbrola.cpp b/src/synth_mbrola.cpp index ec66e8ec..21cf287f 100755 --- a/src/synth_mbrola.cpp +++ b/src/synth_mbrola.cpp @@ -209,7 +209,7 @@ int GetMbrName(PHONEME_LIST *plist, PHONEME_TAB *ph, PHONEME_TAB *ph_prev, PHONE // bit 0 skip the next phoneme // bit 1 match this and Previous phoneme // bit 2 only at the start of a word - // bit 4 don't match two phonemes across a word boundary + // bit 3 don't match two phonemes across a word boundary pr = mbrola_tab; while(pr->name != 0) diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 1b3d41ab..6d5f8459 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.37.02 05.Jun.08"; +const char *version_string = "1.37.04 27.Jun.08"; const int version_phdata = 0x013400; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index 901ccf21..00f946fd 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -151,6 +151,20 @@ Translator *SelectTranslator(const char *name) } break; + case L('d','a'): // Danish + { + static const unsigned char stress_amps_da[] = {16,16, 20,20, 20,24, 24,22 }; + static const short stress_lengths_da[8] = {160,140, 200,200, 0,0, 220,210}; + tr = new Translator(); + SetupTranslator(tr,stress_lengths_da,stress_amps_da); + + tr->langopts.stress_rule = 0; + SetLetterVowel(tr,'y'); +// tr->langopts.numbers = 0x11849; + } + break; + + case L('d','e'): { static const short stress_lengths_de[8] = {150,130, 190,190, 0, 0, 260,275};