diff --git a/dictsource/af_list b/dictsource/af_list index 64666d12..c8b432f9 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 @@ -228,7 +228,6 @@ george _^_EN gerhard x2&rart gerhardus $2 gloria glO:ria -gouws x2@Us grange x2rA:nsi gustav gustaf havenga hA:f@Nx2a @@ -262,7 +261,6 @@ levi le@fi louis luI louise luw'i:z -louw l'@U mbeki mbE:ki magdalena $3 malan mal'an @@ -316,12 +314,14 @@ sebastian s@bastian servaas s@rfA:s shakespeare _^_EN stephan ste@fan +stephanus st@fA:nWs strauss straUs tania tanja telemann te@l@man terblanche t@rblA:nS theron tr'On toerien $2 +trudie trudi viljoen $2 villiers vIli@rs vincent _^_EN @@ -770,7 +770,6 @@ staccato $2 terdeë $2 terug t@-rWx2 tesaam t@sA:m -tesame t@sA:m@ tevrede t@fre@d@ toegee tux2e@ totale tut'A:l@ diff --git a/dictsource/af_rules b/dictsource/af_rules index 4c408140..f6fffffa 100755 --- a/dictsource/af_rules +++ b/dictsource/af_rules @@ -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 @@ -119,7 +119,7 @@ ar (gaï %ar // move default stress: argaïes/-e arge (tip %arx2@ // move default stress: argetipe/argetipies/-e ar (moedig %ar // move default stress: armoedig/-e/-heid - arte (ri %arte@ // fix stress and e sound: arterie/-ë/-s + _) arte (ri %arte@ // fix stress and e sound: arterie/-ë/-s _) asbes %asbEs // fix stress and e sound: asbes and many compounds a (siel %a // shorten a sound and move default stress: asiel and compounds asse (gaai %as@ // move default stress: assegaai/-e @@ -627,8 +627,11 @@ // &C) dele (_ de@l@ _) dames d'A:m@s // numerous compounds with dames - de (ba d@ // debat/-te/debakel + de (bA d@ // debat/-te/debakel/waardebepaling deba (tteer d@b%a // move default stress to end: debatteer + debi (te d%Eb%i // fix stress and e sound: debiteer/debiteur/debitering + debu (ta d%Eb%y // fix stress and e sound: debutant/-e and compounds + debu (te@ d%Eb%y // fix stress and e sound: debuteer/debutering 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 @@ -674,6 +677,9 @@ d (riem_ t // fix t sound: gordriem/halsbandriem dril (A drIl // fix i sound when vowel follows dril: driloefening/-opleiding droef (gees dr%uf // move default stress: droefgeestig/-e/-er/-ste/-heid + @) d (roos t // fix d sound: draadrooster/maand-/strand-/veldroos + @) d (rose_ t // fix d sound: maand-/strand-/veldrose + @) d (rosie t // fix d sound: maand-/strand-/veldrosie/-s @) d (t // drop d: breedte/handtekening/rondte/rondtrek... @n) d (uit t_ // fix d sound and insert short break: enduit/handuit and similar @) dwes tv'Es // noordwes/te/lik/e suidwes/te/lik/e @@ -701,6 +707,7 @@ ros) e (CA @ // fix e sound: rosegeur/roseweg speld) e (C @ // fix e sound: speldekop/-kussing/-punt, etc. spok) e (C @ // fix e sound: compounds beginning with spoke: spokebeeld/-lywe/-dans + styw) e (C @ // fix e sound: stywepas/stywesiek/-te blak) e (r @ // fix e sound: blakerend/-e/blakering skilf) e (r @ // fix e sound: skilferagtig/skilferdeeg/-kors/afgeskilferde/verskilfering syf) e (r @ // fix e sound: (be-/in-/ont-/uitsyfering @@ -731,6 +738,7 @@ And) e (lC @ // fix e sound: swendelfirma/vaandeldraer and similar _ad) e (lC @ // fix e sound: adelbors/-trots/-stand, etc. Cing) e (lA @ // fix e sound: dwingeland/klingeling/kringelend/tingeling + Cing) e (lC@ @ // fix e sound: stingelblare/-deel/-groente/-lit.../swingelboor/-hout/-pomp... maand) e (lA @ // fix e sound: (twee)maandelikse/maandelange KeuC) e (lC@ @ // fix e sound: euweldaad/kneukelbeentjie/kreupelsorg/onkreukelbaar... @mp) e (lC@ @ // fix e sound: dompeldoop/-koker/-verwarmer/drumpeltrapper/pampelmoes/rimpelpapier... @@ -895,6 +903,7 @@ %C) e (tt+ E // fix e sound: (enkelveel)lettergrepige/koppelletter/krulletter/spannette ll) e (lK & // parallel/-le @s) e (l@ @ // e sound in words like borselkop/voedselaanvulling and many similar + tronks) e (l & // fix e sound: tronksel/-selletjie @s) e (lfde '& //fix dieselfde Cs) e (lf & // e sound in words like terselfdertyd/vanselfsprekend Cs) e (lle_ & // e sound in words like bloedselle/limfselle/stamselle/tronkselle @@ -975,6 +984,7 @@ lew) e (ns @ &d) e (r@ @ // not initial or final syllable + @C) e (reë @ // fix e sound: geelperskereën/tropereën, etc. @d) e (rnst & // but fix e sound in doodernstig/-e &t) e (r@ @ &b) e (s@ @ @@ -1019,6 +1029,7 @@ hip) e (r @ _) er (b &r' // erbarm/ing erke (n %&rkE // fix stress and e sounds: erken/-ning/(self)erkende + w) erke (n &rk@ // but: (mede/terug)werkend/-e _) er (v &r' // ervaar/ervare/ervarings/ervaringe &) ere (_ @r@ @l) ere (_ e@r@ // fix e sound: staanlere/toonlere @@ -2125,6 +2136,7 @@ ment m'Ent mental (iteit m,Ental // fix stress: mentaliteit/sentimentaliteit and compounds mentjie m'EiNci // monumentjie/dokumentjies + @C) mere (_ me@:r@ // fix penultimate e sound: sout(water)-/strandmere me (riete m@ // move default stress: meriete and compounds merino m@rin%u // fix stress and vowel sounds: merino/-skaap/-ram, etc. me (rrie mE // fix e sound: merrie/-s/perdemerrie and similar compounds @@ -2313,6 +2325,7 @@ oy OI ou @U ouder (wet %@Ud@r // move default stress: ouderwets/-e, etc. + ouw (K @U // Gouws/Louw/Touwsrivier oetjie uIci oentjie uINci @@ -3122,7 +3135,11 @@ stimu (lA st@m%y // move default stress and fix i sound: stimuleer/stimulering/stimulasie _) sub (a sWb_ // subagent/subartikel/subatomies, etc. sub (li s%Wb // move default stress: subliem/-e + subli (mA s%Wbl%i // move default stress: sublimaat/-ate/sublimering + sublimi (na s%Wbl%im%i // move default stress: subliminaal/-ale + sub (sidA s%Wb // move default stress: subsidie/-s and compounds sub (stansie s%Wp // move default stress and fix b sound: substansie/-s/substansieel/-siële + substi (tu s%Wbst@ // move default stress: subsistuut/-tute 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. @@ -3131,19 +3148,27 @@ sukses s%WksEs // sukses/suksesse/suksesvol/reusesukses _) su (meri s%u // fix stress and u sound: sumeries/-e su (mmier s%W // move default stress: sumier/-e + surro (ga s%Wr%u // fix stress and o sound: surrogaat/surrogate and compounds su (saC s%u // fix stress and u sound: susan/-na/susara + _) sw sw // fix w sound: words beginning with sw-: swerweling/swetend + swaar (lyw sw%A:r // move default stress: swaarlywig/-e/-heid + swaar (moed sw%A:r // move default stress: swaarmoedig/-e/-heid swag sv'ax2 + swa (hili sw%a // fix stress and a sound: swahili/-'s swart (gal sw%art // move default stress: swartgallig @) swem (_ swEm // fix e sound of compounds ending in swem: uitswem/wegswem... - swerk sv&rk + @) swerk sv&rk .group st D_) ste st@ //ste after numbers 22ste etc. + stalag (Ciet st%al%ax2 // fix stress and 1st a sound: stalagmiet/stalagtiet/-e stan (da st%an // standaard/-e/standardisering standerd (@ st%and@rt // compounds starting with standerd + stand (houde st%ant // move default stress: standhoudend/-e/-heid stand (vasti st%ant // move default stress: (on)standvastig/-e/-heid stapel stA:p@l // fix e sound: (op)stapeling/stapelaar staties st'A:tis + sta (tutA st%a // fix stress and a sound: statute/statutêr steding ste@d@N // besteding and compounds C) steker ste@k@r // e sound: (aan/dop/kwaad/rugsteker/-s/-y, etc. _ne) stel st@l // fix e sound: nestel/-end @@ -3174,21 +3199,26 @@ sterrei st@r'eI sterre st&r@ sterretjie st'&rici - + sterwens (@ st&rv@ns_ // fix 2nd e sound and insert paus: sterwensuur/-kreet/-nood and similar ste (m stE // eliminate one m in derivitives like stemming stempel stEmp@l // fix 2nd e sound: stempelband/-datum/-gereedskap/-hamer/-jaar/-letter... stewel ste@v@l // sokkerstewels/stewelmaker and other compounds stie (beu st%i // move default stress: stiebeuel and compounds @) 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 sti (pulA st@ // stipuleer/stipulering/stipulasie stof (o stOf? // fix 1st o sound: stofomslag/-omslae/stofopskoppery stok (A stOk? // stokagtig/stokinsek/stokoud stok (e sto@k // stoker/-y storm stOr@-m + stout (moedi st%@Ut // move default stress: stoutmoedig/-e/-heid + strand (o strant_ // fix d sound and insert pause: strandoord/-e strategie str%at@x2i // fix stress and vowel sounds: strategie and compounds strategies str%ate@x2is // fix stress and vowel sounds: strategies/-e streke stre@k@ + strig (nien str@x2 // move default stress: strignien and compounds + strukt (u str%Wkt // correct stress: strukture/bevelstruktuur/-ture studen (t st%ydEn // fix stress: student/regstudent/studentesentrum, etc. stu (de st%y // fix stress and e sound: bestuderend/bestudering @@ -3200,11 +3230,17 @@ A) tch _^_EN // clutch/pitch/bitch tabak t%abak; 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 + taiwa (n t%aIwa // fix stress and w and a sounds: Taiwan/Taiwanese + taksider (m t%aks%id%&r // fix stress and e sound: taksidermie/taksidermis/-te @) talig t'A:l@x2 // Anderstalig/tweetalig @) ta (lis t%a // shorten a sound: hospitalisasie/kapitalisme/katalisator and similar _) ta (ma t%a // tamatie and compounds _) ta (mb t%a // tamboer and compounds/tambotie and compounds + tamboe (ryn t%amb%u // move default stress: tamboeryn/-e and compounds + 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 @@ -3224,6 +3260,7 @@ @) tiewe (_ t'iv@ // alternatiewe/aktiewe/instinktiewe/(ak)kumulatiewe tink (tink t@Nk // move default stress: tinktinkie/-s ti (ra t%i // move default stress tiran tirade + tira (nnie t%ir%a // move default stress: tirannie titel tit@l // fix e sound: (on)getiteld/titelblad/-geveg and many similar tj tS @) tj (a tj // separate tj: agtjarig/blatjang/bontjas/olifantjag/ouditjaar/tweegatjakkals @@ -3247,6 +3284,7 @@ toegewen (d t%ux2e@v@n // move default stress: toegewend/-e/-heid toe (komsti t%u // move default stress: toekomstig/-e toenemen tun'e@m@n //toenemend/e/er + toepaslik t%upasl@k // move default stress: toepaslik/-e/-heid toereike t%ureIk@ // toereikend/heid toereken (b t%ur'e@k@n // ontoerekenbaar/heid/ontoerekenbaarheid toneel t%une@l @@ -3262,10 +3300,12 @@ toi (let t%OI // move default stress: toilet and compounds tokke (lo t%Ok@ // move default stress: tokkelos/-sie/tokkelok and compounds tok (tokk t%Ok // move default stress: toktokkie/-s/-spelery, etc. + _) to (na t%o@ // fix stress and o sound: tonaal/tonale @) toris (_ t'o@r@s // fix stress: pectoris/klitoris tra (dis tr%a// shorten and unstress 1st slb: tradisie/tradisioneel trag (ed tr%ax2 // move default stress: tragedie and compounds tra (jek tr%a // move default stress and shorten a sound: trajek/-te + _) trak (ta tr%ak // move default stress: traktaat/traktate _) trans (@P5 tr%ans // transatlanties/transformasie/transoranje/Transvaal, etc. _) trans (aksie tr%ans // remove small break: transaksie/-s and compounds trap (soe tr%ap // move default stress: trapsoetjies/-e @@ -3274,16 +3314,20 @@ @) treer tr'e@r // this slb always takes stress; many words tref (afs trEf_ // fix e sound and insert short pause: trefafstand/-e trens (_ tre~ns // fix e sound and nasalise: trens/-snytrens and similar + _) tri (bu tr@ // fix stress and i sound: tribuun/tribune/tribuut/tribute + _) tribu (na tr@b%y // fix stress and i sound: tribunaal/tribunale/tribunaat tre (k tr& trekker tr&k@r // voortrekkerleier/Voortrekkerstraat/salaristrekkersvergadering 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 + 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 _) trom (pet tr%Om // move default stress: trompet/-tte/-tter and compounds tro (tseer tr%O // stress: trotseer/getrotseer tro (tsering tr%O // move default stress + truk (aats tryk // default stress: trukaatser/-s tru (spieë try // fix u sound: truspieël/-tjie/-s ttel t@l // many compounds of bottel/skottelgoed tuiglik t'Yyx2l@k // stress: werktuiglik/sintuiglik/-e/-heid @@ -3292,6 +3336,7 @@ tuur t'yr parti) tuur ty:r // compounds ending with partituur take default stress: musiekpartituur s) tuur ty:r // "uur" in stuur takes default stress: weggestuur + twyfe (l tweIf@ // fix e sound: twyfelloos/twyfellose @) ty (dig t'eI // gelyktydig/vroegtydig @@ -3307,6 +3352,7 @@ teks (tiel t%Eks // move default stress: tekstiel and compounds _) teks (tu t%Eks // move default stress: tekstuur/teksture _) tele (C t%&l@ // telefoneer/telekommunikasie, etc. + @) tele (gra t&l@ // fix e sound in compounds: riem-/spoedtelegram/veldtelegraaf, etc. teleks t&lEks // fix stress and vowel sounds: teleks and compounds _) teler te@l@r // fix stress and vowel sounds: teler/-s/-y/-svereniging, etc. @C) te (nk t& ++ //tenk and friends @@ -3319,6 +3365,7 @@ te (oC t%i% // teologie/-loog/-logies/teorie/teoreties 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 teks (+ tEks // compounds with teks tempel tEmp@l // fix e sounds: afgodtempel/Hindoetempel/kultuurtempel/tempelbewaarder/tempeldienaar tent (_ tEnt //suurstoftent and others @@ -3353,6 +3400,7 @@ 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 + teens (woor t%e@ns // move default stress: teenswoordig/-e 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 @@ -3374,6 +3422,7 @@ teltjie t@lki @) tel (o t@l // hartelose/besluiteloos/gedagtelose ke) te (l t@ // fix 2nd e sound in many compounds with ketel + tendens t%Ende~ns // fix stress and e sounds: tendens/-e and compounds &) tert (A t@rt // fix e sound: agtertoe/foltertuig/gietertuit/kilometertoelae/lastertaal/letterteken &) tert (r t@rt // fix e sound: pleistertroffel/venstertralie/ystertralies/ystertrap &s) tert (aan t&:rt // fix e sound: swa(w)elstertaandpak/-ke @@ -3405,6 +3454,7 @@ ul) terende (_ t'e@r@nd@ //konsulterende resulterende ver) terende (_ t'e@r@nd@ //verterende in compounds ter (myn t%&r // move default stress: termyn/-aandele/-versekering, etc. + tesame t@sA:m@ // fix stress and vowel sounds: moved here because of compounds with tesame: tesamebeleid C) te (tjie ti // fix e sound: holtetjie/groentetjies/laagtetjie, etc. tewe (_ te@v@ // fix e sound: (agter/voor)stewe/tewe and compounds @@ -3418,7 +3468,7 @@ ui Yy uie (C Yy@ // graansuierdiens/kruiersloon/kuiergas/luierbroekie/sluierdoek/suierklep/getuienis uy Yy - + _) uit (@P3 'Yyt // uit- is prefix: uitademing, etc. uit (bund %Yyt // move default stress: uitbundig and derivitives uit (dagen %Yy // move default stress: uitdagend/-e uit (druk %Yyt // move default stress @@ -3429,6 +3479,7 @@ uit (eenloop Yyt_ // restore default stress: uiteenloop uiteen (lop %Yyt_%e@n // move stress to 3rd slb.: uiteenlopend/uiteenloping uiteindeli %YyteInd@l@ // move default stress: uiteindelik/-e + uiter Yyt@r // uit- not prefix: uiters/uiterlik/uitermate uitgee (+ 'Yytx2e@ // se rule: _) uitge (@P5 Yytx2@ uit (kansel ''Yyt // enforce stress on 1st slb: uitkanselleer uit (sluiten %Yyt // move default stress: uitsluitend/-e @@ -3655,6 +3706,8 @@ vleis) w v // fix w sound: vleisweefsel/-woekering/-wange ooC) w v // booswig/grootwild/ooswaarts/ %At) w v // fix w sound: bloedvaatweefsel/laatwinter/privaatwelsynsorganisasies... + swart) w v // fix w sound: swartwildebees/-witpens/-woud, etc. + Cut) w v // fix w sound: geskutwerf/stutwal/-le out) w v // houtwerk/soutwater and similar yd) w v // fix w sound: sluittydwerk/(wa)wydwakker wee (moedi v%e@ // move default stress: weemoedig/-e/-heid diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 57db87f5..a2328e85 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -111,14 +111,15 @@ S s2 t v Z Dictionary fr_dict -@ @- a A A~ e E E~ -i o O O~ u W w^i W~ -y Y +@ @- a A A~ e E E: +E~ i i: o O O~ u W +w^i W~ y Y -: ; b c d dZ f g -h j k l L m n N -n^ p r R s S t t2 -tS v w z Z z2 z3 +* - : ; b c d dZ +f g h j k l L m +n N n^ p r R s S +t t2 tS v w z Z z2 +z3 Dictionary hi_dict @@ -358,10 +359,11 @@ t tS v w x z Z Dictionary th_dict -3 a E i i: O O: +a a: e E: i i: o O +O: u y -: c d h k l m n -N p s t2 +c d h k l m n N +p s t Dictionary hbs_dict @@ -378,9 +380,10 @@ ts tS; v x z Z Dictionary id_dict -@ a aI aU E i O +@ a aI aU e E i o +O u * ? b d dZ f g h j k l m n N n^ p -q r R s S t tS v -w x z +r R s S t tS v w +x z diff --git a/dictsource/en_rules b/dictsource/en_rules index b4698926..4917fee4 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -3151,7 +3151,7 @@ lle (_ l @@o) lled (_$3v d @@) lled (_$3v d - B) l (_ @L + B) l (_N @L w) l (_ l r) l (_ l Al) l (_ @@ -4205,7 +4205,7 @@ r r rr r r) r (_ - C) r (_ r@ + C) r (_N r@ e) r (_ 3 @) r (B @ 3_) rd (_ diff --git a/dictsource/fr_list b/dictsource/fr_list index 7e687639..05e105e6 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -1,8 +1,11 @@ + // This file in UTF8 encoded // 2006-11-18 Gilles Casse // +// Updated 2008-01-21 Michel Such +// // * Numbers, a few abbreviations and exceptions. // @@ -101,7 +104,7 @@ _4 k'atR _5 s'E~c _6 s'iz3 _7 s'Et -_8 'w^it +_8 _|'w^it _9 n'@f _10 d'iz3 _11 O~z @@ -160,7 +163,7 @@ _1M1 m'il _0M2 milj'O~ _0M3 milj'aR _0and e -_dpt pw'E~ +_dpt virg'yl // ABBREVIATIONS @@ -169,22 +172,32 @@ _dpt pw'E~ (http ://) aSt,et,ep'e abc $abbrev ac $abbrev +adsl $abbrev +amd $abbrev api $abbrev +cci $abbrev cio $abbrev ctrl kO~tRol dept depaRt@mA~ etc etseteRa hmm h@m ibm $abbrev +ide $abbrev ip $abbrev +jaws Z'owz kde $abbrev m. m@sjY mbrola Em'bRola mlle mad@mwazEl mme madam mr m@sjY +nti $abbrev +nvda $abbrev +pci $abbrev +pda $abbrev p.s postskRiptOm ratp $abbrev +scsi $abbrev s.t.p s'il:t'@:pl'E s.v.p s'il:v'u:pl'E st s'E~ @@ -194,6 +207,7 @@ svp s'il:v'u:pl'E url $abbrev usb $abbrev utf $abbrev +wma $abbrev xfce iksEfse@ xy $abbrev @@ -207,47 +221,36 @@ prof $dot // articles le $u $nounf la $u $nounf -les lEz2 $u $nounf +les lez2 $u $nounf ?2 les lez2 $u $nounf un $u $nounf une $u $nounf // conjonctions -et e $u $brk -ou $u $brk -car $u $brk -soit $u $brk mais $u $brk ou u $u $brk +et e $u $brk donc $u $brk or $u $brk ni $u $brk car $u $brk +soit $u $brk cependant $u $brk néanmoins $u $brk toutefois $u $brk comme $u $brk +dont dO~t2 $u $brk lorsque $u $brk puisque $u $brk quand $u $brk que $u $brk -qui $u $brk $verbf +qui $u $verbf quoique $u $brk si $u $brk -// (à cause que) $u $brk -// (ainsi que) $u $brk -// (à mesure que) $u $brk -// (après que) $u $brk -// (à moins que) $u $brk -// (au lieu que) $u $brk -// (aussitôt que) $u $brk -// (pendant que) $u $brk -// (pourvu que) $u $pause - // pronouns je $u $verbf tu $u $verbf @@ -261,20 +264,22 @@ on $u $verbf me $u $verbf te $u $verbf se $u $verbf +lui $u $verbf ce $u $nounf +cette $u $nounf ces sEz2 $u $nounf // possessives ma $u+ $nounf mon $u+ $nounf -mes mEz2 $u+ $nounf +mes mez2 $u+ $nounf ta $u+ $nounf ton $u+ $nounf -tes tEz2 $u+ $nounf +tes tez2 $u+ $nounf sa $u+ $nounf son $u+ $nounf -ses sEz2 $u+ $nounf +ses sez2 $u+ $nounf notre $u+ $nounf votre $u+ $nounf leur $u+ @@ -285,7 +290,7 @@ leurs $u+ // prepositions de $u $nounf du $u+ $nounf -des dEz2 $u $nounf +des dez2 $u $nounf ?2 des dez2 $u+ $nounf @@ -296,8 +301,8 @@ aux $u $brk dans $u+ $brk sur $u+ $brk par $u+ $brk -pour $u+ $brk -en $u+ $brk +pour $u+ +en $u+ (en effet) A~nEf'E $brk vers $u+ $brk @@ -317,35 +322,36 @@ où $brk // auxillary verbs (be, have, can, etc) suis $u+ $verb +es Ez2 $u+ $verb est Et2 $u+ d'est d'Est sommes $u+ êtes $u+ -sont $u+ +sont $u+ $verb -étais $u+ -était $u+ -étions $u+ -étiez $u+ -étaient $u+ +étais $u+ $verb +était $u+ $verb +étions $u+ *verb +étiez $u+ $verb +étaient $u+ $verb -serai $u+ -sera $u+ -seras $u+ -serons $u+ -serez $u+ -seront $u+ +serai $u+ $verb +seras $u+ $verb +sera $u+ $verb +serons $u+ $verb +serez $u+ $verb +seront $u+ $verb eu y $u+ -eus yz2 $u+ -eut yt2 $u+ eue y $u+ eues yz2 $u+ +eus yz2 $u+ +eut yt2 $u+ $verb // some common adjectives and adverbs quelque $u -tout $u +tout t'ut2 $u // Letters which can be words @@ -357,6 +363,7 @@ y i:gR'Ek $atend // pronunciation exceptions +consent kO~s'A~t2 divers div'Erz2 scient si bénéficient benefisi $verb @@ -364,7 +371,7 @@ président pRezid'A~ président pRezidt2 $verb résident Rezid'A~ résident Rezidt2 $verb -récipient Resipj'A~ +ressent r@s'A~t2 ►évident evid'A~ évident evidt2 $verb couvent k'uvt2 $verb @@ -385,11 +392,8 @@ torrent tOR'A~ monsieur m@sjY montréal mO~Real -(il y a) ili;a $u -(il y) ili $u (n'est ce pas) nEspa (qu'est ce que) kEsk@ $u -(ce qui) s@ki $brk (cent un) s'A~||W~ (cent unième) s'A~||ynj'Em (cent une) s'A~||yn @@ -400,14 +404,11 @@ absent absA~ accident aksidA~ adéquat adekuat2 adéquate adekuat -adéquats adekuaz2 -adéquates adekuatz2 ardent aRdA~ boeufs bY bus bys choeur kWr discident disidA~ -echo Eko fils fis haillon _|ajO~ haricot _|aRiko @@ -421,25 +422,23 @@ pays pEi prudent pRydA~ secret sYkRE secrets sYkREz2 +souris suri sens sA~s c'est sEt2 $u+ qu'à ka -qu'y ki -s'y si -m'y mi -t'y ti +m'y mi $verbf +t'y ti $verbf +s'y si $verbf +qu'y ki $verbf (sud est) sydEst (nord est) nOREst -écho Eko cci $abbrev nvda $abbrev -open Op'En -outlook autluk -potentiomètre pOtA~sjOmEtR -reader Rid'WR +open Op'@n +potentiomètre pOtA~sjOmEtR@- processus pROsEsys @@ -449,9 +448,16 @@ azimut azim'yt brut bR'yt but by $verb but byt +club kl@b +(le pub) l@||p'@b +(un pub) W~||p'@b +(du pub) dy||p'@b connecticut kOnEktikyt +cut cWt helmut Elmut +hub _|@b mazout mazut +michael mikaEl out aut rut Ryt scorbut skORbyt @@ -470,8 +476,6 @@ exocet EgzOsEt fret fR'Et gadget gadZEt hamlet amlEt -internet E~tERnEt -(internet explorer) E~tErn'Et||EksplOr'Wr jacket ZakEt knesset knEsEt lazaret lazaREt @@ -482,19 +486,6 @@ pickpocket pikpOkEt racket RakEt set sEt soviet sOvjEt -//ticket tikE - -// ct (ct are not said) -aspect aspE -aspects aspE -circonspect ciRcO~spE -irrespect iREspE -prospect pROspE -respect REspE -suspect syspE - -// st (t is not said) -prévost pRevo // urt (t is said) kurt kuRt @@ -519,42 +510,69 @@ flirt fl@Rt (tee shirt) tiS@Rt parfum paRfW~ -forum fOR@m +forum fOROm // words from other languages +amazon amaz'On +(audible manager) od'ibl||manadZ'@r +bluetooth blut'us boy bOj byte bajt bytes bajts +cleaner kli:n@r +(cyber link) sibEr||link debian dEbjAn +driver drajv@rz2 download dOnlod emacs Emaks -emacspeak Emakspik -espeak @spik +emacspeak Emakspi:k +espeak @spi:k +ethernet etERnEt firefox faj@RfOks -thunderbird f@ndERb@Rd +google gu:g'@l girl g@Rl gnome gnom gnu gnu insight insajt +internet E~tERnEt +(internet explorer) E~tErn'Et||EksplOr'@r +leader li:d@R +light lajt +link link liszt list +lite lajt (mac os x) makoEsiks +mail mE:jl +maker mE:jk@r +media medja +messenger mesEnZ'@r +movy mu:v'i +new nj'u +news nj'uz night najt +ok oke +outlook autluk +player plEj'@r +reader Ri:d@R redhat REdat schubert SubER +screamer skri:m@r +(search & destroy) s@:rS_||end_||dEsstrOj +shrink Sr'ink +skype sk'ajp@- +spybot spajbOt sun s@n sunlight s@nlajt +(text aloud) tEkst||@lau-d +thunderbird f@ndERb@Rd ubuntu ubuntu +update @pd'E:jt +upload @plod viavoice viavOjs windows windoz -word wORd +word wWRd wright _^_EN -update @pd'ejt -skype sk'ajp@- -bluetooth blut'us -messenger mEsE~nZ'Wr -player plEj'Wr -movy muv'i -maker mEjk'Wr +writer rajt@r yacht jot @@ -564,53 +582,38 @@ ajoutions aZutjO~z2 apportions apORtjO~z2 apprêtions apREtjO~z2 arrêtions aREtjO~z2 -assistions asistjO~ -bastions bastjO~z2 -battions batjO~z2 chantions SA~tjO~z2 citions sitjO~z2 -combattions kO~batjO~z2 comptions kO~tjO~z2 -congestions kO~ZEstjO~z2 constations kO~statjO~z2 contentions kO~tA~tjO~z2 dations datjO~z2 -digestions diZEstjO~z2 discutions diskytjO~z2 doutions dutjO~z2 débutions debytjO~z2 désertions dezERtjO~z2 détentions detA~tjO~z2 escomptions EskO~tjO~z2 -existions EgzistjO~z2 exploitions EksplwatjO~z2 exportions EkspORtjO~z2 -gestions ZEstjO~z2 habitions abitjO~z2 heurtions @RtjO~z2 -indigestions E~diZEstjO~z2 -insistions E~sistjO~z2 jetions Z@tjO~z2 limitions limitjO~z2 -manifestions manifEstjO~z2 méritions meRitjO~z2 partions paRtjO~z2 pressentions pREsA~tjO~z2 présentions pRezA~tjO~z2 prêtions pREtjO~z2 -quittions kitjO~z2 rations RatjO~z2 redoutions R@dutjO~z2 -regrettions R@gREtjO~z2 représentions R@pRezA~tjO~z2 respections REspEktjO~z2 ressentions R@sA~tjO~z2 -restions REstjO~z2 répétions RepetjO~z2 sentions sA~tjO~z2 sortions sORtjO~z2 souhaitions suEtjO~z2 -soumettions sumEtjO~z2 supportions sypORtjO~z2 tentions tA~tjO~z2 traitions tREtjO~z2 @@ -630,3 +633,4 @@ vincent vE~sA~ + diff --git a/dictsource/fr_rules b/dictsource/fr_rules index d46b8ff0..f075ef0e 100755 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -3,6 +3,8 @@ // 2006-11-18 Gilles Casse // +// Updated: 2008-01-21 Michel Such +// // * The rules are based on Cicero TTS. // @@ -57,6 +59,7 @@ cc (Y ks // accéder cc k // occuper ar) ch (ét k // archétype architecte + _A) ch (o_ k // écho or) ch (esC k // orchestre or) ch (iC k // orchidée sy) ch (o k // psycho @@ -110,13 +113,19 @@ .group e e (Ce_ E + AC) e (_ @- // e muet + CC) e (_ @- // e muet + gu) e (_ @- // e muet eau o // bateau cheveaux j) e (a // Jean Jeanne + sp) ea (k i: // speak speaker + p) ect (_ E // suspect ect (_ Ekt // direct _trépi) ed e _pi) ed e // pied - ee i // meeting + ee i: // meeting _cl) ef (_ e // clef + k) e (r_ @ // maker ein (C E~ // peindre ein (_ E~ e (il E // vieille @@ -135,6 +144,7 @@ C) en (d_ A~ // comprend dépend C) en (ds_ A~ + cipi) en (C A~ // récipient qu) en (d_ A~ qu) en (ds_ A~ @@ -209,10 +219,10 @@ _trav) er (_ ER _ti) er (_ ER - th) er (_ WR // brother - th) er (s_ WR - w) er (_ WR // power - w) er (s_ WR + th) er (_ @R // brother + th) er (s_ @R + w) er (_ @R // power + w) er (s_ @R er (_ e // parler léger er (s_ e @@ -249,8 +259,8 @@ rC) es (_C =@ // fortes dames ') eu (_ y // eu - eu (r_ W // peur - eu (rs_ W // tracteurs + eu (r_ @ // peur + eu (rs_ @ // tracteurs eu (b @ // meuble eu (f @ // neuf @@ -290,6 +300,7 @@ _d) e (ch @ _d) e (Cl @ _d) e (Cr @ // degré + _d) e (rr E // derrière _r) e (ch @ // recherche _r) e (Cl @ _r) e (Cr @ // retracer @@ -374,6 +385,37 @@ .group h +_) h (ac _! // hache +_) h (al _! // halte +_) h (amp _! // hampe +_) h (an _! // hanche +_) h (app _! // happer +_) h (arc _! // harceler +_) h (arna _! // harnais +_) h (ard _! // hardi +_) h (arp _! // harpe +_) h (au _! // haut +_) h (av _! // havre +_) h (ern _! // hernie +_) h (ers _! // herse +_) h (ibo _! // hibou +_) h (ide _! // hideux +_) h (oll _! // hollandais +_) h (ong _! // hongrois +_) h (ont _! // honte +_) h (ord _! // horde +_) h (ou _! // houpe +_) h (uit_ _! // huit +_) h (ul _! // hululer +_) h (um _! // humer +_) h (umain // humain +_) h (umani // humanité +_) h (umb // humble +_) h (umi // humide +_) h (umo // humour +_) h (un _! // huns +_) h (ure_ _! // hure +_) h (utte_ _! // hutte h // ahuri @@ -466,9 +508,9 @@ oin (C wE~ oin (_ wE~ // coin oi wa // poil + oid (_ wa // froid oê (l wE // poêle oî wa // boîte - _) ok (_ oke // OK o (mm O // comme dr) o (me_ o // vélodrome ph) o (ne_ O // téléphone @@ -556,6 +598,12 @@ .group q q k // coq + _a) qu (a ku // aquarium + _a) qu (if ku // aquifère + _A) qu (idist ky // équidistant + _A) qu (ilat ky // équilatéralt + _C) qu (a ku // squale square + _A) qu (a ku // équateur qu k // quatre _) que (_ k@ // que que (_ k@- // puisque banque... @@ -564,10 +612,12 @@ .group r - right _^_EN // copyright + right rajt // copyright _su) rr RR // surréaliste - ou) rr RR // courrai +cou) rr RR // courrai +mou) rr RR // mourrai rre (_ R@- // barre +C) re (_ R@- // litre rr R // erreur r r // rien @@ -592,6 +642,7 @@ ub) s (is z // subsister han) s (on s // chanson A) s (A z // baiser + A) s (oft s // microsoft y) s (A z // paysage CCan) s (A z // transition @@ -631,10 +682,16 @@ V) t (_ t2 // silent at end of verb unless next word starts with a vowe Vn) t (_ t2 // silent at end of verb unless next word starts with a vowel n) t (_ // silent at end of word r) t (_ t2 // fort + tte (_ t@- // fillette +C) te (_ t@- // patte +a) te (_ t@- // tomate aul) t (_ // Renault tt t // attitude + tte (_ t@- // fillette +A) te (_ t@- // tomate +C) te (_ t@- // pente s) th (m // asthme th t // théorie @@ -656,6 +713,7 @@ V) t (_ t2 // silent at end of verb unless next word starts with a vowe t (ion s // programmation s) t (ion t // gestion + t) t (ion t // combattions t (iel s // partiel patiemment t (iem s @@ -794,3 +852,4 @@ V) t (_ t2 // silent at end of verb unless next word starts with a vowe ® R@ZistR'@d_m'aRk + diff --git a/dictsource/id_list b/dictsource/id_list index a23dbde2..d31bec5e 100644 --- a/dictsource/id_list +++ b/dictsource/id_list @@ -40,7 +40,7 @@ _7 t'udZuh _8 d@l'apan _9 s@mb'ilan _10 s@p'uluh -_11 sebelas +_11 s@belas _12 d'uabelas _13 t'igabelas _14 'Empatbelas @@ -57,8 +57,8 @@ _6X 'Enampuluh _7X t'udZuhpuluh _8X d@l'apanpuluh _9X s@mb'ilanpuluh -_0C R'atus -_1C s@*'atus +_0C R'atus_| +_1C s@*'atus_| _0M1 R'ibu_ _1M1 s@r'ibu_ _0M2 dZ'uta_ diff --git a/dictsource/id_rules b/dictsource/id_rules index ce5e0719..512a7dd0 100644 --- a/dictsource/id_rules +++ b/dictsource/id_rules @@ -4,6 +4,9 @@ .group a a a + a) a _|a + A_) a _|a + au) a _|a ai aI au aU @@ -19,10 +22,13 @@ .group e e E + e) e _|E + A_) e _|E e (_ e .group f f f + ff f .group g g g @@ -32,6 +38,8 @@ .group i i i + i) i _|i + A_) i _|i .group j j dZ @@ -43,6 +51,7 @@ .group l l l + ll l .group m m m @@ -55,21 +64,25 @@ .group o o o + o) o _|o + A_) o _|o o (r O oe u // Dutch spelling .group p p p + pp p .group q q k - qu qw + qu kw .group r r R .group s s s + ss s sy S // perhaps [S;] ?? sj S @@ -79,6 +92,8 @@ .group u u u + u) u _|u + A_) u _|u .group v v v diff --git a/dictsource/jbo_list b/dictsource/jbo_list index e7750f59..0aa0a74d 100644 --- a/dictsource/jbo_list +++ b/dictsource/jbo_list @@ -47,6 +47,16 @@ q k@bu w v@bu +// stressed cmavo +cai k'aI_! +cu'i S'uhi_! +pei p'eI_! +ru'e R'uhe_! +sai s'aI_! +nai n'aI_! +na n'a_! +ja'a Z'aha_! + // unstressed words. Note single-syllable cmavo are all unstressed in jbo_rules e'o $u+ // request diff --git a/espeak-data/voices/fr b/espeak-data/voices/fr index 031f2acb..8baef30e 100755 --- a/espeak-data/voices/fr +++ b/espeak-data/voices/fr @@ -3,3 +3,4 @@ name french gender male dictrules 1 +intonation 3 diff --git a/espeak-data/voices/ta b/espeak-data/voices/ta index 43dd4af9..8d28a988 100755 --- a/espeak-data/voices/ta +++ b/espeak-data/voices/ta @@ -2,3 +2,4 @@ name tamil-test language ta gender male +intonation 3 diff --git a/phsource/compile_report b/phsource/compile_report index f95824e4..960d7310 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -1,4 +1,4 @@ -43 phoneme tables +45 phoneme tables new total base 98 98 base2 24 117 @@ -15,10 +15,10 @@ eo 13 110 jbo 4 111 fi 40 129 - fr 35 121 - fr_ca 11 121 + fr 38 122 + fr_ca 11 122 hi 50 134 - ta 13 136 + ta 15 136 hu 23 114 nl 28 121 pl 15 109 @@ -43,29 +43,41 @@ zhy 40 131 zh 61 145 sw 14 107 + th 50 141 + id 14 119 Data file Used by b/b [b] base + [b] fr [b] hi [b;] ro b/b_ [b] base + [b] fr [b] hi b/b@ [b] base + [b] fr [b] hi b/b@2 [b] base + [b] fr [b] hi b/ba [b] base + [b] fr [b] hi b/be [b] base + [b] fr [b] hi b/bi [b] base + [b] fr [b] hi [b;] ro b/bo [b] base + [b] fr [b] hi b/bu [b] base + [b] fr [b] hi b/xb [b] base + [b] fr [b] hi d/d [d] base [d[] base @@ -161,6 +173,8 @@ dzh/xdzh [dZ] base dzh/xdz_pzd [J] base [J2] hi envelope/p_214 [214] zh + [5] th +envelope/p_451 [3] th envelope/p_512 [8] vi envelope/p_fall [2] vi [7] vi @@ -172,6 +186,8 @@ envelope/p_fall [2] vi [22] zh [33] zh [53] zh + [1] th + [2] th envelope/p_fallrise [4] vi envelope/p_level [1] vi [3] zhy @@ -182,6 +198,7 @@ envelope/p_rise [3] vi [2] zhy [5] zhy [35] zh + [4] th envelope/vi_5 [5] vi envelope/vi_5amp [5] vi envelope/vi_6 [6] vi @@ -273,6 +290,7 @@ l/l [l] base [l] en [l] en_wi [l] af + [l] fr [l] hu [l] sk [l] ru @@ -293,7 +311,9 @@ l/_l [l] base [l;] ro [l] zh l/l_ [l/] base + [l] fr l/l@ [(@)] base + [l] fr l/L1_aL [(a)] base l/L1_eL [(e)] base l/L1_iL [(i)] base @@ -312,19 +332,23 @@ l/L2_uL [(u)] base [u:] en_n [u:] en_rp l/l_3 [l/] de - [l] fr l/la [(a)] base + [l] fr l/le [(e)] base + [l] fr l/L_eL_af [&] af [&:] af l/li [(i)] base + [l] fr [l] zh l/l_long [l] base [l] fr [l] la [l;] ro l/lo [(o)] base + [l] fr l/lu [(u)] base + [l] fr l/tl [l] base [l] en [l] en_wi @@ -412,6 +436,7 @@ r2/r2o [(o)] base r2/r2u [(u)] base r3/r_ [r/] base [r/] af + [r] fr [r/] fr [r/] ru r3/r_@ [(@)] base @@ -420,6 +445,7 @@ 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_trill [R2] base @@ -447,6 +473,7 @@ r3/rx [*] base [**] base [r/] base [r/] af + [r/] fr [R] fr_ca [r/] ru [x] pt_pt @@ -482,6 +509,7 @@ r/rr [r/] base [r/] af [r] de [r] fi + [R] fr [r2] nl [r] ru [r/] ru @@ -490,6 +518,7 @@ r/rr [r/] base r/ru [(u)] base r/tr [r] base [r] en_sc + [r] fr [R] pt_pt r/trr [r/] base [r/] af @@ -589,6 +618,7 @@ ustop/k_ [k] base [k] el [kh] zh [k] sw + [kh] th ustop/ki [c] base [k] base [k] base2 @@ -637,11 +667,13 @@ ustop/k_unasp [k] base [k] el [k] zhy ustop/k_unasp_ [k] zh + [k] th ustop/null [?] base ustop/p [p] base [p] fr [ph] hi [p] zhy + [ph] th ustop/p_ [p] base [p] fr [ph] hi @@ -660,6 +692,7 @@ ustop/pl [p] base ustop/pr [p] base [p] base2 [p] fi + [p] fr [p] hi [ph] hi [p] hu @@ -675,6 +708,7 @@ ustop/p_unasp [p] base [p] la [p;] ro [p] zh + [p] th ustop/p_unasp_ [p] base2 [p] fi [p] hi @@ -697,6 +731,7 @@ ustop/t_ [t] base [t] sk [t] el [th] zh + [th] th ustop/t_dnt [t] base [t[] base [t] base2 @@ -737,7 +772,9 @@ ustop/t_short [t.] hi [t] sk [t] el ustop/tsh_pzd [tS;] zh + [ch] th ustop/tsh_pzd_unasp [tS;] zh + [c] th ustop/tsh_sr.wav [tS] sr ustop/ts_pzd [tS;] base [ts;] base @@ -755,9 +792,11 @@ ustop/ts_sr.wav [tS;] sr [dZ;] sr ustop/ts_unasp [ts] zh ustop/t_unasp [t] zh + [t] th vdiph/0i [OI] pt [OI] grc [OI] vi + [O:I] th vdiph/0i_2 [OI] en_sc [OI] en_wi [AI] no @@ -773,6 +812,8 @@ vdiph2/i@ [i@] en_n vdiph2/i@_2 [i@] en_wm vdiph2/ie [i@] en_wi [ie] fi + [ia] th + [i:a] th vdiph2/ii@ [i@] en [i@3] en vdiph2/ii@_3 [i@] vi @@ -780,6 +821,7 @@ vdiph2/iioo [io] zh vdiph2/iu [iU] base2 [iU] vi [iu] zhy + [iU] th vdiph2/iu_2 [iu] fi vdiph2/iu_3 [iu] af vdiph2/iu_4 [Iu] cy @@ -792,12 +834,15 @@ vdiph2/oa [Oa] ro vdiph2/o_oo [o@] en_wi [o] is vdiph2/u-@ [y@] vi + [y:a] th vdiph2/u#@ [U@] en_sc vdiph2/uo [uo] fi vdiph2/uu@ [U@] en [U@] en_n [U@] en_wm [u@] vi + [ua] th + [u:a] th vdiph2/y#@ [Y@] af [y@] zh vdiph2/yu [yU] nl @@ -830,6 +875,9 @@ vdiph/ai [aI] base2 [aI] it [aI] pt [a:I] vi + [aI] th + [a:I] th + [aI] id vdiph/ai_2 [aI] cy [aY] cy vdiph/ai_3 [aI] no @@ -844,6 +892,8 @@ vdiph/aoo [aU] en_us vdiph/au [aU] en [aU] af [a:U] vi + [aU] th + [a:U] th vdiph/au# [aU] en_sc vdiph/au_2 [au] zhy vdiph/au_3 [aU] en_rp @@ -853,6 +903,7 @@ vdiph/au_4 [aU] base2 [aU] sk [aU] it [aU] is + [aU] id vdiph/ee-e [E:] hi vdiph/eei [EI] base2 [eI] en @@ -861,12 +912,14 @@ vdiph/eei [EI] base2 [EI] vi vdiph/eei_2 [eI] eo [ei] fi + [eI] id vdiph/eei_3 [eI] en_rp [eI] sk vdiph/eeu [EU] pt [EU] grc [EU] vi [eu] zhy + [E:U] th vdiph/eeu_2 [EU] la [EU] pt_pt vdiph/eeu_3 [aU] en_n @@ -888,7 +941,10 @@ vdiph/eu [eU] base2 [eU] sk [eU] pt [eU] vi + [eU] th + [e:U] th vdiph/eu_2 [eu] fi +vdiph/@i [@:I] th vdiph/&i [&i] fi [aI] hi vdiph/@i_2 [eI] af @@ -908,6 +964,7 @@ vdiph/oi [oI] base2 [oI] it [OI] la [oI] vi + [o:I] th vdiph/oi_2 [oI] af vdiph/ooi [OI] en [OI] en_n @@ -933,12 +990,15 @@ vdiph/@u [u:] en_wm vdiph/@u_2 [oU] en_rp vdiph/@u_3 [@U] ro vdiph/@u_en [oU] en + [@U] id vdiph/ui [uI] base2 [uI] en [uI] eo [ui] fi [uI] vi [ui] zhy + [uI] th + [u:I] th vdiph/u-i [yI] vi vdiph/ui_2 [uI] af vdiph/ui_3 [uI] cy @@ -1007,6 +1067,7 @@ voc/Q_less [Q] nl [x2] pt voc/v [v] base [v] fi + [v] fr [v] hi [v] ta [v2] nl @@ -1068,7 +1129,9 @@ vowel/@ [@] base [@] en_rp [V] cy [@4] hi + [@] th vowel/@- [@-] base + [@-] fr [r*] hr vowel/& [a] en_rp [&] fi @@ -1082,9 +1145,7 @@ vowel/0 [O] base2 vowel/0_2 [0] en_n [O] pt_pt [o] sw -vowel/0_3 [O] en_us - [O:] en_us - [O] en_sc +vowel/0_3 [O] en_sc [0] en_rp [A] hu vowel/@_2 [@] fr @@ -1101,6 +1162,7 @@ vowel/3_3 [3:] en_rp vowel/3_en [3:] en [e@] en_wm [3:] af + [@:] th vowel/@_4 [@] nl [@] no vowel/8_2 [U] en_us @@ -1112,6 +1174,7 @@ vowel/a [a] en_n [aa] en_wm [a] cy [a] de + [a] ta [a:] hu [a:] nl [a] pl @@ -1121,6 +1184,9 @@ vowel/a [a] en_n [a] hr [a] it [a] zh + [a] th + [a:] th + [a] id vowel/a# [a/] base2 [a2] en_sc [a2] en_wi @@ -1181,7 +1247,9 @@ vowel/aa_2 [A:] en [A:] cy [A] zh vowel/aa_3 [A:] af -vowel/aa_4 [A:] sv +vowel/aa_4 [O] en_us + [O:] en_us + [A:] sv [O] vi vowel/aa_5 [A:] en_n [A:] en_wm @@ -1216,6 +1284,9 @@ vowel/e [e] base2 [e] pt_pt [e] grc [e] vi + [e] th + [e:] th + [e] id vowel/e# [I] en_sc [I2] en_sc vowel/e_2 [eI] en_sc @@ -1253,6 +1324,8 @@ vowel/ee_3 [&] af vowel/ee_6 [E] en_n [&] sk [E3] sv + [E] th + [E:] th vowel/e_mid [E] en_rp [e] jbo [E] fr_ca @@ -1266,6 +1339,8 @@ vowel/e_mid [E] en_rp [E] pt_pt [E] no [E] is + [E] id + [E2] id vowel/e_mid2 [E] af [E] de [E2] de @@ -1300,6 +1375,8 @@ vowel/i [i] base2 [i] zhy [i] zh [i] sw + [i] th + [i:] th vowel/i# [i] en_us [i] en_rp [y:] cy @@ -1316,6 +1393,8 @@ vowel/i_4 [i] fi [i] hu [I] it [i] is +vowel/i#_4 [y] th + [y:] th vowel/i_5 [i:] en_sc vowel/i#_5 [y] pt_pt [i/] pt_pt @@ -1323,7 +1402,9 @@ vowel/i#_5 [y] pt_pt vowel/i_6 [i:] en_us [i] ta [i] hr + [i] id vowel/i_en [i:] en + [i:] fr [i] vi vowel/i_fnt [i:] en_wi [i] hi @@ -1371,6 +1452,7 @@ vowel/@_low [3] en_rp [@2] hi [@] ro [@2] no + [@] id vowel/o [o] base2 [o:] en [oU] en_wi @@ -1386,6 +1468,9 @@ vowel/o [o] base2 [o:] sv [o] zh [u] zh + [o] th + [o:] th + [o] id vowel/o- [o-] zh vowel/o_2 [o:] cy [o:] hi @@ -1419,6 +1504,9 @@ vowel/oo [O:] en_sc [O] sv [O] no [o] zhy + [O] th + [O:] th + [O] id vowel/oo_1 [O:] en_n [O:] en_rp [O@] en_rp @@ -1471,6 +1559,9 @@ vowel/u [u:] en_wi [u:] cs [U] la [u] zh + [u] th + [u:] th + [u] id vowel/u# [u-] en [u:] en_sc vowel/u_2 [u1] fi @@ -1512,6 +1603,7 @@ vowel/uu [U] en [U] en_wm vowel/uu_2 [U] base2 [U] de + [U] ta vowel/uu_3 [u] af vowel/uu_4 [U] fi [U] sv @@ -1530,7 +1622,7 @@ vowel/V_2 [V] en [V#] ru vowel/V_3 [V] en_rp [V] hi - [a] ta + [V] ta vowel/V_4 [V] en_sc [@:] vi vowel/V_6 [V] en_us @@ -1725,6 +1817,7 @@ w/xw [(@)] base [(o)] base [(u)] base x/b [b] base + [b] fr [b] hi [b;] ro [b] is diff --git a/phsource/mbrola/af1 b/phsource/mbrola/af1 index 7c1ae036..e2351d80 100644 --- a/phsource/mbrola/af1 +++ b/phsource/mbrola/af1 @@ -47,6 +47,7 @@ 0 0 NULL 0 O 0 A@ NULL 0 a 0 i@ NULL 0 e +0 i@3 NULL 0 e 0 e@ NULL 60 E @ 0 o@ NULL 70 O @ 0 O@ NULL 70 O @ diff --git a/phsource/mbrola/cr1 b/phsource/mbrola/cr1 index 026a7258..40231fda 100644 --- a/phsource/mbrola/cr1 +++ b/phsource/mbrola/cr1 @@ -73,6 +73,7 @@ volume 16 0 aI NULL 60 a j 0 OI NULL 60 o j 0 i@ NULL 60 i r // @ +0 i@3 NULL 60 i r // @ 0 e@ NULL 70 e r 0 o@ NULL 70 o r // @ 0 O@ NULL 70 o r // @ diff --git a/phsource/mbrola/de4 b/phsource/mbrola/de4 index e6cc95e6..3bebb351 100644 --- a/phsource/mbrola/de4 +++ b/phsource/mbrola/de4 @@ -60,6 +60,7 @@ 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 diff --git a/phsource/mbrola/de6 b/phsource/mbrola/de6 index 54aa54e9..67b8610a 100644 --- a/phsource/mbrola/de6 +++ b/phsource/mbrola/de6 @@ -43,6 +43,7 @@ 0 0 NULL 0 a: 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 diff --git a/phsource/mbrola/en1 b/phsource/mbrola/en1 index c5c1f4c5..30439104 100644 --- a/phsource/mbrola/en1 +++ b/phsource/mbrola/en1 @@ -15,6 +15,7 @@ 0 o@ NULL 0 O: 0 A@ NULL 0 A: 0 i@ NULL 0 I@ +0 i@3 NULL 0 I@ 0 IR NULL 0 3: 0 VR NULL 0 3: 0 @L NULL 0 5 diff --git a/phsource/mbrola/fr1 b/phsource/mbrola/fr1 index e68e124b..c83c5018 100644 --- a/phsource/mbrola/fr1 +++ b/phsource/mbrola/fr1 @@ -49,6 +49,7 @@ volume 15 0 OI NULL 60 O j 0 e@ NULL 0 E 0 i@ NULL 60 i @ +0 i@3 NULL 60 i @ 0 e@ NULL 60 E @ 0 o@ NULL 70 o @ 0 O@ NULL 70 O @ diff --git a/phsource/mbrola/gr2 b/phsource/mbrola/gr2 index e7c73a77..fe9aa051 100644 --- a/phsource/mbrola/gr2 +++ b/phsource/mbrola/gr2 @@ -81,6 +81,7 @@ volume 16 //0 aI NULL 60 a j 0 OI NULL 60 o j 0 i@ NULL 60 i r // @ +0 i@3 NULL 60 i r // @ 0 e@ NULL 70 e r 0 o@ NULL 70 o r // @ 0 O@ NULL 70 o r // @ diff --git a/phsource/mbrola/hu1 b/phsource/mbrola/hu1 index 1db03653..531de819 100644 --- a/phsource/mbrola/hu1 +++ b/phsource/mbrola/hu1 @@ -49,6 +49,7 @@ volume 32 0 aI NULL 60 a: j 0 OI NULL 60 o j 0 i@ NULL 60 i 2 // @ +0 i@3 NULL 60 i 2 // @ 0 e@ NULL 70 e: 2 0 o@ NULL 70 o 2 // @ 0 O@ NULL 70 O 2 // @ diff --git a/phsource/mbrola/nl b/phsource/mbrola/nl index 98cf95c8..05e472b4 100644 --- a/phsource/mbrola/nl +++ b/phsource/mbrola/nl @@ -56,6 +56,7 @@ 0 OI NULL 60 O J 0 e@ NULL 0 E 0 i@ NULL 60 i @ +0 i@3 NULL 60 i @ 0 e@ NULL 60 E @ 0 o@ NULL 70 o @ 0 O@ NULL 70 O @ diff --git a/phsource/mbrola/pl1 b/phsource/mbrola/pl1 index 6f8e2746..bb2545e5 100644 --- a/phsource/mbrola/pl1 +++ b/phsource/mbrola/pl1 @@ -54,6 +54,7 @@ 0 aI NULL 60 a j 0 OI NULL 60 o j 0 i@ NULL 60 i I // @ +0 i@3 NULL 60 i I // @ 0 e@ NULL 0 e 0 o@ NULL 70 o I // @ 0 O@ NULL 70 o I // @ diff --git a/phsource/mbrola/ro1 b/phsource/mbrola/ro1 index 3fc2c746..f7f9fa95 100644 --- a/phsource/mbrola/ro1 +++ b/phsource/mbrola/ro1 @@ -75,6 +75,7 @@ 0 3: NULL 0 @ 0 OI NULL 60 o J 0 i@ NULL 60 i @ +0 i@3 NULL 60 i @ 0 e@ NULL 60 e @ 0 o@ NULL 70 o @ 0 O@ NULL 70 o @ diff --git a/phsource/mbrola/sv b/phsource/mbrola/sv index 819bf94f..a8724dd8 100644 --- a/phsource/mbrola/sv +++ b/phsource/mbrola/sv @@ -55,6 +55,7 @@ 0 aU NULL 60 a U 0 oU NULL 0 o: 0 i@ NULL 60 i: @ +0 i@3 NULL 60 i: @ 0 e@ NULL 0 E: 0 o@ NULL 70 o: @ 0 O@ NULL 70 O @ diff --git a/phsource/mbrola/sv2 b/phsource/mbrola/sv2 index 7ab885e1..d6a121e6 100644 --- a/phsource/mbrola/sv2 +++ b/phsource/mbrola/sv2 @@ -51,6 +51,7 @@ 0 aU NULL 60 a U 0 oU NULL 0 o: 0 i@ NULL 60 i: @ +0 i@3 NULL 60 i: @ 0 e@ NULL 0 E: 0 o@ NULL 70 o: @ 0 O@ NULL 70 O @ diff --git a/phsource/mbrola/us b/phsource/mbrola/us index c5529d50..5c77962c 100644 --- a/phsource/mbrola/us +++ b/phsource/mbrola/us @@ -39,6 +39,7 @@ 0 e@ NULL 50 E r 0 U@ NULL 50 U r 0 i@ NULL 50 I @ +0 i@3 NULL 60 i r 0 p NULL 0 p_h 0 t NULL 0 t_h diff --git a/phsource/mbrola/us3 b/phsource/mbrola/us3 index f3b8897f..825f5504 100644 --- a/phsource/mbrola/us3 +++ b/phsource/mbrola/us3 @@ -39,5 +39,6 @@ 0 e@ NULL 50 E r 0 U@ NULL 50 U r 0 i@ NULL 50 I @ +0 i@3 NULL 60 i r diff --git a/phsource/ph_english_us b/phsource/ph_english_us index c0c694bb..13e93761 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -11,7 +11,7 @@ phoneme 3 // Schwa, used for rhotic schwa in American unstressed linkout r- beforevowel @ - length 215 + length 210 endphoneme @@ -35,7 +35,7 @@ endphoneme phoneme aa // 'bath' etc. vowel starttype (a) endtype (@) - length 215 + length 210 formants vwl_en_us/a linkout r- endphoneme @@ -52,7 +52,7 @@ endphoneme phoneme E vowel starttype (e) endtype (e) - length 185 + length 180 // formants vowel/ee_2 formants vwl_en_us/ee reduceto I 0 @@ -87,7 +87,7 @@ endphoneme phoneme 0 vowel starttype (o) endtype (o) - length 195 + length 190 formants vowel/aa_8 reduceto @ 0 endphoneme @@ -110,7 +110,7 @@ endphoneme phoneme A: vowel starttype (a) endtype (a) - length 215 + length 210 formants vowel/aa_8 before r vwl_en_us/ar linkout r- @@ -119,7 +119,7 @@ endphoneme phoneme A@ // Used for [A:] when followed by 'r', becomes [A:]+[r] in American vowel starttype (a) endtype (@) - length 255 + length 250 formants vwl_en_us/ar appendph r endphoneme @@ -142,9 +142,9 @@ endphoneme phoneme O: - vowel starttype (o) endtype (o) - length 205 - formants vowel/0_3 + vowel starttype (a) endtype (a) + length 210 + formants vowel/aa_4 before r vwl_en_us/or reduceto @ 0 endphoneme @@ -152,7 +152,7 @@ endphoneme phoneme O@ vowel starttype (o) endtype (@) - length 265 + length 260 formants vwl_en_us/oor // formants vwl_en_us/or appendph r @@ -161,23 +161,23 @@ endphoneme phoneme o@ vowel starttype (o) endtype (@) - length 265 + length 260 formants vwl_en_us/or appendph r endphoneme phoneme O - vowel starttype (o) endtype (o) + vowel starttype (a) endtype (a) length 200 - formants vowel/0_3 + formants vowel/aa_4 reduceto @ 0 endphoneme phoneme u: vowel starttype (u) endtype (u) - length 175 + length 170 formants vowel/u#_5 // before l/2 vwl_en/u_L-40+l/L2_uL endphoneme @@ -206,21 +206,21 @@ endphoneme phoneme eI vowel starttype (e) endtype (i) - length 220 + length 225 formants vdiph2/ei_4 endphoneme phoneme OI vowel starttype (o) endtype (i) - length 290 + length 285 formants vdiph/ooi_4 endphoneme phoneme e@ vowel starttype (e) endtype (@) - length 275 + length 270 formants vwl_en_us/er appendph r endphoneme @@ -228,7 +228,7 @@ endphoneme phoneme i@3 vowel starttype (i) endtype (@) - length 255 + length 260 formants vwl_en_us/ir appendph r endphoneme @@ -236,7 +236,7 @@ endphoneme phoneme U@ vowel starttype (@) endtype (@) - length 235 + length 230 formants vwl_en_us/ur linkout r- endphoneme @@ -244,7 +244,7 @@ endphoneme phoneme aI@ vowel starttype (a) endtype (@) - length 265 + length 260 formants vwl_en_us/ai@ linkout r- endphoneme diff --git a/phsource/ph_french b/phsource/ph_french index 9fd47ab8..71329aee 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -9,17 +9,26 @@ phoneme : // Lengthen previous vowel by "length" endphoneme - phoneme @ vowel starttype (@) endtype (@) - length 160 + unstressed + length 170 formants vowel/@_2 endphoneme +phoneme @- // very short schwa + vowel nonsyllabic + starttype (@) endtype (@) + formants vowel/@- + unstressed + length 20 +endphoneme + + phoneme a vowel starttype (a) endtype (a) - length 160 + length 170 formants vowel/a_3 endphoneme @@ -33,7 +42,7 @@ endphoneme phoneme E vowel starttype (e) endtype (e) - length 164 + length 170 formants vowel/ee endphoneme @@ -46,6 +55,14 @@ phoneme i endphoneme +phoneme i: // Slitely longer than i + vowel starttype (i) endtype (i) + length 212 + formants vowel/i_en + linkout ; +endphoneme + + phoneme o vowel starttype (o) endtype (o) length 170 @@ -63,14 +80,14 @@ endphoneme phoneme u vowel starttype (u) endtype (u) - length 160 + length 170 formants vowel/u_2 endphoneme phoneme y vowel starttype (e) endtype (u) - length 160 + length 170 formants vowel/y_2 endphoneme @@ -84,7 +101,7 @@ endphoneme phoneme w liquid - length 120 + length 130 beforenotvowel w/ lengthmod 7 formants w/w @@ -110,21 +127,21 @@ endphoneme phoneme A~ vowel starttype (a) endtype (a) - length 170 + length 180 formants vnasal/aa_n3 endphoneme phoneme E~ // same as W~ for fr-fr vowel starttype (e) endtype (e) - length 170 + length 180 formants vnasal/W_n endphoneme phoneme O~ vowel starttype (o) endtype (o) - length 160 + length 180 formants vnasal/o_n3 endphoneme @@ -182,10 +199,17 @@ phoneme l length 100 lengthmod 7 // beforenotvowel l/ - formants l/l_3 + formants l/l // after _ l/_l // after t l/tl after l/ l/l_long // double l, make it longer + before (a) l/la + before (e) l/le + before (i) l/li + before (o) l/lo + before (u) l/lu + before (@) l/l@ + before _ l/l_ endphoneme @@ -196,6 +220,8 @@ phoneme r lengthmod 7 beforenotvowel r/ formants vwl_fr/@R%40 + after t r/tr + before _ r3/r_ endphoneme @@ -206,6 +232,7 @@ phoneme R lengthmod 7 beforenotvowel r/ formants vwl_fr/@R%40 + after r r/rr endphoneme @@ -213,8 +240,8 @@ phoneme r/ // used for [r] when not preceding a vowel vcd uvl frc length 100 lengthmod 2 // - formants r3/r_ -// before n r3/r_n+r3/rx + formants r3/r_+r3/rx + before n r3/r_n+r3/rx endphoneme @@ -283,7 +310,7 @@ phoneme v vowelin f1=0 f2=1000 -300 -200 f3=-300 100 vowelout f1=0 f2=1000 -500 -300 f3=-300 60 len=50 lengthmod 6 - formants voc/v_+vocw/v + formants voc/v+vocw/v before _ voc/v_+vocw/v switchvoicing f endphoneme @@ -296,16 +323,29 @@ phoneme p lengthmod 2 wave ustop/p before _ ustop/p_ -// before r ustop/pr -// before R ustop/pr + before r ustop/pr%70 + before R ustop/pr before @- ustop/p_unasp before l ustop/pl switchvoicing b endphoneme - - - - +phoneme b + vcd blb stop + vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk + formants b/b+x/b + before _ b/b_+x/b + before (a) b/ba+x/b + before (@) b/b@+x/b + before (e) b/be+x/b + before (i) b/bi+x/b + before (o) b/bo+x/b + before (u) b/bu+x/b + before @- b/b@2+x/b + after _ NULL + after @ b/xb + lengthmod 5 + switchvoicing p +endphoneme diff --git a/phsource/ph_tamil b/phsource/ph_tamil index d4bf8908..30e0170e 100644 --- a/phsource/ph_tamil +++ b/phsource/ph_tamil @@ -5,6 +5,13 @@ phoneme a + vowel starttype (@) endtype (@) + length 130 + formants vowel/a + reduceto V 4 +endphoneme + +phoneme V vowel starttype (@) endtype (@) length 130 formants vowel/V_3 @@ -65,6 +72,13 @@ phoneme u vowel starttype (u) endtype (u) length 130 formants vowel/u + reduceto U 4 +endphoneme + +phoneme U + vowel starttype (u) endtype (u) + length 130 + formants vowel/uu_2 endphoneme diff --git a/phsource/vowel/aa_4 b/phsource/vowel/aa_4 index 6c003cf0..3c4db515 100644 Binary files a/phsource/vowel/aa_4 and b/phsource/vowel/aa_4 differ