diff --git a/dictsource/bo_rules b/dictsource/bo_rules index 121dce55..5a0efa1a 100644 --- a/dictsource/bo_rules +++ b/dictsource/bo_rules @@ -225,19 +225,19 @@ // Give the utf8 codes in octal, because these characters don't // display correctly without a letter to attach to. .group 0xe0bd - \340\275\261 a: - \340\275\262 i - \340\275\263 i: - \340\275\264 u - \340\275\265 u: - \340\275\266 r- - \340\275\267 r-: - \340\275\270 l- - \340\275\271 l-: - \340\275\272 e - \340\275\273 e: - \340\275\274 o - \340\275\275 o: + 0xe0bdb1 a: + 0xe0bdb2 i + 0xe0bdb3 i: + 0xe0bdb4 u + 0xe0bdb5 u: + 0xe0bdb6 r- + 0xe0bdb7 r-: + 0xe0bdb8 l- + 0xe0bdb9 l-: + 0xe0bdba e + 0xe0bdbb e: + 0xe0bdbc o + 0xe0bdbd o: // subjoined letters .group 0xe0be // characters which start with UTF-8 bytes: [e0 be] diff --git a/dictsource/dict_log b/dictsource/dict_log index 0aecca8e..fe78c608 100644 --- a/dictsource/dict_log +++ b/dictsource/dict_log @@ -1,388 +1,6 @@ -Using phonemetable: 'af' -Compiling: '/home/jsd1/speechdata/dictsource/af_list' - 1443 entries -Compiling: '/home/jsd1/speechdata/dictsource/af_rules' - 5141 rules, 60 groups (0) - -Using phonemetable: 'ca' -Compiling: '/home/jsd1/speechdata/dictsource/ca_list' - 192 entries -Compiling: '/home/jsd1/speechdata/dictsource/ca_rules' - 134 rules, 28 groups (0) - -Using phonemetable: 'cs' -Compiling: '/home/jsd1/speechdata/dictsource/cs_list' - 357 entries -Compiling: '/home/jsd1/speechdata/dictsource/cs_rules' - 506 rules, 48 groups (0) - -Using phonemetable: 'cy' -Compiling: '/home/jsd1/speechdata/dictsource/cy_list' - 166 entries -Compiling: '/home/jsd1/speechdata/dictsource/cy_rules' - 208 rules, 27 groups (0) - -Using phonemetable: 'da' -Compiling: '/home/jsd1/speechdata/dictsource/da_list' - 11090 entries -Compiling: '/home/jsd1/speechdata/dictsource/da_rules' - 7410 rules, 56 groups (0) - Using phonemetable: 'hu' Compiling: '/home/jsd1/speechdata/dictsource/hu_list' - 4825 entries + 4869 entries Compiling: '/home/jsd1/speechdata/dictsource/hu_rules' - 1697 rules, 45 groups (0) - -Using phonemetable: 'de' -Compiling: '/home/jsd1/speechdata/dictsource/de_list' - 634 entries -Compiling: '/home/jsd1/speechdata/dictsource/de_rules' - 1231 rules, 34 groups (0) - -Using phonemetable: 'el' -Compiling: '/home/jsd1/speechdata/dictsource/el_list' - 242 entries -Compiling: '/home/jsd1/speechdata/dictsource/el_rules' - 173 rules, 27 groups (26) - -Using phonemetable: 'en' -Compiling: '/home/jsd1/speechdata/dictsource/en_list' - 3346 entries -Compiling: '/home/jsd1/speechdata/dictsource/en_rules' - 5488 rules, 97 groups (0) - -Using phonemetable: 'eo' -Compiling: '/home/jsd1/speechdata/dictsource/eo_list' - 242 entries -Compiling: '/home/jsd1/speechdata/dictsource/eo_rules' - 129 rules, 27 groups (0) - -Using phonemetable: 'es' -Compiling: '/home/jsd1/speechdata/dictsource/es_list' - 385 entries -Compiling: '/home/jsd1/speechdata/dictsource/es_rules' - 172 rules, 27 groups (0) - -Using phonemetable: 'fi' -Compiling: '/home/jsd1/speechdata/dictsource/fi_list' - 316 entries -Compiling: '/home/jsd1/speechdata/dictsource/fi_rules' - 129 rules, 29 groups (0) - -Using phonemetable: 'fr' -Compiling: '/home/jsd1/speechdata/dictsource/fr_list' - 864 entries -Compiling: '/home/jsd1/speechdata/dictsource/fr_rules' - 1183 rules, 33 groups (0) - -Using phonemetable: 'grc' -Compiling: '/home/jsd1/speechdata/dictsource/grc_list' - 22 entries -Compiling: '/home/jsd1/speechdata/dictsource/grc_rules' - 134 rules, 54 groups (27) - -Using phonemetable: 'hr' -Compiling: '/home/jsd1/speechdata/dictsource/hbs_list' - 569 entries -Compiling: '/home/jsd1/speechdata/dictsource/hbs_rules' - 102 rules, 34 groups (0) - -Using phonemetable: 'hi' -Compiling: '/home/jsd1/speechdata/dictsource/hi_list' - 249 entries -Compiling: '/home/jsd1/speechdata/dictsource/hi_rules' - 216 rules, 88 groups (86) - -Using phonemetable: 'ta' -Compiling: '/home/jsd1/speechdata/dictsource/ta_list' - 488 entries -Compiling: '/home/jsd1/speechdata/dictsource/ta_rules' - 3048 rules, 31 groups (26) - -Using phonemetable: 'hy' -Compiling: '/home/jsd1/speechdata/dictsource/hy_list' - 70 entries -Compiling: '/home/jsd1/speechdata/dictsource/hy_rules' - 93 rules, 39 groups (38) - -Using phonemetable: 'id' -Compiling: '/home/jsd1/speechdata/dictsource/id_list' - 132 entries -Compiling: '/home/jsd1/speechdata/dictsource/id_rules' - 77 rules, 27 groups (0) - -Using phonemetable: 'is' -Compiling: '/home/jsd1/speechdata/dictsource/is_list' - 327 entries -Compiling: '/home/jsd1/speechdata/dictsource/is_rules' - 205 rules, 37 groups (0) - -Using phonemetable: 'it' -Compiling: '/home/jsd1/speechdata/dictsource/it_listx' - 4161 entries -Compiling: '/home/jsd1/speechdata/dictsource/it_list' - 412 entries -Compiling: '/home/jsd1/speechdata/dictsource/it_rules' - 309 rules, 28 groups (0) - -Using phonemetable: 'jbo' -Compiling: '/home/jsd1/speechdata/dictsource/jbo_list' - 68 entries -Compiling: '/home/jsd1/speechdata/dictsource/jbo_rules' - 63 rules, 27 groups (0) - -Using phonemetable: 'ku' -Compiling: '/home/jsd1/speechdata/dictsource/ku_list' - 106 entries -Compiling: '/home/jsd1/speechdata/dictsource/ku_rules' - 46 rules, 32 groups (0) - -Using phonemetable: 'la' -Compiling: '/home/jsd1/speechdata/dictsource/la_list' - 215 entries -Compiling: '/home/jsd1/speechdata/dictsource/la_rules' - 113 rules, 31 groups (0) - -Using phonemetable: 'lv' -Compiling: '/home/jsd1/speechdata/dictsource/lv_list' - 339 entries -Compiling: '/home/jsd1/speechdata/dictsource/lv_rules' - 1035 rules, 40 groups (0) - -Using phonemetable: 'mk' -Compiling: '/home/jsd1/speechdata/dictsource/mk_list' - 188 entries -Compiling: '/home/jsd1/speechdata/dictsource/mk_rules' - 150 rules, 65 groups (0) - -Using phonemetable: 'nci' -Compiling: '/home/jsd1/speechdata/dictsource/nci_list' - 16 entries -Compiling: '/home/jsd1/speechdata/dictsource/nci_rules' - 41 rules, 21 groups (0) - -Using phonemetable: 'nl' -Compiling: '/home/jsd1/speechdata/dictsource/nl_list' - 1471 entries -Compiling: '/home/jsd1/speechdata/dictsource/nl_rules' - 635 rules, 33 groups (0) - -Using phonemetable: 'no' -Compiling: '/home/jsd1/speechdata/dictsource/no_list' - 236 entries -Compiling: '/home/jsd1/speechdata/dictsource/no_rules' - 142 rules, 32 groups (0) - -Using phonemetable: 'base2' -Compiling: '/home/jsd1/speechdata/dictsource/pap_list' - 86 entries -Compiling: '/home/jsd1/speechdata/dictsource/pap_rules' - 68 rules, 32 groups (0) - -Using phonemetable: 'pl' -Compiling: '/home/jsd1/speechdata/dictsource/pl_list' - 2957 entries -Compiling: '/home/jsd1/speechdata/dictsource/pl_rules' - 942 rules, 55 groups (0) - -Using phonemetable: 'pt' -Compiling: '/home/jsd1/speechdata/dictsource/pt_list' - 719 entries -Compiling: '/home/jsd1/speechdata/dictsource/pt_rules' - 687 rules, 38 groups (0) - -Using phonemetable: 'ro' -Compiling: '/home/jsd1/speechdata/dictsource/ro_list' - 2167 entries -Compiling: '/home/jsd1/speechdata/dictsource/ro_rules' - 348 rules, 32 groups (0) - -Using phonemetable: 'ru' -Compiling: '/home/jsd1/speechdata/dictsource/ru_list' - 156 entries -Compiling: '/home/jsd1/speechdata/dictsource/ru_rules' - 520 rules, 34 groups (33) - -Using phonemetable: 'sk' -Compiling: '/home/jsd1/speechdata/dictsource/sk_list' - 321 entries -Compiling: '/home/jsd1/speechdata/dictsource/sk_rules' - 535 rules, 46 groups (0) - -Using phonemetable: 'sq' -Compiling: '/home/jsd1/speechdata/dictsource/sq_list' - 132 entries -Compiling: '/home/jsd1/speechdata/dictsource/sq_rules' - 100 rules, 29 groups (0) - -Using phonemetable: 'sv' -Compiling: '/home/jsd1/speechdata/dictsource/sv_list' - 341 entries -Compiling: '/home/jsd1/speechdata/dictsource/sv_rules' - 697 rules, 30 groups (0) - -Using phonemetable: 'sw' -Compiling: '/home/jsd1/speechdata/dictsource/sw_list' - 167 entries -Compiling: '/home/jsd1/speechdata/dictsource/sw_rules' - 66 rules, 27 groups (0) - -Using phonemetable: 'sl' -Compiling: '/home/jsd1/speechdata/dictsource/sl_list' - 105 entries -Compiling: '/home/jsd1/speechdata/dictsource/sl_rules' - 79 rules, 30 groups (0) - -Using phonemetable: 'tr' -Compiling: '/home/jsd1/speechdata/dictsource/tr_list' - 252 entries -Compiling: '/home/jsd1/speechdata/dictsource/tr_rules' - 200 rules, 33 groups (0) - -Using phonemetable: 'vi' -Compiling: '/home/jsd1/speechdata/dictsource/vi_list' - 135 entries -Compiling: '/home/jsd1/speechdata/dictsource/vi_rules' - 404 rules, 97 groups (0) - -Using phonemetable: 'zh' -Compiling: '/home/jsd1/speechdata/dictsource/zh_list' - 3873 entries -Compiling: '/home/jsd1/speechdata/dictsource/zh_rules' - 181 rules, 28 groups (0) - -Using phonemetable: 'zhy' -Compiling: '/home/jsd1/speechdata/dictsource/zhy_rules' - 79 rules, 27 groups (0) - -Using phonemetable: 'am' -Compiling: '/home/jsd1/speechdata/dictsource/am_list' - 31 entries -Compiling: '/home/jsd1/speechdata/dictsource/am_rules' - 345 rules, 7 groups (0) - -Using phonemetable: 'ml' -Compiling: '/home/jsd1/speechdata/dictsource/ml_list' - 99 entries -Compiling: '/home/jsd1/speechdata/dictsource/ml_rules' - 123 rules, 47 groups (42) - -Using phonemetable: 'ne' -Compiling: '/home/jsd1/speechdata/dictsource/ne_list' - 155 entries -Compiling: '/home/jsd1/speechdata/dictsource/ne_rules' - 354 rules, 87 groups (86) - -Using phonemetable: 'pa' -Compiling: '/home/jsd1/speechdata/dictsource/pa_list' - 134 entries -Compiling: '/home/jsd1/speechdata/dictsource/pa_rules' - 270 rules, 67 groups (65) - -Using phonemetable: 'prs' -Compiling: '/home/jsd1/speechdata/dictsource/prs_list' - 53 entries -Compiling: '/home/jsd1/speechdata/dictsource/prs_rules' - 120 rules, 42 groups (36) - -Using phonemetable: 'rw' -Compiling: '/home/jsd1/speechdata/dictsource/rw_list' - 69 entries -Compiling: '/home/jsd1/speechdata/dictsource/rw_rules' - 47 rules, 27 groups (0) - -Using phonemetable: 'hi' -Compiling: '/home/jsd1/speechdata/dictsource/ur_list' - 148 entries -Compiling: '/home/jsd1/speechdata/dictsource/ur_rules' - 82 rules, 49 groups (35) - -Using phonemetable: 'bg' -Compiling: '/home/jsd1/speechdata/dictsource/bg_listx' - 2790 entries -Compiling: '/home/jsd1/speechdata/dictsource/bg_list' - 227 entries -Compiling: '/home/jsd1/speechdata/dictsource/bg_rules' - 118 rules, 31 groups (30) - -Using phonemetable: 'nso' -Compiling: '/home/jsd1/speechdata/dictsource/nso_list' - 166 entries -Compiling: '/home/jsd1/speechdata/dictsource/nso_rules' - 80 rules, 27 groups (0) - -Using phonemetable: 'ht' -Compiling: '/home/jsd1/speechdata/dictsource/ht_list' - 126 entries -Compiling: '/home/jsd1/speechdata/dictsource/ht_rules' - 41 rules, 30 groups (0) - -Using phonemetable: 'ak' -Compiling: '/home/jsd1/speechdata/dictsource/ak_rules' - 50 rules, 29 groups (0) - -Using phonemetable: 'az' -Compiling: '/home/jsd1/speechdata/dictsource/az_list' - 61 entries -Compiling: '/home/jsd1/speechdata/dictsource/az_rules' - 36 rules, 34 groups (0) - -Using phonemetable: 'wo' -Compiling: '/home/jsd1/speechdata/dictsource/wo_list' - 24 entries -Compiling: '/home/jsd1/speechdata/dictsource/wo_rules' - 60 rules, 32 groups (0) - -Using phonemetable: 'dv' -Compiling: '/home/jsd1/speechdata/dictsource/dv_list' - 155 entries -Compiling: '/home/jsd1/speechdata/dictsource/dv_rules' - 79 rules, 51 groups (50) - -Using phonemetable: 'kn' -Compiling: '/home/jsd1/speechdata/dictsource/kn_list' - 262 entries -Compiling: '/home/jsd1/speechdata/dictsource/kn_rules' - 111 rules, 55 groups (50) - -Using phonemetable: 'tn' -Compiling: '/home/jsd1/speechdata/dictsource/tn_list' - 110 entries -Compiling: '/home/jsd1/speechdata/dictsource/tn_rules' - 82 rules, 27 groups (0) - -Using phonemetable: 'te' -Compiling: '/home/jsd1/speechdata/dictsource/te_list' - 141 entries -Compiling: '/home/jsd1/speechdata/dictsource/te_rules' - 112 rules, 58 groups (53) - -Using phonemetable: 'ka' -Compiling: '/home/jsd1/speechdata/dictsource/ka_list' - 135 entries -Compiling: '/home/jsd1/speechdata/dictsource/ka_rules' - 54 rules, 48 groups (43) - -Using phonemetable: 'si' -Compiling: '/home/jsd1/speechdata/dictsource/si_list' - 53 entries -Compiling: '/home/jsd1/speechdata/dictsource/si_rules' - 125 rules, 66 groups (59) - -Using phonemetable: 'et' -Compiling: '/home/jsd1/speechdata/dictsource/et_list' - 303 entries -Compiling: '/home/jsd1/speechdata/dictsource/et_rules' - 220 rules, 31 groups (0) - -Using phonemetable: 'mt' -Compiling: '/home/jsd1/speechdata/dictsource/mt_list' - 232 entries -Compiling: '/home/jsd1/speechdata/dictsource/mt_rules' - 99 rules, 31 groups (0) - -Using phonemetable: 'bo' -Compiling: '/home/jsd1/speechdata/dictsource/bo_rules' - 259 rules, 44 groups (41) + 1883 rules, 45 groups (0) diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 1f01a62f..b0b22e86 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -66,7 +66,7 @@ R3 s S t T tS v w x Z -Dictionary hu_dict 2011-11-29 +Dictionary hu_dict 2011-12-07 a A a: e E e: i i: o o: u u: Y y y: Y: @@ -102,7 +102,7 @@ p Q r R s s; t T ts v x z -Dictionary en_dict 2011-11-29 +Dictionary en_dict 2011-12-09 0 3 3: @ @- @2 @5 @L a a# A: A@ aa aI aI3 aI@ @@ -118,7 +118,7 @@ s S t T t2 tS v w x z Z z# -Dictionary eo_dict 2011-04-02 +Dictionary eo_dict 2011-12-05 @- a aI aU e eI eU i o oI u uI @@ -202,7 +202,7 @@ q r r. s S s. t T t. th th. v w x z -Dictionary ta_dict 2011-11-29 +Dictionary ta_dict 2011-12-09 a a: aI aU e E e: i I i: o o: u U u2 u: @@ -535,7 +535,7 @@ n^ p p` r s S t t` tS tS` v w x z Z -Dictionary ml_dict 2011-04-25 +Dictionary ml_dict 2011-12-05 @ a a# a: aI aU e E e: i I i: o o: r- u @@ -598,7 +598,7 @@ N n^ p q R s S S; t tS v w x z -Dictionary ur_dict 2009-12-02 +Dictionary ur_dict 2011-12-05 @ a a: aI aU E e: i I i: O o: U u: @@ -691,7 +691,7 @@ t. th th. tS v w x z Z -Dictionary kn_dict 2011-06-25 +Dictionary kn_dict 2011-12-05 a a: aI aU e E e: i I i: o o: r- u u: @@ -716,7 +716,7 @@ R R3 s S t T tS ts v w x X z -Dictionary te_dict 2011-03-22 +Dictionary te_dict 2011-12-05 a a: aI aU e E e: i i: l- o o: r- u u: V @@ -729,7 +729,7 @@ s s. S; t t. th th. tS v w z -Dictionary ka_dict 2011-04-11 +Dictionary ka_dict 2011-12-05 @ @- a e i o u @@ -740,7 +740,7 @@ t# tS ts ts# v w x z Z -Dictionary si_dict 2011-03-16 +Dictionary si_dict 2011-12-05 & &: @ a a: aI aU e E e: i i: o o: u u: @@ -776,7 +776,7 @@ q r s S t tS v w x z Z -Dictionary bo_dict 2011-11-17 +Dictionary bo_dict 2011-12-05 a a: e e: i i: l- o o: r- u u: @@ -786,3 +786,14 @@ dh dh. dz dzh g gh H j J k kh l m n N n. n^ p ph r s S s. t t. th th. ts tsh w z Z + + +Dictionary kk_dict 2011-12-07 + +& 8 a A e E i I +o u U u# Y + +; b d f g G h j +k l m n N p q r +s S t tS v w X z +Z diff --git a/dictsource/en_list b/dictsource/en_list index 1f492d46..eb75a138 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -713,6 +713,7 @@ bombard $2 bonbon b0nb0n bonhomie b0n@mi: bonjour bO:nZ'U@ +booger bUg3 boogie b'u:gi bosun boUs@n boutique bu:t'i:k @@ -1618,6 +1619,7 @@ mutate mju:t'eIt myriad mIrIad myrrh m3: ?5 myrrh mVR +myrtle m3:t@L naif naI'i:f naïve naI'i:v diff --git a/dictsource/en_rules b/dictsource/en_rules index 28e5a4fc..77bc80b2 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -2589,7 +2589,7 @@ _) gnu g@nu: hun) g g g (ear g - oo) g (er g + %A) g (er g g (et g g (ette_ dZ ve) g (et dZ @@ -3621,7 +3621,7 @@ &ia) n (_S1 n &ia) ns (_S2 nz - @) name (_S4 neIm + &) name (_S4 neIm _) nano (P4 n,anoU nause nO:sI necessit n@sEsIt @@ -4675,7 +4675,7 @@ &B) red (_ r@d uv) re @ rer (_ r@ - re (_ 3 + &) re (_ 3 A) re (_ r@ r) re (_ r@ _) re (C_ rE @@ -5424,6 +5424,7 @@ with (C w%ID with (A w%ID with (e wID + &) wood (_S4 wUd s) wor (d o@ ss) wor (d w3: ?5 ss) wor (d wVR diff --git a/dictsource/hu_list b/dictsource/hu_list index 04de6d0b..7f659375 100644 --- a/dictsource/hu_list +++ b/dictsource/hu_list @@ -4720,6 +4720,52 @@ biciklizőknek $unstressend forintért $unstressend (a szintet) A'||sintEt $unstressend (egy próbát) EJ_'||pR2o:ba:t $unstressend +(lehetőség van arra) lEhEtY:Se:g||vAn||AR2R2A $unstressend +szervét $unstressend +parancsnokságát $unstressend +kötelezettséget $unstressend +tarthatnak $unstressend +korhatárt $unstressend +korhatára $unstressend +törvényt $unstressend +gondoskodik $unstressend +(tartja el) tArcA_'||El $unstressend +(alól az) Alo:l_'||Az $unstressend +életévét $unstressend + + +nagykorú $unstressend +szólaljon $unstressend +elmaradt $unstressend +őszintén $unstressend +(éjszaka volt) e:jsAkA_'||volt $unstressend +szabott $unstressend +dolgok $unstressend +kifizetnie $unstressend +különadót $unstressend +ezzel $unstressend +szóba $unstressend +azzal $unstressend +(van itt) vAn_'||it: $unstressend +(tudta volna) tut:A'||volnA $unstressend +maradhatnak $unstressend +címezte $unstressend +hivatkozott $unstressend +felelősségük $unstressend +bíróságot $unstressend +(vezetik el) vEzEtik_'||El $unstressend +firtassuk $unstressend +fogni $unstressend +társadalomban $unstressend +években $unstressend +(számunkra az) sa:munkR2A_'||Az $unstressend +azután $unstressend +vitába $unstressend +múltról $unstressend +munkahely $unstressend +pedig $unstressend +vitában $unstressend +(ki kell mondani) ki_||kEl:_||mondAni $unstressend // word pairs diff --git a/dictsource/hu_rules b/dictsource/hu_rules index 3cf398d6..af852a34 100644 --- a/dictsource/hu_rules +++ b/dictsource/hu_rules @@ -131,6 +131,17 @@ szanité) c (cs ts _áká) c (söv ts _aká) c (söv ts _bohó) c (sz ts + _vi) cc (sor ts + tán) cs (ics tS + _ér) c (sisak ts + _in) cz (éd ts +_virgon) c (ság ts +_elmén) c (ség ts +martaló) c (ser ts + _ér) c (sas ts + _újon) c (ság ts + _kuru) c (ság ts + _paló) c (ság ts .group ch anar) ch (i h @@ -185,7 +196,8 @@ oligar) ch h dsz (_S3 ts: beszé) d (szin d beszé) d (sebesség d - cselé) d d + cselé) d (so d + dobermann dob:ER2mAn föl) d (sánc d ha) dd (_S2 d @@ -322,6 +334,25 @@ _biliár) d (szo d beszé) d (stílus d zöl) d (szín d ná) d (szőnye d +manzár) d (szob d +paliszá) d (sor d + föl) d (színé d + föl) d (színű d + ren) d (szerető d + kó) d (szó d + fjor) d (szerű d + harma) d (száz d + kar) d (szíj d + negye) d (szél d +smarag) d (szín d + száza) d (szám d + tér) d (szokny d + _va) d (szag d + _va) d (szam d + _va) d (szárny d + árpá) d (zászló d + árpá) d (sáv d + beszé) d (zagy d .group dz fogó) dz (kod ts @@ -597,14 +628,21 @@ huszone) gy (es J: _e) gy (é_ J: _mint-e) gy (é_ J: na) gy (sáp J +_hiszeke) gy (e J: +huszone) gy (ed J: +huszone) gy (ez J: + újrae) gy (esít J: + e) gy (éjszak J: .group h h h hertz hER2ts hh (-L01 h minde) hh (ez h - - + _cse) h (ország //special exception, the h phoneme doesn't need spokening thiws word part + _cse) h (szlovák //special exception, the h phoneme doesn't need spokening thiws word part + _ju) h (kolb + _ju) h (sajt .group i i i @@ -624,6 +662,7 @@ _mint-e) gy (é_ J: v) í (zére i sz) í (ve i t) í (zes i + t) í (zesz i: sz) í (vel i: _t) í (zük i _sz) í (vattak i @@ -631,6 +670,9 @@ _mint-e) gy (é_ J: _sz) í (vató i _v) í (zi i //for example vízipipa, vízimentők beginning words need spokening i, not i: phoneme _v) í (zió i: //But this word an exception for prewious rule +agressz) í (v i: + _sz) í (nész i + _sz) í (néssz i .group j j j @@ -820,6 +862,8 @@ helybe) n (jár n mikrofo) n (nyílás n szí) n (nyom n kormá) ny (javaslat n^ + _me) ny (assz n^ + _me) nny (assz n^ .group o o o @@ -903,7 +947,7 @@ robbaná) s S gyalogo) s (zászló S ki) s (zsidó S szennye) s (zsá S - alvá) s (zavar S + alvá) s (zava S magatartá) s (zavar S erőforrá) s (zabál S működé) s (zava S @@ -924,7 +968,11 @@ _pörkölé) s (sz S hadá) s (szag S _körö) s (szakál S hú) s (szag S - +gránáto) s (zászló S +páncélo) s S +robbaná) s (zaj S + üté) s (záp S + mozgá) s (zava S .group ss ssz ss2 @@ -965,7 +1013,7 @@ zuhaná) ssz (erű Ss karo) ssz (éria Ss bor) ssz (em Ss bor) ssz (ór Ss - kéke) ssz (ürke Ss + kéke) ssz (ürk Ss éde) ssz (áj Ss égé) ssz (abály Ss egyene) ssz Ss @@ -1167,6 +1215,136 @@ csattaná) ssz (erű Ss _csipké) ssz Ss csobbaná) ssz (erű Ss csuklá) ssz (erű Ss +csavará) ssz (erű Ss + ájulá) ssz (erű Ss +aranyo) ssz (őke Ss +_bakfi) ssz Ss + barná) ssz (ők Ss + bélé) ssz (alag Ss +_berendezé) ssz (e Ss + omlá) ssz (ag Ss + rengé) ssz (erű Ss + pergé) ssz (erű Ss + dú) ssz (akáll Ss + _éde) ssz (esztest Ss +egyene) ssz (ál Ss + előőr) ssz (erű S|s + rúgá) ssz (erű Ss + farka) ssz (uk Ss + _fá) ssz (ín Ss +fehére) ssz (őke Ss +feketé) ssz (ürk Ss + pa) ssz (íroz s + ma) ssz (íroz s +szerelé) ssz (ett Ss +fertőzé) ssz (erű Ss + fájá) ssz (er Ss +csuszamlá) ssz (erű Ss + fűté) ssz (ag Ss +habitu) ssz (erű Ss +halotta) ssz (ob Ss + hányá) ssz (ag Ss +világo) ssz (őke Ss + + kéré) ssz (erű Ss +rándulá) ssz (erű Ss + utalá) ssz (erű Ss +villaná) ssz (erű Ss + hárma) ssz (ám Ss + szoro) ssz (erű Ss +_hente) ssz (ak Ss + örgé) ssz (erű Ss + hő) ssz (erep Ss + hú) ssz (állít Ss + járá) ssz (olgálat Ss + járá) ssz (erű Ss + irtá) ssz (él Ss +jelenté) ssz (int Ss + karo) ssz (ériá Ss +katekizmu) ssz (erű Ss +_keríté) ssz (ag Ss + _kevé) ssz (er Ss + látá) ssz (ög Ss +nyilatkoztatá) ssz (erű Ss +szögellé) ssz (erű Ss +_kitünteté) ssz Ss +kommunikáció) ssz (ob Ss + köle) ssz (em Ss + köntö) ssz (erű Ss +könyöklé) ssz (él Ss + _körö) ssz (ig Ss + _kőri) ssz Ss +_küldeté) ssz Ss +labirintu) ssz (er Ss +lázadá) ssz Ss +_lejté) ssz S|s + üté) ssz (ám Ss + málhá) ssz Ss + medre) ssz (ék Ss + _mela) ssz (ín s: + _méne) ssz Ss +_mesze) ssz (ür Ss + _móku) ssz Ss + _napo) ssz (ob Ss + utazá) ssz (erű Ss + nedve) ssz (ürk Ss + neme) ssz (ív Ss + neme) ssz (őrm Ss +nyikkaná) ssz (er Ss + nyomá) ssz (ab Ss + orvo) ssz (áz Ss + orvo) ssz (er Ss + vodá) ssz (int Ss +örvénylé) ssz (erű Ss + párná) ssz (ék Ss + _pené) ssz (ín s: +pedagógu) ssz (ob Ss +pirami) ssz (erű Ss +_pirító) ssz (e Ss +_piszko) ssz Ss +pisztolylövé) ssz (erű Ss + rádió) ssz (erep Ss + rántá) ssz (erű Ss +repülő) ssz (árny Ss + _ré) ssz (erű Ss +_rózsá) ssz (ők Ss + ruhá) ssz (ekere Ss +selyme) ssz (őke Ss + sérté) ssz (ám Ss +borzongá) ssz (erű S|s +sikoltá) ssz (erű Ss + _sor) ssz (eszély Ss +suhogá) ssz (erű Ss + _suva) ssz (a s: + tálto) ssz (árny Ss +szórakozá) ssz (ám Ss + szúró) ssz (em Ss + támlá) ssz (ék Ss +társalgá) ssz (ámba Ss +templomo) ssz (ak Ss +_tigri) ssz Ss + _típu) ssz (ám Ss + _típu) ssz (öveg Ss +tizede) ssz (állás Ss + tölté) ssz (ab Ss + tölté) ssz (erű Ss + ulánu) ssz (ázad Ss +utasítá) ssz (erű Ss + uta) ssz (int Ss + uta) ssz (olg Ss +ügyelete) ssz (ob Ss +_vallomá) ssz Ss + _váro) ssz (él Ss + vére) ssz (áj Ss + vere) ssz (őke Ss + vérte) ssz (ázad Ss +vörhenye) ssz (őke Ss + _vörö) ssz Ss +zavaro) ssz (ür Ss +_nesze) ssz (er s + a) ssz (isztens s + ka) ssz (íroz s + .group sz sz s @@ -1178,10 +1356,8 @@ csuklá) ssz (erű Ss sz (öld Sz va) sz (abl S||z egé) szs (ég S -liszte) szs (ák SZ rend) sz (er s: -krumpli) szs (ák SZ -szerszámo) szs (ák SZ + rend) sz (erető s maro) sz (ug Sz körö) sz (ug Sz fáklyá) sz (ene Sz @@ -1189,23 +1365,16 @@ fáklyá) sz (ene Sz evé) sz (avar Sz vonó) sz (ene Sz va) sz (ár Sz -kenyere) szs (ák SZ sonká) szs (eml SZ vize) szs (em SZ iga) szs (ágos S: li) sztsz (erű st|s tava) sz (ára s -rongyo) szs (ák SZ para) sztsz (ek st|s rava) sz (ár s _ka) sztsze st|sE -szemete) szs (ák SZ dro) sztsze (rző st|sE //drosztszerződés word need spokening st and single sE phoneme - _búzá) szs (ák SZ -_szene) szs (ák SZ -_szalmá) szs (ák SZ va) szs (anér SZ -gaboná) szs (ák SZ va) sz (ápor Sz bati) sztsz (erű st|s para) sztsz (andál st|s @@ -1217,13 +1386,11 @@ gaboná) szs (ák SZ azbe) szt (sisak st nyu) szt (süveg st serté) szs (ír SZ - szere) szs (ák SZ - rizse) szs (ák SZ tá) szs (in SZ - ruhá) szs (ák SZ - ro) szs (ák SZ va) szs (ír SZ - széná) szs (ák SZ + szs (ák SZ //All szsák part containing part need spokening single S and Z phoneme, for example kenyereszsák, pénzeszsák, krumpliszsák, cukroszsák words + sz (acsk Sz //all szacsk containing part block need spokening single S and z phoneme, for example chipseszacskó word + legké) szs (éges S: .group t t t @@ -1324,6 +1491,7 @@ fejeze) t (sor t küldö) tt (gyűl t szé) t (söpör t rokkan) t (segít t +összebéké) ts (e tS: .group tj C) tj c @@ -1393,6 +1561,7 @@ terüle) tj (elöl tj _tábláza) tj (egy tj üzene) tj (el tj á) tj (össz tj +_keresz) tj (á tj .group ts ts (_S2 tS //general rule with word end of ts letters @@ -1622,6 +1791,7 @@ helyeze) tt (ről t: ttyj c: keresz) tt (űz t: me) ttsz (et ts: +bennszülö) tt (jelmez t .group u u u @@ -1632,6 +1802,10 @@ szovjet) u (nió u: h) ú (szan u h) ú (szas u h) ú (szat u + _h) ú (gocs u + h) ú (gom u + _h) ú (gy u + _h) ú (ggy u .group ü @@ -1804,7 +1978,6 @@ magyará) z (kod s ezkö) z (sáv z eszkö) z (sáv z _mé) z (sárg z - tű) z (sáv z _tí) z (sor z _szá) z (sor z ré) z (sisak z @@ -1817,8 +1990,21 @@ magyará) z (kod s ezkö) z (sor z wal) z (er ts tanácskö) z (társaság s - tű) z (sebesség z + tű) z z _tű) z (zsonglőr z + búcsú) z (tat s + bogo) z (ták s + fogó) z (kod ts + szára) z (sült z + precí) z (ség z + _ro) zs (zabál Z + _bor) z (zsír z + oszto) z (kod s +csatlako) z (tok s + _bron) z z + tű) z (zsák z + búcsú) z (kod s + búcsú) z (t s .group $ dolla:R2 diff --git a/dictsource/ka_rules b/dictsource/ka_rules index 5dff815c..729321d4 100644 --- a/dictsource/ka_rules +++ b/dictsource/ka_rules @@ -140,13 +140,13 @@ // For cyrillic characters (U+0400 to U+04FF) use Russian voice .group 0xd0 - \320 _^_RU + 0xd0 _^_RU .group 0xd1 - \321 _^_RU + 0xd1 _^_RU .group 0xd2 - \322 _^_RU + 0xd2 _^_RU .group 0xd3 - \323 _^_RU + 0xd3 _^_RU .group $ dolari diff --git a/dictsource/kk_list b/dictsource/kk_list new file mode 100644 index 00000000..36aa86c3 --- /dev/null +++ b/dictsource/kk_list @@ -0,0 +1,68 @@ + +// This file is UTF8 encoded +// Spelling to phoneme rules for Kazakh + +б be +в ve +г ge +ғ Ge +д de +ж Ze +з ze +й q8sqA'i +к kA +қ qA +л El +м Em +н En +ң EN +п pe +р Er +с Es +т te +ф Ef +х XA +һ hA +ц tse +ч tSe +ш Sa +щ StSa +ъ Aj8ru +ь ZINISkelIk + +//numbers +_0 n'Yl +_1 b'Ir +_2 ek'I +_3 u#S +_4 t'Yrt +_5 b'es +_6 Alt'8 +_7 Z'et'I +_8 seg'Iz +_9 toG'8z +_1X 'on +_2X Zi'8rmA +_3X 'ot8z +_4X q'8r8q +_5X 'el;u +_6X 'Alp8s +_7X Z'etpIs +_8X s'eksen +_9X t'oqsAn +_0C Z'u#z +_0M1 m'8N +_0M2 milli'on +_0M3 milli'Ard +_dpt _b,u#tIn + +// used after decimal point +_0Z1 'onnAn // tenths +_0Z2 Z'u#zden // hundredths +_0Z3 m'8NnAn +_0Z4 'on||m,8NnAn +_0Z5 Z'u#z||m,8NnAn +_0Z6 milli'onnAn +_0Z7 'on||milli,onnAn +_0Z8 Z'u#z||milli'onnAn +_0Z9 milli'ArdtAn diff --git a/dictsource/kk_rules b/dictsource/kk_rules new file mode 100644 index 00000000..0b8ef9b8 --- /dev/null +++ b/dictsource/kk_rules @@ -0,0 +1,130 @@ + +// This file is UTF8 encoded +// Spelling to phoneme rules for Kazakh + +.group а + а A + а (й a + +.group ә + ә & + +.group б + б b + +.group в + в v + +.group г + г g + +.group ғ + ғ G + +.group д + д d + +.group е + е e + +.group ё + ё ;o + +.group ж + ж Z + +.group з + з z + +.group и + и i + +.group й + й j + +.group к + к k + +.group қ + қ q + +.group л + л l + +.group м + м m + +.group н + н n + +.group ң + ң N + +.group о + о o + +.group ө + ө Y + +.group п + п p + +.group р + р r + +.group с + с s + +.group т + т t + +.group у + у u + A) у w + у (A w + +.group ұ + ұ U + +.group ү + ү u# + +.group ф + ф f + +.group х + х X + +.group һ + һ h + +.group ц + ц ts + +.group ч + ч tS + +.group ш + ш S + +.group щ + щ StS + +.group ы + ы 8 // oU ?? + +.group і + і I + +.group э + э E + +.group ю + ю ;u + +.group я + я ;a + +.group + ъ + ь diff --git a/dictsource/kn_rules b/dictsource/kn_rules index 7b3370dd..f8cd483f 100644 --- a/dictsource/kn_rules +++ b/dictsource/kn_rules @@ -258,9 +258,9 @@ .group 0xe0a4 // devanagari - \340\244 _^_HI // switch to hindi voice for devanagari characters + 0xe0a4 _^_HI // switch to hindi voice for devanagari characters .group 0xe0a5 // devanagari - \340\245 _^_HI + 0xe0a5 _^_HI .group diff --git a/dictsource/ml_rules b/dictsource/ml_rules index 6191e601..c07810dd 100644 --- a/dictsource/ml_rules +++ b/dictsource/ml_rules @@ -273,9 +273,9 @@ _പ്രൊ) ഫ (സര് fa .group 0xe0a4 // devanagari - \340\244 _^_HI // switch to hindi voice + 0xe0a4 _^_HI // switch to hindi voice .group 0xe0a5 // devanagari - \340\245 _^_HI + 0xe0a5 _^_HI .group diff --git a/dictsource/si_rules b/dictsource/si_rules index 4e2f7788..56e98d76 100644 --- a/dictsource/si_rules +++ b/dictsource/si_rules @@ -254,14 +254,14 @@ .group 0xe0a4 // devanagari - \340\244 _^_HI // switch to hindi voice for devanagari characters + 0xe0a4 _^_HI // switch to hindi voice for devanagari characters .group 0xe0a5 // devanagari - \340\245 _^_HI + 0xe0a5 _^_HI .group 0xe0ae // Tamil - \340\256 _^_TA // switch to Tamil voice for Tamil characters + 0xe0ae _^_TA // switch to Tamil voice for Tamil characters .group 0xe0af // Tamil - \340\257 _^_TA + 0xe0af _^_TA .group diff --git a/dictsource/ta_list b/dictsource/ta_list index a8f24a4b..d55001cb 100644 --- a/dictsource/ta_list +++ b/dictsource/ta_list @@ -362,6 +362,7 @@ tamil தமிழ் $text பாதிக்குமா $alt பத்திரப் bVttirVp பாய்ஸ் $alt +புக்கர் $alt @@ -429,6 +430,8 @@ tamil தமிழ் $text தடியாய் $alt தொள $alt தான $alt +தம்மம் $alt +தம்ம $alt // initial ட @@ -512,6 +515,7 @@ tamil தமிழ் $text கௌன் $alt கிண் $alt கிர் $alt +கங்க $alt @@ -543,3 +547,5 @@ tamil தமிழ் $text செட் set. திக் dik பிட் bit. +புட் fud. +உப்ப ubbV diff --git a/dictsource/ta_rules b/dictsource/ta_rules index e58c1386..93fe8801 100644 --- a/dictsource/ta_rules +++ b/dictsource/ta_rules @@ -115,6 +115,8 @@ //sort + _) க (ங்கபாடி gV + _) க (ங்கர gV _) க (ங்கா gV _) க (ங்காரு kV _) க (ங்கை gV @@ -189,6 +191,7 @@ _) க (ாயத்திரி g க (ாரன k _) க (ார்டன g + _) க (ார்டியன g _) க (ிஃப்ட g _) க (ிடுகிடு g _) க (ிண்ணென்ற g @@ -241,8 +244,10 @@ _) கி (ரைண்டர g _) கி (ரௌண்ட g _) க (ிர்ரெ g + _) கி (றிஸ்டல k _) கி (ளப்_ k _) கிளப்ப (ில kl.Vbb + _) கிளப்ப (ுகள klVbb _) கிளப்ப (ுக் kl.Vbb _) கிளப்ப (ை kl.Vbb _) கிளர்க் klVrk @@ -304,6 +309,7 @@ _மன்மதக்) க (ுகை g _) க (ுதிச் g _) க (ுதித் g _) க (ுதிப் g + _) க (ுதிப்பகுதி k _) க (ுபீர g _) க (ுபுகுபு g _) க (ுபுக் g @@ -452,6 +458,8 @@ _வெங்) கட kVt.V# ஒரு) க (ட்ட kV மறு) க (ட்ட kV _கால) க (ட்ட kV + _பின்) க (ட்ட kV + _முன்) க (ட்ட kV ஆரம்ப) க (ட்ட kV _கல்) க (ண்ட kV _நற்) க (தி gV @@ -537,6 +545,7 @@ _ஹன்L04ி) க (ா k _பால்) க (ாரர k _தையல்) க (ாரர k _வண்டி) க (ாரர k + அங்) க (ாரா k _பூ) க (ாரி k _பால்) க (ாரி k _கடை) க (ாரி k @@ -576,7 +585,10 @@ _தொன்ம) க (ால k ஆதி) க (ுடி k _பூர்வ) க (ுடி k _மூத்த) க (ுடி k + அமண்) கு (டி ku2 அரிய) கு (டி ku2 // Don't change to [U] +அம்மன்) கு (டி ku2 +உடையார்) கு (டி ku2 மன்னார்) கு (டி ku2 நற்) க (ுண g _சற்) க (ுண g @@ -595,6 +607,7 @@ _டா) குமெண்ட kUmen.tV# _) குல்க (ந்த gulkV _மெரு) க (ூட்ட g அறை) க (ூவ k + _மார்) கெட் ket. _ஓ) க (ே k நீல) க (ேசி k புலி) க (ேசி k @@ -670,6 +683,7 @@ _போர்) க்க (ுண gg _வெடி) க்க (ுண்ட gg _துப்பாக்கி) க்க (ுண்ட gg ஜன) க்க (ும்பல gg + _மார்) க்கெட் kket. _ல) க்க (ேஜ gg L03) க்க (ோபுர gg _வி) க்ச (னரி ks.V @@ -964,6 +978,7 @@ _தணிகா) ச (ல tSV //sort + _பேண்) ட t.V# _வால்) ட t.V# _கமெண்) ட t.V# _க்ளையண்) ட t.V# @@ -1018,6 +1033,7 @@ _ஷிஃப்) ட t.V# _மால்) ட (ா t. _) டாக் (_ t.a:k _) ட (ாக்க t. // talkies + _) டாக்குமெண்ட d.a:kkUmen.t.V# _) டாக்ட (ர d.a:kt.V _) டாக (்ஸி t.a:k _) டாங்க (ர t.a:NkV @@ -1133,7 +1149,7 @@ _செண்) டிமெண்ட t.imen.t.V# _) ட (ூர t. இண்) ட (ெ t. _) டெக் (னாலஜி t.ek - _) டெக்னிக (ல t.eknikV + _) டெக்னிக t.eknikV# _) ட (ெக்ஸாஸ t. _) ட (ெக்ஸ் t. _) ட (ெண்டர t. @@ -1172,6 +1188,7 @@ _லான்_) ட (ென்னிஸ t. ளு) ட (ோனிய t. _) டோரண்ட (ோ t.o:rVn.t. _ப்ரி) ட (ோரிய t. + _லே) ட் t. @மெண்) ட் t. // -ment _பேண்) ட் t. இண்டர்நெ) ட் t. @@ -1203,6 +1220,7 @@ _லான்_) ட (ென்னிஸ t. _) ட் (ரான்ஸ்ஃபர t. _) ட் (ரான்ஸ்ப t. _) ட்ரான்ஸ்ப (ர t.ra:nsfV + _) ட்ரான்ஸ்ப (ரண்ட t.ra:nspV _) ட் (ரான்ஸ்பாண்டர t. _) ட்ரான்ஸ்பிரண்ட t.ra:nspirVn.t.V# _) ட் (ரான்ஸ்மீட்டர t. @@ -1346,8 +1364,10 @@ _நடுரோ) ட் (ல t. _) த (ன்வந்தரி dV _) தபதப dVbVdVbV# _) த (மயந்தி dV + _) த (ம்படி dV _) த (ம்பதி dV _) த (ம்பிடி dV + _) த (ம்மடிL11் dV _) த (யவ dV _) த (யாணந்த dV _) த (யால dV @@ -1419,6 +1439,7 @@ _நடுரோ) ட் (ல t. _) த (ிகம்பர d _) த (ிகில d _) த (ிகுதிகு d + _) த (ிக்கித்த d _) த (ிக்கில d _) த (ிக்கு d _) த (ிக்கு_முக்க t @@ -1568,6 +1589,7 @@ _நடுரோ) ட் (ல t. _) த (ேவகுல d _) த (ேவக் d _) த (ேவசேன d + _) த (ேவதாஸ d _) த (ேவதூத d _) த (ேவதை d _) த (ேவநேய d @@ -1620,6 +1642,7 @@ _வசந்) த tV# _கௌ) த (ம tV _சாந்) த (ம tV# _கௌ) த (மி tV + _புல்) த (ரை tV _சாந்) த (லிங்க tV# _கீ) த (ா t _சீ) த (ா t @@ -1661,6 +1684,7 @@ _பிரசார்_பார) த (ி t எ) தியோப (ிய tijo:p _பிர) த (ீ t த (ுறை t + த (ூக்க t // in word வீண்) த (ேவை t _நிவேதி) த (ை t வீண்) த (ொல்லை t @@ -1704,6 +1728,7 @@ _சிறை) த்த (ண்டனை ddV _சுப) த்த (ிர dd _ரு) த்த (ிர dd _ரௌ) த்த (ிர dd + _சூ) த்த (ிரச்சி dd _சூ) த்த (ிரன dd _சூ) த்த (ிரரி dd _சூ) த்த (ிரர் dd @@ -1737,6 +1762,7 @@ _வில்வி) த்த (ை dd _ஜெ) த் (மலானி t ச) த (்ய t நி) த (்ய t + ஆதி) த் (ய t இ) த் (யாதி t _மி) த் (ர t _காமசூ) த் (ர t @@ -2011,6 +2037,7 @@ _டெட்_) ப (ாடி b _) ப (ாதிக்கும்_மேல p _) ப (ாதித்த b _) ப (ாதிப்படைகி b + _) ப (ாதிப்படைய b _) ப (ாதிப்படையுமெ b _) ப (ாதிப்படைவ b _) ப (ாதிப்பதா b @@ -2087,6 +2114,7 @@ _விளையாடு_) ப (ாம்பே p _) ப (ால் p _) ப (ால்_தாக்கரே b _) பால்க (னி ba:lkV + _) பால்ட (ிமோர ba:lt. _) ப (ால்ய b _நேய_) ப (ாவ b _ராக_) ப (ாவ b @@ -2119,6 +2147,7 @@ _ராகத்தின்_) ப (ாவ b _) ப (ாவேய b _) ப (ாஷாக்கள b _) ப (ாஷாவ b + _) ப (ாஷிய b _) ப (ாஷை b _) ப (ாஷ்ய b _) ப (ாஸ்கர b @@ -2261,6 +2290,7 @@ _ராகத்தின்_) ப (ாவ b _) பி (ரிட b _) பிரிட (ோரிய prit. _) பி (ரிட்டோரிய p + _) பிரிண்ட prin.t.V# _) பிரிண்ட (ர prin.t.V _) ப (ிரித்தானி b _) பி (ரித்தானி b @@ -2301,6 +2331,7 @@ _ராகத்தின்_) ப (ாவ b _) பி (ரௌச b _) பி (ரௌன b _) ப (ிலாஸ்பூர b + _) ப (ில்கள b _) ப (ில்டப் b _) ப (ில்டிங் b _) ப (ில்லியன b @@ -2308,6 +2339,7 @@ _ராகத்தின்_) ப (ாவ b _) பி (ளஸ p _) பி (ளஸ்_ p _) பி (ளா p + _) பிளாக் bla:k _) பி (ளாட்பார p _) பி (ளாஸ்க் f // flask _) பி (ளீஸ p @@ -2361,6 +2393,7 @@ _ராகத்தின்_) ப (ாவ b _) ப (ுஜ b _) ப (ுட்டி b _பெனசீர்_) ப (ுட்டோ b + _) புட்ப (ால fut.b _) ப (ுதன b _) புத்த(K buddV _) புத் (தJ_புத+ put @@ -2478,6 +2511,7 @@ _பெனசீர்_) ப (ுட்டோ b _) ப (ைனாமி b _) ப (ைபிள b _) ப (ைரவ b + _) ப (ைராகி b _) ப (ொம்மன b _) ப (ொம்மனாட்டி p _) ப (ொம்மல b @@ -2687,6 +2721,7 @@ _முனிசி) ப (ல pV வேலைப்) ப (ளு bV வட) ப (ழ pV வீண்) ப (ழி pV + _முத்து) ப (வள pV _வா) ப (ஸ pV _தீ) ப (ா p _கலி) ப (ா f @@ -2712,6 +2747,7 @@ _வெளிப்) ப (ாக b ஈடு) ப (ாட p _வழி) ப (ாட p _குறை) ப (ாட p + _பட்ட) ப (ாட p _வேறு) ப (ாட p சமன்) ப (ாட p முரன்) ப (ாட p @@ -2730,6 +2766,8 @@ _வெளிப்) ப (ாக b அL06மதா) ப (ாத b ஒளரங்கா) ப (ாத b ஔரங்கா) ப (ாத b + _சிறு) ப (ாதை p + _நடை) ப (ாதை p ஜிந்தா) ப (ாத் b _பஞ்ச) ப (ாத்திர p ச) பாபதி ba:pVti @@ -2768,6 +2806,7 @@ _ப்ரின்சி) ப (ால p _தமிழ்ப்) ப (ாஷ _b வாதா) ப (ி p _கடா) ப (ி f + _யுஎஸ்) ப (ி b சித்தப்) பி(ரமை b _கன்) ப (ிகர f வாலி) பிக (ேஷன fik @@ -2775,6 +2814,7 @@ _தமிழ்ப்) ப (ாஷ _b _கா) பிட(ல pit.V கண்டு) ப (ிடி p திமிர்) ப (ிடி p + _கடை) ப (ிடி p ராவல்) ப (ிண்டி p _டால்) ப (ின f ஒ) ப (ினியன p @@ -2831,6 +2871,7 @@ L03ந்தப்) பி (ராய p ஆண்) ப (ிள்ளை p பெண்) ப (ிள்ளை p விக்கி) ப (ீடியா p + இம்) ப (ீரியல p _திம்) ப (ு p _அன்) ப (ுட b _மார்) ப (ுட b @@ -2847,6 +2888,7 @@ L03ந்தப்) பி (ராய p இன்) ப (ுற b _துன்) ப (ுற b ப (ுறK p + _பா) ப (ுலர p _) பு (ளோரன்ஸ f மண்) ப (ுழு p ப (ூச்சி p @@ -2924,6 +2966,7 @@ _கோலாலம்) ப (ூர p ப (ோன்ற+ p // ?? end-of-word + suffix ?? ப (ோயிரு p ப (ோய் p + எம்) ப (ோரியல p ஏர்) போர்ட po:rt.V# கலி) ப (ோர்னிய f ப (ோல_ p @@ -2959,6 +3002,7 @@ _மைக்ரோசா) ப் (ட f ஆ) ப்ப (ரிக்க fV தென்னா) ப்ப (ரிக்க fV உயிர்) ப்ப (லி bbV + L03) ப்ப (ஸ bbV அடி) ப்ப (ாக bb இறுதி) ப்ப (ாக bb துர்) ப்ப (ாக்கிய bb @@ -2989,6 +3033,7 @@ _ஒL10ி) ப்பி (ரவாக pp ஆ) ப்பி (ரிக்க f தென்னா) ப்பி (ரிக்க fV _ஹ) ப்ப (ிள bb + _க்ள) ப்ப (ுகள bb உ) ப்ப (ுசத்த bb உ) ப்ப (ுசம bb _சந்தேக) ப்ப (ுத்தி bb @@ -3178,6 +3223,8 @@ _சந்தேக) ப்ப (ுத்தி bb இ (ரம்மிய இ (ரயில இ (ரவீந்திர + இ (ரவைகள + இ (ரவையை இ (ராக இ (ராச இ (ராஜ @@ -3292,9 +3339,9 @@ _சந்தேக) ப்ப (ுத்தி bb ௗ : // aU length mark .group 0xe0a4 // devanagari - \340\244 _^_HI // switch to hindi voice + 0xe0a4 _^_HI // switch to hindi voice .group 0xe0a5 // devanagari - \340\245 _^_HI + 0xe0a5 _^_HI .group ் // virama diff --git a/dictsource/te_rules b/dictsource/te_rules index e0c5c825..4b18cdb5 100644 --- a/dictsource/te_rules +++ b/dictsource/te_rules @@ -266,9 +266,9 @@ .group 0xe0a4 // devanagari - \340\244 _^_HI // switch to hindi voice for devanagari characters + 0xe0a4 _^_HI // switch to hindi voice for devanagari characters .group 0xe0a5 // devanagari - \340\245 _^_HI + 0xe0a5 _^_HI .group diff --git a/dictsource/ur_rules b/dictsource/ur_rules index 6c67d430..7de25ee0 100644 --- a/dictsource/ur_rules +++ b/dictsource/ur_rules @@ -207,9 +207,9 @@ .group 0xe0a4 // devanagari - \340\244 _^_HI // switch to hindi voice + 0xe0a4 _^_HI // switch to hindi voice .group 0xe0a5 // devanagari - \340\245 _^_HI + 0xe0a5 _^_HI .group $ do:l@R \ No newline at end of file diff --git a/espeak-data/voices/test/kk b/espeak-data/voices/test/kk new file mode 100644 index 00000000..c99d4ecf --- /dev/null +++ b/espeak-data/voices/test/kk @@ -0,0 +1,3 @@ +name kazakh +language kk + diff --git a/phsource/compile_report b/phsource/compile_report index 875c2fe6..27acd0c6 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -1,4 +1,4 @@ -78 phoneme tables +79 phoneme tables new total base 107 107 consonants 10 116 @@ -77,6 +77,7 @@ consonants 10 116 tn 27 119 mt 32 127 bo 10 152 + kk 17 116 fa 9 110 Data file Used by @@ -401,7 +402,7 @@ l/l_ [l] base [l/] fr l/l_@ [l/3] base [l/] fr -l/l@ [h¶s] base +l/l@ [háÿ] base [l#] base [l] fr [l/2] fr @@ -435,7 +436,7 @@ l/L2_oL [l/2] base l/L2_uL [l/2] base l/l_3 [l/] de l/l_4 [ll] sq -l/la [h¶s] base +l/la [háÿ] base [l#] base [l] fr [l/2] fr @@ -443,7 +444,7 @@ l/la [h [K] tn l/l_a [l/3] base [l/] fr -l/le [h¶s] base +l/le [háÿ] base [l#] base [l] fr [l/2] fr @@ -455,7 +456,7 @@ l/L_eL_af [&] af [&:] af l/l_front [L] sq l/l_front_ [l/4] sq -l/li [h¶s] base +l/li [háÿ] base [l#] base [l] fr [l/2] fr @@ -469,7 +470,7 @@ ll/ll [L] bg ll/_ll [L] bg l/l_long [l] base [l] fr -l/lo [h¶s] base +l/lo [háÿ] base [l#] base [l/2] fr [K] nso @@ -479,7 +480,7 @@ l/l_o [l/3] base l^/l_rfx [l.] base [l] ru [l^] ru -l/lu [h¶s] base +l/lu [háÿ] base [l#] base [l] fr [l/2] fr @@ -787,6 +788,7 @@ ufric/x [x] base [kh] vi ufric/x2 [x2] af [x] ku + [X] kk ufric/x_hr [x] base [x] hr [x] ru @@ -1018,6 +1020,7 @@ vdiph2/ii@ [i@] en [i@3] en [i@] en-us [ja] ru +vdiph2/ii@_2 [e] kk vdiph2/ii@_3 [i@] vi vdiph2/iioo [io] zh vdiph2/iu [iU] base2 @@ -1050,6 +1053,7 @@ vdiph2/uw [u:] en-us vdiph2/uw_2 [u:] en vdiph2/uw_3 [yU] ro vdiph2/uw_4 [u:] en-n +vdiph2/uw_6 [u#] kk vdiph2/y@ [y@] zh vdiph2/y#@ [Y@] af vdiph2/ye [yE] sq @@ -1568,6 +1572,7 @@ vowel/a_5 [a:] ta [a] sw [a:] te [a] tn + [a] kk vowel/a_6 [a] ca [a:] vi [a] am @@ -1616,6 +1621,7 @@ vowel/aa_9 [a] fi [a] pa [a] ak [a] mt + [A] kk vowel/@_bck [@] hi [@] bg [@] zh @@ -1698,6 +1704,7 @@ vowel/ee_2 [E] cy [E#] ku [&] da [E] pa + [&] kk vowel/ee#_2 [E1] et [E-] sv [E#] sq @@ -1775,6 +1782,7 @@ vowel/e_mid2 [E] af vowel/@_fnt [@] en-wi [@2] en-wi [@2] hr + [E] kk vowel/@_fr [3] en-n vowel/@_hgh [@] fr [@-] fr @@ -1881,6 +1889,7 @@ vowel/ii# [Y] cy [Y] ru [I] ku [i] sq + [I] kk vowel/ii_2 [I] en [i] zh [I] mt @@ -1919,6 +1928,7 @@ vowel/ii_6 [I] en-wm [i] wo vowel/ii_7 [i] en [i] sq +vowel/ii_8 [i] kk vowel/ii_final [i] en-us [i] en-rp vowel/@_low [@] en-rp @@ -1984,7 +1994,9 @@ vowel/o_2 [o:] cy vowel/o-_2 [V] en-n [V] en-wm vowel/o_3 [oU] en-sc + [o] kk vowel/o-_3 [U] en-rp + [8] kk vowel/o-_4 [o] ro [o] am vowel/o_5 [O] da @@ -2182,6 +2194,7 @@ vowel/u_bck2 [u] et [u] ht [u] fa vowel/u_bck3 [u:] et + [u] kk vowel/uu [U] en [U] en-n [U] en-wm @@ -2191,6 +2204,7 @@ vowel/uu_2 [U] base2 [U] de [U] ca [U] tr + [U] kk vowel/uu_3 [u] af [y] zh vowel/uu_4 [U] fi @@ -2263,6 +2277,7 @@ vowel/y_3 [y] af vowel/y#_3 [W] is [W:] is vowel/y_4 [y:] no +vowel/y#_4 [Y] kk vowel/y_5 [y:] sv [y] tr [y] ku diff --git a/phsource/error_log b/phsource/error_log index 4b010d07..e796d0cb 100644 --- a/phsource/error_log +++ b/phsource/error_log @@ -457,6 +457,12 @@ include ph_tibetan +______________________________ +Phoneme Table: 'kk' +include ph_kazakh + + + ______________________________ Phoneme Table: 'fa' include ph_farsi @@ -464,4 +470,4 @@ include ph_farsi -Refs 2587, Reused 1799 +Refs 2601, Reused 1809 diff --git a/phsource/ph_kazakh b/phsource/ph_kazakh new file mode 100644 index 00000000..a3f2139a --- /dev/null +++ b/phsource/ph_kazakh @@ -0,0 +1,125 @@ + +// use "flag1" for soft vowels + +// short vowels + +phoneme I + vowel starttype #@ endtype #@ + flag1 + length 100 + IF thisPh(isWordEnd) THEN + length 140 + ENDIF + FMT(vowel/ii#) +endphoneme + +phoneme 8 + vowel starttype #@ endtype #@ + length 100 + IF thisPh(isWordEnd) THEN + length 140 + ENDIF + FMT(vowel/8) +endphoneme + +phoneme u# + vowel starttype @ endtype @ + length 100 + flag1 + IF thisPh(isWordEnd) THEN + length 140 + ENDIF + FMT(vdiph2/uw_6) +endphoneme + +phoneme U + vowel starttype #u endtype #u + length 100 + IF thisPh(isWordEnd) THEN + length 140 + ENDIF + FMT(vowel/uu_2) +endphoneme + + +// long vowels + +phoneme A + vowel starttype #a endtype #a + length 200 + FMT(vowel/aa_9) +endphoneme + +phoneme a + vowel starttype #a endtype #a + length 200 + FMT(vowel/a_5) +endphoneme + +phoneme & + vowel starttype #a endtype #a + flag1 + length 200 + FMT(vowel/ee_2) +endphoneme + +phoneme e + vowel starttype #e endtype #e + length 200 + flag1 + FMT(vdiph2/ii@_2) +endphoneme + +phoneme E + vowel starttype @ endtype @ + length 200 + FMT(vowel/@_fnt) +endphoneme + +phoneme i + vowel starttype #i endtype #i + length 180 + FMT(vowel/ii_8) +endphoneme + +phoneme o + vowel starttype #o endtype #o + length 200 + FMT(vowel/o_3) +endphoneme + +phoneme Y + vowel starttype #@ endtype #@ + length 200 + flag1 + FMT(vowel/y#_4) +endphoneme + +phoneme u + vowel starttype #u endtype #u + length 200 + FMT(vowel/u_bck3) +endphoneme + + + +phoneme r + import_phoneme base/R2 +endphoneme + +phoneme t + import_phoneme base2/t +endphoneme + +phoneme G + import_phoneme base/r" +endphoneme + +phoneme X + vls uvl frc + lengthmod 3 + Vowelin f1=0 f2=2300 200 400 f3=-100 100 + Vowelout f1=0 f2=2300 300 400 f3=-100 100 rms=20 + lengthmod 3 + WAV(ufric/x2, 60) +endphoneme diff --git a/phsource/phonemes b/phsource/phonemes index 67b2dda6..deea225e 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -1885,6 +1885,9 @@ include ph_maltese phonemetable bo hi include ph_tibetan +phonemetable kk base +include ph_kazakh + phonemetable fa base include ph_farsi diff --git a/phsource/vowel/&_3 b/phsource/vowel/&_3 new file mode 100644 index 00000000..fc7ed6ae Binary files /dev/null and b/phsource/vowel/&_3 differ diff --git a/phsource/vowel/e#_2 b/phsource/vowel/e#_2 new file mode 100644 index 00000000..30a5998d Binary files /dev/null and b/phsource/vowel/e#_2 differ diff --git a/phsource/vowel/ii_8 b/phsource/vowel/ii_8 new file mode 100644 index 00000000..6218e30e Binary files /dev/null and b/phsource/vowel/ii_8 differ diff --git a/phsource/vowel/o_3 b/phsource/vowel/o_3 index 4f704a98..8091c872 100644 Binary files a/phsource/vowel/o_3 and b/phsource/vowel/o_3 differ diff --git a/phsource/vowel/u_fnt2 b/phsource/vowel/u_fnt2 new file mode 100644 index 00000000..6c9152e6 Binary files /dev/null and b/phsource/vowel/u_fnt2 differ diff --git a/phsource/vowel/vowelchart.png b/phsource/vowel/vowelchart.png index 7226a60c..1d635d17 100644 Binary files a/phsource/vowel/vowelchart.png and b/phsource/vowel/vowelchart.png differ diff --git a/phsource/vowel/y#_4 b/phsource/vowel/y#_4 new file mode 100644 index 00000000..ca32bcb5 Binary files /dev/null and b/phsource/vowel/y#_4 differ diff --git a/phsource/vowelcharts/af b/phsource/vowelcharts/af index 077d8049..c3bda65b 100644 --- a/phsource/vowelcharts/af +++ b/phsource/vowelcharts/af @@ -1,7 +1,7 @@ @ 1 536 1416 2320 584 1400 2000 @ 0 536 1420 2420 536 1420 2420 @- 0 525 1441 2340 525 1441 2340 -a 0 19271 29922 -25436 16780 -13920 10796 +a 0 -3389 682 10183 -14324 -3574 28986 i 0 272 2247 3100 288 2247 3100 u 0 352 1000 2240 352 1000 2200 E 0 504 1900 2544 496 1920 2552 diff --git a/phsource/vowelcharts/af.png b/phsource/vowelcharts/af.png index c6110762..492929bb 100644 Binary files a/phsource/vowelcharts/af.png and b/phsource/vowelcharts/af.png differ diff --git a/phsource/vowelcharts/am b/phsource/vowelcharts/am index 29454b98..861a5026 100644 --- a/phsource/vowelcharts/am +++ b/phsource/vowelcharts/am @@ -1,7 +1,8 @@ -@ 0 584 1440 2460 600 1440 2460 -a 0 904 1320 2700 896 1340 2660 +@ 1 640 1562 2400 355 2222 2720 +@ 0 528 1500 2380 528 1500 2380 +a 1 904 1320 2740 344 2222 2720 +a 0 864 1280 2700 864 1280 2700 e 0 504 1900 2544 496 1920 2552 -i 0 280 2280 2840 240 2339 2840 +i 0 336 2210 2800 336 2210 2760 o 0 496 972 2500 496 972 2500 u 0 344 800 2360 344 800 2360 -y 0 336 1760 2580 344 1760 2580 diff --git a/phsource/vowelcharts/am.png b/phsource/vowelcharts/am.png index a7b8e31a..f605ce4d 100644 Binary files a/phsource/vowelcharts/am.png and b/phsource/vowelcharts/am.png differ diff --git a/phsource/vowelcharts/bo b/phsource/vowelcharts/bo new file mode 100644 index 00000000..1cece3d1 --- /dev/null +++ b/phsource/vowelcharts/bo @@ -0,0 +1,10 @@ +a 0 904 1320 2700 896 1340 2660 +e 0 504 1900 2544 496 1920 2552 +i 0 280 2280 2840 240 2339 2840 +o 0 454 812 2559 432 824 2520 +u 0 320 860 2360 320 860 2460 +i: 0 304 2440 3020 304 2440 3020 +e: 0 416 2140 2660 416 2140 2660 +a: 0 712 1160 2780 696 1160 2780 +o: 0 424 800 2580 408 780 2600 +u: 0 320 740 2400 320 740 2400 diff --git a/phsource/vowelcharts/bo.png b/phsource/vowelcharts/bo.png new file mode 100644 index 00000000..bd96d35a Binary files /dev/null and b/phsource/vowelcharts/bo.png differ diff --git a/phsource/vowelcharts/ca b/phsource/vowelcharts/ca index 39778d33..652c15c9 100644 --- a/phsource/vowelcharts/ca +++ b/phsource/vowelcharts/ca @@ -8,5 +8,5 @@ E 0 584 1820 2560 584 1820 2560 O 0 552 860 2660 552 880 2660 U 0 388 940 2420 394 980 2360 aI 0 912 1320 2740 360 2200 2820 -a# 0 865 0 0 837 0 0 +a# 0 514 514 514 514 514 514 E2 0 584 1820 2560 584 1820 2560 diff --git a/phsource/vowelcharts/ca.png b/phsource/vowelcharts/ca.png index 203bbfb1..064a231f 100644 Binary files a/phsource/vowelcharts/ca.png and b/phsource/vowelcharts/ca.png differ diff --git a/phsource/vowelcharts/cs b/phsource/vowelcharts/cs index fa179dea..c627fdb3 100644 --- a/phsource/vowelcharts/cs +++ b/phsource/vowelcharts/cs @@ -1,4 +1,5 @@ @- 0 525 1441 2340 525 1441 2340 +a 1 856 1320 2700 856 1320 2700 a 0 904 1320 2700 896 1340 2660 e 0 584 1820 2560 584 1820 2560 i 0 360 2120 2680 360 2120 2660 diff --git a/phsource/vowelcharts/cs.png b/phsource/vowelcharts/cs.png index bd8e96e7..6ba3a87e 100644 Binary files a/phsource/vowelcharts/cs.png and b/phsource/vowelcharts/cs.png differ diff --git a/phsource/vowelcharts/de b/phsource/vowelcharts/de index 33231617..edef991c 100644 --- a/phsource/vowelcharts/de +++ b/phsource/vowelcharts/de @@ -1,13 +1,11 @@ @ 0 496 1500 2420 496 1500 2420 @- 0 525 1441 2340 525 1441 2340 a 0 904 1320 2700 896 1340 2660 -e 0 456 1980 2540 440 1980 2540 i 0 280 2280 2840 240 2339 2840 o 0 552 860 2660 552 880 2660 n- 1 496 1512 2380 480 1500 2540 n- 0 496 1512 2380 380 1780 2540 3 0 658 1408 2460 658 1408 2460 -3: 0 658 1408 2460 658 1408 2460 E 0 504 1900 2544 496 1920 2552 E2 0 504 1900 2544 496 1920 2552 I 0 384 2030 2610 384 2030 2610 @@ -21,7 +19,7 @@ i: 0 280 2255 3030 264 2255 3030 i2 0 280 2255 3030 264 2255 3030 u: 0 320 860 2360 320 860 2460 aU 0 776 1200 2760 368 900 2540 -aI 0 904 1320 2700 355 2222 2720 +aI 0 904 1320 2740 344 2222 2720 EI 0 680 1800 2440 355 2222 2720 OY 0 469 864 2440 310 2040 2440 E: 0 488 1990 2540 488 1990 2540 diff --git a/phsource/vowelcharts/de.png b/phsource/vowelcharts/de.png index adf840c8..cb23b92a 100644 Binary files a/phsource/vowelcharts/de.png and b/phsource/vowelcharts/de.png differ diff --git a/phsource/vowelcharts/en b/phsource/vowelcharts/en index e69de29b..2fca00d8 100644 --- a/phsource/vowelcharts/en +++ b/phsource/vowelcharts/en @@ -0,0 +1,46 @@ +@ 1 552 1441 2400 552 1441 2400 +@ 0 525 1441 2340 525 1441 2340 +@- 0 525 1441 2340 525 1441 2340 +a 1 856 1320 2700 856 1320 2700 +a 0 904 1320 2700 896 1340 2660 +i 0 376 1970 2585 376 1970 2585 +I2 0 408 1920 2580 416 1900 2580 +@2 0 525 1441 2340 525 1441 2340 +@5 0 525 1441 2340 525 1441 2340 +U 0 445 902 2620 445 902 2620 +@L 0 485 891 2780 450 792 2980 +a# 0 -1 -1 257 257 257 257 +aa 0 904 1320 2700 896 1340 2660 +E 0 646 1780 2500 646 1780 2500 +I 0 408 1940 2600 408 1940 2600 +0 0 670 946 2620 630 902 2700 +V 0 654 1274 2586 654 1274 2586 +A: 0 775 1067 2800 795 1122 2580 +A@ 0 775 1067 2800 795 1122 2580 +3: 0 480 1408 2320 545 1419 2320 +i: 0 296 2220 2820 216 2400 2820 +O: 0 465 836 2640 530 1001 2620 +O 0 465 836 2640 530 1001 2620 +O@ 0 465 836 2640 530 1001 2620 +o@ 0 465 836 2640 530 1001 2620 +u: 1 384 1280 2280 290 1023 2220 +u: 0 360 1562 2260 290 1023 2220 +aU 0 830 1364 2440 488 900 2240 +oU 0 630 1353 2340 390 957 2140 +aI 0 860 1240 2820 415 2044 2600 +eI 0 680 1800 2440 355 2222 2720 +OI 0 545 780 2720 310 2002 2500 +e@ 0 720 1760 2420 672 1562 2520 +i@ 0 368 2156 2720 528 1595 2460 +i@3 0 368 2156 2720 528 1595 2460 +U@ 1 520 1160 2440 524 1401 2300 +U@ 0 430 960 2340 558 1300 2300 +aI@ 0 860 1240 2820 640 1518 2400 +aU@ 0 904 1480 2670 705 1344 2320 +IR 0 544 1340 2460 616 1190 2450 +VR 0 648 1180 2595 640 1140 2460 +o: 0 454 812 2559 432 824 2520 +A~ 0 592 1000 2640 592 1000 2640 +O~ 0 540 896 2632 512 900 2620 +e: 0 456 1980 2540 440 1980 2540 +@# 0 528 1500 2380 528 1500 2380 diff --git a/phsource/vowelcharts/en-n b/phsource/vowelcharts/en-n index c3737ef9..4199959e 100644 --- a/phsource/vowelcharts/en-n +++ b/phsource/vowelcharts/en-n @@ -25,7 +25,7 @@ O@ 0 575 891 2640 580 1023 2480 o@ 0 575 891 2640 580 1023 2480 u: 0 332 1527 2256 290 1023 2220 aU 0 660 1562 2360 340 990 2360 -oU 0 546 13623 5943 -16248 -29802 -14707 +oU 0 20480 0 256 768 578 140 aI 0 860 1360 2660 488 1840 2440 OI 0 545 780 2720 310 2002 2500 e@ 0 647 1778 2530 593 1553 2370 diff --git a/phsource/vowelcharts/en-n.png b/phsource/vowelcharts/en-n.png index db322c84..277bd9df 100644 Binary files a/phsource/vowelcharts/en-n.png and b/phsource/vowelcharts/en-n.png differ diff --git a/phsource/vowelcharts/en-us b/phsource/vowelcharts/en-us index a9c507a7..b909b4bc 100644 --- a/phsource/vowelcharts/en-us +++ b/phsource/vowelcharts/en-us @@ -9,7 +9,7 @@ I2 0 416 1800 2560 416 1800 2560 @5 0 525 1441 2340 525 1441 2340 U 0 496 1040 2560 496 1040 2560 @L 0 485 891 2780 450 792 2980 -a# 0 0 0 771 0 0 697 +a# 0 -256 255 0 257 257 257 aa 1 670 1719 2556 710 1672 2671 aa 0 700 1680 2506 652 1488 2470 E 0 544 1760 2580 608 1600 2580 diff --git a/phsource/vowelcharts/en-us.png b/phsource/vowelcharts/en-us.png index f9cc3ca0..ce7595a4 100644 Binary files a/phsource/vowelcharts/en-us.png and b/phsource/vowelcharts/en-us.png differ diff --git a/phsource/vowelcharts/en-wm b/phsource/vowelcharts/en-wm index 9f0bd3b3..d23d3cfe 100644 --- a/phsource/vowelcharts/en-wm +++ b/phsource/vowelcharts/en-wm @@ -9,7 +9,7 @@ I2 0 312 2213 2775 312 2213 2775 @5 0 525 1441 2340 525 1441 2340 U 0 445 902 2620 445 902 2620 @L 0 485 891 2780 450 792 2980 -a# 0 4552 0 4554 4508 0 4510 +a# 0 511 -1 257 257 257 -1 aa 0 904 1320 2700 896 1340 2660 E 0 456 1980 2540 440 1980 2540 I 1 384 2030 2610 384 2030 2610 diff --git a/phsource/vowelcharts/en-wm.png b/phsource/vowelcharts/en-wm.png index 1f7d6692..e2023f2e 100644 Binary files a/phsource/vowelcharts/en-wm.png and b/phsource/vowelcharts/en-wm.png differ diff --git a/phsource/vowelcharts/en.png b/phsource/vowelcharts/en.png index 58fac915..5219814d 100644 Binary files a/phsource/vowelcharts/en.png and b/phsource/vowelcharts/en.png differ diff --git a/phsource/vowelcharts/es b/phsource/vowelcharts/es index 3144e76f..44d9c00f 100644 --- a/phsource/vowelcharts/es +++ b/phsource/vowelcharts/es @@ -1,9 +1,8 @@ -a 1 760 1420 2600 736 1380 2540 -a 0 896 1440 2710 896 1440 2710 +a 0 841 1409 2550 841 1409 2550 e 0 504 1900 2544 496 1920 2552 i 0 280 2280 2840 240 2339 2840 o 0 454 812 2559 432 824 2520 -u 0 320 740 2400 320 740 2400 +u 0 320 820 2360 320 820 2360 E 0 584 1820 2560 584 1820 2560 O 0 552 860 2660 552 880 2660 aU 0 847 1383 2510 360 800 2360 diff --git a/phsource/vowelcharts/es-la b/phsource/vowelcharts/es-la index 3144e76f..44d9c00f 100644 --- a/phsource/vowelcharts/es-la +++ b/phsource/vowelcharts/es-la @@ -1,9 +1,8 @@ -a 1 760 1420 2600 736 1380 2540 -a 0 896 1440 2710 896 1440 2710 +a 0 841 1409 2550 841 1409 2550 e 0 504 1900 2544 496 1920 2552 i 0 280 2280 2840 240 2339 2840 o 0 454 812 2559 432 824 2520 -u 0 320 740 2400 320 740 2400 +u 0 320 820 2360 320 820 2360 E 0 584 1820 2560 584 1820 2560 O 0 552 860 2660 552 880 2660 aU 0 847 1383 2510 360 800 2360 diff --git a/phsource/vowelcharts/es-la.png b/phsource/vowelcharts/es-la.png index b2944219..58a5cbb5 100644 Binary files a/phsource/vowelcharts/es-la.png and b/phsource/vowelcharts/es-la.png differ diff --git a/phsource/vowelcharts/es.png b/phsource/vowelcharts/es.png index b2944219..58a5cbb5 100644 Binary files a/phsource/vowelcharts/es.png and b/phsource/vowelcharts/es.png differ diff --git a/phsource/vowelcharts/et b/phsource/vowelcharts/et new file mode 100644 index 00000000..a6214496 --- /dev/null +++ b/phsource/vowelcharts/et @@ -0,0 +1,27 @@ +a 0 712 1160 2780 696 1160 2780 +e 0 504 1700 2480 504 1700 2480 +i 0 320 2255 3030 320 2255 3030 +o 0 488 900 2520 488 920 2520 +u 0 320 820 2360 320 820 2360 +a: 0 688 1064 2806 672 1100 2806 +A1 0 728 1200 2660 712 1200 2660 +e: 0 452 1880 2520 452 1880 2520 +E1 0 592 1580 2480 592 1580 2460 +i: 0 264 2340 2880 240 2339 2860 +I1 0 360 2120 2680 360 2120 2660 +i1 0 336 1440 2460 336 1440 2460 +o: 0 454 812 2559 432 824 2520 +O1 0 584 940 2580 584 940 2580 +u: 0 296 740 2400 296 740 2400 +U1 0 360 860 2360 360 860 2360 +8 0 448 1220 2260 448 1220 2260 +8: 0 464 1140 2640 464 1140 2640 +& 0 736 1540 2500 752 1540 2500 +&: 0 736 1540 2500 752 1540 2500 +Y 0 448 1520 2420 463 1520 2400 +Y: 0 448 1520 2420 463 1520 2400 +y 0 280 1720 2340 280 1720 2340 +y: 0 280 1720 2340 280 1720 2340 +&i 0 744 1540 2500 328 2280 2720 +Yi 0 536 1420 2420 355 2222 2720 +yi 0 280 1720 2320 296 2280 2780 diff --git a/phsource/vowelcharts/et.png b/phsource/vowelcharts/et.png new file mode 100644 index 00000000..74003384 Binary files /dev/null and b/phsource/vowelcharts/et.png differ diff --git a/phsource/vowelcharts/fa b/phsource/vowelcharts/fa new file mode 100644 index 00000000..a1ed6ba0 --- /dev/null +++ b/phsource/vowelcharts/fa @@ -0,0 +1,15 @@ +@ 0 525 1441 2340 525 1441 2340 +@- 0 525 1441 2340 525 1441 2340 +a 0 736 1540 2500 752 1540 2500 +e 0 504 1900 2544 496 1920 2552 +i 0 280 2280 2840 240 2339 2840 +o 0 488 900 2520 488 920 2520 +u 0 320 820 2360 320 820 2360 +m- 1 512 1300 2340 472 1100 2130 +m- 0 512 1300 2340 370 1040 2300 +n- 1 496 1512 2380 480 1500 2540 +n- 0 496 1512 2380 380 1780 2540 +N- 0 504 1824 2548 490 2100 2540 +A 0 656 1000 2620 630 960 2700 +eI 0 547 1855 2536 320 2300 2740 +oU 0 496 900 2520 360 800 2140 diff --git a/phsource/vowelcharts/fa.png b/phsource/vowelcharts/fa.png new file mode 100644 index 00000000..36e9ef0d Binary files /dev/null and b/phsource/vowelcharts/fa.png differ diff --git a/phsource/vowelcharts/fr b/phsource/vowelcharts/fr index 8f31467f..75cdb96d 100644 --- a/phsource/vowelcharts/fr +++ b/phsource/vowelcharts/fr @@ -1,6 +1,6 @@ @ 0 456 1460 2426 456 1460 2426 -@- 0 525 1441 2340 525 1441 2340 -a 0 856 1320 2700 856 1320 2700 +@- 0 456 1460 2426 456 1460 2426 +a 0 845 1270 2695 845 1270 2695 e 0 488 1990 2540 488 1990 2540 i 0 320 2255 3030 320 2255 3030 o 1 412 760 2680 412 760 2680 @@ -13,10 +13,13 @@ A~ 0 624 960 2880 624 960 2880 E~ 1 584 1820 2560 584 1820 2560 E~ 0 694 1360 2624 694 1360 2624 W~ 0 694 1360 2624 694 1360 2624 -O~ 0 392 700 2720 392 700 2720 +O~ 0 344 700 2620 344 700 2620 W 0 552 1441 2400 552 1441 2400 j/ 0 355 2222 2720 355 2222 2720 -a# 0 8562 0 8564 8518 0 8520 +a- 0 845 1270 2695 845 1270 2695 +a# 0 -1 -1 257 257 257 257 +e- 0 488 1990 2540 488 1990 2540 +E- 0 584 1820 2560 584 1820 2560 I 0 408 1940 2600 408 1940 2600 I2 0 408 1920 2580 416 1900 2580 O 1 544 900 2520 544 900 2520 @@ -25,11 +28,12 @@ O 1 544 900 2520 544 900 2520 O 0 488 900 2520 488 920 2520 oU 0 630 1353 2340 390 957 2140 u: 0 320 820 2360 320 820 2360 +y- 0 280 1720 2340 280 1720 2340 W2 0 552 1441 2400 552 1441 2400 Y 0 448 1520 2420 463 1520 2400 U 0 320 820 2360 320 820 2360 y" 1 280 1720 2340 280 1720 2340 y" 0 280 1720 2340 280 1720 2340 E: 0 584 1820 2560 584 1820 2560 -A 0 856 1320 2700 856 1320 2700 +A 0 845 1270 2695 845 1270 2695 V 0 654 1274 2586 654 1274 2586 diff --git a/phsource/vowelcharts/fr-ca b/phsource/vowelcharts/fr-ca index c460bae2..9bb7899f 100644 --- a/phsource/vowelcharts/fr-ca +++ b/phsource/vowelcharts/fr-ca @@ -1,6 +1,6 @@ @ 0 456 1460 2426 456 1460 2426 -@- 0 525 1441 2340 525 1441 2340 -a 0 856 1320 2700 856 1320 2700 +@- 0 456 1460 2426 456 1460 2426 +a 0 845 1270 2695 845 1270 2695 e 0 488 1990 2540 488 1990 2540 i 0 320 2255 3030 320 2255 3030 o 1 412 760 2680 412 760 2680 @@ -17,10 +17,13 @@ E 0 584 1820 2560 584 1820 2560 A~ 0 624 960 2880 624 960 2880 E~ 0 672 1660 2624 672 1660 2624 W~ 0 694 1360 2624 694 1360 2624 -O~ 0 392 700 2720 392 700 2720 +O~ 0 344 700 2620 344 700 2620 W 0 552 1441 2400 552 1441 2400 j/ 0 355 2222 2720 355 2222 2720 -a# 0 8562 0 8564 8518 0 8520 +a- 0 845 1270 2695 845 1270 2695 +a# 0 -1 -1 257 257 257 257 +e- 0 488 1990 2540 488 1990 2540 +E- 0 584 1820 2560 584 1820 2560 I 0 384 2030 2610 384 2030 2610 I2 0 408 1920 2580 416 1900 2580 O 1 544 900 2520 544 900 2520 @@ -29,6 +32,7 @@ O 1 544 900 2520 544 900 2520 O 0 488 900 2520 488 920 2520 oU 0 630 1353 2340 390 957 2140 u: 0 320 820 2360 320 820 2360 +y- 0 280 1720 2340 280 1720 2340 W2 0 552 1441 2400 552 1441 2400 Y 0 448 1520 2420 463 1520 2400 U 0 368 880 2440 368 900 2440 diff --git a/phsource/vowelcharts/fr-ca.png b/phsource/vowelcharts/fr-ca.png index 231cfe15..c6187510 100644 Binary files a/phsource/vowelcharts/fr-ca.png and b/phsource/vowelcharts/fr-ca.png differ diff --git a/phsource/vowelcharts/fr.png b/phsource/vowelcharts/fr.png index 5b71021f..b89cf6da 100644 Binary files a/phsource/vowelcharts/fr.png and b/phsource/vowelcharts/fr.png differ diff --git a/phsource/vowelcharts/hi b/phsource/vowelcharts/hi index b68d7957..97ee73c5 100644 --- a/phsource/vowelcharts/hi +++ b/phsource/vowelcharts/hi @@ -1,16 +1,13 @@ @ 1 584 1440 2460 600 1440 2460 @ 0 544 1220 2520 544 1260 2520 -@- 0 525 1441 2340 525 1441 2340 a 0 658 1408 2460 658 1408 2460 e 0 416 2140 2660 416 2140 2660 i 0 296 2220 2880 288 2260 2900 o 0 454 812 2559 432 824 2520 -@/ 0 544 1220 2520 544 1260 2520 V 1 584 1440 2460 600 1440 2460 V 0 695 1316 2500 695 1316 2500 -@2 0 584 1440 2460 600 1440 2460 @3 0 528 1500 2380 528 1500 2380 -@4 0 525 1441 2340 525 1441 2340 +@2 0 584 1440 2460 600 1440 2460 i: 0 304 2440 3020 304 2440 3020 I 0 360 2120 2680 360 2120 2660 e: 0 416 2140 2660 416 2140 2660 diff --git a/phsource/vowelcharts/hi.png b/phsource/vowelcharts/hi.png index 42a8af39..cbdd703f 100644 Binary files a/phsource/vowelcharts/hi.png and b/phsource/vowelcharts/hi.png differ diff --git a/phsource/vowelcharts/ht b/phsource/vowelcharts/ht index af61ae55..b89c96d7 100644 --- a/phsource/vowelcharts/ht +++ b/phsource/vowelcharts/ht @@ -1,4 +1,4 @@ -a 0 856 1320 2700 856 1320 2700 +a 0 845 1270 2695 845 1270 2695 e 0 436 2076 2604 436 2076 2604 i 0 320 2255 3030 320 2255 3030 o 0 412 760 2680 412 760 2680 diff --git a/phsource/vowelcharts/ht.png b/phsource/vowelcharts/ht.png index 2c8f0da3..0fae69be 100644 Binary files a/phsource/vowelcharts/ht.png and b/phsource/vowelcharts/ht.png differ diff --git a/phsource/vowelcharts/hu b/phsource/vowelcharts/hu index d3e64f9d..5620ee0a 100644 --- a/phsource/vowelcharts/hu +++ b/phsource/vowelcharts/hu @@ -1,4 +1,5 @@ a 0 904 1320 2700 896 1340 2660 +e 0 456 1980 2540 440 1980 2540 i 0 312 2300 2820 304 2300 2820 o 0 488 900 2520 488 920 2520 u 0 368 880 2440 368 900 2440 diff --git a/phsource/vowelcharts/hu.png b/phsource/vowelcharts/hu.png index d666a013..38f99673 100644 Binary files a/phsource/vowelcharts/hu.png and b/phsource/vowelcharts/hu.png differ diff --git a/phsource/vowelcharts/ka b/phsource/vowelcharts/ka index 239856ca..962901ce 100644 --- a/phsource/vowelcharts/ka +++ b/phsource/vowelcharts/ka @@ -1,6 +1,7 @@ @ 0 525 1441 2340 525 1441 2340 @- 0 525 1441 2340 525 1441 2340 a 0 728 1300 2595 736 1300 2595 +e 1 584 1820 2560 584 1820 2560 e 0 647 1778 2530 647 1778 2530 i 0 280 2280 2840 240 2339 2840 o 0 512 860 2648 512 860 2648 diff --git a/phsource/vowelcharts/ka.png b/phsource/vowelcharts/ka.png index 94e6ae49..783efda7 100644 Binary files a/phsource/vowelcharts/ka.png and b/phsource/vowelcharts/ka.png differ diff --git a/phsource/vowelcharts/kk b/phsource/vowelcharts/kk new file mode 100644 index 00000000..9df236cd --- /dev/null +++ b/phsource/vowelcharts/kk @@ -0,0 +1,13 @@ +a 0 834 1220 2690 834 1220 2690 +e 0 395 2068 2720 515 1595 2460 +i 0 312 2213 2775 256 2360 2820 +o 0 412 760 2680 412 760 2680 +u 0 296 740 2400 296 740 2400 +I 0 448 1660 2528 448 1660 2528 +8 0 520 1160 2440 520 1160 2440 +u# 0 352 1420 2260 320 1120 2235 +U 0 388 940 2420 394 980 2360 +A 0 712 1160 2780 696 1160 2780 +& 0 645 1705 2520 645 1705 2520 +E 0 512 1620 2560 512 1620 2560 +Y 0 400 1370 2300 439 1280 2369 diff --git a/phsource/vowelcharts/kk.png b/phsource/vowelcharts/kk.png new file mode 100644 index 00000000..2cef486b Binary files /dev/null and b/phsource/vowelcharts/kk.png differ diff --git a/phsource/vowelcharts/ml b/phsource/vowelcharts/ml index 597cd0de..0f3d2969 100644 --- a/phsource/vowelcharts/ml +++ b/phsource/vowelcharts/ml @@ -16,4 +16,3 @@ o: 0 454 812 2559 432 824 2520 u: 0 320 860 2360 320 860 2460 aI 0 912 1320 2740 360 2200 2820 aU 0 724 1130 2760 472 780 2500 -y 0 496 1312 2408 496 1312 2408 diff --git a/phsource/vowelcharts/ml.png b/phsource/vowelcharts/ml.png index bf692148..5238864e 100644 Binary files a/phsource/vowelcharts/ml.png and b/phsource/vowelcharts/ml.png differ diff --git a/phsource/vowelcharts/mt b/phsource/vowelcharts/mt new file mode 100644 index 00000000..2a426993 --- /dev/null +++ b/phsource/vowelcharts/mt @@ -0,0 +1,26 @@ +@ 0 525 1441 2340 525 1441 2340 +a 0 712 1160 2780 696 1160 2780 +e 0 504 1900 2544 496 1920 2552 +i 0 744 1540 2500 328 2280 2720 +o 0 512 860 2648 512 860 2648 +u 0 320 740 2400 320 740 2400 +I 0 408 1940 2600 408 1940 2600 +Y 0 448 1520 2420 463 1520 2400 +U 0 368 800 2660 368 800 2660 +y 0 280 1720 2340 280 1720 2340 +ai 0 688 1064 2806 312 2300 2820 +oi 0 545 780 2720 310 2002 2500 +ei 0 547 1855 2536 320 2300 2740 +Yi 0 448 1520 2420 355 2222 2720 +ui 0 320 740 2400 272 2247 3100 +yi 0 280 1720 2320 296 2280 2780 +au 0 688 1060 2580 368 900 2540 +ou 0 516 860 2648 312 860 2360 +eu 0 460 1929 2512 327 947 2367 +iu 0 296 2180 2820 320 920 2360 +ey 0 547 1855 2536 280 1720 2340 +Yy 0 448 1520 2420 280 1720 2340 +iy 0 280 2280 2820 280 1720 2340 +uo 0 344 896 2375 494 864 2468 +ie 0 280 2280 2820 728 1562 2520 +yY 0 280 1720 2340 448 1520 2420 diff --git a/phsource/vowelcharts/mt.png b/phsource/vowelcharts/mt.png new file mode 100644 index 00000000..cfc399a5 Binary files /dev/null and b/phsource/vowelcharts/mt.png differ diff --git a/phsource/vowelcharts/ne b/phsource/vowelcharts/ne index 257f2e58..28db33a4 100644 --- a/phsource/vowelcharts/ne +++ b/phsource/vowelcharts/ne @@ -5,12 +5,10 @@ e 0 456 1980 2540 440 1980 2540 i 0 280 2280 2840 240 2339 2840 o 0 488 900 2520 488 920 2520 u 0 320 740 2400 320 740 2400 -@/ 1 584 1440 2460 600 1440 2460 -@/ 0 544 1220 2520 544 1260 2520 V 1 584 1440 2460 600 1440 2460 V 0 544 1220 2520 544 1260 2520 -@2 0 584 1440 2460 600 1440 2460 @3 0 528 1500 2380 528 1500 2380 +@2 0 584 1440 2460 600 1440 2460 I 0 360 2120 2680 360 2120 2660 E 0 584 1820 2560 584 1820 2560 o: 0 424 800 2580 408 780 2600 @@ -25,6 +23,8 @@ o~ 0 448 840 2598 448 840 2598 u~ 0 328 900 2360 328 900 2360 aI 0 752 1140 2820 424 2000 2500 aU 0 724 1130 2760 472 780 2500 +@/ 1 584 1440 2460 600 1440 2460 +@/ 0 544 1220 2520 544 1260 2520 eI 0 680 1800 2440 355 2222 2720 eU 0 460 1929 2512 327 947 2367 VI 0 605 1232 2620 400 2222 2720 diff --git a/phsource/vowelcharts/ne.png b/phsource/vowelcharts/ne.png index 96f6e1a9..b9d47547 100644 Binary files a/phsource/vowelcharts/ne.png and b/phsource/vowelcharts/ne.png differ diff --git a/phsource/vowelcharts/nl b/phsource/vowelcharts/nl index 9da6a061..dfb96322 100644 --- a/phsource/vowelcharts/nl +++ b/phsource/vowelcharts/nl @@ -1,6 +1,6 @@ @ 0 496 1500 2420 496 1500 2420 @- 0 525 1441 2340 525 1441 2340 -a 0 904 1320 2700 896 1340 2660 +a 0 896 1440 2710 896 1440 2710 e 0 456 1980 2540 440 1980 2540 i 0 280 2255 3030 264 2255 3030 o 0 552 860 2660 552 880 2660 @@ -16,7 +16,7 @@ a: 1 728 1300 2595 736 1300 2595 a: 1 800 1320 2637 800 1320 2637 a: 0 904 1320 2700 896 1340 2660 A 1 728 1300 2595 736 1300 2595 -A 0 762 1120 2840 762 1120 2840 +A 0 728 1200 2660 712 1200 2660 A~ 0 624 960 2880 624 960 2880 O~ 0 540 896 2632 512 900 2620 e: 0 464 1980 2520 328 2280 2720 diff --git a/phsource/vowelcharts/nl.png b/phsource/vowelcharts/nl.png index 8b4dc341..73a8f052 100644 Binary files a/phsource/vowelcharts/nl.png and b/phsource/vowelcharts/nl.png differ diff --git a/phsource/vowelcharts/pt-pt b/phsource/vowelcharts/pt-pt index cff17dec..4b715e33 100644 --- a/phsource/vowelcharts/pt-pt +++ b/phsource/vowelcharts/pt-pt @@ -21,7 +21,7 @@ o~ 0 448 840 2598 448 840 2598 u~ 0 328 900 2360 328 900 2360 &~ 0 670 1719 2556 710 1672 2671 &U~ 0 658 1408 2460 392 520 2580 -& 0 8564 0 8566 8520 0 8522 +& 0 257 -1 257 257 257 257 &/ 0 658 1408 2460 658 1408 2460 A 0 896 1440 2710 896 1440 2710 i/ 0 376 1515 2460 376 1515 2460 diff --git a/phsource/vowelcharts/pt-pt.png b/phsource/vowelcharts/pt-pt.png index 43bb1c59..33fec8ff 100644 Binary files a/phsource/vowelcharts/pt-pt.png and b/phsource/vowelcharts/pt-pt.png differ diff --git a/phsource/vowelcharts/si b/phsource/vowelcharts/si new file mode 100644 index 00000000..446157bd --- /dev/null +++ b/phsource/vowelcharts/si @@ -0,0 +1,16 @@ +@ 0 584 1440 2460 600 1440 2460 +a 0 728 1300 2595 736 1300 2595 +e 0 584 1820 2560 584 1820 2560 +i 0 296 2220 2880 288 2260 2900 +o 0 512 860 2648 512 860 2648 +u 0 320 940 2360 320 900 2360 +i: 0 280 2280 2840 240 2339 2840 +e: 0 504 1900 2544 496 1920 2552 +E 0 584 1820 2560 584 1820 2560 +&: 0 680 1660 2520 680 1660 2520 +a: 0 784 1180 2680 776 1200 2680 +o: 0 512 860 2648 512 860 2648 +u: 0 320 940 2360 320 900 2360 +aI 0 904 1320 2700 304 2360 2980 +aU 0 830 1364 2440 488 900 2240 +& 0 680 1660 2520 680 1660 2520 diff --git a/phsource/vowelcharts/si.png b/phsource/vowelcharts/si.png new file mode 100644 index 00000000..92c56af1 Binary files /dev/null and b/phsource/vowelcharts/si.png differ diff --git a/phsource/vowelcharts/sk b/phsource/vowelcharts/sk index 7f4cc85b..91d004d6 100644 --- a/phsource/vowelcharts/sk +++ b/phsource/vowelcharts/sk @@ -1,4 +1,5 @@ @- 0 525 1441 2340 525 1441 2340 +a 1 856 1320 2700 856 1320 2700 a 0 904 1320 2700 896 1340 2660 e 0 504 1900 2544 496 1920 2552 i 0 360 2120 2680 360 2120 2660 diff --git a/phsource/vowelcharts/sk.png b/phsource/vowelcharts/sk.png index 06407360..152949ec 100644 Binary files a/phsource/vowelcharts/sk.png and b/phsource/vowelcharts/sk.png differ diff --git a/phsource/vowelcharts/sq b/phsource/vowelcharts/sq index aca22bdc..9bdb9b77 100644 --- a/phsource/vowelcharts/sq +++ b/phsource/vowelcharts/sq @@ -15,7 +15,7 @@ a/ 0 658 1408 2460 658 1408 2460 A 1 658 1408 2460 658 1408 2460 A 0 664 1040 2800 648 1060 2840 E 0 592 1700 2505 592 1700 2505 -E# 0 592 1580 2460 592 1580 2460 +E# 0 592 1580 2480 592 1580 2460 I 0 312 2213 2775 312 2213 2775 y 0 280 1720 2340 280 1720 2340 O 1 512 860 2648 512 860 2648 diff --git a/phsource/vowelcharts/sq.png b/phsource/vowelcharts/sq.png index 418b40da..6005a776 100644 Binary files a/phsource/vowelcharts/sq.png and b/phsource/vowelcharts/sq.png differ diff --git a/phsource/vowelcharts/tn b/phsource/vowelcharts/tn index 9fc9e8d0..9e3cd7ba 100644 --- a/phsource/vowelcharts/tn +++ b/phsource/vowelcharts/tn @@ -2,7 +2,7 @@ @ 0 536 1420 2420 536 1420 2420 @- 0 525 1441 2340 525 1441 2340 a 0 834 1220 2690 834 1220 2690 -e 0 592 1580 2460 592 1580 2460 +e 0 592 1580 2480 592 1580 2460 i 0 384 2030 2610 384 2030 2610 o 0 630 920 2627 616 940 2627 u 0 360 860 2360 360 860 2360 diff --git a/phsource/vowelcharts/tn.png b/phsource/vowelcharts/tn.png index e0bb97b8..ccef0e5b 100644 Binary files a/phsource/vowelcharts/tn.png and b/phsource/vowelcharts/tn.png differ diff --git a/phsource/vowelcharts/tr b/phsource/vowelcharts/tr index da8289e7..ff59d736 100644 --- a/phsource/vowelcharts/tr +++ b/phsource/vowelcharts/tr @@ -8,5 +8,5 @@ O 0 552 860 2660 552 880 2660 U 0 388 940 2420 394 980 2360 y 0 280 1980 2340 280 1980 2340 Y 0 392 1700 2240 392 1700 2240 -I 0 360 2120 2680 360 2120 2660 +I 0 336 2210 2800 336 2210 2760 W 0 448 1520 2420 463 1520 2400 diff --git a/phsource/vowelcharts/tr.png b/phsource/vowelcharts/tr.png index 8c7bebcf..213f2eec 100644 Binary files a/phsource/vowelcharts/tr.png and b/phsource/vowelcharts/tr.png differ diff --git a/platforms/windows/make_espeak.iss b/platforms/windows/make_espeak.iss index 3494b461..0b6c28d4 100644 --- a/platforms/windows/make_espeak.iss +++ b/platforms/windows/make_espeak.iss @@ -2,7 +2,7 @@ [Setup] AppName=eSpeak -AppVerName=eSpeak version 1.46.01 +AppVerName=eSpeak version 1.46.08 AppCopyright=Licensed under GNU General Public License version 3. (See file License.txt for details). WindowVisible=yes @@ -116,9 +116,9 @@ begin Result := 'en'; // Translation from microsoft codes to language codes - // Used to set default voices for inatallation. + // Used to set default voices for installation. case lang_main of - //$02: Result := 'bg'; + $02: Result := 'bg'; $03: Result := 'ca'; $04: Result := 'zh'; $05: Result := 'cs'; @@ -155,6 +155,7 @@ begin $36: Result := 'af'; $39: Result := 'hi'; //$3a: Result := 'mt'; + //$3f: Result := 'kk'; $41: Result := 'sw'; $49: Result := 'ta'; $4b: Result := 'kn'; @@ -226,6 +227,7 @@ begin 'is': value := $40f; 'it': value := $410; 'ka': value := $437; + 'kk': value := $43f; 'kn': value := $44b; 'ko': value := $412; 'lv': value := $426; diff --git a/src/compiledata.cpp b/src/compiledata.cpp index 32add637..e84767ab 100644 --- a/src/compiledata.cpp +++ b/src/compiledata.cpp @@ -44,6 +44,7 @@ extern void FindPhonemesUsed(void); extern void DisplayErrorFile(const char *fname); extern int utf8_out(unsigned int c, char *buf); +extern void DrawEnvelopes(); char path_source[sizeof(path_home)+20]; @@ -3503,9 +3504,9 @@ fprintf(f_errors,"\nRefs %d, Reused %d\n",count_references,duplicate_references CompileReport(); report_dict = CompileAllDictionaries(); -#ifdef deleted +//#ifdef deleted DrawEnvelopes(); -#endif +//#endif if(gui_flag) { diff --git a/src/compiledict.cpp b/src/compiledict.cpp index a4b56661..31fffa44 100644 --- a/src/compiledict.cpp +++ b/src/compiledict.cpp @@ -879,6 +879,18 @@ static int group3_ix; +int isHexDigit(int c) +{ + if((c >= '0') && (c <= '9')) + return(c - '0'); + if((c >= 'a') && (c <= 'f')) + return(c - 'a' + 10); + if((c >= 'A') && (c <= 'F')) + return(c - 'A' + 10); + return(-1); +} + + static void copy_rule_string(char *string, int &state) {//=================================================== // state 0: conditional, 1=pre, 2=match, 3=post, 4=phonemes @@ -889,9 +901,11 @@ static void copy_rule_string(char *string, int &state) int ix; int len; char c; + int c2, c3; int sxflags; int value; int literal; + int hexdigit_input = 0; MNEM_TAB *mr; if(string[0] == 0) return; @@ -911,18 +925,38 @@ static void copy_rule_string(char *string, int &state) { literal = 0; c = *p++; + if((c == '0') && (p[0] == 'x') && (isHexDigit(p[1]) >= 0) && (isHexDigit(p[2]) >= 0)) + { + hexdigit_input = 1; + c = p[1]; + p+= 2; + } if(c == '\\') { c = *p++; // treat next character literally +//#ifdef deleted if((c >= '0') && (c <= '3') && (p[0] >= '0') && (p[0] <= '7') && (p[1] >= '0') && (p[1] <= '7')) { // character code given by 3 digit octal value; c = (c-'0')*64 + (p[0]-'0')*8 + (p[1]-'0'); p += 2; } +//endif literal = 1; } - + if(hexdigit_input) + { + if(((c2 = isHexDigit(c)) >= 0) && ((c3 = isHexDigit(p[0])) >= 0)) + { + c = c2 * 16 + c3; + literal = 1; + p++; + } + else + { + hexdigit_input = 0; + } + } if((state==1) || (state==3)) { // replace special characters (note: 'E' is reserved for a replaced silent 'e') diff --git a/src/fifo.cpp b/src/fifo.cpp index 39e314d6..bf9cc83f 100644 --- a/src/fifo.cpp +++ b/src/fifo.cpp @@ -60,7 +60,7 @@ static void* say_thread(void*); static espeak_ERROR push(t_espeak_command* the_command); static t_espeak_command* pop(); -static void init(); +static void init(int process_parameters); static int node_counter=0; enum {MAX_NODE_COUNTER=400, INACTIVITY_TIMEOUT=50, // in ms, check that the stream is inactive @@ -75,7 +75,7 @@ void fifo_init() // security pthread_mutex_init( &my_mutex, (const pthread_mutexattr_t *)NULL); - init(); + init(0); assert(-1 != sem_init(&my_sem_start_is_required, 0, 0)); assert(-1 != sem_init(&my_sem_stop_is_acknowledged, 0, 0)); @@ -457,7 +457,7 @@ static void* say_thread(void*) { // no mutex required since the stop command is synchronous // and waiting for my_sem_stop_is_acknowledged - init(); + init(1); // purge start semaphore SHOW_TIME("say_thread > purge my_sem_start_is_required\n"); @@ -569,14 +569,24 @@ static t_espeak_command* pop() } -static void init() +static void init(int process_parameters) { - ENTER("fifo > init"); - while (delete_espeak_command( pop() )) - {} - node_counter = 0; + // Changed by Tyler Spivey 30.Nov.2011 + t_espeak_command *c = NULL; + ENTER("fifo > init"); + c = pop(); + while (c != NULL) { + if (process_parameters && (c->type == ET_PARAMETER || c->type == ET_VOICE_NAME || c->type == ET_VOICE_SPEC)) + { + process_espeak_command(c); + } + delete_espeak_command(c); + c = pop(); + } + node_counter = 0; } + //> //= 7) { // tonic syllable, include a constant component so it doesn't decrease directly with speed - length_mod += 20; + length_mod += tr->langopts.lengthen_tonic; if(emphasized) - length_mod += 10; + length_mod += (tr->langopts.lengthen_tonic/2); } else if(emphasized) { - length_mod += 20; + length_mod += tr->langopts.lengthen_tonic; } if((len = tr->stress_lengths[stress]) == 0) @@ -739,7 +739,8 @@ if(stress <= 1) } } - if(end_of_clause == 2) + + if((end_of_clause == 2) && !(tr->langopts.stress_flags & S_NO_EOC_LENGTHEN)) { // this is the last syllable in the clause, lengthen it - more for short vowels len = (p->ph->std_length * 2); diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 17076c10..d8dbc5e0 100644 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.46.06 29.Nov.11"; +const char *version_string = "1.46.09 09.Dec.11"; const int version_phdata = 0x014600; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index 8216f38a..78ad921d 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -164,6 +164,7 @@ static Translator* NewTranslator(void) } memset(&(tr->langopts),0,sizeof(tr->langopts)); tr->langopts.max_lengthmod = 500; + tr->langopts.lengthen_tonic = 20; tr->langopts.stress_rule = STRESSPOSN_2R; tr->langopts.unstressed_wd1 = 1; @@ -274,11 +275,13 @@ static const unsigned int replace_cyrillic_latin[] = 0x45c,0x107, 0}; // ѓ ѕ ќ + +static const unsigned char ru_vowels[] = {0x10,0x15,0x31,0x18,0x1e,0x23,0x2b,0x2d,0x2e,0x2f, 0xb9,0xc9,0x91,0x8f,0x36,0}; //also kazakh +static const unsigned char ru_consonants[] = {0x11,0x12,0x13,0x14,0x16,0x17,0x19,0x1a,0x1b,0x1c,0x1d,0x1f,0x20,0x21,0x22,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2c, 0x73,0x7b,0x83,0x9b,0}; + static void SetCyrillicLetters(Translator *tr) {//=========================================== // character codes offset by 0x420 - static const char ru_vowels[] = {0x10,0x15,0x31,0x18,0x1e,0x23,0x2b,0x2d,0x2e,0x2f,0}; - static const char ru_consonants[] = {0x11,0x12,0x13,0x14,0x16,0x17,0x19,0x1a,0x1b,0x1c,0x1d,0x1f,0x20,0x21,0x22,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0}; static const char ru_soft[] = {0x2c,0x19,0x27,0x29,0}; // letter group B [k ts; s;] static const char ru_hard[] = {0x2a,0x16,0x26,0x28,0}; // letter group H [S Z ts] static const char ru_nothard[] = {0x11,0x12,0x13,0x14,0x17,0x19,0x1a,0x1b,0x1c,0x1d,0x1f,0x20,0x21,0x22,0x24,0x25,0x27,0x29,0x2c,0}; @@ -291,14 +294,14 @@ static void SetCyrillicLetters(Translator *tr) tr->letter_bits_offset = OFFSET_CYRILLIC; memset(tr->letter_bits,0,sizeof(tr->letter_bits)); - SetLetterBits(tr,LETTERGP_A,ru_vowels); + SetLetterBits(tr,LETTERGP_A,(char *)ru_vowels); SetLetterBits(tr,1,ru_soft); - SetLetterBits(tr,2,ru_consonants); + SetLetterBits(tr,2,(char *)ru_consonants); SetLetterBits(tr,3,ru_hard); SetLetterBits(tr,4,ru_nothard); SetLetterBits(tr,5,ru_voiced); SetLetterBits(tr,6,ru_ivowels); - SetLetterBits(tr,LETTERGP_VOWEL2,ru_vowels); + SetLetterBits(tr,LETTERGP_VOWEL2,(char *)ru_vowels); } // end of SetCyrillicLetters @@ -893,6 +896,30 @@ SetLengthMods(tr,3); // all equal } break; + case L('k','k'): // Kazakh + { + static const unsigned char stress_amps_tr[8] = {18,16, 20,21, 20,21, 21,20 }; + static const short stress_lengths_tr[8] = {190,180, 230,230, 0,0, 250,250}; + + tr->letter_bits_offset = OFFSET_CYRILLIC; + memset(tr->letter_bits,0,sizeof(tr->letter_bits)); + SetLetterBits(tr,LETTERGP_A,(char *)ru_vowels); + SetLetterBits(tr,LETTERGP_C,(char *)ru_consonants); + SetLetterBits(tr,LETTERGP_VOWEL2,(char *)ru_vowels); + + SetupTranslator(tr,stress_lengths_tr,stress_amps_tr); + + tr->langopts.stress_rule = 7; // stress on the last syllable, before any explicitly unstressed syllable + tr->langopts.stress_flags = S_NO_AUTO_2 + S_NO_EOC_LENGTHEN; //no automatic secondary stress, don't lengthen at end-of-clause + tr->langopts.lengthen_tonic = 0; + tr->langopts.param[LOPT_SUFFIX] = 1; + + tr->langopts.numbers = NUM_OMIT_1_HUNDRED | NUM_DFRACTION_6 ; + tr->langopts.max_initial_consonants = 2; +SetLengthMods(tr,3); // all equal + } + break; + case L('k','o'): // Korean, TEST { static const char ko_ivowels[] = {0x63,0x64,0x67,0x68,0x6d,0x72,0x74,0x75,0}; // y and i vowels diff --git a/src/translate.cpp b/src/translate.cpp index 731a9e5a..3ac2de4b 100644 --- a/src/translate.cpp +++ b/src/translate.cpp @@ -334,16 +334,16 @@ static unsigned char length_mods_en0[100] = { static unsigned char length_mods_equal[100] = { /* a , t s n d z r N <- next */ - 110,110,110,110,110,110,110,110,110, 110, /* a <- next2 */ - 110,110,110,110,110,110,110,110,110, 110, /* , */ - 110,110,110,110,110,110,110,110,110, 110, /* t */ - 110,110,110,110,110,110,110,110,110, 110, /* s */ - 110,110,110,110,110,110,110,110,110, 110, /* n */ - 110,110,110,110,110,110,110,110,110, 110, /* d */ - 110,110,110,110,110,110,110,110,110, 110, /* z */ - 110,110,110,110,110,110,110,110,110, 110, /* r */ - 110,110,110,110,110,110,110,110,110, 110, /* N */ - 110,110,110,110,110,110,110,110,110, 110 }; // SPARE + 110,120,100,110,110,110,110,110,110, 110, /* a <- next2 */ + 110,120,100,110,110,110,110,110,110, 110, /* , */ + 110,120,100,110,100,110,110,110,100, 110, /* t */ + 110,120,100,110,110,110,110,110,110, 110, /* s */ + 110,120,100,110,110,110,110,110,110, 110, /* n */ + 110,120,100,110,110,110,110,110,110, 110, /* d */ + 110,120,100,110,110,110,110,110,110, 110, /* z */ + 110,120,100,110,110,110,110,110,110, 110, /* r */ + 110,120,100,110,110,110,110,110,110, 110, /* N */ + 110,120,100,110,110,110,110,110,110, 110 }; // SPARE static unsigned char *length_mod_tabs[6] = { diff --git a/src/translate.h b/src/translate.h index 49d8f013..0f0a9826 100644 --- a/src/translate.h +++ b/src/translate.h @@ -355,6 +355,7 @@ typedef struct { #define S_INITIAL_2 0x2000 #define S_NO_AUTO_DIM 0x10000 #define S_HYPEN_UNSTRESS 0x100000 +#define S_NO_EOC_LENGTHEN 0x200000 // bit0=don't stress monosyllables, except at end of clause // bit1=don't set diminished stress, // bit2=mark unstressed final syllables as diminished @@ -373,6 +374,7 @@ typedef struct { // bit18= don't lengthen short vowels more than long vowels at end-of-clause // bit19=stress on final syllable if it has a long vowel, but previous syllable has a short vowel // bit20= hyphenated words, 2nd part is unstressed +// bit21= don't lengthen vowels at end-of-clause int stress_flags; int unstressed_wd1; // stress for $u word of 1 syllable @@ -398,6 +400,7 @@ typedef struct { #define NUM_DFRACTION_3 0x6000 #define NUM_DFRACTION_4 0x8000 #define NUM_DFRACTION_5 0xa000 +#define NUM_DFRACTION_6 0xc000 #define NUM_ORDINAL_DOT 0x10000 #define NUM_NOPAUSE 0x20000 #define NUM_AND_HUNDRED 0x40000 @@ -476,7 +479,8 @@ typedef struct { const unsigned int *replace_chars; // characters to be substitutes const char *ascii_language; // switch to this language for Latin characters int max_lengthmod; - int suffix_add_e; // replace a suffix (which has the SUFX_E flag) with this character + int lengthen_tonic; // lengthen the tonic syllable + int suffix_add_e; // replace a suffix (which has the SUFX_E flag) with this character } LANGUAGE_OPTIONS;