Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa xkeyboard-config git update 3 Oct 2003

Conflicts:
	xorg-server/xkeyboard-config/symbols/level3
	xorg-server/xkeyboard-config/symbols/level5

98 files changed, 99 insertions, 101 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index 265c18e87..972769b36 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -10,7 +10,7 @@
 //
 // 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
    name[Group1]= "Afghani";
 
diff --git a/xorg-server/xkeyboard-config/symbols/al b/xorg-server/xkeyboard-config/symbols/al
index ff3388647..a8d6ec715 100644
--- a/xorg-server/xkeyboard-config/symbols/al
+++ b/xorg-server/xkeyboard-config/symbols/al
@@ -3,7 +3,7 @@
 // done by Pablo Saratxaga <pablo@mandrakesoft.com>
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type3)"
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index 9b092f4d6..b7cc6f69e 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/am' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Armenian";
diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl
index ebc4115e6..4262d2480 100644
--- a/xorg-server/xkeyboard-config/symbols/apl
+++ b/xorg-server/xkeyboard-config/symbols/apl
@@ -38,7 +38,7 @@
 // better than using the "common" one. Choosing the complete Dyalog layout is not useful to non-Dyalog
 // users.
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 	include "apl(dyalog_base)"	// forward reference good APL keyboard without Dyalogs extras
 
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 5ecffa4c3..71b50daa5 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/ar' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Arabic";
 
diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az
index cfdc93cea..02330bc43 100644
--- a/xorg-server/xkeyboard-config/symbols/az
+++ b/xorg-server/xkeyboard-config/symbols/az
@@ -1,7 +1,7 @@
 // Symbols definition for a very simple Azerbaidjani keyboard layout.
 // 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "latin" {
 
   include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba
index 7345cc340..9a27cbd96 100644
--- a/xorg-server/xkeyboard-config/symbols/ba
+++ b/xorg-server/xkeyboard-config/symbols/ba
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="Bosnian";
diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd
index d4be36871..6a70d51a7 100644
--- a/xorg-server/xkeyboard-config/symbols/bd
+++ b/xorg-server/xkeyboard-config/symbols/bd
@@ -14,7 +14,7 @@
 // 3 Conjunct characters are not included
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
    name[Group1]= "Bengali";
    key <ESC>  { [ Escape ] };
diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index ffb89e420..5e0eee515 100644
--- a/xorg-server/xkeyboard-config/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/be' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg
index 3b7fd4be0..994380c80 100644
--- a/xorg-server/xkeyboard-config/symbols/bg
+++ b/xorg-server/xkeyboard-config/symbols/bg
@@ -44,7 +44,7 @@
 // Describes Bulgarian keyboard "BDS" modified according to the
 // the new state standard BDS 5237:2006 and extended with symbols in
 // levels 3 and 4.
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "bds" {
 
   name[Group1]= "Bulgarian";
diff --git a/xorg-server/xkeyboard-config/symbols/brai b/xorg-server/xkeyboard-config/symbols/brai
index 036b56ff9..66364e60e 100644
--- a/xorg-server/xkeyboard-config/symbols/brai
+++ b/xorg-server/xkeyboard-config/symbols/brai
@@ -1,5 +1,5 @@
 // 10-dot patterns on the home row + v and n
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "home_row" {
     include "brai(keypad)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/bt b/xorg-server/xkeyboard-config/symbols/bt
index f76f13a4c..c02505e98 100644
--- a/xorg-server/xkeyboard-config/symbols/bt
+++ b/xorg-server/xkeyboard-config/symbols/bt
@@ -13,7 +13,7 @@
 //   Version 1.0   2004-07-29  Some correction by Pema Geyleg <pema_geyleg@druknet.bt>
 /////////////////////////////////////////////////////////////////
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
       name[Group1]= "Dzongkha";
 
diff --git a/xorg-server/xkeyboard-config/symbols/bw b/xorg-server/xkeyboard-config/symbols/bw
index 29fdc1c02..48de2e2df 100644
--- a/xorg-server/xkeyboard-config/symbols/bw
+++ b/xorg-server/xkeyboard-config/symbols/bw
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "tswana" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/by b/xorg-server/xkeyboard-config/symbols/by
index 443a76426..00ecd6a8d 100644
--- a/xorg-server/xkeyboard-config/symbols/by
+++ b/xorg-server/xkeyboard-config/symbols/by
@@ -5,7 +5,7 @@
 // Added third level with russian symbols
 // See freedesktop.org bug #23604
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 	include "ru(winkeys)"
 	name[Group1]= "Belarusian";
diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca
index b039c48ff..c4d37ad5c 100644
--- a/xorg-server/xkeyboard-config/symbols/ca
+++ b/xorg-server/xkeyboard-config/symbols/ca
@@ -1,4 +1,4 @@
-default partial
+default  partial
 xkb_symbols "fr" {
     name[Group1] = "French (Canada)";
 
diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 8b315c6f1..337c5efd2 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -1,4 +1,4 @@
-default partial hidden modifier_keys
+default  partial hidden modifier_keys
 xkb_symbols "capslock" {
     replace key <CAPS> { [ Caps_Lock ] };
     modifier_map Lock { Caps_Lock };
diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in
index e5b09e8a3..a87c749aa 100644
--- a/xorg-server/xkeyboard-config/symbols/cd.in
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
@@ -1,7 +1,7 @@
 // based on us_intl keyboard map file and a Sinhala keyboard map
 // version 0.3
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "French (Democratic Republic of the Congo)";
diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch
index 671c3c5e8..54663f1fa 100644
--- a/xorg-server/xkeyboard-config/symbols/ch
+++ b/xorg-server/xkeyboard-config/symbols/ch
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm
index cdc8577e0..6404c97aa 100644
--- a/xorg-server/xkeyboard-config/symbols/cm
+++ b/xorg-server/xkeyboard-config/symbols/cm
@@ -36,8 +36,7 @@
 // == Cameroon Dvorak ==
 // Cameroon Dvorak is uses a similar system to Cameroon QWERTY.
 
-default
-partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
 	name[Group1]="English (Cameroon)";
diff --git a/xorg-server/xkeyboard-config/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn
index 75ebbf66a..e6b2c525e 100644
--- a/xorg-server/xkeyboard-config/symbols/cn
+++ b/xorg-server/xkeyboard-config/symbols/cn
@@ -1,7 +1,7 @@
 //
 // Default Chinese is the same as American
 //
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     include "us(basic)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz
index 3d3170029..20af4b281 100644
--- a/xorg-server/xkeyboard-config/symbols/cz
+++ b/xorg-server/xkeyboard-config/symbols/cz
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
      
      // This layout conforms to a new cz compromise standard designed 
diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index 4619357a6..34667fc48 100644
--- a/xorg-server/xkeyboard-config/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/dk' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type2)"
diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee
index 61d865cf1..9384bee83 100644
--- a/xorg-server/xkeyboard-config/symbols/ee
+++ b/xorg-server/xkeyboard-config/symbols/ee
@@ -2,7 +2,7 @@
 // Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/empty b/xorg-server/xkeyboard-config/symbols/empty
index cae330310..acdd6776d 100644
--- a/xorg-server/xkeyboard-config/symbols/empty
+++ b/xorg-server/xkeyboard-config/symbols/empty
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys modifier_keys
+default  partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
     name[Group1]= "Empty";
 };
diff --git a/xorg-server/xkeyboard-config/symbols/epo b/xorg-server/xkeyboard-config/symbols/epo
index ae738359f..1f7f3fc7c 100644
--- a/xorg-server/xkeyboard-config/symbols/epo
+++ b/xorg-server/xkeyboard-config/symbols/epo
@@ -7,7 +7,7 @@
 // Benno Schulenberg (Beno Sĥilenberĥ) <bensberg@justemail.net>
 // Chusslove Illich (Ĉaslavo Iliĉo) <caslav.ilic@gmx.net>
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
   name[Group1]= "Esperanto";
diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index b9066fb01..62e2b2c6a 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -1,6 +1,6 @@
 // Modified for a real Spanish keyboard by Jon Tombs.
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et
index a591a77a4..35dc27955 100644
--- a/xorg-server/xkeyboard-config/symbols/et
+++ b/xorg-server/xkeyboard-config/symbols/et
@@ -5,7 +5,7 @@
 // 2007 Sergey Udaltsov <svu@gnome.org>
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     include "et(olpc)"
     name[Group1]="Amharic";
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 4778f7d16..4fdcc2a25 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -6,7 +6,7 @@
 // Eliminate deadkeys alternative sent by Linus Torvalds
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "kotoistus" {
 
     // Official keymap for Finland based on SFS 5966 standard
diff --git a/xorg-server/xkeyboard-config/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo
index 283e13d6d..dc9fa6b45 100644
--- a/xorg-server/xkeyboard-config/symbols/fo
+++ b/xorg-server/xkeyboard-config/symbols/fo
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type2)"
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index e5e83eff4..3898b1c57 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb
index 135583356..7bf071cca 100644
--- a/xorg-server/xkeyboard-config/symbols/gb
+++ b/xorg-server/xkeyboard-config/symbols/gb
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/gb' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge
index 5a5c69dae..8c2e2e9a0 100644
--- a/xorg-server/xkeyboard-config/symbols/ge
+++ b/xorg-server/xkeyboard-config/symbols/ge
@@ -15,7 +15,7 @@
 // 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Georgian";
diff --git a/xorg-server/xkeyboard-config/symbols/gh b/xorg-server/xkeyboard-config/symbols/gh
index 995abb829..bd31a0b39 100644
--- a/xorg-server/xkeyboard-config/symbols/gh
+++ b/xorg-server/xkeyboard-config/symbols/gh
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/gn b/xorg-server/xkeyboard-config/symbols/gn
index 7f796c541..40aa1e365 100644
--- a/xorg-server/xkeyboard-config/symbols/gn
+++ b/xorg-server/xkeyboard-config/symbols/gn
@@ -1,7 +1,7 @@
 // based on us_intl keyboard map file and a Sinhala keyboard map
 // version 0.3
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="French (Guinea)";
diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr
index ba04d9f8a..adfe2edf6 100644
--- a/xorg-server/xkeyboard-config/symbols/gr
+++ b/xorg-server/xkeyboard-config/symbols/gr
@@ -7,7 +7,7 @@
 // Originally converted to single group form by:
 //   Ivan Pascal <pascal@info.tsu.ru>
 
-default partial alphanumeric_keys alternate_group
+default  partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
 	include "gr(simple)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr
index 8275259c4..bda2afd22 100644
--- a/xorg-server/xkeyboard-config/symbols/hr
+++ b/xorg-server/xkeyboard-config/symbols/hr
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="Croatian";
diff --git a/xorg-server/xkeyboard-config/symbols/hu b/xorg-server/xkeyboard-config/symbols/hu
index 21913a330..75b17fee5 100644
--- a/xorg-server/xkeyboard-config/symbols/hu
+++ b/xorg-server/xkeyboard-config/symbols/hu
@@ -25,7 +25,7 @@
 
 
 // Default layout
-default partial
+default  partial
 xkb_symbols "basic" {
     include "hu(102_qwertz_comma_dead)"
     name[Group1] = "Hungarian";
diff --git a/xorg-server/xkeyboard-config/symbols/ie b/xorg-server/xkeyboard-config/symbols/ie
index 3e39d57f9..48f7232f0 100644
--- a/xorg-server/xkeyboard-config/symbols/ie
+++ b/xorg-server/xkeyboard-config/symbols/ie
@@ -22,7 +22,7 @@
 // without use of a deadkey.
 
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Modern keyboard for Irish and English
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 91da6db7a..fa7564fb5 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -4,7 +4,7 @@
 // It does not implement changes to the English layout ("Alt-English"), 
 // as I believe that it is not the job of this layout to modify the English
 // layout.
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     // uses the kbd layout in use in Israel.
 
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index 9f0594928..68f63e528 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -25,7 +25,7 @@
 // based on a keyboard map from an 'xkb/symbols/dev' file
 
 // Devangari is the default. Kill me if I am wrong:)
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "deva" {
 	// March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu>
 	name[Group1]="Indian";
diff --git a/xorg-server/xkeyboard-config/symbols/iq b/xorg-server/xkeyboard-config/symbols/iq
index 597690d25..9a5dd3760 100644
--- a/xorg-server/xkeyboard-config/symbols/iq
+++ b/xorg-server/xkeyboard-config/symbols/iq
@@ -2,7 +2,7 @@
 
 // 3-Level layout
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     include "ara(basic)"
     name[Group1]= "Iraqi";
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 85396b915..d0a11b749 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -12,7 +12,7 @@
 // Author: Behnam Esfahbod <behnam@esfahbod.info>
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "pes" {
     name[Group1]= "Persian";
 
diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is
index 17f78e027..5137e2d71 100644
--- a/xorg-server/xkeyboard-config/symbols/is
+++ b/xorg-server/xkeyboard-config/symbols/is
@@ -7,7 +7,7 @@
 //     Some positions are according to IST ISO/IEC 9995-3:1994
 //     Added nobreakspace
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 7b9183a82..3e402c98a 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -1,7 +1,7 @@
 // based on a keyboard map from an 'xkb/symbols/it' file
 // 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index deac93c7c..189228e57 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -1,6 +1,6 @@
 // Symbols for Japanese 106-keys keyboards (by tsuka@kawalab.dnj.ynu.ac.jp).
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "106" {
 
     include "jp(common)"
diff --git a/xorg-server/xkeyboard-config/symbols/ke b/xorg-server/xkeyboard-config/symbols/ke
index ec2ffd05e..74e8c2dd2 100644
--- a/xorg-server/xkeyboard-config/symbols/ke
+++ b/xorg-server/xkeyboard-config/symbols/ke
@@ -3,7 +3,7 @@
 // Please notify any corrections or omissions to
 // Kevin Donnelly (kevin@dotmon.com)
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "swa" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad
index 51ea3f679..bc47a90e9 100644
--- a/xorg-server/xkeyboard-config/symbols/keypad
+++ b/xorg-server/xkeyboard-config/symbols/keypad
@@ -93,7 +93,7 @@ xkb_symbols "operators" {
     };
 };
 
-default partial hidden keypad_keys
+default  partial hidden keypad_keys
 xkb_symbols "x11" {
 
     include "keypad(operators)"
diff --git a/xorg-server/xkeyboard-config/symbols/kg b/xorg-server/xkeyboard-config/symbols/kg
index 1c2706017..95ef26287 100644
--- a/xorg-server/xkeyboard-config/symbols/kg
+++ b/xorg-server/xkeyboard-config/symbols/kg
@@ -18,7 +18,7 @@
 
 
 // Kyrgyz standard keyboard
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Kyrgyz";
diff --git a/xorg-server/xkeyboard-config/symbols/kh b/xorg-server/xkeyboard-config/symbols/kh
index b25cf1330..ee58abf2f 100644
--- a/xorg-server/xkeyboard-config/symbols/kh
+++ b/xorg-server/xkeyboard-config/symbols/kh
@@ -24,7 +24,7 @@
 //         but with a leading 'XK_'
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Khmer (Cambodia)";
     
diff --git a/xorg-server/xkeyboard-config/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz
index 276305693..9f6260238 100644
--- a/xorg-server/xkeyboard-config/symbols/kz
+++ b/xorg-server/xkeyboard-config/symbols/kz
@@ -10,7 +10,7 @@
 
 // RST KazSSR 903-90
 // levels 3 and 4 are non-standard extensions
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1] = "Kazakh";
diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index cd24a4e3e..20c36c559 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -1,6 +1,6 @@
 // Lao keymap, by Anousak Souphavanh <anousak@muanglao.com>
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // This keymap describes the Lao keyboard standard,
diff --git a/xorg-server/xkeyboard-config/symbols/latam b/xorg-server/xkeyboard-config/symbols/latam
index 4a30d6d4e..47c8976e7 100644
--- a/xorg-server/xkeyboard-config/symbols/latam
+++ b/xorg-server/xkeyboard-config/symbols/latam
@@ -1,7 +1,7 @@
 // based on a keyboard
 // Modified for a real Latin American Keyboard by Fabian Mandelbaum
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/latin b/xorg-server/xkeyboard-config/symbols/latin
index 8cabe73e3..25a7d736a 100644
--- a/xorg-server/xkeyboard-config/symbols/latin
+++ b/xorg-server/xkeyboard-config/symbols/latin
@@ -1,6 +1,6 @@
 // Common Latin alphabet layout
 
-default partial
+default  partial
 xkb_symbols "basic" {
 
     key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};
diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3
index 01fa28a63..b15e24d53 100644..100755
--- a/xorg-server/xkeyboard-config/symbols/level3
+++ b/xorg-server/xkeyboard-config/symbols/level3
@@ -3,7 +3,7 @@
 
 // The default behaviour:
 // the right Alt key (AltGr) chooses the third symbol engraved on a key.
-default partial modifier_keys
+default  partial modifier_keys
 xkb_symbols "ralt_switch" {
   key <RALT> {
     type[Group1]="ONE_LEVEL",
@@ -15,8 +15,8 @@ xkb_symbols "ralt_switch" {
 // Ensure a mapping to a real modifier for LevelThree.
 partial modifier_keys
 xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
   replace key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
   };
   modifier_map Mod5 { <LVL3> };
diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5
index 97cd96822..1ae2e6d3b 100644..100755
--- a/xorg-server/xkeyboard-config/symbols/level5
+++ b/xorg-server/xkeyboard-config/symbols/level5
@@ -34,8 +34,8 @@ xkb_symbols "ralt_switch" {
 // Ensure a mapping to a real modifier for LevelFive.
 partial modifier_keys
 xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
   replace key <MDSW> {
+    type[Group1] = "ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
   };
   modifier_map Mod3 { <MDSW> };
diff --git a/xorg-server/xkeyboard-config/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk
index b88dcdf1e..9f3b7c7b7 100644
--- a/xorg-server/xkeyboard-config/symbols/lk
+++ b/xorg-server/xkeyboard-config/symbols/lk
@@ -28,7 +28,7 @@
 // rayanna = r
 // yayanna = y
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "sin_phonetic" {
 
   include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 5610e6797..8b6b80e5f 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -7,7 +7,7 @@
 //
 // If you want two layouts, use:
 // Option "XkbLayout" "lt,lt(us)"
-default partial alphanumeric_keys modifier_keys
+default  partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv
index f0b63368c..8b0e9d719 100644
--- a/xorg-server/xkeyboard-config/symbols/lv
+++ b/xorg-server/xkeyboard-config/symbols/lv
@@ -44,7 +44,7 @@
 // Latvian QWERTY layout
 // http://en.wikipedia.org/wiki/QWERTY
 //
-default partial alphanumeric_keys modifier_keys
+default  partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
 	name[Group1]= "Latvian";
diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index 2e3f4b1a3..2d128837e 100644
--- a/xorg-server/xkeyboard-config/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
@@ -1,5 +1,5 @@
 // Arabic AZERTY with modern Latin digits 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "arabic" {
     include "ara(azerty)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao
index 4edc3b988..bf3482679 100644
--- a/xorg-server/xkeyboard-config/symbols/mao
+++ b/xorg-server/xkeyboard-config/symbols/mao
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Adds the macrons needed for the Maori language to
diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md
index c23d1184d..1664da9cd 100644
--- a/xorg-server/xkeyboard-config/symbols/md
+++ b/xorg-server/xkeyboard-config/symbols/md
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "ro"
diff --git a/xorg-server/xkeyboard-config/symbols/me b/xorg-server/xkeyboard-config/symbols/me
index 54d63e130..acb37e76d 100644
--- a/xorg-server/xkeyboard-config/symbols/me
+++ b/xorg-server/xkeyboard-config/symbols/me
@@ -3,7 +3,7 @@
 // Initially, a copy of Serbian variants
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
   include "rs(latin)"
   name[Group1]= "Montenegrin";
diff --git a/xorg-server/xkeyboard-config/symbols/mk b/xorg-server/xkeyboard-config/symbols/mk
index 456c81c85..40075848a 100644
--- a/xorg-server/xkeyboard-config/symbols/mk
+++ b/xorg-server/xkeyboard-config/symbols/mk
@@ -2,7 +2,7 @@
 // Author: Damjan Georgievski <penguinista AT mail.net.mk>
 // Revision: 1.5
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" { 
     name[Group1]= "Macedonian";
 
diff --git a/xorg-server/xkeyboard-config/symbols/ml b/xorg-server/xkeyboard-config/symbols/ml
index e310a0189..c9223bc21 100644
--- a/xorg-server/xkeyboard-config/symbols/ml
+++ b/xorg-server/xkeyboard-config/symbols/ml
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "fr(basic)"
diff --git a/xorg-server/xkeyboard-config/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm
index 9738ce911..a680a3153 100644
--- a/xorg-server/xkeyboard-config/symbols/mm
+++ b/xorg-server/xkeyboard-config/symbols/mm
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Burmese";
 
diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn
index f455dee8c..0f471d9e3 100644
--- a/xorg-server/xkeyboard-config/symbols/mn
+++ b/xorg-server/xkeyboard-config/symbols/mn
@@ -3,7 +3,7 @@
 // Author Sanlig Badral <badral@chinggis.com>
 // 2002/12/7 Version 1.0
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
   name[Group1]= "Mongolian";
diff --git a/xorg-server/xkeyboard-config/symbols/mt b/xorg-server/xkeyboard-config/symbols/mt
index 8a0cec3f9..f6027472f 100644
--- a/xorg-server/xkeyboard-config/symbols/mt
+++ b/xorg-server/xkeyboard-config/symbols/mt
@@ -1,7 +1,7 @@
 // Maltese keyboard map (based on MSA Standard DMS100)
 // by Ramon Casha (ramon.casha@linux.org.mt)
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv
index e34e063b4..cb05b8b3c 100644
--- a/xorg-server/xkeyboard-config/symbols/mv
+++ b/xorg-server/xkeyboard-config/symbols/mv
@@ -1,6 +1,6 @@
 // Keymap for Thaana/Dhivehi script (Dhivehi language).
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="Dhivehi";
diff --git a/xorg-server/xkeyboard-config/symbols/ng b/xorg-server/xkeyboard-config/symbols/ng
index 313941a91..ea1fca278 100644
--- a/xorg-server/xkeyboard-config/symbols/ng
+++ b/xorg-server/xkeyboard-config/symbols/ng
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl
index ed25af68f..ff60dbba7 100644
--- a/xorg-server/xkeyboard-config/symbols/nl
+++ b/xorg-server/xkeyboard-config/symbols/nl
@@ -8,7 +8,7 @@
 // based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz
 
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 6ecdb9a7a..5bba1959e 100644
--- a/xorg-server/xkeyboard-config/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/no' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index 5cebac4c8..69175f5fa 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/dev' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
       name[Group1]= "Nepali";
diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc
index e95e2406e..996324d2c 100644
--- a/xorg-server/xkeyboard-config/symbols/pc
+++ b/xorg-server/xkeyboard-config/symbols/pc
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys modifier_keys
+default  partial alphanumeric_keys modifier_keys
 xkb_symbols "pc105" {
 
     key <ESC>  {	[ Escape		]	};
diff --git a/xorg-server/xkeyboard-config/symbols/ph b/xorg-server/xkeyboard-config/symbols/ph
index 3aff18e24..6b3defa7b 100644
--- a/xorg-server/xkeyboard-config/symbols/ph
+++ b/xorg-server/xkeyboard-config/symbols/ph
@@ -41,7 +41,7 @@
 // ┃Ctrl   ┃Super  ┃Alt    ┃ ␣ Space             Space ␣ ┃AltGr ⇮┃Meta   ┃Menu   ┃Ctrl   ┃
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹─────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
 //
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]= "Filipino";
diff --git a/xorg-server/xkeyboard-config/symbols/pk b/xorg-server/xkeyboard-config/symbols/pk
index b53e3aa3c..b85d887a3 100644
--- a/xorg-server/xkeyboard-config/symbols/pk
+++ b/xorg-server/xkeyboard-config/symbols/pk
@@ -6,7 +6,7 @@
 // Alt-key combinations are yet to be put in. The unavailable keys are
 // those which do not have a corresponding glyph in Unicode.
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "urd-phonetic" {
 
    name[Group1]= "Urdu (Pakistan)";
diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index 885a82afa..a448e2baa 100644
--- a/xorg-server/xkeyboard-config/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/pl' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Visualisation and description: http://podziemie.net/xkb/pl
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index 4b85598a5..db3dde907 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/pt' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index 01fb8485c..80d9afce2 100644
--- a/xorg-server/xkeyboard-config/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
@@ -16,7 +16,7 @@
 // v 1.4
 
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 // This RO_US/Programmers layout, although the secondary layout in the 
 // Romanian standard, has always been the "de facto" standard in the 
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index b0d69ac18..22ff2dae8 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -13,7 +13,7 @@
 //   and Slovenian in xkeyboard-config
 //  
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
   name[Group1]= "Serbian";
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index d39f92672..c48637637 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -5,7 +5,7 @@
 // 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
 
 // Windows layout
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "winkeys" {
     include "ru(common)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se
index d015d4015..a498f693d 100644
--- a/xorg-server/xkeyboard-config/symbols/se
+++ b/xorg-server/xkeyboard-config/symbols/se
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/se' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     include "latin(type2)"
     include "se(se)"
diff --git a/xorg-server/xkeyboard-config/symbols/si b/xorg-server/xkeyboard-config/symbols/si
index 7503bce1e..6733d2bd1 100644
--- a/xorg-server/xkeyboard-config/symbols/si
+++ b/xorg-server/xkeyboard-config/symbols/si
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     name[Group1]="Slovenian";
diff --git a/xorg-server/xkeyboard-config/symbols/sk b/xorg-server/xkeyboard-config/symbols/sk
index 075281320..b48e5aa8d 100644
--- a/xorg-server/xkeyboard-config/symbols/sk
+++ b/xorg-server/xkeyboard-config/symbols/sk
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
      
      // This layout conforms to a new sk compromise standard designed 
diff --git a/xorg-server/xkeyboard-config/symbols/sn b/xorg-server/xkeyboard-config/symbols/sn
index 77495ad4d..47c093b43 100644
--- a/xorg-server/xkeyboard-config/symbols/sn
+++ b/xorg-server/xkeyboard-config/symbols/sn
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy
index a539f4019..fb4d45d9c 100644
--- a/xorg-server/xkeyboard-config/symbols/sy
+++ b/xorg-server/xkeyboard-config/symbols/sy
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     include "ara(basic)"
     name[Group1]= "Arabic (Syria)";
diff --git a/xorg-server/xkeyboard-config/symbols/terminate b/xorg-server/xkeyboard-config/symbols/terminate
index 60c24795c..a43f2b979 100644
--- a/xorg-server/xkeyboard-config/symbols/terminate
+++ b/xorg-server/xkeyboard-config/symbols/terminate
@@ -1,4 +1,4 @@
-default partial modifier_keys
+default  partial modifier_keys
 xkb_symbols "ctrl_alt_bksp" {
     key <BKSP> {
         type="CTRL+ALT",
diff --git a/xorg-server/xkeyboard-config/symbols/th b/xorg-server/xkeyboard-config/symbols/th
index 63fd281b5..9cdde53cd 100644
--- a/xorg-server/xkeyboard-config/symbols/th
+++ b/xorg-server/xkeyboard-config/symbols/th
@@ -1,6 +1,6 @@
 // based on a keyboard map from an 'xkb/symbols/th' file
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
     name[Group1]= "Thai";
 
diff --git a/xorg-server/xkeyboard-config/symbols/tj b/xorg-server/xkeyboard-config/symbols/tj
index 76086056d..38a7cd257 100644
--- a/xorg-server/xkeyboard-config/symbols/tj
+++ b/xorg-server/xkeyboard-config/symbols/tj
@@ -11,7 +11,7 @@
 // --------------------------------------------------------------------
 //
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic"
 {
 	name[Group1] = "Tajik";
diff --git a/xorg-server/xkeyboard-config/symbols/tm b/xorg-server/xkeyboard-config/symbols/tm
index ad520a6df..8d84f9a85 100644
--- a/xorg-server/xkeyboard-config/symbols/tm
+++ b/xorg-server/xkeyboard-config/symbols/tm
@@ -1,7 +1,7 @@
 // Nazar Annagurban <nazar_xg@hotmail.com>, 2009
 
 // Default layout (based on Vista Turkmen layout)
-default partial
+default  partial
 xkb_symbols "basic" {
     name[Group1]="Turkmen";
     
diff --git a/xorg-server/xkeyboard-config/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr
index 72bf590f3..1c288524b 100644
--- a/xorg-server/xkeyboard-config/symbols/tr
+++ b/xorg-server/xkeyboard-config/symbols/tr
@@ -4,7 +4,7 @@
 // Nilgün Belma Bugüner <nilgun@belgeler.org>, 2005
 
 //Default Layout (Turkish Q)
-default partial
+default  partial
 xkb_symbols "basic" {
 
     include "latin"
diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw
index e136319c1..8ea31dda6 100644
--- a/xorg-server/xkeyboard-config/symbols/tw
+++ b/xorg-server/xkeyboard-config/symbols/tw
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "tw" {
 
     name[Group1]= "Taiwanese";
diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index 02de5f7aa..9462f2722 100644
--- a/xorg-server/xkeyboard-config/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
@@ -8,7 +8,7 @@
 // http://ilyabirman.ru/projects/typography-layout/
 
 // default layout
-default partial
+default  partial
 xkb_symbols "base" {
 // 1st keyboard row
     key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
diff --git a/xorg-server/xkeyboard-config/symbols/tz b/xorg-server/xkeyboard-config/symbols/tz
index 60ff033be..7b57af6df 100644
--- a/xorg-server/xkeyboard-config/symbols/tz
+++ b/xorg-server/xkeyboard-config/symbols/tz
@@ -3,7 +3,7 @@
 // Please notify any corrections or omissions to
 // Kevin Donnelly (kevin@dotmon.com)
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "swa" {
     name[Group1]= "Swahili (Tanzania)";
 
diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index 331cbfcb3..e286f4835 100644
--- a/xorg-server/xkeyboard-config/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
@@ -5,7 +5,7 @@
 
 // Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
 // some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "unicode" {
     include "ua(winkeys)"
  
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index b70cb016a..357aea16a 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -1,5 +1,4 @@
-default
-partial alphanumeric_keys modifier_keys
+default  partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
     name[Group1]= "English (US)";
diff --git a/xorg-server/xkeyboard-config/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz
index d4cf48fbf..e88741b73 100644
--- a/xorg-server/xkeyboard-config/symbols/uz
+++ b/xorg-server/xkeyboard-config/symbols/uz
@@ -30,7 +30,7 @@
 // apostrophe is replaced with U02BB.
 // 
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "cyrillic" {
 
     name[Group1]= "Uzbek";
diff --git a/xorg-server/xkeyboard-config/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn
index 10a6d2634..1a002e612 100644
--- a/xorg-server/xkeyboard-config/symbols/vn
+++ b/xorg-server/xkeyboard-config/symbols/vn
@@ -8,7 +8,7 @@
 // July 2009
 
 
-default partial alphanumeric_keys
+default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "us"
diff --git a/xorg-server/xkeyboard-config/symbols/za b/xorg-server/xkeyboard-config/symbols/za
index 74abc8271..75f6d9a27 100644
--- a/xorg-server/xkeyboard-config/symbols/za
+++ b/xorg-server/xkeyboard-config/symbols/za
@@ -1,6 +1,6 @@
 // based on the Latvian and GB keyboard maps
 
-default partial alphanumeric_keys modifier_keys
+default  partial alphanumeric_keys modifier_keys
 xkb_symbols "basic" {
 
     // Describes the differences between an en_US