From b1fc16f6c6df60ec39d6a7c7fdd6fd206956937f Mon Sep 17 00:00:00 2001 From: jonsd Date: Sat, 19 Jul 2008 13:08:11 +0000 Subject: [PATCH] [1.37.07] Support for mbrola Brazilian voices, br1, br3. Included epenthetic vowel [i] in Brazilian. Languages changes: fr, af. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@179 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/af_list | 36 ++- dictsource/af_rules | 110 +++++++-- dictsource/dict_phonemes | 12 +- dictsource/en_list | 4 + dictsource/en_rules | 5 + dictsource/fr_list | 236 ++++++++----------- dictsource/fr_rules | 386 +++++++++++++++++--------------- dictsource/pt_list | 6 +- dictsource/pt_rules | 44 +++- espeak-data/voices/af | 2 + espeak-data/voices/mb/mb-br1 | 9 + espeak-data/voices/mb/mb-br3 | 9 + espeak-data/voices/mb/mb-de2 | 6 + espeak-data/voices/mb/mb-es1-en | 8 - espeak-data/voices/mb/mb-es2-en | 8 - phsource/compile_report | 40 ++-- phsource/mbrola/fr1 | 5 +- phsource/ph_afrikaans | 6 + phsource/ph_english_us | 11 +- phsource/ph_french | 183 +++++++++------ phsource/ph_pt_brazil | 7 + phsource/phonemes | 4 +- phsource/vdiph/aoo | Bin 1557 -> 1557 bytes phsource/vdiph/ooi_4 | Bin 8701 -> 8701 bytes phsource/vowel/u#_6 | Bin 6774 -> 6774 bytes phsource/vwl_en_us/a | Bin 6237 -> 6239 bytes phsource/vwl_en_us/ur | Bin 8310 -> 8310 bytes src/dictionary.cpp | 11 +- src/synthdata.cpp | 2 +- src/tr_languages.cpp | 1 + src/translate.cpp | 3 + 31 files changed, 692 insertions(+), 462 deletions(-) create mode 100755 espeak-data/voices/mb/mb-br1 create mode 100644 espeak-data/voices/mb/mb-br3 create mode 100755 espeak-data/voices/mb/mb-de2 delete mode 100644 espeak-data/voices/mb/mb-es1-en delete mode 100644 espeak-data/voices/mb/mb-es2-en diff --git a/dictsource/af_list b/dictsource/af_list index d7c97093..979a556a 100755 --- a/dictsource/af_list +++ b/dictsource/af_list @@ -8,6 +8,7 @@ // This file is UTF-8 encoded // all words lower case +mc _^_EN $alt2 // abbreviations (http ://) hA:te@te@p'e@_ @@ -148,7 +149,8 @@ _roman rum'eIns@ // Place names -alaska al'aska +#alaska al'aska +antwerpen antv&rp@n asië A:si@ babilon babilOn bangladesh baNglad'ES @@ -163,6 +165,7 @@ brooklyn _^_EN caledon kalidOn carolina karul'ina ceres se@r@s +cesaréa s@s@ri:ja ceylon s@lOn china S'ina clanwilliam kl&:nw'ili@m @@ -170,6 +173,7 @@ colenso kul'E:ns@U colesberg ko@lsb&rx2 constantia $2 christiana kr@stij'A:na +damaskus d@maskWs duitswes dYytsv'Es ermelo &rm@lo@ franschhoek frA~nsh'uk @@ -209,13 +213,14 @@ mosambiek musamb'ik europa Y@r'o@pa nigel _^_EN outeniekwa @Ut@n'ikwa +oxford _^_EN pelindaba p&l@nd'A:ba portugal $1 potchefstroom pOtSIfstr'o@m -pretoria prit'o@ria robertson _^_EN senekal se@n@kal singapoer siNgapur +soweto suw'E:tu springs _^_EN $capital sunnyside _^_EN swellendam $3 @@ -228,6 +233,7 @@ viëtnam vj'Etnam wellington wEliNt@n wolseley wulsli worcester v'ust@r +uganda ug'anda zimbabwe zI:mb'ab_wE @@ -236,26 +242,28 @@ zimbabwe zI:mb'ab_wE Abiméleg abin'e@lEx2 abraham A:bram ackerman ak@rman +adam adam adriaan A:drijan adrie A:dri albertus alb'&rtWs -aletta al'Eta -alida al'ida allah %alA: André 'andreI annette an'Et antoinette antun'Et barbara bA:b@ra benjamin bEndZ@m@n +bennett bEn@t bester b'Est@r beyers beI@rs blomerus blum'e@rWs botha bo@ta bouwer b@U@r +brian _^_EN breytenbach breIt@nbax2 brouwer bruw'&:r caesar siz@r carl kA:r@L +cecil sEs@l cecilia s@si:lia charl SA:l charles _^_EN @@ -272,12 +280,15 @@ christine kr@st'i:n cindy sIndi coetzee kuts'e@ cronjé krOnj'e@ +cynthia _^_EN +darwin _^_EN david _^_EN debora d@bo@ra debussy d@bus'i: der d@r derick dErik deventer d'e@v@nt@r +diana dij'A:na du $u (du pisanie) du||pis'A:ni (du plessis) du||pl@s'i @@ -286,6 +297,7 @@ du $u eksteen $1 elisabeth il'isabEt elize il'i:z +elmien $2 elsabé &ls@bi emmarentia Emar'e~nSja erasmus $2 @@ -309,10 +321,12 @@ gerhardus $2 gloria glO:ria grange x2rA:nsi gustav gustaf +harry _^_EN havenga hA:f@Nx2a haydn hAId@n helena hil'e@na helloïse hEluw'i:z +henry _^_EN herklaas $1 herman $1 hilde hild@ @@ -326,17 +340,16 @@ Jean ZA~n $capital jimmy _^_EN joan _^_EN joey dZ@Ui -john _^_EN jordaan $2 josef jo@s@f juanita juan'ita +kelvin _^_EN krige krix2@ langenhoven laN@nho@f@n lasarus lA:s@r%Ws lategan lA:t@x2an le l@ leandra li'andra -leroux l@ru levi le@fi louis luI @@ -389,7 +402,6 @@ rhodes _^_EN robert _^_EN ronel run'&l rousseau r@s@U -roux r'u ruda ruda rupert rup@rt salomo sA:l@mo@ @@ -447,8 +459,10 @@ xhosa kO:za khumalo kum'A:lu // Other proper names -checkers tSEk@rs +centaurus $2 +checkers tSEk@rs chrysler kraIsl@r +martini mart'i:ni wimpy wImpi // article @@ -601,7 +615,7 @@ alreeds $2 alternatiewe $4 amen A:mEn anale an'A:l@ -anatomie $4 $only +//###anatomie $4 $only asof asOf asook %as_o@k aspris $2 @@ -622,6 +636,7 @@ beta be@ta bewe be@v@ bewend be@v@nt bewering b@ve@rIN +boskaas $2 bostaande b'o@stA:nd@ bourgeois _^_FR bourgeoisie _^_FR @@ -702,6 +717,7 @@ hoera hur'A: hoewel huv'&l hokaai hOkAI hoofsaaklik $2 +hoogedele ho@x2 _e@d@l@ hosanna hus'ana huigelary $4 @@ -770,6 +786,7 @@ nadele nA:de@l@ nadenke $1 nagana nag'A:na namens nA:m@ns +nasaréner nasar'e@n@r nassau nas'@U nature nat'yr@ nalatigheid nA:l'A:t@x2eIt @@ -851,6 +868,7 @@ rinkink $2 rooipers roIp&:rs roterende rut'e@r@nd@ rukkerig rWk@r@x2 +ruspes rWsp@s rymelary reIm@lar'eI salami sal'A:mi diff --git a/dictsource/af_rules b/dictsource/af_rules index 1c5615df..168f5948 100755 --- a/dictsource/af_rules +++ b/dictsource/af_rules @@ -11,17 +11,23 @@ .group a _C) a (Cie_ 'A: + ack (_ _^_EN //Jack and others. @) a (Cisasie %a // fix a sound: akklimatisasie/meganisasie/penalisasie/polarisasie and many similar @) a (Ciseer %a // fix a sound: akklimatiseer and many similar @) a (Cisering %a // fix a sound: akklimatisering and many similar a A: AC) a (_ %a // short final a in words like: Eva/Pieta/(su)sara %C) a (_ %a // short final a in words like: Bella/Betta/gogga + C) a (rina %a //unstressed short a in carina tarina etc. &b) a (_ %a // short final a: mamba and compounds/marimba/hamba &d) a (_ %a // short, unstressed a after d at end of word: soda/padda... and compounds i) a (_ %a // a short and unstressed in words ending in ia: laboratoria/millennia &r) a (_ %a // short final a in words ending in -ra: infra/mantra/sentra, etc. &dr) a (_ A: // exceptwrds ending in -dra: ingedra/oorgedra, etc. + _) a (lA %a //short unstressed a for words starting with Al + i) a (tieC %a //words containing iatief/w short unstressed a + i) a (ties 'A: //words containing iaties has stressed long a + &vr) a (_ A: // and wrds ending in -vra: oorgevra/uitgevra/vasvra, etc. &t) a (_N %a // short final a: basta/delta/junta/pasta/many names a (C a @@ -78,6 +84,7 @@ a (kkoord %a // move default stress: akkoord/-e and compounds akku (ra %ak%y // move default stress: akkuraat/akkurate ako (Ciet %ak%u // fix stress and vowel sounds: akoliet/akoniet and compounds + akro (ba %akr%u // move default: akrobaat/-bate/-baties ak (syn %ak // move default stress: aksyns and compounds akwama (ryn %akw%am%a // move default stress: akwamaryn and compounds _) a (kwat %a // move default stress: akwaties/-e @@ -115,9 +122,8 @@ alu (minium %al%u // move stress: aluminium and compounds _) al (we %al // stress: alweer/alwetend/-heid amasone %am%aso@n@ // fix stress and vowel sounds: amasone/-rivier/-steen + ammo (niA %amo@ // fix stress and o sound: ammoniak and compounds/ammonium and compounds _k) a (nA %a //kanon and others - anek (dot %an%Ek // fix stress and vowel sounds: anekdote/-doties - ane (mo %an@ // fix stress and vowel sounds: anemoon/anemone apart %apart // fix stress: (bus-/klein)apartheid _) a (po %a // apollo/apostel @@ -155,6 +161,7 @@ austra %o@strA: antering %ante@r@N //hantering in compounds avon (t ,avOn //avontuur and friends + avontu (rier %av%Ont%y // fix stress: avonturier/-s and compounds _) af (@P2 'af // afbreek/afdwaal/afdwing C) afel (@ A:f@l // compounds starting with tafel/ontrafeling/uitrafeling @@ -230,11 +237,13 @@ arres (_ %arEs // arres/huisarres arre (stA %ar@ // arrestasie/arresteer arro (g %ar%u // arrogant/-e/arrogansie + ar (seen %ar ar (tikel %ar // stress: artikel and compounds artiku %art%ik%y // stress and vowel sounds: artikulasie/artikuleer _) 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 + askari %askA:r%i // move default stress: askari/-'s _) as (ke %as // move default stress: askeet/askete/asketies/askese a (spersie %a // move default stress: aspersie and compounds _) aspi (rA %asp%i // move default stress: aspirant/-e and compounds @@ -314,7 +323,12 @@ aanse (_ 'A~ns@ .group an + anato (mie %an%at%u // move default stress: anatomie and compounds + anatomies %an%ato@m%is // fix stress: anatomies/-e an (djie+ aIN + anek (dot %an%Ek // fix stress and vowel sounds: anekdote/-doties + ane (mo %an@ // fix stress and vowel sounds: anemoon/anemone + _) an (A an //short a at word start ange (lier %aN@ // angelier/-e and compounds an (gina %aN // move default stress, fix n/g sounds: angina _) angl (A %A~Nx2l% // anglikaans/anglisisme/anglofiel @@ -328,8 +342,13 @@ _) ana (C ,ana // words starting with ana starts destressed _) an (emie %an // fix stress and a sound: anemies/-e C) an (keer %an // move default stress: flankeer/frankeer and derivitives and compounds + ante (nnA %antE // fix stress and e sound: antenna/antenne antisep (C %ant%isEp // fix stress and e sound: antisepsis/antispeties/-e/antiseptikum antra (siet %antr%a // move default stress: antrasiet and compounds + @) antrope (_ antr'o@p@ // fix stress: (mis/fil)antrope, etc. + @) antropie (_N antrup'i // fix stress: (mis/fil)antropie, etc. + @) antropie antr'o@pi // fix stress: (mis/fil)antropies/-e + @) antroop antr'o@p // fix stress: (mis/fil)antroop, etc. // The following are experimental nasalisation of ans d) ans A~ns fr) ans A~ns @@ -369,6 +388,7 @@ basi (s bA:s@ // basis and compounds batal (jon b%at%al // shorten 1st a sound, moved stress: bataljon and compounds ba (tik b%a // fix stress and a sound: batik/-doek/-kuns/-werk + bbe (rr b@ // fix e sound: rubberrand/-ranke/-ring/-roller, etc. bobbe (j b%Ob@ //fix stress for bobbejaan and friends bo (grond bo@ // fix 1st o sound: bogronds/-e _) bo (kle bo@ // fix o sound: bokleed/boklere @@ -474,7 +494,10 @@ bei (+ beI // beier/beitel _) be (@P2 b@ @) be (C b@ + beige beI:Z // beige(kleurige) + _) beker (C@ b''e@k@r // fix stress and e sounds: bekerhouer/-kompetisie/-tjie/-vormig/-wedstryd/-wenner bene (dy b%e@n@ // fix stress and e sounds: gebenedy/-de + _) ben (ga b%EN // fix stress and n/g sounds: Bengaalse/Bengale beni (g be@n@ // fix stress and e sound: (swaar/twee/vier)benig, etc. ber (serk b@r // fix stress and 1st e sound: berserk/-er C) be (rsie b'&: //kombersie etc. @@ -620,6 +643,7 @@ &) denis d@n@s // geskiedenisboek/kultuurgeskiedenis/belydenis/beduidenis denken (d d''ENk@n // fix stress and e sound: anders-/edel-/na-/vry-/weldenkend @) dente (@ dEnt@ // fix connecting e in compounds like studenteoptog/-opvoering + skan) dina d@n'A: //skandinawiese etc. deodo (rant d%i%ud%u // fix vowel sounds and stress: deodorant/-e and compounds de (press d%i // depressie/depressief/depressiewe de (puta d%E // fix e sound: deputasie/-s and compounds @@ -629,7 +653,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 + 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 @@ -762,6 +786,8 @@ e (C E CAC) e (CC @ // fix e sound: nalatenskap/wapenstilstand CAC) e (C% E // beesfilette/nougesette/onderbesette/voortgesette + C) e (marie @ //anemarie, lisemarie etc. + n) eke (_ @k@ //anneke Heineke etc. CACp) e (rl @ // fix e sound: werperligte/wimperloos CAC) e (rr @ // fix e sound: koperring/-rooi/nederryn/somerreën/-rok/superrealis/syferrekenaar... @C) e (reekK @ // fix e sound: duine-/rotsereeks @@ -1107,7 +1133,7 @@ eerbied (A e@rb'id // eerbiedig/ing eerbiedw %e@rb%itv // eerbiedwaardig/eerbiedwekkend _) eerw %e@rv // stress: eerwaarde - entjie EiNci + entjie (+ EiNci &k) entjie iNci // fix -entjie sound: bakentjie/dekentjie/kuikentjielakentjie/tekentjie, etc. edjie 'E:ici &) etjie (+ ici @@ -1156,6 +1182,8 @@ @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/-e + pr) entjie E:iNk%i //fix prentjie + @s) ent (rA Ent // winkelsentrum/studentesentrum, etc. C) er (tyd @r // tegelykertyd/kindertyd/indertyd _) etens 'e@t@ns // etenstyd/klok/tafel/uur @@ -1175,7 +1203,7 @@ &C) e (sk@ @ // hondeskou/modeskou/erdeskottel/geleideskip/hardeskyf @d) e (s@ @ // bejaardesorg/heidesoorte/hondesiekte/modesiek/tandestokkie/tersydestelling/vredesluiting @d) esi (ma %Es%i // duodesimaal/heksadesimale - @d) e (se_ 'e@ // Kanadese/nadese, etc. + @d) e (se_+ 'e@ // Kanadese/nadese, etc. pred) e (sti E // predestinasie evang ,e@faNx2 // evangelie/evangelis @@ -1231,7 +1259,7 @@ al) ex (and %Ekz //alexanderbaai, alexandria etc. m) exik Eks%ik //mexiko mexikaans etc. t) exas Eks@s //Texaskoors and may be others - + e (Coux @ //the e in the prefixes to surnames ending in oux .group f f f @@ -1244,6 +1272,7 @@ familie f%amil%i fan (fare f%an // move default stress: fanfare/-s fanta (sA f%ant%a // fantaseer/fantasie + fari (seër f%ar%i // fix stress and a sound: Fariseër/-s farma (seut f%arm%a // move default stress: farmaseut/-e/-ies/-ika fasade f%asA:d@ // fix stress and 1st a sound: fasade/-s and compounds fasiliteit fasilit'eIt // fasiliteit/e/aftrekorderfasiliteit @@ -1364,7 +1393,8 @@ _) gras (A x2ras_ // fix stress and a sound: graseter/grasoppervlakte/grasuie _) gra (sie x2rA: // but restore default stress and long a: grasie _) gri (mA x2r@ // grimas/grimeer/-middel and other compounds/grimering - grond (o x2rOnt_ // fix d sound: grondonteiening/-oppervlakte, etc. + agter) grond (i x2rO:nt_ // fix d sound: agtergrondinligting/-informasie/-instrumente + grond (o x2rO:nt_ // fix d sound: grondonteiening/-oppervlakte, etc. grondwetlik x2r%OntvEtl@k // move default stress: grondwetlik/-e/-heid grondwe (tK x2rOntvE // restore default stress: grondwet/-te/-hof, etc. grondwet (a x2rOntvEt_ // fix e sound and insert short pause: grondwetartikel/-s @@ -1390,6 +1420,7 @@ _) gens (C x2E:ns // fix stress and e sound: gensbok and compounds _) geo (s x2%i%u // fix stress and -eo- sound: geosentries/geosfeer/geoskoop/geostaties _) ge (ossP2 x2@ // but ge- prefix: geossilleer/geossifiseer, etc. + ni) ge (ri x2'e@ //nigeriese etc. gese (_ x2'e@s@ //Portugese, and others gespe (_ x2Esp@ // gespe and compounds @@ -1615,6 +1646,8 @@ in (halig @n // move default stress: inhalig/-e/-heid in (hegten @n // move default stress: inhegtenisname/-neming/-s inisi (A %in%iS%i // fix stress and s sound: inisiasie/inisieer/inisieel/-ële/inisiatief + inisie @n'is%i // fix definisie etc. + inisi (eA %in%iS%i // fix inisieer etc. in (kenn @n // move default stress: inkennig/-e/-heid i (nneemba @ // move default stress: (on)inneembaar/-bare/-baarheid insi (dent @ns@ // insident/e/insidentjie @@ -1639,8 +1672,15 @@ innuendo @ny:|'End@U // innuendo('s) invalide @nv%alid@ // stress and v sound: invalide and compounds - C) ie (r_ i: //ier at end of words is long - C) ie (re_ i: //iere at end of words is long + C) ie (r i: //ier long in most cases, exceptions below: + g) ie (rig i // short ie: gierig/-e/-heid + h) ie (rdie i // short ie: hierdie/-s + k) ie (ranC i // short ie: kierang/kierankies + k) ie (rie i // short ie: kierie and compounds + k) ie (rts i // short ie: kierts(regop) + p) ie (rew i // short ie: pierewaaier/pierewiet + p) ie (ring i // short ie: piering/-s and compounds + w) ie (rook i // short ie: wierook and compounds _em) i (r @ ië e@:@- // i followed by "deelteken e" @@ -1691,7 +1731,6 @@ &C) ikend @k@nt // grinnikend/runnikend/sanikend &C) ikende @k@nd@ // grinnikende/runnikende/sanikende ingenieur @nx2@n'y@r - inspring 'Inspr@N // see list: insp InspEkt'Y@r and rule: &) ring (_S4 rIN inten (s @ntEn // move default stress in (tussen @n // move default stress _) iri (s ir@ // restore stress on 1st slb.: iris/-se @@ -1779,6 +1818,7 @@ jesus ji:sWs // Jesus also used as part of compounds: Jesusbaard/Jesusklong joer (na j%ur // move default stress: joernaal/joernale/ compounds: joernaalinskrywing, etc. joha (n j%uha // Johan/Johanna/Johannie + john _^_EN // English pronunciation: John/-ny/-son/-ston jonge jON@ // jongeling/jongeres jong (etjie jON // fix e sound: jongetjie/-s @@ -1848,6 +1888,7 @@ kleur (effek klY@r // e sound in kleureffek/-te kleure klY@r@ // fix e sound: kleurebeeld/-gloed/-kaart/-kontras/-mengeling/-prag/-sin... kli (maat kl@ // move default stress: klimaat and compounds + kli (mop klI // fix i sound: klimop(plant) kli (niek kl@ // fix stress and i sound: kliniek and compounds klip (A klIp_ // fix i sound: klipalbaster/-altaar/--uil/leiklipolie klou (sule kl%@U // move default stress: klousule/-s @@ -2048,6 +2089,7 @@ _) kor (dA k%Or // kordaat/kordon korpo (raal k%Orp@ // move default stress: korporaal/-s/-strepe/onderkorporaal ko (rrup k%u // fix stress and 1st o sound: korrup/-sie/-te/-teer + kor (set k%Or // move default stress: korset/-te and compounds kort (sigtig k%Ort // move default stress: kortsigtig/-e/-heid kosme (tiek k%Osm@ // move default stress: kosmetiek and compounds kos (met k%Os // move default stress: kosmeties/-e @@ -2093,6 +2135,7 @@ lening le@n@N // banklening/sorgverlening/hulpverlening... lepe (ll le@p@ // fix 2nd e sound in compounds: lepellê, etc. @C) les (K lEs // aanvangsles/geskiedenislesse/musiekles/koffiefles + ie) les (_ lEs // fix e sound: biologie-/geografie-/anatomieles @) less (_ _^_EN // English words ending in -less in Afrikaans text: harmless/motherless, etc. @l) le (sC@ l@ // fix e sound: getallestelsel/gevallestudie/novelleskrywer leuen (tjie lY@iN // leuentjie/witleuentjie @@ -2127,6 +2170,8 @@ linker lINk@r // blinkertjies/many compounds with linker and klinker lino (leum l@no@ // fix stress and i sound: linoleum and compounds, e.g. linoleumvloere li (riek l@ // fix stress and i sound: liriek/-e + _) lito (C l%it%u // fix stress and o sound: several compounds beginning with lito- + _) lit (ograf l%it // to accommodate litografie/-grafies @) ll (_N _^_EN // Words ending in -ll are English lobola l%ObO:la // fix stress and vowel sounds: lobola and compounds lo (kalA l%u // fix stress and o sound: lokale/ontvangslokale, etc. @@ -2157,6 +2202,8 @@ .group m m m m (m + @) marie (_ m%ar'i //names ending in marie fix a and stress. + macedo (nA m%as@do@ // fix stress and vowel sounds: Macedonië/Macedóniër/-s made (lie m%A:d@ // fix stress and e sound: madeliefie/-s/watermadeliefies _) ma (d m%a // fix stress and 1st a sound: madonna/-s/-beeld/-lelie/Madiba/Madras maga (lie m%ax2a // fix stress and a sounds: Magalies/-berg/-e/-burg/-kruin @@ -2494,15 +2541,13 @@ &s) o (_ o@ // and: sommerso/netso o (C O o (CA o@ + gr) o (nd O: //lengthen o ind compounds with grond mikr) o u // mikrogolf/mikroskakelaar/mikrorekenaar oase %u_A:s@ // oase/-s and compounds o (terap u // psigo-/fisioterapeut _) 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 @@ -2542,9 +2587,17 @@ 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 + b) om (o Om_ //fix first o in bomontploffing and others C) o (Ciee %o@ // assosieer/harmonieer/folieer fil) o (@ u% oe u + oe (r u: //long oe sound before r in most cases, but see flg. exceptions: + _) oe (r u // short oe: oerwoud/-tyd, etc. + h) oe (r u // short oe: hoer/-e/-tjie + k) oe (r u // short oe: (ge)koer + t) oe (rA u // short oe: toe(rank/-reik/-rig/-rol...) + w) oe (r u // short oe: (ge)woer + oei uI oi OI oy OI @@ -2576,6 +2629,9 @@ omega %o@me@x2a // omega/-s ometrie ume@tr'i // geometrie/psigometrie ometries um'e@tris // geometries/psigometriese + w) o (rs O: //lengthen o sound in wors compounds + w) o (rstel O //short o in worstel and compounds + oskope usk'o@p@ // kaleidoskope/mikroskope oskopies usk'o@pis // kaleidoskopies/mikroskopies oskoop usk'o@p // bioskoop/giroskoop/mikroskoop and similar @@ -2670,6 +2726,7 @@ ort (osko %Ort // fix 2nd o sound and stress: ortoskopies/-e ose (a %o@S%i // fix stress and s and e sounds: oseaan/oseane and compounds @) oties 'o@tis // antibioties/eksoties/eroties/neuroties + oux 'u //in surnames like tredoux, leroux etc. _) o (va@ %o@ // move default stress: ovaal/ovale/ovaalvormig ovu %Ov%y // fix stress, o and v sounds: ovulasie/ovuleer ower (@ o@v@r // lowergroen/betowerend/dowerig/compounds of owerheid @@ -2826,6 +2883,7 @@ oorkoepel o@rk'up@l // stress and pronunc. of el: oorkoepelend/oorkoepeling oor (lams %o@r // move default stress: oorlams/-e/-heid _) oorlede o@rl'e@d@ // stress oorlede/ne/s + oorle (lK o@rl& // fix e sound: oorlel/-le oorle (wAn o@rl''e@ // stress on 2nd slb.: oorlewing/-sekuriteit/-situasie/oorlewendes oor (meester %o@r // move default stress: oormeester _) oor (peins %o@r // move default stress: oorpeins/-ing @@ -2853,6 +2911,7 @@ oot (moedig %o@t // move default stress: ootmoedig/-e/-heid + .group p p p p (p @@ -2871,6 +2930,7 @@ _) pan (dem p%an // move default stress: pandemie/-s and compounds _) pan (do p%an // move default stress: pandoer/-e/Pandora/pandok panga paNga // fix g sound: panga/-s + _) pan (geC pan // split n/g: pangebraaide/-geroosterde/-gesig/-geweer pano (ram p%an%u // fix stress and vowel sounds: panorama/panoramies _) pan (to p%an // move default stress: pantoffel and compounds/pantoen papaja p%ap'A:ia //papaja and compounds @@ -2883,6 +2943,7 @@ pantser pants@r // fix e sound in compounds starting with pantser pa (pier p%a // papier and compounds pa (pirus p%a // move default stress: papirus and compounds + pappe (ry p%ap@ // move default stress: pappery/-e and compounds parle (ment p%arl@ // move default stress and fix e sound: parlement and compounds, eg. parme (saan p%arm@ // move default stress: parmesaan(kaas) and compounds paro (di p%ar%u // fix stress and vowel sounds: parodie and compounds @@ -2960,6 +3021,7 @@ ph (_ f // fix ph sound: Rudolph/Joseph phi (lip fI phi (lippA_ f@ // fix stress and 1st i sound: Philippa/Philippi + pig (meA p@x2 // move default stress: pigmee/pigmeë pi (kant p%i // move default stress: pikant/-e, etc. pikke (wyn p@k@ // move default stress: pikkewyn and compounds _) pi (la p%i // move default stress: pilaar/pilare/pilatus @@ -3008,6 +3070,10 @@ pre (lud pr@ // fix stress and e sound: prelude/-s/(ge)preludeer pre (mier pr@ // move default stress and fix e sound: premier and compounds pre (nata pr,e@ // fix e sound: prenataal/-tale + pretori pr%it%o@r%i //pretorianer,pretoriaan, fix e and o sounds a + pretoria (_ pr%it'o@ria //ending in pretoria + pretoria (C prit'o@ria //pretoriase, pretoriahuis etc. + pretoria (n pr%it%o@r%i'A: //exception for pretorianer etc. 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 @@ -3109,7 +3175,7 @@ _) roode r'o@d@ //roodepoort and other names roman r%uman - &) ring (_ rIN + &) ring (_ r@N rring r@N // karring/torring &) rm (K r@-m @@ -3127,6 +3193,7 @@ rugby rWgbi ru (dolC ru // fix u sound: rudolf ru (moer r%W // fix stress and u sound: rumoer/-ig/-heid + rusper (C rWsp@r // fix e sound: rusperband/-tjie/-trekker and similar ru (ïn r%y_ // move default stress: ruïne/-s .group re rea (ks r%ia // reaksie/s/skokreaksie @@ -3243,9 +3310,12 @@ _) sebra se@bra // fix vowel sounds: sebra/-strepe; variant of zebra se (ggA s& // fix e sound: niksseggend/-e @) seko (no@ s_%Ek%u // fix e sound; default stress; insert short pause: bedryfs-landsekonomie/-s/-ekonoom + seks (tant s%Eks // move default stress: sekstant and compounds + sekste (t s%EkstE // fix stress and 2nd e sound: sekstet/-te selek (CA s@lEk //seleksie selekteer etc. sending (_ sEnd@N //fix sending at word end seroto (ni s%Er@t%u // fix stress and vowel sounds: serotonien(vlakke, etc.) + sitrus s'itr%Ws_ //i sound and stress in compounds saamge (P6 s'A:mx2@ // saamgepers/-de/saamgetel/saamgeêet saamgee sA:mx2e@ // fix ee in saamgee; see rule: saamge (P6 @@ -3330,7 +3400,6 @@ 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 @@ -3363,7 +3432,7 @@ _) 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 (lied s%O // stress and o sound: solied/-e so (lid s%O // konsolidasie/solidariteit sonant sun'ant // fix stress and o sound: sonant/dissonant/konsonant so (natA s%u // move default stress and fix o sound: sonate/-s and compounds @@ -3510,7 +3579,7 @@ mAre) ste (r st& // fix e sound: more/môrester/-re sterf (K st&rf // fix e sound: uitsterf/weg(ge)sterf/kindersterfte @) sterkt st&rkt // compounds ending in sterkte - + bok) ster (t st&:r // fix e sound: bokstert/-e/-tjie/-s weg) ster (we st&r // wegsterwe/wegsterwende _) ster st&r kwik) ster st&:r // kwikstertjie/-s @@ -3624,7 +3693,7 @@ toe (kome t%u // move default stress: toekomende toe (laatba t%u // move default stress: (on)toelaatbaar/-bare/-baarheid toer (n t%ur // move default stress: compounds of toernooi - toere tu:r@ // restore default stress + toere (_ tu:r@ // restore default stress toi (let t%OI // move default stress: toilet and compounds tokke (lo t%Ok@ // move default stress: tokkelos/-sie/tokkelok and compounds tok (tokk t%Ok // move default stress: toktokkie/-s/-spelery, etc. @@ -3804,6 +3873,7 @@ u y u (C W u (CA y + ugan (de %ug%an // fix stress and g sound: Ugandees/Ugandese uu y ui Yy uie (C Yy@ // graansuierdiens/kruiersloon/kuiergas/luierbroekie/sluierdoek/suierklep/getuienis @@ -3944,6 +4014,7 @@ verf f&rf _) vergesog f'&:r;x2@sOx2 _) verlangs f&:rlaNs // fix stress and e sound: verlangs/-e + verlangs (a f@rl'aNs // fix verlangsaam and derivitives. veronderste (l f@rOn@rst'& // stress: veronderstel/-ling _) verse (b f'&:rs@ C) verse (_ f&rs@ @@ -4071,6 +4142,7 @@ s) w (art w // fix w sound in compounds like donderswart &s) w (eefs v // fix w sound: compounds like -sweefsel/tuisweefstof, etc. @s) w (enn v // fix w sound: beurs-/groeps-/klas-/naas-/pryswenner/-wennende + _) web vEb //webadres/se, webarea etc. plaas) w (erC v // fix w sound: plaaswerf/-werwe s) w (ou v // fix w sound: bamboeswoud/keerkringswoud and similar s) w (r v // fix w sound: skeepswrak/sielswroeging/aardswreedheid @@ -4079,7 +4151,7 @@ @s) w (al v // fix w sound: dwarswal/gruiswalle/loodswalvis @s) w (alk_ w // fix w sound: omswalk/rond(ge)swalk/voortswalk s) w (eek v // fix w sound: feesweek/kersweek/paasweek/vandeesweek/werksweek - @s) w (iel v // fix w sound: fietswiel/gewaarwordingswiel and similar compounds + @C) w (iel v // fix w sound: fietswiel/gewaarwordingswiel/dikwielfiets and similar compounds s) w (il v // fix w sound: groepswil/hemelswil/liefdeswil/korswil wilker vIlk@r // fix e sound: (treur)wilkerboom/-tak, etc. winke (lier v@Nk@l // move default stress: winkelier/-s and compounds diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 1497fae9..5880cc38 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -113,13 +113,13 @@ S s2 t v Z Dictionary fr_dict @ @- a A A~ e E E~ -i i: o O O~ u w W -w^i W~ y Y +i i: o O O2 O~ u w +W W2 w^i W~ y Y : ; b c d dZ f g h j k l m n N n2 -n^ p p2 r R s S t -t2 tS v z Z z2 z3 +n^ p p2 r R r2 s S +t t2 tS v z Z z2 z3 Dictionary hi_dict @@ -276,8 +276,8 @@ Dictionary pt_dict & &/ &U~ &~ @ @- a A aI aU e E eI EI eU EU -i i/ iU o O oI OI o~ -u U uI u~ y +i I i/ iU o O oI OI +o~ u U uI u~ y * : ; b C d dZ f g h j k l l^ m n diff --git a/dictsource/en_list b/dictsource/en_list index 97d52fb5..4cef780d 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -2259,6 +2259,7 @@ Philipine fIlIpi:n // misspell Poland poUl@nd Polish poUlIS $capital $only Portuguese po@tju:g'i:z +Potomac $2 Prague prA:g Pyrenees pIr@n'i:z Qatar katA@ @@ -2338,6 +2339,7 @@ Daphne dafnI2 Darryl dar@L Davie deIvI2 Davis deIvIs +Declan dEkla2n Denise d@ni:s Derek dErIk Dinah daIn@ @@ -2403,6 +2405,7 @@ Miguel mi:Q'El Mohammad moUh'amId Muhammad moUh'amId Moira mOIr@ +Natalie nata2li Nathan neIT@n Neville nEvIl Nicholas nIk@l@s @@ -2571,6 +2574,7 @@ thence DEns be %bi: $pastf $only been ,bi:n $pastf $only +?3 been ,bIn $pastf $only being ,bi:IN $pastf $only $strend2 is I2z $pastf $only // use contraction for 'is a' // am %am $nounf $only // now in en_rules diff --git a/dictsource/en_rules b/dictsource/en_rules index e47a3f65..bf43a467 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -622,6 +622,7 @@ ambi (d ambI ch) am (b eIm As) ame (_ 'A:mE + _) ame (l a2mi: &) am (ent @m amer (ic @mEr c) am (el am @@ -886,6 +887,7 @@ qu) ar (t O@ ar (til %A@ ary (_ @rI2 +?3 ion) ary (_ ErI2 XC) ary e@rI2 w) ar O@ wh) ar O@ @@ -1280,6 +1282,7 @@ _or) ch (es k me) ch (a k mi) ch (a k + chica (n SI2keI ch (irA k a) ch (il k bra) ch k @@ -2719,6 +2722,7 @@ n) iel (_ I2@L &r) iel (_ =i:@L ie (n i@ + d) iene (_ 'aIi:n ie (ntal I'E g) ie (n i: _sc) ie (n aI@ @@ -3050,6 +3054,7 @@ &) ity (_ =ItI2 orb) it It @@) it (an_ =It +?3 &) itary (_ @tErI2 // military gran) it (e It nfin) it (e It ur) it (e It diff --git a/dictsource/fr_list b/dictsource/fr_list index 08c4b80f..b51f8dbb 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -1,11 +1,9 @@ -/ - // This file in UTF8 encoded // 2006-11-18 Gilles Casse // -// Updated 2008-03-19 Michel Such +// Updated 2008-07-16 Michel Such // // * Numbers, a few abbreviations and exceptions. // @@ -119,14 +117,14 @@ _} f'ERm_akOl'ad _0 zeR'o _1 W~ -_2 d'Y -_3 tRw'a +_2 d'Yz2 +_3 tRw'az2 _4 k'atR _5 s'E~c _6 s'iz3 _7 s'Et _8 _|'w^it -_9 n'@f +_9 n'Wf _10 d'iz3 _11 O~z _12 d'uz @@ -136,17 +134,17 @@ _15 k'E~z _16 s'Ez _17 d'is:'Et _18 d'iz'w^it -_19 d'izn'@f +_19 d'izn'Wf _20 v'E~ _21 v'E~te:E~ -_22 v'E~td'Y -_23 v'E~t:tRw'a +_22 v'E~td'Yz2 +_23 v'E~t:tRw'az2 _24 v'E~tk'atR _25 v'E~ts'E~c _26 v'E~ts'iz3 _27 v'E~ts'Et _28 v'E~tw^it -_29 v'E~tn'@f +_29 v'E~tn'Wf _3X tR'A~t _31 tR'A~te:E~ _4X kaR'A~t @@ -164,11 +162,11 @@ _75 swas'A~t:k'E~z _76 swas'A~t:s'Ez _77 swas'A~t:d'is:'Et _78 swas'A~t:d'iz'w^it -_79 swas'A~t:d'izn'@f +_79 swas'A~t:d'izn'Wf _8X k'atR@v'E~ _80 k'atR@v'E~z2 _9X k'atR@v'E~d'iz3 -_91 k'atR@v'E~:O~z +_91 k'atR@v'E~:'O~z _92 k'atR@v'E~:d'uz _93 k'atR@v'E~:tR'Ez _94 k'atR@v'E~:kat'ORz @@ -176,7 +174,7 @@ _95 k'atR@v'E~:k'E~z _96 k'atR@v'E~:s'Ez _97 k'atR@v'E~:d'is:'Et _98 k'atR@v'E~:d'iz'w^it -_99 k'atR@v'E~:d'izn'@f +_99 k'atR@v'E~:d'izn'Wf _0C s'A~ _1C0 s'A~t2 _0M1 m'il @@ -260,21 +258,20 @@ une $u $nounf mais $u ou u $u $brk et e $u $brk -donc $u or $u $brk -ni $u -car $u -soit $u -cependant $u -néanmoins $u -toutefois $u +ni $u $brk +car $u $brk +soit $u $verb +cependant $brk +néanmoins $brk +toutefois $brk +avant $brk +après $brk -comme $u dont dO~t2 $u lorsque $u -(parce que) parsk@ $u -puisque $u +parce pars@- $u quand $u que $u $verbf qui $u $verbf @@ -284,13 +281,13 @@ si $u // pronouns je $u $verbf tu $u $verbf +il $u $verbf elle $u $verbf y $u $verbf -il $u $verbf -nous $u+ $verbf -vous $u+ $verbf -elles $u+ $verbf -ils $u+ $verbf +nous $u $verbf +vous $u $verbf +elles $u $verbf +ils $u $verbf on O~n2 $u $verbf me $u $verbf te $u $verbf @@ -311,54 +308,56 @@ cela $verbf (celles là) sEl||la $verbf // possessives -ma $u+ $nounf -mon $u+ $nounf -mes mez2 $u+ $nounf -ta $u+ $nounf -ton $u+ $nounf -tes tez2 $u+ $nounf -sa $u+ $nounf -son $u+ $nounf -ses sez2 $u+ $nounf -notre $u+ $nounf -votre $u+ $nounf -leur $u+ $nounf -leur $u+ $verb $verbextend -(la leur) la||l@r $u+ $verbf -(le leur) l@||l@r $u+ $verbf -nos $u+ $nounf -vos $u+ $nounf -leurs $u+ $nounf -leurs $u+ $verb $verbextend -(les leur) le||l@r $u+ $verbf -(les leurs) le||l@r $u+ $verbf +ma $u $nounf +mon $u $nounf +mes mez2 $u $nounf +ta $u $nounf +ton $u $nounf +tes tez2 $u $nounf +sa $u $nounf +son $u $nounf +ses sez2 $u $nounf +notre $u $nounf +votre $u $nounf +leur $u $nounf +leur $u $verb $verbextend +(la leur) la||lWr $u $verbf +(le leur) l@||lWr $u $verbf +nos $u $nounf +vos $u $nounf +leurs $u $nounf +leurs $u $verb $verbextend +(les leur) le||lWr $u $verbf +(les leurs) le||lWr $u $verbf // prepositions -de $u $nounf -du $u+ $nounf +de $u +du $u $nounf des dez2 $u $nounf à $u a -au $u $brk -aux $u $brk +au $u dans $u sur $u +autour otur par $u pour $u en $u en $u $verb $verbextend (en suspens) A~||sysp'A~ +(en tous) A~||tuz2 $u +(Tant mieux) tA~||mi;'Y vers $u -avec $u +avec $u $brk sans $u sous $u entre $u $brk contre $u -durant $brk +durant $u $brk // negative ne $u $verbf @@ -367,38 +366,24 @@ ne $u $verbf où $brk // auxillary verbs (be, have, can, etc) -suis $u+ $verb -es Ez2 $u+ $verb -est Et2 $u+ +es Ez2 $verb ès Es $u +est Et2 +ès Es d'est d'Est -sommes $u+ -êtes $u+ -sont $u+ $verb -étais $u+ $verb -était $u+ $verb -étions $u+ $verb -étiez $u+ $verb -étaient $u+ $verb - -serai $u+ $verb -seras $u+ $verb -sera $u+ $verb -serons $u+ $verb -serez $u+ $verb -seront $u+ $verb - -eu y $u+ -eue y $u+ -eues yz2 $u+ -eus yz2 $u+ -eut yt2 $u+ $verb +eu y $u +eue y $u +eues yz2 $u +eus yz2 $u +eut yt2 $u $verb +eux Yz2 $u // some common adjectives and adverbs quelque $u tout t'ut2 $u +rien riE~n2 // Letters which can be words @@ -417,7 +402,6 @@ scient si coing kwE~ convent kO~vA~ dessous d@su -divers divErz2 hareng _!arA~ pastis pastis poing pwE~ @@ -430,54 +414,58 @@ tunis tynis // MAIN WORD DICTIONARY //********************* +(1 er) pr@mi;'er2 +(1 ers) pr@mi;'ez2 +(1 ère) pr@mi;'Er +(1 ères) pr@mi;'Erz2 +(1 èrement) pr@mi;'Er@-mA~ + + monsieur m@sjY montréal mO~Real (n'est ce pas) n'Es@-||p'az2 (qu'est ce que) kEsk@ $u -(quelque chose) kElk@S'oz -(cent un) s'A~||W~ -(cent unième) s'A~||ynj'Em -(cent une) s'A~||yn -(cent onzième) s'A~||O~zj'Em -(cent onze) s'A~||O~z absent absA~ +admin admin airbus Erbys -anus anys auvent ovA~ +bien biE~n2 +(bien sûr) biE~||s'yr +bis bis bissus bisys -bonus bonys bus bys bus by $verb campus kA~pys -casus kazys -choeur k@r +choeur kWr cocus coky +dernier dErnier2 estomac Estoma éloquent ElokA~t2 fils fis gars ga +hélas elas iris iris -juin ZyE~ laser lazEr malus malys mars maRs -minus minys -paravent paravA~ +parangon parA~gO~ pays pEi phallus falys polder pOldEr +premier pr@mier2 souris suri sus sys sus sy $verb tuttiquanti tutikw'anti vénus venys +vot vOt gens ZA~ mens mA~z2 sens sA~s sens sA~z2 $verb -c'est sEt2 $u+ +c'est sEt2 qu'à ka m'y mi $verbf t'y ti $verbf @@ -487,24 +475,19 @@ l'y li $verbf qu'y ki $verbf (sud est) sydEst (nord est) nOREst -tiomètre pOtA~sjOmEtR@- - -processus pROsEsys // ut (t is said) août ut azimut azim'yt brut bR'yt -bouse buz but by $verb but byt -club kl@b -(le pub) l@||p'@b -(un pub) W~||p'@b -(du pub) dy||p'@b +club klWb +(le pub) l@||p'Wb +(un pub) W~||p'Wb +(du pub) dy||p'Wb cut cWt -helmut Elmut -hub _|@b +hub _|Wb mazout mazut michael mikaEl out aut @@ -548,9 +531,9 @@ kart kaRt smart smaRt // irt -flirt fl@Rt -(sweat shirt) swEtS@Rt -(tee shirt) tiS@Rt +flirt flWRt +(sweat shirt) swEtSWRt +(tee shirt) tiSWRt // words from other languages @@ -560,7 +543,7 @@ and _^_en amazon amaz'On apple _^_en at _^_en -(audible manager) odibl||manadZ@r +(audible manager) odibl||manadZWr bit _^_en bluetooth blut'us computer _^_en @@ -574,24 +557,19 @@ epson EpsOn espeak @spi:k ethernet etERnEt exit egzit -eye _^_en -eyes _^_en (file zilla) fajl||zija get _^_en -google gu:g@l -gnome gnom +google gu:gWl +gnome gnOm gnu gnu -hamburger _!A~b@rg@r +hamburger _!A~b@rgWr help _^_en hot _^_en in _^_en inside _^_en -internet E~tERnEt -(internet explorer) E~tErn'Et||EksplOr'@r +(internet explorer) E~tErn'Et||EksplOr'Wr klaxon klaksOn -layer _^_en let _^_en -liszt list lite _^_en login _^_en logon _^_en @@ -603,11 +581,10 @@ my _^_en not _^_en null _^_en ok oke -open Op'@n +open Op'Wn outlook autluk paint _^_en paper _^_en -player _^_en redhat REdat same _^_en sametime _^_en @@ -621,12 +598,7 @@ yes _^_en // tions (tjO~ instead of sjO~) -achetions aS@tjO~z2 apportions apORtjO~z2 -apprêtions apREtjO~z2 -arrêtions aREtjO~z2 -chantions SA~tjO~z2 -comptions kO~tjO~z2 constations kO~statjO~z2 contentions kO~tA~tjO~z2 dations datjO~z2 @@ -634,30 +606,19 @@ discutions diskytjO~z2 débutions debytjO~z2 désertions dezERtjO~z2 $verb détentions detA~tjO~z2 -escomptions EskO~tjO~z2 exploitions EksplwatjO~z2 exportions EkspORtjO~z2 -habitions abitjO~z2 -heurtions _!@RtjO~z2 -jetions Z@tjO~z2 +heurtions _!WRtjO~z2 limitions limitjO~z2 méritions meRitjO~z2 partions paRtjO~z2 -pressentions pREsA~tjO~z2 -présentions pRezA~tjO~z2 -prêtions pREtjO~z2 rations RatjO~z2 $verb -représentions R@pRezA~tjO~z2 respections REspEktjO~z2 -ressentions R@sA~tjO~z2 répétions RepetjO~z2 -sentions sA~tjO~z2 sortions sORtjO~z2 -souhaitions suEtjO~z2 supportions sypORtjO~z2 tentions tA~tjO~z2 -traitions tREtjO~z2 -votions vOtjO~z2 $u +votions votjO~z2 $u étions etjO~z2 évitions evitjO~z2 @@ -678,3 +639,4 @@ vincent vE~sA~ + diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 73f44e5b..bcb3c601 100755 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -4,7 +4,7 @@ // 2006-11-18 Gilles Casse // -// Updated: 2008-06-04 Michel Such +// Updated: 2008-07-17 Michel Such // // * The rules are based on Cicero TTS. // Y @@ -22,9 +22,14 @@ ae ae // maestro aî E // maître aim (K W~ // faim - ain (K W~ // pain + ain (K E~ // pain + CC) ain (_A E~n2 // prochain arret + CC) ain (_h W~n2 // prochain hiver ai (_ e // dirai ferai... + CC) ai (_ E // vrai ais (_ Ez2 // dirais ferais... + ait (_ Et2 // dirait ferait... + aient (_ Et2 // diraient feraient... f) ai (sA @ // faisons faisan a (ill a a (ils_ a @@ -34,8 +39,15 @@ am (b A~ // jambon am (p A~ // camp am (m a // programmation - am (m a // programmation - am (n am // amnistie + _) am (n am // amnistie + am (n a // amnistie + + _) arché (@P5 arke // archéologue + _) archéo (@P6 arkeo // archéologue + _) arch (aP4 ark // archange + _) arch (oP4 ark // archonte + _) anarcho (@P7 anarko // anarchosyndicalisme + a (nnA a // manne an (C A~ // ancien an (_ A~ // élan @@ -44,11 +56,13 @@ aoû ut // août au (l_ O // Paul au o // autruche - aud (_ o // chaud - au o // autruche + _) audio (@P5 odio + _) auto (@P4 oto + _) autom (n otO p) ay (s Ei // pays paysage ay (C E // aymé ay Ej // paye + Xl) ayer (X 'Ej@r // player, layer a a // bateau // group a: English section @@ -78,18 +92,15 @@ cc (Y ks // accéder cc k // occuper _) ch (arism k // charisme, charismatique - _ar) ch (a k // archange, archaïque - _ar) ch (é k // archéologue - _ar) ch (o k // archonte, archosaurien - _anar) ch (o k // anarchosyndicalisme + a) ch (_ k // almanach _A) ch (o_ k // écho _eu) ch (ari k // eucharistie or) ch (esC k // orchestre or) ch (iC k // orchidée - sy) ch (o k // psycho _) ch (ao k // chaos, chaotique _) ch (or k // chorale ch (r k // chrétien + _) chrono (@P6 krono ch (l k ch (n k ch (s k @@ -101,8 +112,10 @@ s) c (Y // x) c (Y c (Y s // cède + _) cyber (P5 sibEr ban) c (_ // banc blan) c (_ // blan + ron) c (_ // tronc cler) c (_ // leclerc tchou) c (_ taba) c (_ @@ -124,28 +137,30 @@ dd d // addition _) d' (P2 d _lan) d (_ d // land - Clan) d (_ d + _stan) d (_ d // stand + an) d (_ _san) d (_ d - Csan) d (_ d - _tan) d (_ d // stand - Ctan) d (_ d - Can) d (_ t2 // grand ami, grand marchand + _gran) d (_ t2 // grand ami, grand marchand Cen) d (_ t2 Con) d (_ t2 quan) d (_ t2 quen) d (_ t2 - quon) d (_ t2 + r) d (_ + _har) d (_ d + lor) d (_ d + au) d (_ + oi) d (_ dt (_ t // Schmidt _ni) d (_ // nid _noeu) d (_ // noeud - r) d (_ // lourd placard d d // don bled _expé) dien (t_ djA~ // expédient V_expé) dien (t_ di // expédient _ingré) dien (t_ djA~ // ingrédient dien (t_ di // étudient (verbe) + _) dendro (@P6 dE~dro // group d: English section day (_ _^_en @@ -154,17 +169,26 @@ .group e + +// Define use of the final 'e' in french + e (_ + qu) e (_ =@- + elqu) e =@ + uisqu) e =@ + rsqu) e =@ + e (Ce_ E eau o // bateau cheveaux g) ea (s_ a // mangeas j) e (a // Jean Jeanne p) ect (_ E // suspect ect (_ Ekt // direct - _trépi) ed e - _pi) ed e // pied + pi) ed (_ e // pied _cl) ef (_ e // clef ein (C E~ // peindre ein (_ E~ + CC) ein (_A E~n2 // plein emploi + CC) ein (_h E~n2 // plein hiver eint (_ E~t2 e (il E // vieille ei E // neige @@ -179,6 +203,7 @@ em (ma e // emmanuel em (mai A~ // emmailloter l) em (n a // solemnel + il) emn Em // dilemne em (p A~ en (_ A~n2 // en en (hA A~n // enharmonique @@ -186,9 +211,7 @@ C) en (d_ A~ // comprend dépend od) en (dr E~ // rhododendron - C) en (ds_ A~ qu) en (d_ A~ - qu) en (ds_ A~ pati) en A~ // patient patience X) en (nu A~ // ennui @@ -199,6 +222,7 @@ Ci) en (nA E // mienne éC) en (t_ A~ // récent différent élément + équ) en (t_ A~ // fréquent, conséquent étic) en (t_ A~ // réticent _C) en (t_ A~ // cent vent lent dent @@ -217,7 +241,7 @@ _ard) en (t_ A~ // argent, ardent _arg) en (t_ A~ // argent, argent _urg) en (t_ A~ // urgent - V_urg) en (t_ // urgent (verbe) + V_urg) en (t_ // urgent (verbe) _émin) en (t_ A~ // éminent immin) en (t_ A~ // imminent @@ -228,10 +252,10 @@ @@Cig) en (t_ A~ // intransigent, intelligent _dilig) en (t_ A~ // diligent XACig) en (t_ A~ // dirigent, exigent - VXACig) en (t_ // dirigent, exigent (verbe) + VXACig) en (t_ // dirigent, exigent (verbe) flig) en (t_ A~ // affligent - Vflig) en (t_ // infligent (verbe) - Xig) en (t_ // figent, pigent + Vflig) en (t_ // infligent (verbe) + Xig) en (t_ // figent, pigent oblig) en (t_ A~ // obligent, d�sobligent Voblig) en (t_ // obligent (verbe) @@ -240,9 +264,9 @@ _pat) en (t_ A~ // patent rmam) en (t_ A~ // firmament éCerg) en (t_ A~ // détergent - V_éCerg) en (t_ // émergent + V_éCerg) en (t_ // émergent verg) en (t_ A~ // convergent, divergent - Vverg) en (t_ // convergent, divergent (verbe) + Vverg) en (t_ // convergent, divergent (verbe) _serg) en (t_ A~ // sergent CACCim) en (t_ A~ // condiment, gentiment @@ -261,14 +285,14 @@ ontin) en (t_ A~ // continent, incontinent _sArm) en (t_ A~ // sarment, serment erm) en (t_ A~ // ferment - Vferm) en (t_ // ferment, referment (verbe) + Vferm) en (t_ // ferment, referment (verbe) XArp) en (t_ A~ // arpent, serpent CArr) en (t_ A~ // conncurrent, torrent - Cerr) en (t_ // ils serrent + Cerr) en (t_ // ils serrent _appar) en (t_ A~ // apparent spar) en (t_ A~ // transparent _par) en (t_ A~ // parent - V_par) en (t_ // parent (verbe) + V_par) en (t_ // parent (verbe) _var) en (t_ A~ // varent mitt) en (t_ A~ // intermittent énit) en (t_ A~ // pénitent @@ -278,10 +302,9 @@ _tal) en (t_ A~ // talent ival) en (t_ A~ // équivalent - Vival) en (t_ // équivalent (verbe) + Vival) en (t_ // équivalent (verbe) xcell) en (t_ A~ // excellent - Vxcell) en (t_ // excellent - nn) en (t_ t2 // prennent, viennent, sonnent + Vxcell) en (t_ // excellent iCam) en (t_ A~ mm) en (t_ A~ @@ -301,7 +324,7 @@ _laur) en (t_ A~ _mécont) en (t_ A~ _cont) en (t_ A~ - _Vcont) en (t_ t2 + _Vcont) en (t_ éC) en (t_ A~ // compétent _souv) en (t_ A~ // souvent Cud) en (t_ A~ @@ -312,6 +335,7 @@ en (t_ // étaient mangent + A) en (t_ // étaient mangent Ci) en (_ E~ // viendra Ci) en (C E~ // viendra @@ -333,11 +357,7 @@ _Ch) er (_ ER // cher _env) er (_ ER _hi) er (_ ER // hier - _hyp) er (_ ER // hyper _hiv) er (_ ER // hiver - _sup) er (_ ER // super - _trav) er (_ ER - _univ) er (_ ER _ti) er (_ ER @@ -371,21 +391,20 @@ _r) e (stru @ // restructurer -) est (_ Est // -est - @Cr) es (_C @- - rC) es (_C @- // fortes dames dg) et (_ Et // Bridget, gadget - ') eu (_ y // eu - eu (rX @ // peur -// eu (rs_ @ // tracteurs + eu Y // eu - eu (C @ - eu (i @ - - eu (s Y // meute tueuse jeu gueuse + eu (C W eu (x_ Y - eu (t_ Y - eu Y // meute tueuse jeu gueuze + eu (i W + eu (rC W2 + eu (tr Y + + _) eut (_ yt2 + eut (_ Yt2 + _) extra (uP5 Ekstra + _) extra (CP5 Ekstra _) eû y // eût eû Y // jeûne @@ -396,24 +415,13 @@ ez (_ ez2 // nez mangez chez _C) e (_ @ // je te - _CC) e (_ @- - _qu) e (_ @ // que + _CC) e (_ =@- -j) e (_ @- - gu) e (_C @- - gu) es (_C @- - qu) e (_C @- - qu) es (_C @- - e (_ // montre g) e (A // mangeons - AC) e (ment @- // vitement sûrement - Aqu) e (ment - enC) e (ment - enqu) e (ment - _d) e (ch @ _d) e (Cl @ _d) e (Cr @ // degré @@ -439,6 +447,8 @@ es (_ z2 ll) e (m // actuellement guillemets + C) e (ment @- // vitement sûrement + u) e (ment @- As) e (gA As) e (pA @@ -473,6 +483,13 @@ qu) este (X_ _^_en // requested, requester _) ev _^_en // even, ever, event oC) ever _^_en // forever, however + _) eye _^_en + + +.group è + + Z) ème iEm + è E .group ë @@ -543,84 +560,47 @@ .group h -_) h (ac _! // hache -_) h (ai _! // haine haillon -_) h (al _! // halte -_) h (amea _! // hameau -_) h (amb _! // hamburger -_) h (amp _! // hampe -_) h (an _! // hanche -_) h (app _! // happer -_) h (ara _! // haranguer -_) h (arc _! // harceler -_) h (ard _! // hardi -_) h (are _! // hareng, haret -_) h (arf _! // harfang -_) h (argn _! // hargne -_) h (ari _! // haricot haridelle -_) h (ark _! // harka -_) h (arn _! // harnais -_) h (arp _! // harpe -_) h (as _! // hasard, hase -_) h (âs _! // hâte -_) h (au _! // haut -_) h (av _! // havre - -_) h (eau _! // heaume -_) h (él _! // hélas, héler -_) h (èl _! // hèlement -_) h (enn _! // henné, hennir -_) h (enr _! // henri -_) h (ère _! // hère -_) h (ériss _! // hérisser, hérisson -_) h (ern _! // hernie -_) h (éro _! // héros, héron -_) h (ers _! // herse -_) h (ertz _! // hertz -_) h (êtr _! // hêtre, hêtraie -_) h (eula _! // heulandite -_) h (eurt _! // heurter - -_) h (iat _! // hiatal, hiatus -_) h (ibo _! // hibou -_) h (ic _! // hic -_) h (ide _! // hideux -_) h (iér _! // hiéroglyphe -_) h (i-fi _! // hi-fi -_) h (i-han _! // hi-han -_) h (iss _! // hisser -_) h (it _! // hit, hit-parad - -_) h (ob _! // hobby, hobereau -_) h (och _! // hocher -_) h (ock _! // hockey -_) h (old _! // holding, hold-up -_) h (oll _! // hollandais -_) h (oma _! // homard -_) h (ondu _! // Honduras -_) h (ong _! // Hongrie -_) h (onn _! // honnir -_) h (ont _! // honte -_) h (oqu _! // hoquet -_) h (ord _! // horde -_) h (ou _! // houpe -_) h (orio _! // horion -_) h (ormi _! // hormis -_) h (ors _! // hors, horsain -_) h (osan _! // hosanna -_) h (ot _! // hot-dog, hotte -_) h (ou _! // houle, housse - -_) h (u _! -_) h (uil // huile -_) h (uiss // huissier -_) h (uî // huître -_) h (umain // humain -_) h (umani // humanité -_) h (umb // humble -_) h (umi // humide -_) h (umo // humour - h // ahuri +_) h _! +_) h (abi // habit, habilleur +_) h (allo // hallogène +_) h (ame // hameçon +_) h (andr // handroïde +_) h (arm // harmonie +_) h (el // hellène +_) h (éb // hébreux +_) h (ect // hectare +_) h (él // hélice +_) h (erb // herbe +_) h (éCa // hématie +_) h (érit // hériter +_) h (eure // heure +_) h (iber // hibernation +_) h (ippo // hippodrome +_) h (iro // hirondelle +_) h (ist // histoire +_) h (ive // hiver +_) h (omm // homme +_) h (onn // honneur +_) h (ôp // hôpital +_) h (os // hostile +_) h (ora // horaire +_) h (oriz // horizon +_) h (oro // horoscope +_) h (orlo // horloge +_) h (orr // horreur +_) h (ôt // hôtel +_) h (uil // huile +_) h (uiss // huissier +_) h (uî // huître +_) h (uma // humain +_) h (umb // humble +_) h (umi // humide +_) h (umo // humour +_) h (y // hypermarché + _) hyper (@P5 ipEr + _) hyper (_ ipEr + _) hypra (@P5 ipra + h // ahuri // group h: English section _) half _^_en @@ -630,8 +610,8 @@ _) half _^_en .group i i i // cri - X) i (a i // fiancer, fiable - _r) i (A i // rien + i (A i // rien + i (o j ie (ment i // remerciement balbutiement C) ien (t_ i dév) ien (t_ i @@ -649,6 +629,7 @@ _) half _^_en i (e_ i i (A j // fermier portier patio renier _) ill ill // illégal + aigu) ill ij // aiguille anqu) ill ill // tranquille _m) ill il // mille v) ill il // village @@ -665,10 +646,15 @@ _) half _^_en w) in in // winrar in (h in // inhumain inct (_ E~ // distinct - in (n i // innombrable + in (n in // innombrable in (C E~ // vingt in (_ W~ // vin - ique (_ ik + _) infra (_P5 E~fra + _) inter (@P5 E~tEr + _) inter (_ E~t'Er + _) inter (ne_ E~t'Er + _) intra (neP5 E~tra + _) intra (uP5 E~tra C) is (_ i // group i: English section @@ -708,8 +694,6 @@ _) half _^_en // group k: English section ke (X _^_en // basket, make, take - key _^_en - ky (_ _^_en .group l l l // lit @@ -727,6 +711,7 @@ _) half _^_en .group m m m // film mm m // pomme + _) m' (P2 m // group m: English section _) mail (_ _^_en // mailer @@ -744,45 +729,54 @@ _) half _^_en A) ng (_ N // parking meeting nn n // panne _) n (_° nymero + _) neuro (@@P5 nYro .group o + br) oc (_ o // broc cr) oc (_ o // escroc + o (lC O2 + on (n O + on (nerA O2 + o (rC O2 + _) os (_ Os + s_) os (_ o + x_) os (_ o + o (se_ o + o (CCement_ O2 + o (Cement_ O2 + o (t_ o + o (tre_ O2 - o (ch o // cochon - o (che_ O // poche, cloche oe (ll wa // moelleux _) oe (C Y // oesophage _ph) oe (C e // phoetus - oeu @ // soeur coeur + oeu W // soeur coeur oeufs @ // oeufs boeufs o (eC o // coefficient - _) oi (gnon O // oignons + _) oi (gnon o // oignons oin (C wE~ oin (_ wE~ // coin oi wa // poil - oid (_ wa // froid + oie (m wa // dploiement oê (l wa // poêle oî wa // boîte - o (mm O // comme - radi) o (C o // radiophonique - dr) o (me_ O // vélodrome - om (b O~ // bombe - om (p O~ // pompe - n) om (_ O~ // nom + om (C O~ // bombe + om (m O // nommer + _) om (n O2m // omnibus + n) om (X O~ // nom om (_ Om // www.web.com on (K O~ // mon - on (n O // bonne + on (t_ O~t2 // mont vont sont onsh (A O~z // bonshommes onh (A On // bonhomme + _) on (z _!O~ // onze, onzime _b) on (_A On // liaison: bon élève _b) on (_h O~n2 // liaison: bon hiver _C) on (_ O~n2 // mon appui, mon histoire, mon havre _c) on (_ O~ // no comment - o (re_ O - alc) oo (l O // alcool z) oo o // zoo z) oo (C oo // zoologue @@ -793,8 +787,6 @@ _) half _^_en _tr) op (_ op2 // trop v) ost (_ o // Prévost - o (sA o // poser - ot (_ o // mot dépots _C) oup (_ u // coup, loup uC) oup (_ up2 // beaucoup @@ -807,12 +799,8 @@ _) half _^_en oy wa // roy o (_ o // zorro allégro o (z_ o // berlioz - o (mo o // momo - o (no o // nono - om) o o // monocorde - on) o o // + o O - o O // sobre notions émotions // group o: English section oa (X _^_en // approach, load @@ -822,6 +810,7 @@ _) half _^_en C) oing (_ _^_en // going oo (Ce _^_en // boomer oo (X _^_en // pool + ook _^_en // book, cook C) oot _^_en // bootable football _) one _^_en _sC) ot _^_en @@ -838,6 +827,10 @@ C) oing (_ _^_en // going .group p p p // pas + _) para (CCP4 para + _) photo (@P5 foto + _) poly (@P4 poli + _) pseudo (@P6 psYdo p (p // appliquer ph f // phrase @@ -848,10 +841,13 @@ C) oing (_ _^_en // going cam) p (_ // camp - dra) p (_ // sparadrap + dra) p (_ // drap + _) psych (@P5 psik + _) psych (iCP5 psiS + _) psych (AA_P5 psiS - ba) p (t // baptiser compte - com) p (t // baptiser compte + ba) p (t // baptiser + com) p (t // compte C) pt (_ // prompt exempt @@ -873,7 +869,7 @@ C) oing (_ _^_en // going _A) qu (ilat ky // équilatéral _C) qu (a kw // squale square _A) qu (a kw // équateur - dA) qu (a kw // adequate + dé) qu (a kw // adequate _) qu (artz kw // quartz qu k // quatre _) que (_ k@ // que @@ -890,6 +886,7 @@ cou) rr RR // courrai mou) rr RR // mourrai rr R // erreur r r // rien + _) radio (@P5 radio // group r: English section AC) ram (_ _^_en @@ -917,7 +914,6 @@ mou) rr RR // mourrai ss s // assez ai) s (em s // vraisemblable - archo) s s // anarchosyndicalisme ub) s (is z // subsister han) s (on s // chanson A) s (A z // baiser @@ -925,6 +921,10 @@ mou) rr RR // mourrai y) s (A z // paysage CCan) s (A z // transition xpan) s (A s // expansion + _) socio (@P5 sosio + _) super (@P5 sypEr + _) super (_ sypEr + _) supra (@P5 sypra _u) s (_ s @@ -934,6 +934,7 @@ mou) rr RR // mourrai mbu) s (_ s Acu) s (_ s écu) s (_ + asu) s (_ s odu) s (_ s gu) s (_ s igu) s (_ // aigus @@ -945,14 +946,16 @@ mou) rr RR // mourrai mu) s (_ s _mu) s (_ ému) s (_ - unu) s (_ s // prunus opu) s (_ s // opus, octopus Aru) s (_ s // virus aru) s (_ // disparus ouru) s (_ // courus + Anu) s (_ s // bonus, tonus + enu) s (_ // menus, venus psu) s (_ s // lapsus + cessu) s (_ s // processus - atu) s (_ s // stratus cactus motus + atu) s (_ s // stratus motus ctu) s (_ s // cactus etu) s (_ s aitu) s (_ @@ -961,7 +964,6 @@ mou) rr RR // mourrai otu) s (_ s // motus Cutu) s (_ s - _tou) s (_C _tou) s (_ s s (b z // sbire @@ -972,10 +974,9 @@ mou) rr RR // mourrai // group s: English section sh (_ _^_en - ship _^_en // friendship - shop _^_en // shop + sh (Ap _^_en // shop, ship sh (At _^_en // shut, shot - sk _^_en + _) sky _^_en _) smil _^_en // smile, smiley spy _^_en sy (_ _^_en @@ -984,19 +985,26 @@ mou) rr RR // mourrai .group t t t // bataille _) t (_ te + _) t' (P2 t -) t (- t V) t (_ t2 // silent at end of verb unless next word starts with a vowel -n) t (_ // silent at end of verb unless next word starts with a vowel +u) t (- t2 // silent at end of verb unless next word starts with a vowel n) t (- t2 // silent at end of verb unless next word starts with a vowel t (_ // silent at end of word t (-S1 t _) th t // thon ts (_S1 z2 // silent at end of word unless next word starts with a vowel C) t (_ t // compost watt soft script malttact abrupt + ki) t (_ t // kit + n) t (_ + Vn) t (_ t2 r) t (_ t2 // fort aul) t (_ // Renault + _) télé (@P4 tele + _) thermo (@P6 tErmo + tt t // attitude s) th (m // asthme @@ -1008,6 +1016,7 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe t (io_ s // ratio + Ama) t (ieX s // diplomatie a) t (ia s // spatial en) t (ia s // confidentialit� bu) t (iA s // balbutiait @@ -1018,10 +1027,21 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe t (ion s // programmation + V) t (ion t // verbes + ache) t (ion t // achetions, rachetions + ai) t (ion t // souhaitions, traitions + chan) t (ion t // chantions, dchantions Cisi) t (ion t // visitions ci) t (ion t // citions + comp) t (ion t // comptions, escomptions + Conc) t (ion s // fonctionner, ponctionner + Ce) t (ion t // jetions, rejetions + habi) t (ion t // habitions ou) t (ion t // ajoutions + rê) t (ion t // arrêtions, apprêtions + s) t (ion t // gestion + sen) t (ion_ t // sentions, ressentions t) t (ion t // combattions t (iel s // partiel patiemment @@ -1061,12 +1081,12 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe .group u u y // cruel nuage brut - ui w^i _b) usi _^_en // business, businessman c) ueill Wj // cueillir c) ueil (_ Wj // recueil _c) ul (_ y + _) ultra (P5 yltra g) ueill Wj // orgueilleux g) ueil (_ Wj // orgueil @@ -1110,6 +1130,7 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe .group v v v + vers (_S4 vErz2 // goup v: English section voice (X _^_en @@ -1145,7 +1166,7 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe _soi) x (A s // soixante - Au) x (_S1 z2 // faux feux choux + Au) x (_ z2 // faux feux choux _au) x (quel // auxquels @@ -1162,6 +1183,7 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe .group y y i // cryogénique myope + _) yahoo (P5 ia'u // symbolique ym (b E~ // symbolique ym (p E~ // tympan ym (_ E~ // thym @@ -1198,7 +1220,7 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe // symbols that are normally spoken when reading text , (D pilk:u - ! Eksklamassj'O~ + ! Eksklamasj'O~ $ dOlaR @ aRobas % puRsA~ diff --git a/dictsource/pt_list b/dictsource/pt_list index e04a61f5..39ef4a58 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -21,7 +21,7 @@ _ac2 &g'udUd'uplU _brv bR'Evi _ced sedZ'ilj& ?1 _ced syd'il^& -_cir sirkuNfl'EksU +_cir sirku~Nfl'EksU _dia tR'em& _dot p'oNtU _grv gR'avi @@ -93,7 +93,7 @@ _@ ax'ob& _[ ,abRikowS'etSi _\ b,ax&,iNvertS'id& _] f,ES&kowS'etSi -_^ s,irkuNfl'Eksu +_^ s,irku~Nfl'Eksu __ s,ublin^'adu _` gR'avi _{ ,abRiS'avi @@ -114,7 +114,7 @@ _" 'abRi;'asp&||d'upl&s# ?1 _0 z'E*u ?2 _0 z'E*U ?1 _1 'um -?2 _1 'uN +?2 _1 'u~N _2 d'oIs# _3 tR'es# ?1 _4 kw'atru diff --git a/dictsource/pt_rules b/dictsource/pt_rules index 799c7f46..2c18fdab 100755 --- a/dictsource/pt_rules +++ b/dictsource/pt_rules @@ -4,9 +4,11 @@ // Options // ?1 European Portuguese // ?2 Brazilian Portuguese +// ?4 Brazil mbrola voice // Letter groups // A a vowel +// B a consonant, except h l r w y // C a consonant // G a voiced consonant // K not a vowel @@ -39,7 +41,8 @@ a (nA@ & am (_ =&~N am (C &~m - an (K &~N +?4 am (C &~N + an (K+ &~N a (nhA &~ am (_ =&U~ ?1 a (z_ 'a //eg: paz, rapaz, capaz, etc... @@ -97,16 +100,19 @@ _) b (_ be b b b (b +?2 b (B bI .group c _) c (_ se c k c (Y s // ce ci +?2 c (B kI ch S + ck k c (c //drop “c” in European Portuguese (eg: seleccionar) -?1 A) ct t //drop “c” in European Portuguese (eg: exacto) -?1 A) cç s //drop “c” in European Portuguese (eg: selecção) + A) ct t //drop “c” in European Portuguese (eg: exacto) + A) cç s //drop “c” in European Portuguese (eg: selecção) ?1 conta) ct (A kt // eg: contacto, contactar, contactável, incontactável, etc... @@ -114,6 +120,8 @@ _) d (_ de d d d (d +?2 d (B dZI +?2 d (_C d_ ?2 d (i dZ ?2 d (í dZ ?2 d (e_ dZ @@ -316,6 +324,7 @@ _) f (_ 'Efe f f f (f +?2 f (B fI .group g @@ -324,6 +333,8 @@ _) g (_ Ze g g g (g +?2 g (B ZI +?2 g (_C g_ g (Y Z // ge gi gu (Y g ?1 guen (C gw'eIN // aguenta, etc. @@ -350,6 +361,8 @@ im (_ iN im (C im +?4 im (C iN + in (C iN // ?4 ?? in (g iN in (k iN inh in^ @@ -397,12 +410,16 @@ .group j _) j (_ Z'Ot& j Z +?2 j (B ZI + .group k ?1 _) k (_ k'ap& ?2 _) k (_ ka k k k (k +?2 k (B kI +?2 k (_C k_ .group l @@ -410,7 +427,7 @@ ?1 _) l (_ El _) l (_ 'Ele l l - l (l + l) l lh l^ A) lh lj ?1 A) lh l^ // @@ -422,6 +439,7 @@ _) m (_ 'eme m m m (m +?2 m (B mI .group n @@ -430,6 +448,7 @@ _) n (_ 'ene n n n (n +?2 n (B nI nh n^ ?1 A) nn n //drop “n” (eg: connosco). @@ -443,6 +462,7 @@ oi (s oI o (iCK o oo u + oon u~N c) oo oo ?1 C) oo (_ ow // eg: voo, enjoo, etc... oy OI @@ -488,6 +508,7 @@ o (ma_ o om (C om +?4 om (C oN on (K oN o (na_ o onh on^ @@ -547,6 +568,7 @@ _) p (_ pe p p p (p +?2 p (B pI ?1 ph f //Didn’t use in European Portuguese (eg: English) ?1 ple (_ _^_EN @@ -554,6 +576,7 @@ .group q _) q (_ ke q k +?2 q (B kI qu kw qü kw qu (Y k @@ -601,15 +624,16 @@ sc (Y s sç s sh S +?4 _) s (C Is A) s (A z ?1 @) s (_ s# ?2 s (_ s# @) s (_A z // next word starts with vowel - @) s (_G z // next word starts with voiced consonant +?!4 @) s (_G z // next word starts with voiced consonant A) s (_S1 s A) s (_AS1 z // next word starts with vowel - A) s (_GS1 z // next word starts with voiced consonant +?!4 A) s (_GS1 z // next word starts with voiced consonant ?1 A) s (C s# ?1 A) ss s @@ -622,6 +646,8 @@ _) t (_ te t t t (t +?2 t (B tSI +?2 t (_C t_ ?2 t (i tS ?2 t (í tS ?2 t (e_ tS @@ -646,6 +672,7 @@ um (_ u~N um (C u~m +?4 um (C u~N un (K u~N unh u~n^ @@ -656,12 +683,14 @@ ú ''u úm (_ ''u~N úm (C ''u~m +?4 úm (C ''u~N ún (K ''u~N únh ''u~n^ .group v v v v (v +?2 v (B vI .group w @@ -669,11 +698,13 @@ ?2 _) w (_ d'ablju w w ?1 w (_ _^_EN +?4 _) w u .group x x (A S A) x (A ks +?4 A) x (A z _e) x (A z e) x (A ks ?1 e) x (CA S @@ -704,6 +735,7 @@ _) z (_ ze z z z (z +?2 z (B zI ?1 @) z (_ S ?2 @) z (_ s @) z (_A z diff --git a/espeak-data/voices/af b/espeak-data/voices/af index 327104c6..dcb61343 100755 --- a/espeak-data/voices/af +++ b/espeak-data/voices/af @@ -1,6 +1,8 @@ name afrikaans language af gender male +roughness 0 +pitch 55 122 diff --git a/espeak-data/voices/mb/mb-br1 b/espeak-data/voices/mb/mb-br1 new file mode 100755 index 00000000..62b002b9 --- /dev/null +++ b/espeak-data/voices/mb/mb-br1 @@ -0,0 +1,9 @@ +language pt 7 +name brazil-mbrola-1 +gender male +pitch 82 117 + +dictrules 2 4 + +mbrola br1 ptbr_phtrans + diff --git a/espeak-data/voices/mb/mb-br3 b/espeak-data/voices/mb/mb-br3 new file mode 100644 index 00000000..231a9f0e --- /dev/null +++ b/espeak-data/voices/mb/mb-br3 @@ -0,0 +1,9 @@ +language pt 7 +name brazil-mbrola-3 +gender male +pitch 82 117 + +dictrules 2 4 + +mbrola br3 ptbr_phtrans + diff --git a/espeak-data/voices/mb/mb-de2 b/espeak-data/voices/mb/mb-de2 new file mode 100755 index 00000000..c0a5475e --- /dev/null +++ b/espeak-data/voices/mb/mb-de2 @@ -0,0 +1,6 @@ +name german-mbrola-2 +language de 6 +gender male + +mbrola de2 de2_phtrans + diff --git a/espeak-data/voices/mb/mb-es1-en b/espeak-data/voices/mb/mb-es1-en deleted file mode 100644 index e5b9d084..00000000 --- a/espeak-data/voices/mb/mb-es1-en +++ /dev/null @@ -1,8 +0,0 @@ -name en-spanish1 -language en 10 -gender male - -dictrules 1 -pitch 82 117 -mbrola es1 es_phtrans - diff --git a/espeak-data/voices/mb/mb-es2-en b/espeak-data/voices/mb/mb-es2-en deleted file mode 100644 index 45f21402..00000000 --- a/espeak-data/voices/mb/mb-es2-en +++ /dev/null @@ -1,8 +0,0 @@ -name en-spanish2 -language en 10 -gender male - -dictrules 1 -pitch 82 117 -mbrola es2 es_phtrans - diff --git a/phsource/compile_report b/phsource/compile_report index fd90fb55..a7cea1ae 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -4,19 +4,19 @@ base2 24 117 en 51 144 en_n 30 144 - en_us 34 144 + en_us 35 144 en_sc 39 146 en_rp 34 144 en_wm 30 144 en_wi 30 144 - af 38 130 + af 39 130 cy 29 124 de 33 125 eo 13 110 jbo 4 111 fi 40 129 - fr 44 124 - fr_ca 11 124 + fr 49 127 + fr_ca 11 127 hi 51 135 ta 17 138 hu 23 114 @@ -32,8 +32,8 @@ la 21 116 es 9 118 es_la 1 118 - pt 27 133 - pt_pt 20 133 + pt 28 134 + pt_pt 20 134 ro 36 141 el 8 117 grc 12 122 @@ -286,6 +286,7 @@ j2/j2o [(o)] base j2/j2u [(u)] base j2/xj2 [(i)] base j/_j [j] base + [j] fr [j] zh j/j_ [j/] base j/j@ [(@)] base @@ -327,6 +328,7 @@ l/_l [l] base [l] af [l/] de [l] fr + [l/] fr [l] hu [l] sk [l] ru @@ -336,6 +338,7 @@ l/_l [l] base [l] zh l/l_ [l/] base [l] fr + [l/] fr l/l@ [(@)] base [l] fr l/L1_aL [(a)] base @@ -367,6 +370,7 @@ l/li [(i)] base [l] zh l/l_long [l] base [l] fr + [l/] fr [l] la [l;] ro l/lo [(o)] base @@ -537,7 +541,6 @@ r/rr [r/] base [r/] af [r] de [r] fi - [R] fr [r2] nl [r] ru [r/] ru @@ -579,6 +582,7 @@ ufric/ll [L] base [l#] is ufric/s [s] base [s] fr + [z2] fr [s] es [s#] pt [s`] ko @@ -1076,7 +1080,7 @@ vnasal/oi_n [oI~] pt vnasal/o_n [o~] hi [o~] pt vnasal/o_n2 [o~] af - [O~] fr +vnasal/o_n3 [O~] fr vnasal/oo_n [O~] en vnasal/oo_n2 [O~] hi [O~] pl @@ -1168,6 +1172,7 @@ vowel/@ [@] base [@] en [@2] en [@5] en + [@] en_us [3] en_rp [@] en_rp [V] cy @@ -1188,12 +1193,13 @@ vowel/0_2 [0] en_n vowel/0_3 [O] en_sc [0] en_rp [A] hu -vowel/@_2 [W] fr vowel/@_3 [@] en_sc [I] en_sc [@2] en_sc [@5] en_sc [@] de + [W] fr + [W2] fr [@3] hi vowel/3_2 [3:] en_n [@] zh @@ -1214,6 +1220,7 @@ vowel/a [a] en_n [aa] en_wm [a] cy [a] de + [a] fr [a] ta [a:] hu [a:] nl @@ -1348,8 +1355,7 @@ vowel/e_2 [eI] en_sc vowel/e_3 [e:] hu [e] ku vowel/e_5 [i] en_sc -vowel/ee [E] fr - [E] pl +vowel/ee [E] pl [E] sv vowel/e_e [E] en_sc [e] is @@ -1379,6 +1385,8 @@ vowel/ee_6 [E] en_n [E] ku vowel/e_mid [E] en_rp [e] jbo + [E] fr + [E~] fr [E] fr_ca [E] hi [E] hu @@ -1410,8 +1418,8 @@ vowel/e_mid2 [E] af vowel/@_fnt [@] en_wi [@2] en_wi [@2] hr -vowel/@_fr [@] fr -vowel/@_hgh [@] hr +vowel/@_hgh [@] fr + [@] hr vowel/i [i] base2 [i:] en_n [i] en_wm @@ -1423,6 +1431,7 @@ vowel/i [i] base2 [i:] hu [i] pl [i] it + [I] pt [y] pt [i/] pt [i] pt_pt @@ -1559,6 +1568,7 @@ vowel/oe_2 [W] no [W] tr vowel/oe_4 [W] sv vowel/o_mid [O] fr + [O2] fr [o] hu [o] tr vowel/oo [O:] en_sc @@ -1806,6 +1816,8 @@ vwl_en_us/or [O:] en_us vwl_en_us/ur [U@] en_us vwl_fr/@R [R] fr [r] fr + [r/] fr + [r2] fr [x] pt_pt vwl_fr/@R2 [R] fr_ca vwl_hi/A [a:] hi @@ -1880,6 +1892,7 @@ w/w2 [w2] base2 [w] sk [w] pt_pt w/wa [(a)] base + [w] fr w/we [(e)] base w/wi [(i)] base [i] vi @@ -1907,6 +1920,7 @@ x/b [b] base [b;] ro [b] is x/b_ [b] base + [b] fr x/d [d] base [t#] en_us [d] fr diff --git a/phsource/mbrola/fr1 b/phsource/mbrola/fr1 index 37c5a3ab..02383302 100644 --- a/phsource/mbrola/fr1 +++ b/phsource/mbrola/fr1 @@ -1,4 +1,4 @@ -volume 15 +volume 15 0 l/2 NULL 0 l 0 l/ NULL 0 l 0 r/ NULL 0 R @@ -30,6 +30,7 @@ volume 15 0 h NULL 0 NULL 0 n2 NULL 0 n 0 p2 NULL 0 p +0 r2 NULL 0 r 0 t2 NULL 0 t 0 z2 NULL 0 z 0 z3 NULL 0 z @@ -58,6 +59,7 @@ volume 15 0 o@ NULL 70 o @ 0 O@ NULL 70 O @ 0 O: NULL 0 O +0 O2 NULL 0 O 0 A: NULL 0 a 0 A@ NULL 70 a @ 0 U@ NULL 60 u @ @@ -71,3 +73,4 @@ volume 15 + diff --git a/phsource/ph_afrikaans b/phsource/ph_afrikaans index 82cfeffb..84eff048 100755 --- a/phsource/ph_afrikaans +++ b/phsource/ph_afrikaans @@ -1,6 +1,12 @@ //**************************************************************** +//redefinition of the : phoneme +phoneme : // Lengthen previous vowel by "length" + virtual + length 140 +endphoneme + // VOWELS //**************************************************************** diff --git a/phsource/ph_english_us b/phsource/ph_english_us index e3d705f6..57f63189 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -10,11 +10,18 @@ phoneme 3 // Schwa, used for rhotic schwa in American formants vwl_en_us/3_us unstressed linkout r- - beforevowel @ +// beforevowel @ length 210 endphoneme +phoneme @ // Schwa + vowel starttype (@) endtype (@) + formants vowel/@ + unstressed + length 140 +endphoneme + phoneme @L vowel starttype (@) endtype l @@ -89,7 +96,7 @@ endphoneme phoneme 0 - vowel starttype (o) endtype (o) + vowel starttype (a) endtype (a) length 190 formants vowel/aa_8 reduceto @ 0 diff --git a/phsource/ph_french b/phsource/ph_french index 78eaafb5..53732637 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -11,9 +11,8 @@ endphoneme phoneme @ vowel starttype (@) endtype (@) - unstressed length 170 - formants vowel/@_fr + formants vowel/@_hgh endphoneme @@ -21,6 +20,7 @@ phoneme a vowel starttype (a) endtype (a) length 170 formants vowel/a_3 + after w vowel/a endphoneme @@ -33,8 +33,8 @@ endphoneme phoneme E vowel starttype (e) endtype (e) - length 170 - formants vowel/ee + length 175 + formants vowel/e_mid endphoneme @@ -54,6 +54,19 @@ phoneme i: // Slitely longer than i endphoneme +phoneme j + liquid + palatal + length 100 + beforenotvowel j/ + formants NULL + after _ j/_j + after v NULL + lengthmod 7 +// beforevowel i +endphoneme + + phoneme o vowel starttype (o) endtype (o) length 170 @@ -65,6 +78,14 @@ phoneme O vowel starttype (o) endtype (o) length 170 formants vowel/o_mid + reduceto o 1 +endphoneme + + +phoneme O2 // Like O but no reduceto + vowel starttype (o) endtype (o) + length 170 + formants vowel/o_mid endphoneme @@ -91,20 +112,28 @@ endphoneme phoneme w - vowel starttype (o) endtype (o) - unstressed - length 100 + vowel + length 120 beforenotvowel w/ lengthmod 7 formants w/w after _ w/_w + before (a) w/wa endphoneme phoneme W vowel starttype (@) endtype (@) - length 170 - formants vowel/@_2 + length 180 + formants vowel/@_3 + reduceto Y 1 +endphoneme + + +phoneme W2 // same as W but don't reduce + vowel starttype (@) endtype (@) + length 180 + formants vowel/@_3 endphoneme @@ -119,22 +148,23 @@ endphoneme phoneme A~ vowel starttype (a) endtype (a) - length 180 - formants vnasal/aa_n2 // silent unless followed by vowel + length 200 + formants vnasal/aa_n2 endphoneme phoneme E~ // same as W~ for fr-fr vowel starttype (e) endtype (e) - length 180 + length 200 formants vnasal/W_n + before n2 vowel/e_mid endphoneme phoneme O~ vowel starttype (o) endtype (o) - length 180 - formants vnasal/o_n2 + length 200 + formants vnasal/o_n3 endphoneme @@ -189,31 +219,30 @@ endphoneme phoneme b vcd blb stop vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk - formants b/b+x/b%45 - before _ b/b_+x/b%45 - before (a) b/ba+x/b%45 - before (@) b/b@+x/b%45 - before (e) b/be+x/b%45 - before (i) b/bi+x/b%45 - before (o) b/bo+x/b%45 - before (u) b/bu+x/b%45 - before @- b/b@2+x/b%45 + 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 + before (u) b/bu + before @- b/b@2+x/b after _ NULL - after @ b/xb%45 + after @ b/xb lengthmod 5 switchvoicing p endphoneme - phoneme d vcd alv stop - vowelin f1=0 f2=1700 -300 300 f3=-100 80 + vowelin f1=0 f2=1700 -300 300 f3=-100 80 amp=20 vowelout f1=0 f2=1700 -300 300 f3=-100 80 - formants d/d%30+x/d%30 - before _ d/d_%30+x/d_%30 - before r d/dr%60+x/d%60 - after _ NULL - after @ d/xd%40 + formants d/d+x/d%40 + before _ d/d_+x/d_%50 + before r d/dr+x/d%50 + after _ d/d+x/d%50 + after @ d/xd lengthmod 5 switchvoicing t endphoneme @@ -221,9 +250,9 @@ endphoneme phoneme g vcd vel stop - vowelin f1=2 f2=2300 200 300 f3=-300 80 + vowelin f1=2 f2=2300 200 300 f3=-300 80 amp=10 vowelout f1=2 f2=2300 250 300 f3=-300 80 brk - formants g/g%30+x/g2%30 + formants g/g+x/g2%30 before _ g/g_+x/g_ after _ NULL after @ g/xg%30 @@ -238,7 +267,7 @@ phoneme k vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20 lengthmod 2 wave ustop/k%45 // reduce strength of noise burst - before _ ustop/k_%45 + before _ ustop/k_ before r ustop/kr%45 before l ustop/kl%45 before (i) ustop/ki%45 @@ -247,10 +276,10 @@ endphoneme phoneme l - liquid + liquid pal palatal length 100 lengthmod 7 -// beforenotvowel l/ + beforenotvowel l/ formants l/l after _ l/_l after t l/tl @@ -265,6 +294,17 @@ phoneme l endphoneme +phoneme l/ // used for [l] when not before a vowel + liquid pal palatal + length 100 + lengthmod 7 + formants l/l_ + before b l/l_long + before (r) l/_l + beforevowel l +endphoneme + + phoneme n2 beforenotvowel NULL vcd alv nasal @@ -279,14 +319,15 @@ endphoneme phoneme p vls blb stop vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 - vowelout f1=0 f2=1000 -500 -350 f3=-300 80 rms=22 + vowelout f1=0 f2=1000 -500 -350 f3=-300 80 brk lengthmod 2 wave ustop/p%45 - before _ ustop/p_%45 - before r ustop/pr%45 - before R ustop/pr%45 - before @- ustop/p_unasp%45 - before l ustop/pl%45 + before _ ustop/p_%70 + after _ ustop/p%70 + before r ustop/pr%60 + before R ustop/pr%60 + before @- ustop/p_unasp%60 + before l ustop/pl%60 switchvoicing b endphoneme @@ -303,33 +344,49 @@ endphoneme phoneme r - vcd uvl frc starttype r endtype r - vowelin f1=0 f2=800 -100 100 f3=-400 100 - vowelout f1=0 f2=800 -100 100 f3=-400 100 len=0 rms=20 + vcd rfx frc starttype r endtype r + vowelin f1=0 f2=800 -50 50 f3=-100 100 len=0 rms=30 + vowelout f1=0 f2=800 -50 50 f3=-100 100 len=0 brk length 100 - lengthmod 7 + lengthmod 3 beforenotvowel r/ - formants vwl_fr/@R%60 - after t r/tr%60 - before _ r3/r_%60 + formants vwl_fr/@R + after t r/tr + after k r/tr + after p r/tr + before _ r3/r_ +endphoneme + + +phoneme r2 // silent unless followed by vowel + vcd rfx frc starttype r endtype r + vowelin f1=0 f2=800 -50 50 f3=-100 100 + vowelout f1=0 f2=600 -100 100 f3=-100 100 len=0 brk + length 100 + lengthmod 3 + beforenotvowel NULL + formants vwl_fr/@R + before _ vwl_fr/@R endphoneme phoneme R - vcd uvl frc starttype r endtype r - vowelin f1=0 f2=800 -100 100 f3=-400 100 + vcd rfx frc starttype r endtype r + vowelin f1=0 f2=800 -50 50 f3=-100 100 len=0 rms=30 length 100 - lengthmod 7 + lengthmod 3 beforenotvowel r/ - formants vwl_fr/@R%60 - after r r/rr%60 + formants vwl_fr/@R +// after r r/rr endphoneme phoneme r/ // variant of [r] when not preceding a vowel - vcd uvl frc starttype r endtype r + vcd rfx frc starttype r endtype r + vowelout f1=0 f2=800 -50 50 f3=-100 100 len=0 rms=20 length 100 - lengthmod 7 // + lengthmod 2 formants NULL + before j vwl_fr/@R endphoneme @@ -366,7 +423,7 @@ phoneme t vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 lengthmod 2 wave ustop/t%30 - before _ ustop/t_%30 + before _ ustop/t_%60 before @- ustop/t%30 before r ustop/tr%30 before R ustop/tr%30 @@ -380,19 +437,19 @@ phoneme t2 // silent unless followed by vowel vowelin f1=0 f2=1600 -300 300 f3=-100 80 vowelout f1=0 f2=1600 -300 250 f3=-100 80 rms=20 lengthmod 2 - wave ustop/t%45 + wave ustop/t%30 before _ ustop/t_%45 endphoneme phoneme v vcd lbd frc - vowelin f1=0 f2=1000 -300 -200 f3=-300 100 - vowelout f1=0 f2=1000 -500 -300 f3=-300 60 len=10 + vowelin f1=0 f2=1000 -300 -200 f3=-300 100 amp=15 + vowelout f1=0 f2=1000 -300 -2300 f3=-300 100 len=10 lengthmod 6 formants voc/v+vocw/v%75 before (r) voc/vj+vocw/v%75 - before _ voc/v_+vocw/v%75 + before _ voc/v_+vocw/v switchvoicing f endphoneme @@ -412,7 +469,7 @@ phoneme z2 // silent unless followed by vowel vcd alv frc sibilant vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 formants voc/z+ufric/s_%45 - before _ voc/z_+ufric/s_%45 + before _ voc/z_+ufric/s%45 lengthmod 6 endphoneme @@ -428,5 +485,3 @@ endphoneme - - diff --git a/phsource/ph_pt_brazil b/phsource/ph_pt_brazil index 5c068f61..a257e967 100644 --- a/phsource/ph_pt_brazil +++ b/phsource/ph_pt_brazil @@ -3,6 +3,13 @@ // Portuguese - based on Base2 //==================================================== +phoneme I // epenthetic i + vowel starttype (i) endtype (i) + length 90 + formants vowel/i + unstressed +endphoneme + phoneme e~ vowel starttype (e) endtype (e) length 240 diff --git a/phsource/phonemes b/phsource/phonemes index 1047bfae..37dd27d8 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -247,7 +247,7 @@ phoneme (a) virtual after N nn/nna after n^ n^/n^a before l/ DFT-40+l/L1_aL - before l/2 DFT-40+l/L2_aL + before l/2 DFT-50+l/L2_aL before l DFT-40+l/xl before w DFT-30+w/xw before j DFT-30+j/xj @@ -316,7 +316,7 @@ phoneme (o) virtual after N nn/nno after n^ n^/n^o before l/ DFT-40+l/L1_oL - before l/2 DFT-40+l/L2_oL + before l/2 DFT-50+l/L2_oL before l DFT-40+l/xl before w DFT-30+w/xw before j DFT-30+j/xj diff --git a/phsource/vdiph/aoo b/phsource/vdiph/aoo index f3e6fb8479b6252e7588cea60753d8464dfdaec6..f860a8a043f9bb22666416fb4a21a6545a06fdfb 100644 GIT binary patch delta 208 zcmbQrGnHq8w-f`<3#M(%3_!ra+%J~TG=&Mowqa$En0%5+YhwR9tSXpcD&!__W&Bb9 zfZ-zdBd9U2m`ubnz{W5$2(#W0cY_)!#`S>j0pkNkknziS{zBRM9QXM$I3eQt9CxIJ wSYc`^tS-Um@dqzHV-qfxS{)ER*FqWHz@8m+=7r#T+(J delta 202 zcmezC{MT6|IKb68B-k~Om4SgFKR+|xgp(nDqev}xU_4NOfnhTP3)eKJc}%KI^BE+W zc8N$b$uLc4u4Z6jIU^PdWLt21Fhp?)@jqaEz{tnDmqC?hH6Mu0%Kw#N0$(yahz&AF zKw5nBBW_!EpREkeoQ+HzOm<9t3=GI1~_Y)+IEWds0c Cp9_Tm delta 56 zcmexn^37y}lAw6&!jlXj;J~_b0hqxM4Wv>gTMEi@d}V16P-c3-xH(RciGy*@=0r(R FMgY104mbb+ diff --git a/phsource/vwl_en_us/a b/phsource/vwl_en_us/a index 86cef1d1af4b74143bce4b6e9815432323f96da1..0967515e701b103e025044c218240b945114ff92 100644 GIT binary patch delta 58 zcmca>aNmGGIKb68B-k~OnSp^JG2Un+Zx9R10VW24&B-hrP*y$%2Mgnl%@sV{AgV>+ GCOZJibq|C9 delta 56 zcmca_aMyr0IKb68B-k~Ok%56BaU*{a3(E>72L8>dEF4f)AqNKw>+s{+&j{2piRS?`W5ncQ0Zqm^o97DLlvsAcb@*}ZX9Vh)#PfieF=}$LfF|R<&2t5A@&f>cw;Ou^ diff --git a/src/dictionary.cpp b/src/dictionary.cpp index b2825e69..77502035 100755 --- a/src/dictionary.cpp +++ b/src/dictionary.cpp @@ -1170,7 +1170,16 @@ void Translator::SetWordStress(char *output, unsigned int dictionary_flags, int stressed_syllable = vowel_count - 1; if(max_stress == 0) { - vowel_stress[stressed_syllable] = 4; + while(stressed_syllable > 0) + { + if(vowel_stress[stressed_syllable] == 0) + { + vowel_stress[stressed_syllable] = 4; + break; + } + else + stressed_syllable--; + } } max_stress = 4; } diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 6d5f8459..f588b0d1 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.04 27.Jun.08"; +const char *version_string = "1.37.07 19.Jul.08"; const int version_phdata = 0x013400; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index 00f946fd..36fd6f1f 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -599,6 +599,7 @@ SetLengthMods(tr,3); // all equal tr->langopts.stress_flags = 0x6 | 0x10 | 0x20000; tr->langopts.numbers = 0x269 + 0x2000 + NUM_ROMAN; SetLetterVowel(tr,'y'); + SetLetterBits(tr,1,"bcdfgjkmnpqstvxz"); // B hard consonants, excluding h,l,r,w,y } break; diff --git a/src/translate.cpp b/src/translate.cpp index 85b25b28..ca69295f 100755 --- a/src/translate.cpp +++ b/src/translate.cpp @@ -373,6 +373,9 @@ int IsAlpha(unsigned int c) if((c >= 0x1100) && (c <= 0x11ff)) return(1); //Korean jamo + if((c > 0x3040) && (c <= 0xa700)) + return(1); // Chinese/Japanese. Should never get here, but Mac OS 10.4's iswalpha seems to be broken, so just make sure + return(0); }