revert commit a9f7e47487, in order to redo it with a full commit message

4 files changed, 77 insertions, 4 deletions

diff --git a/rules/base.extras.xml b/rules/base.extras.xml
index 0112174..a4b82aa 100644
--- a/rules/base.extras.xml
+++ b/rules/base.extras.xml
@@ -716,7 +716,7 @@
           <configItem popularity="exotic">
             <name>ruu</name>
             <shortDescription>ru</shortDescription>
-            <description>Russian (plus Ukrainian and Belarusian letters)</description>
+            <description>Russian (with Ukrainian-Belorussian layout)</description>
             <languageList>
               <iso639Id>rus</iso639Id>
               <iso639Id>ukr</iso639Id>
diff --git a/rules/base.xml b/rules/base.xml
index 4dd5ef4..a2fd708 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -6044,6 +6044,21 @@
         </variant>
         <variant>
           <configItem>
+            <name>rstu</name>
+            <description>Ukrainian (standard RSTU)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu_ru</name>
+            <description>Russian (Ukraine, standard RSTU)</description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>homophonic</name>
             <description>Ukrainian (homophonic)</description>
           </configItem>
diff --git a/symbols/ru b/symbols/ru
index 2a77083..83ea570 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -868,7 +868,7 @@ xkb_symbols "chu" {
 };
 
 
-// RUU (Russian-Ukrainian-Belarusian United keyboard layout).
+// RUU (Russian-Ukrainian United keyboard layout).
 // This is a modified Russian standard keyboard, with the third level containing
 // Ukrainian and Belorusian alphabetic letters and commonly used Unicode symbols.
 // For a description see http://wiki.opennet.ru/RUU [in Russian].
@@ -895,7 +895,7 @@ partial alphanumeric_keys
 xkb_symbols "ruu" {
 
     include "ru(common)"
-    name[Group1]= "Russian (plus Ukrainian and Belarusian letters)";
+    name[Group1]= "Russian (with Ukrainian-Belorussian layout)";
 
     key <TLDE> { [  U2019,  apostrophe,         U0301,  asciitilde  ] };  // Apostrophe and Stress symbol
     key <AE01> { [      1,      exclam,      division,       U2248  ] };  // Division Sign and Almost Equal To
diff --git a/symbols/ua b/symbols/ua
index 60d3eac..8297685 100644
--- a/symbols/ua
+++ b/symbols/ua
@@ -1,4 +1,4 @@
-// Keyboard layouts for Ukraine.
+// Keyboard layouts for the Ukraine.
 
 // AEN <aen@logic.ru> & Leon Kanter <leon@geon.donetsk.ua>,
 // Andriy Rysin <arysin@yahoo.com>, Oleksiy Protas <elfy.ua@gmail.com>
@@ -232,6 +232,64 @@ xkb_symbols "phonetic" {
     key <AB10> { [ slash,             question           ] };
 };
 
+// Ukrainian RSTU 2019-91 keyboard layout (Respublikanskij STandart Ukrajiny).
+// Andrew Porokhnyak <aop@porokhnyak.org>
+partial alphanumeric_keys
+xkb_symbols "rstu" {
+
+    include "ua(legacy)"
+
+    name[Group1]= "Ukrainian (standard RSTU)";
+
+    key <TLDE> { [      apostrophe,        question  ] };
+    key <AE01> { [          exclam,               1  ] };
+    key <AE02> { [        quotedbl,               2  ] };
+    key <AE03> { [      numbersign,               3  ] };
+    key <AE04> { [       semicolon,               4  ] };
+    key <AE05> { [           colon,               5  ] };
+    key <AE06> { [           comma,               6  ] };
+    key <AE07> { [          period,               7  ] };
+    key <AE08> { [        asterisk,               8  ] };
+    key <AE09> { [       parenleft,               9  ] };
+    key <AE10> { [      parenright,               0  ] };
+
+    key <AD12> { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key <AC02> { [      Cyrillic_i,      Cyrillic_I  ] };
+
+    key <AB05> { [     Ukrainian_i,     Ukrainian_I  ] };
+    key <AB10> { [    Ukrainian_yi,    Ukrainian_YI  ] };
+
+    key <BKSL> { [           slash,         percent  ] };
+};
+
+// Russian RSTU 2019-91 keyboard layout (Respublikanskij STandart Ukrajiny).
+// Andrew Porokhnyak <aop@porokhnyak.org>
+partial alphanumeric_keys
+xkb_symbols "rstu_ru" {
+
+    include "ru(common)"
+
+    name[Group1]= "Russian (Ukraine, standard RSTU)";
+
+    key <TLDE> { [      apostrophe,        question  ] };
+    key <AE01> { [          exclam,               1  ] };
+    key <AE02> { [        quotedbl,               2  ] };
+    key <AE03> { [      numbersign,               3  ] };
+    key <AE04> { [       semicolon,               4  ] };
+    key <AE05> { [           colon,               5  ] };
+    key <AE06> { [           comma,               6  ] };
+    key <AE07> { [          period,               7  ] };
+    key <AE08> { [        asterisk,               8  ] };
+    key <AE09> { [       parenleft,               9  ] };
+    key <AE10> { [      parenright,               0  ] };
+    key <BKSL> { [           slash,         percent  ] };
+
+    key.type[group1]="ALPHABETIC";
+
+    key <AB10> { [     Cyrillic_io,     Cyrillic_IO  ] };
+};
+
 // Homophonic keyboard layout (by Tomas Marko Miljenović),
 // based on the Ukrainian National Transliteration,
 // commonly used phonetic layouts for Mac and Win.