From 3899776fadf90927b4466b55a087eb37ba898240 Mon Sep 17 00:00:00 2001 From: jonsd Date: Sat, 12 May 2007 17:29:43 +0000 Subject: [PATCH] Write version_phdata number to phondata file so that the byte order is correct for both little and big-endian processors. Adjust phoneme [R]. Lang=ru Revert to phonemes [S] and [Z] instead of [s.] and [z.]. Lang=ru Remove rule to give 1st syllable a secondary stress if the second syllable has a primary stress. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@9 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/ru_list | 10 ++-- dictsource/ru_rules | 121 ++++++++++++++++++++-------------------- phsource/compile_report | 8 +-- phsource/ph_slovak | 12 ++++ phsource/phonemes | 5 +- phsource/r3/r_trill | Bin 5809 -> 5811 bytes phsource/r3/r_trill.wav | Bin 5366 -> 5366 bytes src/compiledata.cpp | 4 +- src/dictionary.cpp | 12 +++- src/synthdata.cpp | 2 +- src/tr_languages.cpp | 4 +- src/translate.h | 3 +- 12 files changed, 101 insertions(+), 80 deletions(-) diff --git a/dictsource/ru_list b/dictsource/ru_list index 8e7d8a83..00391980 100644 --- a/dictsource/ru_list +++ b/dictsource/ru_list @@ -18,7 +18,7 @@ _2 dv'A _3 t;r'i _4 ts;It'yr;I _5 p;'jat; -_6 s.'Es;t; +_6 S'Es;t; _7 s;'em _8 v'os;E2m _9 d;'ev;It; @@ -28,7 +28,7 @@ _12 dv;In'AttsVt; _13 tr;In'AttsVt; _14 ts;It'y@-*nVttsVt; _15 p;Itn'AttsVt; -_16 s.E#stn'AttsVt; +_16 SE#stn'AttsVt; _17 s;Imn'AttsVt; _18 vOs;Imn'AttsVt; _19 d;E2v;Itn'AttsVt; @@ -36,7 +36,7 @@ _2X dv'AttsVt; _3X tr;'ittsVt; _4X s'o@-*Ok _5X p;Id;d;Is;'jat -_6X s.E2z;d;d;Is;'jat +_6X SE2z;d;d;Is;'jat _7X s;'emd;E2s;It _8X v'os;E2md;E2s;It _9X d;E2v;In'ostO @@ -45,7 +45,7 @@ _2C dv;'es;t;I _3C tr;'ista _4C ts;It'yr;E2sta _5C p;,It;s'ot -_6C s.,E#s;t;s'ot +_6C S,E#s;t;s'ot _7C s;,Ims'ot _8C vOs;Ims'ot _9C d;E2v;It;s'ot @@ -82,7 +82,7 @@ _dpt2 _d;Is;'atYx // end of decimal fraction // questions -что s.to $u $pause // what, that +что Sto $u $pause // what, that // misc. diff --git a/dictsource/ru_rules b/dictsource/ru_rules index f6f430f3..5b2affab 100755 --- a/dictsource/ru_rules +++ b/dictsource/ru_rules @@ -177,25 +177,25 @@ .group ж - _) ж (_ z.E - ж (кY s. - ж (кь s. - ж (пY s. - ж (пь s. - ж (сь s. - ж (сY s. - ж (ть s. - ж (тY s. - ж (фь s. - ж (фY s. - ж (ффь s. - ж (ффY s. - ж (хь s. - ж (хY s. - ж (хкY s. - ж (хкь s. + _) ж (_ ZE + ж (кY S + ж (кь S + ж (пY S + ж (пь S + ж (сь S + ж (сY S + ж (ть S + ж (тY S + ж (фь S + ж (фY S + ж (ффь S + ж (ффY S + ж (хь S + ж (хY S + ж (хкY S + ж (хкь S - ж z. + ж Z .group з _) з (_ zE @@ -243,8 +243,8 @@ з (сь s; з (сY s; - з (ж z. - з (ш s. + з (ж Z + з (ш S з (щ s;s; з (ч s;s; з z @@ -285,7 +285,6 @@ .group л _) л (_ El^ -// л (_ l^ // rule removed л (Y l^ л l @@ -308,21 +307,21 @@ .group н _) н (_ En - н (ь n; + н (ь n^ н (Y n; - н (B n; - н (дь n; - н (дY n; - н (дB n; - н (ть n; - н (тY n; - н (зь n; - н (зY n; - н (сь n; - н (сY n; - н (нь n; - н (нY n; - н (нB n; + н (B n^ + н (дь n^ + н (дY n^ + н (дB n^ + н (ть n^ + н (тY n^ + н (зь n^ + н (зY n^ + н (сь n^ + н (сY n^ + н (нь n^ + н (нY n^ + н (нB n^ н n @@ -330,10 +329,8 @@ .group о о o о (B oj - о (Cь oj о (FY oj - .group п _) п (_ pE п (б b @@ -400,10 +397,10 @@ с (дY z; с (дB z; - с (ж z. - с (ш s. - с (щ s; - с (ч s; + с (ж Z + с (ш S + с (щ s;s; + с (ч s;s; с s @@ -434,7 +431,7 @@ т (ж d - т t + т t .group у _) у (_ u @@ -550,27 +547,27 @@ .group ш - _) ш (_ s.A - ш (б z. - ш (бь z. - ш (бY z. - ш (бмь z. - ш (бмY z. - ш (бвь z. - ш (бвY z. - ш (г z. - ш (гь z. - ш (гY z. - ш (д z. - ш (дь z. - ш (дY z. - ш (дB z. - ш (ж z. - ш (з z. - ш (зь z. - ш (зY z. + _) ш (_ SA + ш (б Z + ш (бь Z + ш (бY Z + ш (бмь Z + ш (бмY Z + ш (бвь Z + ш (бвY Z + ш (г Z + ш (гь Z + ш (гY Z + ш (д Z + ш (дь Z + ш (дY Z + ш (дB Z + ш (ж Z + ш (з Z + ш (зь Z + ш (зY Z - ш s. + ш S .group щ _) щ (_ S;ja diff --git a/phsource/compile_report b/phsource/compile_report index c5110806..acd57941 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -18,7 +18,7 @@ hu 24 109 nl 25 112 pl 17 103 - sk 22 118 + sk 23 118 cs 7 119 hr 16 122 ru 36 120 @@ -248,15 +248,15 @@ 7 ustop/p_unasp base fi hi hu hr it ro 6 ustop/p_unasp_ fi hi hu hr it ro 2 ustop/t base hi - 4 ustop/t_ base hi el + 5 ustop/t_ base hi sk el 26 ustop/t_dnt base fi fr hi hu pl hr ru it ro vi sw 2 ustop/t_dnt2 hi vi 4 ustop/t_pzd pl ru - 7 ustop/tr base hi ru el + 9 ustop/tr base hi sk ru el 8 ustop/ts de eo hu pl ru it ro zh_yue 2 ustop/tsh base zh_yue 2 ustop/tsh_ base zh_yue - 2 ustop/t_short hi el + 3 ustop/t_short hi sk el 8 ustop/ts_pzd base hi ru 2 ustop/ts_pzd_ hi hu 2 ustop/ts_pzd2 hi hu diff --git a/phsource/ph_slovak b/phsource/ph_slovak index d25e10d2..b304ae67 100644 --- a/phsource/ph_slovak +++ b/phsource/ph_slovak @@ -138,4 +138,16 @@ phoneme w after _ w/w2 endphoneme +phoneme t + vls alv stop + vowelin f1=0 f2=1700 -300 300 f3=-100 80 + vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 + lengthmod 2 + wave ustop/t_short + before _ ustop/t_ + before r ustop/tr + before R ustop/tr + switchvoicing d +endphoneme + diff --git a/phsource/phonemes b/phsource/phonemes index 2f1f2a76..750ecff2 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -383,7 +383,8 @@ phoneme R liquid vowelin f1=0 f2=1700 -300 300 f3=-300 80 vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk - formants r3/r_trill+r3/r_trill.wav%60 + formants r3/r_trill+r3/r_trill.wav%45 + trill lengthmod 6 endphoneme @@ -1028,7 +1029,7 @@ phoneme s. vowelout f1=0 f2=1800 -100 300 f3=-300 80 length 100 lengthmod 3 - wave ufric/sh_rfx%80 + wave ufric/sh_rfx%90 before _ ufric/sh_rfx%60 switchvoicing z. endphoneme diff --git a/phsource/r3/r_trill b/phsource/r3/r_trill index cc9efda413353ab709fa31f70a50320354b3035c..45211f84165ea5e78dacecf7929129ddc7e36766 100644 GIT binary patch delta 165 zcmdm}yIEH(IKb68B-k~Ooq>U&D88g9Gbe|Q!F!{~eP)Y0Kp_xtVBXy-4`xkeWMS|I zvq~5k*yk~cF-J09W8h`_!4tvsfbj>1I^#lC2A<8@EQ^?xQc%==XL!vBQ+EWW?mhb| YW+{j{jErhbF!}c!mm%hC=KjY806C;55dZ)H delta 145 zcmdn2yHQspIKb68B-k~Om4ShwC_cH^h>gK*qu70BixWTr5O84L-6{`eO=Wapa09bS z7%h diff --git a/phsource/r3/r_trill.wav b/phsource/r3/r_trill.wav index 6fa3ac82ef40ec4c03089a7c07e513e52873af96..f6b228b290e30880ff75d2ec1f4325e8c852a5af 100644 GIT binary patch literal 5366 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 diff --git a/src/compiledata.cpp b/src/compiledata.cpp index 02e85a68..9d7e84d5 100755 --- a/src/compiledata.cpp +++ b/src/compiledata.cpp @@ -1997,8 +1997,8 @@ memset(markers_used,0,sizeof(markers_used)); } // write a word so that further data doesn't start at displ=0 - fwrite(&version_phdata,4,1,f_phdata); - fwrite(&version_phdata,4,1,f_phindex); + Write4Bytes(f_phdata,version_phdata); + Write4Bytes(f_phindex,version_phdata); memset(ref_hash_tab,0,sizeof(ref_hash_tab)); diff --git a/src/dictionary.cpp b/src/dictionary.cpp index 40ee9398..8c7d7408 100755 --- a/src/dictionary.cpp +++ b/src/dictionary.cpp @@ -1097,7 +1097,16 @@ void Translator::SetWordStress(char *output, unsigned int dictionary_flags, int stress = 3; - if((langopts.stress_flags & 0x1000) && (vowel_stress[1] == 0)) + if((langopts.stress_flags & 0x1000) && (vowel_count == 2)) + { + // Two syllable word, if one syllable has primary stress, then give the other secondary stress + if(vowel_stress[1] == 4) + vowel_stress[2] = 3; + if(vowel_stress[2] == 4) + vowel_stress[1] = 3; + } +#if deleted + if((langopts.stress_flags & 0x2000) && (vowel_stress[1] == 0)) { // If there is only one syllable before the primary stress, give it a secondary stress if((vowel_count > 2) && (vowel_stress[2] >= 4)) @@ -1105,6 +1114,7 @@ void Translator::SetWordStress(char *output, unsigned int dictionary_flags, int vowel_stress[1] = 3; } } +#endif for(v=1; v