xkeyboard-config git update 7/5/2010

4 files changed, 64 insertions, 12 deletions

diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index c9fcd4bb5..fc618a4b9 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -4,9 +4,9 @@ symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \
 am ara az \
-be bd \
-bg br ba \
-bt by brai \
+ba bd be \
+bg br brai \
+bt bw by \
 ca cd \
 ch cn cz \
 de dk \
diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkbdata.src/symbols/ara
index 9fa40e981..90a584475 100644
--- a/xorg-server/xkbdata.src/symbols/ara
+++ b/xorg-server/xkbdata.src/symbols/ara
@@ -31,30 +31,30 @@ xkb_symbols "basic" {
     key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
     key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
     key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
-    key <AD05> {  [      Arabic_feh,     0x100fef9        ]     };
+    key <AD05> {  [   Arabic_feh,  0x100fef9, 0x10006a4   ]     };
     key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };
     key <AD07> {  [      Arabic_ain,         grave        ]     };
     key <AD08> {  [       Arabic_ha,        division      ]     };
     key <AD09> {  [     Arabic_khah,       multiply       ]     };
     key <AD10> {  [      Arabic_hah,    Arabic_semicolon  ]     };
-    key <AD11> {  [     Arabic_jeem,        less          ]     };
+    key <AD11> {  [     Arabic_jeem,   less, 0x1000686    ]     };
     key <AD12> {  [      Arabic_dal,        greater       ]     };
 
     key <AC01> {  [    Arabic_sheen,   Arabic_kasra       ]     };
     key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };
     key <AC03> {  [      Arabic_yeh,       bracketright   ]     };
-    key <AC04> {  [      Arabic_beh,       bracketleft    ]     };
+    key <AC04> {  [   Arabic_beh, bracketleft, 0x100067e  ]     };
     key <AC05> {  [      Arabic_lam,       0x100fef7      ]     };
     key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };
     key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };
     key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };
     key <AC09> {  [     Arabic_meem,         slash        ]     };
-    key <AC10> {  [      Arabic_kaf,           colon      ]     };
+    key <AC10> {  [      Arabic_kaf,   colon, 0x10006af   ]     };
     key <AC11> {  [      Arabic_tah,        quotedbl      ]     };
 
     key <LSGT> {  [             bar,      brokenbar	  ]     };
-    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde       ]     };
-    key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
+    key <AB01> {  [Arabic_hamzaonyeh, asciitilde, guillemotright  ]     };
+    key <AB02> {  [    Arabic_hamza,  Arabic_sukun, guillemotleft ]     };
     key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };
     key <AB04> {  [       Arabic_ra,       braceleft      ]     };
     key <AB05> {  [       0x100fefb,       0x100fef5      ]     };
@@ -64,6 +64,8 @@ xkb_symbols "basic" {
     key <AB09> {  [     Arabic_zain,         period       ]     };
     key <AB10> {  [      Arabic_zah, Arabic_question_mark ]     };
 
+    include "level3(ralt_switch)"
+
     // End alphanumeric section
 };
 
diff --git a/xorg-server/xkbdata.src/symbols/bw b/xorg-server/xkbdata.src/symbols/bw
new file mode 100644
index 000000000..ea5079e5d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/bw
@@ -0,0 +1,19 @@
+partial default alphanumeric_keys  
+xkb_symbols "tswana" {
+
+    include "us"
+
+    name[Group1]= "Botswana";
+        
+    key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
+    key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <TLDE> { [     grave,  asciitilde,  0x01000300,  0x01000303 ] };	//COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> { [   	   6, asciicircum,  0x01000302 	       	    ] };	//COMBINING CIRCUMFLEX ACCENT
+    key <AE08> { [	   8,    asterisk,  0x01000307,  0x01000323 ] };	//COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> { [	   9,   parenleft,  0x01000306	            ] };	//COMBINING BREVE
+    key <AE10> { [	   0,  parenright,  0x0100030c 	            ] };	//COMBINING CARON
+    key <AE11> { [     minus,  underscore,  0x01000304,  0x01000331 ] };	//COMBINING MACRON,COMBINING MACRON BELOW  
+  	
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/ke b/xorg-server/xkbdata.src/symbols/ke
index 71629b0c4..5ec174b7e 100644
--- a/xorg-server/xkbdata.src/symbols/ke
+++ b/xorg-server/xkbdata.src/symbols/ke
@@ -5,9 +5,40 @@
 // Please notify any corrections or omissions to
 // Kevin Donnelly (kevin@dotmon.com)
 
-partial default alphanumeric_keys
+partial default alphanumeric_keys  
 xkb_symbols "swa" {
-  include "tz(swa)"
 
-  name[Group1]= "Kenya";
+    include "us"
+
+    name[Group1]= "Kenya";
+    
+    key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
+    key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <TLDE> { [     grave,  asciitilde,  0x01000300,  0x01000303 ] };	//COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> { [   	   6, asciicircum,  0x01000302 	       	    ] };	//COMBINING CIRCUMFLEX ACCENT
+    key <AE08> { [	   8,    asterisk,  0x01000307,  0x01000323 ] };	//COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> { [	   9,   parenleft,  0x01000306	            ] };	//COMBINING BREVE
+    key <AE10> { [	   0,  parenright,  0x0100030c 	            ] };	//COMBINING CARON
+    key <AE11> { [     minus,  underscore,  0x01000304,  0x01000331 ] };	//COMBINING MACRON,COMBINING MACRON BELOW   
+	
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys  
+xkb_symbols "kik" {
+
+    include "us"
+
+    name[Group1]= "Kenya - Kikuyu";
+    
+    key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
+    key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <TLDE> { [     grave,  asciitilde,  0x01000300,  0x01000303 ] };	//COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> { [   	   6, asciicircum,  0x01000302 	       	    ] };	//COMBINING CIRCUMFLEX ACCENT
+    key <AE08> { [	   8,    asterisk,  0x01000307,  0x01000323 ] };	//COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> { [	   9,   parenleft,  0x01000306	            ] };	//COMBINING BREVE
+    key <AE10> { [	   0,  parenright,  0x0100030c 	            ] };	//COMBINING CARON
+    key <AE11> { [     minus,  underscore,  0x01000304,  0x01000331 ] };	//COMBINING MACRON,COMBINING MACRON BELOW 
+	
+    include "level3(ralt_switch)"
 };