From 500d2c9525c2098ee2b5232b62a390aafac3ef7d Mon Sep 17 00:00:00 2001 From: jonsd Date: Wed, 29 May 2013 10:09:12 +0000 Subject: [PATCH] [1.47.11b] Language updates: en, ga, hy, pt, sl, ta, vi git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@360 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/dict_phonemes | 30 +- dictsource/en_list | 102 +++++- dictsource/en_rules | 81 ++++- dictsource/ga_list | 14 +- dictsource/ga_rules | 68 ++-- dictsource/hy_rules | 66 ++-- dictsource/pt_list | 123 +++---- dictsource/pt_rules | 227 ++++++------ dictsource/sl_list | 98 ++++- dictsource/sl_rules | 14 +- dictsource/ta_rules | 20 +- dictsource/vi_rules | 745 ++++++++++++++++++--------------------- docs/voices.html | 2 +- phsource/compile_report | 41 ++- phsource/mbrola/in1 | 17 +- phsource/ph_armenian | 3 +- phsource/ph_irish | 11 +- phsource/ph_slovenian | 44 ++- phsource/ph_vietnam | 70 ++-- phsource/ph_vietnam_hue | 16 +- phsource/phonemes | 4 + src/intonation.cpp | 14 + src/readclause.cpp | 7 +- src/synthdata.cpp | 2 +- src/tr_languages.cpp | 5 +- src/translate.cpp | 10 +- src/voices.cpp | 5 +- 27 files changed, 1062 insertions(+), 777 deletions(-) diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index c4925e82..04fc27e4 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -148,7 +148,7 @@ p Q r R s s; t T ts v x z -Dictionary en_dict 2013-05-17 +Dictionary en_dict 2013-05-29 0 0# 3 3: @ @- @2 @5 @L a a# A: A@ aa aI aI3 @@ -236,7 +236,7 @@ p2 r r2 s S t t2 t3 tS v z Z z2 z3 -Dictionary ga_dict 2013-04-25 +Dictionary ga_dict 2013-05-18 0 0# @ a a# A: aI aI# aU aU# e E E# e: eI i @@ -245,8 +245,9 @@ U U# u1 u: u@ : ; b c C d d[ dZ f g h j k l m n -p Q Q" r R s S t -t[ tS v w x X z Z +N p Q Q" r R s S +t t[ tS v w x X z +Z Dictionary grc_dict 2008-03-03 @@ -299,7 +300,7 @@ S s2 t t2 tS ts v w z Z -Dictionary hy_dict 2013-05-03 +Dictionary hy_dict 2013-05-22 @ a aI e eI i i@ o u W y @@ -462,7 +463,7 @@ N n^ p r R s S t tS ts tS; v x z Z -Dictionary ml_dict 2013-05-18 +Dictionary ml_dict 2013-05-19 @ a a# a: aI aU e E e: i I i: o o: r- u @@ -574,7 +575,7 @@ S s; S; t t; tS ts tS; ts; v w x z Z Z; -Dictionary pt_dict 2013-05-09 +Dictionary pt_dict 2013-05-29 & &/ &U~ &~ @ @- a A aI aU e E eI EI eU EU @@ -642,15 +643,16 @@ s S t t; tS ts v w x z Z -Dictionary sl_dict 2013-05-16 +Dictionary sl_dict 2013-05-22 @ @- a e E E# i o O o+ u y -: b d dZ dz f g h -j k l l^ m n N n^ -p r R R^ s S t tS -ts tS; v v# w x z Z +* : ; b c d dZ dz +f g h j k l l^ m +n N n^ p r R R^ s +S t tS ts tS; v v# w +x z Z Dictionary sq_dict 2008-12-22 @@ -688,7 +690,7 @@ p Q R s S t T tS v w x z -Dictionary ta_dict 2013-05-10 +Dictionary ta_dict 2013-05-18 a a: aI aU e E e: i I i: o o: u U u2 u: @@ -739,7 +741,7 @@ s S s. t T t# t. t.# v w x z Z z. -Dictionary vi_dict 2013-04-21 +Dictionary vi_dict 2013-05-18 @ @- @: @:I @:U @I @U a a: a:I a:U aI aU e E eU diff --git a/dictsource/en_list b/dictsource/en_list index ca17dadc..9dc2e7fa 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -16,8 +16,8 @@ // ?7 Scottish // ?8 Use full vowel, not schwa in some word endings -// $alt1 use strong ending (-an, -table, -inal, -ier) -// $alt2 use weak ending (ard, ate, ery, ess, ile, men) +// $alt1 use strong ending (-an, -ance, -ative, -table, -inal, -ier) +// $alt2 use weak ending (ard, ate, ery, ess, ile, men, on) // $alt3 use weak first vowel, a->[a#], e->[@], o->[0#] // $alt4 separate 'h', not 'th' // $alt6 'to' @@ -318,6 +318,7 @@ _zh tS'aIni:z ћ tS;E: ђ djE: ќ kjE: +љ ljE: // Arabic letters @@ -605,6 +606,7 @@ sae $abbrev scsi skVzi ssip $abbrev st s@nt +tbsp teIb@Lspu:n th T thu T3: // Thursday ?5 thu TIR // Thursday @@ -618,6 +620,7 @@ upnp $abbrev url $abbrev usa $abbrev usb $abbrev +usda $abbrev ussr $abbrev utc $abbrev uv $abbrev @@ -899,6 +902,7 @@ aviary eIvi@ri awry a#raI axes aksI#z axon aks0n +ayuh a#j'@ backend bak'End backstory baksto@ri @@ -945,6 +949,7 @@ beta bi:t@ ?3 beta beIt@ betake bI2teIk beverage bEv@rI2dZ +bhaji bA:dZi bias baI@s biased baI@st bible baIb@L @@ -1056,6 +1061,7 @@ canton kant0n canvas kanv@s capita kapIt@ capitol kapIt@L +capri ka#pri: caprice ka#pri:s carafe ka#raf ?!3 caramel kar@mEl $onlys @@ -1135,7 +1141,8 @@ cigar sI2gA@ cigarette sIg@'rEt cinema sIn@m@ cinnamon sIn@m@n -circumference $2 +circumference s3:k'Vmfr@ns +circumstance $alt1 circumvent s3:k@mvEnt ?5 circumvent sIRk@mvEnt citadel sIt@dEl @@ -1208,6 +1215,7 @@ compat k@mpat // for compatible competed k@mp'i:tId competing k@mp'i:tIN competition k0mp@t'IS@n +?3 composite $2 compromise k0mpr@maIz compound $2 $verb ?3 comrade k0mrad @@ -1265,11 +1273,13 @@ copilot koUpaIl@t coral k0r@L ?3 cordial kO@dZ@L coronet k0r@nEt +corolla k@roUl@ corollary $2 corporal kO@pr@L corporate kO@p@r@t corps kO@ $only corral k@r'al +corsage kO@s'A:Z cosmos k0zm0s ?3 cosmos k0zmoUs cougar ku:g3 @@ -1304,6 +1314,7 @@ cutoff kVt0f cutout kVtaUt cyan saI'an cymru kVmri +cypress saIpr@s dahlia deIli:@ dais deIIs @@ -1319,6 +1330,7 @@ debunk di:b'Vnk debut deIbju: ?3 debut deIb'ju: decade dEkeId +decaf di:kaf decent di:s@nt decibel dEsI#b@L declaration dEkl@'reIS@n @@ -1488,6 +1500,7 @@ epitome I2pIt@mI epub i:pVb equal i:kw@L equation I2kweIZ@n +equipage EkwIpIdZ equivocal I2kwIv@k@L erase I2reIz // erasing erases eraser I2reIz3 @@ -1567,6 +1580,7 @@ favourites feIv@-rI2ts fedora fI2d'o@r@ feisty faIsti feline fi:laIn +felon $alt2 feminine fEm@nIn fete feIt fetus fi:t@s @@ -1575,6 +1589,7 @@ fiasco fi:'askoU fiat fi:@t fiery faI3rI ?3 fillet fI2leI +finagle fI#neIg@L finale fI2nA:li finance faInans $only finance $verb @@ -1663,6 +1678,7 @@ gimme gImi giraffe dZI2raaf github gIthVb glacier gleIS3 +goatee $2 ?3 goddess $alt2 goin ,goUI2n $only // for goin' gonna g,@n@ @@ -1692,6 +1708,7 @@ guinea gIni gurus gu:ru:z habitual $alt3 +hacienda hasI'End@ haggis hagIs haha hA:h'A: halation $alt3 // in- @@ -1715,6 +1732,7 @@ heineken haIn@k@n heist haIst helium hi:li@m helix hi:lIks +helluva hEl@v@ hello h@loU henceforth hEnsfo@T ?3 herb 3:b @@ -1734,6 +1752,7 @@ heroism hEroUIz@m heroine hEroUIn heron hEr@n herpes h3:pi:z +hiatus haI'eIt@s hideout haIdaUt hindus hIndu:z hiya haIa# @@ -1750,6 +1769,7 @@ hominem h0mInEm hooah h'u:'A: hopi hoUpi: horizontal $3 +hormonal ho@m'oUn@L (hors d'oeuvres) O@'d3:vz hospitable h0sp'It@b@L hostage h0stI2dZ @@ -1760,15 +1780,17 @@ house haUz $verb however $2 howto haUtu: hubris hu:brIs +hula hu:l@ humane $2 hunger hVNg3 -hurrah h@r'A: -hurrah hVr'eI +hurrah h@rA: +hurray h@reI hurricane hVrI2keIn ?3 hurricane h3:@keIn hussar hVz'A@ huzza h@z'A: huzzah h@z'A: +hydrangea haIdr'eIndZ@ hyperbola haIp'3:b@l@ hyperbole haIp'3:b@li hypoxia haIp'0ksi@ @@ -1832,6 +1854,7 @@ intake Int2eIk intel Int2El interim $1 intermediate Int3m'i:di@t +interment I2nt3:m@nt intern Int3:n $noun interrogatory $3 intestine I2ntEstI#n @@ -1870,6 +1893,7 @@ jasmine dZazmIn jedi dZEdaI jehovah dZ@hoUv@ jesus dZi:z@s +joie ZwA: jour ZU@ // french jukebox dZu:kb0ks july dZu:l'aI @@ -1880,7 +1904,7 @@ karate k@rA:ti kebab k@bab ?3 kebab k@bA:b kefir ki:f3 -hiatus haI'eIt@s +?3 khaki kaki kilo ki:loU kilometer kIl'0mI2t3 kilter kIlt3 @@ -1907,6 +1931,7 @@ labyrinth lab3rInT lager lA:g3 laity leI@ti landowner l'and,oUn3 +lapel $alt3 las ,las $only ?3 las ,lA:s $only lasagna l@zanj@ @@ -1953,6 +1978,7 @@ limousine lIm@zi:n lingerie l0nZ@ri ?3 lingerie l0nZ@r'eI linen lInI2n +linoleum $2 liqueur lI2kjU@ ?3 liqueur lI2k3: liter li:t3 @@ -2022,6 +2048,7 @@ marcel mA@s'El marquee mA@k'i: margarine mA@dZ3ri:n ?3 margarine mA@dZ3r@n +maroon $alt3 marquis mA@rk'i: marshall mA@S@L martinet $3 @@ -2050,10 +2077,13 @@ mercedes m3:s'eIdi:z //mercenary m3:s@n@rI merest mi@r@st meringue m@raN +merlot me@l'oU +mesa meIs@ meson mi:z0n metabolic mEt@b'0lIk metaphor mEt@fO@ metastable $alt1 +mezzanine mEz@ni:n miaou mi:'aU miaow mi:'aU mic maIk @@ -2157,6 +2187,7 @@ nescience nEsI@ns nicety naIs@ti nikon naIk0n ninja nIndZ@ +nitrous naItr@s noah noUV nobly noUblI $verbf nobody 'noUb0di @@ -2183,7 +2214,7 @@ obelisk 0b@lI2sk obesity oUb'i:s@ti obey oUb'eI obituary 0b'ItSU@i -?3 obituary 0b'ItSUe@i +?3 obituary oUb'ItSUe@i object $1 $onlys object $verb obsolete 0bs@li:t @@ -2287,6 +2318,7 @@ passersby pas3zb'aI pasted peIstI#d pasting peIstIN pastry peIstri +partake $2 pate pat2eI ?3 patent pat@nt pathe paTeI @@ -2321,6 +2353,7 @@ peruse p@ru:z petit p@ti: petite p@ti:t petroleum p@troUli:@m +?3 petulant pEtS@l@nt petunia $alt3 pharaoh fe@roU philistine fIlI2staIn @@ -2339,6 +2372,7 @@ piñatas pi:n^'ata#z piña pi:n^a# pineapple p'aInap@L pinged pINd +pinot pi:noU pint paInt pioneer paI@n'i@3 pious paI@s @@ -2588,6 +2622,7 @@ righteous raItS@s riposte rI2p0st risen rIz@n robust roUb'Vst +robusta $2 romance roUm'ans rotate $2 rotund roUt'Vnd @@ -2597,6 +2632,7 @@ rout raUt // for routed routine $2 row roU row raU $noun +royale rOI'al ruby ru:bi rugged rVgI#d ruin ru:I2n // for ruining @@ -2618,6 +2654,7 @@ salad sal@d salami $alt3 saline seIlaIn ?3 saline seIli:n +saliva $alt3 salmon sam@n ?3 salon $alt3 saloon $alt3 @@ -2657,7 +2694,6 @@ secretive si:kr@tIv secretary sEkr@trI sedan sI2dan sedate sI2deIt -seduce sI2dju:s sega seIg@ segue sEgweI separate sEp@-r@t @@ -2821,10 +2857,10 @@ tablet tabl@t taboo $2 tabu tabu: taffeta tafI#t@ +(tai chi) taI'tSi: takel tak@L talent tal@nt tallyho talI'hoU -timbre tamb3 tampon tamp0n tangerine tandZ@r'i:n taoiseach ti:S@x @@ -2843,6 +2879,7 @@ tear te@ $verb (tear off) t'e@||'0f teargas ti@3gas teddybear t'EdIb,e@ +tejano tI#hA:noU telemetry t@lEm@tri telepathy t@lEp@Ti telephony t@l'Ef@ni @@ -2858,6 +2895,7 @@ telephon tElI2foUn // for telephoning temperature tEmprI2tS3 ?!3 temporary tEmpr@rI ?3 template tEmpl@t +tetanus tEt@n@s therefore $1 thereof De@r'0v thermos T3:m@s @@ -2865,7 +2903,6 @@ thermostable $alt1 thesis Ti:sIs theta Ti:t@ tho DoU $only -thousand TaUz@nd throughout $2 thursday T3:zdeI ?5 thursday TVRzdeI @@ -2874,10 +2911,12 @@ tidy taIdi tierra tI'e@r@ tikka ti:k@ tilde tIld@ +timbre tamb3 timetable taImteIb@L timider tImId3 tiny taIni tirade taIr'eId +tiramisu tIramI'su: tis tIz $only toboggan t@b0g@n today t@deI @@ -2933,6 +2972,8 @@ twilight twaIlaIt twos tu:z typo taIpoU tyr taI3 +tyranny tIr@ni +?3 tyranny ti@3r@ni ukulele ju:k@l'eIli ultraviolet $3 @@ -2941,6 +2982,7 @@ unable Vn'eIb@L unaware Vn@w'e@ uncle VNk@L undeny VndIn'aI +underground $1 $noun underling $1 underlings Vnd3lINz underworld $1 @@ -2967,8 +3009,7 @@ upgrade $1 $onlys upgrade $verb uproot $2 uplift $2 -upset $1 $onlys -upset Vps'Et $past +upset $1 $noun upstart $1 uptight $2 urine jU@rIn @@ -2999,6 +3040,7 @@ veg vEdZ vegetable vEdZI2t@b@L vehicle vi@k@L vega vi:g@ +vegetative $alt1 veggy vEdZI vengeance vEndZ@ns ventriloquist $2 @@ -3023,6 +3065,7 @@ visa vi:z@ vitamin vIt@mI#n ?3 vitamin vaIt@mI#n vitriol vItri:@l +vivre vi:vr@- voila vwal'A: ?3 voila vwA:l'A: volcano v0lk'eInoU @@ -3060,6 +3103,7 @@ wind waInd $verb (winds up) w'aIndz||'Vp winded wIndI#d winged wINd +wino waInoU wither wID3 // not with+er without $2 wordprocessor $2 @@ -3140,6 +3184,7 @@ Malvern mO:lv3n Morecambe mo@k@m Norfolk nO@f@k Norwich n0rI2tS +Piccadilly $3 Plymouth plIm@T Regis ri:dZI2s Rhyl rIl @@ -3179,6 +3224,8 @@ Armageddon A@ma#g'Ed@n Arkansas A@k@nsO: Atlantis atl'antIs Athens aTI2nz +Augusta $2 +Baja bA:hA: Bahrain $2 Bangledesh baNgl@d'ES Barbados bA@'beId0s @@ -3307,6 +3354,7 @@ Levant l@vant Liberia laIb'i@ri:@ Lima li:ma# Ljubljana lju:blj'A:n@ +Lorraine $alt3 Louisiana lu:,i:zi:'an@ Luxembourg lVks@mb3:g Lvov l@-v0v @@ -3322,6 +3370,7 @@ Mandalay $3 Manhatten $2 Manila $alt3 Massachusetts $3 +Maui maUi: Maya maI@ Mayan maI@n Melbourne mElb3n @@ -3331,6 +3380,7 @@ Mexico $1 Miami maI'ami Michigan mISIg@n Milan $2 +Milwaukee $2 Mindanao mInd@n'aU Mineola mIni:'oUl@ Minneapolis mIni:'ap@lI2s @@ -3396,6 +3446,7 @@ Seville s@vIl Seychelle seIS'El Shanghai $2 Shiloh SaIloU +Shreveport Sri:vpo@t Siam saI'am Sicily sIsI2li Sinai saInaI @@ -3457,6 +3508,7 @@ Abe eIb Abu abu: Abraham eIbr@ham Ada eId@ $onlys +Adolphus $alt3 Adrian eIdri@n Agatha aga#T@ Aggie agi @@ -3486,6 +3538,7 @@ Andreas A:ndr'eI@s Angela andZ@l@ Angelika $2 Anita $alt3 +Annamaria an@ma#r'i:@ Anthony ant@ni Anton ant0n Aoife i:f@ @@ -3589,6 +3642,7 @@ Eva i:v@ Evan Ev@n Evette I2vEt Fainne fan;@ +Felipe fI#li:peI Freda fri:d@ Fírinne fi:rIn;@ Gareth gar@T @@ -3609,6 +3663,7 @@ Guido gwi:doU Guinevere gwInI#vi@3 Hadrian heIdri:@n Hamish heImIS +Harold har@Ld Harriet hari@t Harvey hA@vi Heidi haIdi @@ -3659,8 +3714,8 @@ Leroy li:rOI Liam li:@m Lindsay lInzi Lindsey lInzi -Llewellyn l#@w'ElIn -Llywelyn l#@w'ElIn +Llewellyn lUw'ElIn +Llywelyn lUw'ElIn Loinnir lVni@ Lois loUIs Louis lu:i @@ -3691,6 +3746,7 @@ Megan mEg@n Mellisa $alt3 Mellissa $alt3 Melissa $alt3 +Meredith mEr@dIT Michele mI2SEl Michelle mI2SEl Miguel mi:Q'El @@ -3780,6 +3836,7 @@ Thomas t0m@s Timothy tIm@Ti Tina ti:n@ Titania tIt'A:ni@ +Titus taIt@s Tracy treIsi Triani tri:'ani Trina tri:n@ @@ -3807,15 +3864,18 @@ Capone ka#poUn Carnegie kA@n@gi Cohen koU@n Connolly $1 +Cortez $2 Cthulhu k@-Tu:l#u: Chrysler kraIsl3 (da vinci) da#vIntSi Dante dA:nt2eI Deslauriers dI2lo@rIeI Deveraux dEv3roU +Digiorno dI#Zo@noU Disney dIzni ?3 Dolby doUlbi Dolce d0ltSeI +Dulles dVl@s Dvorak d@-vo@Zak Emory Em3ri Fleming flEmIN @@ -3826,9 +3886,11 @@ Guinness gInIs Gutierrez gu:tj'ErEz Hades heIdi:z Hamilton ham@Lt@n +Heinz haInz Hoosier hu:Z3 Jacobi dZa#koUbi Kendell kEnd@L +Khrushchev kru:StSEf Kyocera kaI|@s'i@r@ Lamaze la#mA:z Laurell $2 @@ -3838,6 +3900,7 @@ Medusa m@du:s@ Michelangelo maIk@L'andZ@loU Montague m0nt2@gju: Mozart moUtsA@t +Nietzsche ni:tSi Niro ni@roU Patel $alt3 Perez p3rEz @@ -3856,6 +3919,7 @@ Sanchez santSEz Shakur Sa#kU@ Tzu tsu: Versace v3sA:tSi +Volkswagen v'oUlksv,A:g@n Wii wi:: Yaesu jeIsu: Yamaha jam@hA: @@ -3952,6 +4016,7 @@ unto ,VntU upon @p0n $u2 from fr0m $u ?3 from frVm $u +(from the) fr,VmD@ (from where) %frVm||w'e@ $pause (from which) %frVm||w'ItS $pause up ,Vp $strend2 @@ -4162,6 +4227,8 @@ we'd wi:d $u $pastf I aI $u+ $verbf $only (I am) %aIa#m (I am) %aIam $atend +(I shall) %aIS,a#l +(I shall) aIS'al $atend he hi: $u $verbsf she Si: $u $only $verbsf it It $u $verbsf @@ -4171,6 +4238,8 @@ it It $u $verbsf ?3 (it was) %It||wVz $atend it $allcaps $abbrev we wi: $u $verbf $only +(we shall) w%i:S,a#l +(we shall) wi:S'al $atend you ju: $u $verbf they DeI $u $verbf @@ -4230,7 +4299,7 @@ whenever wEnEv3 $u2 $pause whoever hu:Ev3 $2 whatever w0tEv3 $2 $pause ?3 whatever wVtEv3 $2 $pause -while w,aIl $pause $strend +while w,aIl $brk $strend whilst w,aIlst $pause @@ -4269,9 +4338,12 @@ that Dat $u $nounf $strend2 $verbsf (that a) ,Dat@ $nounf (that an) ,Dat@n $nounf (that it) ,Da#tIt $verbsf +(that was) Da#t||w0z $atend (that one) D'atw,0n ?3 (that one) D'atw,Vn (that the) %DatD@2 +(that has been) Da#tha#zbIn $u+ +(that's been) Da#tsbIn $u+ these Di:z $u $nounf $strend2 $only those DoUz $u $nounf $strend2 $only there De@ $u $strend2 $only diff --git a/dictsource/en_rules b/dictsource/en_rules index ecd117e5..e96839b5 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -295,6 +295,7 @@ y) ache (_ eIk d) aches (_ eIks h) aches (_ eIks + k) aches (_ eIks r) aches (_ eIks rt) aches (_ eIks tr) ach (e @k @@ -323,6 +324,7 @@ _) ac (ri ak ac (ro ak m) acro (@ akr@ + ac (rum_ 'eIk _) ac (t ak ac (tory 'ak actu (A aktSu: @@ -465,7 +467,8 @@ ague eIg ag (a_ 'A:g agi (_ 'A:gI - @) agua (_ 'agju:@ + agua (_ 'agju:@ +?3 agua (_ 'A:gw@ .group ai _) ai eI @@ -514,6 +517,8 @@ _) al (ast al m) alay @l'eI _) al (b al + _) al (ban O:l + _) al (bani al _) alber (tA alb'3: _) al (c al alco (h alk@ @@ -658,6 +663,7 @@ h) al (v A: ?3 h) al (v a m) al (no %al + but) al (_ A:l .group am _) am (_ %am @@ -672,7 +678,7 @@ @erd) am (_ am ?!3 &h) am (_N @m &s) am (_ @m - @r) am (a_ 'A:m +?3 @r) am (a_ 'am _) am (al a#m amateur am@t3 ?3 amateur am@tS3 @@ -764,6 +770,7 @@ _f) an (at a#n pl) an (t_ an &) an (ce_ @n + &) an (ce_$w_alt1 an ?8 &) an (ce_ a#n fin) an (c 'an h) an (ce_ aan @@ -910,6 +917,7 @@ &l) ar (_ 3 &l) ar (ist 3 &m) ar (_ 3 + lun) ar (_ =3 _p) ara ar@ qu) ar (a 0r _p) ara (de @reI @@ -998,6 +1006,7 @@ @) ar (ity ar ar (iu+ 'e@r _p) arlia A@l@ + @) ar (ol @r arom (at a#roUm arre (_ A@ arred (_ A@d @@ -1108,6 +1117,7 @@ _s) ata (n eIt@ _g) ator eIt3 &) ate (_$w_alt2 @t + &) ately (_ @tli der) ated (_ eItI#d pal) ate (_ @t consul) ate (_ @t @@ -1122,12 +1132,14 @@ mper) ate (_ @t _it_separ) ate (_ @t par) ates (_ eIt|s + ct) ate (_ =eIt @) ated (++_ eItId _s) ate (ll at@ @) ati (_ 'A:ti at (im_ 'eIt @) ating (++_ eItIN &) at (ive @t + &) at (ive_$w_alt1 eIt // &) ately (_ @tl%I ul) at (ory 'eIt sen) at @t @@ -1174,7 +1186,7 @@ d) ata eIt@ f) at (al eIt str) at (eg at - m) at (er at + m) at (er@ at p) at (ern @t f) ath (er A:D b) ath aaT @@ -1323,6 +1335,8 @@ _) be (th bE be (tray bI2 _) be (w bI2 + d) bed (_ bEd + E) bed (_ bEd h) bed (_ bEd er) bed (_ bEd t) bed (_ bEd @@ -1560,7 +1574,7 @@ co (mplex_ k0 co (mplica k0 co (mplim k0 - co (mposit k0 + co (mposit k0# co (mpost k0 co (mpou k0 co (mprehen k0 @@ -1633,6 +1647,7 @@ _) co (rri k0 co (rro k@ co (rrup k@ + _) co (sm k0 _) costar koUstA@ _) counter (@P7 k'aUnt3 // prefix @@ -1776,6 +1791,7 @@ _) devas dEv@s de (via di: de (vil dE + de (vill d@ de (vio di: de (von dE @@ -1899,6 +1915,7 @@ _) e (ffac %I e (ffec %I e (ffic %I + e (ffica E efier (_ I2faI3 e (ful _) e (ffu %I @@ -1941,8 +1958,10 @@ e (qual i: _) e (quat %I _s) e (que i: - e (quip %I - equiv %IkwIv + _) equi (@ ,i:kwI# + _) equ (in@ Ekw + _) equi (p %IkwI + equiv (@ %IkwIv h) e (sion_ 'i: @) e (tio i: discr) e (tion E @@ -2096,6 +2115,7 @@ h) ed (ral 'i:d h) ed (ron 'i:d h) ed (ra 'i:d + @) ed (th_ @d @) edur 'i:dZ3 &) ed (y @d @@ -2145,6 +2165,7 @@ _) ele (g ElI _) elem ElIm _) ele (p ElI + _) el (er El sk) ele (t ElI# _) ele (va ElI el (igi 'El @@ -2161,6 +2182,7 @@ &) elling @lI2N &) eling @lI2N &) ell (ous @l + &) el (ous_ @l cib) el (_ El xc) el (_ 'El onn) el (_ 'El @@ -2184,6 +2206,7 @@ .group em _) em %Em _) em (a I2m + &) em (a_ @m &) em (_ @m em (ail i:m f) em (ale i:m @@ -2310,6 +2333,8 @@ mill) en (ia 'En l) eni (e i:nI v) eni (e i:nI + en (sia En + en (tsi En &) en (t_ @n ?8 &) en (t_ En @) en (tal 'En @@ -2591,7 +2616,7 @@ &l) et (_ @t j) et (_ Et s) et (_ Et - t) et (_ Et + t) et (_ 'Et @@An) et (_ Et phab) et (_ Et ber) et (_ eI @@ -2607,8 +2632,9 @@ .group eu eu ju: + l) eu u: ?3 n) eu u: -?3 n) eu (r U@ +?3 n) eu (r@ U@ r) eu (d OI eu (m_ 'i:@ s) eu (m_ 'i@ @@ -2714,8 +2740,6 @@ for (ward f'o@ // straightforward ft (en f &) ful (_S3i f@L - &) fully (_S5 f@li - &) fulness (_S7 f@Ln@s .group g g g @@ -2752,6 +2776,7 @@ gh (C g gh (an g gm (_ m + gm (y_ m gn (_ n _poi) gn nj _) gnu g@nu: @@ -2849,6 +2874,7 @@ i (CCi_ 'I XC) i (Ca_ i: @) i (Cate_ =I# + @) i (Cator_ =I# &) i (Cenc I &) i (Cent I @) i (Cer I @@ -2909,6 +2935,8 @@ _) ich Ik iche (_N 'i:S m) ichael 'aIk@L + l) ich (_ Ix + l) ich (er_ Ix &) i (ciCe_ =I i (cial 'I ician 'IS@n @@ -2998,6 +3026,7 @@ r) ia (b I2@ t) ia (b I2@ &) iage (_ I2dZ + &l) iage (_ I2I2dZ iah (_ 'aI@ ia (m i@ &) ia (n i@ @@ -3196,7 +3225,7 @@ imm (ig Im imm (in Im immo (bi Im'oU - imm (unis Im + imm (uniL06 Im _) immu (no I2mju: @) imous (_ =Im@s im (pac Im @@ -3304,6 +3333,7 @@ _) in (sole In _) in (somu In _) in (spir In + _) in (stag In _) in (stan In _) instant Inst@nt _) in (sti In @@ -3427,7 +3457,8 @@ ll) ion (_ =i@n n) ion =i@n v) io (l aI@ - ione (_ 'aI@ni + @) ione (_ 'aI@ni + ione (_ aI'oUni g) io (n+ @ m) io (n I20 sh) io (n @ @@ -3585,6 +3616,7 @@ &) itous =I#t@s l) itre i:t3 n) it (rA aIt + _n) itro (@ ,aItroU n) itro aItroU n) itro (ge aItr@ it (um aIt @@ -3647,6 +3679,7 @@ _) k (L01Y k _) k (hY k _) k (wY k + _) kh (r@@ k _) kj (e@ kj _) kn (Y n kn (if n @@ -3707,6 +3740,7 @@ ief) ly (_S2 l%i ff) ly (_S2 l%i of) ly (_S2 l%i + &ful) ly (_S2m l%i o) ly (_ l%i multip) ly laI &p) ly (_S2 l%i @@ -3850,8 +3884,8 @@ _) nano (P4 n,anoU nause nO:sI necessit n@sEsIt - &) ness (_S4i n@s -?8 &) ness (_S4i nEs + &) ness (_S4im n@s +?8 &) ness (_S4im nEs @) n (cC N @) n (ch n n (c_ N @@ -3920,7 +3954,7 @@ o 0 _) o 0 X) o 0# - X) o ($w_alt3 %0# + X) o ($w_alt3++ %0# _) o'(P2 %oU // prefix o'er o@ o (Ba_ 'oU @@ -3997,6 +4031,7 @@ _h) o (cu oU cr) o (cu oU o (cyte_ =@ + _) o (dA oU _b) o (dy 0 cust) o (d @ k) o (dA oU @@ -4172,6 +4207,7 @@ s) ol (idi @l f) ol (k oU y) ol (k oU + n) oll oUl p) oll (u @l r) oll oUl tr) oll (A 0l @@ -4186,6 +4222,8 @@ olo (gic @l'0 &) ol (ous_ @l olt oUlt + v) olt oUlt + v) ol (C 0l w) olv Ulv N_p) oly ,0lI _) ol (ym @l @@ -4233,6 +4271,7 @@ .group on @@) on (_ @n + @) on (_$w_alt2 @n ?8 @) on (_++ 0n %C) on (_ @n &b) on (_ @n @@ -4992,7 +5031,7 @@ _) re (creat ,ri: _) re (creati rE re (ct rE - re (dC rE + _) re (dC rE _) re (deCP2 ,ri: un) rede (C ,ri:dI2 re (dem+ rI2 @@ -5027,6 +5066,7 @@ re (act rI2 _c) re (mat rI2 rement rIm@nt + _) re (mons rE _) re (nC rE re (nova rE _) reper (t rEp3 @@ -5035,6 +5075,7 @@ re (pli rE re (prim rE re (pt rE + re (quis rE _) re (scu rE re (sidue rE res (ign rI2z @@ -5094,7 +5135,7 @@ _) s (va s _) s (ve s _) s (wY s - _) s (zY s + _) sz (@@ Sz sche (m ski: _) sch (ism sk @@ -5105,7 +5146,6 @@ _e) sch S ?3 sch (ed sk _) sch (il S - _) scar (A ske@ _) scar (a skar scarc ske@s sc (L02 s @@ -5148,6 +5188,7 @@ e) s (d z _) se (clu sI2 secur sI2kjU@ + _) se (duc sI2 self (_ 'sElf selves (_ 'sElvz _) semi (@@P4 s,EmI2 @@ -5370,6 +5411,7 @@ th (old th th (ole th _) th (om@ t + thousand TaUz@nd ph) th T smoo) th D wor) th (_ T @@ -5489,6 +5531,7 @@ @) u (da_ 'ju: ?3 @L08) u (da_ 'u: b) u (ddh U +?3 b) u (ddh u: u (esq ju: u (ga_ 'u: f) u (gal 'ju: @@ -5538,6 +5581,7 @@ d) u (ly ju: z) u (l_ 'u: &) um (_ @m + circ) um @m vol) u (me ju: u (ma_ 'u: h) u (man ju: @@ -5747,7 +5791,6 @@ ?3 _) vibra (t v'aIbreI vivi (@ vIvI viv (_ vaIv - _) vo (lC v0 .group w w w diff --git a/dictsource/ga_list b/dictsource/ga_list index d2ea684d..1e5d314b 100755 --- a/dictsource/ga_list +++ b/dictsource/ga_list @@ -1,7 +1,7 @@ // Irish Gaeilge dictionary // written by Ronan McGuirk // 2013 -// version 2.6.1 +// version 2.7 // Please send comments and suggestions to espeak.gaeilge@gmail.com // This file is UTF8 encoded @@ -29,7 +29,7 @@ _o oU p pi: q kju: r ar -s Es +_s Es t ti: $atend u ju: v vi: @@ -142,6 +142,7 @@ abhaile @w'0l;E ach 0x $u ag Eg $verbf $u anall @n'aUl +anam '0n@m aige @g'E air Er acu 0k'U @@ -149,13 +150,13 @@ ar Er $u arsa @rs@ agaibh 0g@Iv agus 0g@s +aisfhilleadh ,aS'Il;@ amach @m'0x amárach @m'A:r@x amuigh @mu1'I amháin @w'A:in am aUm anaithnid '0nah@nIdZ -anois @nIS anonn @naUn ann aUn anseo @nS'O @@ -183,6 +184,7 @@ chlainne xl'InE chun xUn $u crainn kri:n chrainn xri:n +cúlslais ku:lslaS de dE $u+ des dEs $u @@ -240,10 +242,10 @@ os o:s rabh raU raibh rEv raidió r'adi:o: -réamhrá r'e:@vr,a: réidh re: -'s s -samhain saUIn +rímhaith R'i:w0 +(s é) S'e: +(s í) S'i: san s@n seo S@_ tabhair t'u:@r diff --git a/dictsource/ga_rules b/dictsource/ga_rules index cef882c0..1f19d38e 100755 --- a/dictsource/ga_rules +++ b/dictsource/ga_rules @@ -2,7 +2,7 @@ // translation rules for Irish Gaeilge // This file is UTF-8 encoded // written by Ronan McGuirk 2013 -// Version 2.6.1 +// Version 2.7 // Please send comments and suggestions to espeak.gaeilge@gmail.com @@ -11,10 +11,10 @@ .L01 e i é í // slender vowels .L02 c ch d g gh n s // following ea gets ; sounds -.L03 b bh mb c ch f m mh dh // used for words likemuir or cuid +.L03 b bh mb c ch f m mh dh p ph // used for words likemuir or cuid .L04 b bh mb // for words like beag .L05 nn nna nnas dh r s ntas nach nas nais dar mar rtha nta mh chas chais cht chta nnach ntach llach d l ll // word endings where @ is to repleace ea or a -.L06 aidh idh aí á eá eadh adh ad adsa imid aimid imis aimis ainn inn idís aidís éin // word endings where f changes to h +.L06 aidh idh aí á eá eadh adh ad ead adsaeadsa imid aimid imis aimis ainn ainnse inn innse idís aidís éin // word endings where f changes to h .L07 b c g ch bh gh mb .L08 lc ll nt bhse // for words like cailc .L09 cl cr chr f @@ -24,12 +24,12 @@ .L13 oc omb .L14 río dún gnío // followed with mh .L15 c ch f bhf m d dh g gc gh mh // aoi following -.L16 b c bh ch gr ghr // for inn word ending +.L16 b c bh ch gr ghr t th // for inn word ending .L17 l le li niste nn .L18 n nt nte neann neadh ntear nim nfear nfinn nfidh nfidis neamar .L19 na nea ra rea la llea arga // word endings with silent dh .L20 eo eoir eá eabh io iu iú // slender m -.L21 ll nn ndán nntán +.L21 ll nn nna nnta ndán nntán nntáin .L22 eadh eag eaga eagán eagáinín eo io iu iú eall eabh ealtaine eann .L23 ea eo i .L24 b mb bh g gh p ph bp m mh @@ -41,6 +41,7 @@ adh (C aI abht aU#t[ amhr aUr // words like amhras + amha aU@ K) amhl aUl abh (C aU // words like slabhra aghaidh aIg @@ -56,6 +57,7 @@ X) a (nn_ aU# X) a (ll_ aU# abha aU@ + abhai aU@ am (pla aUm ama (_ aU#m@ athair 'ah@r @@ -64,7 +66,7 @@ agh (d aI agh (s aI _) ath 0h - + a (rraige a ai (m_ @ aí i: aoi @i: @@ -83,6 +85,7 @@ amhna (_ aUn@ arraing arIng _) ath (@@P3 ,0_ + _) athr '0hr .group á á A: @@ -99,16 +102,17 @@ ai a# L04) ai (L17 0# aile (_ '0l;E // words like baile - Xc) ai (l '0# - ch) ai (l '0# + Xc) ai (lA '0# + ch) ai (lA '0# m) ai (n 0# c) ai (th 0# ch) ai (th 0# + ai (lleach 0# ai (tín 0# ai (d 0# p) ai (l 0# @) ai (L11_ I - ai (L08+ aI# + ai (L08++ aI# c) ai (l_ I ai (msi 'aI // words like aimsir _L04) ai (L18_++ u1'I//words like bain @@ -118,7 +122,9 @@ X) aigh 'aI aigh aI# L04) aill (_ wi:l aing (_ Ing - ai (llimh '0 // words like Gaillimh + ailleach '0l;@x + ai (llimh++ '0 // words like Gaillimh + aidhm aIm .group b @@ -190,7 +196,8 @@ deirfiúr d;r@f'u:r dheirfiúr g;r@f'u:r _) do (Ch@@P2 d[,U_ - _) dí (@@P2 d,i: + _) dí (C@@P2 d,i: + dícheall d;'i:Ca#l .group e e E# @@ -206,6 +213,8 @@ eo o: eoi o: + eoi (CC_ o:I + eoi (g o:I eogha o: eoghai o: d) eo (ch O# @@ -214,6 +223,7 @@ s) eo (_ @ + .group é é 'e: éi 'e: @@ -251,8 +261,12 @@ fh (éin_ h fh (L22 ; // slender @) f (L06_ h + fios fIs + fhios Is _) fo (C@@P2 f,U _) fogh f'aU + _) forb f'Orb + _) foc (@++ fOk ?1 _bh_) f (@ ?1 _bh_) f (L22 ; @@ -284,6 +298,7 @@ i I _) i I ia i@ + iu U ia (tha i: io O# io (dá I @@ -319,8 +334,9 @@ ll (L23 l; l (g l@ l (b l@ + ll (b l _) lorg (@@P4 l,Or@g - _) lán (C@@P3 l,A:n + _) lán (@@P3 l,A:n .group m m m // broad @@ -344,14 +360,15 @@ ?1 _) n (_L01 n; _) nd n // urú _) nd (L01 n; // urú slender - _) ng n - _) ng (L01 n; + _) ng N + _) ng (L01 N; ?1 _) n (_d n // urú ?1 _) n (_dL01 n; // urú slender -?1 _) n (_g n -?1 _) n (_gL01 n; +?1 _) n (_g N +?1 _) n (_gL01 N; nn n - nn (L01 n; // slender + nn (L01 nj // slender + i) nn (_ N n (b n@ n (m n@ n (bh n@ @@ -394,6 +411,8 @@ _L15) oi (+ @'I _) oi (b I oi (de I + oi (di I + oi (c_ I h) oi (b I _) oi (r I r) oi I @@ -406,12 +425,14 @@ oi (nnío @ oi (mis @ ois (++ O#S + n) ois (_++ IS oill w'i:l _) oi (leá 'I oidh aI oir (_ 'ERR _sc) oi (r O oigh (ea aI + oighn aIXn .group p @@ -435,13 +456,14 @@ r (bh r@ s) r (A R _) ramh raU + _) réamh (@P5 r,e:v .group s s s // broad L01) s S // slender s (L01 S // slender - s (cL01 S + s (CL01 S s (CCL01 S // slender s (pCé s // broad ?1 _t_) s (@ @@ -482,10 +504,10 @@ uai u@ uai (g ui uai (d ui + uainn u:iN uá u:'A: ui I - ui (s U - ui (sce_ I + uinn (_ 'i:n uinti U#'i:ntI _b) uí wi: @@ -506,7 +528,10 @@ ú u: únmh u:nv - úi (r u: + úi u: + úinn (_ u:IN + úibh (_ u:Iv + // words which contain j k q v w x y z, speak as English @@ -521,6 +546,7 @@ .group v v _^_EN + véarsa ve:rs@ .group w w _^_EN diff --git a/dictsource/hy_rules b/dictsource/hy_rules index 053e38eb..775a89ed 100755 --- a/dictsource/hy_rules +++ b/dictsource/hy_rules @@ -19,15 +19,15 @@ .group բ բ b - _) բ (C b@ + _) բ (B b@ .group գ գ g - _) գ (C g@ + _) գ (B g@ .group դ դ d - _) դ (C d@ + _) դ (B d@ .group ե ե e @@ -37,8 +37,8 @@ .group զ զ z - _) զ (L01 @z - _) զ (C z@ + _) զ (L01+ @z + _) զ (B z@ .group է է e @@ -50,7 +50,7 @@ .group թ թ t# - _) թ (C t#@ + _) թ (B t#@ .group ժ ժ Z @@ -63,57 +63,57 @@ .group լ լ l - _) լ (C l@ + _) լ (B l@ .group խ խ X .group ծ ծ ts - _) ծ (C ts@ + _) ծ (B ts@ .group կ կ k - _) կ (C k@ + _) կ (B k@ .group հ հ h - _) հ (C h@ + _) հ (B h@ .group ձ ձ dz - _) ձ (C dz@ + _) ձ (B dz@ .group ղ ղ r" - _) ղ (C r"@ + _) ղ (B r"@ .group ճ ճ tS - _) ճ (C tS@ + _) ճ (B tS@ .group մ մ m - _) մ (C m@ + _) մ (B m@ C) մ (_ @m L02) մ (_ m .group յ յ j - _) յ (C j@ + _) յ (B j@ ?1 _) յ h -?1 _) յ (C h@ +?1 _) յ (B h@ .group ն ն n - _) ն (C n@ + _) ն (B n@ C) ն (_ @n L02) ն (_ n .group շ շ S _) շ (տ @S - _) շ (C S@ + _) շ (B S@ .group ո ո o @@ -126,63 +126,63 @@ .group չ չ tS# - _) չ (C tS#@ + _) չ (B tS#@ .group պ պ p - _) պ (C p@ + _) պ (B p@ .group ջ ջ dZ - _) ջ (C dZ@ + _) ջ (B dZ@ .group ռ - ռ R2 - _) ռ (C R2@ + ռ R + _) ռ (B R@ ?1 L02) ռ (L02 * .group ս ս s - _) ս (L01 @s - _) ս (C s@ + _) ս (L01+ @s + _) ս (B s@ .group վ վ v - _) վ (C v@ + _) վ (B v@ .group տ տ t // ?? [dd] - _) տ (C t@ + _) տ (B t@ .group ր ր r ?1 L02) ր (L02 r - _) ր (C r@ + _) ր (B r@ C) ր (_ @r L02) ր (_ r .group ց ց ts# - _) ց (C ts#@ + _) ց (B ts#@ .group ւ ւ v - _) ւ (C v@ + _) ւ (B v@ .group փ փ p# - _) փ (C p'@ + _) փ (B p#@ .group ք ք k# // ?? [kk] - _) ք (C k#@ + _) ք (B k#@ .group օ օ o .group ֆ ֆ f - _) ֆ (C f@ + _) ֆ (B f@ diff --git a/dictsource/pt_list b/dictsource/pt_list index 5923cbb1..4cb3303c 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -1,4 +1,3 @@ - // This file in UTF8 encoded // Options @@ -58,7 +57,7 @@ _à $accent // à can be a word _é $accent // é can be a word ê $accent í $accent -ó $accent +_ó $accent ô $accent õ $accent ú $accent @@ -341,6 +340,7 @@ elas $u+ $verbf me $u $verbf // reflexive te $u $verbf nos $u $nounf +vos vus $u la $u lo lU $u las $u @@ -405,7 +405,7 @@ numas $u $nounf por $u $nounf // by,for,through pelo $u $nounf -?2 pela $u $nounf p'el& +?2 pela $u $nounf ao $u $nounf à ,a: @@ -438,7 +438,7 @@ com $u // with // conjunctions ?1 e i $u // and ?2 e i $u // and -se $u+ // if +se $u+ $verbf // if ?2 mas $u // but @@ -475,7 +475,7 @@ se $u+ // if ?2 mal // as soon as, hardly ?2 (logo que) l'Oguki/ // as soon as ?2 (antes que) '&~NtSiski/ // before -?2 (depois que) dep'OIski/ // after +?2 (depois que) dep'oIski/ // after ?2 (sempre que) s'eNpriki/ // whenever ?2 enquanto // while @@ -645,7 +645,6 @@ jamais $u+ $verbf // $alt changes stressed [e] or [o] phoneme to open [E] or [O] // $alt2 changes stressed [E] or [O] phoneme to close [e] or [o] -abacaxi abakaSy abordo $alt aborto $alt $verb absorta $alt2 @@ -655,10 +654,8 @@ acocho $alt2 $noun acordo $alt $verb acervo $alt2 adepto $alt -adore $alt adorno $alt $verb aeroporto $alt2 -aeroportos $alt aflore $alt alcateia $alt alcova $alt2 @@ -690,19 +687,19 @@ assopro $alt2 $noun ateia $alt aterro $alt2 aterro $alt $verb -autora $alt2 avesso $alt2 axé aSE azeda $alt $verb azedo $alt $verb bairro b'aIxU banquete $alt2 +barreto $alt2 bastonete $alt2 beco $alt2 besta $alt2 bilhete $alt2 bissulfeto $alt2 -blazer bl'eIzer +blazer bl'eIzer blazers bl'eIzers boca $alt2 boceta $alt2 @@ -723,21 +720,19 @@ bromelha $alt broto $alt2 $noun cabresto $alt2 cacete $alt2 -cachorra $alt2 caderneta $alt2 cadete $alt2 -cãibra k'&~IbR& caibro k'aIbRU +cãibra k'&~IbR& caixeta $alt2 camelha $alt camiseta $alt2 canaleta $alt2 canhoto $alt2 -cantora $alt2 capacete $alt2 caractere $alt carbureto $alt2 -careta $alt2 +caroços $alt carrapeta $alt2 carreta $alt2 carroça $alt @@ -749,14 +744,14 @@ cedro $alt cefaleia $alt centopeia $alt cerebelo $alt2 -cerca $alt2 $noun +cerca $alt $verb cerco $alt $verb -cerda $alt cetro $alt chamego $alt2 $verb chaveta $alt2 chefe $alt checam $alt +chofer $alt choça $alt choro $alt2 $noun chovesse $alt2 @@ -775,7 +770,8 @@ colheres $alt $noun colmeia $alt colore $alt colosso $alt2 -colostro $alt2 +colossos $alt2 +colostro $alt2 começo $alt $verb comodo $alt2 concerto $alt2 $noun @@ -805,10 +801,11 @@ cotovelo $alt2 cratera $alt crede $alt2 credo $alt -crepe $alt decore $alt decoro $alt2 $noun degelo $alt2 +desaforo $alt2 +desamores $alt2 desapego $alt2 $noun descordo $alt desemprego $alt2 @@ -820,7 +817,6 @@ desmantelo $alt2 $noun despojo $alt2 $noun despojos $alt desporto $alt2 -desportos $alt desprezo $alt2 $noun desse $alt2 desse $alt $verb @@ -828,6 +824,7 @@ deste $alt2 deste $alt $verb desterro $alt2 destroem $alt +deteriore $alt deveras $alt dez $alt diarreia $alt @@ -835,18 +832,20 @@ diego $alt2 diogo $alt2 discordo $alt dissabores $alt2 +?1 dispneia dISpyn'EI& ?2 dispneia dZIspyn'EI& dobro $alt2 dobro $alt $verb doce $alt2 -dorminhoco $alt2 -doutora $alt2 +dorminhoco $alt2 +dorminhocos $alt doze $alt2 dueto $alt2 +edson $alt elixir eliSir emprego $alt2 emprego $alt2 $noun -encasqueta $alt +encasqueta $alt encosto $alt $verb endereço $alt $verb enforco $alt @@ -878,6 +877,7 @@ espeto $alt2 $noun espoleta $alt2 esposa $alt2 esqueleto $alt2 +ester $alt estilete $alt2 estorno $alt $verb estorvo $alt $verb @@ -888,14 +888,12 @@ eta $alt2 europa $alt europeia $alt exagero $alt $verb -exorto $alt +exorto $alt explore $alt faceta $alt2 falangeta $alt2 farofa $alt farolete $alt2 -febre $alt -feitora $alt2 fezes $alt filete $alt2 ?1 fixe fiSy @@ -950,7 +948,6 @@ gueto $alt2 hemorroida $alt hoje $alt2 horrores $alt2 -humores $alt2 ideia $alt inovo $alt interesse $alt2 @@ -964,34 +961,26 @@ jogos $alt joguete $alt2 lagosta $alt2 lambreta $alt2 -laser l'eIzer -lasers l'eIzers -lebre $alt -leitora $alt2 +laser l'eIzer +lasers l'eIzers lembrete $alt2 lepra $alt leste $alt2 $verb ?2 lhe l^y -lingueta $alt2 lisboeta $alt2 +livreto $alt2 lodo $alt2 logro $alt lopes $alt macete $alt2 -maior $alt -major $alt -maleta $alt2 maniçoba $alt marieta $alt2 -mariposa $alt2 +mariposa $alt2 marreta $alt2 megera $alt melhor $alt menor $alt -mentora $alt2 -merda $alt meta $alt $noun -meteoro $alt metro $alt minueto $alt2 miolo $alt2 @@ -1006,8 +995,6 @@ monera $alt morcego $alt2 morda $alt2 moreia $alt -mortos $alt -motora $alt2 mui mwi muleta $alt2 mureta $alt2 @@ -1018,8 +1005,8 @@ naquele $alt2 $nounf nervo $alt2 nojo $alt2 novelo $alt2 -novos $alt odisseia $alt +off $alt onu $1 olho $alt2 $noun olhos $alt @@ -1027,14 +1014,10 @@ onomatopeia $alt opereta $alt2 ordens $alt osso $alt2 -ossos $alt ostra $alt2 -ovos $alt -pachorra $alt2 paexa paeSa paella pa'el^& palacete $alt2 -paleta $alt2 palheta $alt2 palhoça $alt panfleto $alt2 @@ -1042,22 +1025,21 @@ pangeia $alt pantera $alt papoco $alt2 $noun parede $alt2 -pastora $alt2 peba $alt pedra $alt -pela $alt $verb +pela $alt2 pelo $alt2 -pelo $alt $verb +penhores $alt2 $noun +perda $alt2 pereba $alt +peres $alt peroba $alt -peses $alt +peses $alt peseta $alt2 peso $alt $verb piloto $alt2 $noun -pintora $alt2 pior $alt pipoco $alt2 $noun -pirueta $alt2 plateia $alt plebeia $alt polca $alt @@ -1068,9 +1050,7 @@ porra $alt2 porreta $alt2 porrete $alt2 porto $alt $verb -portos $alt pose $alt2 -povos $alt poxa p'oS& primavera $alt primores $alt2 @@ -1089,17 +1069,16 @@ reconstroem $alt recordo $alt recorto $alt rede $alt2 -redor $alt reembolso $alt $verb reforço $alt $verb reforços $alt refresco $alt $verb rego $alt2 $noun -reitora $alt2 relevo $alt2 $noun remoem $alt remorso $alt renovo $alt $verb +represa $alt2 retorno $alt $verb reuva x'EUv& rigores $alt2 @@ -1113,11 +1092,9 @@ rolo $alt2 $noun rota $alt2 rota $alt $noun rubores $alt2 -rumores $alt2 sabonete $alt2 sabores $alt2 saibro s'aIbRU -saleta $alt2 sarjeta $alt2 seborreia $alt seca $alt2 $noun @@ -1148,12 +1125,13 @@ suporto $alt suor suOr sutiã sutSi'&~N tabefe $alt +tapera $alt tapete $alt2 temores $alt2 tempero $alt2 $noun tenores $alt2 terrores $alt2 -teses $alt +teses $alt teta $alt2 togo $alt2 topo $alt2 $noun @@ -1162,7 +1140,6 @@ tornozelo $alt2 torre $alt2 $noun torres $alt2 torro $alt -tortos $alt toso $alt transtorno $alt $verb traqueia $alt @@ -1174,12 +1151,11 @@ troco $alt2 $noun tropa $alt tropeço $alt2 $noun trombeta $alt2 -tumores $alt2 -valeta $alt2 vanessa $alt2 vareta $alt2 vera $alt verbete $alt2 +verde $alt2 violeta $alt2 violoncelo $alt voga $alt @@ -1217,6 +1193,7 @@ blind bl'aind ?1 dj d,i:dZ'eI ?2 diesel dZ'izEU ?1 down d'a,wn +?2 down d'aUN ?1 download d'a,wnl'oud ?2 download daUNl'owd ?2 downloads daUNl'owds @@ -1231,11 +1208,13 @@ drivers dR'aIveRs ?2 Explorer ekspl'O*er ?1 eyes 'aiz ?2 eyes 'aIs +flash flES ?1 frame fr'eImy ?2 frame fR'eImi game g'eImy ?1 gmail g,em'eIl ?2 Gmail Zem'eIl +get gEt ?1 google g'u:g&l ?2 google g'ugol ?1 hardware 'ard,w'Er- @@ -1250,16 +1229,19 @@ happy x'Epy ?2 Intranet iNtRan'Et ?1 kernel k'Ern,El ?2 kernel k'Ern@l +left $alt laptop lEptOp +laptops lEptOps ?1 line l'ain layout l'eI,aUt ?2 login logiN ?1 lock l'Ok mail m'eIl mails m'eIls +marketing m'arketSiN ?2 mouse m'aUzi ?1 menu menu -?1 next n'Ekst +next n'Ekst ok Ok'eI ?2 offline Ofl'aIN ?2 online oNlaIN @@ -1270,6 +1252,7 @@ laptop lEptOp pizza p'its& python p'aIT&~N ?1 readme r'i:dmi: +right r'aIt ?1 sapi s,ap'i ?1 scanner sk'En&r sky sk'ay @@ -1288,6 +1271,7 @@ símbolo s'imbolU ?1 sporting sp'Ort,ing tab t'aby tablet t'ablet + tablets t'ablets taser t'eIzer ?1 telemóvel t,El,Em'OvEl ?1 telemóveis t,El,Em'OveIs# @@ -1296,6 +1280,7 @@ update &pd'eIt upgrade &pgR'eId upload &pl'oud ?2 web w'Eb +writer r'aIter ?1 yahoo 'i,ah'u ?2 yahoo iah'u ?1 yes j'Es @@ -1311,6 +1296,7 @@ louis _^_FR ?1 adobe &d'Oby android &NdR'Oid apple 'Epow +baby b'eIby chrome kR'owmi debian d'Ebj&~N ?1 excel ,Eks'El @@ -1321,7 +1307,9 @@ facebook feIsybuk ?1 fedora _^_EN firefox f'ai@fOks ?1 front fr'ont +high haI ?1 jaws dZ'au:z +lady l'eIdy ?1 linux l,in'uks ?2 linux l'inUks live l'aiv @@ -1356,6 +1344,7 @@ mac mEk ?2 Skype sk'aIp Slackware sl'akwe@- ?1 smart sm'art // nero StartSmart +?2 society sos'aIty speak spi:k suse z'u:ts@ ?1 start st'art // nero StartSmart @@ -1379,15 +1368,19 @@ darwin d'Arwin dijkstra d'ijkstrA: einstein _!'aInSt,aIn ?2 einstein _!'aInst,aIn +feuerbach _^_DE feynman f'ainm@n freud fR'OId friedrich fR'i:dRiS gauss g'aUs geisel g'aIzEU -gottfried g'Otfri:t +gottfried g'OtfRi:t +hegel x'egel +heidegger h'aIdege hawking h'o:king heisenberg h'aIzEnberg hitler h'itler +husserl x'usEl isaac iz'&k lavoisier lavwazj'e leibniz l'aIbni:ts @@ -1397,8 +1390,8 @@ newton n'i;utoN oppenheimer _!'Op@nh,aImar richard x'iS&rd riemann r'i:man -rijndael x'ain;d'al -?2 rousseau xus'o +rijndael x'ain;d'al +rousseau xus'o schrödinger Sr'edinger stephen st'i:v@n steve st'i:v diff --git a/dictsource/pt_rules b/dictsource/pt_rules index 79c52688..dd8c2569 100755 --- a/dictsource/pt_rules +++ b/dictsource/pt_rules @@ -20,7 +20,7 @@ .L03 a am o .L04 a am e em o ue uem .L05 r ra ram re rem rde rmo -.L06 ra ram ste re rem rmo +.L06 r ra ram ste sse ssem re rem rmo .L07 sse ssem ste @@ -37,11 +37,7 @@ ?1 a (_a =&/ // ?? elide final a before a ?1 a (_à =&/ - a (C_ & - a (r_ 'a ?1 p) a (d_ =E - a (CC_ & - a (h_ a ?1 a (l_ 'A // eg: Portugal, capital, etc. ?1 a (lK ,A // Algarve, Almerinda, etc... ?2 al (K aU @@ -60,10 +56,7 @@ an (K+ &~N anh (A &~n^ am (_ =&U~ - a (t_ a - a (ts_ a - a (x_ a - a (z_ 'a //eg: paz, rapaz, capaz, etc... + ?1 C) acç 'a's // eg: selecção, etc... ai aI @@ -74,23 +67,23 @@ ao (_ aU au aU au (s aU - a (uCK a - âB) a (CA_ & - âBC) a (CA_ & - êC) a (CA_ & - êCC) a (CA_ & - ôB) a (CA_ & - ôBC) a (CA_ & - áC) a (CA_ & - áCC) a (CA_ & - éC) a (CA_ & + au (CK aU + âB) a (C@ & + âBC) a (C@ & + êC) a (C@ & + êCC) a (C@ & + ôB) a (C@ & + ôBC) a (C@ & + áC) a (C@ & + áCC) a (C@ & + éC) a (C@ & í) a (CA_ & - íC) a (CA_ & - íCC) a (CA_ & - óC) a (CA_ & - óCC) a (CA_ & - óC) a (CCA_ & - úC) a (CA_ & + íC) a (C@ & + íCC) a (C@ & + óC) a (C@ & + óCC) a (C@ & + úC) a (C@ & + úCC) a (C@ & ation (_ 'eIS&~N @@ -186,11 +179,9 @@ e (lh+ e e (ll+ E - e (bL02_ E - e (cL04_ E -@c) e (L07_ e + @c) e (L07_ e e (chL04_ E r) e (cho_ e @@ -209,10 +200,9 @@ h) e (gL04_ e - e (guL02_ E - e (lL04_ E - + C) e (pL04_ E + e (ptL04_ E i) e (r_ E qu) e (r_ E @@ -229,7 +219,7 @@ sp) e (rL04_ E f) e (rL04_ E - + e (rdL04_ E e (quL02_ E e (rbL04_ E e (rgL04_ E @@ -260,8 +250,8 @@ m) e (tL03_ e An) e (tA_ e on) e (te_ E -qu) e (ta_ e - e (vL04_ E + u) e (ta_ e + e (vL04_ E t) e (ve_ e e (rrAs_ E @@ -347,65 +337,60 @@ qu) e (ta_ e ef) e (tuL02_ e t) e (tra E - âC) e (CA_ e - âCC) e (CA_ e - êC) e (CA_ e - êCC) e (CA_ e - ôC) e (CA_ e - áC) e (CA_ e - áCC) e (CA_ e - íC) e (CA_ e - íCC) e (CA_ e - óC) e (Ca_ e - óCC) e (CA_ e - úC) e (CA_ e + âC) e (C@ e + âCC) e (C@ e + êC) e (C@ e + êCC) e (C@ e + ôC) e (C@ e + áC) e (C@ e + áCC) e (C@ e + éCCC) e (C@ e + íC) el (_ eU + íC) e (C@ e + íCC) e (C@ e + óC) e (C@ e + óCC) e (C@ e + úC) e (C@ e úC) el (_ eU ection (_ 'EkS&~N //sort _d) e (L05_ E - em) e (L05_ e // temeram, etc. rd) e (L05_ e // perderam, etc. _vi) e (L05_ E - end) e (L05_ e // entenderam, etc. fiz) e (L05_ E + oub) e (L05_ E // soubeste, etc. tiv) e (L05_ E // es- - viv) e (L05_ e - _com) e (L05_ e - _cos) e (L05_ e _pud) e (L05_ E - _coub) e (L05_ E _exag) e (L05_ E - _houv) e (L05_ E _mulh) e (L05_ E - _soub) e (L05_ E _talh) e (L05_ E -_escond) e (L05_ e _troux) e (L05_ E -respond) e (L05_ e + @m) e (L06_ e // temeram, etc. + end) e (L06_ e // entenderam, etc. + viv) e (L06_ e + _cos) e (L06_ e diss) e (L06_ E // contra- - m) e (L07_ e // comeste, etc. + _houv) e (L06_ E +_escond) e (L06_ e +respond) e (L06_ e eb) e (L07_ e // recebeste, etc. - eg) e (L07_ e // elegeste, etc. + eg) e (L07_ e // elegeste, etc. + _@o) e (L07_ e // doeste, etc. _cr) e (L07_ e - _do) e (L07_ e - _mo) e (L07_ e - _ro) e (L07_ e bat) e (L07_ e // re- com- ced) e (L07_ e // pro- con- su- - end) e (L07_ e // vendeste, etc. - met) e (L07_ e // meteste, cometeste, etc. + met) e (L07_ e // meteste, cometeste, etc. mex) e (L07_ e mov) e (L07_ e // re- co- olv) e (L07_ e // devolveste, etc. ond) e (L07_ e // escondeste, etc. orr) e (L07_ e // correste, etc. - viv) e (L07_ e // re- _ard) e (L07_ e - _cos) e (L07_ e _coz) e (L07_ e colh) e (L07_ e // & es- ench) e (L07_ e // pre- + romp) e (L07_ e // cor- inter- vert) e (L07_ e // in- re- con- _ergu) e (L07_ e _mord) e (L07_ e @@ -415,15 +400,12 @@ respond) e (L05_ e screv) e (L07_ e // e- in- ree- pre- de- _atrev) e (L07_ e _corro) e (L07_ e -_interromp) e (L07_ e _troux) e (L07_ E _ens) e (bL03_ E - _v) e (lhL03_ E _amanc) e (bL03_ E qu) e (brL04_ E - _cel) e (brL04_ E - _dilac) e (rL04_ E - _encarc) e (rL04_ E + cel) e (brL04_ E + _C) e (bre_ E _boch) e (chL04_ e _ex) e (crL04_ E _enr) e (dL01_ E @@ -439,10 +421,9 @@ _enver) e (dL03_ E estr) ei (L04_ EI _r) e (jL03_ E _inv) e (jL04_ E + _v) e (lhL03_ E + _caC) e (lo_ e ?2 el (ton_ 'EU - tr) e (pL04_ E // es- - _dec) e (pL04_ E - _in) e (ptL03_ E ad) e (quL04_ E _dig) e (rL02_ E _ing) e (rL02_ E @@ -456,7 +437,6 @@ _enver) e (dL03_ E _op) e (rL04_ E gen) e (rL04_ E // de- re- _alt) e (rL04_ E - _ent) e (sL04_ E _enc) e (rL04_ E _imp) e (rL04_ E _min) e (rL04_ E @@ -471,6 +451,8 @@ _enver) e (dL03_ E _exub) e (rL04_ E _temp) e (rL04_ E _adult) e (rL04_ E +_dilac) e (rL04_ E +_encarc) e (rL04_ E _incin) e (rL04_ E _persev) e (rL04_ E _recup) e (rL04_ E @@ -478,10 +460,7 @@ _refrig) e (rL04_ E _c) e (rcL02_ E _ex) e (rcL02_ E _alic) e (rcL02_ E - _p) e (rdL02_ E - _l) e (rdL03_ E - _h) e (rdL04_ E - _des) e (rdL04_ E + _esqu) e (rdL03_ e s_colh) e (res_ E _) e (rgL03_ e _re) e (rgL03_ e @@ -493,6 +472,8 @@ s_colh) e (res_ E _alic) e (rçL03_ E _p) e (sL01_ E _l) e (sL03_ E + _repr) e (sL03_ E + _ent) e (sL04_ E _refr) e (scL01_ E _d) e (scL02_ E _cr) e (scL02_ E @@ -502,6 +483,7 @@ s_colh) e (res_ E _p) e (squL02_ E _refr) e (squL02_ E _l) e (ssL02_ e + _ac) e (ssL02_ E _esp) e (ssL03_ e _c) e (stL03_ e _pr) e (tL03_ e @@ -509,6 +491,8 @@ s_colh) e (res_ E _rem) e (tL03_ e _derr) e (tL03_ e _obsol) e (tL03_ e + _Cal) e (ta_ e + _caC) e (ta_ e _sol) e (trL03_ E _pen) e (trL04_ E _n) eu (trL03_ 'eU @@ -517,8 +501,7 @@ _obsol) e (tL03_ e _atr) e (vL03_ e m) e (xL03_ e _r) e (zL04_ E - _pr) e (zL04_ E - spr) e (zL04_ E + pr) e (zL04_ E // des- _enf) e (zL04_ E _rev) e (zL04_ E _embel) e (zL04_ E @@ -526,7 +509,6 @@ _embel) e (zL04_ E p) e (çL03_ E _m) e (çL03_ E _entorp) e (çL03_ e -_caC) e (lo_ e //endsort @@ -553,7 +535,7 @@ _caC) e (lo_ e êm (C ''eIm ên (K ''eIN ênh ''en^ - êm (_ ''eIN + êu ''eU .group f @@ -610,6 +592,8 @@ _caC) e (lo_ e i (e i i (ã i i (õ i + i (á i + i (ó i i (ú i i (o i Cr) i i @@ -628,9 +612,7 @@ _caC) e (lo_ e in (k iN inh in^ - i (A_ 'i - i (am_ 'i - i (em_ 'i + i (L04_ 'i io (_ iU io (s_ iU @@ -661,6 +643,7 @@ _caC) e (lo_ e ?1 @) ings (_ _^_EN ?2 il (ton_ 'iU ?2 i (rton_ 'i +?2 ight (_ 'aIt ?1 ight (_ _^_EN ?1 ights (_ _^_EN @@ -782,9 +765,8 @@ _caC) e (lo_ e o (lvL02_ O - o (sA_ O + o (sL04_ O o (so_N o // not for osos_ - o (sAm_ O o (ssL04_ O @@ -832,12 +814,15 @@ _caC) e (lo_ e o (ze_ O o (rL04_ O c) o (re_ o - d) o (re_ o + @d) o (ra_ o + @d) o (re_ o + ri) o (re_ o l) o (re_ o - t) o (re_ o + s) o (ra_ o + s) o (re_ o + @t) o (ra_ o + @t) o (re_ o v) o (re_ o - - @@) o (rA_ o b) o (rL04_ O o (p_ O ?1 _) o (C O // eg: olá, orla, opção, etc... @@ -848,26 +833,27 @@ _caC) e (lo_ e ?1 _s) o (lu u // solução, soluções. ?1 interr) o (g u // eg: interrogação ?1 f) o (rmulá u // eg: formulário, formulários. -?1 v) o (lt O o (luem_ o o (ssuem_ o - êC) o (CA_ o - êCC) o (CA_ o - ôC) o (CA_ o - áC) o (CA_ o - - éC) o (CA_ o - éCC) o (CA_ o - í) o (CA_ U - íC) o (CA_ o - íCC) o (CA_ o - óC) o (CA_ o - óCC) o (CA_ o - úC) o (CA_ o - úCC) o (CA_ o + âBC) o (C@ o + êC) o (C@ o + êCC) o (C@ o + ôC) o (C@ o + áC) o (C@ o + áCC) o (C@ o + éC) o (C@ o + éCC) o (C@ o + í) o (CA U + íC) o (C@ o + íCC) o (C@ o + óC) o (C@ o + óCC) o (C@ o + úC) o (C@ o + úCC) o (C@ o //sort _f) o (L05_ o + _red) o (L05_ O _pormen) o (L05_ O _f) o (L07_ o _s) o (bL02_ O @@ -888,6 +874,7 @@ _pormen) o (L05_ O _emp) o (lgL04_ O _) o (lhL04_ O m) o (lhL04_ O + emb) o (lsL02_ O _env) o (ltL03_ o ent) o (pL02_ O _c) o (pL03_ O @@ -900,28 +887,30 @@ _pormen) o (L05_ O _) o (ptL04_ O p) o (rL02_ o _dev) o (rL02_ O + _apav) o (rL02_ O _defl) o (rL02_ O _impl) o (rL02_ O - _inod) o (rL03_ O -_inson) o (rL03_ O -_comem) o (rL04 O - _enam) o (rL04_ O -_aprim) o (rL04_ O -_remem) o (rL04_ O + _ad) o (rL04_ O + _ma@) o (r_ O + _@um) o (re_ o f) o (rmL03_ O c) o (rrL01_ o // incorra, corra, etc. _m) o (rrL01_ o - @p) o (rtL03_ O // importo, etc. + _Cach) o (rra_ o + @p) o (rtL03_ O // importo, etc. + ortos (_ O*@-t=Us# // tortos, mortos, etc.ortos (_ 'O*@-tUs t) o (rçL03_ o // con- _r) o (snL04_ O _c) o (spL02_ O _enr) o (squL02_ O - p) ostos (_ Ost=Us# // dispostos etc. + ossos (_ Os=Us# // nossos, grossos, etc. + p) ostos (_ Ost=Us# // dispostos etc.ortos (_ 'O*@-tUs _gar) o (tL03_ o _mar) o (tL03_ o _escr) o (tL03_ o _ch) o (vL01_ o pr) o (vL03_ O + ovos (_ Ov=Us# novos, povos, etc. _g) o (zL04_ O _esb) o (çL01_ O _r) o (çL03_ O @@ -963,6 +952,8 @@ _remem) o (rL04_ O ?3 p (t p ?3 p (_C p_ ph f + play pl'eI +?2 _) práxis (_ pR'aksis .group q @@ -974,6 +965,8 @@ _remem) o (rL04_ O qu (Y k qu (K ku _) que (_ ky +?2 por_) que (_ ke +?2 por_) que (_é ky ?1 _) qua kwa // quatro, etc. ?1 _) que ke // quente, etc. ?1 _) quei (C k'eI // queira, queima, etc @@ -1012,8 +1005,8 @@ _remem) o (rL04_ O r (_ r r (C *@- A) r (A * - r (_A * - ?2 r (_h * + r (_A * + r (_h * C) r (A R rr x _) r x @@ -1157,9 +1150,11 @@ _remem) o (rL04_ O a) x (ar S a) x (ei S xA) x (A S +_abaca) x (i S ale) x (a S bau) x (A S brA) x (A S + _bu) x (o_ S bY) x (A S _ca) x (A S _co) x (A S diff --git a/dictsource/sl_list b/dictsource/sl_list index ac6e863e..0f79b20c 100755 --- a/dictsource/sl_list +++ b/dictsource/sl_list @@ -5,6 +5,7 @@ // $alt1 open vowel [E] or [O] in the stressed syllable // $alt2 open vowel [o] or [o] in the stressed syllable // $alt3 short stress on final syllable +// $alt4 final 'e' is schwa // letter names @@ -44,11 +45,81 @@ y 'ipsilon ü $accent ß 'o:stri||s'@ +а a: +б b@ +в v@ +г g@ +д d@ +е e: +ё jo: +ж Z@ +з z@ +и i: +й ,ik@-*'atkOji +к k@ +л l@ +м m@ +н n@ +о o: +п p@ +р R@ +с s@ +т t@ +у u: +ф f@ +х x@ +ц ts@ +ч tS@ +ш S@ +щ StS@ +э E: +ю ju: +я ja: +ћ tS;@ +ђ dj@ +ќ kj@ + + // accent names -_dia sprEgl'asom +_dia spREgl'asom // languages -_cyr tsiR'i:litSno +_cyr tsiR'i:litSni + +// symbols + +@ 'a:fna +# l'e:stvitsa +$ d'o:laR +% Otst'o:tOw +& 'i:n +* zv'e:ditsa ++ plu:s += En'akO +/ pOS'e:wnitsa +\ l'e:va||pOS'e:wnitsa +_. p'i:ka +_! klic'a:j +_? upRaS'a:j +_" naREkOv'a:j +_' En'o:jni||naREkOv'a:j +_` OstR'i:vEts +_, v'e:jitsa +_- pOS'e:wnitsa +_: dv#'o:p'i:tSjE +_; p'Odp'i:tSjE +_( OklEp'a:j +_) zaklEp'a:j +_[ Og;'a:ti||OklEp'a:j +_] Og;'a:ti||zaklEp'a:j +_{ zav'i:ti||OklEp'a:j +_} zav'i:ti||zaklEp'a:j +_… El'i:psa +__ pOttS@Rt'a:j +_< jE||m'a:njSe +_> jE||v'etSjE +_| nawp'i:tSna||tS'@Rta + // numbers _0 n'i:tS @@ -154,12 +225,19 @@ bili $u // exceptions // (these are just a few example exceptions) -deset $2 -devet $2 -dim $alt3 -ena $alt1 -oba $2 -šel S@w -tisoč $1 -žena $alt1 +deset $2 +devet $2 +dim $alt3 +ena $alt1 +oba $2 +osem $alt4 +poševnica $2 +sedem $alt4 +šel S@w +tisoč $1 +žena $alt1 + +// names +estonija $2 +slovenija $2 diff --git a/dictsource/sl_rules b/dictsource/sl_rules index d844b8df..8c5de2fe 100755 --- a/dictsource/sl_rules +++ b/dictsource/sl_rules @@ -13,6 +13,7 @@ a (X$w_alt3+ 'a a (č_ 'a: + a (j_ 'a: a (l_ 'a: @@ -39,6 +40,7 @@ e (X$w_alt3+ 'E ee i: + e (X$w_alt4 @ @) e (n_ E# @C) e (r_ E# @@ -64,9 +66,6 @@ i (X$w_alt3+ 'i i (A j - @) i (jL03_ =i - r) i (jL03_ i: - z) i (jL03_ i: i (l_ 'i: .group j @@ -94,6 +93,7 @@ m (g N m (k N K) m (K m@- // unstressed + K) m (r m .group n @@ -102,6 +102,7 @@ n (k N K) n (K n@- // unstressed + K) n (r n nj n^ nj (A nj nj (i n^ @@ -116,6 +117,7 @@ o (L04+ o: o (č_ 'o: + o (j_ 'o: o (l_ 'o: oo u: @@ -137,6 +139,7 @@ .group s s s + sch S .group š @@ -154,6 +157,7 @@ u (A w A) u (K w + C) ue (C u: // German names .group v @@ -161,7 +165,7 @@ v (-A+ v // preposition 'v' before a vowel A) v (K w K) v (K %u - v (r v + v (r+ v L01) v (A v# @@ -203,5 +207,3 @@ ü y: ß _^_DE - $ d'olaR - diff --git a/dictsource/ta_rules b/dictsource/ta_rules index a9fd9127..8afdfb07 100644 --- a/dictsource/ta_rules +++ b/dictsource/ta_rules @@ -429,7 +429,9 @@ _மன்மதக்) க (ுகை g _) க (ுருகுல g _) க (ுருக்கள g _) க (ுருக்குல g + _) க (ுருக்ஷேத்திர g _) க (ுருசாமி g + _) குருச (ேத்திர gurUs. _) க (ுருஜி g _) க (ுருதேவ g _) க (ுருநா g @@ -446,6 +448,7 @@ _மன்மதக்) க (ுகை g _) க (ுருமூர்த்தி g _) க (ுருரா g _) க (ுருவடி g + _) க (ுருவம்ச g _) க (ுருவருள g _) க (ுருவா g _) க (ுருவாய g @@ -457,6 +460,8 @@ _மன்மதக்) க (ுகை g _) க (ுருவை g _) க (ுருவோ g _) க (ுருவோட g + _) க (ுருஷேத்திர g + _) கு (ரூப் g _) க (ுலாப g _) க (ுலாம g _) க (ுலேபா g @@ -589,7 +594,7 @@ _மன்மதக்) க (ுகை g _கோபி) க kV# _ஸ்டா) க kV# _ஜமாய்) க kV# -_வெங்) கட kVt.V# + _வெங்) கட kVt.V# அலை) க (டல kV சமையல்) க (ட் kV உச்ச) க (ட்ட kV @@ -679,6 +684,7 @@ _ஹன்L04ி) க (ா k சித்திரலே) க (ா k _ஹாங்) க (ாங் k _தென்) க (ாசி k + _சு) க (ாசினி H அ) க (ாடமி k _நேர்) க (ாணல k _கண்) க (ாணா k @@ -771,7 +777,9 @@ _டா) குமெண்ட kUmen.tV# L03து) க (ுறித்த k அரை) க (ுறை k _கீழ்) க (ுல k + _ரா) க (ுல H அரச) க (ுல k + இரா) க (ுல H ராஜ) க (ுல k _குரு) க (ுல k _கோ) க (ுல k @@ -889,6 +897,7 @@ _சத்தியா) க்கி (ரஹ gg _மு) க்க (ுண gg L03) க்க (ுண gg _போர்) க்க (ுண gg + _கை) க்க (ுண்ட gg அணு) க்க (ுண்ட gg _கோலி) க்க (ுண்ட gg _வெடி) க்க (ுண்ட gg @@ -3234,7 +3243,7 @@ _பெனசீர்_) ப (ுட்டோ b _) பு (ரோட்டான p _) பு (ரௌச b _) ப (ுல்_L15 f - _) ப (ுல்கா f + _) புல்க (ா fulk _) ப (ுல்டோசர b _) ப (ுல்லட் b _) ப (ுல்லா_ f @@ -3509,6 +3518,7 @@ _பெனசீர்_) ப (ுட்டோ b //endsort //sort + _நீர்) ப pV# _ப்ரூ) ப fV# இடர்) ப pV# நடை) ப pV# @@ -3522,6 +3532,7 @@ _பெனசீர்_) ப (ுட்டோ b _விகல்) ப pV# அடால்) ப fV# அஷ்ரா) ப fV# +_ஒL10ி) ப pV# _செயல்) ப pV# _ருடால்) ப fV# _ஷரீ) ப (+ fV# @@ -3531,6 +3542,7 @@ _ருடால்) ப fV# அநுதா) ப (+ bV# அனுதா) ப (+ bV# பிரஸ்தா) ப (+ bV# +_கோபதா) ப (+ bV# _பச்சாதா) ப (+ bV# _விரகதா) ப (+ bV# மனஸ்தா) ப (+ bV# @@ -3644,8 +3656,6 @@ _சொந்த) ப (ந்த bV கா) ப (ர bV _ஜெனி) ப (ர fV நாகா) ப (ரண bV - _ஒலி) ப (ரப் pV - _ஒளி) ப (ரப் pV வீர) ப (ராக்கிரம pV _மறு) ப (ரிசீலனை pV ஆ) ப (ரேசன pV @@ -3943,7 +3953,6 @@ _ஷண்முக) பி (ரிய p ராம்) ப (ூர p _கோலாலம்) ப (ூர p அ) ப (ூர்வ b -ஒL10ி) ப (ெ p இன்ஸ்) ப (ெக்டர p _) பெஞ்ச (ா_ pen^dZ _) பெஞ்ச (ாலும pen^dZ @@ -4310,6 +4319,7 @@ _சந்தேக) ப்ப (ுத்தி bb பெர்னாண்ட) ஸ zV# _ம) ஸ்த (ூர zd அரி) ஸ (ோன z + _சூய) ஸ zV# .group ஹ ஹ HV diff --git a/dictsource/vi_rules b/dictsource/vi_rules index e0479fb7..f6b8d6d1 100644 --- a/dictsource/vi_rules +++ b/dictsource/vi_rules @@ -78,101 +78,119 @@ ỵ ỵ // Consonants //================================ .L01 t c ne nd k x s nt ch th me te le ce ny ry e o u re nch de p pe ph sh v ve ge -.L02 n +.L02 n a .L03 t ch nh - +.L04 a u ă â o ô á à ả ã ạ ù ú ủ ũ ụ ắ ằ ẳ ẵ ặ ấ ầ ẩ ẫ ậ ó ò ỏ õ ọ ố ồ ổ ỗ ộ ư ứ ừ ử ữ ự ơ ớ ờ ở ỡ ợ .group b b b _) b _b //b($w_alt2 _^_EN - - + .group c c g //k c (_ kh - _) ch tS; // try [tS;] [tS] [c] c -?2 _) ch c -?1 _) ch c - ch (_ c - ce (_ _^_EN + _) ch tS; // try [tS;] [tS] [c] c +?2 _) ch c +?1 _)ch c + ch (_ c + ce (_ _^_EN _) cl _^_EN - - - - + + + .group d - d J^ // try [z] [J] [dZ] [dZ;] [J^] + d z // try [z] [J] [dZ] [dZ;] [J^] +?2 d J^ +?1 d J^ + d (_ _^_EN - - - - + + + .group đ đ d _) đ _d - - - - + + + .group f //f f _) f _^_EN f (_ _^_EN - - - + + .group g - g Q // try [g] [Q] + g (L04 Q // try [g] [Q] gh Q // or [g] [Q] - //g (i J^ // try [D] [z] [j] [J^] [z;] [J] [dZ] - //g (ì J^ - //g (í J^ - //g (ỉ J^ - //g (ĩ J^ - //g (ị J^ - gi J^ + gi z // try [D] [z] [j] [J^] [z;] [J] [dZ] + g (ì z + g (í z + g (ỉ z + g (ĩ z + g (ị z + +?1 g (ì J^ +?1 g (í J^ +?1 g (ỉ J^ +?1 g (ĩ J^ +?1 g (ị J^ + +?2 g (ì J^ +?2 g (í J^ +?2 g (ỉ J^ +?2 g (ĩ J^ +?2 g (ị J^ + +?1 gi J^ +?2 gi J^ ?1 giết J^'iE3g - giết J^'iE3t[ - giếc J^'iE3kh +?2 giết J^'iE3g +?1 giếng J^'iE3N +?2 giếng J^'iE3N +?1 giêng J^'iE1N +?2 giêng J^'iE1N + + giết z'iE3t[ + giếc z'iE3kh + giêng z'iE1N + giếng z'iE3N + giểng z'iE4N + giễng z'iE5N + giệng z'iE6N + ?1 giệt J^'iE6g - giệt J^'iE6t[ - giệc J^'iE6kh + giệt z'iE6t[ + giệc z'iE6kh _) gol _^_EN _) gat _^_EN - ght (_ _^_EN - - - + ght (_ _^_EN + + .group h h h - - - +?2 hu w + .group j j Z - - - + + .group k k k //k (_ kh kh x k (_ _^_EN - - - + + .group l l l l (_ _^_EN le (_ _^_EN - - - + + .group m m m - - - + + .group n n n ?1 n (_ N //n @@ -180,93 +198,83 @@ ỵ ỵ ng N ngh N nh n^ +?2 L02) nh n nd (_ _^_EN - - - + + .group ñ ñ n^ - - - + + .group p p p ph f - - - + + .group q q k q (_ kh qu w //kw - - - + + .group r - r z // try [z] [z.] [r] [z;] -?2 r Q -?1 r z. - r (_ _^_EN + r z // try [z] [z.] [r] [z;] +?2 r Q +?1 r z. + r (_ _^_EN rm (_ _^_EN - - - + + .group s s s. // try [s.] [s] [S] _) sh _^_EN s (_ _^_EN st (_ _^_EN se (_ _^_EN - - - + + .group t t t[ ?1 t (_ kh -?2 t (_ kh +?2 t (_ kh th t - tr tS //cr // try [cr] [tr] [tS;] [tS] [c] [dZ] [dz;] -?1 tr cr + tr tS //cr // try [cr] [tr] [tS;] [tS] [c] [dZ] [dz;] +?1 tr cr ?2 tr c - ts (_ _^_EN + ts (_ _^_EN te (_ _^_EN th (_ _^_EN tt (_ _^_EN - - - + + .group v v v -?2 v J^ +?2 v J^ ve (_ _^_EN - - - + + .group w w w _) w _^_EN w (_ _^_EN - - - + + .group x x s x (_ _^_EN - - - + + .group z z z z (_ _^_EN - - + + //================================ // Vowels //================================ - - - - + + + .group a a a: ai a:I @@ -276,8 +284,8 @@ ỵ ỵ aĩ a:I5 aị a:I6 ay aI -?2 ay a:I - +?2 ay a:I + aỳ aI2 aý aI3 aỷ aI4 @@ -290,7 +298,7 @@ ỵ ỵ aõ a:U5 aọ a:U6 au aU -?2 au a:U +?2 au a:U aù aU2 aú aU3 aủ aU4 @@ -298,145 +306,130 @@ ỵ ỵ aụ aU6 a (L01 _^_EN ai (L02 _^_EN - - - + + .group à à a:2 ài a:I2 ày aI2 -?2 ày a:I2 - - - - +?2 ày a:I2 + + + + ào a:U2 àu aU2 -?2 àu a:U2 - - +?2 àu a:U2 + .group á á a:3 ái a:I3 áy aI3 áo a:U3 áu aU3 -?2 áu a:U3 -?2 áy a:I3 - + ?2 áu a:U3 + ?2 áy a:I3 .group ả ả a:4 ải a:I4 ảy aI4 ảo a:U4 ảu aU4 -?2 ảu a:U4 -?2 ảy a:I4 - +?2 ảu a:U4 +?2 ảy a:I4 .group ã ã a:5 ãi a:I5 ãy aI5 ão a:U5 ãu aU5 -?2 ãu a:U5 -?2 ãy a:I5 - +?2 ãu a:U5 +?2 ãy a:I5 .group ạ ạ a:6 ại a:I6 ạy aI6 ạo a:U6 ạu aU6 -?2 ạu a:U6 -?2 ạy a:I6 - +?2 ạu a:U6 +?2 ạy a:I6 + //================================ .group ă ă a - - - - + + + .group ằ ằ a2 - - - - + + + .group ắ ắ a3 - - - - + + + .group ẳ ẳ a4 - - - - + + + .group ẵ ẵ a5 - - - - + + + .group ặ ặ a6 - - + + //================================= .group â â @ ây @I âu @U1 -?2 â (L03 a -?1 â (L03 a - - - +?2 â (L03 a +?1 â (L03 a + + .group ầ ầ @2 ầy @I2 ầu @U2 -?2 ầ (L03 a2 -?1 ầ (L03 a2 - - - +?2 ầ (L03 a2 +?1 ầ (L03 a2 + + .group ấ ấ @3 ấy @I3 ấu @U3 -?2 ấ (L03 a3 -?1 ấ (L03 a3 - - - +?2 ấ (L03 a3 +?1 ấ (L03 a3 + + .group ẩ ẩ @4 ẩy @I4 ẩu @U4 - - - - + + + .group ẫ ẫ @5 ẫy @I5 ẫu @U5 - - - - + + + .group ậ ậ @6 ậy @I6 ậu @U6 -?2 ậ (L03 a6 -?1 ậ (L03 a6 - +?2 ậ (L03 a6 +?1 ậ (L03 a6 + //=========================== .group e e E @@ -448,89 +441,77 @@ ỵ ỵ eọ EU6 e (L01 _^_EN ey (_ _^_EN - - - + + .group è è E2 èo EU2 - - - - + + + .group é é E3 éo EU3 - - - - + + + .group ẻ ẻ E4 ẻo EU4 - - - - + + + .group ẽ ẽ E5 ẽo EU5 - - - - + + + .group ẹ ẹ E6 ẹo EU6 - - + + //============================ - - + .group ê ê e êu eU1 -?2 ê (L03 @: -?2 ê (L02 @: - - +?2 ê (L03 @: +?2 ê (L02 @: + .group ề ề e2 ều eU2 -?2 ề (L03 @:2 -?2 ề (L02 @:2 - - + ?2 ề (L03 @:2 + ?2 ề (L02 @:2 + .group ế ế e3 ếu eU3 - -?2 ế (L03 @:3 -?2 ế (L02 @:3 - + + ?2 ế (L03 @:3 +?2 ế (L02 @:3 .group ể ể e4 ểu eU4 -?2 ể (L03 @:4 -?2 ể (L02 @:4 - - + ?2 ể (L03 @:4 +?2 ể (L02 @:4 + .group ễ ễ e5 ễu eU5 -?2 ễ (L03 @:5 -?2 ễ (L02 @:5 - - + ?2 ễ (L03 @:5 + ?2 ễ (L02 @:5 + .group ệ ệ e6 ệu eU6 -?2 ệ (L03 @:6 -?2 ệ (L02 @:6 - +?2 ệ (L03 @:6 +?2 ệ (L02 @:6 + //============================ - - + .group i i i //i (A j @@ -559,19 +540,17 @@ ỵ ỵ iễu iU5 iệu iU6 i (L01 _^_EN -?2 i (L03 @ +?2 i (L03 @ ?1 i (L03 @ ?2 i (L02 @ - .group ì ì i2 ì (A j2 ìa i@2 ìu iU2 -?2 ì (L03 @2 +?2 ì (L03 @2 ?1 ì (L03 @2 ?2 ì (L02 @2 - .group í í i3 í (A j3 @@ -580,27 +559,24 @@ ỵ ỵ ?2 í (L03 @3 ?1 í (L03 @3 ?2 í (L02 @3 - .group ỉ ỉ i4 ỉ (A j4 ỉa i@4 ỉu iU4 -?2 ỉ (L03 @4 +?2 ỉ (L03 @4 ?1 ỉ (L03 @4 -?2 ỉ (L02 @4 - - +?2 ỉ (L02 @4 + .group ĩ ĩ i5 ĩ (A j5 ĩa i@5 ĩu iU5 -?2 ĩ (L03 @5 +?2 ĩ (L03 @5 ?1 ĩ (L03 @5 -?2 ĩ (L02 @5 - - +?2 ĩ (L02 @5 + .group ị ị i6 ị (A j6 @@ -609,14 +585,19 @@ ỵ ỵ ?2 ị (L03 @6 ?1 ị (L03 @6 ?2 ị (L02 @6 - + //========================= - - + .group o o O oa o@ // modify oa sound example: hoa,khoa // o (A w - oi OI + oà o@2 + oá o@3 + oả o@4 + oã o@5 + oạ o@6 + oo o@ + oi OI oì OI2 oí OI3 oỉ OI4 @@ -625,165 +606,147 @@ ỵ ỵ ong O# oe o& // Adding oe sound example: lóe sáng,toét mắt o (L01 _^_EN - oai Oi // oai sound - oại Oi6 - oài Oi2 - oái Oi3 - oải Oi4 - oãi Oi5 - - + oai Oi // oai sound + oại Oi6 + oài Oi2 + oái Oi3 + oải Oi4 + oãi Oi5 + .group ò ò O2 òi OI2 òa o@2 //ò (A w2 òng O#2 òe o&2 - - - - + + + .group ó ó O3 ói OI3 óa o@3 //ó (A w3 óng O#3 óe o&3 - - - - + + + .group ỏ ỏ O4 ỏi OI4 ỏa o@4 //ỏ (A w4 ỏng O#4 ỏe o&4 - - - - + + + .group õ õ O5 õi OI5 õa o@5 //õ (A w5 õng O#5 õe o&5 - - - - + + + .group ọ ọ O6 ọi OI6 ọa o@6 //ọ (A w6 ọng O#6 ọe o&6 - - - + + + //============================= - - + .group ô ô o ôi oI ông o# // ông sound ?2 ôi O- //south dialect - - + .group ồ ồ o2 ồi oI2 ồng o#2 ?2 ồi O-2 - - - + + .group ố ố o3 ối oI3 ống o#3 -?2 ối O-3 - - - + ?2 ối O-3 + + .group ổ ổ o4 ổi oI4 ổng o#4 -?2 ổi O-4 - - - + ?2 ổi O-4 + + .group ỗ ỗ o5 ỗi oI5 ỗng o#5 - + ?2 ỗi O-5 - - + .group ộ ộ o6 ội oI6 ộng o#6 ?2 ội O-6 - - + + //============================= - - + .group ơ ơ @: ơi @:I ơu @:U ?2 ơi @- //south dialect - - - + + .group ờ ờ @:2 ời @:I2 ờu @:U2 -?2 ời @-2 - - - + ?2 ời @-2 + + .group ớ ớ @:3 ới @:I3 ớu @:U3 -?2 ới @-3 - - - +?2 ới @-3 + + .group ở ở @:4 ởi @:I4 ởu @:U4 -?2 ởi @-4 - - - +?2 ởi @-4 + + .group ỡ ỡ @:5 ỡi @:I5 ỡu @:U5 ?2 ỡi @-5 - - - + + .group ợ ợ @:6 ợi @:I6 ợu @:U6 -?2 ợi @-6 - - +?2 ợi @-6 + + //============================= - - + .group u u u u (A w @@ -816,60 +779,54 @@ ỵ ỵ u (L01 _^_EN ui (L01 _^_EN ua (L01 _^_EN -?2 u u- - - +?2 u u- + .group ù ù u2 ù (A w2 ùi uI2 ùa u@2 //ùng u#2 - -?2 ù u-2 - - + +?2 ù u-2 + .group ú ú u3 ú (A w3 úi uI3 úa u@3 //úng u#3 -?2 ú u-3 - - - + ?2 ú u-3 + + .group ủ ủ u4 ủ (A w4 ủi uI4 ủa u@4 //ủng u#4 - -?2 ủ u-4 - - + +?2 ủ u-4 + .group ũ ũ u5 ũ (A w5 ũi uI5 ũa u@5 //ũng u#5 -?2 ũ u-5 - - - +?2 ũ u-5 + + .group ụ ụ u6 ụ (A w6 ụi uI6 ụa u@6 //ụng u#6 -?2 ụ u-6 - + ?2 ụ u-6 + //============================= - - + .group ư ư y ưi yI @@ -893,56 +850,50 @@ ỵ ỵ ưởu y@w4 ưỡu y@w5 ượu y@w6 - - - - + + + .group ừ ừ y2 ừi yI2 ừa y@2 ừu yw2 - - - - + + + .group ứ ứ y3 ứi yI3 ứa y@3 ứu yw3 - - - - + + + .group ử ử y4 ửi yI4 ửa y@4 ửu yw4 - - - - + + + .group ữ ữ y5 ữi yI5 ữa y@5 ữu yw5 - - - - + + + .group ự ự y6 ựi yI6 ựa y@6 ựu yw6 - - + + //============================= - - + .group y y i // y (A j @@ -958,56 +909,49 @@ ỵ ỵ yể i@4 yễ i@5 yệ i@6 - // yêu i@U - + // yêu i@U y (L01 _^_EN - - + .group ỳ ỳ i2 ỳ (A j2 ỳa i@2 - - - - + + + .group ý ý i3 ý (A j3 ýa i@3 - - - - + + + .group ỷ ỷ i4 ỷ (A j4 ỷa i@4 - - - - + + + .group ỹ ỹ i5 ỹ (A j5 ỹa i@5 - - - - + + + .group ỵ ỵ i6 ỵ (A j6 ỵa i@6 - - + + //============================= - - + .group 0xce // Greek letters // 0xce is the first byte of the utf-8 code for these characters - - + + α a:1n_|f'a:1 ά a:1n_|f'a:1 β b'e1_|t['a:1 @@ -1027,13 +971,12 @@ ỵ ỵ ν nw'i1 ξ s'i7 ο o1_|m'i1_|kz.'O7n - - - - + + + .group 0xcf // Greek letters - - + + π p'i1 ρ z.'o1 σ s'i3c_|m'a:1 @@ -1047,12 +990,11 @@ ỵ ỵ ω o1_|m'e1_|Q'a:7 ώ o1_|m'e1_|Q'a:7 ό o1_|m'i1_|kz.'O7n - - - - - - + + + + + .group % f'@2n||cr'am ! _:c'@3m_|t'a:7n_: @@ -1063,14 +1005,13 @@ ỵ ỵ != x'o#_|_b'a2N_ >= l'@:3n_|h'@:1n_|hw,a6kh_b'a2N <= n^'O4_|h'@:1n_|hw,a6kh_b'a2N - - + + __) - (_D cr'y2 A_) - (_D _ C_) - (_D _ - + . c'@3m_ . (. _: \.) . - - + diff --git a/docs/voices.html b/docs/voices.html index 3bcd8c0f..4aaea500 100644 --- a/docs/voices.html +++ b/docs/voices.html @@ -36,7 +36,7 @@ The language attribute is mandatory. All the other attributes
language  <language code> [<priority>]
This attribute should appear before the other attributes which are listed below.

-It selectes the default behaviour and characteristics for the language, and sets default values for +It selects the default behaviour and characteristics for the language, and sets default values for "phonemes", "dictionary" and other attributes. The <language code> should be a two-letter ISO 639-1 language code. One or more language variant codes may be appended, separated by hyphens. (eg. en-uk-north).

The optional <priority> value gives the preference of this voice compared with others for the specified language. A low value indicates a more preferred voice. The default value is 5.

More than one language line may be present. A voice may be selected for other related languages (variants which have the same initial 2 letter language code as the specified language), but it will be less preferred for these. Different language variants may be specified by additional language lines in order to indicate that this is a preferred voice for them also. Eg.

diff --git a/phsource/compile_report b/phsource/compile_report
index c3d99c2f..c58605b0 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -57,8 +57,8 @@ consonants  11  119
       no  28  134
       is  42  141
       vi  57  150
-  vi-hue  15  150
-  vi-sgn  17  150
+  vi-hue  17  150
+  vi-sgn  18  150
      zhy  41  138
       zh  64  155
       sw   9  110
@@ -72,7 +72,7 @@ consonants  11  119
       fa   9  112
       rw  15  132
      prs   8  113
-      sl  16  125
+      sl  18  125
       gd   6  109
      nso  12  113
       ht  11  146
@@ -241,9 +241,11 @@ dzh/xdz_pzd     [J] base
                 [J#] ml
                 [J] tr
                 [J] ku
-envelope/i_risefall  [11] zh
+envelope/i_risefall  [1] vi-sgn
+                [11] zh
 envelope/i_risefall2  [+2] rw
 envelope/p_214  [5] vi
+                [5] vi-sgn
                 [214] zh
 envelope/p_512  [+] pa
                 [6] vi
@@ -266,23 +268,22 @@ envelope/p_fall  [2] vi
                 [+] rw
 envelope/p_fallrise  [4] vi
                 [3] vi-hue
+                [4] vi-sgn
 envelope/p_level  [1] vi
                 [1] vi-hue
                 [7] vi-hue
-                [1] vi-sgn
                 [1] zhy
                 [3] zhy
                 [6] zhy
                 [55] zh
 envelope/p_rise  [3] vi
                 [3] vi-sgn
-                [4] vi-sgn
-                [5] vi-sgn
                 [2] zhy
                 [5] zhy
                 [44] zh
                 [35] zh
 envelope/vi_5amp  [5] vi
+                [4] vi-sgn
 envelope/vi_6amp  [6] vi
                 [2] vi-hue
                 [5] vi-hue
@@ -876,12 +877,14 @@ ustop/c         [c] base
 ustop/k         [k] base
                 [k] fr
                 [k] zhy
+                [k] sl
 ustop/k_        [k] base
                 [k] base2
                 [k] fr
                 [k] lv
                 [k] el
                 [k] sq
+                [k] sl
 ustop/k_asp     [k#] consonants
                 [kh] consonants
                 [g#] hi
@@ -909,6 +912,7 @@ ustop/ki        [k] base
                 [c] tr
                 [J] ku
                 [c] ku
+                [k] sl
 ustop/kl        [k] base
                 [kh] consonants
                 [k] base2
@@ -917,12 +921,14 @@ ustop/kl        [k] base
                 [k] lv
                 [k] el
                 [k] zhy
+                [k] sl
                 [kh] tn
 ustop/kr        [k] base
                 [k] base2
                 [k] et
                 [k] el
                 [k] zhy
+                [k] sl
 ustop/k_unasp   [k] base
                 [k-] consonants
                 [k] base2
@@ -931,6 +937,7 @@ ustop/k_unasp   [k] base
                 [k] el
                 [k] zhy
                 [k] sq
+                [k] sl
                 [k-] tn
 ustop/k_unasp_  [k] zh
                 [k-] ko
@@ -1011,6 +1018,7 @@ ustop/t_dnt     [t] base
                 [t] lt
                 [t] pl
                 [t] hr
+                [t] sl
 ustop/t_dnt2    [t] base2
                 [d] kn
 ustop/t_hi      [t[] base
@@ -1311,7 +1319,6 @@ vdiph/eu_2      [eu] fi
                 [eu] mt
 vdiph/@i        [Yi] et
                 [@I] vi
-                [@:I] vi
 vdiph/&i        [&i] fi
                 [&i] et
                 [aI] hi
@@ -1351,12 +1358,12 @@ vdiph/ooi       [OI] en
                 [oi] mt
 vdiph/ooi_2     [OI] af
                 [oI] eo
+                [OI] vi
                 [Oi] vi-hue
                 [Oi] vi-sgn
 vdiph/ooi_3     [OI] en-us
                 [OI] en-rp
                 [aI] en-wm
-                [OI] vi
                 [Oi] vi
 vdiph/ooi_4     [OI] sq
 vdiph/oou       [oU] cs
@@ -1406,10 +1413,13 @@ vdiph/yi        [yi] fi
                 [yi] zh
                 [yi] mt
 vdiph/y#i       [Yi] fi
+                [@:I] vi
                 [Yi] mt
 vdiph/y#i_2     [Yy] is
                 [Yy:] is
 vdiph/y#y       [Yy] fi
+                [@:I] vi-hue
+                [@:I] vi-sgn
                 [Yy] mt
 vdiph/y#y_2     [Yy] af
                 [eoi] zhy
@@ -1577,11 +1587,8 @@ vowel/0         [0] en
                 [O] hi
                 [O] pt
                 [O] grc
-                [O] vi-hue
-                [O] vi-sgn
 vowel/0_2       [0] en-n
                 [O] pt-pt
-                [O] vi
                 [o] sw
                 [O] sl
                 [o] nso
@@ -1733,6 +1740,7 @@ vowel/a#_3      [a#] en
 vowel/a_4       [a] ga
                 [a] es
                 [a] el
+                [a] vi
 vowel/a#_4      [a:] nl
                 [a] ml
                 [a] bg
@@ -1748,7 +1756,6 @@ vowel/a_5       [a:] hi
                 [a] tn
                 [a] kk
 vowel/a_6       [a] ca
-                [a] vi
                 [a] am
                 [a:] wo
 vowel/a_7       [a] fr
@@ -1878,6 +1885,7 @@ vowel/ee        [E] en-n
                 [&] tt
 vowel/e_e       [E] en-sc
                 [E:] is
+                [E] vi
 vowel/ee#       [E#] pl
 vowel/ee_1      [E] base2
                 [e@] en
@@ -1889,6 +1897,7 @@ vowel/ee_1      [E] base2
                 [E] grc
                 [E:] sv
                 [E:] no
+                [E] vi-sgn
                 [e] zhy
 vowel/ee_2      [E] cy
                 [E2] nl
@@ -1905,7 +1914,6 @@ vowel/ee#_2     [E1] et
 vowel/ee_3      [&] af
                 [&:] af
                 [E] pt
-                [E] vi
 vowel/ee_4      [E] sq
 vowel/ee_5      [E] en
                 [E] ak
@@ -2028,6 +2036,7 @@ vowel/i         [i] base
                 [i] tt
                 [i] kl
 vowel/i#        [y:] cy
+                [i] vi-sgn
 vowel/i_2       [i2] de
                 [i:] de
                 [i] nl
@@ -2287,6 +2296,7 @@ vowel/oo_1      [O:] en-n
                 [o:] sk
                 [o] hr
                 [o/] it
+                [O] vi-sgn
                 [O] sq
                 [o] ka
                 [o] si
@@ -2296,11 +2306,13 @@ vowel/oo_1      [O:] en-n
 vowel/oo_2      [0] en-sc
                 [O] cy
                 [o] cs
+                [O] vi
                 [0] da
                 [?0] da
                 [O] ak
                 [@] ko
 vowel/oo_3      [O] af
+                [O] vi-hue
 vowel/oo_4      [O] base2
                 [0] en-wm
                 [V] en-wi
@@ -2310,6 +2322,7 @@ vowel/oo_4      [O] base2
                 [O] pa
                 [O] it
                 [O] an
+                [O] sl
 vowel/oo_5      [O] bn
                 [O] pl
                 [O] is
diff --git a/phsource/mbrola/in1 b/phsource/mbrola/in1
index d2caa089..ee35fa48 100644
--- a/phsource/mbrola/in1
+++ b/phsource/mbrola/in1
@@ -3,7 +3,7 @@
 0  r/ NULL   0  r
 0  r- NULL   0  r
 0  l- NULL   0  l
-0  w/ NULL   0  w
+0  w/ NULL   0  v
 0  j/ NULL   0  j
 0  ;  NULL   0  NULL
 0  g- NULL   0  NULL
@@ -40,16 +40,25 @@
 0  u~ NULL   60  uu n
 
 0  H  NULL   0  h
+0  p# NULL   0  ph
+0  b# NULL   0  bh
+0  t# NULL   0  th
+0  d# NULL   0  dh
 0  t. NULL   0  T
-0  t.h NULL  0  Th
+0  t.# NULL  0  Th
 0  d. NULL   0  D
-0  d.h NULL  0  Dh
+0  d.# NULL  0  Dh
+0  c# NULL   0  ch
 0  J  NULL   0  j
-0  Jh NULL   0  jh
+0  J# NULL   0  jh
+0  k# NULL   0  kh
+0  g# NULL   0  gh
 0  n. NULL   0  N
 0  n^ NULL   0  N
 0  j  NULL   0  y
 0  S  NULL   0  sh
 0  s. NULL   0  sh
 0  l. NULL   0  l
+0  w  NULL   0  v
+
 
diff --git a/phsource/ph_armenian b/phsource/ph_armenian
index dd1300f0..aff1599f 100644
--- a/phsource/ph_armenian
+++ b/phsource/ph_armenian
@@ -94,7 +94,8 @@ endphoneme
 
 
 phoneme k#
-  import_phoneme consonants/kh
+//  import_phoneme consonants/kh
+  import_phoneme base/k
 endphoneme
 
 
diff --git a/phsource/ph_irish b/phsource/ph_irish
index a7d0eb3c..8cdc4602 100755
--- a/phsource/ph_irish
+++ b/phsource/ph_irish
@@ -1,4 +1,6 @@
-// Version 2.4 January 2013
+// Irish Phonemes
+//Please contact espeak.gaeilge@gmail.com
+// Version 2.7  2013
 
 // short vowels
 
@@ -19,6 +21,11 @@ phoneme @    //  Schwa, but always unstressed
     Length 80
     FMT(vwl_af/r@)
   ENDIF
+  IF prevPh(i:) THEN
+    Length 60
+    FMT(vwl_af/r@)
+  ENDIF
+  
   FMT(vwl_af/@)
 endphoneme
 
@@ -66,8 +73,10 @@ phoneme I
   FMT(vowel/ii_2)
 endphoneme
 
+
 phoneme i   // non syllabic i for end of words
   vowel  starttype #i  endtype #i
+  unstressed
   ipa iU+032F
   length 45
   FMT(vowel/ii_7)
diff --git a/phsource/ph_slovenian b/phsource/ph_slovenian
index e6a9ca22..1b02a83a 100644
--- a/phsource/ph_slovenian
+++ b/phsource/ph_slovenian
@@ -82,7 +82,10 @@ phoneme o+   // doesn't reduce to [O]
 phoneme O
   vowel starttype #o endtype #o
   length 170
-  FMT(vowel/0_2)
+  IF thisPh(isStressed) THEN
+    FMT(vowel/0_2)
+  ENDIF
+  FMT(vowel/oo_4)
 endphoneme
 
 
@@ -92,6 +95,45 @@ phoneme v
 endphoneme
 
 
+phoneme t
+  vls dnt stop
+  lengthmod 2
+  voicingswitch d
+  Vowelin f1=0  f2=1600 -300 300  f3=-100 80
+  Vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  IF nextPh(isPause2) AND prevPhW(isVowel) THEN
+    WAV(ustop/t_dnt, 40)
+  ENDIF
+  WAV(ustop/t_dnt, 60)
+endphoneme
+
+
+phoneme k
+  vls vel stop
+  voicingswitch g
+  lengthmod 2
+  Vowelin f1=0  f2=2300 200 300  f3=-200 80
+  Vowelout f1=0 f2=2300 300 400  f3=-200 80  rms=20
+
+  IF KlattSynth THEN
+    Vowelout f1=0 f2=2300 200 300  f3=-200 80  rms=20
+  ENDIF
+
+  IF nextPh(isPause2) AND prevPhW(isVowel) THEN
+    WAV(ustop/k_)
+  ELIF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN
+    WAV(ustop/kr)
+  ELIF nextPh(#i) OR nextPh(;) THEN
+    WAV(ustop/ki)
+  ELIF nextPh(l) THEN
+    WAV(ustop/kl)
+  ELIF nextPh(@-) THEN
+    WAV(ustop/k_unasp, 70)
+  ENDIF
+  WAV(ustop/k)
+endphoneme
+
+
 // for foreign letters
 phoneme y
   vowel starttype #i endtype #i
diff --git a/phsource/ph_vietnam b/phsource/ph_vietnam
index 95ddc9c6..59ea7b04 100755
--- a/phsource/ph_vietnam
+++ b/phsource/ph_vietnam
@@ -6,25 +6,25 @@
 
 phoneme 1   //  ngang tone: level
   stress
-  Tone(28, 32, envelope/p_level, NULL)
+  Tone(28,32, envelope/p_level, NULL) // 28 29
 endphoneme
 
 
 phoneme 2   //  huyền tone: low falling
   stress
-  Tone(20,  8, envelope/p_fall, NULL) //20
+  Tone(20, 8, envelope/p_fall, NULL) //20 8
 endphoneme
 
 
 phoneme 3   //  sắc Tone(rising
   stress
-  Tone(30, 60, envelope/p_rise, NULL) // 25 50
+  Tone(20, 80, envelope/p_rise, NULL) // 30 60
 endphoneme
 
 
 phoneme 4   //  hỏi Tone(curve (dipping rising)
   stress
-  Tone(40,  5, envelope/p_fallrise, NULL) //30
+  Tone(30, 5, envelope/p_fallrise, NULL) //33 31
 endphoneme
 
 
@@ -37,7 +37,7 @@ endphoneme
 phoneme 6   //  nặng Tone(drop  (constricted)
   stress
   //length 150 // ignore because it make too short sound 75  // reduce the length of the vowel
-  Tone(40, 20, envelope/p_512, envelope/vi_6amp)
+  Tone(33, 21, envelope/p_512, envelope/vi_6amp) //40 20
 endphoneme
 
 
@@ -55,20 +55,24 @@ endphoneme
 phoneme a
   vowel starttype #@ endtype #@
   	length 140
-	  FMT(vowel/a_6)  //a_4)
+	  FMT(vowel/a_4)  //a_4)
 endphoneme
 
 phoneme a:
   vowel starttype #a endtype #a
-  length 240 //280
+  IF nextPh(n^) OR nextPh(c) THEN
+  length 100
+  ELSE
+  length 170 //280
+  ENDIF
     FMT(vowel/a_8)
 endphoneme
 
 
 phoneme E
   vowel starttype #e endtype #e
-  length 240
-  FMT(vowel/ee_3)
+  length 200
+  FMT(vowel/e_e)   //ee_3)
 endphoneme
 
 phoneme e
@@ -80,14 +84,15 @@ endphoneme
 
 phoneme i
   vowel  starttype #i  endtype #i
-  length 240
-  IfNextVowelAppend(;)
+    IfNextVowelAppend(;)
   IF prevPhW(w) THEN
     VowelStart(w/wi)
   ENDIF
   IF nextPh(n^) OR nextPh(c) THEN
+  length 100
   FMT(vnasal/ii_n)
-ELSE
+  ELSE
+  length 240
 FMT(vowel/i_4)
 ENDIF
 endphoneme
@@ -100,7 +105,7 @@ phoneme O
 	ELSE
 	length 200
 	ENDIF
-    FMT(vowel/0_2) //aa_4)
+    FMT(vowel/oo_2)
 endphoneme
 
 phoneme o
@@ -141,7 +146,7 @@ phoneme @
  IF nextPh(kh) OR nextPh(N) OR nextPh(n^) OR nextPh(c) THEN
 	length 120
 	ELSE
-	length 200
+	length 170
 	ENDIF
   FMT(vowel/V)   //vowel/@_2)
 endphoneme
@@ -182,7 +187,7 @@ endphoneme
 phoneme @:I
   vowel starttype #@ endtype #i
   length 200 //250
-  FMT(vdiph/@i)
+  FMT(vdiph/y#i)
 endphoneme
 
 
@@ -202,8 +207,8 @@ endphoneme
 
 phoneme OI
   vowel starttype #o endtype #i
-  length 200
-  FMT(vdiph/ooi_3)
+  length 150
+  FMT(vdiph/ooi_2)
 endphoneme
 
 
@@ -231,28 +236,28 @@ endphoneme
 
 phoneme aU
   vowel starttype #a endtype #u
-  length 200
+  length 150
   FMT(vdiph/aau_4)
 endphoneme
 
 
 phoneme a:U
   vowel starttype #a endtype #u
-  length 200 //270
+  length 150 //270
   FMT(vdiph/au)
 endphoneme
 
 
 phoneme eU
   vowel starttype #e endtype #u
-  length 200
+  length 150
   FMT(vdiph/eu)
 endphoneme
 
 
 phoneme EU
   vowel starttype #e endtype #u
-  length 200
+  length 150
   FMT(vdiph/eeu)
 endphoneme
 
@@ -310,7 +315,7 @@ endphoneme
 
 
 phoneme o@
-  vowel  starttype #o endtype #o
+  vowel  starttype #o endtype #a
   length 140
   FMT(vdiph2/oa)
 endphoneme
@@ -366,7 +371,7 @@ endphoneme
 
 phoneme l
   liquid
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=30
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=15
   //lengthmod 7
    //IF nextPh(isNotVowel) THEN
    // ChangePhoneme(l/2)
@@ -380,7 +385,7 @@ phoneme t
   vls alv stop
   //voicingswitch d
   lengthmod 2
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=30
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=15
   Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
 
   WAV(vietnam/th, 50)
@@ -390,7 +395,7 @@ phoneme cr
   vls pla afr sibilant
   //voicingswitch dZ
   lengthmod 2
-  Vowelin f1=0  f2=2300 200 400  f3=-100 80 len=30
+  Vowelin f1=0  f2=2300 200 400  f3=-100 80 len=15
 
   
   WAV(vietnam/tr,10)
@@ -400,7 +405,7 @@ phoneme d
   vcd alv stop
     //	lengthmod 5
 	
- Vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=30
+ Vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=15
   Vowelout f1=2 f2=1700 -300 300  f3=-100 80 brk len=30
 WAV(vietnam/dd)
  endphoneme
@@ -410,8 +415,8 @@ WAV(vietnam/dd)
   //voicingswitch J
   lengthmod 2
   length 2
-    Vowelin f1=0  f2=2700 400 600  f3=300 80 len=30 brk
-  Vowelout f1=1  f2=2700 400 600  f3=200 70 len=30 colr=1
+    Vowelin f1=0  f2=2700 400 600  f3=300 80 len=15 brk
+  Vowelout f1=1  f2=2700 400 600  f3=200 70 len=15 colr=1
 
   
   WAV(vietnam/ch,5)
@@ -430,8 +435,8 @@ endphoneme
 
 phoneme n
   vcd alv nasal
-  Vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=11 brk len=30
-  Vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk len=30
+  Vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=11 brk len=15
+  Vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk len=15
     lengthmod 4
 	length 75
 FMT(n/nr_)
@@ -442,11 +447,12 @@ phoneme t[        // dental variant of /t/
   voicingswitch d[
   lengthmod 2
   length 5
-  Vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16 len=30
-  Vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20 len=30
+  Vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16 len=15
+  Vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20 len=15
 
   IF nextPh(isPause2) THEN
     WAV(ustop/t_unasp2, 5)
   ENDIF
   WAV(ustop/t_hi, 70)
 endphoneme
+
diff --git a/phsource/ph_vietnam_hue b/phsource/ph_vietnam_hue
index ee843f33..e1079ea6 100644
--- a/phsource/ph_vietnam_hue
+++ b/phsource/ph_vietnam_hue
@@ -6,7 +6,7 @@
 
 phoneme 1   //  ngang tone: level
   stress
-  Tone(40, 5, envelope/p_level, NULL) // similar Hue dialect tone
+  Tone(10 ,60, envelope/p_level, NULL) // 40 5 similar Hue dialect tone
 endphoneme
 
 
@@ -76,7 +76,7 @@ endphoneme
 phoneme O
  CALL vi/O
  length 150
- FMT(vowel/0)
+ FMT(vowel/oo_3)
 endphoneme
 
 phoneme Oi
@@ -84,3 +84,15 @@ phoneme Oi
  length 100
  FMT(vdiph/ooi_2)
 endphoneme
+
+// Redefine consonants
+
+phoneme n
+import_phoneme vi/n
+Vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 rms=5 brk len=15
+endphoneme
+
+phoneme @:I
+ CALL vi/@:I
+  FMT(vdiph/y#y)
+endphoneme
diff --git a/phsource/phonemes b/phsource/phonemes
index 15aca447..1d59c748 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1949,3 +1949,7 @@ include ph_korean
 
 phonemetable kl base
 include ph_greenlandic
+
+
+//phonemetable en2 en
+//include ph_english_test
diff --git a/src/intonation.cpp b/src/intonation.cpp
index 891c3901..b6dfa71e 100644
--- a/src/intonation.cpp
+++ b/src/intonation.cpp
@@ -1246,10 +1246,24 @@ void CalcPitches(Translator *tr, int clause_type)
 			}
 
 			count_pitch_vowels(st_start, ix, n_st);
+			if((ix < n_st) || (clause_type == 0))
+			{
+				calc_pitches(option, st_start, ix, group_tone);   // split into > 1 tone groups
+
+				if((clause_type==1) || (clause_type==2))
+					group_tone = tr->langopts.tunes[1];  // , or ?  remainder has comma-tone
+				else
+					group_tone = tr->langopts.tunes[0];  // . or !  remainder has statement tone
+			}
+			else
+				calc_pitches(option, st_start, ix, group_tone);
+
+#ifdef deleted
 			if((ix < n_st) || (clause_type == 0))
 				calc_pitches(option, st_start, ix, group_tone_emph);   // split into > 1 tone groups, use emphatic tone
 			else
 				calc_pitches(option, st_start, ix, group_tone);
+#endif
 
 			st_start = ix;
 		}
diff --git a/src/readclause.cpp b/src/readclause.cpp
index 2fcc5d87..4305c0ab 100644
--- a/src/readclause.cpp
+++ b/src/readclause.cpp
@@ -1596,6 +1596,7 @@ static int GetVoiceAttributes(wchar_t *pw, int tag_type)
 	wchar_t *name;
 	wchar_t *age;
 	wchar_t *variant;
+	int value;
 	const char *new_voice_id;
 	SSML_STACK *ssml_sp;
 
@@ -1641,7 +1642,9 @@ static int GetVoiceAttributes(wchar_t *pw, int tag_type)
 
 		attrcopy_utf8(ssml_sp->language,lang,sizeof(ssml_sp->language));
 		attrcopy_utf8(ssml_sp->voice_name,name,sizeof(ssml_sp->voice_name));
-		ssml_sp->voice_variant_number = attrnumber(variant,1,0)-1;
+		if((value = attrnumber(variant,1,0)) > 0)
+			value--;    // variant='0' and variant='1' the same
+		ssml_sp->voice_variant_number = value;
 		ssml_sp->voice_age = attrnumber(age,0,0);
 		ssml_sp->voice_gender = attrlookup(gender,mnem_gender);
 		ssml_sp->tag_type = tag_type;
@@ -2288,7 +2291,7 @@ f_input = f_in;  // for GetC etc
 				return(CLAUSE_EOF);
 			}
 
-			if((skip_characters > 0) && (count_characters > skip_characters))
+			if((skip_characters > 0) && (count_characters >= skip_characters))
 			{
 				// reached the specified start position
 				// don't break a word
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 64a172a1..9f3cc273 100644
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.47.11a  18.May.13";
+const char *version_string = "1.47.11b  28.May.13";
 const int version_phdata  = 0x014709;
 
 int option_device_number = -1;
diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
index 08fcb0b6..742ae2f9 100644
--- a/src/tr_languages.cpp
+++ b/src/tr_languages.cpp
@@ -965,7 +965,8 @@ SetLengthMods(tr,3);  // all equal
 			static const short stress_lengths_hy[8] = {250, 200,  250, 250,  0, 0,  250, 250};
 			static const char hy_vowels[] = {0x31, 0x35, 0x37, 0x38, 0x3b, 0x48, 0x55, 0};
 			static const char hy_consonants[] = {0x32,0x33,0x34,0x36,0x39,0x3a,0x3c,0x3d,0x3e,0x3f,
-				0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x56,0};
+				0x40,0x41,0x42,0x43,0x44,   0x46,0x47,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x56,0};
+			static const char hy_consonants2[] = {0x45,0};
 
 			SetupTranslator(tr,stress_lengths_hy,NULL);
 			tr->langopts.stress_rule = STRESSPOSN_1R;  // default stress on final syllable
@@ -974,7 +975,9 @@ SetLengthMods(tr,3);  // all equal
 			memset(tr->letter_bits,0,sizeof(tr->letter_bits));
 			SetLetterBits(tr,LETTERGP_A,hy_vowels);
 			SetLetterBits(tr,LETTERGP_VOWEL2,hy_vowels);
+			SetLetterBits(tr,LETTERGP_B,hy_consonants);    // not including 'j'
 			SetLetterBits(tr,LETTERGP_C,hy_consonants);
+			SetLetterBits(tr,LETTERGP_C,hy_consonants2);   // add 'j'
 			tr->langopts.max_initial_consonants = 6;
 			tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_OMIT_1_HUNDRED;
 		//	tr->langopts.param[LOPT_UNPRONOUNCABLE] = 1;   // disable check for unpronouncable words
diff --git a/src/translate.cpp b/src/translate.cpp
index e6f07949..973592e7 100644
--- a/src/translate.cpp
+++ b/src/translate.cpp
@@ -2559,6 +2559,7 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t
 	int dict_flags = 0;        // returned from dictionary lookup
 	int word_flags;        // set here
 	int next_word_flags;
+	int new_sentence2;
 	int embedded_count = 0;
 	int letter_count = 0;
 	int space_inserted = 0;
@@ -2639,16 +2640,19 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t
 		if(clause_pause < 0)
 			clause_pause = 0;
 
-		terminator &= ~CLAUSE_BIT_SENTENCE;  // clear sentence bit
+		if(new_sentence)
+			terminator |= CLAUSE_BIT_SENTENCE;  // carry forward an end-of-sentence indicator
 		max_clause_pause += clause_pause;
+		new_sentence2 = 0;
 	}
 	else
 	{
 		max_clause_pause = clause_pause;
+		new_sentence2 = new_sentence;
 	}
 	tr->clause_terminator = terminator;
 
-	if(new_sentence)
+	if(new_sentence2)
 	{
 		count_sentences++;
 		if(skip_sentences > 0)
@@ -3459,7 +3463,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
 		clause_pause = 10;
 	}
 
-	MakePhonemeList(tr, clause_pause, new_sentence);
+	MakePhonemeList(tr, clause_pause, new_sentence2);
 	phoneme_list[N_PHONEME_LIST].ph = NULL;   // recognize end of phoneme_list array, in Generate()
 	phoneme_list[N_PHONEME_LIST].sourceix = 1;
 
diff --git a/src/voices.cpp b/src/voices.cpp
index 566fc7ef..4e8470a1 100644
--- a/src/voices.cpp
+++ b/src/voices.cpp
@@ -177,7 +177,7 @@ static MNEM_TAB keyword_tab[] = {
 
 #define N_VOICE_VARIANTS   12
 const char variants_either[N_VOICE_VARIANTS] = {1,2,12,3,13,4,14,5,11,0};
-const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,0};
+const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,6,7,0};
 const char variants_female[N_VOICE_VARIANTS] = {11,12,13,14,0};
 const char *variant_lists[3] = {variants_either, variants_male, variants_female};
 
@@ -300,7 +300,7 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, const char*lea
 	espeak_VOICE *voice_data;
 	int priority;
 	int age;
-	int n_variants = 3;    // default, number of variants of this voice before using another voice
+	int n_variants = 4;    // default, number of variants of this voice before using another voice
 	int gender;
 
 #ifdef PLATFORM_WINDOWS
@@ -1067,6 +1067,7 @@ voice_t *LoadVoice(const char *vname, int control)
 		if((ix = SelectPhonemeTableName(phonemes_name)) < 0)
 		{
 			fprintf(stderr,"Unknown phoneme table: '%s'\n",phonemes_name);
+			ix = 0;
 		}
 		voice->phoneme_tab_ix = ix;
 		new_translator->phoneme_tab_ix = ix;