diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 459b2d99..99ea00a0 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -40,6 +40,17 @@ p r s S t T v w x z +Dictionary da_dict + +& 0 @ @- a A aI aU +e E i o O u V W +y Y + +: b d D f g h j +k l m n N p r R +s S; t tS; v w + + Dictionary de_dict 3 @ @- a A A: aI aU @@ -118,14 +129,14 @@ Dictionary fr_dict @ @- @2 a A a2 A~ e E E~ i i: o O o2 O2 -O~ u u: W W2 w^a w^i W~ +O~ u u: W W2 w^i wA W~ y Y : ; b c d dZ f g h j k l m n N n2 -n^ p p2 r r2 s S t -t2 t3 tS v w z Z z2 -z3 +n^ p p2 r R r2 s S +t t2 t3 tS v w z Z +z2 z3 Dictionary grc_dict @@ -222,6 +233,17 @@ l m n N p R s S t tS v w x z Z +Dictionary ko_dict + +a e E i ji o u u- +V + +b c C c` ch d dZ g +h j J k k` kh l m +n N p p` ph r s S; +s` t t` th w + + Dictionary ku_dict 8 a e E E# eI eU i @@ -335,6 +357,16 @@ t; ts ts; tS; v x z Z z; Z; +Dictionary rw_dict + +a e i o u + +* : b B c d dZ f +g h j J k l m n +N n^ p q R s S S; +t tS v w x z + + Dictionary sk_dict & @- a a: e e: i i: @@ -347,6 +379,17 @@ n^ p r R R^ R^/ s S t t; tS ts v x z Z +Dictionary sq_dict + +@ a e E i O u y +yE + +* ** b c d D dZ f +g h j J k l ll m +n n^ p r R s S t +T tS ts v w z Z + + Dictionary sv_dict 8 @ a a2 A: E E- e: diff --git a/dictsource/en_list b/dictsource/en_list index 39b98559..b4043bfa 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -577,6 +577,7 @@ awry a2raI axes aksIz backend bak'End +backstory baksto@rI ballad bal@d ballast bal@st ballet baleI @@ -921,6 +922,7 @@ eden i:d@n edict i:dIkt edit EdIt edition I2dIS@n +edwardian Edw'O@di@n efile i:faIl eh eI el ,El @@ -958,6 +960,7 @@ escort Esk'O@t $verb espionage EspI@nA:Z essential Is'EnS@L estoppel Est'0p@L +estrange $2 exit EgzIt // exiting exonerate Egz'0n@reIt eureka ju:'ri:ka2 @@ -1242,6 +1245,7 @@ laser leIz3 lasso las'u: lawyer lOI3 lava lA:v@ +layout leIaUt le l@ $only lead li:d leafy li:fI2 @@ -1729,6 +1733,7 @@ ridiculous $2 righteous raItS@s riposte rI2p0st risen rIz@n +robust roUb'Vst romance roUm'ans rotate $2 rouse raUz @@ -2368,6 +2373,7 @@ Derek dErIk Dinah daIn@ Dominic d0mInIk Donald d0n@Ld +Doris d0rIs Dougall du:g@L Dylan dIl@n Edith i:dIT diff --git a/dictsource/en_rules b/dictsource/en_rules index abc6588f..780e8d87 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -2113,6 +2113,7 @@ all) er (_ 3 mb) er (_ 3 lin) er (_S1 3 + lin) ers (_S2 3z er 3: _) er (A I2r _) er 3: @@ -3094,6 +3095,7 @@ am) it (e aIt un) it (e aIt _sp) it (e aIt + wr) it (e aIt _s) it (e aIt x) ite (_ aIt it (erat It diff --git a/dictsource/fr_list b/dictsource/fr_list index 43b95ba1..699843ff 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -24,7 +24,7 @@ // 2006-11-18 Gilles Casse // -// Updated 2008-08-29 Michel Such +// Updated 2008-09-13 Michel Such // // * Numbers, a few abbreviations and exceptions. // @@ -84,7 +84,7 @@ z zEd _lig ligat'yr _acu aksA~tEg'y _ac2 dublaksA~tEg'y -_brv br'Ev +_brv bR'Ev _ced sed'ij _cir aksA~sirkO~fl'Eks _dia trem'a @@ -140,7 +140,7 @@ _} f'Erm_akOl'ad _0 zero _1 W~ _2 dYz2 -_3 trw^az2 +_3 tRwAz2 _4 katr _5 sE~k _6 siz3 @@ -150,7 +150,7 @@ _9 nWf _10 diz3 _11 _!O~z _12 duz -_13 trEz +_13 tREz _14 katOrz _15 kE~z _16 sEz @@ -160,43 +160,43 @@ _19 diznWf _20 vE~ _21 vE~te:W~ _22 vE~tdYz2 -_23 vE~t:trw^az2 +_23 vE~t:trwAz2 _24 vE~tkatr _25 vE~tsE~k _26 vE~tsiz3 _27 vE~tsEt _28 vE~tw^it3 _29 vE~tnWf -_3X trA~t -_31 trA~te:W~ +_3X tRA~t +_31 tRA~te:W~ _4X karA~t _41 karA~te:W~ _5X sE~kA~t _51 sE~kA~te:W~ -_6X sw^asA~t -_61 sw^asA~te:W~ -_7X sw^asA~t:diz3 -_71 sw^asA~te:O~z -_72 sw^asA~t:duz -_73 sw^asA~t:trEz -_74 sw^asA~t:katOrz -_75 sw^asA~t:kE~z -_76 sw^asA~t:sEz -_77 sw^asA~t:dis:Et -_78 sw^asA~t:diz'w^it3 -_79 sw^asA~t:diznWf +_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^it3 +_79 swAsA~t:diznWf _8X katr@vE~ -_80 katr@vE~z2 -_9X katr@vE~diz3 -_91 katr@vE~:O~z -_92 katr@vE~:duz -_93 katr@vE~:trEz -_94 katr@vE~:katOrz -_95 katr@vE~:kE~z -_96 katr@vE~:sEz -_97 katr@vE~:dis:Et -_98 katr@vE~:dizw^it3 -_99 katr@vE~:diznWf +_80 katR@vE~z2 +_9X katR@vE~diz3 +_91 katR@vE~:O~z +_92 katR@vE~:duz +_93 katR@vE~:trEz +_94 katR@vE~:katOrz +_95 katR@vE~:kE~z +_96 katR@vE~:sEz +_97 katR@vE~:dis:Et +_98 katR@vE~:dizw^it3 +_99 katR@vE~:diznWf _0C sA~ _1C0 sA~t2 _0M1 mil @@ -210,7 +210,7 @@ _dpt virgyl ?2 _7X sEptA~t ?2 _71 sEptA~te:W~ ?2 _72 sEptA~t:dYz2 -?2 _73 sEptA~t:trw^az2 +?2 _73 sEptA~t:trwAz2 ?2 _74 sEptA~t:katr ?2 _75 sEptA~t:sE~k ?2 _76 sEptA~t:siz3 @@ -220,7 +220,7 @@ _dpt virgyl ?2 _9X no2nA~t ?2 _91 no2nA~te:W~ ?2 _92 no2nA~t:dYz2 -?2 _93 no2nA~t:trw^az2 +?2 _93 no2nA~t:trwAz2 ?2 _94 no2nA~t:katr ?2 _95 no2nA~t:sE~k ?2 _96 no2nA~t:siz3 @@ -229,11 +229,11 @@ _dpt virgyl ?2 _99 no2nA~t:nWf (21 ème) vE~te:yniEm -(31 ème) trA~te:yniEm +(31 ème) tRA~te:yniEm (41 ème) karA~te:yniEm (51 ème) sE~kA~te:yniEm -(61 ème) sw^asA~te:yniEm -(81 ème) katr@vE~:yniEm +(61 ème) swAsA~te:yniEm +(81 ème) katR@vE~:yniEm // ABBREVIATIONS //************** @@ -250,7 +250,7 @@ avh aveaS bd boulevard $text cci $abbrev cio $abbrev -ctrl kO~tro2l $pause +ctrl kO~tRo2l $pause dept depart@mA~ edf $abbrev etc etsetera @@ -262,14 +262,14 @@ ide $abbrev ip $abbrev jaws dZ'O2wz kde $abbrev -kg kilogram +kg kilogRam khz kiloErts km kilomEtr kw kilowat m. m@sjY -mbrola Em'brola +mbrola EmbRola mhz megaErts -mlle mad@mw^azEl +mlle mad@mwAzEl mme madam mr m@sjY nsi $abbrev @@ -279,7 +279,7 @@ nvda $abbrev ong $abbrev pci $abbrev pda $abbrev -p.s postskriptOm +p.s postskRiptOm ratp $abbrev scsi $abbrev s.t.p s'il:t'@:pl'E @@ -552,7 +552,7 @@ tunis tynis // MAIN WORD DICTIONARY //********************* -(1 er) pr@mi;'er2 +(1 er) pr@mjer2 (1 ers) pr@mi;'ez2 (1 ère) pr@mi;'Er (1 ères) pr@mi;'Erz2 @@ -574,11 +574,12 @@ bissus bisys bus bys bus by $verb campus kA~pys +(chef d'oeuvre) chédeuvre $text choeur kWr cocus coky -dernier dErnier2 +dernier dErnjer2 éloquent ElokA~t2 -fier fier2 $verb +fier fier $verb fuel fjul gars ga gym Zim @@ -590,7 +591,7 @@ mars mars parangon parA~gO~ phallus falys polder pOldEr -premier pr@mier2 +premier pr@mjer2 scanner skaner2 scanner skanWr $noun souris suri @@ -731,7 +732,7 @@ constations kO~statjO~z2 contentions kO~tA~tjO~z2 dations datjO~z2 désertions dezErtjO~z2 $verb -exploitions Eksplw^atjO~z2 +exploitions EksplwAtjO~z2 heurtions hWrtjO~z2 partions partjO~z2 rations ratjO~z2 $verb diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 57133f08..413f481d 100755 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -23,7 +23,7 @@ // 2006-11-18 Gilles Casse // -// Updated: 2008-09-02 Michel Such +// Updated: 2008-09-13 Michel Such // // Letter classes: @@ -820,7 +820,7 @@ _) half _^_en o (Cos_ o2 C) o (d_ O2 - oe (ll w^a // moelleux + oe (ll wA // moelleux oe (i W2 // oeil _) oe (C Y // oesophage _ph) oe (C e // phoetus @@ -834,10 +834,10 @@ _) half _^_en _) oi (gnon o // oignons oin (C wE~ oin (_ wE~ // coin - _) oi w^a // oiseau - oi w^a // poil - oê (l w^a // poêle - oî w^a // boîte + _) oi wA // oiseau + oi wA // poil + oê (l wA // poêle + oî wA // boîte om (C O~ // bombe om (m O // nommer _) om (n O2m // omnibus @@ -870,9 +870,9 @@ _) half _^_en ou u // hibou brouillard où u // où oû u // coûter - oyes (_ w^a // troyes - oy (A w^aj // noyer voyelles - oy w^a // roy + oyes (_ wA // troyes + oy (A wAj // noyer voyelles + oy wA // roy o (_ o // zorro allégro o (z_ o // berlioz o O @@ -960,7 +960,9 @@ C) oing (_ _^_en // going .group r +C) r R _su) rr rr // surréaliste + cou) rr rr // courrai cou) rr (i r // courrier mou) rr rr // mourrai diff --git a/dictsource/zh_rules b/dictsource/zh_rules index 8c6153b3..c3b98f9b 100644 --- a/dictsource/zh_rules +++ b/dictsource/zh_rules @@ -8,19 +8,23 @@ ˋ 4 ā a1 á a2 +ă a3 ǎ a3 à a4 ō o1 ó o2 +ŏ o3 ǒ o3 ò o4 ê ea ē e1 é e2 +ĕ e3 ě e3 è e4 ī i1 í i2 +ĭ i3 ǐ i3 ì i4 ū u1 @@ -29,6 +33,7 @@ ù u4 ǖ ü1 ǘ ü2 +ŭ u3 ǚ ü3 ǜ ü4 //some pinyin vaiants diff --git a/phsource/compile_report b/phsource/compile_report index 25aa027d..2797a784 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -1,4 +1,4 @@ -47 phoneme tables +51 phoneme tables new total base 98 98 base2 24 117 @@ -15,7 +15,7 @@ eo 13 110 jbo 4 111 fi 40 129 - fr 53 134 + fr 54 134 fr_ca 11 134 hi 51 135 ta 17 138 @@ -47,6 +47,10 @@ tr 18 122 ku 18 122 id 15 119 + rw 15 124 + ko 18 145 + da 15 128 + sq 12 122 Data file Used by b/b [b] base @@ -173,6 +177,7 @@ dzh/dz_pzd [J] base [J2] hi [J] tr [J] ku + [J] sq dzh/dz_pzd_ [J] base [J2] hi dzh/xdzh [dZ] base @@ -186,6 +191,7 @@ dzh/xdzh [dZ] base dzh/xdz_pzd [J] base [J2] hi envelope/i_risefall [11] zh +envelope/i_risefall2 [+2] rw envelope/p_214 [214] zh envelope/p_512 [8] vi envelope/p_fall [2] vi @@ -197,6 +203,7 @@ envelope/p_fall [2] vi [22] zh [33] zh [53] zh + [+] rw envelope/p_fallrise [4] vi envelope/p_level [1] vi [3] zhy @@ -354,6 +361,7 @@ l/L2_uL [(u)] base [u:] en_n [u:] en_rp l/l_3 [l/] de +l/l_4 [ll] sq l/la [(a)] base [a] fr [a2] fr @@ -377,8 +385,9 @@ l/lo [(o)] base [o] fr [O2] fr [o2] fr - [w^a] fr + [wA] fr l^/l_rfx [l.] hi + [l.] sq l/lu [(u)] base [u] fr [y] fr @@ -410,7 +419,7 @@ l/xl [(@)] base [e] fr [@2] fr [W2] fr - [w^a] fr + [wA] fr [w^i] fr m/_m [m] base [m;] ru @@ -436,11 +445,13 @@ n^/n^#_ [n^#] is n/_n [n] base [n;] ro [n] zh + [n] da n/n_ [n] base [n2] fr [n;] ro n/n@ [(@)] base n/n#_ [n#] is + [n] da n^/n^a [(a)] base n/na [(a)] base n^/n^e [(e)] base @@ -453,6 +464,7 @@ n/nj [n] base [n.] base [n^] base [n;] ro + [n] da n/n_long_ [n] zh nn/_nn [N] base [N] en @@ -486,10 +498,10 @@ r3/r_ [r/] base [r/] af [r/] ru r3/r_@ [(@)] base + [@2] fr r3/r#_ [r#] is r3/r_2 [r/] fr r3/r_a [(a)] base - [a2] fr r3/r_e [(e)] base r3/r_i [(i)] base [i] fr @@ -523,8 +535,10 @@ r3/r_u [(u)] base r3/rx [*] base [r/] base [r/] af + [R] fr [r] fr [r/] fr + [r2] fr [R] fr_ca [r/] ru [x] pt_pt @@ -533,7 +547,10 @@ r3/rx [*] base r3/rz_cs [R^] sk [R^/] sk r3/@tap [**] base + [r] ko r3/@tap2 [**] base + [r] ko +r/a_ [r] da r/r [r] base [r-] base [r] en_sc @@ -567,6 +584,7 @@ r/rr [r/] base r/ru [(u)] base r/tr [r] base [r] en_sc + [R] fr r/trr [r/] base [r/] af [r] de @@ -588,14 +606,16 @@ r/xr [(@)] base [W] fr [Y] fr [a] fr + [e] fr + [i] fr [u] fr [y] fr [W2] fr [a2] fr [i:] fr [u:] fr + [wA] fr [A~] fr - [w^a] fr [w^i] fr ufric/ch [C] base [J^] base @@ -618,6 +638,7 @@ ufric/s [s] base [z2] fr [s] es [s#] pt + [s`] ko ufric/s_ [s] base [z] base [s2] fi @@ -651,6 +672,7 @@ ufric/sh3 [S] hr ufric/sh_pzd [S;] base [Z;] base [S;] ro + [s`] ko ufric/sh_pzd_ [S;] base [Z;] base ufric/sh_pzd2 [S] sr @@ -696,6 +718,7 @@ ustop/k_ [k] base [k] el [kh] zh [k] sw + [k] sq ustop/ki [c] base [k] base [k] base2 @@ -713,6 +736,8 @@ ustop/ki [c] base [c] tr [J] ku [c] ku + [J] sq + [c] sq ustop/kl [k] base [k] base2 [k] en @@ -743,6 +768,8 @@ ustop/k_unasp [k] base [k] sk [k] el [k] zhy + [k`] ko + [k] sq ustop/k_unasp_ [k] zh ustop/null [?] base ustop/p [p] base @@ -766,6 +793,7 @@ ustop/pl [p] base [p] sk [p] la [p;] ro + [p] sq ustop/pr [p] base [p] base2 [p] fi @@ -785,6 +813,8 @@ ustop/p_unasp [p] base [p] la [p;] ro [p] zh + [p`] ko + [p] sq ustop/p_unasp_ [p] base2 [p] fi [p] hi @@ -792,6 +822,7 @@ ustop/p_unasp_ [p] base2 [p] sk [p] la [p;] ro + [p] sq ustop/q [q] base ustop/q_u [q] base ustop/t [t] base @@ -808,6 +839,7 @@ ustop/t_ [t] base [t] sk [t] el [th] zh + [t] sq ustop/t_dnt [t] base [t[] base [t] base2 @@ -821,6 +853,7 @@ ustop/t_dnt [t] base [t;] ro [t[] vi [t] sw + [t`] ko ustop/t_dnt2 [t[] vi ustop/t_hi [t] hi [th] hi @@ -829,6 +862,7 @@ ustop/t_pzd [t;] pl ustop/tr [t] base [t[] base [t2] en + [t] fr [t.h] hi [t] ru ustop/ts [ts] base2 @@ -852,6 +886,7 @@ ustop/t_short [t] fr [t.] hi [t] sk [t] el + [t] sq ustop/tsh_pzd [tS;] zh ustop/tsh_pzd_unasp [tS;] zh ustop/tsh_sr [tS] sr @@ -863,6 +898,7 @@ ustop/ts_pzd_ [c] hi [c] hu ustop/ts_pzd2 [c] hi [c] hu + [c`] ko ustop/ts_pzd3 [tS;] hr [dZ;] hr ustop/t_sr [d] sr @@ -922,8 +958,10 @@ vdiph2/uw [u:] en_us vdiph2/uw_2 [u:] en vdiph2/uw_3 [yU] ro vdiph2/uw_4 [u:] en_n +vdiph2/uw_6 [y] ko vdiph2/y@ [y@] zh vdiph2/y#@ [Y@] af +vdiph2/yE [yE] sq vdiph2/yu [yU] nl [yu] zh vdiph2/y-y# [yY] fi @@ -1086,6 +1124,7 @@ vdiph/yi [yi] fi vdiph/y#i [Yi] fi vdiph/y#i_2 [Yy] is vdiph/yi_fr [w^i] fr + [ji] ko vdiph/y#y [Yy] fi vdiph/y#y_2 [Yy] af [eoi] zhy @@ -1208,6 +1247,7 @@ vowel/@ [@] base [@] en_rp [V] cy [@4] hi + [@] sq vowel/@- [@-] base [r*] hr vowel/& [a] en_rp @@ -1262,12 +1302,15 @@ vowel/a [a] en_n [a] it [a] zh [a] id + [a] ko vowel/a# [a/] base2 [a2] en_sc [a2] en_wi [&] sr [&] pt [&/] pt + [a#] rw + [a/] rw vowel/a_2 [a] base2 [a] en_wi [A:] en_wi @@ -1278,6 +1321,8 @@ vowel/a_2 [a] base2 [a] pt_pt [a] ro [a:] vi + [a] rw + [a] da vowel/a#_2 [a#] pl [&] hr [a2] sv @@ -1291,6 +1336,7 @@ vowel/a_3 [a] en_sc [a:] la [a] is [A] zh + [A] da vowel/a#_3 [a2] en [a2] en_n [a2] en_us @@ -1338,6 +1384,7 @@ vowel/aa_6 [A] de vowel/aa_7 [A] nl vowel/aa_8 [0] en_us [A:] en_us + [V] ko vowel/a_en [a] en [aa] en [A] fr @@ -1365,6 +1412,10 @@ vowel/e [e] base2 [e] grc [e] vi [e] id + [e] rw + [e#] rw + [e] ko + [e] da vowel/e# [I] en_sc [I2] en_sc vowel/e_2 [eI] en_sc @@ -1395,6 +1446,7 @@ vowel/ee_2 [E] en [E2] nl [E] zh [E#] ku + [&] da vowel/ee#_2 [E-] sv vowel/ee_3 [&] af [&:] af @@ -1407,6 +1459,7 @@ vowel/ee_6 [E] en_n vowel/e_mid [E] en_rp [e] jbo [E] fr + [e] fr [E2] fr [E] fr_ca [E] hi @@ -1423,6 +1476,8 @@ vowel/e_mid [E] en_rp [E] tr [E] id [E2] id + [E] da + [E] sq vowel/e_mid2 [E] af [E] de [E2] de @@ -1435,6 +1490,7 @@ vowel/e_mid2 [E] af [e] el [e] sw [e] tr + [E] ko vowel/@_fnt [@] en_wi [@2] en_wi [@2] hr @@ -1458,6 +1514,9 @@ vowel/i [i] base2 [i] zhy [i] zh [i] sw + [i] rw + [i#] rw + [i] ko vowel/i# [i] en_rp [y:] cy vowel/i_2 [i:] en_rp @@ -1474,6 +1533,7 @@ vowel/i_4 [i] fi [i] hu [I] it [i] is + [i] da vowel/i_5 [i:] en_sc vowel/i#_5 [y] pt_pt [i/] pt_pt @@ -1560,12 +1620,16 @@ vowel/o [o] base2 [o] grc [o:] sv [o] id + [o] rw + [o#] rw vowel/o_2 [o:] cy [o2] fr [o:] hi [o:] hu [o:] la [o:] no + [o] ko + [o] da vowel/o-_2 [V] en_n [V] en_wm vowel/o_3 [oU] en_sc @@ -1574,11 +1638,13 @@ vowel/o-_3 [U] en_rp vowel/o_4 [oU] en_n vowel/o-_4 [o] ro vowel/o_5 [O] nl + [O] da vowel/o_6 [O:] nl vowel/o_7 [o] ku vowel/oe [W] en [W] af [W] de + [W] da vowel/oe_2 [W] no [W] tr vowel/oe_4 [W] sv @@ -1615,6 +1681,7 @@ vowel/oo_1 [O:] en_n vowel/oo_2 [0] en_sc [O] cy [o] cs + [0] da vowel/oo_3 [O] af vowel/oo_4 [O] base2 [0] en_wm @@ -1693,6 +1760,9 @@ vowel/u_bck [u] base2 [u] is [u] zhy [u] zh + [u] rw + [u#] rw + [u] ko vowel/u_bck2 [u:] la vowel/u_fnt [u:] en_rp vowel/uu [U] en @@ -1713,6 +1783,7 @@ vowel/uu_bck [U] en_n [U] pt [U] no [u] zhy +vowel/u_unr [u-] ko vowel/V [3] en_sc vowel/V_2 [V] en [a] af @@ -1724,6 +1795,7 @@ vowel/V_3 [V] en_rp [V] ta vowel/V_4 [V] en_sc [@:] vi + [V] da vowel/V_6 [V] en_us vowel/y [y:] en [y:] de @@ -1732,6 +1804,7 @@ vowel/y [y:] en [y] nl [y] la [yu] zhy + [y] sq vowel/y# [Y:] en [3:] en_wm [Y:] de @@ -1742,6 +1815,7 @@ vowel/y# [Y:] en [Y] ro [y] vi [oe] zhy + [Y] ko vowel/y## [y#] is vowel/y_2 [y] fr [y"] fr @@ -1757,6 +1831,7 @@ vowel/y_5 [y:] sv [y] ku vowel/yy [y"] fr_ca [y] no + [Y] da vowel/yy_3 [y] sv vowel/yy_4 [y] de [y] hu @@ -1817,9 +1892,12 @@ vwl_en_us/or [O:] en_us vwl_en_us/ur [U@] en_us vwl_fr/@R [x] pt_pt vwl_fr/@R2 [R] fr_ca -vwl_fr/@R3 [r] fr +vwl_fr/@R3 [R] fr + [r] fr [r2] fr -vwl_fr/w_a [w^a] fr +vwl_fr/@R4 [r] fr + [r2] fr +vwl_fr/w_a [wA] fr vwl_hi/A [a:] hi vwl_hi/l-voc [l-] jbo [l-] hi diff --git a/phsource/mbrola/fr1 b/phsource/mbrola/fr1 index b631c892..0f48f170 100644 --- a/phsource/mbrola/fr1 +++ b/phsource/mbrola/fr1 @@ -21,8 +21,8 @@ volume 15 0 E~ NULL 0 e~ 0 O~ NULL 0 o~ 0 W~ NULL 0 9~ -0 w^i NULL 0 H -0 w^a NULL 50 w a +0 w^i NULL 50 H i +0 wA NULL 50 w a 0 r NULL 0 R 0 n^ NULL 75 n j 0 c NULL 0 k @@ -34,7 +34,7 @@ volume 15 0 h NULL 0 NULL 0 n2 NULL 0 n 0 p2 NULL 0 p -0 r2 NULL 0 r +0 r2 NULL 0 R 0 t2 NULL 0 t 0 t3 NULL 0 t 0 z2 NULL 0 z @@ -80,3 +80,4 @@ volume 15 + diff --git a/phsource/ph_french b/phsource/ph_french index 12bcbfc8..cc6ba7cb 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -21,6 +21,7 @@ phoneme @2 length 150 formants vowel/@_fr before l/ DFT-30+l/xl+20 + before R DFT-20+r3/r_@ endphoneme @@ -30,7 +31,7 @@ phoneme a formants vowel/a_5 after l l/la-15 before l/ DFT-20+l/xl - before r/ DFT+r/xr-40 + before r/ DFT-30+r/xr reduceto a2 1 endphoneme @@ -40,7 +41,7 @@ phoneme a2 length 150 formants vowel/a_5 after l l/la-15 - before (r) DFT-20+r3/r_a + before (r) DFT-20+r/xr before r/ DFT-20+r/xr endphoneme @@ -51,6 +52,8 @@ phoneme e formants vowel/e after l l/le-15 before l/ DFT-20+l/xl + before (r) DFT+r/xr + before r2 vowel/e_mid-40+r/xr endphoneme @@ -80,7 +83,7 @@ phoneme i linkout ; after l l/li-15 before l/ DFT-20+l/L1_iL-80 - before (r) DFT-20+r3/r_i + before (r) DFT+r/xr before r/ DFT+r3/r_i endphoneme @@ -119,7 +122,7 @@ phoneme O formants vowel/o_mid after l l/lo-10 before l/ DFT-10+l/xl - before r/ DFT-25+r/xr-20 + before r/ DFT-30+r3/r_o reduceto o 1 endphoneme @@ -129,6 +132,7 @@ phoneme O2 // Like O but no reduceto length 170 formants vowel/o_mid after l l/lo-10 + before r/ DFT-20+r3/r_o endphoneme @@ -138,7 +142,8 @@ phoneme u formants vowel/u_3 after l l/lu-20 before l/ DFT-20+l/L1_uL-80 - before r/ DFT+r/xr-40 + before (r) DFT+r/xr + before r/ DFT-20+r/xr endphoneme @@ -178,7 +183,7 @@ phoneme W formants vowel/@_5 after l l/l@-20 before l/ DFT-40+l/xl+15 - before r/ DFT-20+r/xr-30 + before r/ DFT-20+r/xr reduceto Y 1 endphoneme @@ -189,17 +194,17 @@ phoneme W2 // same as W but don't reduce formants vowel/@_3 after l l/l@-20 before l/ DFT-40+l/xl+15 - before r/ DFT+r/xr-40 + before r/ DFT-20+r3/r_@ endphoneme -phoneme w^a +phoneme wA vowel starttype (o) endtype (a) length 240 formants vwl_fr/w_a after l l/lo-10 before l/ DFT-10+l/xl - before r/ DFT-25+r/xr-15 + before r/ DFT-30+r/xr endphoneme @@ -331,7 +336,7 @@ phoneme k lengthmod 2 wave ustop/k%40 // reduce strength of noise burst before _ ustop/k_ - before (r) ustop/kr%30 + before R ustop/kr%45 before r/ ustop/kr%45 before l ustop/kl%45 before l/ ustop/kl%45 @@ -383,7 +388,7 @@ phoneme p wave ustop/p%50 after _ ustop/p%70 before _ ustop/p_%70 - before (r) ustop/pr%40 + before R ustop/pr%70 before @- ustop/p_unasp%60 before l ustop/pl%30 switchvoicing b @@ -402,31 +407,46 @@ endphoneme phoneme r - liquid pla starttype (r) endtype (r) - vowelin f1=0 f2=1500 -400 400 f3=-600 80 + liquid pal starttype (r) endtype (r) + vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40 vowelout f1=0 f2=1500 -400 400 f3=-600 80 length 100 lengthmod 7 beforenotvowel r/ - formants vwl_fr/@R3+r3/rx%20 - after k vwl_fr/@R3-60 - after p vwl_fr/@R3-60 - after t vwl_fr/@R3-60+r3/rx%30 + formants vwl_fr/@R3+r3/rx%30 + after (e) vwl_fr/@R4+r3/rx%15 + after (u) vwl_fr/@R4+r3/rx%15 + after wA vwl_fr/@R4+r3/rx%20 endphoneme phoneme r2 // silent unless followed by vowel - liquid pla starttype (r) endtype (r) + liquid pal starttype (r) endtype (r) + vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40 + vowelout f1=0 f2=1500 -400 400 f3=-600 80 length 100 lengthmod 7 beforenotvowel NULL - formants vwl_fr/@R3 + formants vwl_fr/@R4+r3/rx%15 after k vwl_fr/@R3-60 after p vwl_fr/@R3-60 after t vwl_fr/@R3-40 before _ r/r endphoneme + +phoneme R // for beginning of words + vcd pal frc + vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40 + length 100 + lengthmod 7 + beforenotvowel r/ + formants vwl_fr/@R3+r3/rx%40 + after k r/tr + after p r/tr + after t r/tr +endphoneme + phoneme r/ // variant of [r] when not preceding a vowel vcd pal frc vowelout f1=0 f2=800 -50 50 f3=-600 80 len=40 @@ -476,7 +496,7 @@ phoneme t lengthmod 2 wave ustop/t_short%50 before _ ustop/t_%40 - before (r) ustop/t_short%40 + before R ustop/tr%30 before r/ ustop/t_short%50 switchvoicing d endphoneme diff --git a/phsource/phonemes b/phsource/phonemes index b1adafe3..8019792e 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -1276,3 +1276,16 @@ include ph_kurdish phonemetable id base2 include ph_indonesian + + +phonemetable rw base2 +include ph_kinyarwanda + +phonemetable ko hi +include ph_korean + +phonemetable da is +include ph_danish + +phonemetable sq es +include ph_albanian diff --git a/phsource/vwl_fr/@R3 b/phsource/vwl_fr/@R3 index bb9e8526..2e067ec8 100755 Binary files a/phsource/vwl_fr/@R3 and b/phsource/vwl_fr/@R3 differ