diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 03ff95a5..8a94af6e 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -313,7 +313,7 @@ Dictionary is_dict & @- a aI aU e E eI i I o O oU oU2 u W -y Yy +y y# Yy * : ; b c C d D f g h j J k l l# diff --git a/dictsource/en_rules b/dictsource/en_rules index ef8e9851..230b1cb3 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -5130,6 +5130,7 @@ ? (? kwEstS@nmA@ks ?) ? : koUl@n + D_) : (_DD_ // omit colon in time, eg: 2:30 $ d0l3 % p3sEnt ?5 % pVRs'Ent diff --git a/dictsource/is_list b/dictsource/is_list index a9f2b916..c6b2b41f 100755 --- a/dictsource/is_list +++ b/dictsource/is_list @@ -359,7 +359,7 @@ _í i: í i: $atend j j'o:D k k'aU: -l El +l Etl# m Em n En p pje: diff --git a/dictsource/is_rules b/dictsource/is_rules index b026bd8f..c05dd45a 100644 --- a/dictsource/is_rules +++ b/dictsource/is_rules @@ -18,6 +18,7 @@ au (CC Yy _) al (@P2N ,a:l + _) a (ll+ & .group á á aU: @@ -222,13 +223,13 @@ .group r - _) r @-* + _) r R2 C) r @-* - A) r (A @-* + A) r (A R L08) r r# r (L08 r# r (_ r# - r r + r R rl dl rl (K rtl# rn rdn# @@ -256,6 +257,7 @@ u (CC y K) u (ng u K) u (nk u + &) ur (_ y#r# .group ú diff --git a/phsource/compile_report b/phsource/compile_report index ab75ee94..4071c554 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -30,7 +30,7 @@ el 8 114 sv 25 115 no 29 119 - is 32 118 + is 33 119 vi 41 130 zh_yue 32 121 sw 14 102 @@ -513,6 +513,7 @@ 1 vowel/V_4 en_sc 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 2 vowel/y_2 fr 2 vowel/y#_2 hu sv 1 vowel/y_3 af diff --git a/phsource/ph_icelandic b/phsource/ph_icelandic index 6cd18ca7..f93a0818 100644 --- a/phsource/ph_icelandic +++ b/phsource/ph_icelandic @@ -87,6 +87,12 @@ phoneme y formants vowel/yy_4 endphoneme +phoneme y# + vowel starttype (@) endtype (@) + length 130 + formants vowel/y## +endphoneme + phoneme W vowel starttype (@) endtype (@) length 130 diff --git a/phsource/vdiph/y#i_2 b/phsource/vdiph/y#i_2 index 47821923..28bc900b 100644 Binary files a/phsource/vdiph/y#i_2 and b/phsource/vdiph/y#i_2 differ diff --git a/phsource/vowel/y## b/phsource/vowel/y## new file mode 100644 index 00000000..508f2472 Binary files /dev/null and b/phsource/vowel/y## differ diff --git a/phsource/vowel/yy_4 b/phsource/vowel/yy_4 index fcd827a1..f96066ac 100644 Binary files a/phsource/vowel/yy_4 and b/phsource/vowel/yy_4 differ diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 0dfa7629..166c8298 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.04 23.May.07"; +const char *version_string = "1.25.06 23.May.07"; const int version_phdata = 0x012501; int option_device_number = -1; diff --git a/src/transldlg.cpp b/src/transldlg.cpp index 0384dbf7..627daee3 100755 --- a/src/transldlg.cpp +++ b/src/transldlg.cpp @@ -295,7 +295,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event) case MENU_SPEAK_TRANSLATE: SpeakNextClause(NULL,NULL,2); // stop speaking file - strncpy0(buf,t_source->GetValue().mb_str(wxConvLocal),sizeof(buf)); + strncpy0(buf,t_source->GetValue().mb_str(wxConvUTF8),sizeof(buf)); phon_out[0] = 0; n_ph_list = 0; clause_count = 0; @@ -329,14 +329,13 @@ void TranslDlg::OnCommand(wxCommandEvent& event) rewind(f_trans); while(fgets(buf,sizeof(buf),f_trans) != NULL) { - t_phonetic->AppendText(wxString(buf,wxConvLocal)); + t_phonetic->AppendText(wxString(buf,wxConvUTF8)); } t_phonetic->AppendText(_T("---\n")); fclose(f_trans); remove(fname_temp); } t_phonetic->AppendText(wxString(phon_out,wxConvLocal)); -// MbrolaTranslate(ph_list,n_ph_list,stdout); // for Testing break; case T_PROCESS: