xkeyboard-config/symbols ru,1.20,1.21

--===============0759418985==

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/symbols
In directory kemper:/tmp/cvs-serv7046/symbols

Modified Files:
	ru 
Log Message:
changed default russian layout, put a lot of info abount languages/countries into base.xmml

Index: ru
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ru,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ru	24 Jan 2008 23:21:06 -0000	1.20
+++ ru	19 Apr 2008 22:36:45 -0000	1.21
@@ -8,11 +8,27 @@
 //
 // $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
 
-partial default alphanumeric_keys 
+// Windows layout, former winkeys
+partial default alphanumeric_keys
 xkb_symbols "basic" {
+    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	]	};
@@ -69,6 +85,13 @@
 };
 
 partial alphanumeric_keys
+xkb_symbols "legacy" {
+    include "ru(common)"
+
+    name[Group1]= "Russia - Legacy";
+};
+
+partial alphanumeric_keys
 xkb_symbols "olpc" {
 
     include "ru(basic)"
@@ -76,35 +99,17 @@
     key        <TLDE> {        [          0x01000451,          0x01000401, grave       ]       }; // Ñ‘, Ð
     key <AE03> {        [               3,      numbersign, 0x01002116      ]       }; // â„–
     key <AE04> {        [               4,          dollar, semicolon   ]       };
-    key <AE05> {        [               5,          percent             ]       };
     key <AE06> {        [               6,      asciicircum, colon      ]       };
     key <AE07> {        [               7,          ampersand           ]       };
-    key <AE08> {        [               8,          asterisk            ]       };
     key <AE09> {        [               9,          parenleft, acute    ]       };
-    key        <AC12> {        [       backslash,          bar, slash          ]       };
-    key <AB10> {        [          period,          comma               ]       };
-    key <BKSL> {        [       backslash,          slash               ]       };
+    key <AC12> {        [       backslash,          bar, slash          ]       };
 
     include "group(olpc)"
 };
 
 partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "ru(basic)"
-    name[Group1]= "Russia - Winkeys";
-    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 alphanumeric_keys
 xkb_symbols "typewriter" {
-    include "ru(basic)"
+    include "ru(common)"
     name[Group1]= "Russia - Typewriter";
     key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
     key	<AE01> {	[	   exclam,		 1 	]	};
@@ -182,7 +187,7 @@
 
 partial alphanumeric_keys
 xkb_symbols "tt" {
-    include "ru(winkeys)"
+    include "ru(basic)"
     name[Group1]= "Russia - Tatar";
 
     key.type[group1]="FOUR_LEVEL";
@@ -205,10 +210,10 @@
 };
 
 partial alphanumeric_keys 
-xkb_symbols "os" {
-    include "ru(basic)"
+xkb_symbols "os_legacy" {
+    include "ru(common)"
 
-    name[Group1]= "Russia - Ossetian";
+    name[Group1]= "Russia - Ossetian, legacy";
 
     key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
     key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
@@ -217,7 +222,7 @@
 
 partial alphanumeric_keys 
 xkb_symbols "os_winkeys" {
-    include "ru(winkeys)"
+    include "ru(basic)"
 
     name[Group1]= "Russia - Ossetian, Winkeys";
 
@@ -228,7 +233,7 @@
 
 partial alphanumeric_keys
 xkb_symbols "cv" {
-    include "ru(winkeys)"
+    include "ru(basic)"
 
     name[Group1]= "Russia - Chuvash";
 
@@ -248,7 +253,7 @@
 
 partial alphanumeric_keys
 xkb_symbols "udm" {
-    include "ru(winkeys)"
+    include "ru(basic)"
 
     name[Group1]= "Russia - Udmurt";
 
@@ -301,7 +306,7 @@
 partial alphanumeric_keys 
 xkb_symbols "kom" {
 
-    include "ru(winkeys)"
+    include "ru(basic)"
 
     name[Group1]= "Russia - Komi";
 


--===============0759418985==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
xlibs-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xlibs-commit

--===============0759418985==--