From 36c6727e90f3c5c95a9ca6f53fd0385b1702ff1d Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Thu, 19 Jul 2018 19:49:15 +0100 Subject: [PATCH] =?UTF-8?q?issue=20#518:=20Add=20the=20'=D0=B5=20=D1=94=20?= =?UTF-8?q?=D1=97'=20letters=20to=20the=20Y=20group=20in=20Translate=5FRus?= =?UTF-8?q?sian,=20not=20SetCyrillicLetters.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libespeak-ng/tr_languages.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c index b7317798..0947ab71 100644 --- a/src/libespeak-ng/tr_languages.c +++ b/src/libespeak-ng/tr_languages.c @@ -433,7 +433,7 @@ static void SetCyrillicLetters(Translator *tr) static const char ru_hard[] = { 0x2a, 0x16, 0x26, 0x28, 0 }; // letter group H [S Z ts] -- ъ ж ц ш static const char ru_nothard[] = { 0x11, 0x12, 0x13, 0x14, 0x17, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x20, 0x21, 0x22, 0x24, 0x25, 0x27, 0x29, 0x2c, 0 }; // б в г д з й к л м н п р с т ф х ч щ ь static const char ru_voiced[] = { 0x11, 0x12, 0x13, 0x14, 0x16, 0x17, 0 }; // letter group G (voiced obstruents) -- б в г д ж з - static const char ru_ivowels[] = { 0x15, 0x2c, 0x2e, 0x2f, 0x31, 0x34, 0x37, 0 }; // letter group Y (iotated vowels & soft-sign) -- е ь ю я ё є ї + static const char ru_ivowels[] = { 0x2c, 0x2e, 0x2f, 0x31, 0 }; // letter group Y (iotated vowels & soft-sign) -- ь ю я ё tr->encoding = ESPEAKNG_ENCODING_KOI8_R; tr->transpose_min = 0x430; // convert cyrillic from unicode into range 0x01 to 0x22 tr->transpose_max = 0x451; @@ -1607,11 +1607,11 @@ static void Translator_Russian(Translator *tr) { static const unsigned char stress_amps_ru[] = { 16, 16, 18, 18, 20, 24, 24, 22 }; static const short stress_lengths_ru[8] = { 150, 140, 220, 220, 0, 0, 260, 280 }; - static const char ru_ivowels2[] = { 0x18, 0 }; // add и to Y lettergroup (iotated vowels & soft-sign) + static const char ru_ivowels[] = { 0x15, 0x18, 0x34, 0x37, 0 }; // add "е и є ї" to Y lettergroup (iotated vowels & soft-sign) SetupTranslator(tr, stress_lengths_ru, stress_amps_ru); SetCyrillicLetters(tr); - SetLetterBits(tr, LETTERGP_Y, ru_ivowels2); + SetLetterBits(tr, LETTERGP_Y, ru_ivowels); tr->langopts.param[LOPT_UNPRONOUNCABLE] = 0x432; // [v] don't count this character at start of word tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 1;