From 39a9a10ff11f6872e4b278240fbabb4e98209fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chusslove=20Illich=20=28=D0=A7=D0=B0=D1=81=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B2=20=D0=98=D0=BB=D0=B8=D1=9B=29?= <caslav.ilic@gmx.net>
Date: Sat, 14 Sep 2013 13:02:10 +0200
Subject: Rebased Pannonian Rusyn layout on Serbian Cyrillic.

It appears that this is the somewhat established convention among
Rusyn users, rather than basing on Ukrainian homophonic.

https://bugs.freedesktop.org/show_bug.cgi?id=44590
---
 rules/base.xml.in |  2 +-
 symbols/rs        | 46 ++++++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 3eed176..6471467 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4412,7 +4412,7 @@
         <variant>
           <configItem>
             <name>rue</name>
-            <_description>Pannonian Rusyn (homophonic)</_description>
+            <_description>Pannonian Rusyn</_description>
             <languageList>
               <iso639Id>rue</iso639Id>
             </languageList>
diff --git a/symbols/rs b/symbols/rs
index 22ff2da..86b5463 100644
--- a/symbols/rs
+++ b/symbols/rs
@@ -300,30 +300,28 @@ xkb_symbols "latinalternatequotes" {
 };
 
 xkb_symbols "rue" {
-  // Homophonic layout for Pannonian Rusyn (spoken mainly in Serbia and
-  // Croatia by the Rusyn people), based on Ukrainian homophonic.
-  // Author: Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga.rs@gmail.com>
-
-  name[Group1]= "Pannonian Rusyn (homophonic)";
-
-  include "ua(homophonic)"
-
-  key <TLDE> { [ grave, asciitilde ] };
-  key <AE03> { [ 3, doublelowquotemark ] };
-  key <AE04> { [ 4, rightdoublequotemark ] };
-  key <AE07> { [ 7, EuroSign ] };
-  key <AE11> { [ 0x002D, emdash ] };
-  key <AE12> { [ equal, plus ] };
-
-  key <AD02> { [ Ukrainian_ie, Ukrainian_IE ] };
-  key <AD06> { [ Cyrillic_yu, Cyrillic_YU ] };
-  key <AD08> { [ Cyrillic_i, Cyrillic_I ] };
-  key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] };
-  key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
-
-  key <LSGT> { [ Ukrainian_yi, Ukrainian_YI ] };
-  key <AB08> { [ comma, semicolon ] };
-  key <AB09> { [ period, colon ] };
+  // Layout for Pannonian Rusyn (spoken mainly in Serbia and
+  // Croatia by the Rusyn people), based on Serbian Cyrillic layout.
+  // Authors:
+  //   Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com>
+  //   Mihajlo Hornjak <smeceiotpad@gmail.com>
+
+  name[Group1]= "Pannonian Rusyn";
+
+  include "rs(basic)"
+
+  key <TLDE> {   [ Cyrillic_softsign,         Cyrillic_SOFTSIGN         ]   }; // `
+
+  key <AD01> {   [ Cyrillic_ya,               Cyrillic_YA               ]   }; // q
+  key <AD02> {   [ Ukrainian_ie,              Ukrainian_IE              ]   }; // w
+  key <AD12> {   [ Cyrillic_shcha,            Cyrillic_SHCHA            ]   }; // ]
+
+  key <AC05> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ]   }; // g
+  key <AC07> {   [ Cyrillic_shorti,           Cyrillic_SHORTI           ]   }; // j
+  key <AC11> {   [ Cyrillic_ghe,              Cyrillic_GHE              ]   }; // '
+
+  key <AB01> {   [ Cyrillic_yu,               Cyrillic_YU               ]   }; // z
+  key <AB02> {   [ Ukrainian_yi,              Ukrainian_YI              ]   }; // x
 };
 
 // EXTRAS:
-- 
cgit v1.2.1