From c13ee28c825cded1be9cff68c36cb24a0b39aaba Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 15 Jun 2016 15:28:34 +0200
Subject: [PATCH 1/2] add phonetic russian dvorak layout

---
 rules/base.xml.in |  6 ++++++
 symbols/ru        | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index fff0416..2bd3500 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4568,6 +4568,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>phonetic_dvorak</name>
+            <_description>Russian (phonetic dvorak)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>phonetic_fr</name>
             <_description>Russian (phonetic French)</_description>
           </configItem>
diff --git a/symbols/ru b/symbols/ru
index 4d68f96..e74c71d 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -562,6 +562,65 @@ xkb_symbols "phonetic_azerty" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "phonetic_dvorak" {
+    include "level3(ralt_switch)"
+
+    name[Group1]= "Russian (phonetic dvorak)";
+
+    key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] };
+
+    key <AE01> { [ 1, exclam ] };
+    key <AE02> { [ 2, at ] };
+    key <AE03> { [ 3, Cyrillic_io ] };
+    key <AE04> { [ 4, Cyrillic_IO ] };
+    key <AE05> { [ 5, Cyrillic_hardsign ] };
+    key <AE06> { [ 6, Cyrillic_HARDSIGN ] };
+    key <AE07> { [ 7, ampersand ] };
+    key <AE08> { [ 8, asterisk ] };
+    key <AE09> { [ 9, parenleft ] };
+    key <AE10> { [ 0, parenright ] };
+    key <AE11> { [ Cyrillic_sha, Cyrillic_SHA ] };
+    key <AE12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+    key <BKSL> { [ Cyrillic_e, Cyrillic_E ] };
+
+    key <AD01> { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
+    key <AD02> { [ comma, less, dead_cedilla, dead_caron ] };
+    key <AD03> { [ period, greater, dead_abovedot, periodcentered ] };
+    key <AD04> { [ Cyrillic_pe, Cyrillic_PE ] };
+    key <AD05> { [ Cyrillic_yeru, Cyrillic_YERU ] };
+    key <AD06> { [ Cyrillic_ef, Cyrillic_EF ] };
+    key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+    key <AD08> { [ Cyrillic_tse, Cyrillic_TSE ] };
+    key <AD09> { [ Cyrillic_er, Cyrillic_ER ] };
+    key <AD10> { [ Cyrillic_el, Cyrillic_EL ] };
+    key <AD11> { [ slash, question ] };
+    key <AD12> { [ Cyrillic_che, Cyrillic_CHE ] };
+
+    key <AC01> { [ Cyrillic_a, Cyrillic_A ] };
+    key <AC02> { [ Cyrillic_o, Cyrillic_O ] };
+    key <AC03> { [ Cyrillic_ie, Cyrillic_IE ] };
+    key <AC04> { [ Cyrillic_u, Cyrillic_U ] };
+    key <AC05> { [ Cyrillic_i, Cyrillic_I ] };
+    key <AC06> { [ Cyrillic_de, Cyrillic_DE ] };
+    key <AC07> { [ Cyrillic_ha, Cyrillic_HA ] };
+    key <AC08> { [ Cyrillic_te, Cyrillic_TE ] };
+    key <AC09> { [ Cyrillic_en, Cyrillic_EN ] };
+    key <AC10> { [ Cyrillic_es, Cyrillic_ES ] };
+    key <AC11> { [ minus, underscore ] };
+
+    key <AB01> { [ semicolon, colon, dead_ogonek, dead_doubleacute ] };
+    key <AB02> { [ Cyrillic_ya, Cyrillic_YA ] };
+    key <AB03> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+    key <AB04> { [ Cyrillic_ka, Cyrillic_KA ] };
+    key <AB05> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
+    key <AB06> { [ Cyrillic_be, Cyrillic_BE ] };
+    key <AB07> { [ Cyrillic_em, Cyrillic_EM ] };
+    key <AB08> { [ Cyrillic_ve, Cyrillic_VE ] };
+    key <AB09> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
+    key <AB10> { [ Cyrillic_ze, Cyrillic_ZE ] };
+};
+
+partial alphanumeric_keys
 xkb_symbols "phonetic_fr" {
 
     include "fr"
-- 
2.8.3


From 12612044d14135734688e174d6dddd5a29f9964c Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 15 Jun 2016 15:32:45 +0200
Subject: [PATCH 2/2] add contact and author

---
 symbols/ru | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/symbols/ru b/symbols/ru
index e74c71d..ef684c6 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -561,6 +561,9 @@ xkb_symbols "phonetic_azerty" {
     key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
 };
 
+// Russian dvorak phonetic layout
+// 2016-06-15 by Mart Lubbers
+// contact: <mart@martlubbers.net>
 partial alphanumeric_keys
 xkb_symbols "phonetic_dvorak" {
     include "level3(ralt_switch)"
-- 
2.8.3