Russian update (#1437)

dictsource/extra/ru_listx

@@ -191695,6 +191695,7 @@
 хакнуть                        $1
 халабуда                       $3
 халабуде                       $3
+халапеньо                         $3
 халатик                        $2
 халатиках                      $2
 халатиком                      $2

dictsource/ru_list

@@ -25,9 +25,9 @@ _18     vOs;Imn'AttsVt;
 _19     d;E2v;Itn'AttsVt;
 _2X     dv'AttsVt;
 _3X     tr;'ittsVt;
-_4X     s'o@-*Ok
+_4X     s'o@-rOk
 _5X     p;Vd;d;Is;'jat
-_6X     SE2z;d;d;Is;'jat
+_6X     Syz;d;is;'jat
 _7X     s;'emd;E2s;Vt
 _8X     v'os;I3md;E2s;Vt
 _9X     d;E2v;In'ostO
@@ -111,13 +111,19 @@ _»      z'akr uglof
 _,      zVpit'aja
 
 // particle
-// б       by $u         // shortened form of 'бы'
 ж       S $u         // same as the particle form
+же    Zy           $u
+бы    $u  // would
 
 // prepositions
 в       v  $u         // to,in,at -- TODO: 'f' before voiceless consonants.
 для        $u         // for
+за        $u // behind
+за      $atend  // stressed at the end
+из        $u // from
+из    $atend  // stressed at the end
 на  n@ $u         // on
+над                $u
 от        $u         // from
 с       s  $u         // with,from,since
 у       u  $u         // by
@@ -131,15 +137,13 @@ _,      zVpit'aja
 хотя      $2 $pause  // although
 чтобы        $pause  // in order that
 
-
-// pronouns
-я     ja    $u         // I
-
 // questions
 что     Sto $u $pause // what, that
 
 // misc.
 не      $u           // negative
+не    $atend // stressed at the end
+ни      $u // uther form of не
 
 // auxillary verbs
 будем   $u1
@@ -230,7 +234,7 @@ _с      Es
 ь       m;'jaxk;I#jzn'Ak
 э       e
 ю       ju
-я       ja            $atend
+я       ja
 
 // exceptions
 электрификация    $5 // for the unit test pangram
@@ -249,8 +253,8 @@ _с      Es
            (всё-таки)               fs;'8tVk;I
       (где-то)               gd;'etV
            (зачем-то)        zatS;'emtV
-          (из буфера)               'Is||b'uf;ira#
-         (из города)         'Is||g'orVda#
+          (из буфера)               iz||b'uf;ira#
+         (из города)         iz||g'orVda#
          (как-то)               k'AktV
                (какая-то)                kak'AjatV
                (какие-то)           kak;'ijitV#
@@ -264,13 +268,20 @@ _с      Es
              (мои глаза)               mV#'I||glaz'A
              (на свои места)             n@||svV#'I||m;ist'A
           (наконец-то)             nVkV#n;'etstV
+         (на поводу)            n@||pV#vV#d'u
           (не были)              n;'ebyl;I
         (не было)               n;'ebylV
+             (не за что)               n;'ezV#StV#
            (не с чем)              n;'estS;im
              (одной стороны)               V#dn'oj||stV#rV#n'y
            (от числа)          ot||tS;isl'A
+             (по поводу)           pV#p'ovV#du
                           (почему-то)          pVtS;im'utV
           (с высоты)              s||vysV#t'y
           (чего-то)               tS;iv'otV
            (чем-то)           tS;'emtV
            (чему-то)         tS;im'utV
+                (что б)            St'op
+             (что ли)               St'ol;i
+             (что ж)             St'oS
+             (что же)               St'oZy

dictsource/ru_rules

@@ -2,6 +2,9 @@
 // *   Copyright (C) 2007 to 2013 by Jonathan Duddington                     *
 // *   email: [email protected]                                    *
 // *   Copyright (C) 2018 Reece H. Dunn                                      *
+// *   Copyright (C) 2022 by Kirill Kolov                                      *
+// *   email: [email protected]                                    *
+
 // *                                                                         *
 // *   This program is free software; you can redistribute it and/or modify  *
 // *   it under the terms of the GNU General Public License as published by  *
@@ -118,6 +121,7 @@
    _занедоро) г (о_   g   
      _немно) г (о_   g
    _се) г (о    v
+             _страте) г (о_               g // stratego board game
    _стро) г (о   g
  _твое) г (о_   v
  _свое) г (о_   v
@@ -131,7 +135,7 @@
         д (зY   d;
         д (к   t
         д (нь   d;
-        д (пY   t
+        д (п   t
         д (сY   t;
         д (тY   t;
         д (фY   t
@@ -255,7 +259,7 @@
 
 .group о
         о       o
-        ь) о       'j8
+        ь) о       j8
 
 .group п
         п       p

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 SE2z;d;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@-*Okdv'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@-*Okdv;'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 SE2z;d;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 SE2z;d;d;Is;'jatd;'evI3t; t'ys;itS;_! s'o@-*OkV#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 SE2z;d;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'y" "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 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"
 
 # A deleted phoneme at the start of a word should preserve the sourceix property.
 test_phon en-GB-x-gbcwmd "aI 'av" "I have"