From 89955e7f9a2ad37d5de9cec864989f90ee60a9e0 Mon Sep 17 00:00:00 2001
From: NikoKrause <nikokrause@gmx.de>
Date: Mon, 4 Jul 2016 13:17:52 +0200
Subject: [PATCH] added two Russian layouts for Germans

---
 rules/base.xml.in |  22 ++++++++++++
 symbols/de        | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index a86d3f3..6dc4624 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3465,6 +3465,28 @@
         </variant>
         <variant>
           <configItem>
+            <name>ru-recom</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russisch (Deutschland, empfohlen)</description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+	    <variant>
+          <configItem>
+            <name>ru-translit</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <shortDescription>ru</shortDescription>
+            <description>Russisch (Deutschland, Transliteration)</description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>legacy</name>
             <_description>German (legacy)</_description>
           </configItem>
diff --git a/symbols/de b/symbols/de
index fe72152..40816d6 100644
--- a/symbols/de
+++ b/symbols/de
@@ -637,6 +637,112 @@ xkb_symbols "ru" {
     include "level3(ralt_switch)"
 };
 
+// layout for Russian (recommended) letters on a german keyboard
+// based on "Russisch für Deutsche, empfohlen" by B. Bendixen und H. Rothe http://russisch.urz.uni-leipzig.de/key2000.htm 2016-02-01
+// adapted by Niko Krause <nikokrause@gmx.de> 2016-06-09
+
+partial alphanumeric_keys
+xkb_symbols "ru-recom" {
+
+    include "de(basic)"
+ 
+    name[Group1]= "Russian (Germany, recommended)";
+
+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+    key <LatA> { [        Cyrillic_a,        Cyrillic_A ] };
+    key <LatB> { [       Cyrillic_be,       Cyrillic_BE ] };
+    key <LatW> { [       Cyrillic_ve,       Cyrillic_VE ] };
+    key <LatG> { [      Cyrillic_ghe,      Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+    key <LatD> { [       Cyrillic_de,       Cyrillic_DE ] };
+    key <LatE> { [       Cyrillic_ie,       Cyrillic_IE ] };
+    key <TLDE> { [       Cyrillic_ya,       Cyrillic_YA, asciicircum, degree ] };
+    key <LatX> { [      Cyrillic_ha,      Cyrillic_HA ] };
+    key <LatZ> { [       Cyrillic_tse,       Cyrillic_TSE ] };
+    key <LatI> { [        Cyrillic_i,        Cyrillic_I, Ukrainian_i,  Ukrainian_I ] };
+    key <LatJ> { [   Cyrillic_shorti,   Cyrillic_SHORTI, Ukrainian_yi, Ukrainian_YI ] };
+    key <LatK> { [       Cyrillic_ka,       Cyrillic_KA ] };
+    key <LatL> { [       Cyrillic_el,       Cyrillic_EL ] };
+    key <LatM> { [       Cyrillic_em,       Cyrillic_EM ] };
+    key <LatN> { [       Cyrillic_en,       Cyrillic_EN ] };
+    key <LatO> { [        Cyrillic_o,        Cyrillic_O ] };
+    key <LatP> { [       Cyrillic_pe,       Cyrillic_PE ] };
+    key <LatR> { [       Cyrillic_er,       Cyrillic_ER ] };
+    key <LatS> { [       Cyrillic_es,       Cyrillic_ES, Cyrillic_ze, Cyrillic_ZE ] };
+    key <LatT> { [       Cyrillic_te,       Cyrillic_TE ] };
+    key <LatU> { [        Cyrillic_u,        Cyrillic_U ] };
+    key <LatF> { [       Cyrillic_ef,       Cyrillic_EF ] };
+    key <LatH> { [       Cyrillic_zhe,       Cyrillic_ZHE ] };
+    key <LatC> { [      Cyrillic_che,      Cyrillic_CHE ] };
+    key <AC10> { [      Cyrillic_io,      Cyrillic_IO ] };
+    key <AD11> { [      Cyrillic_yu,      Cyrillic_YU ] };
+    key <AD12> { [    Cyrillic_sha,    Cyrillic_SHA, plus, asterisk ] };
+    key <LSGT> { [ Cyrillic_ze, Cyrillic_ZE ] };
+    key <LatY> { [     Cyrillic_yeru,     Cyrillic_YERU ] };
+    key <LatV> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+    key <AC11> { [        Cyrillic_e,        Cyrillic_E, Ukrainian_ie, Ukrainian_IE ] };
+    key <BKSL> { [       Cyrillic_hardsign,       Cyrillic_HARDSIGN, numbersign, apostrophe ] };
+    key <LatQ> { [       Cyrillic_shcha,       Cyrillic_SHCHA ] };
+
+    key <AE11> { [ asciitilde, question, backslash, questiondown ] };
+    key <AE12>	{ [     U0301,      U0300,      U0323,      U0307 ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// layout for Russian (transliteration) letters on a german keyboard
+// based on "Russisch für Deutsche, Transliteration" by B. Bendixen und H. Rothe http://russisch.urz.uni-leipzig.de/key2000.htm 2016-02-01
+// adapted by Niko Krause <nikokrause@gmx.de> 2016-06-09
+
+partial alphanumeric_keys
+xkb_symbols "ru-translit" {
+
+    include "de(basic)"
+ 
+    name[Group1]= "Russian (Germany, transliteration)";
+
+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+    key <LatA> { [        Cyrillic_a,        Cyrillic_A ] };
+    key <LatB> { [       Cyrillic_be,       Cyrillic_BE ] };
+    key <LatW> { [       Cyrillic_sha,       Cyrillic_SHA ] };
+    key <LatG> { [      Cyrillic_ghe,      Cyrillic_GHE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+    key <LatD> { [       Cyrillic_de,       Cyrillic_DE ] };
+    key <LatE> { [       Cyrillic_ie,       Cyrillic_IE ] };
+    key <TLDE> { [       Cyrillic_ya,       Cyrillic_YA, asciicircum, degree ] };
+    key <LatX> { [      Cyrillic_ha,      Cyrillic_HA ] };
+    key <LatZ> { [       Cyrillic_ze,       Cyrillic_ZE ] };
+    key <LatI> { [        Cyrillic_i,        Cyrillic_I, Ukrainian_i,  Ukrainian_I ] };
+    key <LatJ> { [   Cyrillic_shorti,   Cyrillic_SHORTI, Ukrainian_yi, Ukrainian_YI ] };
+    key <LatK> { [       Cyrillic_ka,       Cyrillic_KA ] };
+    key <LatL> { [       Cyrillic_el,       Cyrillic_EL ] };
+    key <LatM> { [       Cyrillic_em,       Cyrillic_EM ] };
+    key <LatN> { [       Cyrillic_en,       Cyrillic_EN ] };
+    key <LatO> { [        Cyrillic_o,        Cyrillic_O ] };
+    key <LatP> { [       Cyrillic_pe,       Cyrillic_PE ] };
+    key <LatR> { [       Cyrillic_er,       Cyrillic_ER ] };
+    key <LatS> { [       Cyrillic_es,       Cyrillic_ES, Cyrillic_che, Cyrillic_CHE ] };
+    key <LatT> { [       Cyrillic_te,       Cyrillic_TE ] };
+    key <LatU> { [        Cyrillic_u,        Cyrillic_U ] };
+    key <LatF> { [       Cyrillic_ef,       Cyrillic_EF ] };
+    key <LatH> { [       Cyrillic_zhe,       Cyrillic_ZHE ] };
+    key <LatC> { [      Cyrillic_tse,      Cyrillic_TSE ] };
+    key <AC10> { [      Cyrillic_io,      Cyrillic_IO ] };
+    key <AD11> { [      Cyrillic_yu,      Cyrillic_YU ] };
+    key <AD12> { [    Cyrillic_hardsign,    Cyrillic_HARDSIGN, plus, asterisk ] };
+    key <LSGT> { [ Cyrillic_che, Cyrillic_CHE ] };
+    key <LatY> { [     Cyrillic_yeru,     Cyrillic_YERU ] };
+    key <LatV> { [ Cyrillic_ve, Cyrillic_VE ] };
+    key <AC11> { [        Cyrillic_e,        Cyrillic_E, Ukrainian_ie, Ukrainian_IE ] };
+    key <BKSL> { [       Cyrillic_softsign,       Cyrillic_SOFTSIGN, numbersign, apostrophe ] };
+    key <LatQ> { [       Cyrillic_shcha,       Cyrillic_SHCHA ] };
+
+    key <AE11> { [ asciitilde, question, backslash, questiondown ] };
+    key <AE12>	{ [     U0301,      U0300,      U0323,      U0307 ]	};
+
+    include "level3(ralt_switch)"
+};
+
 partial alphanumeric_keys
 xkb_symbols "pl" {
 
-- 
1.9.1