mesa xkeyboard-config xserver git update 15 jan 2014

xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43

3 files changed, 149 insertions, 85 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index a1f615c62..24028a867 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -1,78 +1,74 @@
 // based on a keyboard map from an 'xkb/symbols/il' file
 
-// This is a partial implemetation of the Israeli standard SI-1452
-// It does not implement changes to the English layout ("Alt-English"), 
-// as I believe that it is not the job of this layout to modify the English
-// layout.
+// This is an implemetation of the Israeli standard SI-1452 (2013)
+// It does not implement changes to the English layout, as that part
+// of the standard is not normative nor really useful in the context
+// of xkb.
+// This implementation extends the standard with Yiddish digraphs
+// (a common extension) and Nun Hafukha (a fun character).
+
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
     // uses the kbd layout in use in Israel.
 
     name[Group1]= "Hebrew";
+    key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC";
 
-    key <AD01> { [ slash,	Q		]	};
-    key <AD02> { [ apostrophe,	W		]	};
-    key <AD04> { [ hebrew_resh,	R		]	};
-    key <AD05> { [ hebrew_aleph,T		]       };
-    key <AD06> { [ hebrew_tet,	Y		]       };
-    key <AD07> { [ hebrew_waw,	U		]       };
-    key <AD08> { [ hebrew_finalnun,	I	]       };
-    key <AD09> { [ hebrew_finalmem,	O	]       };
-    key <AD10> { [ hebrew_pe,	P		]	};
+    key <AB01> { [ hebrew_zain,	Z		]       };
+    key <AB02> { [ hebrew_samech, X,	U05B6	]       };  // Segol
+    key <AB03> { [ hebrew_bet,	C,	U05B1	]       };  // Hataf Segol
+    key <AB04> { [ hebrew_he,	V		]       };
+    key <AB05> { [ hebrew_nun,	B,	NoSymbol,	U05C6	]}; // Nun Hafukha
+    key <AB06> { [ hebrew_mem,	N		]	};
+    key <AB07> { [ hebrew_zade,	M,	U05B5	]	};  // Tsere
+    key <AB08> { [ hebrew_taw,	greater,	rightsinglequotemark	]}; // greater Mirrored
+    key <AB09> { [ hebrew_finalzade,	less,	singlelowquotemark	]}; // less Mirrored
 
-    key <AC02> { [ hebrew_dalet,S		]       };
+    key <AC01> { [ hebrew_shin,	A,	U05B0	]	};  // Shva
+    key <AC02> { [ hebrew_dalet,S,	U05BC	]       };  // Dagesh
     key <AC03> { [ hebrew_gimel,D		]       };
     key <AC04> { [ hebrew_kaph,	F		]	};
-    key <AC05> { [ hebrew_ayin,	G		]       };
-    key <AC06> { [ hebrew_yod,	H		]       };
-    key <AC07> { [ hebrew_chet,	J		]	};
+    key <AC05> { [ hebrew_ayin,	G,	U05F1	]       };  // Yiddish Vav Yod
+    key <AC06> { [ hebrew_yod,	H,	U05F2	]       };  // Yiddish Double Yod
+    key <AC07> { [ hebrew_chet,	J,	U05B4	]	};  // Hiriq
     key <AC08> { [ hebrew_lamed, K		]	};
-    key <AC09> { [ hebrew_finalkaph,	L	]       };
-    key <AC10> { [ hebrew_finalpe,	colon	]       };
-    key <AC11> { [ comma,	quotedbl	]	};
+    key <AC09> { [ hebrew_finalkaph,	L,	rightdoublequotemark	]};
+    key <AC10> { [ hebrew_finalpe,	colon,	doublelowquotemark	]};
 
-    key <AB01> { [ hebrew_zain,	Z		]       };
-    key <AB02> { [ hebrew_samech, X		]       };
-    key <AB03> { [ hebrew_bet,	C		]       };
-    key <AB04> { [ hebrew_he,	V		]       };
-    key <AB05> { [ hebrew_nun,	B		]       };
-    key <AB06> { [ hebrew_mem,	N		]	};
-    key <AB07> { [ hebrew_zade,	M		]	};
-    // Mirrored:
-    key <AB08> { [ hebrew_taw,	greater		]	};
-    key <AB09> { [ hebrew_finalzade,	less	]	};
-
-    key.type[Group1] = "THREE_LEVEL";
-
-    key <TLDE> { [ semicolon,	asciitilde,0x10005b0	]}; // Sheva
-    key <AB10> { [ period,	question,  0x10005c3	]}; // Sof Pasuq
-    key <AD03> { [ hebrew_qoph,	E,	EuroSign	]};
-    key <AC01> { [ hebrew_shin,	A,	0x10020AA	]};
-
-    // The following may get overriden by the iso9995-3(basic101) symbols.
-    // therefore they are included here. 
-    // Including them isn't a great idea (for instance: what if group 1 uses
-    // UK keyboard mapping, and maps shift-3 to sterling? This mapping won't
-    // preserve that, and I'm not sure that this is a good feature.
-    key <AE01> { [     1, exclam      , 0x10005b1	]}; // H. Segol
-    key <AE02> { [     2, at          , 0x10005b2	]}; // H. Patah
-    key <AE03> { [     3, numbersign  , 0x10005b3	]}; // H.  Qamats
-    key <AE04> { [     4, dollar      , 0x10005b4	]}; // Hiriq
-    key <AE05> { [     5, percent     , 0x10005b5	]}; // Tsere
-    key <AE06> { [     6, asciicircum , 0x10005b6	]}; // Segol
-    key <AE07> { [     7, ampersand   , 0x10005b7	]}; // Patah
-    key <AE08> { [     8, asterisk    , 0x10005b8	]}; // Qamats
-    // Mirrored: 
-    key <AE09> { [     9, parenright   , 0x10005c2	]}; // Sin dot
-    key <AE10> { [     0, parenleft  , 0x10005c1	]}; // Shin dot
-    key <AE11> { [ minus, underscore  , 0x10005b9	]}; // Holam
-    key <AE12> { [ equal, plus        , 0x10005bc	]}; // Dagesh/Shuruq
-
-    // Mirrored: 
-    key <AD11> { [ bracketright, braceright, 0x10005bf	]}; // Rafe
-    key <AD12> { [ bracketleft,  braceleft,  0x10005bd	]}; // Meteg
-
-    key <BKSL> { [ backslash,    bar,  0x10005bb	]}; // Qubuts    
+    key <AD01> { [ slash,	Q,	U05C2	]	};  // Sin Dot
+    key <AD02> { [ apostrophe,	W,	U05C1	]	};  // Shin Dot
+    key <AD03> { [ hebrew_qoph,	E,	U05B8	]	};  // Qamats
+    key <AD04> { [ hebrew_resh,	R,	U05B3	]	};  // Hataf Qamats
+    key <AD05> { [ hebrew_aleph,T		]       };
+    key <AD06> { [ hebrew_tet,	Y,	U05F0	]       };  // Yiddish Double Vav
+    key <AD07> { [ hebrew_waw,	U,	U05B9	]       };  // Holam
+    key <AD08> { [ hebrew_finalnun,	I	]       };
+    key <AD09> { [ hebrew_finalmem,	O	]       };
+    key <AD10> { [ hebrew_pe,	P,	U05B7	]	};  // Patah
+
+    key.type[Group1] = "FOUR_LEVEL";
+
+    // Non-alphanumeric keys
+    key <AB10> { [ period,	question,  division	]};
+    key <AC11> { [ comma,	quotedbl,	U05F4]	};  // Gershayim
+    key <AD11> { [ bracketright, braceright, U05B2	]}; // Mirrored; Hataf Patah
+    key <AD12> { [ bracketleft,  braceleft,  U05BF	]}; // Mirrored; Rafe
+    key <BKSL> { [ backslash,    bar,  U05BB	]	};  // Qubuts
+
+    // Top (digits) row
+    key <TLDE> { [ semicolon,	asciitilde,	U05F3	]}; // Geresh
+    key <AE01> { [     1,	exclam	]		};
+    key <AE02> { [     2,	at	]		};
+    key <AE03> { [     3, 	numbersign,	EuroSign	]};
+    key <AE04> { [     4, 	dollar,		NewSheqelSign	]};
+    key <AE05> { [     5,	percent,	degree	]};
+    key <AE06> { [     6, 	asciicircum,	U05AB	]}; // Hebrew Accent Ole
+    key <AE07> { [     7,	ampersand,	U05BD	]}; // Meteg
+    key <AE08> { [     8,	asterisk,	multiply]};
+    key <AE09> { [     9,	parenright,	U200E	]}; // LRM; Paren Mirrored
+    key <AE10> { [     0,	parenleft,	U200F	]}; // RLM; Paren Mirrored
+    key <AE11> { [ minus,	underscore,	U05BE	]}; // Maqaf
+    key <AE12> { [ equal, 	plus,		endash	]};
 
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index fdf008887..f70e215e6 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -2013,4 +2013,72 @@ xkb_symbols "tel-kagapa" {
 
     include "level3(ralt_switch)"
 };
-// ---- END Telugu KaGaPa ----
+
+// Description 	: Keymap for Manipuri language (Meetei mayek script)
+// Encoding    	: Unicode (http://www.unicode.org)
+// Author      	: Santosh Heigrujam <santosh.tomba@gmail.com>
+// Date        	: December, 2013
+// Source	: 
+// Comment	:
+	
+partial alphanumeric_keys modifier_keys
+xkb_symbols "eeyek" {
+
+    name[Group1]= "Manipuri (Eeyek)";
+
+    // Alphanumeric section
+    key <TLDE> {	[     grave,	asciitilde	]	};
+    key <AE01> {	[	  Uabf1,	exclam 		]	};
+    key <AE02> {	[	  Uabf2,	at		]	};
+    key <AE03> {	[	  Uabf3,	numbersign	]	};
+    key <AE04> {	[	  Uabf4,	dollar		]	};
+    key <AE05> {	[	  Uabf5,	percent		]	};
+    key <AE06> {	[	  Uabf6,	asciicircum	]	};
+    key <AE07> {	[	  Uabf7,	ampersand	]	};
+    key <AE08> {	[	  Uabf8,	asterisk	]	};
+    key <AE09> {	[	  Uabf9,	parenleft	]	};
+    key <AE10> {	[	  Uabf0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <AD01> {	[	  Uabc8,	Uabd8 		]	};
+    key <AD02> {	[	  Uabcb,	Uabcb		]	};
+    key <AD03> {	[	  Uabcf,	Uabe2		]	};
+    key <AD04> {	[	  Uabd4,	Uabd4		]	};
+    key <AD05> {	[	  Uabc7,	Uabe0		]	};
+    key <AD06> {	[	  Uabcc,	Uabe6		]	};
+    key <AD07> {	[	  Uabce,	Uabe8		]	};
+    key <AD08> {	[	  Uabe4,	Uabe9		]	};
+    key <AD09> {	[	  Uabe3,	Uabe7		]	};
+    key <AD10> {	[	  Uabc4,	Uabde		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+
+    key <AC01> {	[	  Uabd1,	Uabe5 		]	};
+    key <AC02> {	[	  Uabc1,	Uabd3		]	};
+    key <AC03> {	[	  Uabd7,	Uabd9		]	};
+    key <AC04> {	[	  Uabd0,	Uabda		]	};
+    key <AC05> {	[	  Uabd2,	Uabd8		]	};
+    key <AC06> {	[	  Uabcd,	Uabea		]	};
+    key <AC07> {	[	  Uabd6,	Uabd3		]	};
+    key <AC08> {	[	  Uabc0,	Uabdb		]	};
+    key <AC09> {	[	  Uabc2,	Uabdc		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ apostrophe,	quotedbl	]	};
+
+    key <AB01> {	[	  Uabc9,	Uabe1 		]	};
+    key <AB02> {	[	  Uabca,	Uabd9		]	};
+    key <AB03> {	[	  Uabc6,	Uabeb		]	};
+    key <AB04> {	[	  Uabda,	Uabed		]	};
+    key <AB05> {	[	  Uabd5,	Uabec		]	};
+    key <AB06> {	[	  Uabc5,	Uabdf		]	};
+    key <AB07> {	[	  Uabc3,	Uabdd		]	};
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+
+    key <BKSL> {	[ backslash,         bar	]	};
+    // End alphanumeric section
+    
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index 20c36c559..a77e971d3 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -76,7 +76,7 @@ xkb_symbols "stea" {
 
     name[Group1]= "Lao (STEA proposed standard layout)";
 
-    key <TLDE> { [  quotedbl,      apostrophe           	]};
+    key <TLDE> { [  quotedbl,      apostrophe			]};
     key <AE01> { [ 0x1000ea2,               1,       0x1000ed1	]};
     key <AE02> { [ 0x1000e9f,               2,       0x1000ed2	]};
     key <AE03> { [ 0x1000ec2,               3,       0x1000ed3	]};
@@ -88,48 +88,48 @@ xkb_symbols "stea" {
     key <AE09> { [ 0x1000e88,               7,       0x1000ed9	]};
     key <AE10> { [ 0x1000e82,               8,       0x1000ed0	]};
     key <AE11> { [ 0x1000e8a,               9			]};
-    key <AE12> { [ 0x1000ecd 					]};
+    key <AE12> { [ 0x1000ecd					]};
 
     key <AD01> { [ 0x1000ebb					]};
     key <AD02> { [ 0x1000ec4,               0			]};
-    key <AD03> { [ 0x1000eb3,       asterisk			]};
-    key <AD04> { [ 0x1000e9e,       underscore             	]};
-    key <AD05> { [ 0x1000eb0,       plus                	]};
+    key <AD03> { [ 0x1000eb3,        asterisk			]};
+    key <AD04> { [ 0x1000e9e,      underscore			]};
+    key <AD05> { [ 0x1000eb0,            plus			]};
     key <AD06> { [ 0x1000eb4					]};
     key <AD07> { [ 0x1000eb5					]};
-    key <AD08> { [ 0x1000eae,       0x1000ea3	                ]};
+    key <AD08> { [ 0x1000eae,       0x1000ea3			]};
     key <AD09> { [ 0x1000e99,       0x1000edc			]};
     key <AD10> { [ 0x1000e8d,       0x1000ebd			]};
-    key <AD11> { [ 0x1000e9a,       minus			]};
-    key <AD12> { [ 0x1000ea5        				]};
-    key <BKSL> { [     slash,       backslash	                ]};
+    key <AD11> { [ 0x1000e9a,           minus			]};
+    key <AD12> { [ 0x1000ea5					]};
+    key <BKSL> { [     slash,       backslash			]};
 
-    key <AC01> { [ 0x1000eb1        		]};
+    key <AC01> { [ 0x1000eb1			]};
     key <AC02> { [ 0x1000eab,       semicolon	]};
-    key <AC03> { [ 0x1000e81,       period	]};
-    key <AC04> { [ 0x1000e94,       comma	]};
-    key <AC05> { [ 0x1000ec0,       colon	]};
+    key <AC03> { [ 0x1000e81,          period	]};
+    key <AC04> { [ 0x1000e94,           comma	]};
+    key <AC05> { [ 0x1000ec0,           colon	]};
     key <AC06> { [ 0x1000ec9,       0x1000eca	]};
     key <AC07> { [ 0x1000ec8,       0x1000ecb	]};
-    key <AC08> { [ 0x1000eb2,       exclam	]};
-    key <AC09> { [ 0x1000eaa,       question	]};
-    key <AC10> { [ 0x1000ea7,       percent	]};
-    key <AC11> { [ 0x1000e87,       equal	]};
+    key <AC08> { [ 0x1000eb2,          exclam	]};
+    key <AC09> { [ 0x1000eaa,        question	]};
+    key <AC10> { [ 0x1000ea7,         percent	]};
+    key <AC11> { [ 0x1000e87,           equal	]};
 
     key <AB01> { [ 0x1000e9c,       0x10020ad	]};
     key <AB02> { [ 0x1000e9b,       parenleft	]};
     key <AB03> { [ 0x1000ec1,       0x1000eaf	]};
-    key <AB04> { [ 0x1000ead,       x		]};
+    key <AB04> { [ 0x1000ead,               x	]};
     key <AB05> { [ 0x1000eb6			]};
     key <AB06> { [ 0x1000eb7			]};
     key <AB07> { [ 0x1000e97,       0x1000ec6	]};
     key <AB08> { [ 0x1000ea1,       0x1000edd	]};
-    key <AB09> { [ 0x1000ec3,       dollar	]};
-    key <AB10> { [ 0x1000e9d,       parenright	]};
+    key <AB09> { [ 0x1000ec3,          dollar	]};
+    key <AB10> { [ 0x1000e9d,      parenright	]};
 
-    key <SPCE> { [ space, nobreakspace, nobreakspace		]};
+    key <SPCE> { [     space,    nobreakspace,    nobreakspace	]};
 
-    key <KPDL> { [     comma,       period 			]};
+    key <KPDL> { [     comma,          period 			]};
 
     include "level3(ralt_switch)"
 };