making ua(unicode) default, b.fd.o#21302

3 files changed, 50 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 595899fb..539494cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ua: making ua(unicode) default,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21302
+
 2009-04-22 Sergey Udaltsov
 
 	* rules/compat/ln_s.sh, rules/compat/ml1_s.sh: improved compat rules,
diff --git a/rules/base.xml.in b/rules/base.xml.in
index e2a6509f..7d5944af 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3855,8 +3855,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>unicode</name>
-            <_description>Unicode</_description>
+            <name>legacy</name>
+            <_description>Legacy</_description>
           </configItem>
         </variant>
         <variant>
diff --git a/symbols/ua b/symbols/ua
index 73439caf..673d327e 100644
--- a/symbols/ua
+++ b/symbols/ua
@@ -7,11 +7,51 @@
 //
 // $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
 
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
+// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
+// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
+partial default alphanumeric_keys
+xkb_symbols "unicode" {
+    include "ua(winkeys)"
+ 
     name[Group1]= "Ukraine";
 
+    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
+    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
+    key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
+    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
+    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
+    key <AE05> {    [               5,     percent,	  degree               ]       };
+    key <AE06> {    [               6,       colon,   less                             ]       };
+    key <AE07> {    [               7,    question,   greater                             ]       };
+    key <AE08> {    [               8,    asterisk, enfilledcircbullet         ]       };
+    key	<AE09> {    [		    9,	 parenleft,  bracketleft,    braceleft ]       };
+    key	<AE10> {    [		    0,	parenright, bracketright,    braceright]       };
+    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };
+    key	<AE12> {    [	    	equal,	      plus, 	notequal,    plusminus ]       };
+
+    key	<AD03> {    [      Cyrillic_u,	Cyrillic_U,  Byelorussian_shortu,  Byelorussian_SHORTU	]};
+    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm
+    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD12> {    [    Ukrainian_yi,Ukrainian_YI,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+    key	<AC02> {    [    Ukrainian_i,  Ukrainian_I, Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};
+
+    key	<BKSL> {    [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash,  bar	]	};
+
+    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};
+    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};
+    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};
+    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};
+    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "legacy" {
+
+    name[Group1]= "Ukraine - Legacy";
+
     key	<TLDE> {	[      apostrophe,	asciitilde	]	};
     key	<AE01> {	[		1,	    exclam 	]	};
     key	<AE02> {	[		2,        quotedbl	]	};
@@ -82,47 +122,6 @@ xkb_symbols "winkeys" {
     key <AB10> {        [          period,           comma      ]       };
 };
 
-
-// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
-// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
-partial alphanumeric_keys
-xkb_symbols "unicode" {
-    include "ua(winkeys)"
- 
-    name[Group1]= "Ukraine - Unicode";
-
-    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
-    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
-    key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
-    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
-    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
-    key <AE05> {    [               5,     percent,	  degree               ]       };
-    key <AE06> {    [               6,       colon,   less                             ]       };
-    key <AE07> {    [               7,    question,   greater                             ]       };
-    key <AE08> {    [               8,    asterisk, enfilledcircbullet         ]       };
-    key	<AE09> {    [		    9,	 parenleft,  bracketleft,    braceleft ]       };
-    key	<AE10> {    [		    0,	parenright, bracketright,    braceright]       };
-    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };
-    key	<AE12> {    [	    	equal,	      plus, 	notequal,    plusminus ]       };
-
-    key	<AD03> {    [      Cyrillic_u,	Cyrillic_U,  Byelorussian_shortu,  Byelorussian_SHORTU	]};
-    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm
-    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<AD12> {    [    Ukrainian_yi,Ukrainian_YI,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
-    key	<AC02> {    [    Ukrainian_i,  Ukrainian_I, Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};
-
-    key	<BKSL> {    [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash,  bar	]	};
-
-    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};
-    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};
-    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};
-    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};
-    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };
-
-    include "level3(ralt_switch)"
-};
-
 partial alphanumeric_keys
 xkb_symbols "typewriter" {
     include "ua(basic)"