From 811b0ed93ac67bbaebb6fbc5deb93e03770202ca Mon Sep 17 00:00:00 2001 From: jonsd Date: Wed, 13 Aug 2008 20:39:06 +0000 Subject: [PATCH] [1.37.12] git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@184 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/dict_phonemes | 16 ++-- dictsource/en_list | 14 +++- dictsource/en_rules | 13 +++- dictsource/fr_list | 69 +++++++++-------- dictsource/fr_rules | 148 +++++++++++++++++++++---------------- dictsource/nl_list | 9 ++- dictsource/nl_rules | 3 + dictsource/pt_list | 80 +++++++++++--------- dictsource/pt_rules | 7 +- espeak-data/voices/en/en-r | 4 +- phsource/compile_report | 35 ++++----- phsource/ph_english | 2 +- phsource/ph_english_us | 13 ++-- phsource/ph_french | 39 +++++----- phsource/vdiph/aoo | Bin 1557 -> 1557 bytes phsource/vdiph2/ei_4 | Bin 7276 -> 7276 bytes phsource/vowel/V_6 | Bin 1267 -> 6239 bytes phsource/vowel/aa_4 | Bin 5204 -> 5204 bytes phsource/vowel/aa_8 | Bin 2156 -> 2156 bytes phsource/vwl_en_us/3_us | Bin 1348 -> 1348 bytes phsource/vwl_en_us/a | Bin 6237 -> 6237 bytes phsource/vwl_en_us/ee | Bin 3352 -> 3352 bytes phsource/vwl_en_us/ii | Bin 6238 -> 6238 bytes phsource/vwl_en_us/ii_2 | Bin 7276 -> 0 bytes phsource/vwl_en_us/u | Bin 0 -> 6237 bytes src/dictionary.cpp | 5 +- 26 files changed, 264 insertions(+), 193 deletions(-) delete mode 100644 phsource/vwl_en_us/ii_2 create mode 100644 phsource/vwl_en_us/u diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 87cfc8cf..2ecb27bf 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -54,9 +54,10 @@ Dictionary en_dict 0 3 3: @ @- @2 @5 @L a a2 A: A@ aa aI aI@ aU -aU@ E e@ eI I i I2 i: -i@ i@3 IR O O: o: O@ o@ -OI oU O~ U u: U@ V VR +aU@ A~ E e@ eI I i I2 +i: i@ i@3 IR O O: o: O@ +o@ OI oU O~ U u: U@ V +VR : ; ? b C d D dZ f g h j k l m n @@ -98,14 +99,15 @@ S s2 t v Z Dictionary fr_dict -@ @- a A A~ e E E~ -i i: o O O2 O~ u u: -w W W2 w^i W~ y Y +@ @- a A a2 A~ e E +E~ i i: o O o2 O2 O~ +u u: 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 r2 s S -t t2 tS v z Z z2 z3 +t t2 tS v w z Z z2 +z3 Dictionary hi_dict diff --git a/dictsource/en_list b/dictsource/en_list index ca4217f9..25a779e0 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -815,6 +815,7 @@ curse k3:s ?5 curse kVRs customer k'Vst@m3 cutoff kVt0f +cutout kVtaUt cyan saI'an cymru kVmrI2 @@ -1393,6 +1394,7 @@ negate nI2geIt neglect nI2glEkt neon ni:0n nepenthe nIp'EnTI2 +nescience nEsI@ns niche ni:S noah noUV nobly noUblI2 $verbf @@ -1409,6 +1411,7 @@ nowhere noUwe@ oases oU'eIsi:z oasis oU'eIsIs +obelisk 0b@lIsk obesity oUb'i:s@tI2 obey oUb'eI obituary 0b'ItSU@I2 @@ -1429,6 +1432,8 @@ ogre oUg3 okay oUk'eI omelet 0ml@t omelette 0ml@t +omnibus $1 +omniscience 0mn'IsI@ns opaque oUp'eIk opine oUp'aIn opossum @p0s@m @@ -1554,7 +1559,8 @@ predicate prEdIkeIt preface prEf@s preferably prEf@-r@blI2 $verbf prelude prElju:d -preparation prEp@r'eIS@n +preparation prEp@r'eIS@n +prescience pri:si@ns present prEz@nt $only present $verb presently prEz@ntlI2 $verbf @@ -1761,6 +1767,7 @@ secret si:kr@t secretive si:kr@tI2v secretary sEkr@trI2 sedate sI2deIt +seduce sI2dju:s separate sEp@-r@t separate sEp3reIt $verb semen si:m@n @@ -1834,7 +1841,6 @@ strychnine str'Ikni:n ?3 status stat@s sterile stEraIl stomata stoUm@t@ -stonily stoUnIlI2 storytell stO:rI2tEl stripy straIpI2 suave swA:v @@ -2027,7 +2033,6 @@ volcano v0lk'eInoU wane weIn wannabe w0na2bi: -warily we@IlI2 $verbf warring wO@rIN wastage weIstIdZ wast weIst // wasted @@ -2262,6 +2267,7 @@ Polish poUlIS $capital $only Portuguese po@tju:g'i:z Potomac $2 Prague prA:g +Provence pr0v'A~s Pyrenees pIr@n'i:z Qatar katA@ Quebec kwI2bEk @@ -2272,6 +2278,7 @@ Savannah $2 Savoy sa2vOI Seattle si:'at@L Seychelle seIS'El +Sicily sIsI2lI2 Slovak sloUvak Seoul soUl (sri lanka) sr,i:||l'anka2 @@ -2725,6 +2732,7 @@ he %hi: $verbsf she %Si: $only $verbsf it %It $verbsf (it has) I2t||h'az $atend +(it was) I2t||w'0z $atend it $allcaps $abbrev we %wi: $verbf $only you %ju: $verbf diff --git a/dictsource/en_rules b/dictsource/en_rules index d85987d7..b498d0a0 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -635,6 +635,7 @@ l) ame (nt %amE amm (end a2m amoeb a2mi:b + f) amil amIl f) am (ous eIm &) am (ent @m &) ame (nta @m'E @@ -861,7 +862,7 @@ are (t ar@ ar (iaC_ 'e@ ar (ia_ 'e@ - arily (_ 'Er@lI2 + @) arily (_ 'Er@lI2 ch) ar (it ar m) ar (i @r m) ar (ig ar @@ -2436,6 +2437,8 @@ K) hl L &) hold (_$4 hoUld holme hoUm + _) homeo hoUmi:oU + _) homoeo hoUmi:oU &) hood (_S4 hUd &) hoods (_S5 hUdz _) h (our @@ -2560,7 +2563,7 @@ _C) i (lo aI _k) i (lo I _l) i (Cy_ I - &) ily (_ I2lI2 + &) ily (_S2i lI2 l) i (m@ I cl) i (m aI l) ime aIm @@ -2726,6 +2729,7 @@ d) iene (_ 'aIi:n ie (ntal I'E g) ie (n i: + sc) ie (nc aI@ _sc) ie (n aI@ ?8 _sc) ie (n aIa2 ie (nCiA I2'E @@ -3625,6 +3629,7 @@ &) om (ise_ =@m &) om (ize_ =@m @) om (ist_ =@m + _) omni (@ 0mn'I &) omy (_ =@mI2 .group on @@ -3777,6 +3782,7 @@ _) or (iC 0r @t) ore (_ 3 st) ore (_ o@ + @) orily (_ '0r@lI2 h) ori (z @raI h) ori (zont 0rI _h) or (o 0r @@ -4073,6 +4079,7 @@ pneu nju: pota (t p@teI _) ps s + pseudo su:doU psych saIk psycho saIkoU psycho (lo saIk'0 @@ -4244,6 +4251,7 @@ _) run (a rVn _) run (o rVn _) rw r%U + &ant) ry (_S2 rI2 .group re // _) re (@P2 %ri: @@ -4595,6 +4603,7 @@ u (_ ju: r) u (_ u: l) u (_ u: + w) u (_ u: h) u (_ =u: u (ga_ 'u: u (ki_ 'u: diff --git a/dictsource/fr_list b/dictsource/fr_list index edd2f3d6..ae0294fb 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -3,7 +3,7 @@ // 2006-11-18 Gilles Casse // -// Updated 2008-08-07 Michel Such +// Updated 2008-08-12 Michel Such // // * Numbers, a few abbreviations and exceptions. // @@ -119,7 +119,7 @@ _} f'ERm_akOl'ad _0 zeRo _1 W~ _2 dYz2 -_3 tRwaz2 +_3 tRwa2z2 _4 katR _5 sE~k _6 siz3 @@ -127,7 +127,7 @@ _7 sEt _8 _|w^it _9 nWf _10 diz3 -_11 O~z +_11 _!O~z _12 duz _13 tREz _14 katORz @@ -139,7 +139,7 @@ _19 diznWf _20 vE~ _21 vE~te:W~ _22 vE~tdYz2 -_23 vE~t:tRwaz2 +_23 vE~t:tRwa2z2 _24 vE~tkatR _25 vE~tsE~k _26 vE~tsiz3 @@ -152,18 +152,18 @@ _4X kaRA~t _41 kaRA~te:W~ _5X sE~kA~t _51 sE~kA~te:W~ -_6X swasA~t -_61 swasA~te:W~ -_7X swasA~t:diz3 -_71 swasA~te:O~z -_72 swasA~t:duz -_73 swasA~t:tREz -_74 swasA~t:katORz -_75 swasA~t:kE~z -_76 swasA~t:sEz -_77 swasA~t:dis:Et -_78 swasA~t:diz'w^it -_79 swasA~t:diznWf +_6X swa2sA~t +_61 swa2sA~te:W~ +_7X swa2sA~t:diz3 +_71 swa2sA~te:O~z +_72 swa2sA~t:duz +_73 swa2sA~t:tREz +_74 swa2sA~t:katORz +_75 swa2sA~t:kE~z +_76 swa2sA~t:sEz +_77 swa2sA~t:dis:Et +_78 swa2sA~t:diz'w^it +_79 swa2sA~t:diznWf _8X katR@vE~ _80 katR@vE~z2 _9X katR@vE~diz3 @@ -189,7 +189,7 @@ _dpt virgyl (31 ème) trA~te:yniEm (41 ème) karA~te:yniEm (51 ème) sE~kA~te:yniEm -(61 ème) swasA~te:yniEm +(61 ème) swa2sA~te:yniEm (81 ème) katr@vE~:yniEm // ABBREVIATIONS @@ -224,7 +224,7 @@ kw kilowat m. m@sjY mbrola Em'bRola mhz megaErts -mlle mad@mwazEl +mlle mad@mwa2zEl mme madam mr m@sjY nsi $abbrev @@ -271,8 +271,8 @@ une $u+ $nounf // conjonctions mais $u+ ou u $u $brk +eh $u $brk et e $u $brk -or $u $brk ni $u $brk car $u+ $brk cependant $brk @@ -366,20 +366,30 @@ au $u aux $u autour otur $u+ +autre $u+ +autres $u+ dans $u+ en $u+ en $u+ $verb $verbextend (en suspens) A~||sysp'A~ (en tous) A~||tuz2 $u+ par $u+ +parmi $u+ pour $u+ tant tA~t2 $u+ +autant $u+ +tandis $u+ +dès $u entre $u+ contre $u+ plusieurs $u+ durant $u+ avec $u+ sans $u+ +trop $u+ +assez $u+ +beaucoup $u+ +très $u // negative ne $u $verbf @@ -448,7 +458,7 @@ rien riE~n2 $u+ // Letters which can be words //=========================== -à $atend $accent +à $atend $accent $only y igr'Ek $atend $only ô $atend $accent @@ -501,19 +511,17 @@ campus kA~pys choeur kWr cocus coky dernier dErnier2 -estomac Estoma éloquent ElokA~t2 fier fier2 $verb fils fis fuel fjul gars ga -hélas elas +hélas elas $u+ iris iris laser lazEr malus malys mars maRs parangon parA~gO~ -pays pEi phallus falys polder pOldEr premier pr@mier2 @@ -556,7 +564,7 @@ zut zyt exocet EgzOsEt fret fR'Et budget bydZE -hamlet amlEt +hamlet hamlEt knesset knEsEt lazaret lazaREt margaret maRgaREt @@ -568,7 +576,7 @@ soviet sOvjEt // urt (t is said) kurt kuRt yaourt jauRt -yoghourt yoguRt +yoghourt yogurt yogourt yoguRt // ort (t said) @@ -595,7 +603,7 @@ amazon amaz'On apple _^_en at _^_en (audible manager) od,ibl||manadZ'Wr -bit _^_en +bit bit bluetooth blut'us computer _^_en (cyber link) _^_en @@ -613,7 +621,7 @@ get _^_en google gu:gWl gnome gnOm gnu gnu -hamburger _!A~b@rgWr +hamburger hA~b@rgWr help _^_en hot _^_en in _^_en @@ -645,7 +653,7 @@ sun _^_en (text aloud) tEkst||@la=wd ubuntu ubuntu up _^_en -yacht jot +yacht jO2t yes _^_en @@ -658,9 +666,9 @@ discutions diskytjO~z2 débutions debytjO~z2 désertions dezERtjO~z2 $verb détentions detA~tjO~z2 -exploitions EksplwatjO~z2 +exploitions Eksplwa2tjO~z2 exportions EkspORtjO~z2 -heurtions _!WRtjO~z2 +heurtions hWRtjO~z2 limitions limitjO~z2 méritions meRitjO~z2 partions paRtjO~z2 @@ -692,3 +700,4 @@ vincent vE~sA~ + diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 7b9cdb64..b1d6ed93 100755 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -23,7 +23,7 @@ // 2006-11-18 Gilles Casse // -// Updated: 2008-08-07 Michel Such +// Updated: 2008-08-12 Michel Such // // Letter classes: @@ -65,8 +65,7 @@ _) anarcho (@P7 anarko // anarchosyndicalisme a (nnA a // manne - an (C A~ // ancien - an (_ A~ // élan + an (K A~ // ancien, élan _C) aon (_ A~ // faon, paon, taon s) aoul (_ u // saoul s) aou (le u // saoule @@ -78,9 +77,11 @@ _) audio (@P5 odio _) auto (@P4 oto _) autom (n otO - p) ay (s Ei // pays paysage + _) au (treX o2 + p) a (ys E // pays paysage ay (C E // aymé ay Ej // paye + ay (_ E // display Xl) ayer (X EjWr // player, layer a a // bateau @@ -111,6 +112,7 @@ cc k // occuper _) ch (arism k // charisme, charismatique a) ch (_ k // almanach + e) ch (_ k // varech _A) ch (o_ k // écho _eu) ch (ari k // eucharistie or) ch (esC k // orchestre @@ -119,7 +121,7 @@ _) ch (or k // chorale te) ch (_ k ch (r k // chrétien - _) chrono (@P6 krono + _) chrono (@P6 kro2no ch (l k ch (n k ch (s k @@ -138,11 +140,12 @@ cler) c (_ // leclerc tchou) c (_ taba) c (_ + toma) c (_ se) c (ond g // seconde secondaire c k // recoin donc s) cien (t jA~ // conscient scientifique - cien (t_ si // ils appr�ient, remercient. + cient (_ sit2 // ils appr�ient, remercient. effi) cien (t sjA~ // coefficient défi) cien (t sjA~ // déficient @@ -152,6 +155,12 @@ cut (_ _^_en // cut, shortcut +.group ç + + ç s // rançon +_) ç' (P2v s + + .group d dd d // addition _) d' (P2 d @@ -198,11 +207,9 @@ _C) e (_ @ // je te -c) e (_ @- -j) e (_ @- + C) e (- @- e (Ce_ E - ack) er (K Wr - ock) er (K Er - rock) er (K Wr eau o // bateau cheveaux g) ea (s_ a // mangeas j) e (a // Jean Jeanne @@ -216,10 +223,10 @@ e (il E // vieille ei E // neige ell El // selle - el (C El // celsius - el (_ El // caramel + el (K El // celsius, caramel _f) em (me a // femme - i) e (ment // remerciement, d‚ploiement + i) e (mA // remerciement, d‚ploiement + i) e (rA // remerciera @) em (me a // patiemment em (b A~ // décembre em (mACC A~ // emmancher @@ -255,7 +262,7 @@ _dol) en (t_ A~ // dolent ol) en (t_ A~ // somnolent, violent Vol) en (t_ // somnolent, violent - Xol) en (t_ // volent + Xol) ent (_ t2 // volent ul) en (t_ A~ // turbulent Vul) en (t_ imCoC) en (t_ A~ // impotent @@ -264,10 +271,10 @@ XACcid) en (t_ A~ // accident, occident _ag) en (t_ A~ // agent - _ard) en (t_ A~ // argent, ardent - _arg) en (t_ A~ // argent, argent + _ard) en (t_ A~ // ardent + _arg) en (t_ A~ // argent _urg) en (t_ A~ // urgent - V_urg) en (t_ // urgent (verbe) + V_urg) ent (_ t2 // urgent (verbe) _émin) en (t_ A~ // éminent immin) en (t_ A~ // imminent @@ -278,21 +285,22 @@ @@Cig) en (t_ A~ // intransigent, intelligent _dilig) en (t_ A~ // diligent XACig) en (t_ A~ // dirigent, exigent - VXACig) en (t_ // dirigent, exigent (verbe) + VXACig) ent (_ t2 // dirigent, exigent (verbe) flig) en (t_ A~ // affligent - Vflig) en (t_ // infligent (verbe) - Xig) en (t_ // figent, pigent + Vflig) ent (_ t2 // infligent (verbe) + Xig) ent (_ t2 // figent, pigent oblig) en (t_ A~ // obligent, d�sobligent - Voblig) en (t_ // obligent (verbe) + Voblig) ent (_ t2 // obligent (verbe) + tang) en (t_ A~ // tangent man) en (t_ A~ // permanent @@ing) en (t_ A~ // astreingent, contingentindigent _pat) en (t_ A~ // patent rmam) en (t_ A~ // firmament éCerg) en (t_ A~ // détergent - V_éCerg) en (t_ // émergent + V_éCerg) ent (_ t2 // émergent verg) en (t_ A~ // convergent, divergent - Vverg) en (t_ // convergent, divergent (verbe) + Vverg) ent (_ t2 // convergent, divergent (verbe) _serg) en (t_ A~ // sergent CACCim) en (t_ A~ // condiment, gentiment @@ -311,30 +319,30 @@ ontin) en (t_ A~ // continent, incontinent _sArm) en (t_ A~ // sarment, serment erm) en (t_ A~ // ferment - Vferm) en (t_ // ferment, referment (verbe) + Vferm) ent (_ t2 // ferment, referment (verbe) XArp) en (t_ A~ // arpent, serpent CArr) en (t_ A~ // conncurrent, torrent - Cerr) en (t_ // ils serrent + Cerr) ent (_ t2 // 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) ent (_ t2 // parent (verbe) _var) en (t_ A~ // varent mitt) en (t_ A~ // intermittent énit) en (t_ A~ // pénitent tourm) en (t_ A~ // tourment Cflu) en (t_ A~ // affluent, confluent - VCflu) en (t_ // refluent, influent (verbe) + VCflu) ent (_ t2 // refluent, influent (verbe) _tal) en (t_ A~ // talent ival) en (t_ A~ // équivalent - Vival) en (t_ // équivalent (verbe) + Vival) ent (_ t2 // équivalent (verbe) xcell) en (t_ A~ // excellent - Vxcell) en (t_ // excellent + Vxcell) ent (_ t2 // excellent iCam) en (t_ A~ mm) en (t_ A~ - em) en (t_ A~ // vitement + em) en (t_ A~ // lentement mom) en (t_ A~ // moment Aaim) en (t_ A~ Caim) en (t_ A~ @@ -345,13 +353,13 @@ rum) en (t_ A~ éCid) en (t_ A~ - VéCid) en (t_ + VéCid) ent (_ t2 Xtrid) en (t_ A~ _flor) en (t_ A~ _laur) en (t_ A~ _mécont) en (t_ A~ _cont) en (t_ A~ - _Vcont) en (t_ + _Vcont) ent (_ t2 éC) en (t_ A~ // compétent _souv) en (t_ A~ // souvent Cud) en (t_ A~ @@ -360,14 +368,12 @@ V_couv) en (t_ // elles couvent s_couv) en (t_ // elles couvent - - en (t_ // étaient mangent - A) en (t_ // étaient mangent + ent (_ t2 // étaient mangent + A) ent (_ t2 // étaient mangent Ci) en (K E~ // rien, lien Ci) en (c A~ // science - AA) en (_ E~ C) en (_ En // amen, abdomen, golden xam) en (_ E~ // examen @@ -385,7 +391,9 @@ _fi) er (_ ER // fier _hiv) er (X ER // hiver _ti) er (_ ER - + ack) er (K Wr + ock) er (K Er + rock) er (K Wr er (_ e // parler léger er (s_ e @@ -420,6 +428,7 @@ eu Y // eu eu (C W + eu (h_ Y eu (x_ Y eu (i W eu (rC W2 @@ -458,6 +467,7 @@ e (Cr @ _) e (ff e // effet, effectuer e (C_ E + e (t_ Et2 e (rC E es (_ z2 @@ -480,6 +490,7 @@ _) e (xA E Cr) eamer i:mWr Cl) eaner i:nWr + Ack) et (_ Et // group e: English section @@ -496,8 +507,6 @@ eld (_ _^_en // field _) enter (_ _^_en // enter _) enhan _^_en - ack) et (_ _^_en // racket, packet - ock) et (_ _^_en // rocket, pocket qu) est (_ _^_en // request qu) este (X_ _^_en // requested, requester _) even _^_en // forever, however @@ -509,7 +518,7 @@ .group è Z) ème iEm - è E + è E .group ë @@ -575,6 +584,7 @@ .group h _) h _! +Ca) h (_ h _) h (abi // habit, habilleur _) h (allo // hallogène _) h (ame // hameçon @@ -709,6 +719,7 @@ _) half _^_en .group j j Z // adjoint joujoux _) j' (P2v Z + _) jusqu' (P6 Zysk .group k @@ -725,6 +736,7 @@ _) half _^_en au) lt // hérault uCi) l (_ // outil, fusil ui) ll j // juillet + _) lorsqu' (P7 lO2rsk // group l: English section less (_ _^_en // noiseless @@ -764,16 +776,25 @@ _) half _^_en on (n O on (nerA O2 o (rC O2 + o (rX O2 _) os (_ Os s_) os (_ o x_) os (_ o - o (seX o + X) o (se_ o2 + X) o (ses_ o2 o (CCement_ O2 o (Cement_ O2 o (t_ o o (tre_ O2 + _) o (bCC o2 + _) o (bCe o2 + X) o (Co@ o2 + o (Cau o2 + o (Ceau o2 + o (Co_ o2 + o (Cos_ o2 - oe (ll wa // moelleux + oe (ll wa2 // moelleux _) oe (C Y // oesophage _ph) oe (C e // phoetus oeu W // soeur coeur @@ -782,9 +803,9 @@ _) half _^_en _) oi (gnon o // oignons oin (C wE~ oin (_ wE~ // coin - oi wa // poil - oê (l wa // poêle - oî wa // boîte + oi wa2 // poil + oê (l wa2 // poêle + oî wa2 // boîte om (C O~ // bombe om (m O // nommer _) om (n O2m // omnibus @@ -816,9 +837,9 @@ _) half _^_en ou u // hibou brouillard où u // où oû u // coûter - oyes (_ wa // troyes - oy (A waj // noyer voyelles - oy wa // roy + oyes (_ wa2 // troyes + oy (A wa2j // noyer voyelles + oy wa2 // roy o (_ o // zorro allégro o (z_ o // berlioz o O @@ -850,7 +871,7 @@ C) oing (_ _^_en // going .group p p p // pas _) para (CCP4 para - _) photo (@P5 foto + _) photo (@P5 fo2to _) poly (@P4 poli _) pseudo (@P6 psYdo p (p // appliquer @@ -875,6 +896,7 @@ C) oing (_ _^_en // going se) pt (_ t // sept se) pt (iè t // septième + _) puisqu' (P7 pyisk // group p: English section pad (_ _^_en @@ -935,6 +957,7 @@ mou) rr RR // mourrai ss s // assez ai) s (em s // vraisemblable + aCè) s (_ s ub) s (is z // subsister tran) s (A z // transition tran) s (e s // transe @@ -1006,13 +1029,12 @@ mou) rr RR // mourrai .group t t t // bataille _) t (_ te +-) t (- t2 _) t' (P2v t --) t (- t -V) t (_ t2 // 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 + t (_ t2 + A) t (_ + peti) t (_ t2 + t- t2_ _) 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 @@ -1204,15 +1226,16 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe .group y y i // cryogénique myope _) y (A _!i // yak, yacht - _) y (eu i // yak, yacht + _) y (eu i // yeux - _) yahoo (P5 ia'u // symbolique + _) yahoo (P5 ia'u ym (b E~ // symbolique ym (p E~ // tympan ym (_ E~ // thym y (nn i y (nA i - ys (_ is + pa) ys (_ i + X) ys (_ is yx (_ iks yn E~ // laryngite @@ -1229,9 +1252,7 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe â a: ñ n^ - ç s // rançon é e // été - è E // règle ê E // fête ñ Ni // niño ö O // angström @@ -1244,7 +1265,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 ! Eksklamasj'O~ - $ dOlaR + $ do2laR @ aRobaz % puRsA~ & _e @@ -1257,13 +1278,14 @@ n) t (- t2 // silent at end of verb unless next word starts with a vowe ° d@gRe _n_) ° // n° ± pl'yz_'u_mw'E~ - × myltip@-lj'e_p'aR + × myltipli:'e_p'aR ÷ diviz'e_p'aR ¼ W~_k'aR ½ W~_d@m'i - ¾ tRw'a k'aR + ¾ tRw'a2 k'aR © _^_EN - ® R@ZistR'@d_m'aRk + ® m'ark_depos'e + diff --git a/dictsource/nl_list b/dictsource/nl_list index 047385b8..98d93905 100644 --- a/dictsource/nl_list +++ b/dictsource/nl_list @@ -85,7 +85,7 @@ _7X z'e:f@nt@x _8X t'Axt@x _9X n'e:g@nt@x _0C h'OndErt -_0M2 d'WyzEnt +_0M1 d'WyzEnt _1M1 d'WyzEnt _0M2 m'iljun _0M3 m'iljArt @@ -250,5 +250,10 @@ player _^_EN the _^_EN // pronunciation exceptions -eren I:*@n +bourgondier burx'o:ndi:@r +circuit sIrku'i +contour ko:nt'ur +eren I:*@n +journaal Surn'a:l +kennedy kEn@dE diff --git a/dictsource/nl_rules b/dictsource/nl_rules index 10c08dbe..c4e0bbfe 100644 --- a/dictsource/nl_rules +++ b/dictsource/nl_rules @@ -124,6 +124,7 @@ l l ll l @) lijk lIk + &) laan (_S4 la:n .group m @@ -182,6 +183,8 @@ s s ss s sch sx + sch (_ s + sch (e_ s sj S diff --git a/dictsource/pt_list b/dictsource/pt_list index 6dc1052e..994a8675 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -241,14 +241,14 @@ sr $dot // articles o $u+ $nounf a $u+ $nounf -os $u+ -as $u+ +os $u+ $nounf +as $u+ $nounf ?1 a & $u+ $nounf -um $u -uma $u -uns $u -umas $u +um $u $nounf +uma $u $nounf +uns $u $nounf +umas $u $nounf // pronouns @@ -272,39 +272,39 @@ las $u los $u //se $u -?2 este $u+ 'estSi // this -?2 estes $u+ 'estSis // these -?2 esta 'Est& $brk $u+ -?2 neste $u+ n'estSi //in this +?2 este $u+ $nounf 'estSi // this +?2 estes $u+ $nounf 'estSis // these +?2 esta 'Est& $brk $u+ $nounf +?2 neste $u+ $nounf n'estSi //in this ?2 nestes $u+ n'estSis //in these -?2 esse $u+ 'esi // that -essa 'Es& $brk $u+ -desse d'esy $u+ -nesse n'esy $u+ -aquele &k'ely $u+ // that -aquela $u+ -daquele d&k'ely $u+ +?2 esse $u+ $nounf 'esi // that +essa 'Es& $brk $u+ $nounf +desse d'esy $u+ $nounf +nesse n'esy $u+ $nounf +aquele &k'ely $u+ $nounf // that +aquela $u+ $nounf +daquele d&k'ely $u+ $nounf ?1 que ky $u ?2 que ke $u $pause // possessive adjectives -meu $u+ -minha $u+ +meu $u+ $nounf +minha $u+ $nounf meus $u+ minhas $u+ -teu $u+ -tua $u+ +teu $u+ $nounf +tua $u+ $nounf teus $u+ tuas $u+ -seu $u+ -sua $u+ +seu $u+ $nounf +sua $u+ $nounf seus $u+ suas $u+ -?2 nosso $u+ n'OsU -?2 nossa $u+ n'Os& -?2 nossos $u+ n'OsUs -?2 nossas $u+ n'Os&s +?2 nosso $u+ $nounf +?2 nossa $u+ $nounf +?2 nossos $u+ +?2 nossas $u+ dele dely $u1+ dela $u+ deles $u+ @@ -313,8 +313,8 @@ nele nely $u1+ // prepositions de $u // of,from -do $u -da $u +do $u $nounf +da $u $nounf dos $u das $u dum $u @@ -323,8 +323,8 @@ duns $u dumas $u em $u $brk // in,on,at -no nu $u $brk -na $u $brk +no nu $u $brk $nounf +na $u $brk $nounf ?2 nos nus# $u $brk nas $u $brk num $u $brk @@ -344,7 +344,7 @@ aos $u $brk às ,a:s $brk para $u $brk // for,to -pro $u $brk +pro $u $brk $nounf pra $u $brk pros $u $brk pras $u $brk @@ -574,18 +574,25 @@ acordo &k'OrdU $verb governo gov'ernU $noun olho 'oljU $noun colher kolj'Er $noun +força f'ors& $noun // MAIN WORD DICTIONARY //********************* +borboleta b,orbol'et& +catorze k&t'orzy +forca f'ork& fosse f'osy fossem f'oseIN hoje 'oZi +líderes l'ide*ys mulher mulj'Er mui mu~j muito m'u~jtu // -s is included as a suffix muita m'u~jt& +osso 'osU ?2 rede x'edZy +selvagem seUv'aZeIN teta t'et& // $alt changes the first [o] phoneme to open [O] @@ -632,6 +639,10 @@ roxo x'oSU ?1 dj d,i:dZ'eI ?1 down d'a,wn ?1 download d'a,wnl'oud +?2 download daUNl'owd +?2 downloads daUNl'owds +?3 download dau~Nl'owd +?3 downloads dau~Nl'owdIs ?1 end 'end ?1 escape Sk'eIpy ?1 explorer ,ekspl'O:*&r- @@ -660,7 +671,9 @@ roxo x'oSU ?2 logo l'OgU ?1 lock l'Ok mail m'eIl +?3 mail m'eI@l mails m'eIls +?3 mails m'eI@ls ?1 maior m,&j'Or- ?2 maior maI'Or ?2 maiores maI'O*is @@ -724,7 +737,6 @@ louis _^_FR ?2 firefox f'ai@fOks ?1 front fr'ont ?1 jaws dZ'au:z -?2 jaws dZ'Os ?1 linux l,in'uks ?2 linux l'inUks ?1 live l'aiv @@ -759,6 +771,8 @@ louis _^_FR ubuntu ub'untu ?1 unix ,u:n'iks ?2 unix j'uniks + wagner v'agner +?3 wagner v'agIner ?1 windows w'iNd'ou:z ?2 windows w'iNdows ?1 window w'iNd'ou diff --git a/dictsource/pt_rules b/dictsource/pt_rules index e1d5190d..a76809e1 100755 --- a/dictsource/pt_rules +++ b/dictsource/pt_rules @@ -46,6 +46,7 @@ am (C &~m ?4 am (C &~N an (K+ &~N + anh (A &~n^ am (_ =&U~ ?1 a (z_ 'a //eg: paz, rapaz, capaz, etc... ?1 C) acç 'a's // eg: selecção, etc... @@ -197,6 +198,7 @@ ib) e (rA_ E d) e (rA_ E ed) e (rAm_ e + m) e (rA_ E iv) e (rAm_ E pod) e (rA_ e d) e (rAm_ E @@ -368,7 +370,7 @@ _) g (_ Ze g g g (g -?3 g (B ZI +?3 g (B gI ?3 g (_C g_ g (Y Z // ge gi gu (Y g @@ -598,6 +600,7 @@ @@) o (rA_ o o (p_ O + o (ps_ O ?1 _) o (C O // eg: olá, orla, opção, etc... ?1 _C) o (CACAC u // Documento, documentação, localizar, etc. ?1 f) o (rmat u // formatar, formato. @@ -848,7 +851,7 @@ . (. _: \.) . - * aste*r'isku + * ,aste*'iskU *) * (* ** **) * (_ _:: diff --git a/espeak-data/voices/en/en-r b/espeak-data/voices/en/en-r index 44b8ddf2..7c311ac2 100755 --- a/espeak-data/voices/en/en-r +++ b/espeak-data/voices/en/en-r @@ -4,11 +4,13 @@ language en-us language en 3 gender male +formant 1 99 100 100 + phonemes en_us dictrules 3 6 option 12 1 // reduce [t] -stressLength 145 125 170 170 0 0 270 290 +stressLength 148 125 170 170 0 0 260 285 stressAmp 17 16 20 20 20 22 23 20 replace 03 I i diff --git a/phsource/compile_report b/phsource/compile_report index 566bfc31..515b0a4a 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -15,8 +15,8 @@ eo 13 110 jbo 4 111 fi 40 129 - fr 50 128 - fr_ca 11 128 + fr 51 130 + fr_ca 11 130 hi 51 135 ta 17 138 hu 23 114 @@ -60,26 +60,19 @@ 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 @@ -315,6 +308,7 @@ l/l [l] base [l] en_wi [l] af [l] fr + [l/] fr [l] hu [l] sk [l] ru @@ -1059,8 +1053,8 @@ vdiph/y#y [Yy] fi vdiph/y#y_2 [Yy] af [eoi] zhy vdiph/y#y_3 [Y:] nl -vnasal/aa_n [A~] en -vnasal/aa_n2 [A~] fr +vnasal/aa_n2 [A~] en + [A~] fr vnasal/aa_n3 [A~] af vnasal/a#_n [&~] pt vnasal/a#u_n [&U~] pt @@ -1281,7 +1275,8 @@ vowel/a#_3 [a2] en [a] zhy vowel/a_4 [a/] el [a] vi -vowel/a_5 [a:] ta +vowel/a_5 [a2] fr + [a:] ta [a/] it [a] la [a] sv @@ -1475,7 +1470,8 @@ vowel/i_en [i:] en vowel/i_fnt [i:] en_wi [i] hi [i:] hi -vowel/ii [I] en_rp +vowel/ii [i] en_us + [I] en_rp [I2] en_rp [I] en_wm [I2] en_wm @@ -1504,6 +1500,8 @@ vowel/ii_4 [I] en [I] en_n [i] en_n [I2] en_n + [I] en_us + [I2] en_us vowel/ii_5 [I] en_wi [I2] en_wi [I] la @@ -1543,6 +1541,7 @@ vowel/o [o] base2 [o] rw [o#] rw vowel/o_2 [o:] cy + [o2] fr [o:] hi [o:] hu [o:] la @@ -1658,8 +1657,7 @@ vowel/u_5 [u] sw vowel/u_6 [U] pt_pt [u] pt_pt [u] ku -vowel/u#_6 [u:] en_us - [y] ko +vowel/u#_6 [y] ko vowel/u_7 [u] vi vowel/u#_7 [u#] tr vowel/u_bck [u] base2 @@ -1806,15 +1804,13 @@ vwl_en_us/ar [A:] en_us [A@] en_us vwl_en_us/ee [E] en_us vwl_en_us/er [e@] en_us -vwl_en_us/ii [I] en_us - [I2] en_us -vwl_en_us/ii_2 [i] en_us vwl_en_us/ir [i@3] en_us [i@3] en_sc vwl_en_us/oor [O@] en_us vwl_en_us/or [O:] en_us [o@] en_us [O:] en_sc +vwl_en_us/u [u:] en_us vwl_en_us/ur [U@] en_us vwl_fr/@R [R] fr [r] fr @@ -1882,14 +1878,11 @@ vwl_zh/uo [uo] zh vwl_zh/y& [y&] zh vwl_zh/yee [yE] zh w/w [w] base - [w] fr w/_w [w] base - [w] fr [w] zh w/w_ [w/] base w/w@ [(@)] base w/w2 [w2] base2 - [w] fr [w] pl [w] sk [w] pt_pt diff --git a/phsource/ph_english b/phsource/ph_english index ecb1c71a..1b5c9bda 100644 --- a/phsource/ph_english +++ b/phsource/ph_english @@ -380,7 +380,7 @@ endphoneme phoneme A~ vowel starttype (a) endtype (a) length 260 - formants vnasal/aa_n + formants vnasal/aa_n2 endphoneme diff --git a/phsource/ph_english_us b/phsource/ph_english_us index cda9eb3e..d5e8b614 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -72,7 +72,7 @@ endphoneme phoneme I vowel starttype (i) endtype (i) length 155 - formants vwl_en_us/ii + formants vowel/ii_4 linkout ; endphoneme @@ -81,7 +81,7 @@ phoneme I2 vowel starttype (i) endtype (i) unstressed length 155 - formants vwl_en_us/ii + formants vowel/ii_4 linkout ; endphoneme @@ -89,7 +89,8 @@ endphoneme phoneme i // optional variant of [I] for end of words vowel starttype (i) endtype (i) length 190 - formants vwl_en_us/ii_2 + formants vowel/ii +// formants vwl_en_us/ii_2 // formants vowel/i# linkout ; endphoneme @@ -188,8 +189,8 @@ endphoneme phoneme u: vowel starttype (u) endtype (u) length 170 - formants vowel/u#_6 -// formants vowel/u#_5 +// formants vowel/u#_6 + formants vwl_en_us/u endphoneme @@ -216,7 +217,7 @@ endphoneme phoneme eI vowel starttype (e) endtype (i) - length 225 + length 230 formants vdiph2/ei_4 endphoneme diff --git a/phsource/ph_french b/phsource/ph_french index 0c3da091..c9f51701 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -22,6 +22,14 @@ phoneme a endphoneme +phoneme a2 + vowel starttype (a) endtype (a) + length 160 + unstressed + formants vowel/a_5 +endphoneme + + phoneme e vowel starttype (e) endtype (e) length 172 @@ -72,6 +80,13 @@ phoneme o endphoneme +phoneme o2 + vowel starttype (o) endtype (o) + length 170 + formants vowel/o_2 +endphoneme + + phoneme O vowel starttype (o) endtype (o) length 170 @@ -87,7 +102,6 @@ phoneme O2 // Like O but no reduceto endphoneme - phoneme u vowel starttype (u) endtype (u) length 180 @@ -116,17 +130,6 @@ phoneme Y endphoneme -phoneme w - vowel starttype (u) endtype (@) - length 80 - beforenotvowel w/ - lengthmod 7 - formants w/w2 - after _ w/_w - after (r) w/w -endphoneme - - phoneme W vowel starttype (@) endtype (@) length 180 @@ -225,15 +228,8 @@ endphoneme phoneme b vcd blb stop vowelout f1=0 f2=1000 -500 -300 f3=-300 80 brk - formants b/b+x/b%50 + formants b/b+x/b%70 before _ b/b_+x/b_ - before (a) b/ba+x/b%50 - before (@) b/b@+x/b%40 - before (e) b/be+x/b%50 - before (i) b/bi+x/b%50 - before (o) b/bo+x/b%25 - before (u) b/bu+x/b%40 - before @- b/b@2+x/b%50 after _ NULL after @ b/xb%50 lengthmod 5 @@ -299,6 +295,7 @@ phoneme l/ // used for [l] when not before a vowel lengthmod 7 formants l/l_ before b l/l_long + after b l/l before (r) l/_l beforevowel l endphoneme @@ -444,7 +441,7 @@ endphoneme phoneme v vcd lbd frc - vowelin f1=0 f2=1000 -300 -200 f3=-300 100 amp=15 + vowelin f1=0 f2=1000 -300 -200 f3=-300 100 len=0 vowelout f1=0 f2=1000 -300 -2300 f3=-300 100 len=10 lengthmod 6 formants voc/v+vocw/v%75 diff --git a/phsource/vdiph/aoo b/phsource/vdiph/aoo index f860a8a043f9bb22666416fb4a21a6545a06fdfb..7277555845ef4ab40e6eb7644cfd1d0aee760a8b 100644 GIT binary patch delta 321 zcmbQrGnHpTsF473zgRxg6eb2B&|qbdaD}o(xcK-VFg{=eiT~h9fU@;DMEDoBGa~6? zCPJ4UP}k<2j695LBCI#W-C(wHJ>Y}caDnG9lnt_B@@u9q^*b4QxHdCwV+J|EgDFWWb5zJ_F};9#N<-NI%ywdk zU?^fZ$WX(O!LW>BJ%a~>E`t(-?BqC>gOUtP45BhjGT^{zVP+7EfU<2STd>{*0JH=` AMF0Q* delta 321 zcmbQrGnHpTs1XNqzgRxg6eb2BuwiA8aD}o3xcK-VFg{=ei67xffU@;Dp7AYgXGGG) zOoT2ypsvk38F?7hgjsKhyFqOb<9fgcvtb#}UnpCj<38Wy*GymPH!!GjEoa)s403=H z6N9iCRNErv9I;R++n>vZ7iPpn?j~*+dj_8&JA|#lVIi%`3SsMWRLE&CJ%M^kLs=Wl zc4CNNC}KFsP{WYHu#90ng9n2ygA#-6e8b5gw7HJu zIWt75Bhxgv(m1xwaHTsrzc7H6c5!@QW_&TZnn#k6Ve?d;=gi^`?DLpjG1@cDV_3n+ hz?Z@JfH8t?D#L}%lLg)~bH+1(zyt<|&7C5T*#S)BC&d5& delta 150 zcmaE3@y239B#SC{67xDncc!TfDohN*T1;9@nQS*1WY`yo)-XjdZQ_(>e8YJ_cyk@g zb7qKAN2Y0TrEzSV;YxRMeqjJB?c(^r%=lq)HIF3Y^379uo->Oxu+L+9#c0nok6{5L i18)Z71I7rpsSH0hPZoH~%o)o70uvZaHg}3VW(NQQC@Kj6 diff --git a/phsource/vowel/V_6 b/phsource/vowel/V_6 index 3556a50e197c5aa42ff11f02a980075da8501560..e3573968a95c2407ee0399847503072a04307327 100644 GIT binary patch literal 6239 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 s=lg2(oVdP%xW1mCYWb<2p6(ESxaW0TJu54FCWD literal 1267 zcmeH`J4*vW6otQxSxsWh8eQWnzC{C8K2WsDir8qgqKGIW_-M3ABL?(mq_GJpZ0&3W z3rmX>{)B+7h^0tiy|Zf)2?1LR=Q4B8oO$f-*?Tsf)s?Ny)r}@#`(QrEfqaT^$`msU zF)nMPL`l#^Hyv1*#3lP(j~d5m_j*inhwSa8Uv3>BDPy06Dd*zytOPN^>CfUrv;HV- zt+}O4&S_=O8-(qRbfI diff --git a/phsource/vowel/aa_8 b/phsource/vowel/aa_8 index 2b8272c38570f3c5db1899e4fc155f224d00db85..6b6b28ac0f9ea5ec4d0e05d717df7be480059e9d 100644 GIT binary patch delta 143 zcmaDO@J3)m8KVpXV*~ddraepyKyZUeRn&*c3e29v!XP>M0F&J04UAuKC}L&+DcXF1 lNd(!L|Nk$*jrso{tl|T+7^5VzMJM1Y7#QYkmS^>41^|%OAnX7D delta 142 zcmaDO@J3)m8KdMc1_thVO!Jr+fZzs`s;Cc>6_~wYvOKHUOqfq`g?Cf{Ye&(y%Nc^^|7699Sl BHB|rr delta 155 zcmX@Yb%bkzm)$f52F{gC222b<@Pn~INP_7BBZwWq${_5;6af~0!p^|^lo2Anf`@_U qC7AvFKLh{dA52;kHytC&lnYo*0a^t%W%2{YJ4_6moA)ubF#!OKu_JT< diff --git a/phsource/vwl_en_us/a b/phsource/vwl_en_us/a index d4a00885092abeb79566cdb0f1ee19b7a8c9b6c9..7781aa2df99d2b282973bf9a893e0fc6eb690758 100644 GIT binary patch delta 85 zcmca>aMxf%D2r4B&juD5ruR(xj0cz)1R|I&Fh#IVVVJ a21LG^gM)=pVsi@*Hw)vP%@YL9vI77OP#0hT delta 85 zcmca>aMxf%D2tQ>&juD5ruR(xj0cz)1R|I&Fh#IVVVJ a21LG^gM)=pXLAb=Hw)v3%@YL9vI79{g%=6{ diff --git a/phsource/vwl_en_us/ee b/phsource/vwl_en_us/ee index 59a9042f2decbf878bfd07bf1779aa61f22685d0..f58ceca3bb2c5d1bbe3d5638358ac71785c6a316 100644 GIT binary patch delta 164 zcmbOsHA6};IKb68B-k~OiGhJ3HI)B19JqM;pEd?ia@EiT-ruYb7Ty_*>7pAMmoP?h NgfbXxZsobj4FI1L66^o~ delta 66 zcmca-aL-^v7z^J4&R(V`Olge040()e#5Sj}{9}fSB{LR7#0oe#Sa=sOri*T5T*4U1 N5y~L5xs~T8Hvs3+6uJNa diff --git a/phsource/vwl_en_us/ii_2 b/phsource/vwl_en_us/ii_2 deleted file mode 100644 index 4db46efdfff114865df29b13a516008c0527f351..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7276 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 B2iE`q diff --git a/phsource/vwl_en_us/u b/phsource/vwl_en_us/u new file mode 100644 index 0000000000000000000000000000000000000000..23d2e214bbcc6b06c132940daac60ce7b2e4b198 GIT binary patch literal 6237 zcmb7|2UrzXw}#J|nceryoO3{trWC0H5|u$P=gIN%$Zx#nng` zvW#3M7QgaX+{LujGN)RXb{rTLM>Gb(>~U+wB1^L z#BecwMZ8!tA1pS=^ZHZcm3hau-QK}*$5G!Y&uP3+i%*-IchlSI-(u!jx+XN_S?44Z0*esMznrgbmhlsB@Neb=2lDHx! zh!T-3zmc2e@A8&>E)^Zars&V*U0EQH%8hce>>#VjM`E?e68@ru7xOZrwKyc|!5!`O z=lXb~qPfjXvE8uc+3k++9c7&cJDqlNasJFX**V_1vNLr)?KI!1y;Fcwp<^=i?4-T5 z{gSPvE#GWto-kS%5A?};lwKs4$SfHyxqKm{jFD3%)hFma#!p6?dD|Rl!}g)}d-nQ{ zNshgabB^f806x|hCRX37#VT~rqZd?y;%JdfgS z_$a=bALqAtDOcg?SNSeDQ=1pD2`q^1q^a}{8Am=LMR)_O%ucu^PQwjx0*=IiSmK*# zFPedJQGFDQqMxj-o%cFSEiw4VYgunw+Qv7>|IUKsH)r7*UaEYfG`1F5I#?|ZsuWn4 zsl}Gtn#GJ$;*|R07v&VS$O3DD6&uOcaA^^*+pljfG%Wmmd!m~Ky>Is|p9fEQ{Xef+ z@V33P)~wH4*X^0SFLh^gpNy03_H?+Jli202u6uLO=YE=dsY`yR@*VeN9c~lfs!sap z#$}Qnb#K&KS94^7>7(H4 zfp`5n_-^(p^7M7@Snh0@;ZAw>-_7yHT>Y`^BW-exNEX+4A8zHtA@+w+N~e+tatm+5 z6L4o-2OD@VYJpBejHakQ(D!oc9pJ$Y%^Sv4MGLf->U|~M8m-RM)}vXtBk`j9X)|__ zrSqS;pXenvipxTg4(TkJd?}oK;}Y}~IdBym zi>u>TXe>If#cTJqez+{1#jt1~d+Obdx@NK2({|WaVx#tA+a6nQTN&E|Gr(MA_!(>U z`VhU_;}udB!EaeAVjuJ_Ux>G$>K#yO*lNo})jf%e(<7xwB9`N@uoj(jdB@j3y(1BMNOsm(rWmlhtC)SQg7= z{n$u0oh@fSu>))$kYpHKxeP41MLH5pF5u_54w+A0kOVr4Zli@%VeTxHMX)N&o4uq5 zX@6RVPKHbqh(pm;^{!Q_6SYNXAg)BVk`OwEo}un6jg4m8*v@1=5FN%J;uBq3X z7>~i5PxXJ>Ld)MA|C0sE8(rW*-?Jdyy5j>2R;VXFu;3_HKCr;cNcexUAo2qXPR3S^ zyO?k(xlQW1^jEFsw_V_T9p}#pKTDQma!`_Vh2?WUgv4xoLRH!bIoz zMYX<;{MRQ-tJV%*8Cq27S@7E6TfqY=MTX$eZK2U&L&AE78DYtx5g~_yU4y~`-2CqP z?C_dWeu&2;w?pMZUAC6Vat?Dsjw`l(<_|`;UP%`45zK>rkMC(k%6_GeRvleHP4Pyo zkb2}>@&|FJ=`fNTVEzu#t#m5Qq~+;vWF(0vfuuSaM2g7>8pw{aZV(5vgtz=oK9h<1 zIDMyHpg)ATDbXM37xjJmOueHXte=CmD&<&F3MynHv$7;QAF|L2+!tux74{~$5`Kt| zp_?cZdy*&Qce;$VhbK=Fr6N}5$R4t_{8+vcyTvfkKm-UOp7Fc<2EPW|ZT^D0KxP^) zPK!vnN>*b7bMv2kJ+-d5z`nF!SQMSR5kKJtB%umf(#${dTWu+!g0hL_HQuM3# z8FIo~;mx&47`X;SJcyoZnij5hRU2wPC?9pfk8oE~Ku*c3IoWoZEzCPcUqdw}>6P@8phTL;24r&x{2mf&OT?|*<`ki?P6D1ARoiA_(ouvD|dp9c`C2UO|rAJ z%f+IK*urb@?GTqoXdBAuF|rGCdkxTKalq&vFh1SHap3|CNRtWh-V0)oz(CC3m>0{U zE66k43KyY$=sK#8kK)GU5DBK8=|q_IVKDDCXgMmVE3FNGoux5s9jnBb^I)-9xXEGi zq72kq>izXRpk#!8MfQ|efG*j5AnQp}NI32S3bF@oN-98XCcwCru#b3S{w2@hS)fkp z@+#bwzhs5LmL+TiYYUNVX9Yl@Z0bwTkntpeI7l%r!WQBI>#i=TLqbRi%vBEdz~|9s z&>pY*T?W+ZczhODCZk9psZK}IV^n7`tOFa$Cczj+KO4UDJqtD-sPL8r+T4F&fyMI0 zo3rm(kO?ek_D&c4sH)b6?{vW;9{7O;4UMJ$0}CSQKkI_14=h-nSU<_qpns$0sr8zg z&4;y^-YOwuPUeC(U$oud_ITTzw*A}O$XL*7?iZJu_H3M!e5Gz_?X!{Jf7~kk^WZKO zLn=hN=ev5kul4NZW%Uj9yWt-acsDRSs3)EV2djN{R7A*u8d_=C`Sx_&O!za;D6o__dvDyaJROcvMy{K-~`XGP23rCX$3hA8s(FQO>d+Af^&1%4mR{~9Ph~~ldW00MrNJUZ;vJr)fqC2a@%Zp<1lg!nn zG1j*lGI64lXbG*$y0Jbiot0x7X&4jE;la`57X;6nBC6c|Zs)1$8izxREjV z95PXqwoyH$#%c4kpS5LLl-5@L&g!C`)FN;P(wkilKB!8O+USh-az-%^FeKDa-g^Z zJQ~C{(Q}~LZ=qw_CN)b9)fBW6h2gQF&+g$8{1AGy7q7?La3QWpx{)p9HbL|iISu*e zBeDa>;X!iaS-(SE0RaLk~l)hdR!l>(^PaAMr?ulTnSPv)(dcIzniRZ=@ff^*L)AB}=o@)&j{m6(ES3Z~ z8}&gKw6ZRG!?s>S_XBUmi&YlO-vt5RH3>o&2b z(-yw1z1#fRu10(B>`@&va~9>)&q?gKs6%R2%eIGFFaN^P)HCH);>`Gz+M!X2)qknF zvvTc_Zb2CVKK|?ciu@M(&j^?i_*Ia5a87XR;QK+oK_vmh{SQ?<>$A^mQu!txZf-YS zj+Hs?RBVs5tu$)urQ#ev2U;zjZUBXR3D3aoaVpNnOED)y34@q%VH4S77R!6`p}Z^q zgr5h^br4i_1JVaiMcXxZ&8oH2?r6E_DyoO);LF&BM3OX;4VrQb!L%DKqFvZ!RvYf0 z&u2p=QkfrO$!rg;M5hpq49D*H2%3iaqRvps4T5@ZJIuQ~=z{6^A}GbLASZd!9zgXf zY##G~x}uu+1(f=2*;T)+#~U+@GX^(9%{pe9nPIj!JDa(%Wt+{+>LxaK8($iaKxzL4 z^}U8f#BM`RzXsoA1)sz7cmr*=@jYuXPK^kVuOHCPIp$^K$hAkNqGLdg3b z;7j-mFX1L!g*Q~>sh~TSiBsYQU4|7jK1K`&qAMc{vw6~6Gz zhA0Gz)Z{xr?{}k%fqBOucK%eSt0CGgZ5pZ!5mODSA}89L9;X!`6aT<|X4lzEri0RU z<~lD0Z{S}r`h8gg7RWHW4Qk*w&?%R|b)ca61EE$g&j`B)ZqRo?pje>&J+h7T0`{)N zK6nHw(JpIUQ4+2~G^i9BKsDjSYeBtIgHup1%^>eLqkDn=gK+_>i@+(;Zm1K~5Ot+e zWJT7`6o2)SI#`q7N8Lm*cm&>#uK=wXp`Zw^0!yYqE^>ujGy%0j4Nx{(j2?rcnFZH; zAp;B~-;-6a8h<2fq4pa|+5-)vpIus=`zG>Z@LJdJ-!b6*;eYcEn^^Z+n!NK4m#f&i z{GE3g$a9szciv%HqpY>;KYE9e^l$I5CjHwxe9eNl-eI>IqiZgRITcr&I3%TE(*|GU zwJOS3)MiuLz;?J@QrnVDp3%K!mF7uJjyBqp7#-ibRz%JGYVl#C0tS2Ou77|_wZJ9a zL-G2<=S9VV{$B=c3g{Ft*1w#ei|-V#S)MU& zK4+5*s0>HL%s(fw;0fNN$xx*+o(Way1MV;CLI!ILK9UrNp_X&uD?kJ6rwwTV=|h~! zHsFpAzKm9(!6*YIp?KInN0pHUt<#!mb+ml#IJ$!GlRNYjTf|#}w>Lx<$!N$ylk}+& zYiW8}aGTnK3o!tCoW~_!!+Jp-JB00q)z+0Cfgbb+cGzSCP_L`yVTjSAawVwhvT_#q z2o3pQHj^$P%kUDkL|dmmQJyNj)q84!Hc*?af&Zc1)0&~vC>^p`5agmcWCy5(tE2>c zggEd&=Rl4*2JXlY;EmoUeMtopK-QCK;B3t2(?m~M9qOY_#(5(gC^gI+4y1}Q9|OPq zjXAoer^%_}ATI`8oz`--=D*Fw_LQ#SbDw*u<(g zWcZk^fGY1>$gYF&OYnU$8n3x(i_~y+vl6b1wdPo|t)K|G@+J=XcN^~u?11mbQjzD@3c9xEXTH+d+LDE5&Q1S%d2le?F zKZETNzKsj;ub}JaLR@#oO~I3@fy2Qw@Wdv5iq4?bkQ*Yi P{+9|A=tzc<3FN;34h@Co literal 0 HcmV?d00001 diff --git a/src/dictionary.cpp b/src/dictionary.cpp index 77502035..83f5c91e 100755 --- a/src/dictionary.cpp +++ b/src/dictionary.cpp @@ -440,8 +440,11 @@ char *EncodePhonemes(char *p, char *outptr, unsigned char *bad_phoneme) { // Switch Language: this phoneme is followed by a text string char *p_lang = outptr; - while(!isspace(c = *p++) && (c != 0)) + while(!isspace(c = *p) && (c != 0)) + { + p++; *outptr++ = tolower(c); + } *outptr = 0; if(c == 0) {