svn merge ^/branches/released .

7 files changed, 685 insertions, 589 deletions

diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkbdata.src/rules/base.extras.xml.in
index 7e32c3140..a17205e54 100644
--- a/xorg-server/xkbdata.src/rules/base.extras.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.extras.xml.in
@@ -1,69 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
-  <modelList/>
-  <layoutList>
-    <layout>
-      <configItem>
-        <name>apl</name>
-        <_shortDescription>APL</_shortDescription>
-        <_description>APL</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>us</name>
-        <_shortDescription>USA</_shortDescription>
-        <_description>USA</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>intl-unicode</name>
-            <_description>International (AltGr Unicode combining)</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>alt-intl-unicode</name>
-            <_description>International (AltGr Unicode combining, alternative)</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ats</name>
-            <_description>Atsina</_description>
-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crd</name>
-            <_description>Couer D'alene Salish</_description>
-            <languageList><iso639Id>crd</iso639Id></languageList>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>rs</name>
-        <_shortDescription>SRB</_shortDescription>
-        <_description>Serbia</_description>
-        <languageList><iso639Id>srp</iso639Id></languageList>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>combiningkeys</name>
-            <_description>Combining accents instead of dead keys</_description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-  </layoutList>
-  <optionList/>
-</xkbConfigRegistry>
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">

+<xkbConfigRegistry>

+  <modelList/>

+  <layoutList>

+    <layout>

+      <configItem>

+        <name>apl</name>

+        <_shortDescription>APL</_shortDescription>

+        <_description>APL</_description>

+        <languageList><iso639Id>eng</iso639Id></languageList>

+      </configItem>

+      <variantList/>

+    </layout>

+    <layout>

+      <configItem>

+        <name>ir</name>

+        <_shortDescription>Iran</_shortDescription>

+        <_description>Iran</_description>

+        <languageList><iso639Id>per</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>ave</name>

+            <_description>Avestan</_description>

+            <languageList><iso639Id>ave</iso639Id></languageList>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+    <layout>

+      <configItem>

+        <name>us</name>

+        <_shortDescription>USA</_shortDescription>

+        <_description>USA</_description>

+        <languageList><iso639Id>eng</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>intl-unicode</name>

+            <_description>International (AltGr Unicode combining)</_description>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>alt-intl-unicode</name>

+            <_description>International (AltGr Unicode combining, alternative)</_description>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>ats</name>

+            <_description>Atsina</_description>

+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>crd</name>

+            <_description>Couer D'alene Salish</_description>

+            <languageList><iso639Id>crd</iso639Id></languageList>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+    <layout>

+      <configItem>

+        <name>rs</name>

+        <_shortDescription>SRB</_shortDescription>

+        <_description>Serbia</_description>

+        <languageList><iso639Id>srp</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>combiningkeys</name>

+            <_description>Combining accents instead of dead keys</_description>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+  </layoutList>

+  <optionList/>

+</xkbConfigRegistry>

diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
index c49f70e0c..36af488d1 100644
--- a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
+++ b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst
@@ -1,4 +1,5 @@
-rs	combiningkeys	extras/rs	combiningkeys
-us	alt-intl-unicode	extras/us	alt-intl-unicode
-us	crd		extras/us	crd
-us	intl-unicode	extras/us	intl-unicode
+rs	combiningkeys	extras/rs	combiningkeys

+ir	ave		extras/ir	ave

+us	alt-intl-unicode	extras/us	alt-intl-unicode

+us	crd		extras/us	crd

+us	intl-unicode	extras/us	intl-unicode

diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.am b/xorg-server/xkbdata.src/symbols/extras/Makefile.am
index 6140b9456..7410ac24f 100644
--- a/xorg-server/xkbdata.src/symbols/extras/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.am
@@ -1,4 +1,5 @@
-symbolsdir = $(xkb_base)/symbols/extras
-dist_symbols_DATA = apl \
-		    rs \
-		    us
+symbolsdir = $(xkb_base)/symbols/extras

+dist_symbols_DATA = apl \

+		    ir \

+		    rs \

+		    us

diff --git a/xorg-server/xkbdata.src/symbols/extras/ir b/xorg-server/xkbdata.src/symbols/extras/ir
new file mode 100644
index 000000000..52502bf75
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/ir
@@ -0,0 +1,63 @@
+/////////////////////////////////////////////////////////////////////////////////

+//

+// Generated keyboard layout file with the Keyboard Layout Editor.

+// For more about the software, see http://code.google.com/p/keyboardlayouteditor

+//

+// Version 0.2, fixed AD09.

+//

+// Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32

+// Creation of this file by Simos Xenitellis.

+

+partial default alphanumeric_keys

+xkb_symbols "ave"

+{

+	name[Group1] = "Iran - Avestan";

+

+	key <AB01> { [ U10B30,         U10B32 ] }; // 𐬰 𐬲 

+	key <AB02> { [ U10B11,         U10B12 ] }; // 𐬑 𐬒 

+	key <AB03> { [ U10B17,          UE102 ] }; // 𐬗  

+	key <AB04> { [ U10B2C,         U10B13 ] }; // 𐬬 𐬓 

+	key <AB05> { [ U10B20,         U10B21 ] }; // 𐬠 𐬡 

+	key <AB06> { [ U10B25,         U10B27 ] }; // 𐬥 𐬧 

+	key <AB07> { [ U10B28,         U10B29 ] }; // 𐬨 𐬩 

+	key <AB08> { [ U10B3C,         U10B39 ] }; // 𐬼 𐬹 

+	key <AB09> { [ U10B3E,         U10B3D ] }; // 𐬾 𐬽 

+	key <AB10> { [ U10B3F, periodcentered ] }; // 𐬿 · 

+

+	key <AC01> { [ U10B00,         U10B01 ] }; // 𐬀 𐬁 

+	key <AC02> { [ U10B2F,         U10B31 ] }; // 𐬯 𐬱 

+	key <AC03> { [ U10B1B,         U10B1C ] }; // 𐬛 𐬜 

+	key <AC04> { [ U10B1F,         U10B16 ] }; // 𐬟 𐬖 

+	key <AC05> { [ U10B14,         U10B15 ] }; // 𐬔 𐬕 

+	key <AC06> { [ U10B35,          UE100 ] }; // 𐬵  

+	key <AC07> { [ U10B18,         U10B24 ] }; // 𐬘 𐬤 

+	key <AC08> { [ U10B10,          UE101 ] }; // 𐬐  

+	key <AC09> { [ U10B2E,          UE103 ] }; // 𐬮  

+	key <AC10> { [ U10B3B,         U10B3A ] }; // 𐬻 𐬺 

+	key <AC11> { [ U10B1D                 ] }; // 𐬝 

+

+	key <AD01> { [ U10B22,         U10B23 ] }; // 𐬢 𐬣 

+	key <AD02> { [ U10B33,         U10B34 ] }; // 𐬳 𐬴 

+	key <AD03> { [ U10B08,         U10B09 ] }; // 𐬈 𐬉 

+	key <AD04> { [ U10B2D,         U10B26 ] }; // 𐬭 𐬦 

+	key <AD05> { [ U10B19,         U10B1A ] }; // 𐬙 𐬚 

+	key <AD06> { [ U10B2B,         U10B2A ] }; // 𐬫 𐬪 

+	key <AD07> { [ U10B0E,         U10B0F ] }; // 𐬎 𐬏 

+	key <AD08> { [ U10B0C,         U10B0D ] }; // 𐬌 𐬍 

+	key <AD09> { [ U10B0A,         U10B0B ] }; // 𐬊 𐬋

+	key <AD10> { [ U10B1E                 ] }; // 𐬞 

+	key <AD11> { [ U10B06,         U10B07 ] }; // 𐬆 𐬇 

+	key <AD12> { [ U10B02,         U10B03 ] }; // 𐬂 𐬃 

+

+	key <AE01> { [ U10B78                 ] }; // 𐭸 

+	key <AE02> { [ U10B79                 ] }; // 𐭹 

+	key <AE03> { [ U10B7A                 ] }; // 𐭺 

+	key <AE04> { [ U10B7B                 ] }; // 𐭻 

+	key <AE05> { [ U10B7C                 ] }; // 𐭼 

+	key <AE06> { [ U10B7D                 ] }; // 𐭽 

+	key <AE07> { [ U10B7E                 ] }; // 𐭾 

+	key <AE08> { [ U10B7F                 ] }; // 𐭿 

+

+	key <BKSL> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅 

+	key <LSGT> { [ U10B04,         U10B05 ] }; // 𐬄 𐬅 

+};

diff --git a/xorg-server/xkbdata.src/symbols/extras/makefile b/xorg-server/xkbdata.src/symbols/extras/makefile
new file mode 100644
index 000000000..99b45229c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/makefile
@@ -0,0 +1,14 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\extras
+
+dist_symbols_DATA = apl \
+		    ir \
+		    rs \
+		    us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/makefile b/xorg-server/xkbdata.src/symbols/makefile
index a968ee6c8..6eea13f1c 100644
--- a/xorg-server/xkbdata.src/symbols/makefile
+++ b/xorg-server/xkbdata.src/symbols/makefile
@@ -1,3 +1,5 @@
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+
 ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
@@ -6,8 +8,6 @@ THISDIR=symbols
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
 
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
-
 dist_xkbdata_symbols_DATA = \
 ad af al \
 am ara az \
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru
index 540e89e27..0e059afad 100644
--- a/xorg-server/xkbdata.src/symbols/ru
+++ b/xorg-server/xkbdata.src/symbols/ru
@@ -1,510 +1,510 @@
-// $XKeyboardConfig$
-
-// based on
-// russian standard keyboard
-// AEN <aen@logic.ru>
-// 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
-// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
-//
-// $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
-
-// Windows layout
-partial default alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "ru(common)"
-
-    name[Group1]= "Russia";
-
-    key <AE03> {        [               3,      numerosign      ]       };
-    key <AE04> {        [               4,       semicolon      ]       };
-    key <AE05> {        [               5,         percent      ]       };
-    key <AE06> {        [               6,           colon      ]       };
-    key <AE07> {        [               7,        question      ]       };
-    key <AE08> {        [               8,        asterisk      ]       };
-
-    key <AB10> {        [          period,           comma      ]       };
-    key <BKSL> {        [       backslash,           slash      ]       };
-};
-
-partial hidden alphanumeric_keys 
-xkb_symbols "common" {
-
-    key	<AE01> {	[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        quotedbl	]	};
-    key	<AE03> {	[		3,      numbersign	]	};
-    key	<AE04> {	[		4,        asterisk	]	};
-    key	<AE05> {	[		5,	     colon	]	};
-    key	<AE06> {	[		6,	     comma	]	};
-    key	<AE07> {	[		7,	    period	]	};
-    key	<AE08> {	[		8,	 semicolon	]	};
-    key	<AE09> {	[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	]	};
-    key	<BKSL> {	[	backslash,             bar	]	};
-    key	<AB10> {	[	    slash,	  question	]	};
-    key <LSGT> {        [           slash,             bar      ]       };
-
-    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
-
-    key.type[group1]="TWO_LEVEL";
-
-    include "kpdl(comma)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "legacy" {
-    include "ru(common)"
-
-    name[Group1]= "Russia - Legacy";
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-    include "ru(common)"
-
-    key        <TLDE> {        [          0x01000451,          0x01000401, grave       ]       }; // Ñ‘, Ð
-    key <AE03> {        [               3,      numbersign, 0x01002116      ]       }; // â„–
-    key <AE04> {        [               4,          dollar, semicolon   ]       };
-    key <AE06> {        [               6,      asciicircum, colon      ]       };
-    key <AE07> {        [               7,          ampersand           ]       };
-    key <AE09> {        [               9,          parenleft, acute    ]       };
-    key <AC12> {        [       backslash,          bar, slash          ]       };
-
-    include "group(olpc)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "typewriter" {
-    include "ru(common)"
-    name[Group1]= "Russia - Typewriter";
-    key	<TLDE> {	[	      bar,	      plus	] 	};
-    key	<AE01> {	[      numerosign,		 1 	]	};
-    key	<AE02> {	[           minus,		 2	]	};
-    key	<AE03> {	[	    slash,		 3	]	};
-    key	<AE04> {	[	 quotedbl,		 4	]	};
-    key	<AE05> {	[	    colon,		 5	]	};
-    key	<AE06> {	[	    comma,		 6	]	};
-    key	<AE07> {	[	   period,		 7	]	};
-    key	<AE08> {	[      underscore,		 8	]	};
-    key	<AE09> {	[	 question,		 9	]	};
-    key	<AE10> {	[	  percent,		 0	]	};
-    key	<AE11> {	[	   exclam,	     equal	]	};
-    key	<AE12> {	[       semicolon,	 backslash	]	};
-
-    key	<BKSL> {	[	parenright,	 parenleft	]	};
-
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
-    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "typewriter-legacy" {
-    include "ru(common)"
-    name[Group1]= "Russia - Typewriter, legacy";
-    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
-    key	<AE01> {	[	   exclam,		 1 	]	};
-    key	<AE02> {	[      numerosign,		 2	]	};
-    key	<AE03> {	[	    slash,		 3	]	};
-    key	<AE04> {	[	semicolon,		 4	]	};
-    key	<AE05> {	[	    colon,		 5	]	};
-    key	<AE06> {	[	    comma,		 6	]	};
-    key	<AE07> {	[	   period,		 7	]	};
-    key	<AE08> {	[      underscore,		 8	]	};
-    key	<AE09> {	[	 question,		 9	]	};
-    key	<AE10> {	[	  percent,		 0	]	};
-    key	<BKSL> {	[	parenleft,	parenright	]	};
-
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
-    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic" {
-
-    name[Group1]= "Russia - Phonetic";
-
-    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> {	[	    minus,	underscore	]	};
-
-    key	<AB09> {	[	   period,	   greater	]	};
-    key	<AB10> {	[	    slash,	  question	]	};
-    key	<AB08> {	[	    comma,	      less	]	};
-    key	<AC10> {	[	semicolon,	     colon	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	]	};
-    key	<LSGT> {	[	      bar,	 brokenbar	]	};
-
-    key	<TLDE> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<LatQ> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<LatZ> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<LatS> {	[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<LatA> {	[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<LatW> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<LatC> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<LatX> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<LatD> {	[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<LatE> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<LatV> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<LatF> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<LatT> {	[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<LatR> {	[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<LatN> {	[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<LatB> {	[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<LatH> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<LatG> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<LatY> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<LatM> {	[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<LatJ> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<LatU> {	[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<LatK> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<LatI> {	[      Cyrillic_i,	Cyrillic_I	]	};
-    key	<LatO> {	[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<LatL> {	[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<LatP> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
-
-    key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic_winkeys" {
-
-    include "ru(phonetic)"
-    name[Group1]= "Russia - Phonetic Winkeys";
-
-    key	<LatX> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<LatH> {	[     Cyrillic_che,     Cyrillic_CHE	]	};
-    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_softsign  ]	};
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "tt" {
-    include "ru(winkeys)"
-    name[Group1]= "Russia - Tatar";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key <TLDE> {       [      0x010004bb,      0x010004ba,
-                             Cyrillic_io,     Cyrillic_IO      ]       };
-    key        <AD02> {        [      0x010004e9,      0x010004e8,
-                            Cyrillic_tse,    Cyrillic_TSE      ]       };
-    key        <AD09> {        [      0x010004d9,      0x010004d8,
-                          Cyrillic_shcha,  Cyrillic_SHCHA      ]       };
-    key        <AD12> {        [      0x010004af,      0x010004ae,
-                       Cyrillic_hardsign,Cyrillic_HARDSIGN     ]       };
-    key        <AC10> {        [      0x010004a3,      0x010004a2,
-                            Cyrillic_zhe,    Cyrillic_ZHE      ]       };
-    key        <AB07> {        [      0x01000497,      0x01000496,
-                       Cyrillic_softsign,Cyrillic_SOFTSIGN     ]       };
-
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "os_legacy" {
-    include "ru(common)"
-
-    name[Group1]= "Russia - Ossetian, legacy";
-
-    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      ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "cv" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Chuvash";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key        <AD03> {        [      Cyrillic_u,	Cyrillic_U,
-                            0x010004f3,    0x010004f2      ]       };
-    key        <AD05> {        [      Cyrillic_ie,     Cyrillic_IE,
-                       0x01000115,	0x01000114     ]       };
-    key        <AC04> {        [      Cyrillic_a,	Cyrillic_A,
-                          abreve,  Abreve      ]       };
-    key        <AB03> {        [      Cyrillic_es,     Cyrillic_ES,
-                            ccedilla,    Ccedilla      ]       };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "udm" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Udmurt";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key	<AE01> {	[	 question,	    exclam,    1,       1 	]	};
-    key	<AE02> {	[	parenleft,        quotedbl,    2,       2	]	};
-    key	<AE03> {	[      parenright,      numbersign,    3,       3	]	};
-    key	<AE04> {	[	    colon,       semicolon,    4,       4	]	};
-    key	<AE05> {	[	 asterisk,	   percent,    5,       5	]	};
-    key	<AE06> {	[      0x010004dd,	0x010004dc,    6,       6	]	};
-    key	<AE07> {	[      0x010004e7,	0x010004e6,    7,       7	]	};
-    key	<AE08> {	[      0x010004f5,	0x010004f4,    8,       8	]	};
-    key	<AE09> {	[      0x010004e5,	0x010004e4,    9,       9	]	};
-    key	<AE10> {	[      0x010004df,	0x010004de,    0,       0	]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "cv_latin" {
-    include "us(alt-intl)"
-
-    name[Group1]= "Russia - Chuvash Latin";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key        <AD01> {	[	  q,	Q,    0x01000161,       0x01000160 ] };
-    key        <AD02> {	[	  w,	W,    udiaeresis,       Udiaeresis ] };
-    key        <AD03> { [         e,	E,    0x01000115,	0x01000114 ] };
-    key        <AD07> {	[	  u,	U,    udiaeresis,       Udiaeresis ] };
-    key        <AD08> {	[	  i,	I,    0x0100012d,       0x0100012c ] };
-    key        <AD09> {	[	  o,	O,    odiaeresis,       Odiaeresis ] };
-    key        <AC01> { [	  a,    A,        abreve,           Abreve ] };
-    key        <AC02> { [	  s,    S,      scedilla,         Scedilla ] };
-    key        <AC05> { [	  g,    G,        gbreve,           Gbreve ] };
-    key        <AC07> { [	  j,    J,    0x01000131,       0x01000130 ] };
-    key        <AB03> { [         c,    C,      ccedilla,         Ccedilla ] };
-
-    include "level3(ralt_switch)"
-
-};
-
-// Komi language layout
-// based on
-// russian standard keyboard
-// Vlad Shakhov <lumpen.intellectual@gmail.com>
-// Last Changes 2007/10/23 by Vlad Shakhov <lumpen.intellectual@gmail.com>
-
-partial alphanumeric_keys 
-xkb_symbols "kom" {
-
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Komi";
-
-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-
-// cyrilllic o with diaeresis 
-    key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		
-			U04E7,  		U04E6		] };
-    
-// hard I as additional key for soft Cyrillic_I 
-    key <AB05> { [      Cyrillic_i,		Cyrillic_I,
-			Ukrainian_i,     	Ukrainian_I     ] };
-
-    include "level3(ralt_switch)"
-};
-
-// Yakut language layout
-// 2008/04/23 Yakov Aleksandrov <bertjickty@yandex.ru>
-// 2008/04/23 Anatoliy Zhozhikov <jav@sitc.ru>
-// 2008/04/23 Aleksandr Varlamov
-partial alphanumeric_keys
-xkb_symbols "sah" {
-
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Yakut";
-
-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-
-    key <TLDE> { [	Cyrillic_io,		Cyrillic_IO,
-    			U04EB,			U04EA			] };
-    key <AD01> { [	Cyrillic_shorti,	Cyrillic_SHORTI,
-			U048B,			U048A			] };
-    key <AD03> { [	Cyrillic_u,		Cyrillic_U,
-			Cyrillic_u_straight,	Cyrillic_U_straight	] };
-    key <AD04> { [	Cyrillic_ka,		Cyrillic_KA,
-    			U04C4,			U04C3			] };
-    key <AD06> { [	Cyrillic_en,		Cyrillic_EN,
-			U04A5,			U04A4			] };
-    key <AD07> { [	Cyrillic_ghe,		Cyrillic_GHE,
-			U0495,			U0494			] };
-    key <AD10> { [	Cyrillic_ze,		Cyrillic_ZE,
-    			U04E1,			U04E0			] };
-    key <AD11> { [	Cyrillic_ha,		Cyrillic_HA,
-			Cyrillic_shha,		Cyrillic_SHHA		] };
-    key <AC07> { [	Cyrillic_o,		Cyrillic_O,
-			Cyrillic_o_bar,		Cyrillic_O_bar		] };
-    key <AC10> { [	Cyrillic_zhe,		Cyrillic_ZHE,
-    			U0461,			U0460			] };
-    key <AB02> { [	Cyrillic_che,		Cyrillic_CHE,
-    			Cyrillic_u_macron,	Cyrillic_U_macron	] };
-    key <AB04> { [	Cyrillic_em,		Cyrillic_EM,
-    			U04C8,			U04C7			] };
-    key <AB05> { [	Cyrillic_i,		Cyrillic_I,
-			Cyrillic_i_macron,	Cyrillic_I_macron	] };
-
-    include "level3(ralt_switch)"
-};
-
-
-//Kalmyk language layout
-//based on the Kalmyk language layout: http://soft.oyrat.org/
-//Nikolay Korneev <halmg@oyrat.org>
-//Toli Miron <mirontoli@gmail.com>
-        
-partial alphanumeric_keys
-xkb_symbols "xal" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Kalmyk";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key <AE01> {        [                     question,                  exclam,               1      ]       };
-    key <AE02> {        [      	            numerosign,                quotedbl,               2      ]       };
-    key <AE03> {        [          Cyrillic_u_straight,     Cyrillic_U_straight,               3      ]       };
-    key <AE04> {        [               Cyrillic_schwa,          Cyrillic_SCHWA,               4      ]       }; 
-    key <AE05> {        [                     asterisk,                 percent,               5      ]       };
-    key <AE06> {        [        Cyrillic_en_descender,   Cyrillic_EN_descender,               6      ]       };
-    key <AE07> {        [               Cyrillic_o_bar,          Cyrillic_O_bar,               7      ]       }; 
-    key <AE08> {        [                Cyrillic_shha,           Cyrillic_SHHA,               8      ]       }; 
-    key <AE09> {        [       Cyrillic_zhe_descender,  Cyrillic_ZHE_descender,               9      ]       };
-    key <AE10> {        [                    semicolon,                   colon,               0      ]       };
-
-    key <TLDE> {        [                    parenleft,               parenright, Cyrillic_io, Cyrillic_IO    ]       };
-
-    key <AD02> {        [                 Cyrillic_tse,             Cyrillic_TSE,         dollar      ]       };
-    key <AD03> {        [                   Cyrillic_u,               Cyrillic_U,       EuroSign      ]       }; 
-    key <AD04> {        [                  Cyrillic_ka,              Cyrillic_KA,     registered      ]       }; 
-    key <AD05> {        [                  Cyrillic_ie,              Cyrillic_IE,      trademark      ]       }; 
-    key <AD11> {        [                  Cyrillic_ha,              Cyrillic_HA,    bracketleft      ]       }; 
-    key <AD12> {        [            Cyrillic_hardsign,        Cyrillic_HARDSIGN,   bracketright      ]       };
-    key <AC11> {        [                   Cyrillic_e,               Cyrillic_E,     apostrophe      ]       };
-    key <AB03> {        [                  Cyrillic_es,              Cyrillic_ES,      copyright      ]       }; 
-    key <AB08> {        [                  Cyrillic_be,              Cyrillic_BE,           less      ]       };
-    key <AB09> {        [                  Cyrillic_yu,              Cyrillic_YU,        greater      ]       };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "dos" {
-
-    include "ru(common)"
-
-    name[Group1]= "Russia - DOS";
-
-    key        <TLDE> {        [   parenright,  parenleft   ] };
-    key        <AE04> {        [   4,           currency    ] };
-    key        <AE09> {        [   9,           question    ] };
-    key        <AE10> {        [   0,           percent     ] };
-
-    key        <AB10> {        [   Cyrillic_io, Cyrillic_IO ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "bak" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Bashkirian";
-    key.type[group1]="FOUR_LEVEL";
-
-    key <TLDE> { [     0x010004d9,       0x010004d8,   Cyrillic_io,   Cyrillic_IO      ] };
-    key <AE01> { [     exclam,           quotedbl,      1,       1       ] };
-    key <AE02> { [     0x010004e9,       0x010004e8,    2,       2 ] };
-    key <AE03> { [     0x010004a1,       0x010004a0,    3,       3 ] };
-    key <AE04> { [     0x01000493,       0x01000492,    4,       4 ] };
-    key <AE05> { [     0x010004ab,       0x010004aa,    5,       5 ] };
-    key <AE06> { [     colon,            semicolon,     6,       6 ] };
-    key <AE07> { [     0x01000499,       0x01000498,    7,       7 ] };
-    key <AE08> { [     0x010004bb,       0x010004ba,    8,       8 ] };
-    key <AE09> { [     question,         parenleft,     9,       9 ] };
-    key <AE10> { [     numerosign,       parenright,    0,       0 ] };
-    key <AE11> { [     minus,            percent,       minus,    underscore     ]};
-    key <AE12> { [     0x010004af, 0x010004ae,    equal,  plus    ]};
-    key <BKSL> { [     0x010004a3, 0x010004a2,    backslash,        slash     ]};	
-	
-    include "level3(ralt_switch)"
-};
-
-// Serbian charecters added as third level symbols to Russian keyboard layout.
-
-partial alphanumeric_keys
-xkb_symbols "srp" {
-    include "ru(common)"
-    include "level3(ralt_switch)"
-
-    name[Group1]= "Russia - Serbian";
-
-    key <AE03> { [ 3, numerosign ] };
-    key <AE04> { [ 4, semicolon ] };
-    key <AE05> { [ 5, percent ] };
-    key <AE06> { [ 6, colon ] };
-    key <AE07> { [ 7, question ] };
-    key <AE08> { [ 8, asterisk ] };
-    key <AB10> { [ period, comma ] };
-    key <BKSL> { [ backslash, slash ] };
-    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, U458, U408 ] };
-    key	<AD06> { [ Cyrillic_en, Cyrillic_EN, U45A, U40A ] };
-    key	<AC08> { [ Cyrillic_el, Cyrillic_EL, U459, U409 ] };
-    key	<AC09> { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] };
-    key	<AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] };
-    key	<AB02> { [ Cyrillic_che, Cyrillic_CHE, U45B, U40B ] };
-};
+// $XKeyboardConfig$

+

+// based on

+// russian standard keyboard

+// AEN <aen@logic.ru>

+// 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>

+// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>

+//

+// $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $

+

+// Windows layout

+partial default alphanumeric_keys

+xkb_symbols "winkeys" {

+    include "ru(common)"

+

+    name[Group1]= "Russia";

+

+    key <AE03> {        [               3,      numerosign      ]       };

+    key <AE04> {        [               4,       semicolon      ]       };

+    key <AE05> {        [               5,         percent      ]       };

+    key <AE06> {        [               6,           colon      ]       };

+    key <AE07> {        [               7,        question      ]       };

+    key <AE08> {        [               8,        asterisk      ]       };

+

+    key <AB10> {        [          period,           comma      ]       };

+    key <BKSL> {        [       backslash,           slash      ]       };

+};

+

+partial hidden alphanumeric_keys 

+xkb_symbols "common" {

+

+    key	<AE01> {	[		1,	    exclam 	]	};

+    key	<AE02> {	[		2,        quotedbl	]	};

+    key	<AE03> {	[		3,      numbersign	]	};

+    key	<AE04> {	[		4,        asterisk	]	};

+    key	<AE05> {	[		5,	     colon	]	};

+    key	<AE06> {	[		6,	     comma	]	};

+    key	<AE07> {	[		7,	    period	]	};

+    key	<AE08> {	[		8,	 semicolon	]	};

+    key	<AE09> {	[		9,	 parenleft	]	};

+    key	<AE10> {	[		0,	parenright	]	};

+    key	<AE11> {	[	    minus,	underscore	]	};

+    key	<AE12> {	[	    equal,	      plus	]	};

+    key	<BKSL> {	[	backslash,             bar	]	};

+    key	<AB10> {	[	    slash,	  question	]	};

+    key <LSGT> {        [           slash,             bar      ]       };

+

+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};

+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};

+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};

+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};

+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};

+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};

+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};

+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};

+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};

+    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};

+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};

+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};

+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};

+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};

+    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};

+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};

+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};

+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};

+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};

+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};

+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};

+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};

+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};

+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};

+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};

+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};

+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};

+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};

+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};

+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};

+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};

+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};

+

+    key.type[group1]="TWO_LEVEL";

+

+    include "kpdl(comma)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "legacy" {

+    include "ru(common)"

+

+    name[Group1]= "Russia - Legacy";

+};

+

+partial alphanumeric_keys

+xkb_symbols "olpc" {

+

+    include "ru(common)"

+

+    key        <TLDE> {        [          0x01000451,          0x01000401, grave       ]       }; // Ñ‘, Ð

+    key <AE03> {        [               3,      numbersign, 0x01002116      ]       }; // â„–

+    key <AE04> {        [               4,          dollar, semicolon   ]       };

+    key <AE06> {        [               6,      asciicircum, colon      ]       };

+    key <AE07> {        [               7,          ampersand           ]       };

+    key <AE09> {        [               9,          parenleft, acute    ]       };

+    key <AC12> {        [       backslash,          bar, slash          ]       };

+

+    include "group(olpc)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "typewriter" {

+    include "ru(common)"

+    name[Group1]= "Russia - Typewriter";

+    key	<TLDE> {	[	      bar,	      plus	] 	};

+    key	<AE01> {	[      numerosign,		 1 	]	};

+    key	<AE02> {	[           minus,		 2	]	};

+    key	<AE03> {	[	    slash,		 3	]	};

+    key	<AE04> {	[	 quotedbl,		 4	]	};

+    key	<AE05> {	[	    colon,		 5	]	};

+    key	<AE06> {	[	    comma,		 6	]	};

+    key	<AE07> {	[	   period,		 7	]	};

+    key	<AE08> {	[      underscore,		 8	]	};

+    key	<AE09> {	[	 question,		 9	]	};

+    key	<AE10> {	[	  percent,		 0	]	};

+    key	<AE11> {	[	   exclam,	     equal	]	};

+    key	<AE12> {	[       semicolon,	 backslash	]	};

+

+    key	<BKSL> {	[	parenright,	 parenleft	]	};

+

+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};

+    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "typewriter-legacy" {

+    include "ru(common)"

+    name[Group1]= "Russia - Typewriter, legacy";

+    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};

+    key	<AE01> {	[	   exclam,		 1 	]	};

+    key	<AE02> {	[      numerosign,		 2	]	};

+    key	<AE03> {	[	    slash,		 3	]	};

+    key	<AE04> {	[	semicolon,		 4	]	};

+    key	<AE05> {	[	    colon,		 5	]	};

+    key	<AE06> {	[	    comma,		 6	]	};

+    key	<AE07> {	[	   period,		 7	]	};

+    key	<AE08> {	[      underscore,		 8	]	};

+    key	<AE09> {	[	 question,		 9	]	};

+    key	<AE10> {	[	  percent,		 0	]	};

+    key	<BKSL> {	[	parenleft,	parenright	]	};

+

+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};

+    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "phonetic" {

+

+    name[Group1]= "Russia - Phonetic";

+

+    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> {	[	    minus,	underscore	]	};

+

+    key	<AB09> {	[	   period,	   greater	]	};

+    key	<AB10> {	[	    slash,	  question	]	};

+    key	<AB08> {	[	    comma,	      less	]	};

+    key	<AC10> {	[	semicolon,	     colon	]	};

+    key	<AC11> {	[      apostrophe,	  quotedbl	]	};

+    key	<LSGT> {	[	      bar,	 brokenbar	]	};

+

+    key	<TLDE> {	[     Cyrillic_yu,     Cyrillic_YU	]	};

+    key	<LatQ> {	[     Cyrillic_ya,     Cyrillic_YA	]	};

+    key	<LatZ> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};

+    key	<LatS> {	[     Cyrillic_es,     Cyrillic_ES	]	};

+    key	<LatA> {	[      Cyrillic_a,	Cyrillic_A	]	};

+    key	<LatW> {	[     Cyrillic_ve,     Cyrillic_VE	]	};

+    key	<LatC> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};

+    key	<LatX> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

+    key	<LatD> {	[     Cyrillic_de,     Cyrillic_DE	]	};

+    key	<LatE> {	[     Cyrillic_ie,     Cyrillic_IE	]	};

+    key	<LatV> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};

+    key	<LatF> {	[     Cyrillic_ef,     Cyrillic_EF	]	};

+    key	<LatT> {	[     Cyrillic_te,     Cyrillic_TE	]	};

+    key	<LatR> {	[     Cyrillic_er,     Cyrillic_ER	]	};

+    key	<LatN> {	[     Cyrillic_en,     Cyrillic_EN	]	};

+    key	<LatB> {	[     Cyrillic_be,     Cyrillic_BE	]	};

+    key	<LatH> {	[     Cyrillic_ha,     Cyrillic_HA	]	};

+    key	<LatG> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};

+    key	<LatY> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};

+    key	<LatM> {	[     Cyrillic_em,     Cyrillic_EM	]	};

+    key	<LatJ> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};

+    key	<LatU> {	[      Cyrillic_u,	Cyrillic_U	]	};

+    key	<LatK> {	[     Cyrillic_ka,     Cyrillic_KA	]	};

+    key	<LatI> {	[      Cyrillic_i,	Cyrillic_I	]	};

+    key	<LatO> {	[      Cyrillic_o,	Cyrillic_O	]	};

+    key	<LatL> {	[     Cyrillic_el,     Cyrillic_EL	]	};

+    key	<LatP> {	[     Cyrillic_pe,     Cyrillic_PE	]	};

+

+    key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};

+    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	]	};

+    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};

+    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "phonetic_winkeys" {

+

+    include "ru(phonetic)"

+    name[Group1]= "Russia - Phonetic Winkeys";

+

+    key	<LatX> {	[     Cyrillic_ha,     Cyrillic_HA	]	};

+    key	<LatH> {	[     Cyrillic_che,     Cyrillic_CHE	]	};

+    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_softsign  ]	};

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "tt" {

+    include "ru(winkeys)"

+    name[Group1]= "Russia - Tatar";

+

+    key.type[group1]="FOUR_LEVEL";

+

+    key <TLDE> {       [      0x010004bb,      0x010004ba,

+                             Cyrillic_io,     Cyrillic_IO      ]       };

+    key        <AD02> {        [      0x010004e9,      0x010004e8,

+                            Cyrillic_tse,    Cyrillic_TSE      ]       };

+    key        <AD09> {        [      0x010004d9,      0x010004d8,

+                          Cyrillic_shcha,  Cyrillic_SHCHA      ]       };

+    key        <AD12> {        [      0x010004af,      0x010004ae,

+                       Cyrillic_hardsign,Cyrillic_HARDSIGN     ]       };

+    key        <AC10> {        [      0x010004a3,      0x010004a2,

+                            Cyrillic_zhe,    Cyrillic_ZHE      ]       };

+    key        <AB07> {        [      0x01000497,      0x01000496,

+                       Cyrillic_softsign,Cyrillic_SOFTSIGN     ]       };

+

+    include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys 

+xkb_symbols "os_legacy" {

+    include "ru(common)"

+

+    name[Group1]= "Russia - Ossetian, legacy";

+

+    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      ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "cv" {

+    include "ru(winkeys)"

+

+    name[Group1]= "Russia - Chuvash";

+

+    key.type[group1]="FOUR_LEVEL";

+

+    key        <AD03> {        [      Cyrillic_u,	Cyrillic_U,

+                            0x010004f3,    0x010004f2      ]       };

+    key        <AD05> {        [      Cyrillic_ie,     Cyrillic_IE,

+                       0x01000115,	0x01000114     ]       };

+    key        <AC04> {        [      Cyrillic_a,	Cyrillic_A,

+                          abreve,  Abreve      ]       };

+    key        <AB03> {        [      Cyrillic_es,     Cyrillic_ES,

+                            ccedilla,    Ccedilla      ]       };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "udm" {

+    include "ru(winkeys)"

+

+    name[Group1]= "Russia - Udmurt";

+

+    key.type[group1]="FOUR_LEVEL";

+

+    key	<AE01> {	[	 question,	    exclam,    1,       1 	]	};

+    key	<AE02> {	[	parenleft,        quotedbl,    2,       2	]	};

+    key	<AE03> {	[      parenright,      numerosign,    3,       3	]	};

+    key	<AE04> {	[	    colon,       semicolon,    4,       4	]	};

+    key	<AE05> {	[	 asterisk,	   percent,    5,       5	]	};

+    key	<AE06> {	[      0x010004dd,	0x010004dc,    6,       6	]	};

+    key	<AE07> {	[      0x010004e7,	0x010004e6,    7,       7	]	};

+    key	<AE08> {	[      0x010004f5,	0x010004f4,    8,       8	]	};

+    key	<AE09> {	[      0x010004e5,	0x010004e4,    9,       9	]	};

+    key	<AE10> {	[      0x010004df,	0x010004de,    0,       0	]	};

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "cv_latin" {

+    include "us(alt-intl)"

+

+    name[Group1]= "Russia - Chuvash Latin";

+

+    key.type[group1]="FOUR_LEVEL";

+

+    key        <AD01> {	[	  q,	Q,    0x01000161,       0x01000160 ] };

+    key        <AD02> {	[	  w,	W,    udiaeresis,       Udiaeresis ] };

+    key        <AD03> { [         e,	E,    0x01000115,	0x01000114 ] };

+    key        <AD07> {	[	  u,	U,    udiaeresis,       Udiaeresis ] };

+    key        <AD08> {	[	  i,	I,    0x0100012d,       0x0100012c ] };

+    key        <AD09> {	[	  o,	O,    odiaeresis,       Odiaeresis ] };

+    key        <AC01> { [	  a,    A,        abreve,           Abreve ] };

+    key        <AC02> { [	  s,    S,      scedilla,         Scedilla ] };

+    key        <AC05> { [	  g,    G,        gbreve,           Gbreve ] };

+    key        <AC07> { [	  j,    J,    0x01000131,       0x01000130 ] };

+    key        <AB03> { [         c,    C,      ccedilla,         Ccedilla ] };

+

+    include "level3(ralt_switch)"

+

+};

+

+// Komi language layout

+// based on

+// russian standard keyboard

+// Vlad Shakhov <lumpen.intellectual@gmail.com>

+// Last Changes 2007/10/23 by Vlad Shakhov <lumpen.intellectual@gmail.com>

+

+partial alphanumeric_keys 

+xkb_symbols "kom" {

+

+    include "ru(winkeys)"

+

+    name[Group1]= "Russia - Komi";

+

+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";

+

+// cyrilllic o with diaeresis 

+    key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		

+			U04E7,  		U04E6		] };

+    

+// hard I as additional key for soft Cyrillic_I 

+    key <AB05> { [      Cyrillic_i,		Cyrillic_I,

+			Ukrainian_i,     	Ukrainian_I     ] };

+

+    include "level3(ralt_switch)"

+};

+

+// Yakut language layout

+// 2008/04/23 Yakov Aleksandrov <bertjickty@yandex.ru>

+// 2008/04/23 Anatoliy Zhozhikov <jav@sitc.ru>

+// 2008/04/23 Aleksandr Varlamov

+partial alphanumeric_keys

+xkb_symbols "sah" {

+

+    include "ru(winkeys)"

+

+    name[Group1]= "Russia - Yakut";

+

+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";

+

+    key <TLDE> { [	Cyrillic_io,		Cyrillic_IO,

+    			U04EB,			U04EA			] };

+    key <AD01> { [	Cyrillic_shorti,	Cyrillic_SHORTI,

+			U048B,			U048A			] };

+    key <AD03> { [	Cyrillic_u,		Cyrillic_U,

+			Cyrillic_u_straight,	Cyrillic_U_straight	] };

+    key <AD04> { [	Cyrillic_ka,		Cyrillic_KA,

+    			U04C4,			U04C3			] };

+    key <AD06> { [	Cyrillic_en,		Cyrillic_EN,

+			U04A5,			U04A4			] };

+    key <AD07> { [	Cyrillic_ghe,		Cyrillic_GHE,

+			U0495,			U0494			] };

+    key <AD10> { [	Cyrillic_ze,		Cyrillic_ZE,

+    			U04E1,			U04E0			] };

+    key <AD11> { [	Cyrillic_ha,		Cyrillic_HA,

+			Cyrillic_shha,		Cyrillic_SHHA		] };

+    key <AC07> { [	Cyrillic_o,		Cyrillic_O,

+			Cyrillic_o_bar,		Cyrillic_O_bar		] };

+    key <AC10> { [	Cyrillic_zhe,		Cyrillic_ZHE,

+    			U0461,			U0460			] };

+    key <AB02> { [	Cyrillic_che,		Cyrillic_CHE,

+    			Cyrillic_u_macron,	Cyrillic_U_macron	] };

+    key <AB04> { [	Cyrillic_em,		Cyrillic_EM,

+    			U04C8,			U04C7			] };

+    key <AB05> { [	Cyrillic_i,		Cyrillic_I,

+			Cyrillic_i_macron,	Cyrillic_I_macron	] };

+

+    include "level3(ralt_switch)"

+};

+

+

+//Kalmyk language layout

+//based on the Kalmyk language layout: http://soft.oyrat.org/

+//Nikolay Korneev <halmg@oyrat.org>

+//Toli Miron <mirontoli@gmail.com>

+        

+partial alphanumeric_keys

+xkb_symbols "xal" {

+    include "ru(winkeys)"

+

+    name[Group1]= "Russia - Kalmyk";

+

+    key.type[group1]="FOUR_LEVEL";

+

+    key <AE01> {        [                     question,                  exclam,               1      ]       };

+    key <AE02> {        [      	            numerosign,                quotedbl,               2      ]       };

+    key <AE03> {        [          Cyrillic_u_straight,     Cyrillic_U_straight,               3      ]       };

+    key <AE04> {        [               Cyrillic_schwa,          Cyrillic_SCHWA,               4      ]       }; 

+    key <AE05> {        [                     asterisk,                 percent,               5      ]       };

+    key <AE06> {        [        Cyrillic_en_descender,   Cyrillic_EN_descender,               6      ]       };

+    key <AE07> {        [               Cyrillic_o_bar,          Cyrillic_O_bar,               7      ]       }; 

+    key <AE08> {        [                Cyrillic_shha,           Cyrillic_SHHA,               8      ]       }; 

+    key <AE09> {        [       Cyrillic_zhe_descender,  Cyrillic_ZHE_descender,               9      ]       };

+    key <AE10> {        [                    semicolon,                   colon,               0      ]       };

+

+    key <TLDE> {        [                    parenleft,               parenright, Cyrillic_io, Cyrillic_IO    ]       };

+

+    key <AD02> {        [                 Cyrillic_tse,             Cyrillic_TSE,         dollar      ]       };

+    key <AD03> {        [                   Cyrillic_u,               Cyrillic_U,       EuroSign      ]       }; 

+    key <AD04> {        [                  Cyrillic_ka,              Cyrillic_KA,     registered      ]       }; 

+    key <AD05> {        [                  Cyrillic_ie,              Cyrillic_IE,      trademark      ]       }; 

+    key <AD11> {        [                  Cyrillic_ha,              Cyrillic_HA,    bracketleft      ]       }; 

+    key <AD12> {        [            Cyrillic_hardsign,        Cyrillic_HARDSIGN,   bracketright      ]       };

+    key <AC11> {        [                   Cyrillic_e,               Cyrillic_E,     apostrophe      ]       };

+    key <AB03> {        [                  Cyrillic_es,              Cyrillic_ES,      copyright      ]       }; 

+    key <AB08> {        [                  Cyrillic_be,              Cyrillic_BE,           less      ]       };

+    key <AB09> {        [                  Cyrillic_yu,              Cyrillic_YU,        greater      ]       };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "dos" {

+

+    include "ru(common)"

+

+    name[Group1]= "Russia - DOS";

+

+    key        <TLDE> {        [   parenright,  parenleft   ] };

+    key        <AE04> {        [   4,           currency    ] };

+    key        <AE09> {        [   9,           question    ] };

+    key        <AE10> {        [   0,           percent     ] };

+

+    key        <AB10> {        [   Cyrillic_io, Cyrillic_IO ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "bak" {

+    include "ru(winkeys)"

+

+    name[Group1]= "Russia - Bashkirian";

+    key.type[group1]="FOUR_LEVEL";

+

+    key <TLDE> { [     0x010004d9,       0x010004d8,   Cyrillic_io,   Cyrillic_IO      ] };

+    key <AE01> { [     exclam,           quotedbl,      1,       1       ] };

+    key <AE02> { [     0x010004e9,       0x010004e8,    2,       2 ] };

+    key <AE03> { [     0x010004a1,       0x010004a0,    3,       3 ] };

+    key <AE04> { [     0x01000493,       0x01000492,    4,       4 ] };

+    key <AE05> { [     0x010004ab,       0x010004aa,    5,       5 ] };

+    key <AE06> { [     colon,            semicolon,     6,       6 ] };

+    key <AE07> { [     0x01000499,       0x01000498,    7,       7 ] };

+    key <AE08> { [     0x010004bb,       0x010004ba,    8,       8 ] };

+    key <AE09> { [     question,         parenleft,     9,       9 ] };

+    key <AE10> { [     numerosign,       parenright,    0,       0 ] };

+    key <AE11> { [     minus,            percent,       minus,    underscore     ]};

+    key <AE12> { [     0x010004af, 0x010004ae,    equal,  plus    ]};

+    key <BKSL> { [     0x010004a3, 0x010004a2,    backslash,        slash     ]};	

+	

+    include "level3(ralt_switch)"

+};

+

+// Serbian charecters added as third level symbols to Russian keyboard layout.

+

+partial alphanumeric_keys

+xkb_symbols "srp" {

+    include "ru(common)"

+    include "level3(ralt_switch)"

+

+    name[Group1]= "Russia - Serbian";

+

+    key <AE03> { [ 3, numerosign ] };

+    key <AE04> { [ 4, semicolon ] };

+    key <AE05> { [ 5, percent ] };

+    key <AE06> { [ 6, colon ] };

+    key <AE07> { [ 7, question ] };

+    key <AE08> { [ 8, asterisk ] };

+    key <AB10> { [ period, comma ] };

+    key <BKSL> { [ backslash, slash ] };

+    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, U458, U408 ] };

+    key	<AD06> { [ Cyrillic_en, Cyrillic_EN, U45A, U40A ] };

+    key	<AC08> { [ Cyrillic_el, Cyrillic_EL, U459, U409 ] };

+    key	<AC09> { [ Cyrillic_de, Cyrillic_DE, U45F, U40F ] };

+    key	<AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U452, U402 ] };

+    key	<AB02> { [ Cyrillic_che, Cyrillic_CHE, U45B, U40B ] };

+};