From bba5528c3dbb9adc59eca28194176a8fd7f1ca3b Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Fri, 1 Sep 2006 22:08:57 +0000
Subject: [PATCH] Added Ossetian b.fd.o#8092

---
 ChangeLog           |  5 +++++
 rules/base.o_s.part |  2 +-
 rules/base.xml.in   | 16 ++++++++++++++--
 symbols/altwin      |  7 ++++---
 symbols/ru          | 22 ++++++++++++++++++++++
 5 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5abca29..9c56224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-01  Sergey Udaltsov
+
+	symbols/ru, rules/base.xml.in: added Ossetian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8092
+
 2006-09-01  Sergey Udaltsov
 
 	symbols/ir, symbols/iq, rules/base.xml.in: added Kurdish Arabic-Latin
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 64145a6..fc62522 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -44,7 +44,7 @@
   altwin:super_win	=	+altwin(super_win)
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
-  altwin:swap_ralt_rwin	=	+altwin(swap_ralt_rwin)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
   compose:ralt		=	+compose(ralt)
   compose:lwin		=	+compose(lwin)
   compose:rwin		=	+compose(rwin)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index e293365..a15edbe 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2146,6 +2146,18 @@
             <_description>Tatar</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>os</name>
+            <_description>Ossetian</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_winkeys</name>
+            <_description>Ossetian, Winkeys</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3059,8 +3071,8 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:swap_ralt_rwin</name>
-          <_description>Right Alt is swapped with right Win-key.</_description>
+          <name>altwin:swap_lalt_lwin</name>
+          <_description>Left Alt is swapped with left Win-key.</_description>
         </configItem>
       </option>
     </group>
diff --git a/symbols/altwin b/symbols/altwin
index 6bb1aea..8ca535d 100644
--- a/symbols/altwin
+++ b/symbols/altwin
@@ -60,7 +60,8 @@ xkb_symbols "alt_super_win" {
 };
 
 partial modifier_keys 
-xkb_symbols "swap_ralt_rwin" {
-    key <RALT> {	[ 	Super_R			]	};
-    key <RWIN> {	[	Alt_R,	Meta_R		]	};
+xkb_symbols "swap_lalt_lwin" {
+    key <LALT> {	[ 	Super_L			]	};
+    key <LWIN> {	[	Alt_L,	Meta_L		]	};
+    modifier_map Mod1 { <LWIN> };
 };
diff --git a/symbols/ru b/symbols/ru
index 2e2b129..bc36bfe 100644
--- a/symbols/ru
+++ b/symbols/ru
@@ -183,3 +183,25 @@ xkb_symbols "tt" {
     include "level3(ralt_switch)"
 
 };
+
+partial alphanumeric_keys 
+xkb_symbols "os" {
+    include "ru(basic)"
+
+    name[Group1]= "Russia - Ossetian";
+
+    key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
+    key	<AC11> {	[      0x010004D5,      0x010004D4      ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "os_winkeys" {
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Ossetian, Winkeys";
+
+    key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
+    key	<AC11> {	[      0x010004D5,      0x010004D4      ]	};
+};
-- 
2.32.0.93.g670b81a890