Switched to xkeyboard-config-1.6.99

27 files changed, 1483 insertions, 340 deletions

diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index d033a159c..472a39922 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
 
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.in b/xorg-server/xkbdata.src/symbols/Makefile.in
index 67faac258..45c080daf 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/Makefile.in
@@ -181,7 +181,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \
@@ -567,7 +567,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA
 
 $(subdir).dir: $(dir_data)
 	-rm -f $@
-	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+	here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin
index 64e8a3577..d0154f2f3 100644
--- a/xorg-server/xkbdata.src/symbols/altwin
+++ b/xorg-server/xkbdata.src/symbols/altwin
@@ -5,7 +5,8 @@
 partial modifier_keys 
 xkb_symbols "meta_alt" {
     key <LALT> {	[ 	Alt_L,	Meta_L		]	};
-    key <RALT> {	[ 	Alt_R,	Meta_R		]	};
+    key <RALT> { type[Group1] = "TWO_LEVEL",
+                 symbols[Group1] = [ Alt_R, Meta_R ] };
     modifier_map Mod1	{ Alt_L, Alt_R, Meta_L, Meta_R };
 //  modifier_map Mod4	{};
 };
@@ -22,7 +23,8 @@ xkb_symbols "ctrl_win" {
 partial modifier_keys 
 xkb_symbols "ctrl_alt_win" {
     key <LALT> {	[ 	Control_L, Control_L		]	};
-    key <RALT> {	[ 	Control_R, Control_R		]	};
+    key <RALT> { type[Group1] = "TWO_LEVEL",
+                 symbols[Group1] = [ Control_R, Control_R ] };
     key <LWIN> {	[	Alt_L, Meta_L    	]	};
     key <RWIN> {	[	Alt_R, Meta_R		]	};
     modifier_map Control { <RALT>, <LALT> };
@@ -33,7 +35,8 @@ xkb_symbols "ctrl_alt_win" {
 partial modifier_keys 
 xkb_symbols "meta_win" {
     key <LALT> {	[ 	Alt_L,	Alt_L		]	};
-    key <RALT> {	[ 	Alt_R,	Alt_R		]	};
+    key <RALT> { type[Group1] = "TWO_LEVEL",
+                 symbols[Group1] = [ Alt_R, Alt_R ] };
     key <LWIN> {	[ 	Meta_L			]	};
     key <RWIN> {	[ 	Meta_R			]	};
     modifier_map Mod1	{ Alt_L, Alt_R };
diff --git a/xorg-server/xkbdata.src/symbols/bg b/xorg-server/xkbdata.src/symbols/bg
index 4e4ca079f..d10204e8e 100644
--- a/xorg-server/xkbdata.src/symbols/bg
+++ b/xorg-server/xkbdata.src/symbols/bg
@@ -1,212 +1,362 @@
 //////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1999, 2000, 2005 by Anton Zinoviev <anton@lml.bas.bg>
+// Copyright (C) 1999, 2000, 2007, 2009 by Anton Zinoviev <anton@lml.bas.bg>
 //
 // This software may be used, modified, copied, distributed, and sold,
-// in both source and binary form provided that the above copyright
-// and these terms are retained. Under no circumstances is the author
-// responsible for the proper functioning of this software, nor does
-// the author assume any responsibility for damages incurred with its
-// use.
+// both in source and binary form provided that the above copyright
+// notice and these terms are retained. The name of the author may not
+// be used to endorse or promote products derived from this software
+// without prior permission.  THIS SOFTWARE IS PROVIDES "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED.  IN NO EVENT
+// SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE.
 //
 ////////////////////////////////////////////////////////////////////////// 
-// Version 1.9-BAN
+// Version 2.0
 
+// The following variants are defined in this file:
+
+// "bds" - the BDS keyboard layout compliant with the proposed
+//         Bulgarian state standard BDS 5237:2006
+
+// "phonetic" - Bulgarian phonetic layout with traditional position of
+//              the letters.
+
+// "bas_phonetic" - the phonetic keyboard layout compliant with the
+//                  proposed Bulgarian state standard BDS 5237:2006
+
+// "latin" - an extended variant of the QWERTY layout with symbols
+//           Bulgarian users will type while the keyboard is in Latin mode.
+
+// The reasons behind the layout of the symbols in levels 3 and 4 are
+// explained in http://arxiv.org/abs/0905.0484  (in Bulgarian).
+
+// Two notes for the maintainers of xkeyboard-config:
+
+// 1. Please do not use key names such as <LatQ> for the Bulgarian
+// phonetic layouts.  The placement of the symbols must stay always
+// the same regardless of which one of the alias sets in
+// xkb/keycodes/aliases is used.
+
+// 2. The layouts should not include level3(ralt_switch).
+
+////////////////////////////////////////////////////////////////////////// 
+
+// Describes Bulgarian keyboard "BDS" modified according to the
+// the new state standard BDS 5237:2006 and extended with symbols in
+// levels 3 and 4.
 partial default alphanumeric_keys
 xkb_symbols "bds" {
+
   name[Group1]= "Bulgaria";
   
-key.type[Group1] = "TWO_LEVEL";
-  key <TLDE> {   [ parenleft,         parenright          ]    };
+  key <TLDE> {   [ parenleft,         parenright,
+		   bracketleft,       bracketright        ]    };
   key <AE01> {   [ 1,                 exclam              ]    };
   key <AE02> {   [ 2,                 question            ]    };
-  key <AE03> {   [ 3,                 plus                ]    };
+  key <AE03> {   [ 3,                 plus,
+		   dagger,            dagger              ]    };
   key <AE04> {   [ 4,                 quotedbl            ]    };
-  key <AE05> {   [ 5,                 percent             ]    };
-  key <AE06> {   [ 6,                 equal               ]    };
-  key <AE07> {   [ 7,                 colon               ]    };
-  key <AE08> {   [ 8,                 slash               ]    };
-  key <AE09> {   [ 9,                 emdash              ]    };
+  key <AE05> {   [ 5,                 percent,
+		   U2329,             U232A               ]    };
+  key <AE06> {   [ 6,                 equal,
+		   emdash,            emdash              ]    };
+  key <AE07> {   [ 7,                 colon,
+		   ellipsis,          ellipsis            ]    };
+  key <AE08> {   [ 8,                 slash,
+		   U0300,             U0301               ]    };
+  key <AE09> {   [ 9,                 endash              ]    };
   key <AE10> {   [ 0,                 numerosign          ]    };
-  key <AE11> {   [ minus,             dollar              ]    };
+  key <AE11> {   [ minus,             dollar,
+		   U2011,             EuroSign            ]    };
   key <AE12> {   [ period,            EuroSign            ]    };
 
-  key <AD01> {   [ comma,             Cyrillic_yeru       ]    };
-key.type[Group1] = "ALPHABETIC";
+
+  key <AD01> {   [ comma,             Cyrillic_yeru,
+		   rightsinglequotemark, leftsinglequotemark ] };
   key <AD02> {   [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
-  key <AD04> {   [ Cyrillic_i,        Cyrillic_I          ]    };
+  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE,
+		   Cyrillic_e,        Cyrillic_E          ]    };
+  key <AD04> {   [ Cyrillic_i,        Cyrillic_I,
+		   U045D,             U040D               ]    };
   key <AD05> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
   key <AD06> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-  key <AD07> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AD08> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
+  key <AD07> {   [ Cyrillic_ka,       Cyrillic_KA,
+		   copyright,         copyright           ]    };
+  key <AD08> {   [ Cyrillic_es,       Cyrillic_ES,
+		   copyright,         copyright           ]    };
   key <AD09> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
   key <AD10> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
   key <AD11> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-key.type[Group1] = "TWO_LEVEL";
   key <AD12> {   [ semicolon,         section             ]    };
 
-key.type[Group1] = "ALPHABETIC";
-  key <AC01> {   [ Cyrillic_softsign, U045D               ]    };
-  key <AC02> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+
+  key <AC01> {   [ Cyrillic_softsign, U045D,
+		   Cyrillic_yeru,     Cyrillic_YERU       ]    };
+  key <AC02> {   [ Cyrillic_ya,       Cyrillic_YA,
+		   U0463,             U0462               ]    };
   key <AC03> {   [ Cyrillic_a,        Cyrillic_A          ]    };
   key <AC04> {   [ Cyrillic_o,        Cyrillic_O          ]    };
   key <AC05> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
   key <AC06> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC07> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
+  key <AC07> {   [ Cyrillic_te,       Cyrillic_TE,
+		   trademark,         trademark           ]    };
   key <AC08> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
   key <AC09> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
   key <AC10> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
   key <AC11> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <BKSL> {   [ doublelowquotemark, leftdoublequotemark,
+		   guillemotleft,     guillemotright      ]    };
 
+
+  key <LSGT> {   [ U045D,             U040D               ]    };
   key <AB01> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
-  key <AB02> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <AB03> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
+  key <AB02> {   [ Cyrillic_shorti,   Cyrillic_SHORTI,
+		   U046D,             U046C               ]    };
+  key <AB03> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN,
+		   U046B,             U046A               ]    };
   key <AB04> {   [ Cyrillic_e,        Cyrillic_E          ]    };
   key <AB05> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
   key <AB06> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
   key <AB07> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AB08> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
+  key <AB08> {   [ Cyrillic_er,       Cyrillic_ER,
+		   registered,        registered          ]    };
   key <AB09> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
   key <AB10> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
-    
-key.type[Group1] = "TWO_LEVEL";
-  key <BKSL> {   [ doublelowquotemark,leftdoublequotemark ]    };
 
-  key <LSGT> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
 
-  // End alphanumeric section
-  
+  key <SPCE> {   [ space,             space,
+		   nobreakspace,      nobreakspace        ]    };
+    
+
   key <KPDL> {   type[Group1] = "KEYPAD",
                  [ KP_Delete,         KP_Separator        ]    };
-
 };
 
+// This is improved variant of the traditional Bulgarian phonetic
+// keyboard.  Some unnecessary symbols in levels 1 and 2 are replaced
+// by more useful (the same way as in "bas_phonetic") and additional
+// symbols in levels 3 and 4 are added.
 partial alphanumeric_keys 
 xkb_symbols "phonetic" {
-  
-  name[Group1]= "Bulgaria - Traditional Phonetic";
+  name[Group1]= "Bulgaria - Traditional phonetic";
   
   key <TLDE> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
   key <AE01> {   [ 1,                 exclam              ]    };
   key <AE02> {   [ 2,                 at                  ]    };
-  key <AE03> {   [ 3,                 numbersign          ]    };
-  key <AE04> {   [ 4,                 dollar              ]    };
+  key <AE03> {   [ 3,                 numerosign          ]    };
+  key <AE04> {   [ 4,                 dollar,
+		   EuroSign,          EuroSign            ]    };
   key <AE05> {   [ 5,                 percent             ]    };
-  key <AE06> {   [ 6,                 asciicircum         ]    };
-  key <AE07> {   [ 7,                 ampersand           ]    };
+  key <AE06> {   [ 6,                 EuroSign            ]    };
+  key <AE07> {   [ 7,                 section             ]    };
   key <AE08> {   [ 8,                 asterisk            ]    };
-  key <AE09> {   [ 9,                 parenleft           ]    };
-  key <AE10> {   [ 0,                 parenright          ]    };
-  key <AE11> {   [ minus,             underscore          ]    };
-  key <AE12> {   [ equal,             plus                ]    };
-
-  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
-  key <LatW> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <LatE> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
-  key <LatR> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <LatT> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <LatY> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
-  key <LatU> {   [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <LatI> {   [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <LatO> {   [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <LatP> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AE09> {   [ 9,                 parenleft,
+		   bracketleft,       U2329               ]    };
+  key <AE10> {   [ 0,                 parenright,
+		   bracketright,      U232A               ]    };
+  key <AE11> {   [ minus,             endash,
+		   U2011,             U2011               ]    };
+  key <AE12> {   [ equal,             plus,
+		   emdash,            dagger              ]    };
+
+  key <AD01> {   [ Cyrillic_ya,       Cyrillic_YA,
+		   U0463,             U0462               ]    };
+  key <AD02> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE,
+		   Cyrillic_e,        Cyrillic_E          ]    };
+  key <AD04> {   [ Cyrillic_er,       Cyrillic_ER,
+		   registered,        registered          ]    };
+  key <AD05> {   [ Cyrillic_te,       Cyrillic_TE,
+		   trademark,         trademark           ]    };
+  key <AD06> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN,
+		   U046B,             U046A               ]    };
+  key <AD07> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <AD08> {   [ Cyrillic_i,        Cyrillic_I,
+		   U045D,             U040D               ]    };
+  key <AD09> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <AD10> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
   key <AD11> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
   key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-
-  key <LatA> {   [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <LatS> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <LatD> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <LatF> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <LatG> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <LatH> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AC10> {   [ semicolon,         colon               ]    };
-  key <AC11> {   [ quoteright,        quotedbl            ]    };
+  
+  
+  key <AC01> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <AC02> {   [ Cyrillic_es,       Cyrillic_ES,
+		   copyright,         copyright           ]    };
+  key <AC03> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <AC04> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <AC05> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <AC06> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <AC07> {   [ Cyrillic_shorti,   Cyrillic_SHORTI,
+		   U046D,             U046C               ]    };
+  key <AC08> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <AC09> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ semicolon,         colon,
+		   ellipsis,          ellipsis            ]    };
+  key <AC11> {   [ apostrophe,        quotedbl,
+		   rightsinglequotemark, leftsinglequotemark ] };
   key <BKSL> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+  
+  
+  key <LSGT> {   [ U045D,             U040D               ]    };
+  key <AB01> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <AB02> {   [ Cyrillic_softsign, U045D,
+		   Cyrillic_yeru,     Cyrillic_YERU       ]    };
+  key <AB03> {   [ Cyrillic_tse,      Cyrillic_TSE,
+		   copyright,         copyright           ]    };
+  key <AB04> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <AB05> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+  key <AB06> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <AB07> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AB08> {   [ comma,             doublelowquotemark,
+		   guillemotleft,     guillemotleft       ]    };
+  key <AB09> {   [ period,            leftdoublequotemark,
+		   guillemotright,    guillemotright      ]    };
+  key <AB10> {   [ slash,             question,
+		   U0300,             U0301               ]    };
+
+
+  key <SPCE> {   [ space,             space,
+		   nobreakspace,      nobreakspace        ]    };
 
-  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <LatX> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
-  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <LatV> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
-  key <LatB> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
-  key <LatN> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
-  key <LatM> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
-  key <AB08> {   [ comma,             less                ]    };
-  key <AB09> {   [ period,            greater             ]    };
-  key <AB10> {   [ slash,             question            ]    };
 
-  // End alphanumeric section
+  key <KPDL> {   type[Group1] = "KEYPAD",
+                 [ KP_Delete,           KP_Separator         ]    };
 
 };
 
-partial alphanumeric_keys
+// This is the Bulgarian phonetic keyboard acording to the proposed
+// state standard BDS 5237:2006 with additional symbols in
+// levels 3 and 4.
+partial alphanumeric_keys 
 xkb_symbols "bas_phonetic" {
-  name[Group1]= "Bulgaria - Standard Phonetic";
-
-key.type[Group1] = "ALPHABETIC";
-  key <TLDE> {   [ Cyrillic_yu,         Cyrillic_YU          ]    };
-key.type[Group1] = "TWO_LEVEL";
-  key <AE01> {   [ 1,                   exclam               ]    };
-  key <AE02> {   [ 2,                   at                   ]    };
-  key <AE03> {   [ 3,                   numerosign           ]    };
-  key <AE04> {   [ 4,                   dollar               ]    };
-  key <AE05> {   [ 5,                   percent              ]    };
-  key <AE06> {   [ 6,                   EuroSign             ]    };
-  key <AE07> {   [ 7,                   section              ]    };
-  key <AE08> {   [ 8,                   asterisk             ]    };
-  key <AE09> {   [ 9,                   parenleft            ]    };
-  key <AE10> {   [ 0,                   parenright           ]    };
-  key <AE11> {   [ minus,               emdash               ]    };
-  key <AE12> {   [ equal,               plus                 ]    };
-
-key.type[Group1] = "ALPHABETIC";
-  key <LatQ> {   [ Cyrillic_che,        Cyrillic_CHE         ]    };
-  key <LatW> {   [ Cyrillic_sha,        Cyrillic_SHA         ]    };
-  key <LatE> {   [ Cyrillic_ie,         Cyrillic_IE          ]    };
-  key <LatR> {   [ Cyrillic_er,         Cyrillic_ER          ]    };
-  key <LatT> {   [ Cyrillic_te,         Cyrillic_TE          ]    };
-  key <LatY> {   [ Cyrillic_hardsign,   Cyrillic_HARDSIGN    ]    };
-  key <LatU> {   [ Cyrillic_u,          Cyrillic_U           ]    };
-  key <LatI> {   [ Cyrillic_i,          Cyrillic_I           ]    };
-  key <LatO> {   [ Cyrillic_o,          Cyrillic_O           ]    };
-  key <LatP> {   [ Cyrillic_pe,         Cyrillic_PE          ]    };
-  key <AD11> {   [ Cyrillic_ya,         Cyrillic_YA          ]    };
-  key <AD12> {   [ Cyrillic_shcha,      Cyrillic_SHCHA       ]    };
-
-  key <LatA> {   [ Cyrillic_a,          Cyrillic_A           ]    };
-  key <LatS> {   [ Cyrillic_es,         Cyrillic_ES          ]    };
-  key <LatD> {   [ Cyrillic_de,         Cyrillic_DE          ]    };
-  key <LatF> {   [ Cyrillic_ef,         Cyrillic_EF          ]    };
-  key <LatG> {   [ Cyrillic_ghe,        Cyrillic_GHE         ]    };
-  key <LatH> {   [ Cyrillic_ha,         Cyrillic_HA          ]    };
-  key <LatJ> {   [ Cyrillic_shorti,     Cyrillic_SHORTI      ]    };
-  key <LatK> {   [ Cyrillic_ka,         Cyrillic_KA          ]    };
-  key <LatL> {   [ Cyrillic_el,         Cyrillic_EL          ]    };
-key.type[Group1] = "TWO_LEVEL";
-  key <AC10> {   [ semicolon,           colon                ]    };
-  key <AC11> {   [ apostrophe,          quotedbl             ]    };
-key.type[Group1] = "ALPHABETIC";
-  key <BKSL> {   [ Cyrillic_softsign,   U045D                ]    };
-
-  key <LatZ> {   [ Cyrillic_ze,         Cyrillic_ZE          ]    };
-  key <LatX> {   [ Cyrillic_zhe,        Cyrillic_ZHE         ]    };
-  key <LatC> {   [ Cyrillic_tse,        Cyrillic_TSE         ]    };
-  key <LatV> {   [ Cyrillic_ve,         Cyrillic_VE          ]    };
-  key <LatB> {   [ Cyrillic_be,         Cyrillic_BE          ]    };
-  key <LatN> {   [ Cyrillic_en,         Cyrillic_EN          ]    };
-  key <LatM> {   [ Cyrillic_em,         Cyrillic_EM          ]    };
-key.type[Group1] = "TWO_LEVEL";
-  key <AB08> {   [ comma,               doublelowquotemark   ]    };
-  key <AB09> {   [ period,              leftdoublequotemark  ]    };
-  key <AB10> {   [ slash,               question             ]    };
-
-  key <LSGT> {   [ Cyrillic_softsign,   Cyrillic_SOFTSIGN    ]    };
-
-  // End alphanumeric section
+  include "bg(phonetic)"
+  name[Group1]= "Bulgaria - New phonetic";
+  
+  key <TLDE> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+  key <AD01> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <AD02> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD11> {   [ Cyrillic_ya,       Cyrillic_YA,
+		   U0463,             U0462               ]    };
+  key <BKSL> {   [ Cyrillic_softsign, U045D,
+		   Cyrillic_yeru,     Cyrillic_YERU       ]    };
+  key <AB02> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <AB04> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+};
+
+
+// This is extended variant of the standard Latin QWERTY layout with
+// additional symbols in levels 3 and 4.
+partial hidden alphanumeric_keys 
+xkb_symbols "latin" {
+  
+  key <TLDE> {   [ grave,             asciitilde,
+		   U2248,             U2245               ]    };
+  key <AE01> {   [ 1,                 exclam,
+		   notsign,           notsign             ]    };
+  key <AE02> {   [ 2,                 at,
+		   twosuperior,       enfilledcircbullet  ]    };
+  key <AE03> {   [ 3,                 numbersign,
+		   threesuperior,     notequal            ]    };
+  key <AE04> {   [ 4,                 dollar,
+		   EuroSign,          sterling            ]    };
+  key <AE05> {   [ 5,                 percent,
+		   U2030,             U2030               ]    };
+  key <AE06> {   [ 6,                 asciicircum,
+		   logicaland,        logicalor           ]    };
+  key <AE07> {   [ 7,                 ampersand,
+		   section,           section             ]    };
+  key <AE08> {   [ 8,                 asterisk,
+		   infinity,          multiply            ]    };
+  key <AE09> {   [ 9,                 parenleft,
+		   U2202,             nabla               ]    };
+  key <AE10> {   [ 0,                 parenright,
+		   U2300,             U2300               ]    };
+  key <AE11> {   [ minus,             underscore,
+		   U2011,             endash              ]    };
+  key <AE12> {   [ equal,             plus,
+		   emdash,            plusminus           ]    };
+
+
+  key <AD01> {   [ q,                 Q,
+		   Greek_THETA,       Greek_theta         ]    };
+  key <AD02> {   [ w,                 W,
+		   Greek_OMEGA,       Greek_omega         ]    };
+  key <AD03> {   [ e,                 E,
+		   U2203,             Greek_epsilon       ]    };
+  key <AD04> {   [ r,                 R,
+		   registered,        Greek_rho           ]    };
+  key <AD05> {   [ t,                 T,
+		   trademark,         Greek_tau           ]    };
+  key <AD06> {   [ y,                 Y,
+		   yen,               Greek_upsilon       ]    };
+  key <AD07> {   [ u,                 U,
+		   intersection,      union               ]    };
+  key <AD08> {   [ i,                 I,
+		   integral,          Greek_iota          ]    };
+  key <AD09> {   [ o,                 O,
+		   degree,            U222E               ]    };
+  key <AD10> {   [ p,                 P,
+		   Greek_PI,          Greek_pi            ]    };
+  key <AD11> {   [ bracketleft,       braceleft,
+		   U2286,             includedin          ]    };
+  key <AD12> {   [ bracketright,      braceright,
+		   U2208,             U2209               ]    };
+
+
+  key <AC01> {   [ a,                 A,
+		   U2200,             Greek_alpha         ]    };
+  key <AC02> {   [ s,                 S,
+		   Greek_SIGMA,       Greek_sigma         ]    };
+  key <AC03> {   [ d,                 D,
+		   Greek_DELTA,       Greek_delta         ]    };
+  key <AC04> {   [ f,                 F,
+		   Greek_PHI,         Greek_phi           ]    };
+  key <AC05> {   [ g,                 G,
+		   Greek_GAMMA,       Greek_gamma         ]    };
+  key <AC06> {   [ h,                 H,
+		   U2225,             Greek_eta           ]    };
+  key <AC07> {   [ j,                 J                   ]    };
+  key <AC08> {   [ k,                 K,
+		   U03F0,             Greek_kappa         ]    };
+  key <AC09> {   [ l,                 L,
+		   Greek_LAMBDA,      Greek_lambda        ]    };
+  key <AC10> {   [ semicolon,         colon,
+		   division,          division            ]    };
+  key <AC11> {   [ apostrophe,        quotedbl,
+		   leftdoublequotemark, rightdoublequotemark ] };
+  key <BKSL> {   [ backslash,         bar,
+		   identical,         downtack            ]    };
+
+
+  key <LSGT> {   [ less,              greater,
+		   U2266,             U2267               ]    };
+  key <AB01> {   [ z,                 Z,
+		   U2220,             Greek_zeta          ]    };
+  key <AB02> {   [ x,                 X,
+		   Greek_XI,          Greek_xi            ]    };
+  key <AB03> {   [ c,                 C,
+		   copyright,         Greek_chi           ]    };
+  key <AB04> {   [ v,                 V,
+		   Greek_PSI,         Greek_psi           ]    };
+  key <AB05> {   [ b,                 B,
+		   U03D1,             Greek_beta          ]    };
+  key <AB06> {   [ n,                 N,
+		   U207F,             Greek_nu            ]    };
+  key <AB07> {   [ m,                 M,
+		   Greek_mu,          Greek_mu            ]    };
+  key <AB08> {   [ comma,             less,
+		   U2266,             U21D4               ]    };
+  key <AB09> {   [ period,            greater,
+		   U2267,             U21D2               ]    };
+  key <AB10> {   [ slash,             question,
+		   leftsinglequotemark, rightsinglequotemark ] };
+
+
+  key <SPCE> {   [ space,             space,
+		   nobreakspace,      nobreakspace        ]    };
+
 
   key <KPDL> {   type[Group1] = "KEYPAD",
-                 [ KP_Delete,           KP_Separator         ]    };
+                 [ KP_Delete,           KP_Decimal        ]    };
 };
 
diff --git a/xorg-server/xkbdata.src/symbols/by b/xorg-server/xkbdata.src/symbols/by
index b3194133b..4409e52dd 100644
--- a/xorg-server/xkbdata.src/symbols/by
+++ b/xorg-server/xkbdata.src/symbols/by
@@ -3,74 +3,33 @@
 // based on
 // belarusian standard keyboard 
 // Alexander Mikhailian <mikhailian@altern.org>
+// Reworked to use winkeys by default and russian keymap as base by Paul Lubetsky <vegeek@gmail.com>
+// Added third level with russian symbols
+// See freedesktop.org bug #23604
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
+	include "ru(winkeys)"
+	name[Group1]= "Belarus";
 
-    name[Group1]= "Belarus";
-
-    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<LSGT> {	[		bar,	brokenbar	]	};
-
-    key	<AE02> {	[		2,        quotedbl	]	};
-    key	<AE04> {	[		4,        semicolon	]	};
-    key	<AE05> {	[		5,	     percent	]	};
-    key	<AE06> {	[		6,	     colon	]	};
-    key	<AE07> {	[		7,	    question	]	};
-
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[  Byelorussian_shortu,  Byelorussian_SHORTU	]};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<AD12> {	[	apostrophe,	apostrophe	]	};
-
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
-
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<AB10> {	[	    period,	     comma	]	};
-
-    key	<BKSL> {	[	slash,		       bar	]	};
-
-    // End alphanumeric section
+	key	<AD09> {	[	Byelorussian_shortu,	Byelorussian_SHORTU	]	};
+	key	<AD12> {	[	apostrophe,	apostrophe	]	};
+	key	<AB05> {	[	Ukrainian_i,	Ukrainian_I	]	};
 };
 
 partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "by(basic)"
-    name[Group1]= "Belarus - Winkeys";
-    key	<AE04> {	[		4,       semicolon	]	};
-    key	<AE03> {	[		3,      numbersign	]	};
-    key	<AE05> {	[		5,	   percent	]	};
-    key	<AE06> {	[		6,	     colon	]	};
-    key	<AE07> {	[		7,	  question	]	};
-    key	<AE08> {	[		8,	  asterisk	]	};
-    key	<AB10> {	[	   period,	     comma	]	};
-    key	<BKSL> {	[	    slash,             bar	]	};
+xkb_symbols "legacy" {
+	include "by(basic)"
+	name[Group1]= "Belarus - Legacy";
+	
+	key <AE03> {        [               3,      numbersign      ]       };
+	key <AE04> {        [               4,        asterisk      ]       };
+	key <AE05> {        [               5,           colon      ]       };
+	key <AE06> {        [               6,           comma      ]       };
+	key <AE07> {        [               7,          period      ]       };
+	key <AE08> {        [               8,       semicolon      ]       };
+	key <AB10> {        [           slash,        question      ]       };
+	key <BKSL> {        [       backslash,             bar      ]       };
 };
 
 // based on a keyboard map from an 'xkb/symbols/iso3335-3' file
@@ -79,18 +38,19 @@ xkb_symbols "winkeys" {
 
 partial alphanumeric_keys
 xkb_symbols "latin" {
-
-    include "latin"
-    name[Group1]= "Belarus - Latin";
-    key <AD02> {        [    w,    W,    scaron,    Scaron    ]       };
-    key <AD07> {        [    u,    U,    ubreve,    Ubreve    ]       };
-    key <AC02> {        [    s,    S,    sacute,    Sacute    ]       };
-    key <AC09> {        [    l,    L,    lstroke,   Lstroke   ]       };
-    key <AB01> {        [    z,    Z,    zacute,    Zacute    ]       };
-    key <AB02> {        [    x,    X,    zcaron,    Zcaron    ]       };
-    key <AB03> {        [    c,    C,    cacute,    Cacute    ]       };
-    key <AB04> {        [    v,    V,    ccaron,    Ccaron    ]       };
-    key <AB06> {        [    n,    N,    nacute,    Nacute    ]       };
-
-    include "level3(ralt_switch)"
+	include "latin"
+	name[Group1]= "Belarus - Latin";
+	
+	key <AD02> {        [    w,    W,    scaron,    Scaron    ]       };
+	key <AD07> {        [    u,    U,    ubreve,    Ubreve    ]       };
+	key <AC02> {        [    s,    S,    sacute,    Sacute    ]       };
+	key <AC09> {        [    l,    L,    lstroke,   Lstroke   ]       };
+	key <AB01> {        [    z,    Z,    zacute,    Zacute    ]       };
+	key <AB02> {        [    x,    X,    zcaron,    Zcaron    ]       };
+	key <AB03> {        [    c,    C,    cacute,    Cacute    ]       };
+	key <AB04> {        [    v,    V,    ccaron,    Ccaron    ]       };
+	key <AB06> {        [    n,    N,    nacute,    Nacute    ]       };
+	
+	include "level3(ralt_switch)"
 };
+
diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkbdata.src/symbols/ca
index 818a8ff7b..63f9e48e6 100644
--- a/xorg-server/xkbdata.src/symbols/ca
+++ b/xorg-server/xkbdata.src/symbols/ca
@@ -467,7 +467,12 @@ xkb_symbols "shs" {
     //q, l, t, s, m, g, k, p, w, y, r
     //XCompose key is used for the other accute and grave.
 
-    key <AB08> {        [ comma, less, U0313    ]	};
+    key <AB08>	{ [ comma, less, U0313    ]	};
+    key <AC01>	{ [ a, A, aacute, Aacute  ]	};
+    key <AD03>	{ [ e, E, eacute, Eacute  ]	};
+    key <AD07>	{ [ u, U, uacute, Uacute  ]	};
+    key <AD08>	{ [ i, I, iacute, Iacute  ]	};
+    key <AD09>	{ [ o, O, oacute, Oacute  ]	};
 
     include "level3(ralt_switch)"
     include "compose(rctrl)"
diff --git a/xorg-server/xkbdata.src/symbols/capslock b/xorg-server/xkbdata.src/symbols/capslock
index 58599c6e6..415e4db1d 100644
--- a/xorg-server/xkbdata.src/symbols/capslock
+++ b/xorg-server/xkbdata.src/symbols/capslock
@@ -41,3 +41,25 @@ xkb_symbols "backspace" {
     key <CAPS> {        [       BackSpace  ]       };
 };
 
+partial hidden modifier_keys
+xkb_symbols "super" {
+    key <CAPS> {        [       Super_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
+partial hidden modifier_keys
+xkb_symbols "hyper" {
+    key <CAPS> {        [       Hyper_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
+partial hidden modifier_keys
+xkb_symbols "none" {
+    key <CAPS> {        [       VoidSymbol  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "numlock" {
+    key <CAPS> {        [       Num_Lock  ]       };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de
index 25f883ee7..b23aaf6c0 100644
--- a/xorg-server/xkbdata.src/symbols/de
+++ b/xorg-server/xkbdata.src/symbols/de
@@ -38,7 +38,7 @@ xkb_symbols "basic" {
     key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] };
     key <TLDE>	{ [dead_circumflex, degree,	U2032,    U2033	] };
 
-    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
+    key <BKSL>	{ [numbersign, apostrophe, rightsinglequotemark,   dead_breve ]	};
     key <AB01>	{ [         y,          Y,       guillemotright,    U203A 	] };
     key <AB02>	{ [         x,          X,        guillemotleft,    U2039 	] };
     key <AB04>	{ [         v,          V,   doublelowquotemark, singlelowquotemark ]	};
diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkbdata.src/symbols/es
index 96ccc6fed..42b0e8cb1 100644
--- a/xorg-server/xkbdata.src/symbols/es
+++ b/xorg-server/xkbdata.src/symbols/es
@@ -17,7 +17,7 @@ xkb_symbols "basic" {
     key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
     key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
     key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [exclamdown, questiondown, asciitilde,   asciitilde ]	};
+    key <AE12>	{ [exclamdown, questiondown, dead_tilde,   asciitilde ]	};
 
     key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
     key <AD12>	{ [      plus,   asterisk, bracketright,  dead_macron ]	};
diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.am b/xorg-server/xkbdata.src/symbols/extras/Makefile.am
new file mode 100644
index 000000000..6140b9456
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/extras
+dist_symbols_DATA = apl \
+		    rs \
+		    us
diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.in b/xorg-server/xkbdata.src/symbols/extras/Makefile.in
new file mode 100644
index 000000000..e00e6e91e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.in
@@ -0,0 +1,354 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/extras
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/extras
+dist_symbols_DATA = apl \
+		    rs \
+		    us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/extras/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/extras/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/extras/apl b/xorg-server/xkbdata.src/symbols/extras/apl
new file mode 100644
index 000000000..512277a75
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/apl
@@ -0,0 +1,296 @@
+// APL Keyboard Layouts
+
+// This file supports:
+// -	The Sharp APL for Unix (SAX) layout
+// -	The IBM APL2 layout
+// -	The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout
+
+// Unicode APL table: http://aplwiki.com/UnicodeAplTable
+// ...and another: http://publibfp.boulder.ibm.com/epubs/pdf/h2110611.pdf (appendix A)
+// Generic Unicode stuff: http://www.fileformat.info/info/unicode/category/index.htm
+
+// Tim Nelson (this file's creator) says:
+
+// This file doesn't deal with all the combining stuff -- I'm not an APL programmer,
+// and am not quite sure what's needed here.  However, it may be possible to get this
+// working with dead keys and the like.  Patches gratefully accepted.  
+
+// Some of the shift-key assignments may differ from the APL tradition.  If
+// that's not considered acceptable, it should be possible to remap the 
+// shift keys.  I have striven, however, to ensure that the use of shift keys
+// in these maps is at least self-consistent.  
+
+// I'm assuming that this will be used with another keyboard layout (ie. for 
+// your language), with a special shift key to use these maps.  
+
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "common" {
+	name[Group1]= "APL";
+
+	key <AE01> { [	diaeresis	] };
+	key <AE02> { [	U00AF	] }; // ¯ -- Macron
+	key <AE03> { [	less	] };
+	key <AE04> { [	U2264	] }; // ≤ -- Less-than Or Equal To
+	key <AE05> { [	equal	] };
+	key <AE06> { [	U2265	] }; // ≥ -- Greater-than Or Equal To
+	key <AE07> { [	greater	] };
+	key <AE08> { [	U2260	] }; // ≠ -- Not Equal To
+	key <AE09> { [	U2228	] }; // ∨ -- Logical Or
+	key <AE10> { [	U2227	] }; // ∧ -- Logical And
+
+	// Q
+	key <AD01> { [	question	] };
+	// W
+	key <AD02> { [	U2375		] }; // ⍵ -- APL Functional Symbol Omega
+	// E
+	key <AD03> { [	U220A		] }; // ∊ -- Small Element Of
+	// R
+	key <AD04> { [	U2374		] }; // ⍴ -- APL Functional Symbol Rho
+	// T
+	key <AD05> { [	asciitilde		] };
+	// Y
+	key <AD06> { [	U2191		] }; // ↑ -- Upwards Arrow
+	// U
+	key <AD07> { [	U2193		] }; // ↓ -- Downwards Arrow
+	// I
+	key <AD08> { [	U2373	] }; // ⍳ -- APL Functional Symbol Iota
+	// O
+	key <AD09> { [	U25CB	] }; // ○ -- White Circle
+	// P
+	key <AD10> { [	U22C6	] }; // ⋆ -- Should this be a plain asterisk, or the star operator???
+	// [
+	key <AD11> { [	U2190	] }; // ← -- Leftwards Arrow
+
+	// A
+	key <AC01> { [	U237A	] }; // ⍺ -- APL Functional Symbol Alpha
+	// S
+	key <AC02> { [	U2308	] }; // ⌈ -- Left Ceiling
+	// D
+	key <AC03> { [	U230A	] }; // ⌊ -- Left Floor
+	// F
+	key <AC04> { [	underscore	] };
+	// G
+	key <AC05> { [	U2207	] }; // ∇ -- Nabla
+	// H
+	key <AC06> { [	U2206	] }; // ∆ -- Increment
+	// J
+	key <AC07> { [	U2218	] }; // ∘ -- Ring Operator
+	// K
+	key <AC08> { [	apostrophe ] };
+	// L
+	key <AC09> { [	U2395	] }; // ⎕ -- APL Functional Symbol Quad
+
+	// Z
+	key <AB01> { [	U2282	] }; // ⊂ -- Subset Of
+	// X
+	key <AB02> { [	U2283	] }; // ⊃ -- Superset Of
+	// C
+	key <AB03> { [	U2229	] }; // ∩ -- Intersection
+	// V
+	key <AB04> { [	U222A	] }; // ∪ -- Union
+	// B
+	key <AB05> { [	U22A5	] }; // ⊥ -- Up Tack
+	// N
+	key <AB06> { [	U22A4	] }; // ⊤ -- Down Tack
+	// M
+	key <AB07> { [	U007C	] }; // | -- Vertical Line
+};
+
+// Keys common to a number of keyboards that allow normal language usage alongside APL
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "unified" {
+	name[Group1]= "APL Keyboard Symbols: Unified Layout";
+
+	include "apl(common)"
+
+	// `
+	key <TLDE> { [	U22C4	] }; // ⋄ -- Diamond Operator
+	key <AE09> { [	NoSymbol,	U2371	] }; // ⍱ -- APL Functional Symbol Down Caret Tilde
+	key <AE10> { [	NoSymbol,	U2372	] }; // ⍲ -- APL Functional Symbol Up Caret Tilde
+	// -
+	key <AE11> { [	U00D7	] }; // × -- Multiplication Sign
+	// =
+	key <AE12> { [	U00F7,	U2339	] }; // ÷ ⌹ -- Division Sign / APL Functional Symbol Quad Divide
+
+	// ]
+	key <AD12> { [	U2192		] }; // → -- Rightwards Arrow
+};
+
+// Layout: http://www.wickensonline.co.uk/apl-unicomp.html
+default
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "sax" {
+	name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix";
+
+	include "apl(unified)"
+
+	key <AE01> { [	NoSymbol,	U00A1	] }; // ¡ -- Inverted Exclamation Mark
+	key <AE04> { [	NoSymbol,	cent	] };
+	key <AE08> { [	NoSymbol,	U2342	] }; // ⍂ -- APL Functional Symbol Quad Backslash
+	// -
+	key <AE11> { [	NoSymbol,	U2261	] }; // ≡ -- Identical To
+
+	// Q
+	key <AD01> { [	NoSymbol,	U00BF	] }; // ¿ -- Inverted Question Mark
+	// W
+	key <AD02> { [	NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile
+	// E
+	key <AD03> { [	NoSymbol,	U2377	] }; // ⍷ -- APL Functional Symbol Epsilon Underbar
+	// T
+	key <AD05> { [	NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash
+	// I
+	key <AD08> { [	NoSymbol,	U2378	] }; // ⍸ -- APL Functional Symbol Iota Underbar
+	// O
+	key <AD09> { [	NoSymbol,	U2365	] }; // ⍥ -- APL Functional Symbol Circle Diaeresis
+	// P
+	key <AD10> { [	NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star
+
+	// A
+	key <AC01> { [	NoSymbol,	U2296	] }; // ⊖ -- Circled Minus
+	// F
+	key <AC04> { [	NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde
+	// G
+	key <AC05> { [	NoSymbol,	U2352	] }; // ∇ ⍒ -- APL Functional Symbol Del Stile
+	// H
+	key <AC06> { [	NoSymbol,	U234B	] }; // ∆ ⍋ -- APL Functional Symbol Delta Stile
+	// J
+	key <AC07> { [	NoSymbol,	U2364	] }; // ⍤ -- APL Functional Symbol Jot Diaeresis
+	// K
+	key <AC08> { [	NoSymbol,	U233B	] }; // ⌻
+	// L
+	key <AC09> { [	NoSymbol,	U235E	] }; // ⍞ -- APL Functional Symbol Quote Quad
+	// ;
+	key <AC10> { [	U22A2	] }; // ⊢ -- Right Tack
+	// '
+	key <AC11> { [	U22A3	] }; // ⊣ -- Left Tack
+
+	// C
+	key <AB03> { [	NoSymbol,	U235D	] }; // ⍝ -- APL Functional Symbol Up Shoe Jot
+	// B
+	key <AB05> { [	NoSymbol,	U234E	] }; // ⍎ -- APL Functional Symbol Down Tack Jot (Unicode got the name wrong; it should have been "Up Tack")
+	// N
+	key <AB06> { [	NoSymbol,	U2355	] }; // ⍕ -- APL Functional Symbol Up Tack Jot (Unicode got the name wrong; it should have been "Down Tack")
+	// M
+	key <AB07> { [	NoSymbol,	U2336	] }; // ⌶ -- APL Functional Symbol I-Beam
+	// ,
+	key <AB08> { [	U235E,	U236A	] }; // ⍞ ⍪ -- APL Functional Symbol Quote Quad / APL Functional Symbol Comma Bar
+	// .
+	key <AB09> { [	U234E,	U2359	] }; // ⍎ ⍙ -- [See B key] / APL Functional Symbol Delta Underbar
+	// /
+	key <AB10> { [	U2355,	U233F	] }; // ⍕ ⌿ -- [See N key] / APL Functional Symbol Slash Bar
+
+	key <BKSL> { [	U235D,	U2340	] }; // ⍝ ⍀ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Backslash Bar
+};
+
+// Layout: http://www.wickensonline.co.uk/apl-unicomp.html
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "apl2" {
+	name[Group1]= "APL Keyboard Symbols: IBM APL2";
+
+	include "apl(common)"
+
+	// The first column is NoSymbol because it inherits.  The second is NoSymbol because those keys don't do anything
+
+	// `
+	key <TLDE> { [	NoSymbol,	U233B,	U2342	] }; // ⌻ ⍂ -- 
+	key <AE01> { [	NoSymbol, NoSymbol, U2336	] }; // ⌶ -- APL Functional Symbol I-Beam
+	key <AE02> { [	NoSymbol, NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde
+	key <AE03> { [	NoSymbol, NoSymbol,	U2353	] }; // ⍒ -- APL Functional Symbol Del Stile
+	key <AE04> { [	NoSymbol, NoSymbol,	U234B	] }; // ⍋ -- APL Functional Symbol Delta Stile
+	key <AE05> { [	NoSymbol, NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile
+	key <AE06> { [	NoSymbol, NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash
+	key <AE07> { [	NoSymbol, NoSymbol,	U2296	] }; // ⊖ -- Circled Minus
+	key <AE08> { [	NoSymbol, NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star
+	key <AE09> { [	NoSymbol, NoSymbol,	U2371	] }; // ⍱ -- APL Functional Symbol Down Caret Tilde
+	key <AE10> { [	NoSymbol, NoSymbol,	U2372	] }; // ⍲ -- APL Functional Symbol Up Caret Tilde
+	// -
+	key <AE11> { [	plus,	minus,	exclam	] };
+	// =
+	key <AE12> { [	U00D7,	U00F7,	U2339	] }; // × ÷ ⌹ -- Multiplication Sign / Division Sign / APL Functional Symbol Quad Divide
+
+	// [
+	key <AD11> { [	NoSymbol,	U2192,	U235E	] }; // (←) → ⍞ -- Rightwards Arrow / APL Functional Symbol Quote Quad
+	// ]
+	key <AD12> { [	U2337,	U2378,	U2359	] }; // ⌷ ⍸ ⍙ -- APL Functional Symbol Squish Quad / APL Functional Symbol Iota Underbar / APL Functional Symbol Delta Underbar
+
+	// ;
+	key <AC10> { [	bracketleft, parenleft,	U234E	] }; // ⍎ -- [See B key in SAX layout]
+	// '
+	key <AC11> { [	bracketright, parenright, U2355	] }; // ⍕ -- [See N key in SAX layout] 
+
+	// ,
+	key <AB08> { [	comma,	semicolon, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot
+	// .
+	key <AB09> { [	period,	colon,	U2340	] }; // ⍀ -- APL Functional Symbol Backslash Bar
+	// /
+	key <AB10> { [	slash,	backslash, U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar
+
+	key <BKSL> { [	U2261,	U2377, U2364	] }; // ≡ ⍷ ⍤ -- Identical To / APL Functional Symbol Epsilon Underbar / APL Functional Symbol Jot Diaeresis
+};
+
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "aplplusII" {
+	name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";
+
+	include "apl(apl2)"
+
+	// `
+	key <TLDE> { [	dollar,	U22C4,	U236A	] }; // ⋄ ⍪ -- Diamond Operator / APL Functional Symbol Comma Bar
+	key <AE01> { [	NoSymbol, NoSymbol, U2261	] }; // ≡ -- Identical To
+
+	// [
+	key <AD11> { [	U2190,	NoSymbol,	U235E	] }; // ← ⍞ -- Leftwards Arrow / APL Functional Symbol Quote Quad
+	// ]
+	key <AD12> { [	U2192,	NoSymbol,	U236C	] }; // → ⍬ -- Rightwards Arrow / APL Functional Symbol Zilde
+
+	// ;
+	key <AC10> { [	bracketleft, parenleft,	U234E	] }; // ⍎ -- [See B key in SAX layout]
+	// '
+	key <AC11> { [	bracketright, parenright, U2355	] }; // ⍕ -- [See N key in SAX layout] 
+
+	key <BKSL> { [	U22A3,	U22A2,	U2359	] }; // ⊣ ⊢ ⍙ -- Left Tack / Right Tack / APL Functional Symbol Delta Underbar
+};
+
+
+// MicroAPL layout: http://aplwiki.com/APLXKeyboardLayouts
+// I didn't do the old-style MicroAPL layout; patches gratefully accepted
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "aplx" {
+	name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";
+
+	include "apl(unified)"
+
+	// `
+	key <TLDE> { [	NoSymbol,	U235E	] }; // ⍞ -- APL Functional Symbol Quote Quad
+	key <AE01> { [	NoSymbol,	U2336	] }; // ⌶ -- APL Functional Symbol I-Beam
+	key <AE02> { [	NoSymbol,	U236B	] }; // ⍫ -- APL Functional Symbol Del Tilde
+	key <AE03> { [	NoSymbol,	U2353	] }; // ⍒ -- APL Functional Symbol Del Stile
+	key <AE04> { [	NoSymbol,	U234B	] }; // ⍋ -- APL Functional Symbol Delta Stile
+	key <AE05> { [	NoSymbol,	U233D	] }; // ⌽ -- APL Functional Symbol Circle Stile
+	key <AE06> { [	NoSymbol,	U2349	] }; // ⍉ -- APL Functional Symbol Circle Backslash
+	key <AE07> { [	NoSymbol,	U2296	] }; // ⊖ -- Circled Minus
+	key <AE08> { [	NoSymbol,	U235F	] }; // ⍟ -- APL Functional Symbol Circle Star
+	// -
+	key <AE11> { [	NoSymbol,	exclam ] };
+
+	// [
+	key <AD11> { [	NoSymbol,	U2347	] }; // ⍇ -- Box With Left Arrow
+	// ]
+	key <AD12> { [	NoSymbol,	U2348	] }; // ⍈ -- Box With Right Arrow
+
+	// ;
+	key <AC10> { [	U234E,	U2261	] }; // ⍎ ≡ -- [See B key in SAX layout] / Identical To
+	// '
+	key <AC11> { [	U2355,	U2262	] }; // ⍕ ≢ -- [See N key in SAX layout] / Not Identical To
+
+	// ,
+	key <AB08> { [	U235D,	U236A	] }; // ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar
+	// .
+	key <AB09> { [	U2340,	U2364	] }; // ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis
+	// /
+	key <AB10> { [	U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar
+
+	key <BKSL> { [	U22A3,	U22A3	] }; // ⊣ ⊢ -- Left Tack / Right Tack
+};
+
+
diff --git a/xorg-server/xkbdata.src/symbols/extras/rs b/xorg-server/xkbdata.src/symbols/extras/rs
new file mode 100644
index 000000000..cc6b5fb44
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/rs
@@ -0,0 +1,15 @@
+xkb_symbols "combiningkeys" {
+  // Raw combining characters instead of dead keys,
+  // especially good for post-accenting texts.
+
+  name[Group1]= "Serbia - Combining accents instead of dead keys";
+
+  include "rs(basic)"
+
+  key <AE03> {   [ any,any,     U0302, dead_circumflex    ]   }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
+  key <AE07> {   [ any,any,     U0300, NoSymbol           ]   }; // 7, U0300 = COMBINING GRAVE ACCENT
+  key <AE08> {   [ any,any,     U030F, NoSymbol           ]   }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
+  key <AE09> {   [ any,any,     U0301, NoSymbol           ]   }; // 9, U0301 = COMBINING ACUTE ACCENT
+  key <AE10> {   [ any,any,     U0311, NoSymbol           ]   }; // 0, U0311 = COMBINING INVERTED BREVE
+  key <AE11> {   [ any,any,     U0304, NoSymbol           ]   }; // -, U0304 = COMBINING MACRON
+};
diff --git a/xorg-server/xkbdata.src/symbols/extras/us b/xorg-server/xkbdata.src/symbols/extras/us
new file mode 100644
index 000000000..b58932c6a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/extras/us
@@ -0,0 +1,147 @@
+// XCompose is out! Unicode combining is in!  For those of us who live
+// on the edge: A keymap using Unicode combining characters instead of
+// deadkeys.  This variation does not deviate from the lame MS-style
+// US-intl layout; but it uses AltGr for combining, like altgr-intl.
+//
+// This might break your font layout layout systems (because they
+// suck), caveat emptor.  Also, most of today's software will count
+// individual combining marks for selection, deletion, character
+// counting &c., and won't be smart enough to do canonical equivalence
+// when searching, &c.
+//
+// With Unicode combining you use "handwriting order", not
+// "typewriting order" as with deadkeys.  That is, you first type the
+// base character, then the diacritics/accents/modifiers.  This has
+// the advantage of avoiding hidden states --- each keypress changes
+// something on screen.
+//
+// TODO: as of now, this duplicates all us(intl) functionality with
+// combining.  With care, perhaps we could add more combining marks
+// not present in intl, and support all major languages.
+partial alphanumeric_keys
+xkb_symbols "intl-unicode" {
+
+ name[Group1]= "USA - International (AltGr Unicode combining)";
+
+ include "us(intl)"
+ include "level3(ralt_switch)"
+
+ // grave, tilde
+ key <TLDE> { [grave, asciitilde, U0300, U0303 ] };
+ // double acute
+ key <AE02> { [ 2, at, twosuperior, U030B ] };
+ // macron
+ key <AE03> { [ 3, numbersign, threesuperior, U0304 ] };
+ // circumflex
+ key <AE06> { [ 6, asciicircum, onequarter, U0302 ] };
+ // horn
+ key <AE07> { [ 7, ampersand, onehalf, U031B ] };
+ // ogonek
+ key <AE08> { [ 8, asterisk, threequarters, U0328 ] };
+ // breve
+ key <AE09> { [	 9, parenleft, leftsinglequotemark, U0306 ] };
+ // abovering
+ key <AE10> { [	 0, parenright, rightsinglequotemark, U030A ] };
+
+ // belowdot
+ key <AE11> { [ minus, underscore, yen, U0323 ] };
+ // acute, diaeresis
+ key <AC11> { [apostrophe, quotedbl, U0301, U0308 ] };
+ // abovedot, caron
+ key <AB09> { [ period, greater, U0307, U030C ] };
+ // hook
+ key <AB10> { [ slash, question, questiondown, 0309 ] };
+
+ // alt-intl compatibility
+ // cedilla, caron
+ key <AB08> { [ comma, less,	 U0327, U030C ] };
+ // ogonek, diaeresis
+ key <AC10> { [ semicolon, colon,	 U0328, U0308 ] };
+ // doubleacute, horn
+ key <AE12> { [ equal, plus,	 U030B, U031B ] };
+
+ // we don't do combining latin letters and combining enclosures
+ // because support for those is very rare.
+};
+
+// XCompose is out! Unicode combining is in! For those of us who live
+// on the edge: A keymap using Unicode combining characters instead of
+// deadkeys. This variation does break compatibility with us-intl,
+// whenever I thought it would be more mnemonic or Unicodeish.
+partial alphanumeric_keys
+xkb_symbols "alt-intl-unicode" {
+
+ name[Group1]= "USA - International (AltGr Unicode combining, alternative)";
+
+ include "extras/us(intl-unicode)"
+ include "level3(ralt_switch)"
+
+ // easier macron; em-dash.
+ // em-dash is available via compose, but I added here since it's such
+ // an important typographic character.
+ key <AE11> { [ minus, underscore, U0304, U2014 ] };
+
+ // belowdot, abovedot (caron at coma/less key, per above)
+ key <AB09> { [ period, greater, U0323, U0307 ] };
+
+};
+
+partial alphanumeric_keys  
+xkb_symbols "ats" {
+
+    include "us"
+
+    name[Group1]= "USA - Atsina";
+
+    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
+    //q, l, t, s, m, g, k, p, w, y, r
+    //XCompose key is used for the other accute and grave.
+
+    key <AD03> { [ e, E, eacute, Eacute  ] };
+    key <AD07> { [ u, U, uacute, Uacute  ] };
+    key <AD08> { [ i, I, iacute, Iacute  ] };
+    key <AD09> { [ o, O, oacute, Oacute  ] };
+    key <AD11> { [ bracketleft,	braceleft, U03B8 ] };
+    key <AD12> { [ bracketright, braceright, U010D, U010C ] };
+    //U+010C (uppercase Č) and U+010D (lowercase č).
+
+    key <AC01> { [ a, A, aacute, Aacute  ] };
+
+
+    //Small letter Open use compose to key get acute accent
+    key <AB03> { [ c,	C, U0254, U0186		  ] };
+    key <AB08> { [ comma,     less, U0313 ] };
+    key <AB10> { [ slash, question, U0294 ] };
+
+    include "level3(ralt_switch)"
+    include "compose(rctrl)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "crd" {
+
+  include "us"
+
+  name[Group1]= "USA - Couer D'alene Salish";
+
+  // Alphanumeric section
+  key <AD02> { [         w,           W, U02B7, U02B7 ] }; 
+  key <AE07> { [         7,   ampersand, U0294        ] }; 
+  key <AD01> { [         q,           Q, U221A        ] }; 
+  key <AB04> { [         v,           V, U0259        ] }; 
+  key <BKSL> { [ backslash,         bar, U026B        ] }; 
+  key <AD03> { [         e,           E, U025B        ] }; 
+  key <AD08> { [         i,           I, U026A        ] }; 
+  key <AC07> { [         j,           J, U01F0        ] }; 
+  key <AE06> { [         6, asciicircum, U0295        ] }; 
+  key <AC02> { [         s,           S, U0161        ] }; 
+  key <AB03> { [         c,           C, U010D        ] }; 
+  key <AD09> { [         o,           O, U0254        ] }; 
+  key <AB09> { [    period,     greater, U0323        ] }; 
+
+  include "level3(ralt_switch)"
+  include "compose(rctrl)"
+
+  // End alphanumeric section
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkbdata.src/symbols/gb
index bfb54820c..de11f64eb 100644
--- a/xorg-server/xkbdata.src/symbols/gb
+++ b/xorg-server/xkbdata.src/symbols/gb
@@ -122,8 +122,17 @@ xkb_symbols "colemak" {
     key <TLDE>	{ [     grave,    notsign,          bar,          bar ]	};
 
     key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
-    key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
-
+    key <LSGT> { [            z,            Z,              ae,               AE ] };
+    key <AB01> { [            x,            X, dead_circumflex,       asciitilde ] };
+    key <AB02> { [            c,            C,        ccedilla,         Ccedilla ] };
+    key <AB03> { [            v,            V,              oe,               OE ] };
+    key <AB04> { [            b,            B,      dead_breve,       asciitilde ] };
+    key <AB05> { [            k,            K,  dead_abovering,       asciitilde ] };
+    key <AB06> { [            m,            M,     dead_macron,       asciitilde ] };
+    key <AB07> { [        comma,         less,    dead_cedilla,       asciitilde ] };
+    key <AB08> { [       period,      greater,   dead_abovedot,       asciitilde ] };
+    key <AB09> { [    backslash,          bar,      asciitilde,       asciitilde ] };
+    key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
     include "level3(ralt_switch_multikey)"
 };
 
diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkbdata.src/symbols/in
index bb616fdd8..f80abfe91 100644
--- a/xorg-server/xkbdata.src/symbols/in
+++ b/xorg-server/xkbdata.src/symbols/in
@@ -739,53 +739,129 @@ xkb_symbols "tam_unicode" {
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: Unicode (http://www.unicode.org)
 // Author: Thuraiappah Vaseeharan <vasee@ieee.org>
-// Date  : Sat Feb  9 21:10:48 CST 2002
+// Modifed by: Malathi S <malathiramya@gmail.com>
+// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org>
+// Date  : Fri Sep 4 11:32:00 CST 2009
 // Mapping:
   
     name[Group1]= "India - Tamil Unicode";
 
     // granthas
-    key <AE01> {  [ U0b83 ] } ;
-    key <AE03> {  [ U0b9c ] } ;
-    key <AE04> {  [ U0bb7 ] } ;
-    key <AE05> {  [ U0bb8 ] } ;
-    key <AE06> {  [ U0bb9 ] } ;
-	
+    key <TLDE> {  [ apostrophe, asciitilde ] };
+    key <AE01> {  [ U0031, exclam ] } ;
+    key <AE02> {  [ U0032, at ] } ;
+    key <AE03> {  [ U0033, numbersign ] } ;
+    key <AE04> {  [ U0034, U0BF9 ] } ;
+    key <AE05> {  [ U0035, percent ] } ;
+    key <AE06> {  [ U0036, asciicircum ] } ;
+    key <AE07> {  [ U0037, ampersand ] } ;
+    key <AE08> {  [ U0038, asterisk ] } ;
+    key <AE09> {  [ U0039, parenleft ] } ;
+    key <AE10> {  [ U0030, parenright ] } ;
+    key <AE11> {  [ minus, underscore ] };
+    key <AE12> {  [ equal, plus	] };
+
+
     // Qrow
-    key <AD01> {  [ U0b9e ] };
-    key <AD02> {  [ U0bb1 ] };
-    key <AD03> {  [ U0ba8 ] };
-    key <AD04> {  [ U0b9a ] };
-    key <AD05> {  [ U0bb5 ] };
-    key <AD06> {  [ U0bb2 ] };
-    key <AD07> {  [ U0bb0 ] };
-    key <AD08> {  [ U0bc8, U0b90 ] };
-    key <AD09> {  [ U0bca, U0bcb ] };
-    key <AD10> {  [ U0bbf, U0bc0 ] };
-    key <AD11> {  [ U0bc1, U0bc2 ] };
+    key <AD01> {  [ U0B9E, U0BB6 ] };
+    key <AD02> {  [ U0BB1, U0BB7 ] };
+    key <AD03> {  [ U0BA8, U0BB8 ] };
+    key <AD04> {  [ U0B9A, U0BB9 ] };
+    key <AD05> {  [ U0BB5, U0B9C ] };
+    key <AD06> {  [ U0BB2 ] };
+    key <AD07> {  [ U0BB0 ] };
+    key <AD08> {  [ U0BC8, U0B90 ] };
+    key <AD09> {  [ U0BCA, U0BCB ] };
+    key <AD10> {  [ U0BBF, U0BC0 ] };
+    key <AD11> {  [ U0BC1, U0BC2 ] };
 
     // Arow
-    key <AC01> { [ U0baf ] };
-    key <AC02> { [ U0bb3 ] };
-    key <AC03> { [ U0ba9 ] };
-    key <AC04> { [ U0b95 ] };
-    key <AC05> { [ U0baa ] };
-    key <AC06> { [ U0bbe, U0bb4 ] };
-    key <AC07> { [ U0ba4 ] };
-    key <AC08> { [ U0bae ] };
-    key <AC09> { [ U0b9f ] };
-    key <AC10> { [ U0bcd ] };
-    key <AC11> { [ U0b99 ] };
+    key <AC01> { [ U0BAF ] };
+    key <AC02> { [ U0BB3 ] };
+    key <AC03> { [ U0BA9 ] };
+    key <AC04> { [ U0B95 ] };
+    key <AC05> { [ U0BAA ] };
+    key <AC06> { [ U0BBE, U0BB4 ] };
+    key <AC07> { [ U0BA4 ] };
+    key <AC08> { [ U0BAE ] };
+    key <AC09> { [ U0B9F ] };
+    key <AC10> { [ U0BCD, U0B83 ] };
+    key <AC11> { [ U0B99 ] };
     
     // Zrow
-    key <AB01> { [ U0ba3 ]  };
-    key <AB02> { [ U0b92, U0b93 ]  };
-    key <AB03> { [ U0b89, U0b8a ]  };
-    key <AB04> { [ U0b8e, U0b8f ]  };
-    key <AB05> { [ U0bc6, U0bc7 ]  };
-    key <AB06> { [ U0b94, U0bcc ]  };
-    key <AB07> { [ U0b85, U0b86 ]  };
-    key <AB08> { [ U0b87, U0b88 ]  };
+    key <AB01> { [ U0BA3 ]  };
+    key <AB02> { [ U0B92, U0B93 ]  };
+    key <AB03> { [ U0B89, U0B8A ]  };
+    key <AB04> { [ U0B8E, U0B8F ]  };
+    key <AB05> { [ U0BC6, U0BC7 ]  };
+    key <AB06> { [ U0B94, U0BCC ]  };
+    key <AB07> { [ U0B85, U0B86 ]  };
+    key <AB08> { [ U0B87, U0B88 ]  };
+};
+
+partial alphanumeric_keys
+xkb_symbols "tam_keyboard_with_numerals" {
+
+// Description: A keymap based on the TamilNet'99 typewriter keyboard 
+// Encoding: Unicode (http://www.unicode.org)
+// Author: Malathi S <malathiramya@gmail.com>
+// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org>
+// Date  : Fri Sep 4 11:33:00 CST 2009
+// Mapping:
+
+      name[Group1]= "India - Tamil Keyboard with Numerals";
+
+      // Mainly numbers.
+      key <TLDE> { [ apostrophe, asciitilde ] };
+      key <AE01> { [ U0BE7, exclam ] };
+      key <AE02> { [ U0BE8, at ] };
+      key <AE03> { [ U0BE9, numbersign ] };
+      key <AE04> { [ U0BEA, U0BF9 ] };
+      key <AE05> { [ U0BEB, percent ] };
+      key <AE06> { [ U0BEC, asciicircum ] };
+      key <AE07> { [ U0BED, ampersand ] };
+      key <AE08> { [ U0BEE, asterisk ] };
+      key <AE09> { [ U0BEF, parenleft ] };
+      key <AE10> { [ U0BE6, parenright ] };
+      key <AE11> { [ minus, underscore ] };
+      key <AE12> { [ equal, plus ] };
+
+
+    // Qrow
+    key <AD01> {  [ U0B9E, U0BB6 ] };
+    key <AD02> {  [ U0BB1, U0BB7 ] };
+    key <AD03> {  [ U0BA8, U0BB8 ] };
+    key <AD04> {  [ U0B9a, U0BB9 ] };
+    key <AD05> {  [ U0BB5, U0B9c ] };
+    key <AD06> {  [ U0BB2 ] };
+    key <AD07> {  [ U0BB0 ] };
+    key <AD08> {  [ U0BC8, U0B90 ] };
+    key <AD09> {  [ U0BCA, U0BCB ] };
+    key <AD10> {  [ U0BBF, U0BC0 ] };
+    key <AD11> {  [ U0BC1, U0BC2 ] };
+
+    // Arow
+    key <AC01> { [ U0BAF ] };
+    key <AC02> { [ U0BB3 ] };
+    key <AC03> { [ U0BA9 ] };
+    key <AC04> { [ U0B95 ] };
+    key <AC05> { [ U0BAA ] };
+    key <AC06> { [ U0BBE, U0BB4 ] };
+    key <AC07> { [ U0BA4 ] };
+    key <AC08> { [ U0BAE ] };
+    key <AC09> { [ U0B9F ] };
+    key <AC10> { [ U0BCD, U0B83 ] };
+    key <AC11> { [ U0B99 ] };
+
+    // Zrow
+    key <AB01> { [ U0BA3 ]  };
+    key <AB02> { [ U0B92, U0B93 ]  };
+    key <AB03> { [ U0B89, U0B8A ]  };
+    key <AB04> { [ U0B8E, U0B8F ]  };
+    key <AB05> { [ U0BC6, U0BC7 ]  };
+    key <AB06> { [ U0B94, U0BCC ]  };
+    key <AB07> { [ U0B85, U0B86 ]  };
+    key <AB08> { [ U0B87, U0B88 ]  };
 };
 
 partial alphanumeric_keys 
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
index a159021f8..7300e76da 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -122,7 +122,7 @@ xkb_symbols "evdev" {
 
 //  key <I120>   {      [ ]       }; // KEY_MACRO 
     key <I126>   {      [ plusminus             ]       };
-    key <I129>   {      [ KP_Separator          ]       };
+    key <I129>   {      [ KP_Decimal            ]       };
     key <I147>   {      [ XF86MenuKB            ]       };
     key <I148>   {      [ XF86Calculator        ]       };
 //  key <I149>   {      [ ]       }; // KEY_SETUP
@@ -174,7 +174,7 @@ xkb_symbols "evdev" {
     key <I213>   {      [ XF86Suspend           ]       };
     key <I214>   {      [ XF86Close             ]       };
     key <I215>   {      [ XF86AudioPlay         ]       };
-    key <I216>   {      [ XF86Forward           ]       };
+    key <I216>   {      [ XF86AudioForward      ]       };
 //  key <I217>   {      [ ]       }; // KEY_BASSBOOST
     key <I218>   {      [ Print                 ]       };
 //  key <I219>   {      [ ]       }; // KEY_HP
@@ -1797,6 +1797,15 @@ xkb_symbols "unitekkb1925" {
     key <I1A> { [ XF86Reload ] };
 };
 
+// Creative
+
+// Creative Desktop Wireless 7000
+partial alphanumeric_keys
+xkb_symbols "creativedw7000" {
+    include "inet(media_nav_acpi_common)"
+    key <I66>   {       [ XF86Pictures ]       };
+};
+
 // Compal
 
 // Compal FL90
diff --git a/xorg-server/xkbdata.src/symbols/ir b/xorg-server/xkbdata.src/symbols/ir
index af662cf3a..85f18b144 100644
--- a/xorg-server/xkbdata.src/symbols/ir
+++ b/xorg-server/xkbdata.src/symbols/ir
@@ -1,17 +1,38 @@
 // $XKeyboardConfig$
-// Iranian keyboard layout,
-// based on National Iranian Keyboard Standard (ISIRI 2901:1994),
-// with additions.
+
+// Iranian keyboard layout
+
+////////////////////////////////////////
+// Persian layout,
+// based on
+// Information Technology – Layout of Persian Letters and Symbols on Computer Keyboards
+// ISIRI 9147 – 1st Edition
+// Institute of Standards and Industrial Research of Iran
+// http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147
+// http://behnam.esfahbod.info/standards/isiri-keyboard-9147.pdf
 //
 // Author: Behnam Esfahbod <behnam@esfahbod.info>
 //
 
-
-// 3-Level layout
-
 partial default alphanumeric_keys
-xkb_symbols "basic" {
+xkb_symbols "pes" {
+    include "ir(pes_part_basic)"
+    include "ir(pes_part_ext)"
+
     name[Group1]= "Iran";
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "pes_keypad" {
+    include "ir(pes_part_basic)"
+    include "ir(pes_part_keypad)"
+
+    name[Group1]= "Iran - Persian, with Persian Keypad";
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "pes_part_basic" {
 
     // Persian digits
     key <AE01> { [ 0x10006f1,	exclam,		quoteleft		] };
@@ -25,13 +46,7 @@ xkb_symbols "basic" {
     key <AE09> { [ 0x10006f9,	parenright,	0x100200e		] };
     key <AE10> { [ 0x10006f0,	parenleft,	0x100200f		] };
 
-    // Other 3-Level symbols
-    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
-    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
-    key <AE12> { [ equal,		plus,			0x1002212	] };
-    key <BKSL> { [ backslash,		bar,			0x1002010	] };
-    key <SPCE> { [ space,		0x100200c,		nobreakspace	] };
-
+    // Persian letters and symbols
     key <AD01> { [ Arabic_dad,		Arabic_sukun,		degree		] };
     key <AD02> { [ Arabic_sad,		Arabic_dammatan,	VoidSymbol	] };
     key <AD03> { [ Arabic_theh,		Arabic_kasratan,	0x13a4		] };
@@ -68,14 +83,20 @@ xkb_symbols "basic" {
     key <AB09> { [ period,		less,			apostrophe	] };
     key <AB10> { [ slash,		Arabic_question_mark,	question	] };
 
+    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
+    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
+    key <AE12> { [ equal,		plus,			0x1002212	] };
+    key <BKSL> { [ backslash,		bar,			0x1002010	] };
+
+    key <SPCE> { [ space,		0x100200c,		nobreakspace	] };
+
     include "level3(ralt_switch)"
 };
 
-
 partial hidden alphanumeric_keys
-xkb_symbols "part_pro" {
+xkb_symbols "pes_part_ext" {
 
-    // Persian and English (ASCII) digits
+    // Persian and ASCII digits
     key <AE01> { [ 0x10006f1,	exclam,		quoteleft,		1	] };
     key <AE02> { [ 0x10006f2,	0x100066c,	at,			2	] };
     key <AE03> { [ 0x10006f3,	0x100066b,	numbersign,		3	] };
@@ -86,10 +107,12 @@ xkb_symbols "part_pro" {
     key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet,	8	] };
     key <AE09> { [ 0x10006f9,	parenright,	0x100200e,		9	] };
     key <AE10> { [ 0x10006f0,	parenleft,	0x100200f,		0	] };
+
+    key <SPCE> { [ space,	0x100200c,	nobreakspace,	0x100202F	] };
 };
 
 partial hidden alphanumeric_keys
-xkb_symbols "part_keypad" {
+xkb_symbols "pes_part_keypad" {
 
     // Persian digits and Mathematical operators
     key <KPDV> { [ division,	XF86_Ungrab	] };
@@ -116,39 +139,9 @@ xkb_symbols "part_keypad" {
     key <KPDL> { [ KP_Delete,	0x100066b	] };
 };
 
-// 4-Level leyout
-
-partial alphanumeric_keys
-xkb_symbols "pro" {
-    include "ir(basic)"
-    include "ir(part_pro)"
-
-    name[Group1]= "Iran - Pro";
-};
-
-
-// Persian Keypad leyout
-
-partial alphanumeric_keys
-xkb_symbols "keypad" {
-    include "ir(basic)"
-    include "ir(part_keypad)"
-
-    name[Group1]= "Iran - Keypad";
-};
-
-
-// 4-Level leyout with Persian Keypad leyout
-
-partial alphanumeric_keys
-xkb_symbols "pro_keypad" {
-    include "ir(basic)"
-    include "ir(part_keypad)"
-    include "ir(part_pro)"
-
-    name[Group1]= "Iran - Pro Keypad";
 
-};
+////////////////////////////////////////
+// Kurdish Layout
 
 partial alphanumeric_keys
 xkb_symbols "ku" {
@@ -168,6 +161,7 @@ xkb_symbols "ku_alt" {
     name[Group1]= "Iran - Kurdish, Latin Alt-Q";
 };
 
+////////////////////////////////////////
 // Kurdish Soranî Bahdînî (Arabic) keyboard layout,
 // based on the Kurdî Soranî Bahdînî keyboard from KurdITGroup
 // which is based on National Iranian Keyboard Standard (ISIRI 2901:1994),
@@ -182,6 +176,7 @@ xkb_symbols "ku_alt" {
 // Author: Erdal Ronahî  <erdal.ronahi@gmail.com>
 //
 // Kurdish Arabic-Latin Layout for Soranî
+
 partial alphanumeric_keys
 xkb_symbols "ku_ara" {
     name[Group1]= "Iran - Kurdish, Arabic-Latin";
@@ -242,5 +237,5 @@ xkb_symbols "ku_ara" {
     key <AB10> { [ slash,		Arabic_question_mark, 	question	] };
 
     include "level3(ralt_switch)"
-
 };
+
diff --git a/xorg-server/xkbdata.src/symbols/it b/xorg-server/xkbdata.src/symbols/it
index e91a9f804..7f703d16f 100644
--- a/xorg-server/xkbdata.src/symbols/it
+++ b/xorg-server/xkbdata.src/symbols/it
@@ -176,3 +176,43 @@ xkb_symbols "olpc" {
     key <I219> { [ less,        greater, guillemotleft, guillemotright ] };
 };
 
+partial alphanumeric_keys modifier_keys
+xkb_symbols "us" {
+
+    name[Group1]= "Italy - US keyboard with Italian letters";
+    
+    include "us(euro)"
+    
+    // Alphanumeric section
+
+    key <TLDE> { [     grave, asciitilde,    dead_grave,       dead_tilde ] };
+    key <AE01> { [         1,     exclam,   onesuperior                   ] };
+    key <AE02> { [         2,         at,   twosuperior                   ] };
+    key <AE03> { [         3, numbersign, threesuperior                   ] };
+    key <AE06> { [         6,asciicircum,dead_circumflex                  ] };
+    key <AE10> { [         0, parenright,        degree                   ] };
+    key <AE11> { [     minus, underscore,   dead_macron                   ] };
+
+    key <AD03> { [         e,          E,        egrave,           Egrave ] };
+    key <AD04> { [         r,          R,    registered                   ] };
+    key <AD07> { [         u,          U,        ugrave,           Ugrave ] };
+    key <AD08> { [         i,          I,        igrave,           Igrave ] };
+    key <AD09> { [         o,          O,        ograve,           Ograve ] };
+
+    key <AC01> { [         a,          A,        agrave,           Agrave ] };
+    key <AC03> { [         d,          D,        eacute,           Eacute ] };
+    key <AC07> { [         j,          J,        uacute,           Uacute ] };
+    key <AC08> { [         k,          K,        iacute,           Iacute ] };
+    key <AC09> { [         l,          L,        oacute,           Oacute ] };
+    key <AC10> { [ semicolon,      colon,dead_diaeresis,   dead_diaeresis ] };
+    key <AC11> { [apostrophe,   quotedbl,    dead_acute                   ] };
+
+    key <AB01> { [         z,          Z,        aacute,           Aacute ] };
+    key <AB03> { [         c,          C,     copyright                   ] };
+    key <AB06> { [         n,          N,        ntilde,           Ntilde ] };
+    key <AB08> { [     comma,       less,   guillemotleft                 ] };
+    key <AB09> { [    period,    greater,  guillemotright                 ] };
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/ng b/xorg-server/xkbdata.src/symbols/ng
index 8c3567b3a..5b3a19e27 100644
--- a/xorg-server/xkbdata.src/symbols/ng
+++ b/xorg-server/xkbdata.src/symbols/ng
@@ -77,7 +77,7 @@ xkb_symbols "olpc" {
    key <AE11> { [     minus, underscore,     0x1000304,        0x1000304 ] }; // combining macron above
    key <AE12> { [     equal,       plus,     0x1000303,        0x1000303 ] }; // combining tilde above
 
-   key <AD02> { [         w,          W,     0x1000,       0x1000 ] }; // E with dot below
+   key <AD02> { [         w,          W,     0x1001EB9, 0x1001EB8 ] }; // E with dot below
    key <AD03> { [         e,          E,     0x10001DD, 0x100018E ] }; // reversed E
    key <AD04> { [         r,          R,     0x10001B4, 0x10001B3 ] }; // Y with hook
    key <AD05> { [         t,          T,     0x1000327, 0x1000327 ] }; // combining cedilla
diff --git a/xorg-server/xkbdata.src/symbols/no b/xorg-server/xkbdata.src/symbols/no
index 80a10a2eb..56c3d2c42 100644
--- a/xorg-server/xkbdata.src/symbols/no
+++ b/xorg-server/xkbdata.src/symbols/no
@@ -15,6 +15,12 @@ xkb_symbols "basic" {
 
     name[Group1]="Norway";
 
+    key <AB09>	{ [    period,      colon, ellipsis,   periodcentered ]	};
+    key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
+    key <AD04>	{ [         r,          R,   registered,    trademark ]	};
+    key <AD10>	{ [         p,          P,        Greek_pi,        Greek_PI ]	};
+    key <AE05>	{ [         5,    percent,      onehalf,         0x1002030 ]	};
+
     key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
     key <AE12>	{ [ backslash, dead_grave,   dead_acute,      notsign ]	};
 
@@ -26,6 +32,8 @@ xkb_symbols "basic" {
     key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
     key <LSGT>	{ [      less,    greater,      onehalf, threequarters]	};
 
+    include "nbsp(level3n)"
+    include "keypad(ossmath)"
     include "kpdl(comma)"
 
     include "level3(ralt_switch)"
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru
index e7317c771..6bc48940f 100644
--- a/xorg-server/xkbdata.src/symbols/ru
+++ b/xorg-server/xkbdata.src/symbols/ru
@@ -438,3 +438,28 @@ xkb_symbols "dos" {
     key        <AB10> {        [   Cyrillic_io, Cyrillic_IO ] };
 };
 
+partial alphanumeric_keys
+xkb_symbols "bak" {
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Bashkirian";
+    key.type[group1]="FOUR_LEVEL";
+
+    key <TLDE> { [     0x010004d9,       0x010004d8,   Cyrillic_io,   Cyrillic_IO      ] };
+    key <AE01> { [     exclam,           quotedbl,      1,       1       ] };
+    key <AE02> { [     0x010004e9,       0x010004e8,    2,       2 ] };
+    key <AE03> { [     0x010004a1,       0x010004a0,    3,       3 ] };
+    key <AE04> { [     0x01000493,       0x01000492,    4,       4 ] };
+    key <AE05> { [     0x010004ab,       0x010004aa,    5,       5 ] };
+    key <AE06> { [     colon,            semicolon,     6,       6 ] };
+    key <AE07> { [     0x01000499,       0x01000498,    7,       7 ] };
+    key <AE08> { [     0x010004bb,       0x010004ba,    8,       8 ] };
+    key <AE09> { [     question,         parenleft,     9,       9 ] };
+    key <AE10> { [     numerosign,       parenright,    0,       0 ] };
+    key <AE11> { [     minus,            percent,       minus,    underscore     ]};
+    key <AE12> { [     0x010004af, 0x010004ae,    equal,  plus    ]};
+    key <BKSL> { [     0x010004a3, 0x010004a2,    backslash,        slash     ]};	
+	
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us
index 5378cf888..41670f018 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/us
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us
@@ -257,6 +257,8 @@ xkb_symbols "type6" {
     include "eurosign(4)"
 
     key <SYRQ> { [ SunSys_Req 			]};
+    key <LSGT> { [ less, greater, bar, brokenbar ] };
+
 };
 
 xkb_symbols "pc101" {
diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir
index e68960ad3..79681dbee 100644
--- a/xorg-server/xkbdata.src/symbols/symbols.dir
+++ b/xorg-server/xkbdata.src/symbols/symbols.dir
@@ -145,6 +145,7 @@ h-p----- a------- pc(editing)
 --p----- a------- in(ori)
 --p----- a------- in(tam)
 --p----- a------- in(tam_unicode)
+--p----- a------- in(tam_keyboard_with_numerals)
 --p----- a------- in(tam_TSCII)
 --p----- a------- in(tam_TAB)
 --p----- a------- in(tel)
@@ -163,7 +164,7 @@ h-p----- a------- pc(editing)
 --p----- a------- hr(unicode)
 --p----- a------- hr(unicodeus)
 -dp----- a------- by(basic)
---p----- a------- by(winkeys)
+--p----- a------- by(legacy)
 --p----- a------- by(latin)
 -dp----- -------- tr(basic)
 --p----- -------- tr(f)
@@ -226,12 +227,11 @@ h-p----- --k----- hu(def_dot)
 h-p----- a------- hu(def_dead)
 h-p----- a------- hu(def_nodead)
 h-p----- a------- hu(def_common)
--dp----- a------- ir(basic)
-h-p----- a------- ir(part_pro)
-h-p----- a------- ir(part_keypad)
---p----- a------- ir(pro)
---p----- a------- ir(keypad)
---p----- a------- ir(pro_keypad)
+-dp----- a------- ir(pes)
+--p----- a------- ir(pes_keypad)
+h-p----- a------- ir(pes_part_basic)
+h-p----- a------- ir(pes_part_ext)
+h-p----- a------- ir(pes_part_keypad)
 --p----- a------- ir(ku)
 --p----- a------- ir(ku_f)
 --p----- a------- ir(ku_alt)
@@ -345,6 +345,10 @@ h-p----- -m------ capslock(swapescape)
 h-p----- -m------ capslock(groupshift)
 h-p----- -m------ capslock(escape)
 h-p----- -m------ capslock(backspace)
+h-p----- -m------ capslock(super)
+h-p----- -m------ capslock(hyper)
+h-p----- -m------ capslock(none)
+h-p----- -m------ capslock(numlock)
 -dp----- a------- is(basic)
 --p----- a------- is(Sundeadkeys)
 --p----- a------- is(nodeadkeys)
@@ -548,6 +552,17 @@ h------- -------- macintosh_vndr/us(oldmac)
 -------- -------- sony_vndr/us(nwp5461)
 -dp----- am------ za(basic)
 -------- -------- hp_vndr/us(hil)
+-------- -------- extras/rs(combiningkeys)
+--p----- am------ extras/apl(common)
+--p----- am------ extras/apl(unified)
+-dp----- am------ extras/apl(sax)
+--p----- am------ extras/apl(apl2)
+--p----- am------ extras/apl(aplplusII)
+--p----- am------ extras/apl(aplx)
+--p----- a------- extras/us(intl-unicode)
+--p----- a------- extras/us(alt-intl-unicode)
+--p----- a------- extras/us(ats)
+--p----- a------- extras/us(crd)
 -dp----- a------- ie(basic)
 --p----- a------- ie(CloGaelach)
 --p----- a------- ie(UnicodeExpert)
@@ -659,9 +674,11 @@ h-p----- -m------ group(olpc)
 --p----- a------- it(mac)
 --p----- a------- it(geo)
 -------- -------- it(olpc)
+--p----- am------ it(us)
 -dp----- a------- bg(bds)
 --p----- a------- bg(phonetic)
 --p----- a------- bg(bas_phonetic)
+h-p----- a------- bg(latin)
 h-p----- a------- inet(media_common)
 h-p----- a------- inet(nav_common)
 h-p----- a------- inet(acpi_common)
@@ -770,6 +787,7 @@ h-p----- a------- inet(logitech_set3)
 --p----- a------- inet(benqx)
 --p----- a------- inet(classmate)
 --p----- a------- inet(unitekkb1925)
+--p----- a------- inet(creativedw7000)
 --p----- a------- inet(compalfl90)
 --p----- a------- inet(pc105)
 -dp----- a------- latam(basic)
@@ -836,6 +854,7 @@ h-p----- a------- ru(common)
 --p----- a------- ru(sah)
 --p----- a------- ru(xal)
 --p----- a------- ru(dos)
+--p----- a------- ru(bak)
 -dp----- am------ lv(basic)
 --p----- am------ lv(apostrophe)
 --p----- am------ lv(tilde)
diff --git a/xorg-server/xkbdata.src/symbols/tr b/xorg-server/xkbdata.src/symbols/tr
index 68672aa11..c217a7af0 100644
--- a/xorg-server/xkbdata.src/symbols/tr
+++ b/xorg-server/xkbdata.src/symbols/tr
@@ -299,9 +299,11 @@ xkb_symbols "olpc" {
 };
 
 // Crimean Tatar (Crimean Turkish) layouts. 
+// First released: 2009.
 // These layouts are currently experimental. In particular, the mapping of letter 'x', 
 // included for foreign words and shortcuts, might change in the future...
-// Reşat SABIQ <tilde.birlik@gmail.com>, 2009
+// Reşat SABIQ <tilde.birlik @ gmail . com>
+// Özgür Qarahan <qarahan @ gmail . com>
 
 // Crimean Tatar (Crimean Turkish) Q Layout
 partial
diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkbdata.src/symbols/us
index 20a1b57f4..c732de64b 100644
--- a/xorg-server/xkbdata.src/symbols/us
+++ b/xorg-server/xkbdata.src/symbols/us
@@ -91,7 +91,7 @@ xkb_symbols "intl" {
     key <AE02> { [	   2,         at,   twosuperior, dead_doubleacute ] };
     key <AE03> { [	   3, numbersign, threesuperior,      dead_macron ] };
     key <AE04> { [	   4,     dollar,      currency,         sterling ] };
-    key <AE05> { [	   5,    percent,      EuroSign                   ] };
+    key <AE05> { [	   5,    percent,      EuroSign,     dead_cedilla ] };
     key <AE06> { [    6, dead_circumflex,    onequarter,      asciicircum ] };
     key <AE07> { [	   7,  ampersand,       onehalf,	dead_horn ] };
     key <AE08> { [	   8,   asterisk, threequarters,      dead_ogonek ] };
@@ -765,11 +765,11 @@ xkb_symbols "altgr-intl" {
    key <AB02> { [        x, X,           oe,           OE              ] };
    key <AB04> { [        v, V,           registered,   registered      ] };
 
-// onequarter etc (not in iso8859-15) deleted to get three unshifted deadkeys:
+// onequarter etc (not in iso8859-15) moved to get three unshifted deadkeys:
 
-   key <AE06> { [        6, asciicircum,       dead_circumflex         ] };
-   key <AE07> { [        7, ampersand,         dead_horn               ] };
-   key <AE08> { [        8, asterisk,          dead_ogonek             ] };
+   key <AE06> { [        6, asciicircum, dead_circumflex, onequarter    ] };
+   key <AE07> { [        7, ampersand,   dead_horn,       onehalf       ] };
+   key <AE08> { [        8, asterisk,    dead_ogonek,     threequarters ] };
 
    include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkbdata.src/symbols/vn b/xorg-server/xkbdata.src/symbols/vn
index 37d81408a..acebae572 100644
--- a/xorg-server/xkbdata.src/symbols/vn
+++ b/xorg-server/xkbdata.src/symbols/vn
@@ -6,6 +6,8 @@
 // August 1999
 // Further modified by Ashley Clark <aclark@debian.org>
 // July 2000 for X 4.0
+// Fix accents into combining marks by Samuel Thibault <samuel.thibault@ens-lyon.org>
+// July 2009
 
 
 partial default alphanumeric_keys  
@@ -21,11 +23,11 @@ xkb_symbols "basic" {
     key <AE02> { [	   acircumflex,  Acircumflex	] };
     key <AE03> { [	   ecircumflex,	Ecircumflex	] };
     key <AE04> { [	   ocircumflex,	Ocircumflex	] };
-    key <AE05> { [	   dead_grave,	percent		] };
-    key <AE06> { [	   dead_hook,	asciicircum	] };
-    key <AE07> { [	   dead_tilde,	ampersand	] };
-    key <AE08> { [	   dead_acute,	asterisk	] };
-    key <AE09> { [	   dead_belowdot,parenleft	] };
+    key <AE05> { [	   0x1000300,	percent,	dead_grave,	percent		] };
+    key <AE06> { [	   0x1000309,	asciicircum,	dead_hook,	asciicircum	] };
+    key <AE07> { [	   0x1000303,	ampersand,	dead_tilde,	ampersand	] };
+    key <AE08> { [	   0x1000301,	asterisk,	dead_acute,	asterisk	] };
+    key <AE09> { [	   0x1000323,	parenleft,	dead_belowdot,	parenleft	] };
     key <AE10> { [	   dstroke,	Dstroke		] };
     key <AE11> { [     minus, underscore  ]	};
     key <AE12> { [     DongSign, plus ]	};