Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > media > main-testing-src > by-pkgid > 7400d62ca6127472412cc421e1edce56 > files > 5

xkeyboard-config-1.3-6mdv2009.0.src.rpm

diff -u -rN xkeyboard-config-1.3/symbols/az xkeyboard-config-1.3.fixkbd/symbols/az
--- xkeyboard-config-1.3/symbols/az	2005-01-16 02:18:20.000000000 +0000
+++ xkeyboard-config-1.3.fixkbd/symbols/az	2008-05-28 10:43:21.000000000 +0100
@@ -20,7 +20,7 @@
   key <AE08> { [ 8,          asterisk,   asciicircum, dead_circumflex ] };
   key <AE11> { [ minus,      underscore, hyphen,      emdash          ] };
 
-  key <AD02> { [ udiaeresis, Udiaeresis  ] };
+  key <AD02> { [ udiaeresis, Udiaeresis, w, W  ] };
   key <AD04> { [ r,          R,          registered   ] };
   key <AD08> { [ i,          Iabovedot   ] };
   key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };
diff -u -rN xkeyboard-config-1.3/symbols/be xkeyboard-config-1.3.fixkbd/symbols/be
--- xkeyboard-config-1.3/symbols/be	2007-07-16 09:27:03.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/be	2008-05-28 10:43:21.000000000 +0100
@@ -27,6 +27,7 @@
     key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};
     key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};
     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
     key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };
     key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};
 
diff -u -rN xkeyboard-config-1.3/symbols/fr xkeyboard-config-1.3.fixkbd/symbols/fr
--- xkeyboard-config-1.3/symbols/fr	2008-04-22 20:54:11.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/fr	2008-05-28 10:43:21.000000000 +0100
@@ -27,6 +27,7 @@
     key <AD01>	{ [         a,          A,           ae,           AE ]	};
     key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
     key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
     key <AD12>	{ [    dollar,   sterling,     currency,  dead_macron ]	};
 
diff -u -rN xkeyboard-config-1.3/symbols/il xkeyboard-config-1.3.fixkbd/symbols/il
--- xkeyboard-config-1.3/symbols/il	2007-05-13 12:23:38.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/il	2008-05-28 10:43:21.000000000 +0100
@@ -130,6 +130,9 @@
     key <AD12> { [ bracketleft,	braceleft	]       };
     key <AE09> { [ 9         ,	parenright	]       };
     key <AE10> { [ 0         ,	parenleft	]       };
+
+    // Mirrored until "us" doesn't set EuroSign, cf mdbz#39418
+    key <AE05> { [     5, percent       ]};
     
     key <AE11> { [     minus,	0x10005be	]	}; // H. Hiphen
 };
diff -u -rN xkeyboard-config-1.3/symbols/mt xkeyboard-config-1.3.fixkbd/symbols/mt
--- xkeyboard-config-1.3/symbols/mt	2006-06-14 22:43:30.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/mt	2008-05-28 10:43:21.000000000 +0100
@@ -8,7 +8,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "latin"
+    include "gb"
 
     name[Group1]="Malta";
 
diff -u -rN xkeyboard-config-1.3/symbols/pt xkeyboard-config-1.3.fixkbd/symbols/pt
--- xkeyboard-config-1.3/symbols/pt	2007-10-19 12:05:22.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/pt	2008-05-28 10:43:21.000000000 +0100
@@ -25,6 +25,7 @@
     key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
 
     key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
+    key <LSGT>	{ [ less, greater ]	};
 
     include "level3(ralt_switch)"
 };
diff -u -rN xkeyboard-config-1.3/symbols/ro xkeyboard-config-1.3.fixkbd/symbols/ro
--- xkeyboard-config-1.3/symbols/ro	2008-05-12 21:43:22.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/ro	2008-05-28 10:45:03.000000000 +0100
@@ -19,6 +19,11 @@
 
 
 partial default alphanumeric_keys
+xkb_symbols "qwertz" {
+   include "ro(std_cedilla)"
+};
+
+partial alphanumeric_keys
 xkb_symbols "basic" {
 // This RO_US/Programmers layout, although the secondary layout in the 
 // Romanian standard, has always been the "de facto" standard in the 
diff -u -rN xkeyboard-config-1.3/symbols/tj xkeyboard-config-1.3.fixkbd/symbols/tj
--- xkeyboard-config-1.3/symbols/tj	2005-08-01 23:11:07.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/tj	2008-05-28 10:43:21.000000000 +0100
@@ -3,10 +3,10 @@
 // based on
 // Tajik keyboard 
 // it is a Russian layout keyboard, with SHCHA replaced with 
-// dead_cedilla/dead_macron
-// that allows to type the SHCHA with dead_cedilla + SHA
+// dead_macron
+// that allows to type the SHCHA with dead_macron + SHA
 // and all the extra Tajik keys:
-// dead_cedilla + KA, HA --> KA descender, HA descender
+// dead_macron + KA, HA --> KA descender, HA descender
 // dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
 // it requires proper dead_cedilla and dead_macron entries in Compose file
 // it also allows to use Mode_switch when in cyrillic mode to enter
@@ -55,7 +55,7 @@
     key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
     key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
     key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA,     Cyrillic_shcha,  Cyrillic_SHCHA]	 };
-    key	<AD09> {	[    dead_cedilla,     dead_macron	]	};
+    key	<AD09> {	[    dead_macron,     dead_macron	]	};
     key	<AE10> {	[		0,	parenright	]	};
     key	<AE09> {	[		9,	 parenleft	]	};
     key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
@@ -71,4 +71,6 @@
 
     // End alphanumeric section
 
+	include "level3(ralt_switch)"
+
 };
diff -u -rN xkeyboard-config-1.3/symbols/us xkeyboard-config-1.3.fixkbd/symbols/us
--- xkeyboard-config-1.3/symbols/us	2008-05-27 22:50:35.000000000 +0100
+++ xkeyboard-config-1.3.fixkbd/symbols/us	2008-05-28 10:43:21.000000000 +0100
@@ -16,7 +16,7 @@
     key <AE02> {	[	  2,	at		]	};
     key <AE03> {	[	  3,	numbersign	]	};
     key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
+    key <AE05> {	[	  5,	percent, EuroSign ]	}; // EuroSign should be removed post mdv2008.1 (cf mdvbz#39418)
     key <AE06> {	[	  6,	asciicircum	]	};
     key <AE07> {	[	  7,	ampersand	]	};
     key <AE08> {	[	  8,	asterisk	]	};