diff --git a/dictsource/ru_list b/dictsource/ru_list index 7d74ee63..a644b566 100644 --- a/dictsource/ru_list +++ b/dictsource/ru_list @@ -28,7 +28,7 @@ _2X dv'AttsVt; _3X tr;'ittsVt; _4X s'o@-rOk _5X p;Vd;d;Is;'jat -_6X Syz;d;is;'jat +_6X SE#z;d;is;'jat _7X s;'emd;E2s;Vt _8X v'os;I3md;E2s;Vt _9X d;E2v;In'ostO @@ -73,7 +73,6 @@ _0M10 nVn;il;i'onV#f _0MA10 nVn;il;i'ona _dpt _:'i_: // start of decimal fraction _dpt2 _d;Is;'atYx // end of decimal fraction -_dpt3 _sotyx // end of decimal fraction // symbols _` akts'Ent @@ -133,8 +132,8 @@ _, zVpit'aja у u $u // by // conjunctions -а $u $pause // and -и i $u $pause // and +а $u // and +и I $u // and или $u или $atend // stressed at the end ибо $u $pause // for @@ -146,7 +145,8 @@ _, zVpit'aja что Sto $u $pause // what, that // misc. -не $u // negative +не n;I $u // negative +?3 не nI $u не $atend // stressed at the end ни $u // uther form of не diff --git a/espeak-ng-data/lang/zle/ru b/espeak-ng-data/lang/zle/ru index f5a75fc8..959754b6 100644 --- a/espeak-ng-data/lang/zle/ru +++ b/espeak-ng-data/lang/zle/ru @@ -2,4 +2,3 @@ name Russian language ru replace 03 a a# dict_min 20000 -speed 95 diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test index b0d378a2..e29001f6 100755 --- a/tests/language-phonemes.test +++ b/tests/language-phonemes.test @@ -117,7 +117,7 @@ test_phwav qdb 4ee6801e86937a1fb46fd337e804b5c36296c079 "ma na Na pa ta ka ba d test_phwav quc 0c7199d688488c4e71bb7096cd5c9ab518d4b19d "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" test_phwav qya b9b73f37cc0ecb4fb1d30830847123ac53a2bf4a "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" test_phwav ro 1d4a597446e9c02da47af76ba08bb3b067d55c44 "ma na n^a pa ta ka ba da ga fa Ta sa Sa J^a xa Da tSa la l^a *a Ra ra v#a _:_ ma ma/ me me/ mE mi mo mo/ mu moI" -test_phwav ru 20aaefaeb63d1a51af6f997ce74d82dc4dcf0f8c "ma na pa ba ta da tSa dZa tsa dza ca Ja Ca ka ga fa va sa za Sa Za xa Qa ha la ja wa Ra *a _:_ mi me m& my mW mu mo ma m@" +test_phwav ru 4fa971f03b58d68a26130f33ff0d0dfda44e7a4a "ma na pa ba ta da tSa dZa tsa dza ca Ja Ca ka ga fa va sa za Sa Za xa Qa ha la ja wa Ra *a _:_ mi me m& my mW mu mo ma m@" test_phwav ru-cl 20aaefaeb63d1a51af6f997ce74d82dc4dcf0f8c "ma na pa ba ta da tSa dZa tsa dza ca Ja Ca ka ga fa va sa za Sa Za xa Qa ha la ja wa Ra *a _:_ mi me m& my mW mu mo ma m@" test_phwav ru-LV d9e3e425268d7ed140d1bf0e883e4dacc25d7749 "ma na pa ba ta da tSa dZa tsa dza ca Ja Ca ka ga fa va sa za Sa Za xa Qa ha la ja wa Ra *a _:_ mi me m& my mW mu mo ma m@" test_phwav sd e0ce9b04c614df8b34180478f2f87ae58baa95ba "ma na n.a n^a pa t#a t.a tSa ka qa p#a t.#a c#a k#a ba d#a d.a dZa ga b#a d.#a J#a g#a fa sa Sa xa va za Za Qa Ha ra r.a la ja _:_ mI mU me m@ mo mE mV mO ma mi: mu: me: mo: mE: mO: ma: m&: mI~ mi~ mU~ mu~ mU~ me~ mo~ mE~ mV~ mO~ ma~ mAI maU" diff --git a/tests/translate.test b/tests/translate.test index 8aaf1fc4..2b0307f0 100755 --- a/tests/translate.test +++ b/tests/translate.test @@ -37,8 +37,8 @@ test_phon hi "ka:n'u:n" "कानून" test_phon en "k'apIt@Lz" "capitals" # bug: https://github.com/espeak-ng/espeak-ng/issues/824 -test_phon ru "(en)s'i:(ru) n'ojl t'otS;ka# v'os;I3md;E2s;ats;'ejm m;,IlI;'onV#f_! p;,It;s'ot Syz;d;is;'jatd;'evI3t; t'ys;itS;_! dv;'es;t;I p;Vd;d;Is;'jattR;'i p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I V#d;'in p@-rats'Ent dv;'es;t;I t'otS;ka# t@-r;'ittsat;S'Es;t; t'ys;itS;_! vOs;Ims'ot s;Imn'AttsVt; p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# dv;'e t'ys;itS;i d;E2v;Itn'AttsVt; p@-rats'Ent dv;'es;t;I V#d;'in t'otS;ka# n'ojl tR;'iv'os;im;_!s;'ejm d;'evI3t;S'Es;t;_!tR;'i p@-rats'Ent dv'A (en)s'i:(ru) V#d;'in t'otS;ka# n'ojl tR;'iv'os;im;_!s;'ejm d;'evI3t;S'Es;t;_!tR;'i p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I V#d;'in p@-rats'Ent dv;'es;t;I t'otS;ka# tS;It'yr;E2sta# d;E2v;Itn'AttsVt; t'ys;itS;_! S,E#s;t;s'ot t@-r;'ittsat;s;'ejm p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# n'ojldv'A_! tR;'is;'ejm_!p;'At; p@-rats'Ent dv'AttsVt; (en)s'i:(ru) p@-rats'Ent dv;'es;t;I t'otS;ka# t@-r;'ittsVt; t'ys;itS;_! v'os;I3md;E2s;ats;'ejm p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# n'ojltS;It'yR;I_! p;'At;Vd;'in_!tS;It'yR;I p@-rats'Ent dv;'es;t;I t'otS;ka# p;,It;s'ot v'os;I3md;E2s;atdv;'e t'ys;itS;i_! s;,Ims'ot t@-r;'ittsat;d;'evI3t; p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# dv;'es;t;I SE#stn'AttsVt; t'ys;itS;_! dev;ats'ot s'o@-rOkdv'A p@-rats'Ent dv;'es;t;I t'otS;ka# s;,Ims'ot p;Vd;d;Is;'jat t'ys;itS;_! p;,It;s'ot d;E2v;In'ostOtR;'i p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# tS;It'yr;E2sta# s;'emd;E2s;Vt t'ys;itS;_! t@-r;'ista# v'os;im; p@-rats'Ent dv;'es;t;I t'otS;ka# n'ojld;'evI3t;_! p;'at;n'ojl_!dv'A p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# st'o s'o@-rOkdv;'e t'ys;itS;i_! p;,It;s'ot s;Imn'AttsVt; p@-rats'Ent dv; -dv'A (en)s'i:(ru) v'os;im; t'otS;ka# vOs;Ims'ot dv'Attsat;d;'evI3t; t'ys;itS;_! s;,Ims'ot Syz;d;is;'jatv'os;im; p@-rats'Ent dv'AttsVt; (en)s'i:(ru) p@-rats'Ent dv;'es;t;I p@-rats'Ent dv'A (en)s'i:(ru) p;'At; t'otS;ka# S,E#s;t;s'ot Syz;d;is;'jatd;'evI3t; t'ys;itS;_! s'o@-rOkV#d;'in p@-rats'Ent dv'AttsVt; tS;It'yR;I t'otS;ka# p;Vd;d;Is;'jatd;'evI3t; t'ys;itS;_! S,E#s;t;s'ot d;E2v;In'ostOd;'evI3t; p@-rats'Ent dv'A (en)s'i:(ru) d;'es;It; t'otS;ka# dv'A m;,IlI;'ona#_! S,E#s;t;s'ot p;Vd;d;Is;'jatdv;'e t'ys;itS;i_! t@-r;'ista# d;E2v;In'ostOV#d;'in p@-rats'Ent dv'AttsVt; d;'es;It; t'otS;ka# dv;'es;t;I Syz;d;is;'jatp;'At; t'ys;itS;_! dv;'es;t;I t@-r;'ittsat;v'os;im; p@-rats'Ent dv'A (en)s'i:(ru) d;'es;It; t'otS;ka# dv'A m;,IlI;'ona#_! S,E#s;t;s'ot p;Vd;d;Is;'jatdv;'e t'ys;itS;i_! t@-r;'ista# d;E2v;In'ostOV#d;'in p@-rats'Ent dv'AttsVt; (en)z'Ed(ru) p@-rats'Ent dv'AttsVt; (en)'Em(ru) p@-rats'Ent dv;'e t'ys;itS;i d;'es;It; t'otS;ka# n'ojltR;'i_!s;'ejm v'os;im;S'Es;t;_!p;'At; p@-rats'Ent dv'A (en)s'i:(ru) d;E2v;Itn'AttsVt; t'otS;ka# s;,Ims'ot d;E2v;In'ostOv'os;im; t'ys;itS;_! p;,It;s'ot t@-r;'ittsat;s;'ejm p@-rats'Ent dv'AttsVt; (en)v'i:(ru) p@-rats'Ent dv;'es;t;I V#d;'in t'otS;ka# st'o s;'emd;E2s;VttS;It'yR;I t'ys;itS;i_! st'o v'os;I3md;E2s;atv'os;im; p@-rats'Ent dv'AttsVt; (en)'eI(ru) p@-rats'Ent dv;'es;t;I V#d;'in t'otS;ka# tS;It'yr;E2sta# v'os;I3md;E2s;atv'os;im; t'ys;itS;_! p;,It;s'ot d;E2v;Itn'AttsVt; p@-rats'Ent dv'A (en)s'i:(ru) V#d;'in t'otS;ka# tS;It'yr;E2sta# v'os;I3md;E2s;atv'os;im; t'ys;itS;_! p;,It;s'ot d;E2v;Itn'AttsVt; p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I V#d;'in p@-rats'Ent dv;'es;t;I t'otS;ka# vOs;Ims'ot p;Vd;d;Is;'jats;'ejm t'ys;itS;_! tS;It'yr;E2" "C0.87569253%200%200%201%200.36817%2C-0.2019%201.0387963%2C1.0387963%200%200%201%200.419637%2C-0.02375%20c%200.30087%2C0.04514%200.582739%2C0.216942%200.750593%2C0.470308%200.09502%2C0.142517%200.153603%2C0.308788%200.18844%2C0.478226%200.03484%2C0.168646%200.0475%2C0.340459%200.05701%2C0.513064%200.03167%2C0.601741%200.03167%2C1.205067%200.01426%2C1.808392%20-0.01426%2C0.526524%20-0.04355%2C1.0673%20-0.253366%2C1.549486%20-0.271575%2C0.619159%20-0.817101%2C1.08155%20-1.405383%2C1.414092%20a%205.5835296%2C5.5835296%200%200%201%20-1.257323%2C0.512272%20c%200.38163%2C1.219319%200.580363%2C2.56532%200.580363%2C3.93349%20a%2013.935071%2C13.935071%200%200%201%20-0.106901%2C1.682498%2010.264446%2C10.264446%200%200%200%205.054631%2C-8.829768%20c%200%2C-5.669041%20-4.59699%2C-10.2652391%20-10.265238%2C-10.2652391%20z%20M%2010.037865%2C19.798537%20v%201.174188%20a%201.488519%2C1.488519%200%200%201%200.857482%2C0.286619%201.3760882%2C1.3760882%200%200%201%200.440222%2C0.538402%20c%200.0966%2C0.213775%200.131432%2C0.456056%200.09184%2C0.687252%20a%201.1821057%2C1.1821057%200%200%201%20-0.262867%2C0.560568%201.3040376%2C1.3040376%200%200%201%20-0.502772%2C0.36263%201.3760882%2C1.3760882%200%200%201%20-0.623119%2C0.0966%20v%202.953287%20l%206.145683%2C-3.33175%20-6.145683%2C-3," "ru sum strings" +test_phon ru "(en)s'i:(ru) n'ojl t'otS;ka# v'os;I3md;E2s;ats;'ejm m;,IlI;'onV#f_! p;,It;s'ot SE#z;d;is;'jatd;'evI3t; t'ys;itS;_! dv;'es;t;I p;Vd;d;Is;'jattR;'i p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I V#d;'in p@-rats'Ent dv;'es;t;I t'otS;ka# t@-r;'ittsat;S'Es;t; t'ys;itS;_! vOs;Ims'ot s;Imn'AttsVt; p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# dv;'e t'ys;itS;i d;E2v;Itn'AttsVt; p@-rats'Ent dv;'es;t;I V#d;'in t'otS;ka# n'ojl tR;'iv'os;im;_!s;'ejm d;'evI3t;S'Es;t;_!tR;'i p@-rats'Ent dv'A (en)s'i:(ru) V#d;'in t'otS;ka# n'ojl tR;'iv'os;im;_!s;'ejm d;'evI3t;S'Es;t;_!tR;'i p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I V#d;'in p@-rats'Ent dv;'es;t;I t'otS;ka# tS;It'yr;E2sta# d;E2v;Itn'AttsVt; t'ys;itS;_! S,E#s;t;s'ot t@-r;'ittsat;s;'ejm p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# n'ojldv'A_! tR;'is;'ejm_!p;'At; p@-rats'Ent dv'AttsVt; (en)s'i:(ru) p@-rats'Ent dv;'es;t;I t'otS;ka# t@-r;'ittsVt; t'ys;itS;_! v'os;I3md;E2s;ats;'ejm p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# n'ojltS;It'yR;I_! p;'At;Vd;'in_!tS;It'yR;I p@-rats'Ent dv;'es;t;I t'otS;ka# p;,It;s'ot v'os;I3md;E2s;atdv;'e t'ys;itS;i_! s;,Ims'ot t@-r;'ittsat;d;'evI3t; p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# dv;'es;t;I SE#stn'AttsVt; t'ys;itS;_! dev;ats'ot s'o@-rOkdv'A p@-rats'Ent dv;'es;t;I t'otS;ka# s;,Ims'ot p;Vd;d;Is;'jat t'ys;itS;_! p;,It;s'ot d;E2v;In'ostOtR;'i p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# tS;It'yr;E2sta# s;'emd;E2s;Vt t'ys;itS;_! t@-r;'ista# v'os;im; p@-rats'Ent dv;'es;t;I t'otS;ka# n'ojld;'evI3t;_! p;'at;n'ojl_!dv'A p@-rats'Ent dv'A (en)s'i:(ru) n'ojl t'otS;ka# st'o s'o@-rOkdv;'e t'ys;itS;i_! p;,It;s'ot s;Imn'AttsVt; p@-rats'Ent dv; +dv'A (en)s'i:(ru) v'os;im; t'otS;ka# vOs;Ims'ot dv'Attsat;d;'evI3t; t'ys;itS;_! s;,Ims'ot SE#z;d;is;'jatv'os;im; p@-rats'Ent dv'AttsVt; (en)s'i:(ru) p@-rats'Ent dv;'es;t;I p@-rats'Ent dv'A (en)s'i:(ru) p;'At; t'otS;ka# S,E#s;t;s'ot SE#z;d;is;'jatd;'evI3t; t'ys;itS;_! s'o@-rOkV#d;'in p@-rats'Ent dv'AttsVt; tS;It'yR;I t'otS;ka# p;Vd;d;Is;'jatd;'evI3t; t'ys;itS;_! S,E#s;t;s'ot d;E2v;In'ostOd;'evI3t; p@-rats'Ent dv'A (en)s'i:(ru) d;'es;It; t'otS;ka# dv'A m;,IlI;'ona#_! S,E#s;t;s'ot p;Vd;d;Is;'jatdv;'e t'ys;itS;i_! t@-r;'ista# d;E2v;In'ostOV#d;'in p@-rats'Ent dv'AttsVt; d;'es;It; t'otS;ka# dv;'es;t;I SE#z;d;is;'jatp;'At; t'ys;itS;_! dv;'es;t;I t@-r;'ittsat;v'os;im; p@-rats'Ent dv'A (en)s'i:(ru) d;'es;It; t'otS;ka# dv'A m;,IlI;'ona#_! S,E#s;t;s'ot p;Vd;d;Is;'jatdv;'e t'ys;itS;i_! t@-r;'ista# d;E2v;In'ostOV#d;'in p@-rats'Ent dv'AttsVt; (en)z'Ed(ru) p@-rats'Ent dv'AttsVt; (en)'Em(ru) p@-rats'Ent dv;'e t'ys;itS;i d;'es;It; t'otS;ka# n'ojltR;'i_!s;'ejm v'os;im;S'Es;t;_!p;'At; p@-rats'Ent dv'A (en)s'i:(ru) d;E2v;Itn'AttsVt; t'otS;ka# s;,Ims'ot d;E2v;In'ostOv'os;im; t'ys;itS;_! p;,It;s'ot t@-r;'ittsat;s;'ejm p@-rats'Ent dv'AttsVt; (en)v'i:(ru) p@-rats'Ent dv;'es;t;I V#d;'in t'otS;ka# st'o s;'emd;E2s;VttS;It'yR;I t'ys;itS;i_! st'o v'os;I3md;E2s;atv'os;im; p@-rats'Ent dv'AttsVt; (en)'eI(ru) p@-rats'Ent dv;'es;t;I V#d;'in t'otS;ka# tS;It'yr;E2sta# v'os;I3md;E2s;atv'os;im; t'ys;itS;_! p;,It;s'ot d;E2v;Itn'AttsVt; p@-rats'Ent dv'A (en)s'i:(ru) V#d;'in t'otS;ka# tS;It'yr;E2sta# v'os;I3md;E2s;atv'os;im; t'ys;itS;_! p;,It;s'ot d;E2v;Itn'AttsVt; p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I p@-rats'Ent dv;'es;t;I V#d;'in p@-rats'Ent dv;'es;t;I t'otS;ka# vOs;Ims'ot p;Vd;d;Is;'jats;'ejm t'ys;itS;_! tS;It'yr;E2" "C0.87569253%200%200%201%200.36817%2C-0.2019%201.0387963%2C1.0387963%200%200%201%200.419637%2C-0.02375%20c%200.30087%2C0.04514%200.582739%2C0.216942%200.750593%2C0.470308%200.09502%2C0.142517%200.153603%2C0.308788%200.18844%2C0.478226%200.03484%2C0.168646%200.0475%2C0.340459%200.05701%2C0.513064%200.03167%2C0.601741%200.03167%2C1.205067%200.01426%2C1.808392%20-0.01426%2C0.526524%20-0.04355%2C1.0673%20-0.253366%2C1.549486%20-0.271575%2C0.619159%20-0.817101%2C1.08155%20-1.405383%2C1.414092%20a%205.5835296%2C5.5835296%200%200%201%20-1.257323%2C0.512272%20c%200.38163%2C1.219319%200.580363%2C2.56532%200.580363%2C3.93349%20a%2013.935071%2C13.935071%200%200%201%20-0.106901%2C1.682498%2010.264446%2C10.264446%200%200%200%205.054631%2C-8.829768%20c%200%2C-5.669041%20-4.59699%2C-10.2652391%20-10.265238%2C-10.2652391%20z%20M%2010.037865%2C19.798537%20v%201.174188%20a%201.488519%2C1.488519%200%200%201%200.857482%2C0.286619%201.3760882%2C1.3760882%200%200%201%200.440222%2C0.538402%20c%200.0966%2C0.213775%200.131432%2C0.456056%200.09184%2C0.687252%20a%201.1821057%2C1.1821057%200%200%201%20-0.262867%2C0.560568%201.3040376%2C1.3040376%200%200%201%20-0.502772%2C0.36263%201.3760882%2C1.3760882%200%200%201%20-0.623119%2C0.0966%20v%202.953287%20l%206.145683%2C-3.33175%20-6.145683%2C-3," "ru sum strings" # A deleted phoneme at the start of a word should preserve the sourceix property. test_phon en-GB-x-gbcwmd "aI 'av" "I have"