diff --git a/dictsource/hu_list b/dictsource/hu_list index f66e5740..e8f80134 100644 --- a/dictsource/hu_list +++ b/dictsource/hu_list @@ -1,29 +1,3 @@ -// Letters -_a A: -b be: -c tse: -d de: -f Ef -g ge: -h ha: -j je: -k ka: -l El -m Em -n En -p pe: -q ku: -r ER -s S_ -s ES $atend -_s ES -v ve: -w duplAve: -x iks -y ipsilAn -z ze: -_. pont - // Numbers @@ -68,10 +42,10 @@ _dpt v,Ess2Y: // Articles a $u -a A: $atend // letter "a" az $u +aki $u+ // that -ez $u // this +ez $u+ // this // Pronouns @@ -155,6 +129,33 @@ tudunk $u+ tudtok $u+ tudnak $u+ +// Letters +_a A: +a A: $atend // letter "a" +b be: +c tse: +d de: +f Ef +g ge: +h ha: +j je: +k ka: +l El +m Em +n En +p pe: +q ku: +r ER +s S_ +s ES $atend +_s ES +v ve: +w duplAve: +x iks +y ipsilAn +z ze: +_. pont + // Main Exceptions List //===================== diff --git a/dictsource/hu_rules b/dictsource/hu_rules index e2f0e081..2cec9ec8 100644 --- a/dictsource/hu_rules +++ b/dictsource/hu_rules @@ -5,6 +5,8 @@ .group a a A + _) a (_ %A + .group á á a: @@ -12,6 +14,8 @@ b b bb b: + bizal (mát b'iz'Al // TEST + .group c c ts cc ts: @@ -23,6 +27,9 @@ pszi) ch C pszy) ch C mün) ch (en C + maso) ch (istA C + + _sto) ck (holm k .group d @@ -53,6 +60,7 @@ .group é é e: + éi (é e::i: .group ë ë e @@ -77,6 +85,11 @@ C) gyj J A) gyj (A J: + _e) gy (es J: + _e) gy (ik J: +_minde) gy (ik J: + + .group h h h h (_ @@ -113,7 +126,6 @@ ny n^ nny n^n^ nj n^ - nyj n^ ny (k N ny (g N @@ -152,12 +164,17 @@ sz s ssz ss2 + sz (öld Sz + + .group t _) t (_ te: -) t (_ t t t tt t: ty c + s) ty c: // + z) ty c: // keztyű tty c: ts tS @@ -212,6 +229,13 @@ zs Z zzs Z: + ga) zs (ág zS + _ví) zsz (int zs: + _gá) zsz (ámla zs: + _gá) zsz (ámlá zs: + _ré) zs (ó zS + _há) zs (or zS + _vá) zs (or zS .group % sa:zAle:k diff --git a/phsource/compile_report b/phsource/compile_report index 40138c01..590614f1 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -24,8 +24,8 @@ ru 36 122 it 28 115 es 6 115 - pt 28 132 - pt_pt 20 132 + pt 34 138 + pt_pt 20 138 ro 36 139 el 8 115 sv 25 116 @@ -418,14 +418,14 @@ 2 vowel/@_4 nl hr 3 vowel/8_2 en_us hr sv 1 vowel/8_3 zh_yue - 11 vowel/a en_n cy de hu nl pl sk hr + 12 vowel/a en_n cy de hu nl pl sk hr pt 4 vowel/a# en_sc it pt - 5 vowel/a_2 eo it pt_pt ro vi - 4 vowel/a#_2 hr sv is sw - 6 vowel/a_3 en_sc cs is + 6 vowel/a_2 eo it pt pt_pt ro vi + 5 vowel/a#_2 hr pt sv is sw + 7 vowel/a_3 en_sc cs pt is 12 vowel/a#_3 en en_n en_us en_wm de hi ru pt_pt vi zh_yue 4 vowel/a_4 en_wm el vi - 2 vowel/a_5 sv sw + 3 vowel/a_5 pt sv sw 7 vowel/aa en_us fi fr_ca no zh_yue 1 vowel/aa# fi 3 vowel/aa_2 en cy @@ -512,7 +512,7 @@ 2 vowel/V en en_sc 3 vowel/V_2 af ru 3 vowel/V_3 en_rp hi vi - 1 vowel/V_4 en_sc + 2 vowel/V_4 en_sc pt 6 vowel/y en de fi hu nl zh_yue 10 vowel/y# en en_wm de fi fr hu nl ro vi zh_yue 1 vowel/y## is diff --git a/phsource/dzh/dz_pzd_ b/phsource/dzh/dz_pzd_ index e61cdcea..73aa5551 100644 Binary files a/phsource/dzh/dz_pzd_ and b/phsource/dzh/dz_pzd_ differ diff --git a/phsource/dzh/xdz_pzd b/phsource/dzh/xdz_pzd index 13d26d89..584c60e8 100644 Binary files a/phsource/dzh/xdz_pzd and b/phsource/dzh/xdz_pzd differ diff --git a/phsource/ph_hungarian b/phsource/ph_hungarian index 2240ea2c..cbc17570 100644 --- a/phsource/ph_hungarian +++ b/phsource/ph_hungarian @@ -10,7 +10,7 @@ phoneme i: vowel starttype (i) endtype (i) length 200 formants vowel/i - linkout ; +// linkout ; endphoneme phoneme E @@ -33,7 +33,7 @@ endphoneme phoneme A vowel starttype (o) endtype (o) - length 140 + length 150 formants vowel/0_3 endphoneme @@ -186,8 +186,6 @@ endphoneme - - phoneme s2 // second part of geminated [s:] vls alv frc sibilant vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_portuguese b/phsource/ph_portugual similarity index 79% rename from phsource/ph_portuguese rename to phsource/ph_portugual index 7be7b497..96cb6713 100644 --- a/phsource/ph_portuguese +++ b/phsource/ph_portugual @@ -32,6 +32,12 @@ phoneme &~ formants vnasal/ee_n2 endphoneme +phoneme &U~ + vowel starttype (@) endtype (u) + length 240 + formants vnasal/a#u_n +endphoneme + phoneme E @@ -134,4 +140,28 @@ phoneme x // [r] for Portugal endphoneme +phoneme R + liquid starttype r endtype r + length 100 + lengthmod 7 + beforenotvowel r/ + trill + formants r/r + after _ r/_r t r/tr p r/tr k r/tr + before _ r/r_ +endphoneme + + +phoneme s# // This is [s] for Brazi;, [S] for Portugal + vls pla frc sibilant + vowelin f1=0 f2=2100 100 300 f3=-100 80 + vowelout f1=0 f2=2100 100 300 f3=-100 80 + length 100 + lengthmod 3 + wave ufric/sh + before _ ufric/sh_ + switchvoicing Z +endphoneme + + diff --git a/phsource/ph_pt_brazil b/phsource/ph_pt_brazil index ec96ee5e..969b1450 100644 --- a/phsource/ph_pt_brazil +++ b/phsource/ph_pt_brazil @@ -66,10 +66,46 @@ endphoneme phoneme A // for "al" in European Portuguese vowel starttype (a) endtype (a) length 200 - formants vowel/aa_7 -// reduceto & 4 + formants vowel/a_3 endphoneme +phoneme A2 // for "al" in European Portuguese + vowel starttype (a) endtype (a) + length 200 + formants vowel/aa_7 +endphoneme + +phoneme A3 // for "al" in European Portuguese + vowel starttype (a) endtype (a) + length 200 + formants vowel/a_5 +endphoneme + +phoneme A4 // for "al" in European Portuguese + vowel starttype (a) endtype (a) + length 200 + formants vowel/a_2 +endphoneme + +phoneme A5 // for "al" in European Portuguese + vowel starttype (a) endtype (a) + length 200 + formants vowel/a +endphoneme + +phoneme A6 // for "al" in European Portuguese + vowel starttype (a) endtype (a) + length 200 + formants vowel/V_4 +endphoneme + +phoneme A7 // for "al" in European Portuguese + vowel starttype (a) endtype (a) + length 200 + formants vowel/a#_2 +endphoneme + + phoneme E vowel starttype (e) endtype (e) diff --git a/phsource/vowel/a_3 b/phsource/vowel/a_3 index 96d81019..b80f83eb 100644 Binary files a/phsource/vowel/a_3 and b/phsource/vowel/a_3 differ diff --git a/phsource/vowel/aa_7 b/phsource/vowel/aa_7 index 504dc1d2..993aa096 100644 Binary files a/phsource/vowel/aa_7 and b/phsource/vowel/aa_7 differ diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 78cdd7a7..39652f26 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.25.09 26.May.07"; +const char *version_string = "1.25.10 27.May.07"; const int version_phdata = 0x012501; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index 23ac3d9b..b4f14836 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -313,7 +313,7 @@ Translator *SelectTranslator(const char *name) case L('h','u'): // Hungarian { static int stress_amps_hu[8] = {17,17, 19,19, 20,24, 24,22 }; - static int stress_lengths_hu[8] = {190,190, 190,190, 0,0, 200,210}; + static int stress_lengths_hu[8] = {185,190, 190,190, 0,0, 210,220}; // static int stress_lengths_hu[8] = {180,180, 200,190, 0,0, 210,225}; static const wchar_t replace_chars_hu[] = {0xd4,0xf4,0xdb,0xfb,0}; static const unsigned int replacement_chars_hu[] = {0x150,0x151,0x170,0x171,0}; // allow o,u-circumflex for o,u-double-acute @@ -328,7 +328,7 @@ Translator *SelectTranslator(const char *name) tr->langopts.stress_rule = 0; tr->langopts.stress_flags = 0x36; tr->langopts.unstressed_wd1 = 2; - tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 0x2; // don't propagate over v + tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 0x4; // don't propagate over word boundaries tr->langopts.param[LOPT_IT_DOUBLING] = 1; tr->langopts.long_stop = 130;