Used synchronise script to update files

77 files changed, 8040 insertions, 8040 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin
index 597b3fb92..92599128f 100644
--- a/xorg-server/xkeyboard-config/symbols/altwin
+++ b/xorg-server/xkeyboard-config/symbols/altwin
@@ -1,79 +1,79 @@
-partial modifier_keys 

-xkb_symbols "meta_alt" {

-    key <LALT> {	[ 	Alt_L,	Meta_L		]	};

-    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	{};

-};

-

-// Control is mapped to the Win-keys (and the usual Ctrl keys).

-partial modifier_keys 

-xkb_symbols "ctrl_win" {

-    key <LWIN> {	[ 	Control_L		]	};

-    key <RWIN> {	[ 	Control_R		]	};

-    modifier_map Control { <LWIN>, <RWIN> };

-};

-

-// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys,  Win is mapped to the Ctrl-keys.

-partial modifier_keys 

-xkb_symbols "ctrl_alt_win" {

-    key <LALT> {	[ 	Control_L, Control_L		]	};

-    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> };

-    modifier_map  Mod1 { <LWIN>, <RWIN> };

-};

-

-

-partial modifier_keys 

-xkb_symbols "meta_win" {

-    key <LALT> {	[ 	Alt_L,	Alt_L		]	};

-    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 };

-    modifier_map Mod4	{ <META>, Meta_L, Meta_R };

-};

-

-partial modifier_keys 

-xkb_symbols "left_meta_win" {

-    key <LALT> {	[ 	Alt_L,	Alt_L		]	};

-    key <LWIN> {	[ 	Meta_L			]	};

-    modifier_map Mod1	{ Alt_L };

-    modifier_map Mod4	{ <META>, Meta_L };

-};

-

-partial modifier_keys 

-xkb_symbols "hyper_win" {

-    key <LWIN> {	[ 	Hyper_L			]	};

-    key <RWIN> {	[ 	Hyper_R			]	};

-    modifier_map Mod4	{ Hyper_L, Hyper_R };

-};

-

-// Use Menu for the menu key

-partial modifier_keys 

-xkb_symbols "menu" {

-    key <MENU> {	[ 	Menu		]	};

-};

-

-// Layout for Tux key caps with additional right Alt key

-partial modifier_keys 

-xkb_symbols "alt_super_win" {

-    key <LALT> {        [       Alt_L,  Meta_L          ]       };

-    key <RWIN> {        [       Alt_R,  Meta_R          ]       };

-    key <LWIN> {        [       Super_L                 ]       };

-    key <MENU> {        [       Super_R                 ]       };

-    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };

-    modifier_map Mod4   { Super_L, Super_R };

-};

-

-partial modifier_keys 

-xkb_symbols "swap_lalt_lwin" {

-    key <LALT> { type[Group1] = "ONE_LEVEL",

-                 symbols[Group1] = [ Super_L ] };

-    key <LWIN> {	[	Alt_L,	Meta_L		]	};

-};

+partial modifier_keys 
+xkb_symbols "meta_alt" {
+    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
+    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	{};
+};
+
+// Control is mapped to the Win-keys (and the usual Ctrl keys).
+partial modifier_keys 
+xkb_symbols "ctrl_win" {
+    key <LWIN> {	[ 	Control_L		]	};
+    key <RWIN> {	[ 	Control_R		]	};
+    modifier_map Control { <LWIN>, <RWIN> };
+};
+
+// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys,  Win is mapped to the Ctrl-keys.
+partial modifier_keys 
+xkb_symbols "ctrl_alt_win" {
+    key <LALT> {	[ 	Control_L, Control_L		]	};
+    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> };
+    modifier_map  Mod1 { <LWIN>, <RWIN> };
+};
+
+
+partial modifier_keys 
+xkb_symbols "meta_win" {
+    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
+    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 };
+    modifier_map Mod4	{ <META>, Meta_L, Meta_R };
+};
+
+partial modifier_keys 
+xkb_symbols "left_meta_win" {
+    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
+    key <LWIN> {	[ 	Meta_L			]	};
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod4	{ <META>, Meta_L };
+};
+
+partial modifier_keys 
+xkb_symbols "hyper_win" {
+    key <LWIN> {	[ 	Hyper_L			]	};
+    key <RWIN> {	[ 	Hyper_R			]	};
+    modifier_map Mod4	{ Hyper_L, Hyper_R };
+};
+
+// Use Menu for the menu key
+partial modifier_keys 
+xkb_symbols "menu" {
+    key <MENU> {	[ 	Menu		]	};
+};
+
+// Layout for Tux key caps with additional right Alt key
+partial modifier_keys 
+xkb_symbols "alt_super_win" {
+    key <LALT> {        [       Alt_L,  Meta_L          ]       };
+    key <RWIN> {        [       Alt_R,  Meta_R          ]       };
+    key <LWIN> {        [       Super_L                 ]       };
+    key <MENU> {        [       Super_R                 ]       };
+    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod4   { Super_L, Super_R };
+};
+
+partial modifier_keys 
+xkb_symbols "swap_lalt_lwin" {
+    key <LALT> { type[Group1] = "ONE_LEVEL",
+                 symbols[Group1] = [ Super_L ] };
+    key <LWIN> {	[	Alt_L,	Meta_L		]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/compose b/xorg-server/xkeyboard-config/symbols/compose
index 520d44aaf..d7257329e 100644
--- a/xorg-server/xkeyboard-config/symbols/compose
+++ b/xorg-server/xkeyboard-config/symbols/compose
@@ -1,54 +1,54 @@
-partial modifier_keys

-xkb_symbols "ralt" {

-    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "lwin" {

-    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "rwin" {

-    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "menu" {

-    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "rctrl" {

-    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "lctrl" {

-    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "caps" {

-    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "102" {

-    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "paus" {

-    key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "prsc" {

-    key <PRSC> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "sclk" {

-    key <SCLK> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

+partial modifier_keys
+xkb_symbols "ralt" {
+    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lwin" {
+    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rwin" {
+    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "menu" {
+    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rctrl" {
+    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lctrl" {
+    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "caps" {
+    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "102" {
+    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "paus" {
+    key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "prsc" {
+    key <PRSC> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "sclk" {
+    key <SCLK> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
index 063fc8d57..69184024b 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
@@ -1,5 +1,5 @@
-symbolsdir = $(xkb_base)/symbols/digital_vndr
-
-dist_symbols_DATA = \
-lk pc us \
-vt
+symbolsdir = $(xkb_base)/symbols/digital_vndr

+

+dist_symbols_DATA = \

+lk pc us \

+vt

diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
index 82a8c90c6..243086581 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
@@ -1,130 +1,130 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log: lk,v 

-// Revision 1.2  1996/06/18  09:10:09  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker

-// 	Rename to avoid name conflicts with XKB stuff

-// 	[1995/03/10  17:10:33  William_Walker]

-//

-// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker

-// 	New experimental version.

-// 	[1994/10/31  14:48:37  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58

-// 

-// Symbols common to all the LK-style keyboards.

-//

-default xkb_symbols "common" {

-

-    // Modifier mappings

-    modifier_map Shift  	{ Shift_L, 	Shift_R	  };

-    modifier_map Lock   	{ Caps_Lock };

-    modifier_map Control	{ Control_L, Control_R };

-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };

-    modifier_map Mod2		{ Num_Lock };

-    modifier_map Mod3   	{ Scroll_Lock };

-

-    // Additional alphanumeric keys

-    key <LSGT>		{ [ less,	greater		] };

-    key <LALT>		{ [ Alt_L,	Meta_L		] };

-

-    // "Function" keys

-    key <FK01>		{ [ F1				] };

-    key <FK02>		{ [ F2				] };

-    key <FK03>		{ [ F3				] };

-    key <FK04>		{ [ F4				] };

-    key <FK05>		{ [ F5				] };

-    key <FK06>		{ [ F6				] };

-    key <FK07>		{ [ F7				] };

-    key <FK08>		{ [ F8				] };

-    key <FK09>		{ [ F9				] };

-    key <FK10>		{ [ F10				] };

-    key <FK11>		{ [ Escape,	F11		] };

-    key <FK12>		{ [ F12				] };

-    key <FK13>		{ [ F13				] };

-    key <FK14>		{ [ F14				] };

-    key <FK17>		{ [ F17				] };

-    key <FK18>		{ [ F18				] };

-    key <FK19>		{ [ F19				] };

-    key <FK20>		{ [ F20				] };

-

-    // "Editing" keys

-    key <HELP>		{ [ Help			] };

-    key <DO>		{ [ Menu			] };

-    key <FIND>		{ [ Find			] };

-    key <INS>		{ [ Insert			] };

-    key <DELE>		{ [ Delete			] };

-    key <SELE>		{ [ Select			] };

-    key <PGUP>		{ [ Prior			] };

-    key <PGDN>		{ [ Next			] };

-

-    key <UP>		{ [ Up				] };

-    key <LEFT>		{ [ Left			] };

-    key <DOWN>		{ [ Down			] };

-    key <RGHT>		{ [ Right			] };

-

-    // "Keypad" keys

-    key <KPF1>		{

-				type= "SHIFT+ALT",

-				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]

-			};

-    key <KPF2>		{ [ KP_F2			] };

-    key <KPF3>		{ [ KP_F3			] };

-    key <KPF4>		{ [ KP_F4			] };

-

-    key <KPCO>		{ [ KP_Separator		] };

-    key <KPSU>		{ [ KP_Subtract			] };

-

-    key <KP7>		{ [ KP_7			] };

-    key <KP8>		{ [ KP_8			] };

-    key <KP9>		{ [ KP_9			] };

-

-    key <KP4>		{ [ KP_4			] };

-    key <KP5>		{ [ KP_5			] };

-    key <KP6>		{ [ KP_6			] };

-

-    key <KP1>		{ [ KP_1			] };

-    key <KP2>		{ [ KP_2			] };

-    key <KP3>		{ [ KP_3			] };

-    key <KPEN>		{ [ KP_Enter			] };

-

-    key <KP0>		{ [ KP_0			] };

-    key <KPDL>		{ [ KP_Decimal			] };

-};

-

-xkb_symbols "lk401" {

-    include "symbols/digital_vndr/lk(common)"

-    key <RALT>              { [ Alt_R,      Meta_R          ] };

-    key <LCMP>              { [ Multi_key                   ] };

-    key <RCMP>              { [ Multi_key                   ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: lk,v 
+// Revision 1.2  1996/06/18  09:10:09  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker
+// 	Rename to avoid name conflicts with XKB stuff
+// 	[1995/03/10  17:10:33  William_Walker]
+//
+// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker
+// 	New experimental version.
+// 	[1994/10/31  14:48:37  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58
+// 
+// Symbols common to all the LK-style keyboards.
+//
+default xkb_symbols "common" {
+
+    // Modifier mappings
+    modifier_map Shift  	{ Shift_L, 	Shift_R	  };
+    modifier_map Lock   	{ Caps_Lock };
+    modifier_map Control	{ Control_L, Control_R };
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod2		{ Num_Lock };
+    modifier_map Mod3   	{ Scroll_Lock };
+
+    // Additional alphanumeric keys
+    key <LSGT>		{ [ less,	greater		] };
+    key <LALT>		{ [ Alt_L,	Meta_L		] };
+
+    // "Function" keys
+    key <FK01>		{ [ F1				] };
+    key <FK02>		{ [ F2				] };
+    key <FK03>		{ [ F3				] };
+    key <FK04>		{ [ F4				] };
+    key <FK05>		{ [ F5				] };
+    key <FK06>		{ [ F6				] };
+    key <FK07>		{ [ F7				] };
+    key <FK08>		{ [ F8				] };
+    key <FK09>		{ [ F9				] };
+    key <FK10>		{ [ F10				] };
+    key <FK11>		{ [ Escape,	F11		] };
+    key <FK12>		{ [ F12				] };
+    key <FK13>		{ [ F13				] };
+    key <FK14>		{ [ F14				] };
+    key <FK17>		{ [ F17				] };
+    key <FK18>		{ [ F18				] };
+    key <FK19>		{ [ F19				] };
+    key <FK20>		{ [ F20				] };
+
+    // "Editing" keys
+    key <HELP>		{ [ Help			] };
+    key <DO>		{ [ Menu			] };
+    key <FIND>		{ [ Find			] };
+    key <INS>		{ [ Insert			] };
+    key <DELE>		{ [ Delete			] };
+    key <SELE>		{ [ Select			] };
+    key <PGUP>		{ [ Prior			] };
+    key <PGDN>		{ [ Next			] };
+
+    key <UP>		{ [ Up				] };
+    key <LEFT>		{ [ Left			] };
+    key <DOWN>		{ [ Down			] };
+    key <RGHT>		{ [ Right			] };
+
+    // "Keypad" keys
+    key <KPF1>		{
+				type= "SHIFT+ALT",
+				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]
+			};
+    key <KPF2>		{ [ KP_F2			] };
+    key <KPF3>		{ [ KP_F3			] };
+    key <KPF4>		{ [ KP_F4			] };
+
+    key <KPCO>		{ [ KP_Separator		] };
+    key <KPSU>		{ [ KP_Subtract			] };
+
+    key <KP7>		{ [ KP_7			] };
+    key <KP8>		{ [ KP_8			] };
+    key <KP9>		{ [ KP_9			] };
+
+    key <KP4>		{ [ KP_4			] };
+    key <KP5>		{ [ KP_5			] };
+    key <KP6>		{ [ KP_6			] };
+
+    key <KP1>		{ [ KP_1			] };
+    key <KP2>		{ [ KP_2			] };
+    key <KP3>		{ [ KP_3			] };
+    key <KPEN>		{ [ KP_Enter			] };
+
+    key <KP0>		{ [ KP_0			] };
+    key <KPDL>		{ [ KP_Decimal			] };
+};
+
+xkb_symbols "lk401" {
+    include "symbols/digital_vndr/lk(common)"
+    key <RALT>              { [ Alt_R,      Meta_R          ] };
+    key <LCMP>              { [ Multi_key                   ] };
+    key <RCMP>              { [ Multi_key                   ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
index b8d1fb2bb..f50d4cde4 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
@@ -1,175 +1,175 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log

-// Revision 1.2  1996/06/18  09:10:12  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker

-// 	Update to XKB 0.65

-// 	[1995/12/17  02:37:07  William_Walker]

-//

-// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker

-// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics

-// 	[1995/10/23  15:49:03  William_Walker]

-// 

-// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker

-// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)

-// 	[1995/08/06  14:06:32  William_Walker]

-// 

-// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker

-// 	Sync up with Erik's pool.

-// 	[1995/08/03  20:17:15  William_Walker]

-// 

-// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:29:52  William_Walker]

-// 

-// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker

-// 	Make RALT default to Mode_switch

-// 	[1995/06/08  17:08:50  William_Walker]

-// 

-// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:17:03  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 

-// 

-

-// **************************************************************

-// *								*

-// * The symbols common to all Extended PC layouts.		*

-// *								*

-// **************************************************************

-xkb_symbols "pc" {

-

-    // Modifier mappings

-    //

-    modifier_map Shift		{ Shift_L, Shift_R		};

-    modifier_map Lock		{ Caps_Lock			};

-    modifier_map Control	{ Control_L, Control_R		};

-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};

-    modifier_map Mod3		{ Mode_switch			};

-    modifier_map Mod4		{ Num_Lock			};

-    modifier_map Mod5		{ Scroll_Lock			};

-

-    // Common keys

-    //

-    key <BKSP> {       [       BackSpace,	   Delete ] };

-    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };

-    key <CAPS> {       [       Caps_Lock ] };

-    key <RTRN> {       [	  Return ] };

-    key <LFSH> {       [	 Shift_L ] };

-    key <RTSH> {       [	 Shift_R ] };

-    key <LCTL> {       [       Control_L ] };

-    key <LALT> {       [	   Alt_L,	   Meta_L ] };

-    key <SPCE> {       [	   space ] };

-    key <RALT> {       [     Mode_switch ] };

-    key <RCTL> {       [       Control_R ] };

-

-    // "Function" keys

-    //

-    key	 <ESC> {       [	  Escape ] };

-    key <FK01> {       [	      F1 ] };

-    key <FK02> {       [	      F2 ] };

-    key <FK03> {       [	      F3 ] };

-    key <FK04> {       [	      F4 ] };

-    key <FK05> {       [	      F5 ] };

-    key <FK06> {       [	      F6 ] };

-    key <FK07> {       [	      F7 ] };

-    key <FK08> {       [	      F8 ] };

-    key <FK09> {       [	      F9 ] };

-    key <FK10> {       [	     F10 ] };

-    key <FK11> {       [	     F11 ] };

-    key <FK12> {       [	     F12 ] };

-    key <PRSC> {

-	type= "PC_ALT_LEVEL2",

-	symbols[Group1]= [	     Print,	    Sys_Req ]

-    };

-    key <SCLK> {       [     Scroll_Lock ] };

-    key <PAUS> {

-	type= "PC_CONTROL_LEVEL2",

-	symbols[Group1]= [	     Pause,	      Break ]

-    };

-

-    // "Editing" keys

-    //

-    key	 <INS> {       [	  Insert ] };

-    key <HOME> {       [	    Home ] };

-    key <PGUP> {       [	   Prior ] };

-    key <DELE> {       [	  Delete ] };

-    key	 <END> {       [	     End ] };

-    key <PGDN> {       [	    Next ] };

-

-    key	  <UP> {       [	      Up ] };

-    key <LEFT> {       [	    Left ] };

-    key <DOWN> {       [	    Down ] };

-    key <RGHT> {       [	   Right ] };

-

-    // "Keypad" keys

-    //

-    key <NMLK> {

-	type= "SHIFT+ALT",

-	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]

-    };

-    key <KPDV> {       [       KP_Divide ] };

-    key <KPMU> {       [     KP_Multiply ] };

-    key <KPSU> {       [     KP_Subtract ] };

-

-    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };

-    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };

-    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };

-    key <KPAD> {       [	  KP_Add ] };

-

-    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };

-    key	 <KP5> {       [	    KP_5 ] };

-    key	 <KP6> {       [	KP_Right,	     KP_6 ] };

-

-    key	 <KP1> {       [	  KP_End,	     KP_1 ] };

-    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };

-    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };

-    key <KPEN> {       [	KP_Enter ] };

-

-    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };

-    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };

-

-    // Key to support Lock-Down Modifier descriptions for R5

-    //

-    key	 <LDM> {       [	NoSymbol ] };

-};

-

-xkb_symbols "pc104" {

-    include "digital_vndr/pc(pc)"

-

-    replace key <LALT> {       [       Alt_L ] };

-    key	<LWIN> {       [	 Meta_L ] };

-    key	<RWIN> {       [	 Meta_R ] };

-    key	<MENU> {       [	 Menu   ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:12  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:07  William_Walker]
+//
+// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker
+// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics
+// 	[1995/10/23  15:49:03  William_Walker]
+// 
+// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:32  William_Walker]
+// 
+// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/03  20:17:15  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:29:52  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker
+// 	Make RALT default to Mode_switch
+// 	[1995/06/08  17:08:50  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:03  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 
+// 
+
+// **************************************************************
+// *								*
+// * The symbols common to all Extended PC layouts.		*
+// *								*
+// **************************************************************
+xkb_symbols "pc" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+    modifier_map Mod4		{ Num_Lock			};
+    modifier_map Mod5		{ Scroll_Lock			};
+
+    // Common keys
+    //
+    key <BKSP> {       [       BackSpace,	   Delete ] };
+    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <RTRN> {       [	  Return ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCTL> {       [       Control_L ] };
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <SPCE> {       [	   space ] };
+    key <RALT> {       [     Mode_switch ] };
+    key <RCTL> {       [       Control_R ] };
+
+    // "Function" keys
+    //
+    key	 <ESC> {       [	  Escape ] };
+    key <FK01> {       [	      F1 ] };
+    key <FK02> {       [	      F2 ] };
+    key <FK03> {       [	      F3 ] };
+    key <FK04> {       [	      F4 ] };
+    key <FK05> {       [	      F5 ] };
+    key <FK06> {       [	      F6 ] };
+    key <FK07> {       [	      F7 ] };
+    key <FK08> {       [	      F8 ] };
+    key <FK09> {       [	      F9 ] };
+    key <FK10> {       [	     F10 ] };
+    key <FK11> {       [	     F11 ] };
+    key <FK12> {       [	     F12 ] };
+    key <PRSC> {
+	type= "PC_ALT_LEVEL2",
+	symbols[Group1]= [	     Print,	    Sys_Req ]
+    };
+    key <SCLK> {       [     Scroll_Lock ] };
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	symbols[Group1]= [	     Pause,	      Break ]
+    };
+
+    // "Editing" keys
+    //
+    key	 <INS> {       [	  Insert ] };
+    key <HOME> {       [	    Home ] };
+    key <PGUP> {       [	   Prior ] };
+    key <DELE> {       [	  Delete ] };
+    key	 <END> {       [	     End ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <NMLK> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]
+    };
+    key <KPDV> {       [       KP_Divide ] };
+    key <KPMU> {       [     KP_Multiply ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };
+    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };
+    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };
+    key <KPAD> {       [	  KP_Add ] };
+
+    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	KP_Right,	     KP_6 ] };
+
+    key	 <KP1> {       [	  KP_End,	     KP_1 ] };
+    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };
+    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };
+    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc)"
+
+    replace key <LALT> {       [       Alt_L ] };
+    key	<LWIN> {       [	 Meta_L ] };
+    key	<RWIN> {       [	 Meta_R ] };
+    key	<MENU> {       [	 Menu   ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/us b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
index 95d7301e7..e737e4e3f 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
@@ -1,211 +1,211 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log

-// Revision 1.2  1996/06/18  09:10:16  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker

-// 	Update to XKB 0.65

-// 	[1995/12/17  02:37:44  William_Walker]

-//

-// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker

-// 	Add pc104-key support

-// 	[1995/10/23  15:46:27  William_Walker]

-// 

-// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:30:33  William_Walker]

-// 

-// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker

-// 	Add VT105 layout support and ISO group support

-// 	[1995/06/09  20:43:05  William_Walker]

-// 

-// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker

-// 	Use ISO_Next_Group instead of grouplock

-// 	[1995/06/08  21:03:56  William_Walker]

-// 

-// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:17:54  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 

-// 

-

-// **************************************************************

-// *								*

-// * Symbols for en_US.ISO8859-1 - English for U.S.		*

-// *								*

-// **************************************************************

-

-xkb_symbols "us" {

-

-    key <AE00> {       [	    grave,     asciitilde ] };

-    key <AE01> {       [		1,	   exclam ] };

-    key <AE02> {       [		2,	       at ] };

-    key <AE03> {       [		3,     numbersign ] };

-    key <AE04> {       [		4,	   dollar ] };

-    key <AE05> {       [		5,	  percent ] };

-    key <AE06> {       [		6,    asciicircum ] };

-    key <AE07> {       [		7,	ampersand ] };

-    key <AE08> {       [		8,	 asterisk ] };

-    key <AE09> {       [		9,	parenleft ] };

-    key <AE10> {       [		0,     parenright ] };

-    key <AE11> {       [	    minus,     underscore ] };

-    key <AE12> {       [	    equal,	     plus ] };

-

-    key <AD01> {       [		q,		Q ] };

-    key <AD02> {       [		w,		W ] };

-    key <AD03> {       [		e,		E ] };

-    key <AD04> {       [		r,		R ] };

-    key <AD05> {       [		t,		T ] };

-    key <AD06> {       [		y,		Y ] };

-    key <AD07> {       [		u,		U ] };

-    key <AD08> {       [		i,		I ] };

-    key <AD09> {       [		o,		O ] };

-    key <AD10> {       [		p,		P ] };

-    key <AD11> {       [      bracketleft,	braceleft ] };

-    key <AD12> {       [     bracketright,     braceright ] };

-

-    key <AC01> {       [		a,		A ] };

-    key <AC02> {       [		s,		S ] };

-    key <AC03> {       [		d,		D ] };

-    key <AC04> {       [		f,		F ] };

-    key <AC05> {       [		g,		G ] };

-    key <AC06> {       [		h,		H ] };

-    key <AC07> {       [		j,		J ] };

-    key <AC08> {       [		k,		K ] };

-    key <AC09> {       [		l,		L ] };

-    key <AC10> {       [	semicolon,	    colon ] };

-    key <AC11> {       [       apostrophe,	 quotedbl ] };

-    key <BKSL> {       [	backslash,	      bar ] };

-

-    key <AB01> {       [		z,		Z ] };

-    key <AB02> {       [		x,		X ] };

-    key <AB03> {       [		c,		C ] };

-    key <AB04> {       [		v,		V ] };

-    key <AB05> {       [		b,		B ] };

-    key <AB06> {       [		n,		N ] };

-    key <AB07> {       [		m,		M ] };

-    key <AB08> {       [	    comma,	     less ] };

-    key <AB09> {       [	   period,	  greater ] };

-    key <AB10> {       [	    slash,	 question ] };

-};

-

-// **************************************************************

-// *								*

-// * The VT105 layouts						*

-// *								*

-// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*

-// *	    for the VT108 layout are identical for the US.	*

-// *								*

-// **************************************************************

-xkb_symbols "vt105-tw" {

-    include "digital_vndr/us(us)"

-    include "digital_vndr/vt(vt105)"

-    override key <AE03> { 

-	symbols[Group1]= [ 3, numbersign ],

-	symbols[Group2]= [ sterling ]

-    };

-    key <AB00> {       [	     less,	  greater ] };

-};

-

-xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };

-xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };

-

-// **************************************************************

-// *								*

-// * The VT108 layouts - based upon the LK401-AA		*

-// *								*

-// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*

-// *	    for the VT108 layout are identical for the US.	*

-// *								*

-// **************************************************************

-xkb_symbols "vt108-tw" {

-    include "digital_vndr/us(us)"

-    include "digital_vndr/vt(vt108)"

-    replace key <LCMP> { [ Multi_key ] };

-    override key <AE03> { 

-	symbols[Group1]= [ 3, numbersign ],

-	symbols[Group2]= [ sterling ]

-    };

-    key <AB00> {       [	     less,	  greater ] };

-};

-

-xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };

-xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };

-

-// **************************************************************

-// *								*

-// * The "unix" layouts	- based upon the LK421-AA		*

-// *								*

-// * NOTES: The "unix" keyboard emits the same keycodes as the	*

-// *	    LK401, but is a shorter keyboard that uses an	*

-// *	    "extend" key.  To make life easier, we map <AE00>	*

-// *	    to Escape so users do not have to press Extend+F11	*

-// *	    to get Escape.					*

-// *								*

-// **************************************************************

-xkb_symbols "unix" {

-    include "digital_vndr/us(vt108)"

-    override key <AE00>	{ [ Escape ] };

-    override key <AB00>	{ [ grave, asciitilde ] };

-};

-

-// **************************************************************

-// *								*

-// * The "pcxal" layouts					*

-// *								*

-// * NOTES: The pcxal layouts are pretty much standardized for	*

-// *	    the US and use a 101-key keyboard.			*

-// *								*

-// **************************************************************

-xkb_symbols "pcxalga" {

-    include "digital_vndr/pc(pc)"

-    include "digital_vndr/us(us)"

-    replace key <RALT> { [ Alt_R, Meta_R ] };

-};

-

-xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };

-

-// **************************************************************

-// *								*

-// * The "pc104" layouts.					*

-// *								*

-// **************************************************************

-xkb_symbols "pc104" {

-    include "digital_vndr/pc(pc104)"

-    include "digital_vndr/us(us)"

-    replace key <RALT> { [ Alt_R ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:16  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:44  William_Walker]
+//
+// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:27  William_Walker]
+// 
+// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:33  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:05  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker
+// 	Use ISO_Next_Group instead of grouplock
+// 	[1995/06/08  21:03:56  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:54  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 
+// 
+
+// **************************************************************
+// *								*
+// * Symbols for en_US.ISO8859-1 - English for U.S.		*
+// *								*
+// **************************************************************
+
+xkb_symbols "us" {
+
+    key <AE00> {       [	    grave,     asciitilde ] };
+    key <AE01> {       [		1,	   exclam ] };
+    key <AE02> {       [		2,	       at ] };
+    key <AE03> {       [		3,     numbersign ] };
+    key <AE04> {       [		4,	   dollar ] };
+    key <AE05> {       [		5,	  percent ] };
+    key <AE06> {       [		6,    asciicircum ] };
+    key <AE07> {       [		7,	ampersand ] };
+    key <AE08> {       [		8,	 asterisk ] };
+    key <AE09> {       [		9,	parenleft ] };
+    key <AE10> {       [		0,     parenright ] };
+    key <AE11> {       [	    minus,     underscore ] };
+    key <AE12> {       [	    equal,	     plus ] };
+
+    key <AD01> {       [		q,		Q ] };
+    key <AD02> {       [		w,		W ] };
+    key <AD03> {       [		e,		E ] };
+    key <AD04> {       [		r,		R ] };
+    key <AD05> {       [		t,		T ] };
+    key <AD06> {       [		y,		Y ] };
+    key <AD07> {       [		u,		U ] };
+    key <AD08> {       [		i,		I ] };
+    key <AD09> {       [		o,		O ] };
+    key <AD10> {       [		p,		P ] };
+    key <AD11> {       [      bracketleft,	braceleft ] };
+    key <AD12> {       [     bracketright,     braceright ] };
+
+    key <AC01> {       [		a,		A ] };
+    key <AC02> {       [		s,		S ] };
+    key <AC03> {       [		d,		D ] };
+    key <AC04> {       [		f,		F ] };
+    key <AC05> {       [		g,		G ] };
+    key <AC06> {       [		h,		H ] };
+    key <AC07> {       [		j,		J ] };
+    key <AC08> {       [		k,		K ] };
+    key <AC09> {       [		l,		L ] };
+    key <AC10> {       [	semicolon,	    colon ] };
+    key <AC11> {       [       apostrophe,	 quotedbl ] };
+    key <BKSL> {       [	backslash,	      bar ] };
+
+    key <AB01> {       [		z,		Z ] };
+    key <AB02> {       [		x,		X ] };
+    key <AB03> {       [		c,		C ] };
+    key <AB04> {       [		v,		V ] };
+    key <AB05> {       [		b,		B ] };
+    key <AB06> {       [		n,		N ] };
+    key <AB07> {       [		m,		M ] };
+    key <AB08> {       [	    comma,	     less ] };
+    key <AB09> {       [	   period,	  greater ] };
+    key <AB10> {       [	    slash,	 question ] };
+};
+
+// **************************************************************
+// *								*
+// * The VT105 layouts						*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt105-tw" {
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt105)"
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };
+xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };
+
+// **************************************************************
+// *								*
+// * The VT108 layouts - based upon the LK401-AA		*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt108-tw" {
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt108)"
+    replace key <LCMP> { [ Multi_key ] };
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };
+xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };
+
+// **************************************************************
+// *								*
+// * The "unix" layouts	- based upon the LK421-AA		*
+// *								*
+// * NOTES: The "unix" keyboard emits the same keycodes as the	*
+// *	    LK401, but is a shorter keyboard that uses an	*
+// *	    "extend" key.  To make life easier, we map <AE00>	*
+// *	    to Escape so users do not have to press Extend+F11	*
+// *	    to get Escape.					*
+// *								*
+// **************************************************************
+xkb_symbols "unix" {
+    include "digital_vndr/us(vt108)"
+    override key <AE00>	{ [ Escape ] };
+    override key <AB00>	{ [ grave, asciitilde ] };
+};
+
+// **************************************************************
+// *								*
+// * The "pcxal" layouts					*
+// *								*
+// * NOTES: The pcxal layouts are pretty much standardized for	*
+// *	    the US and use a 101-key keyboard.			*
+// *								*
+// **************************************************************
+xkb_symbols "pcxalga" {
+    include "digital_vndr/pc(pc)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R, Meta_R ] };
+};
+
+xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };
+
+// **************************************************************
+// *								*
+// * The "pc104" layouts.					*
+// *								*
+// **************************************************************
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc104)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
index 5d3680db4..13f7941c6 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
@@ -1,158 +1,158 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log

-// Revision 1.2  1996/06/18  09:10:19  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker

-// 	Update to XKB 0.65

-// 	[1995/12/17  02:37:47  William_Walker]

-//

-// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker

-// 	Make RALT act as RALT

-// 	[1995/07/11  21:18:28  William_Walker]

-// 

-// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:30:37  William_Walker]

-// 

-// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker

-// 	Add VT105 layout support and ISO group support

-// 	[1995/06/09  20:43:09  William_Walker]

-// 

-// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:17:58  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 

-// 

-xkb_symbols "vt105" {

-

-    // Modifier mappings

-    //

-    modifier_map Shift		{ Shift_L, Shift_R		};

-    modifier_map Lock		{ Caps_Lock			};

-    modifier_map Control	{ Control_L, Control_R		};

-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};

-    modifier_map Mod3		{ Mode_switch			};

-

-    // Common keys

-    //

-    key <BKSP> {       [	  Delete ] };

-    key	 <TAB> {       [	     Tab ] };

-    key <RTRN> {       [	  Return ] };

-    key <LCTL> {       [       Control_L ] };

-    key <CAPS> {       [       Caps_Lock ] };

-    key <LFSH> {       [	 Shift_L ] };

-    key <RTSH> {       [	 Shift_R ] };

-    key <LCMP> {       [   Alt_L, Meta_L ] };

-    key <SPCE> {       [	   space ] };

-

-    // "Function" keys

-    //

-    key <FK01> {       [	       F1 ] };

-    key <FK02> {       [	       F2 ] };

-    key <FK03> {       [	       F3 ] };

-    key <FK04> {       [	       F4 ] };

-    key <FK05> {       [	       F5 ] };

-    key <FK06> {       [	       F6 ] };

-    key <FK07> {       [	       F7 ] };

-    key <FK08> {       [	       F8 ] };

-    key <FK09> {       [	       F9 ] };

-    key <FK10> {       [	      F10 ] };

-    key <FK11> {       [	   Escape,	      F11 ] };

-    key <FK12> {       [	      F12 ] };

-    key <FK13> {       [	      F13 ] };

-    key <FK14> {       [	      F14 ] };

-    key <FK17> {       [	      F17 ] };

-    key <FK18> {       [	      F18 ] };

-    key <FK19> {       [	      F19 ] };

-    key <FK20> {       [	      F20 ] };

-

-    // "Editing" keys

-    //

-    key <HELP> {       [	    Help ] };

-    key	  <DO> {       [	    Menu ] };

-    key <FIND> {       [	    Find ] };

-    key	 <INS> {       [	  Insert ] };

-    key <DELE> {       [       apLineDel ] };

-    key <SELE> {       [	  Select ] };

-    key <PGUP> {       [	   Prior ] };

-    key <PGDN> {       [	    Next ] };

-

-    key	  <UP> {       [	      Up ] };

-    key <LEFT> {       [	    Left ] };

-    key <DOWN> {       [	    Down ] };

-    key <RGHT> {       [	   Right ] };

-

-    // "Keypad" keys

-    //

-    key <KPF1> {

-	type= "SHIFT+ALT",

-	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]

-    };

-    key <KPF2> {       [	   KP_F2 ] };

-    key <KPF3> {       [	   KP_F3 ] };

-    key <KPF4> {       [	   KP_F4 ] };

-

-    key	 <KP7> {       [	    KP_7 ] };

-    key	 <KP8> {       [	    KP_8 ] };

-    key	 <KP9> {       [	    KP_9 ] };

-    key <KPSU> {       [     KP_Subtract ] };

-

-    key	 <KP4> {       [	    KP_4 ] };

-    key	 <KP5> {       [	    KP_5 ] };

-    key	 <KP6> {       [	    KP_6 ] };

-    key <KPCO> {       [    KP_Separator ] };

-

-    key	 <KP1> {       [	    KP_1 ] };

-    key	 <KP2> {       [	    KP_2 ] };

-    key	 <KP3> {       [	    KP_3 ] };

-    key <KPEN> {       [	KP_Enter ] };

-

-    key	 <KP0> {       [	    KP_0 ] };

-    key <KPDL> {       [      KP_Decimal ] };

-

-    // Key to support Lock-Down Modifier descriptions for R5

-    //

-    key	 <LDM> {       [	NoSymbol ] };

-};

-

-xkb_symbols "vt108" {

-

-    include "digital_vndr/vt(vt105)"

-

-    replace key <LCMP> { [ Mode_switch ] };

-

-    key <LALT> {       [	   Alt_L,	   Meta_L ] };

-    key <RALT> {       [	   Alt_R,	   Meta_R ] };

-    key <RCMP> {       [       Multi_key ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:19  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:47  William_Walker]
+//
+// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker
+// 	Make RALT act as RALT
+// 	[1995/07/11  21:18:28  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:37  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:09  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:58  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 
+// 
+xkb_symbols "vt105" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+
+    // Common keys
+    //
+    key <BKSP> {       [	  Delete ] };
+    key	 <TAB> {       [	     Tab ] };
+    key <RTRN> {       [	  Return ] };
+    key <LCTL> {       [       Control_L ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCMP> {       [   Alt_L, Meta_L ] };
+    key <SPCE> {       [	   space ] };
+
+    // "Function" keys
+    //
+    key <FK01> {       [	       F1 ] };
+    key <FK02> {       [	       F2 ] };
+    key <FK03> {       [	       F3 ] };
+    key <FK04> {       [	       F4 ] };
+    key <FK05> {       [	       F5 ] };
+    key <FK06> {       [	       F6 ] };
+    key <FK07> {       [	       F7 ] };
+    key <FK08> {       [	       F8 ] };
+    key <FK09> {       [	       F9 ] };
+    key <FK10> {       [	      F10 ] };
+    key <FK11> {       [	   Escape,	      F11 ] };
+    key <FK12> {       [	      F12 ] };
+    key <FK13> {       [	      F13 ] };
+    key <FK14> {       [	      F14 ] };
+    key <FK17> {       [	      F17 ] };
+    key <FK18> {       [	      F18 ] };
+    key <FK19> {       [	      F19 ] };
+    key <FK20> {       [	      F20 ] };
+
+    // "Editing" keys
+    //
+    key <HELP> {       [	    Help ] };
+    key	  <DO> {       [	    Menu ] };
+    key <FIND> {       [	    Find ] };
+    key	 <INS> {       [	  Insert ] };
+    key <DELE> {       [       apLineDel ] };
+    key <SELE> {       [	  Select ] };
+    key <PGUP> {       [	   Prior ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <KPF1> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]
+    };
+    key <KPF2> {       [	   KP_F2 ] };
+    key <KPF3> {       [	   KP_F3 ] };
+    key <KPF4> {       [	   KP_F4 ] };
+
+    key	 <KP7> {       [	    KP_7 ] };
+    key	 <KP8> {       [	    KP_8 ] };
+    key	 <KP9> {       [	    KP_9 ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP4> {       [	    KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	    KP_6 ] };
+    key <KPCO> {       [    KP_Separator ] };
+
+    key	 <KP1> {       [	    KP_1 ] };
+    key	 <KP2> {       [	    KP_2 ] };
+    key	 <KP3> {       [	    KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [	    KP_0 ] };
+    key <KPDL> {       [      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "vt108" {
+
+    include "digital_vndr/vt(vt105)"
+
+    replace key <LCMP> { [ Mode_switch ] };
+
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <RALT> {       [	   Alt_R,	   Meta_R ] };
+    key <RCMP> {       [       Multi_key ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/empty b/xorg-server/xkeyboard-config/symbols/empty
index 16443b28c..cae330310 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

-xkb_symbols "basic" {

-    name[Group1]= "Empty";

-};

+default partial alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+    name[Group1]= "Empty";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/eurosign b/xorg-server/xkeyboard-config/symbols/eurosign
index 380350174..0d95a900f 100644
--- a/xorg-server/xkeyboard-config/symbols/eurosign
+++ b/xorg-server/xkeyboard-config/symbols/eurosign
@@ -1,23 +1,23 @@
-// Most keyboards have the EuroSign engraved on the E key

-partial

-xkb_symbols "e" {

-    key <AD03>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};

-};

-

-// Many Apple keyboards have the EuroSign engraved on the 2 key

-partial

-xkb_symbols "2" {

-    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};

-};

-

-// Some keyboards have the EuroSign engraved on the 4 key

-partial

-xkb_symbols "4" {

-    key <AE04>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};

-};

-

-// Many keyboards have the EuroSign engraved on the 5 key

-partial

-xkb_symbols "5" {

-    key <AE05>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};

-};

+// Most keyboards have the EuroSign engraved on the E key
+partial
+xkb_symbols "e" {
+    key <AD03>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
+
+// Many Apple keyboards have the EuroSign engraved on the 2 key
+partial
+xkb_symbols "2" {
+    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
+
+// Some keyboards have the EuroSign engraved on the 4 key
+partial
+xkb_symbols "4" {
+    key <AE04>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
+
+// Many keyboards have the EuroSign engraved on the 5 key
+partial
+xkb_symbols "5" {
+    key <AE05>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
index fb128fd19..bbcd6d58d 100644
--- a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
+++ b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
-
-grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort
+#!/bin/sh

+

+grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort

diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
index 4e3a96ee1..5c9b0b833 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
-
-dist_symbols_DATA = \
-jp us
+symbolsdir = $(xkb_base)/symbols/fujitsu_vndr

+

+dist_symbols_DATA = \

+jp us

diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
index 0eb277712..63bf56aca 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
@@ -1,87 +1,87 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// Japanese layout for a Fujitsu 140 key keyboard

-

-xkb_symbols {

-    override "fujitsu_vndr/us"

-    augment key <AE01> { [],			[ kana_NU	] 	};

-	    key <AE02> { [ 2, quotedbl	],	[ kana_FU	]	};

-	    key <AE03> { [ 3, numbersign ],	[ kana_A, kana_a ]	};

-	    key <AE04> { [ 4, dollar	],	[ kana_U, kana_u ]	};

-    augment key <AE05> { [],		[ kana_E, kana_e ]	};

-	    key <AE06> { [ 6, ampersand	],	[ kana_O, kana_o ]	};

-	    key <AE07> { [ 7, apostrophe ],	[ kana_YA, kana_ya ]	};

-	    key <AE08> { [ 8, parenleft	],	[ kana_YU, kana_yu ]	};

-	    key <AE09> { [ 9, parenright ],	[ kana_YO, kana_yo ]	};

-    replace key <AE10> { [ 0	],		[ kana_WA, kana_WO ]	};

-	    key <AE11> { [ minus, equal	],	[ kana_HO	]	};

-	    key <AE12> { [ asciicircum, asciitilde ], [ kana_HE ]	};

-	    key <BKSL> { [ backslash, bar ],	[ prolongedsound]	};

-    augment key <AD01> { [],			[ kana_TA	]	};

-    augment key <AD02> { [],			[ kana_TE	]	};

-    augment key <AD03> { [],			[ kana_I, kana_i ]	};

-    augment key <AD04> { [],			[ kana_SU	]	};

-    augment key <AD05> { [],			[ kana_KA	]	};

-    augment key <AD06> { [],			[ kana_N	]	};

-    augment key <AD07> { [],			[ kana_NA	]	};

-    augment key <AD08> { [],			[ kana_NI	]	};

-    augment key <AD09> { [],			[ kana_RA	]	};

-    augment key <AD10> { [],			[ kana_SE	]	};

-	    key <AD11> { [ at, grave	],	[ voicedsound	]	};

-	    key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ]	};

-    augment key <AC01> { [],			[ kana_CHI	]	};

-    augment key <AC02> { [],			[ kana_TO	]	};

-    augment key <AC03> { [],			[ kana_SHI	]	};

-    augment key <AC04> { [],			[ kana_HA	]	};

-    augment key <AC05> { [],			[ kana_KI	]	};

-    augment key <AC06> { [],			[ kana_KU	]	};

-    augment key <AC07> { [],			[ kana_MA	]	};

-    augment key <AC08> { [],			[ kana_NO	]	};

-    augment key <AC09> { [],			[ kana_RI	]	};

-	    key <AC10> { [ semicolon, plus ],	[ kana_RE	]	};

-	    key <AC11> { [ colon, asterisk ],	[ kana_KE	]	};

-	    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-    augment key <AB01> { [],			[ kana_TSU, kana_tsu ]	};

-    augment key <AB02> { [],			[ kana_SA	]	};

-    augment key <AB03> { [],			[ kana_SO	]	};

-    augment key <AB04> { [],			[ kana_HI	]	};

-    augment key <AB05> { [],			[ kana_KO	]	};

-    augment key <AB06> { [],			[ kana_MI	]	};

-    augment key <AB07> { [],			[ kana_MO	]	};

-    augment key <AB08> { [],			[ kana_NE, kana_comma ]	};

-    augment key <AB09> { [],			[ kana_RU, kana_fullstop ] };

-    augment key <AB10> { [],			[ kana_ME, kana_conjunctive ] };

-	    key <AB11> { [ underscore	],	[ kana_RO	]	};

-	    key <UNK0> { [ Select	]	}; 

-	    key <UNK1> { [ Massyo	]	}; 

-	    key <UNK2> { [ Touroku	]	}; 

-	    key <UNK3> { [ Zenkaku_Hankaku ]	}; 

-	    key <UNK4> { [ Eisu_Shift	]	};

-	    key <UNK5> { [ Mode_switch	]	};

-	    key <UNK6> { [ Cancel	]	};

-	    key <UNK7> { [ Muhenkan	]	};

-	    key <UNK8> { [ Henkan	]	};

-};

+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// Japanese layout for a Fujitsu 140 key keyboard
+
+xkb_symbols {
+    override "fujitsu_vndr/us"
+    augment key <AE01> { [],			[ kana_NU	] 	};
+	    key <AE02> { [ 2, quotedbl	],	[ kana_FU	]	};
+	    key <AE03> { [ 3, numbersign ],	[ kana_A, kana_a ]	};
+	    key <AE04> { [ 4, dollar	],	[ kana_U, kana_u ]	};
+    augment key <AE05> { [],		[ kana_E, kana_e ]	};
+	    key <AE06> { [ 6, ampersand	],	[ kana_O, kana_o ]	};
+	    key <AE07> { [ 7, apostrophe ],	[ kana_YA, kana_ya ]	};
+	    key <AE08> { [ 8, parenleft	],	[ kana_YU, kana_yu ]	};
+	    key <AE09> { [ 9, parenright ],	[ kana_YO, kana_yo ]	};
+    replace key <AE10> { [ 0	],		[ kana_WA, kana_WO ]	};
+	    key <AE11> { [ minus, equal	],	[ kana_HO	]	};
+	    key <AE12> { [ asciicircum, asciitilde ], [ kana_HE ]	};
+	    key <BKSL> { [ backslash, bar ],	[ prolongedsound]	};
+    augment key <AD01> { [],			[ kana_TA	]	};
+    augment key <AD02> { [],			[ kana_TE	]	};
+    augment key <AD03> { [],			[ kana_I, kana_i ]	};
+    augment key <AD04> { [],			[ kana_SU	]	};
+    augment key <AD05> { [],			[ kana_KA	]	};
+    augment key <AD06> { [],			[ kana_N	]	};
+    augment key <AD07> { [],			[ kana_NA	]	};
+    augment key <AD08> { [],			[ kana_NI	]	};
+    augment key <AD09> { [],			[ kana_RA	]	};
+    augment key <AD10> { [],			[ kana_SE	]	};
+	    key <AD11> { [ at, grave	],	[ voicedsound	]	};
+	    key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ]	};
+    augment key <AC01> { [],			[ kana_CHI	]	};
+    augment key <AC02> { [],			[ kana_TO	]	};
+    augment key <AC03> { [],			[ kana_SHI	]	};
+    augment key <AC04> { [],			[ kana_HA	]	};
+    augment key <AC05> { [],			[ kana_KI	]	};
+    augment key <AC06> { [],			[ kana_KU	]	};
+    augment key <AC07> { [],			[ kana_MA	]	};
+    augment key <AC08> { [],			[ kana_NO	]	};
+    augment key <AC09> { [],			[ kana_RI	]	};
+	    key <AC10> { [ semicolon, plus ],	[ kana_RE	]	};
+	    key <AC11> { [ colon, asterisk ],	[ kana_KE	]	};
+	    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+    augment key <AB01> { [],			[ kana_TSU, kana_tsu ]	};
+    augment key <AB02> { [],			[ kana_SA	]	};
+    augment key <AB03> { [],			[ kana_SO	]	};
+    augment key <AB04> { [],			[ kana_HI	]	};
+    augment key <AB05> { [],			[ kana_KO	]	};
+    augment key <AB06> { [],			[ kana_MI	]	};
+    augment key <AB07> { [],			[ kana_MO	]	};
+    augment key <AB08> { [],			[ kana_NE, kana_comma ]	};
+    augment key <AB09> { [],			[ kana_RU, kana_fullstop ] };
+    augment key <AB10> { [],			[ kana_ME, kana_conjunctive ] };
+	    key <AB11> { [ underscore	],	[ kana_RO	]	};
+	    key <UNK0> { [ Select	]	}; 
+	    key <UNK1> { [ Massyo	]	}; 
+	    key <UNK2> { [ Touroku	]	}; 
+	    key <UNK3> { [ Zenkaku_Hankaku ]	}; 
+	    key <UNK4> { [ Eisu_Shift	]	};
+	    key <UNK5> { [ Mode_switch	]	};
+	    key <UNK6> { [ Cancel	]	};
+	    key <UNK7> { [ Muhenkan	]	};
+	    key <UNK8> { [ Henkan	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
index 73dde7612..b856393fd 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
@@ -1,143 +1,143 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// US/ASCII layout for a Fujitsu 138 key keyboard

-xkb_symbols {

-    include "us(basic)"

-

-    // A few alphanumeric keys are different

-    key <TLDE> { [ grave, asciitilde ]	};

-    key <BKSP> { [ BackSpace	]	};

-    key <BKSL> { [ backslash, bar ]	};

-    key <AB11> { [		]	};

-

-    key <RTSH> { [ Shift_R	]	};

-

-    key <LALT> { [ Alt_L	]	};

-    key <RALT> { [ Alt_R	]	};

-    key <LMTA> { [ Meta_L	]	};

-    key <RMTA> { [ Meta_R	]	};

-    key <LNFD> { [ Linefeed	]	};

-    key <COMP> { [ Multi_key	]	};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <BREA> { [ Break	]	};

-    key <PRSC> { [ Print	]	};

-    key <KNJI> { [ Kanji	]	};

-    key <PAUS> { [ Pause	]	};

-

-    key <FK01> { [ F1		]	};

-    key <FK02> { [ F2		]	};

-    key <FK03> { [ F3		]	};

-    key <FK04> { [ F4		]	};

-    key <FK05> { [ F5		]	};

-    key <FK06> { [ F6		]	};

-    key <FK07> { [ F7		]	};

-    key <FK08> { [ F8		]	};

-    key <FK09> { [ F9		]	};

-    key <FK10> { [ F10		]	};

-    key <FK11> { [ F11		]	};

-    key <FK12> { [ F12		]	};

-    key <FK13> { [ F13		]	};

-    key <FK14> { [ F14		]	};

-    key <FK15> { [ F15		]	};

-    key <FK16> { [ F16		]	};

-    key <FK17> { [ F17		]	};

-    key <FK18> { [ F18		]	};

-    key <FK19> { [ F19		]	};

-    key <FK20> { [ F20		]	};

-    key <FK21> { [ F21		]	};

-    key <FK22> { [ F22		]	};

-    key <FK23> { [ F23		]	};

-    key <FK24> { [ F24		]	};

-    key <FK25> { [ F25		]	};

-    key <FK26> { [ F26		]	};

-    key <FK27> { [ F27		]	};

-    key <FK28> { [ F28		]	};

-    key <FK29> { [ F29		]	};

-    key <FK30> { [ F30		]	};

-    key <FK31> { [ F31		]	};

-    key <FK32> { [ F32		]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <UNDO> { [ Undo		]	};

-    key <COPY> { [ F33		]	};

-    key <PAST> { [ F34		]	};

-    key <CUT>  { [ F35		]	};

-    key <HELP> { [ Help		]	};

-    // End "Editing" section

-

-    // Begin "Cursor" section

-    key <UNK0> { [ 		]	}; 

-    key <UNK1> { [ 		]	}; 

-    key <UNK2> { [ 		]	}; 

-    key <PGUP> { [ Prior	]	}; 

-    key <HOME> { [ Home		]	};

-    key <PGDN> { [ Next		]	}; 

-    key <UNK3> { [ 		]	}; 

-    key <DEL>  { [ Delete	]	}; 

-    key <INS>  { [ Insert	]	}; 

-    key <LEFT> { [ Left		]	};

-    key <RGHT> { [ Right	]	};

-    key <UP>   { [ Up		]	};

-    key <DOWN> { [ Down		]	};

-    key <EXEC> { [ Execute	]	};

-    // End "Cursor" section

-

-    // Begin "Keypad" section

-    key <KPMU> { [ KP_Multiply	]	};

-    key <KPDV> { [ KP_Divide	]	};

-    key <KPAD> { [ KP_Add	]	};

-    key <KPSU> { [ KP_Subtract	]	};

-

-    key  <KP7> { [  KP_7	]	};

-    key  <KP8> { [  KP_8	]	};

-    key  <KP9> { [  KP_9	]	};

-    key <KPEQ> { [ KP_Equal 	]	};

-

-    key  <KP4> { [  KP_4	]	};

-    key  <KP5> { [  KP_5	]	};

-    key  <KP6> { [  KP_6	]	};

-    key <KPDC> { [  KP_Decimal	]	};

-

-    key  <KP1> { [  KP_1	]	};

-    key  <KP2> { [  KP_2	]	};

-    key  <KP3> { [  KP_3	]	};

-    key <KPEN> { [  KP_Enter	]	}; 

-

-    key  <KP0> { [  KP_0	]	};

-    key <KP00> { [  KP_0	]	};

-    // End "Keypad" section

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R };

-    modifier_map Mod1   	{ Meta_L, Meta_R };

-    modifier_map Mod2   	{ Mode_switch };

-    modifier_map Mod3   	{ Alt_L };

-    modifier_map Mod4   	{ Num_Lock };

-    modifier_map Mod5   	{ F13, F18, F20 };

-};

+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Fujitsu 138 key keyboard
+xkb_symbols {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave, asciitilde ]	};
+    key <BKSP> { [ BackSpace	]	};
+    key <BKSL> { [ backslash, bar ]	};
+    key <AB11> { [		]	};
+
+    key <RTSH> { [ Shift_R	]	};
+
+    key <LALT> { [ Alt_L	]	};
+    key <RALT> { [ Alt_R	]	};
+    key <LMTA> { [ Meta_L	]	};
+    key <RMTA> { [ Meta_R	]	};
+    key <LNFD> { [ Linefeed	]	};
+    key <COMP> { [ Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BREA> { [ Break	]	};
+    key <PRSC> { [ Print	]	};
+    key <KNJI> { [ Kanji	]	};
+    key <PAUS> { [ Pause	]	};
+
+    key <FK01> { [ F1		]	};
+    key <FK02> { [ F2		]	};
+    key <FK03> { [ F3		]	};
+    key <FK04> { [ F4		]	};
+    key <FK05> { [ F5		]	};
+    key <FK06> { [ F6		]	};
+    key <FK07> { [ F7		]	};
+    key <FK08> { [ F8		]	};
+    key <FK09> { [ F9		]	};
+    key <FK10> { [ F10		]	};
+    key <FK11> { [ F11		]	};
+    key <FK12> { [ F12		]	};
+    key <FK13> { [ F13		]	};
+    key <FK14> { [ F14		]	};
+    key <FK15> { [ F15		]	};
+    key <FK16> { [ F16		]	};
+    key <FK17> { [ F17		]	};
+    key <FK18> { [ F18		]	};
+    key <FK19> { [ F19		]	};
+    key <FK20> { [ F20		]	};
+    key <FK21> { [ F21		]	};
+    key <FK22> { [ F22		]	};
+    key <FK23> { [ F23		]	};
+    key <FK24> { [ F24		]	};
+    key <FK25> { [ F25		]	};
+    key <FK26> { [ F26		]	};
+    key <FK27> { [ F27		]	};
+    key <FK28> { [ F28		]	};
+    key <FK29> { [ F29		]	};
+    key <FK30> { [ F30		]	};
+    key <FK31> { [ F31		]	};
+    key <FK32> { [ F32		]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <UNDO> { [ Undo		]	};
+    key <COPY> { [ F33		]	};
+    key <PAST> { [ F34		]	};
+    key <CUT>  { [ F35		]	};
+    key <HELP> { [ Help		]	};
+    // End "Editing" section
+
+    // Begin "Cursor" section
+    key <UNK0> { [ 		]	}; 
+    key <UNK1> { [ 		]	}; 
+    key <UNK2> { [ 		]	}; 
+    key <PGUP> { [ Prior	]	}; 
+    key <HOME> { [ Home		]	};
+    key <PGDN> { [ Next		]	}; 
+    key <UNK3> { [ 		]	}; 
+    key <DEL>  { [ Delete	]	}; 
+    key <INS>  { [ Insert	]	}; 
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+    key <EXEC> { [ Execute	]	};
+    // End "Cursor" section
+
+    // Begin "Keypad" section
+    key <KPMU> { [ KP_Multiply	]	};
+    key <KPDV> { [ KP_Divide	]	};
+    key <KPAD> { [ KP_Add	]	};
+    key <KPSU> { [ KP_Subtract	]	};
+
+    key  <KP7> { [  KP_7	]	};
+    key  <KP8> { [  KP_8	]	};
+    key  <KP9> { [  KP_9	]	};
+    key <KPEQ> { [ KP_Equal 	]	};
+
+    key  <KP4> { [  KP_4	]	};
+    key  <KP5> { [  KP_5	]	};
+    key  <KP6> { [  KP_6	]	};
+    key <KPDC> { [  KP_Decimal	]	};
+
+    key  <KP1> { [  KP_1	]	};
+    key  <KP2> { [  KP_2	]	};
+    key  <KP3> { [  KP_3	]	};
+    key <KPEN> { [  KP_Enter	]	}; 
+
+    key  <KP0> { [  KP_0	]	};
+    key <KP00> { [  KP_0	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Alt_L };
+    modifier_map Mod4   	{ Num_Lock };
+    modifier_map Mod5   	{ F13, F18, F20 };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
index 6bcd4da3e..25e8fa44f 100644
--- a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/hp_vndr
-
-dist_symbols_DATA = \
-us
+symbolsdir = $(xkb_base)/symbols/hp_vndr

+

+dist_symbols_DATA = \

+us

diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/us b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
index 7e07198d6..aedda92d2 100644
--- a/xorg-server/xkeyboard-config/symbols/hp_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
@@ -1,104 +1,104 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// US/ASCII layout for a HP non-PC keyboard

-xkb_symbols "hil" {

-    include "us(basic)"

-

-    // A few alphanumeric keys are different

-    key <TLDE> { [ grave,	asciitilde	]};

-    key <RTSH> { [ Shift_R	]};

-    key <LALT> { [ Meta_L	]};

-    key <RALT> { [ Meta_R	]};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <BRK>  { [ Break	]};

-    key <STOP> { [ Cancel	]};

-    key <FK01> { [ F1	]	};

-    key <FK02> { [ F2	]	};

-    key <FK03> { [ F3	]	};

-    key <FK04> { [ F4	]	};

-    key <MENU> { [ Menu	]	};

-    key <SYST> { [ hpSystem	]};

-    key <FK05> { [ F5	]	};

-    key <FK06> { [ F6	]	};

-    key <FK07> { [ F7	]	};

-    key <FK08> { [ F8	]	};

-    key <CLRL> { [ hpClearLine	]};

-    key <CLR>  { [ Clear	]};

-    key <FK09> { [ F9	]	};

-    key <FK10> { [ F10	]	};

-    key <FK11> { [ F11	]	};

-    key <FK12> { [ F12	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ Execute, Print	]};

-    key <INSL> { [ hpInsertLine	]};

-    key <DELL> { [ hpDeleteLine	]};

-    key <INSC> { [ hpInsertChar	]};

-    key <DELC> { [ hpDeleteChar	]};

-    key <HOME> { [ Home	]	};

-    key <PGUP> { [ Prior ]	};

-    key <PGDN> { [ Next ]	};

-    key <SELE> { [ Select ]	};

-    key <LEFT> { [ Left	]	};

-    key <DOWN> { [ Down	]	};

-    key <UP>   { [ Up	]	};

-    key <RGHT> { [ Right	]};

-

-    // End "Editing" section, begin "Keypad"

-    key <KPMU> { [ KP_Multiply	]};

-    key <KPDV> { [ KP_Divide	]};

-    key <KPAD> { [ KP_Add	]};

-    key <KPSU> { [ KP_Subtract	]};

-

-    key  <KP7> { [ KP_7	]	};

-    key  <KP8> { [ KP_8	]	};

-    key  <KP9> { [ KP_9	]	};

-    key <KPEN> { [ KP_Enter	]}; 

-

-    key  <KP4> { [ KP_4	]	};

-    key  <KP5> { [ KP_5	]	};

-    key  <KP6> { [ KP_6	]	};

-    key <KPSP> { [ KP_Separator	]};

-

-    key  <KP1> { [ KP_1	]	};

-    key  <KP2> { [ KP_2	]	};

-    key  <KP3> { [ KP_3	]	};

-    key <KPTB> { [ KP_Tab	]}; 

-

-    key  <KP0> { [ KP_0	]	};

-    key <KPDL> { [ KP_Decimal ]	};

-    // End "Keypad" section

-

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R };

-    modifier_map Mod1   	{ Meta_L, Meta_R };

-    modifier_map Mod2   	{ Alt_L };

-    modifier_map Mod3   	{ Mode_switch };

-};

+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a HP non-PC keyboard
+xkb_symbols "hil" {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave,	asciitilde	]};
+    key <RTSH> { [ Shift_R	]};
+    key <LALT> { [ Meta_L	]};
+    key <RALT> { [ Meta_R	]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break	]};
+    key <STOP> { [ Cancel	]};
+    key <FK01> { [ F1	]	};
+    key <FK02> { [ F2	]	};
+    key <FK03> { [ F3	]	};
+    key <FK04> { [ F4	]	};
+    key <MENU> { [ Menu	]	};
+    key <SYST> { [ hpSystem	]};
+    key <FK05> { [ F5	]	};
+    key <FK06> { [ F6	]	};
+    key <FK07> { [ F7	]	};
+    key <FK08> { [ F8	]	};
+    key <CLRL> { [ hpClearLine	]};
+    key <CLR>  { [ Clear	]};
+    key <FK09> { [ F9	]	};
+    key <FK10> { [ F10	]	};
+    key <FK11> { [ F11	]	};
+    key <FK12> { [ F12	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Execute, Print	]};
+    key <INSL> { [ hpInsertLine	]};
+    key <DELL> { [ hpDeleteLine	]};
+    key <INSC> { [ hpInsertChar	]};
+    key <DELC> { [ hpDeleteChar	]};
+    key <HOME> { [ Home	]	};
+    key <PGUP> { [ Prior ]	};
+    key <PGDN> { [ Next ]	};
+    key <SELE> { [ Select ]	};
+    key <LEFT> { [ Left	]	};
+    key <DOWN> { [ Down	]	};
+    key <UP>   { [ Up	]	};
+    key <RGHT> { [ Right	]};
+
+    // End "Editing" section, begin "Keypad"
+    key <KPMU> { [ KP_Multiply	]};
+    key <KPDV> { [ KP_Divide	]};
+    key <KPAD> { [ KP_Add	]};
+    key <KPSU> { [ KP_Subtract	]};
+
+    key  <KP7> { [ KP_7	]	};
+    key  <KP8> { [ KP_8	]	};
+    key  <KP9> { [ KP_9	]	};
+    key <KPEN> { [ KP_Enter	]}; 
+
+    key  <KP4> { [ KP_4	]	};
+    key  <KP5> { [ KP_5	]	};
+    key  <KP6> { [ KP_6	]	};
+    key <KPSP> { [ KP_Separator	]};
+
+    key  <KP1> { [ KP_1	]	};
+    key  <KP2> { [ KP_2	]	};
+    key  <KP3> { [ KP_3	]	};
+    key <KPTB> { [ KP_Tab	]}; 
+
+    key  <KP0> { [ KP_0	]	};
+    key <KPDL> { [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Alt_L };
+    modifier_map Mod3   	{ Mode_switch };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/kpdl b/xorg-server/xkeyboard-config/symbols/kpdl
index 1e4a537a9..968dbd2d9 100644
--- a/xorg-server/xkeyboard-config/symbols/kpdl
+++ b/xorg-server/xkeyboard-config/symbols/kpdl
@@ -1,102 +1,102 @@
-// The <KPDL> key is a mess.

-// It was probably originally meant to be a decimal separator.

-// Except since it was declared by USA people it didn't use the original

-// SI separator "," but a "." (since then the USA managed to f-up the SI

-// by making "." an accepted alternative, but standards still use "," as

-// default)

-// As a result users of SI-abiding countries expect either a "." or a ","

-// or a "decimal_separator" which may or may not be translated in one of the

-// above depending on applications.

-// It's not possible to define a default per-country since user expectations

-// depend on the conflicting choices of their most-used applications,

-// operating system, etc. Therefore it needs to be a configuration setting

-// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>

-

-

-// Legacy <KPDL> #1

-// This assumes KP_Decimal will be translated in a dot

-partial keypad_keys

-xkb_symbols "dot" {

-

-    key.type[Group1]="KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> <separator>

-};

-

-

-// Legacy <KPDL> #2

-// This assumes KP_Separator will be translated in a comma

-partial keypad_keys

-xkb_symbols "comma" {

-

-    key.type[Group1]="KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, KP_Separator ] }; // <delete> <separator>

-};

-

-

-// Period <KPDL>, usual keyboard serigraphy in most countries

-partial keypad_keys

-xkb_symbols "dotoss" {

-

-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , � (narrow no-break space)

-};

-

-

-// Period <KPDL>, usual keyboard serigraphy in most countries, latin-9 restriction

-partial keypad_keys

-xkb_symbols "dotoss_latin9" {

-

-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , � (no-break space)

-};

-

-

-// Comma <KPDL>, what most non anglo-saxon people consider the real separator

-partial keypad_keys

-xkb_symbols "commaoss" {

-

-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, comma, period, 0x100202F ] }; // <delete> , . � (narrow no-break space)

-};

-

-

-// Momayyez <KPDL>: Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE

-partial keypad_keys

-xkb_symbols "momayyezoss" {

-

-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // <delete> ? , � (narrow no-break space)

-};

-

-

-// Abstracted <KPDL>, pray everything will work out (it usually does not)

-partial keypad_keys

-xkb_symbols "kposs" {

-

-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;

-

-    key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? � (narrow no-break space)

-};

-

-// Spreadsheets may be configured to use the dot as decimal

-// punctuation, comma as a thousands separator and then semi-colon as

-// the list separator. Of these, dot and semi-colon is most important

-// when entering data by the keyboard; the comma can then be inferred

-// and added to the presentation afterwards. Using semi-colon as a

-// general separator may in fact be preferred to avoid ambiguities

-// in data files. Most times a decimal separator is hard-coded, it

-// seems to be period, probably since this is the syntax used in

-// (most) programming languages.

-partial keypad_keys

-xkb_symbols "semi" {

-

-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;

-

-    key <KPDL> { [ NoSymbol, NoSymbol, semicolon ] };

-};

+// The <KPDL> key is a mess.
+// It was probably originally meant to be a decimal separator.
+// Except since it was declared by USA people it didn't use the original
+// SI separator "," but a "." (since then the USA managed to f-up the SI
+// by making "." an accepted alternative, but standards still use "," as
+// default)
+// As a result users of SI-abiding countries expect either a "." or a ","
+// or a "decimal_separator" which may or may not be translated in one of the
+// above depending on applications.
+// It's not possible to define a default per-country since user expectations
+// depend on the conflicting choices of their most-used applications,
+// operating system, etc. Therefore it needs to be a configuration setting
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+
+
+// Legacy <KPDL> #1
+// This assumes KP_Decimal will be translated in a dot
+partial keypad_keys
+xkb_symbols "dot" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> <separator>
+};
+
+
+// Legacy <KPDL> #2
+// This assumes KP_Separator will be translated in a comma
+partial keypad_keys
+xkb_symbols "comma" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Separator ] }; // <delete> <separator>
+};
+
+
+// Period <KPDL>, usual keyboard serigraphy in most countries
+partial keypad_keys
+xkb_symbols "dotoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , � (narrow no-break space)
+};
+
+
+// Period <KPDL>, usual keyboard serigraphy in most countries, latin-9 restriction
+partial keypad_keys
+xkb_symbols "dotoss_latin9" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , � (no-break space)
+};
+
+
+// Comma <KPDL>, what most non anglo-saxon people consider the real separator
+partial keypad_keys
+xkb_symbols "commaoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, comma, period, 0x100202F ] }; // <delete> , . � (narrow no-break space)
+};
+
+
+// Momayyez <KPDL>: Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE
+partial keypad_keys
+xkb_symbols "momayyezoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // <delete> ? , � (narrow no-break space)
+};
+
+
+// Abstracted <KPDL>, pray everything will work out (it usually does not)
+partial keypad_keys
+xkb_symbols "kposs" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? � (narrow no-break space)
+};
+
+// Spreadsheets may be configured to use the dot as decimal
+// punctuation, comma as a thousands separator and then semi-colon as
+// the list separator. Of these, dot and semi-colon is most important
+// when entering data by the keyboard; the comma can then be inferred
+// and added to the presentation afterwards. Using semi-colon as a
+// general separator may in fact be preferred to avoid ambiguities
+// in data files. Most times a decimal separator is hard-coded, it
+// seems to be period, probably since this is the syntax used in
+// (most) programming languages.
+partial keypad_keys
+xkb_symbols "semi" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ NoSymbol, NoSymbol, semicolon ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3
index 599443002..9d495550a 100644
--- a/xorg-server/xkeyboard-config/symbols/level3
+++ b/xorg-server/xkeyboard-config/symbols/level3
@@ -1,196 +1,196 @@
-// these variants assign various XKB keycodes to ISO_Level3_Shift so that

-// the third shift level can be reached

-//

-

-// the default behavior is for the right Alt key (AltGr) to generate the

-// third engraved symbol

-default partial modifier_keys

-xkb_symbols "ralt_switch" {

-  key <RALT> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-// Right Alt key never chooses 3rd level.

-// This option attempts to undo the effect of a layout's

-// including ralt_switch.  You may also want to select another

-// level3 option that maps the level3 shift to some other key.

-partial modifier_keys

-xkb_symbols "ralt_alt" {

-  key <RALT> { 

-    type[Group1]="TWO_LEVEL",

-    type[Group2]="TWO_LEVEL",

-    type[Group3]="TWO_LEVEL",

-    type[Group4]="TWO_LEVEL",

-    symbols[Group1] = [ Alt_R, Meta_R ], 

-    symbols[Group2] = [ Alt_R, Meta_R ], 

-    symbols[Group3] = [ Alt_R, Meta_R ], 

-    symbols[Group4] = [ Alt_R, Meta_R ]

-    };

-  modifier_map Mod1    { <RALT> };

-};

-

-partial modifier_keys

-xkb_symbols "ralt_switch_multikey" {

-  key <RALT> {

-    type[Group1]="TWO_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]

-    };

-};

-

-// special case or right Alt switch - for use with grp:alts_toggle

-//

-partial hidden modifier_keys

-xkb_symbols "ralt_switch_for_alts_toggle" {

- virtual_modifiers LAlt, AlGr;

-  key <LALT> {

-    type[Group1]="PC_RALT_LEVEL2",

-    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ],

-    virtualMods= LAlt

-  };

-  key <RALT> {

-    type[Group1]="PC_ALT_LEVEL2",

-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],

-    virtualMods= AltGr

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-// using the level(alt_switch) map, either Alt key temporarily chooses

-// the third shift level.  (Mostly be used to imitate Mac OS functionality.)

-partial modifier_keys

-xkb_symbols "alt_switch" {

-  include "level3(lalt_switch)"

-  include "level3(ralt_switch)"

-};

-

-partial modifier_keys

-xkb_symbols "lalt_switch" {

-  key <LALT> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { <LALT> };

-};

-

-// using the level(switch) map, the right Control key temporarily

-// chooses the third shift level (until it is released).

-partial modifier_keys

-xkb_symbols "switch" {

-  key <RCTL> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-// using the level(menu_switch) map, the Menu key temporarily

-// chooses the third shift level (until it is released).

-partial modifier_keys

-xkb_symbols "menu_switch" {

-  key <MENU> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-// using the level3(win_switch) map, the either Windows' logo key

-// temporarily chooses the third shift level.

-partial modifier_keys

-xkb_symbols "win_switch" {

-  include "level3(lwin_switch)"

-  include "level3(rwin_switch)"

-};

-

-// using the level3(lwin_switch) map, the left Windows' logo key

-// temporarily chooses the third shift level.

-partial modifier_keys

-xkb_symbols "lwin_switch" {

-  key <LWIN> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-// using the level(rwin_switch) map, the right Windows' logo key

-// temporarily chooses the third shift level.  If you use this map,

-// you should define your keyboard as pc101 or pc102 instead of pc104

-// or pc105.

-partial modifier_keys

-xkb_symbols "rwin_switch" {

-  key <RWIN> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-// using the level3(enter_switch) map, the Enter key on the keypad

-// temporarily chooses the third shift level.  This is especially

-// useful for Mac laptops which miss the right Alt key.

-partial modifier_keys

-xkb_symbols "enter_switch" {

-  key <KPEN> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-    };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "caps_switch" {

-  key <CAPS> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "bksl_switch" {

-  key <BKSL> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "lsgt_switch" {

-  key <LSGT> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift ]

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "caps_switch_latch" {

-  key <CAPS> {

-    type[Group1]="THREE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "bksl_switch_latch" {

-  key <BKSL> {

-    type[Group1]="THREE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "lsgt_switch_latch" {

-  key <LSGT> {

-    type[Group1]="THREE_LEVEL",

-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]

-  };

-  modifier_map Mod5   { ISO_Level3_Shift };

-};

+// these variants assign various XKB keycodes to ISO_Level3_Shift so that
+// the third shift level can be reached
+//
+
+// the default behavior is for the right Alt key (AltGr) to generate the
+// third engraved symbol
+default partial modifier_keys
+xkb_symbols "ralt_switch" {
+  key <RALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// Right Alt key never chooses 3rd level.
+// This option attempts to undo the effect of a layout's
+// including ralt_switch.  You may also want to select another
+// level3 option that maps the level3 shift to some other key.
+partial modifier_keys
+xkb_symbols "ralt_alt" {
+  key <RALT> { 
+    type[Group1]="TWO_LEVEL",
+    type[Group2]="TWO_LEVEL",
+    type[Group3]="TWO_LEVEL",
+    type[Group4]="TWO_LEVEL",
+    symbols[Group1] = [ Alt_R, Meta_R ], 
+    symbols[Group2] = [ Alt_R, Meta_R ], 
+    symbols[Group3] = [ Alt_R, Meta_R ], 
+    symbols[Group4] = [ Alt_R, Meta_R ]
+    };
+  modifier_map Mod1    { <RALT> };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_multikey" {
+  key <RALT> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
+    };
+};
+
+// special case or right Alt switch - for use with grp:alts_toggle
+//
+partial hidden modifier_keys
+xkb_symbols "ralt_switch_for_alts_toggle" {
+ virtual_modifiers LAlt, AlGr;
+  key <LALT> {
+    type[Group1]="PC_RALT_LEVEL2",
+    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ],
+    virtualMods= LAlt
+  };
+  key <RALT> {
+    type[Group1]="PC_ALT_LEVEL2",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],
+    virtualMods= AltGr
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(alt_switch) map, either Alt key temporarily chooses
+// the third shift level.  (Mostly be used to imitate Mac OS functionality.)
+partial modifier_keys
+xkb_symbols "alt_switch" {
+  include "level3(lalt_switch)"
+  include "level3(ralt_switch)"
+};
+
+partial modifier_keys
+xkb_symbols "lalt_switch" {
+  key <LALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { <LALT> };
+};
+
+// using the level(switch) map, the right Control key temporarily
+// chooses the third shift level (until it is released).
+partial modifier_keys
+xkb_symbols "switch" {
+  key <RCTL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(menu_switch) map, the Menu key temporarily
+// chooses the third shift level (until it is released).
+partial modifier_keys
+xkb_symbols "menu_switch" {
+  key <MENU> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level3(win_switch) map, the either Windows' logo key
+// temporarily chooses the third shift level.
+partial modifier_keys
+xkb_symbols "win_switch" {
+  include "level3(lwin_switch)"
+  include "level3(rwin_switch)"
+};
+
+// using the level3(lwin_switch) map, the left Windows' logo key
+// temporarily chooses the third shift level.
+partial modifier_keys
+xkb_symbols "lwin_switch" {
+  key <LWIN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(rwin_switch) map, the right Windows' logo key
+// temporarily chooses the third shift level.  If you use this map,
+// you should define your keyboard as pc101 or pc102 instead of pc104
+// or pc105.
+partial modifier_keys
+xkb_symbols "rwin_switch" {
+  key <RWIN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level3(enter_switch) map, the Enter key on the keypad
+// temporarily chooses the third shift level.  This is especially
+// useful for Mac laptops which miss the right Alt key.
+partial modifier_keys
+xkb_symbols "enter_switch" {
+  key <KPEN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "caps_switch" {
+  key <CAPS> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "bksl_switch" {
+  key <BKSL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch" {
+  key <LSGT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "caps_switch_latch" {
+  key <CAPS> {
+    type[Group1]="THREE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "bksl_switch_latch" {
+  key <BKSL> {
+    type[Group1]="THREE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_latch" {
+  key <LSGT> {
+    type[Group1]="THREE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5
index 6e9a693cc..ce219b5bf 100644
--- a/xorg-server/xkeyboard-config/symbols/level5
+++ b/xorg-server/xkeyboard-config/symbols/level5
@@ -1,147 +1,147 @@
-// these variants assign various XKB keycodes to ISO_Level5_Shift so that

-// the third shift level can be reached

-//

-

-// using the level(switch) map, the right Control key temporarily

-// chooses the fifth shift level (until it is released).

-partial modifier_keys

-xkb_symbols "rctrl_switch" {

-  key <RCTL> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift ]

-    };

-  modifier_map Mod3   { ISO_Level5_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "lsgt_switch" {

-  key <LSGT> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift ]

-    };

-  modifier_map Mod3   { ISO_Level5_Shift };

-};

-

-partial modifier_keys

-xkb_symbols "ralt_switch" {

-  key <RALT> {

-    type[Group1]="ONE_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift ]

-    };

-  modifier_map Mod3   { ISO_Level5_Shift };

-};

-

-

-// The following modifier keys are used to switch to the third shift and to set a

-// corresponding lock, implemented as NumLock.

-

-partial modifier_keys

-xkb_symbols "lock" {

-  // This adds the definitions needed to create a level5-lock behaviour, using

-  // the real modifier NumLock as a lock indicator.

-  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK

-  // See also: compat/level5(level5_lock)

-  key.type[Group1] = "ONE_LEVEL";

-

-  replace key <MDSW> {

-    vmods = LevelFive,

-    symbols[Group1] = [ ISO_Level5_Shift ],

-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]

-  };

-  modifier_map Mod3 { <MDSW> };

-

-  replace key <HYPR> {

-    vmods = NumLock,

-    symbols[Group1] = [ NoSymbol ],

-    actions[Group1] = [ SetMods(modifiers=NumLock) ]

-  };

-  modifier_map Mod2 { <HYPR> };

-};

-

-partial modifier_keys

-xkb_symbols "lsgt_switch_lock" {

-

-  include "level5(lock)"

-

-  key <LSGT> {

-    type[Group1] = "EIGHT_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "lwin_switch_lock" {

-

-  include "level5(lock)"

-

-  key <LWIN> {

-    type[Group1] = "EIGHT_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "ralt_switch_lock" {

-

-  include "level5(lock)"

-

-  key <RALT> {

-    type[Group1] = "EIGHT_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "rwin_switch_lock" {

-

-  include "level5(lock)"

-

-  key <RWIN> {

-    type[Group1] = "EIGHT_LEVEL",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "lsgt_switch_lock_cancel" {

-

-  include "level5(lock)"

-

-  key <LSGT> {

-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "lwin_switch_lock_cancel" {

-

-  include "level5(lock)"

-

-  key <LWIN> {

-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "ralt_switch_lock_cancel" {

-

-  include "level5(lock)"

-

-  key <RALT> {

-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

-

-partial modifier_keys

-xkb_symbols "rwin_switch_lock_cancel" {

-

-  include "level5(lock)"

-

-  key <RWIN> {

-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

-  };

-};

+// these variants assign various XKB keycodes to ISO_Level5_Shift so that
+// the third shift level can be reached
+//
+
+// using the level(switch) map, the right Control key temporarily
+// chooses the fifth shift level (until it is released).
+partial modifier_keys
+xkb_symbols "rctrl_switch" {
+  key <RCTL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch" {
+  key <LSGT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch" {
+  key <RALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
+
+
+// The following modifier keys are used to switch to the third shift and to set a
+// corresponding lock, implemented as NumLock.
+
+partial modifier_keys
+xkb_symbols "lock" {
+  // This adds the definitions needed to create a level5-lock behaviour, using
+  // the real modifier NumLock as a lock indicator.
+  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+  // See also: compat/level5(level5_lock)
+  key.type[Group1] = "ONE_LEVEL";
+
+  replace key <MDSW> {
+    vmods = LevelFive,
+    symbols[Group1] = [ ISO_Level5_Shift ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+  };
+  modifier_map Mod3 { <MDSW> };
+
+  replace key <HYPR> {
+    vmods = NumLock,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=NumLock) ]
+  };
+  modifier_map Mod2 { <HYPR> };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_lock" {
+
+  include "level5(lock)"
+
+  key <LSGT> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "lwin_switch_lock" {
+
+  include "level5(lock)"
+
+  key <LWIN> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_lock" {
+
+  include "level5(lock)"
+
+  key <RALT> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "rwin_switch_lock" {
+
+  include "level5(lock)"
+
+  key <RWIN> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <LSGT> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "lwin_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <LWIN> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <RALT> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "rwin_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <RWIN> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 09c2fb32f..54b61d215 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
@@ -1,101 +1,101 @@
-//

-// 03.01.2003

-// Andreas Tobler <a.tobler@schweiz.ch>

-// modified for Swiss German Apple Extended Keyboard II

-

-partial alphanumeric_keys

-xkb_symbols "extended" {

-    

-    name[Group1]= "Switzerland - German, Mac";

-

-    // Alphanumeric section

-

-    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};

-    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};

-    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};

-					// not displayed here

-    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};

-    key <AE05> { [	5,	percent, 	bracketleft			]	};

-    key <AE06> { [	6,	ampersand, 	bracketright			]	};

-    key <AE07> { [	7,	slash, 	bar,		backslash		]	};

-    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};

-    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};

-    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};

-    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};

-    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};

-    key <AD01> { [	q,	Q, 	oe,		OE			]	};

-    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};

-    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};

-    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};

-    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 

-    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};

-    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};

-    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};

-    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};

-    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};

-    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};

-    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};

-    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};

-    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 

-					// ligature fl

-    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};

-			// partialderivative is not available here att

-    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};

-    key <AC05> { [ 	g,	G, 	at,		comma			]	};

-    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};

-    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};

-    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};

-    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};

-    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};

-    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};

-    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};

-    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};

-    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};

-    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};

-    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  

-    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };

-					// to be fixed att

-    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };

-					// not sure att

-    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};

-    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};

-    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};

-    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};

-			// ligature fi	// per mille

-    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};

-    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};

-    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};

-

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "de" {

-    include "macintosh_vndr/ch(extended)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "fr" {

-

-    // Describes the differences between a very simple US/ASCII

-    // keyboard and a very simple Swiss/French keybaord

-

-    include "macintosh_vndr/ch(extended)"

-    name[Group1]= "Switzerland - French, Mac";

-

-    override key <AD11> {

-	[ egrave,	udiaeresis,  bracketleft	]

-    };

-    override key <AC10> {

-	[ eacute,	odiaeresis	]

-    };

-    override key <AC11> {

-	[ agrave,	adiaeresis,   braceleft		]

-    };

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-    include "macintosh_vndr/ch(fr)" // for consistent naming

-};

+//
+// 03.01.2003
+// Andreas Tobler <a.tobler@schweiz.ch>
+// modified for Swiss German Apple Extended Keyboard II
+
+partial alphanumeric_keys
+xkb_symbols "extended" {
+    
+    name[Group1]= "Switzerland - German, Mac";
+
+    // Alphanumeric section
+
+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
+					// not displayed here
+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
+    key <AE05> { [	5,	percent, 	bracketleft			]	};
+    key <AE06> { [	6,	ampersand, 	bracketright			]	};
+    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
+    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
+    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
+    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
+    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
+    key <AD01> { [	q,	Q, 	oe,		OE			]	};
+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
+    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
+    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
+    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
+    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
+    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
+    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
+					// ligature fl
+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
+			// partialderivative is not available here att
+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
+    key <AC05> { [ 	g,	G, 	at,		comma			]	};
+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
+					// to be fixed att
+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
+					// not sure att
+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
+			// ligature fi	// per mille
+    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de" {
+    include "macintosh_vndr/ch(extended)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fr" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "macintosh_vndr/ch(extended)"
+    name[Group1]= "Switzerland - French, Mac";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis,  bracketleft	]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis,   braceleft		]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/ch(fr)" // for consistent naming
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
index 4c8bebdf4..da5bc7772 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
@@ -1,94 +1,94 @@
-// olh@suse.de   very close to MacOS map

-

-default partial alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple US/ASCII

-    // keyboard and a very simple German keybaord

-

-    include "latin"

-    name[Group1]= "Germany - Mac";

-

-    // Alphanumeric section

-    key <TLDE> {	[ dead_circumflex,	degree,    notsign 		]	};

-    key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};

-    key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};

-    key <AE03> {	[	  3,	section,  threesuperior,sterling	]	};

-    key <AE04> {	[	  4,	dollar,  onequarter,	currency	]	};

-    key <AE05> {	[	  5,	percent,  bracketleft			]	};

-    key <AE06> {	[	  6,	ampersand,  bracketright		]	};

-    key <AE07> {	[	  7,	slash,        bar,    backslash		]	};

-    key <AE08> {	[	  8,	parenleft,  braceleft,    asciitilde	]	};

-    key <AE09> {	[	  9,	parenright, braceright			]	};

-    key <AE10> {	[	  0,	equal,  braceright,	degree		]	};

-    key <AE11> {	[    ssharp,	question,  backslash,	questiondown	]	};

-    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla		]	};

-

-    key <AD01> {	[	  q,	Q, guillemotleft,guillemotright	]	};

-    key <AD03> {	[	  e,	E,   EuroSign			]	};

-    key <AD04> {	[         r,    R,  registered			]	};

-    key <AD05> {	[	  t,	T		]	};

-    key <AD06> {	[	  z,	Z		]	};

-    key <AD07> {	[	  u,	U, diaeresis,    Aacute		]	};

-    key <AD08> {	[	  i,	I,      slash,    Ucircumflex	]	};

-    key <AD09> {	[         o,    O,      oslash,   Ooblique	]	};

-    key <AD11> {	[ udiaeresis,	Udiaeresis,  periodcentered, degree	]	};

-    key <AD12> {	[      plus,	asterisk,  asciitilde			]	}; 

-    key <AC01> {	[         a,    A,      aring,    Aring		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G,  copyright			]	};

-    key <AC06> {	[         h,    H,  ordfeminine			]	};

-    key <AC09> {	[	  l,    L, 	at			]	};

-    key <AC10> {	[ odiaeresis,	Odiaeresis,  dead_acute			]	};

-    key <AC11> {	[ adiaeresis,	Adiaeresis,  dead_circumflex		]	};

-

-    key <LSGT> {	[      less,	greater,        bar			]	};

-    key <AB01> {	[	  y,	Y,  guillemotleft,less		]	};

-    key <AB06> {	[         n,    N, asciitilde			]	};

-    key <AB07> {	[	  m,	M, 	 mu			]	};

-    key <AB08> {	[     comma,	semicolon	]	};

-    key <AB09> {	[    period,	colon,  periodcentered, division	]	};

-    key <AB10> {	[     minus,	underscore	]	};

-    key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};

-

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys 

-xkb_symbols "Sundeadkeys" {

-    // modify the default German layout to use Sun dead keys

-    include "macintosh_vndr/de(basic)"

-    name[Group1]= "Germany - Mac, Sun dead keys";

-

-    key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};

-    key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};

-    key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};

-    key <AD12> {	[      plus,	asterisk,  SunFA_Tilde,	dead_macron	]	};

-    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute			]	};

-    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum			]	};

-

-    key <BKSL> {	[ numbersign,	acute,  SunFA_Grave			]	};

-};

-

-partial alphanumeric_keys 

-xkb_symbols "sundeadkeys" {

-    include "macintosh_vndr/de(Sundeadkeys)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-    // modify the default German layout to not have any dead keys

-    include "macintosh_vndr/de(basic)"

-    name[Group1]= "Germany - Mac, eliminate dead keys";

-

-    key <TLDE> {	[ asciicircum,	degree,    notsign 			]	};

-    key <AE12> {	[ acute,	grave,  cedilla				]	};

-    key <AD11> {	[ udiaeresis,	Udiaeresis,  diaeresis 			]	};

-    key <AD12> {	[      plus,	asterisk,  asciitilde,	macron		]	};

-    key <AC10> {	[ odiaeresis,	Odiaeresis,  acute			]	};

-    key <AC11> {	[ adiaeresis,	Adiaeresis,  asciicircum		]	};

-

-    key <BKSL> {	[ numbersign,	apostrophe,  grave			]	};

-};

+// olh@suse.de   very close to MacOS map
+
+default partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple German keybaord
+
+    include "latin"
+    name[Group1]= "Germany - Mac";
+
+    // Alphanumeric section
+    key <TLDE> {	[ dead_circumflex,	degree,    notsign 		]	};
+    key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};
+    key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};
+    key <AE03> {	[	  3,	section,  threesuperior,sterling	]	};
+    key <AE04> {	[	  4,	dollar,  onequarter,	currency	]	};
+    key <AE05> {	[	  5,	percent,  bracketleft			]	};
+    key <AE06> {	[	  6,	ampersand,  bracketright		]	};
+    key <AE07> {	[	  7,	slash,        bar,    backslash		]	};
+    key <AE08> {	[	  8,	parenleft,  braceleft,    asciitilde	]	};
+    key <AE09> {	[	  9,	parenright, braceright			]	};
+    key <AE10> {	[	  0,	equal,  braceright,	degree		]	};
+    key <AE11> {	[    ssharp,	question,  backslash,	questiondown	]	};
+    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla		]	};
+
+    key <AD01> {	[	  q,	Q, guillemotleft,guillemotright	]	};
+    key <AD03> {	[	  e,	E,   EuroSign			]	};
+    key <AD04> {	[         r,    R,  registered			]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD07> {	[	  u,	U, diaeresis,    Aacute		]	};
+    key <AD08> {	[	  i,	I,      slash,    Ucircumflex	]	};
+    key <AD09> {	[         o,    O,      oslash,   Ooblique	]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis,  periodcentered, degree	]	};
+    key <AD12> {	[      plus,	asterisk,  asciitilde			]	}; 
+    key <AC01> {	[         a,    A,      aring,    Aring		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G,  copyright			]	};
+    key <AC06> {	[         h,    H,  ordfeminine			]	};
+    key <AC09> {	[	  l,    L, 	at			]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  dead_acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  dead_circumflex		]	};
+
+    key <LSGT> {	[      less,	greater,        bar			]	};
+    key <AB01> {	[	  y,	Y,  guillemotleft,less		]	};
+    key <AB06> {	[         n,    N, asciitilde			]	};
+    key <AB07> {	[	  m,	M, 	 mu			]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon,  periodcentered, division	]	};
+    key <AB10> {	[     minus,	underscore	]	};
+    key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    // modify the default German layout to use Sun dead keys
+    include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, Sun dead keys";
+
+    key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};
+    key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};
+    key <AD12> {	[      plus,	asterisk,  SunFA_Tilde,	dead_macron	]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum			]	};
+
+    key <BKSL> {	[ numbersign,	acute,  SunFA_Grave			]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "macintosh_vndr/de(Sundeadkeys)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    // modify the default German layout to not have any dead keys
+    include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, eliminate dead keys";
+
+    key <TLDE> {	[ asciicircum,	degree,    notsign 			]	};
+    key <AE12> {	[ acute,	grave,  cedilla				]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis,  diaeresis 			]	};
+    key <AD12> {	[      plus,	asterisk,  asciitilde,	macron		]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  asciicircum		]	};
+
+    key <BKSL> {	[ numbersign,	apostrophe,  grave			]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
index 177913737..7a865d2bc 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
@@ -1,17 +1,17 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple mac_US

-    // keyboard and a very simple Swedish(Finland) keybaord

-

-    include "macintosh_vndr/se(basic)" // for consistent naming

-    name[Group1]= "Finland - Mac";

-

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-    include "macintosh_vndr/se(basic)"	// for consistent naming

-    name[Group1]= "Finland - Mac, eliminate dead keys";

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Swedish(Finland) keybaord
+
+    include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Finland - Mac";
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/se(basic)"	// for consistent naming
+    name[Group1]= "Finland - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
index 9a8f8de23..c76551d30 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
@@ -1,110 +1,110 @@
-// Marc.Shapiro@inria.fr 19-sep-1998
-// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
-// adapted to the new input layer :
-//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
-//////////////////////////////////////////////////////////////////
-// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : 
-// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE 
-// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign"
-// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. )
-// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L
-// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée
-// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html
-//////////////////////////////////////////////////////////////////
-// This map is an almost-complete mapping of the standard French
-// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
-// as possible to the Mac meaning of each key.	I did this entirely by
-// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
-// Accessory for the Mac meaning of keys, and on reading keysymdef.h
-// to intuit the corresponding X names.	 Lacking proper documentation,
-// I may have made some mistakes.
-
-// Entries marked CHECK are particularly uncertain
-
-// Entries marked MISSING mark Mac characters for which I was unable
-// to find a corresponding keysym.  (Some for sure don't: e.g. the
-// Apple mark and the oe/OE character; others I may have simply not
-// found.)
-
-default
-xkb_symbols "extended" {
-
-    name[Group1]= "France - Mac";
-
-    key <ESC>  {	[ Escape			]	};
-
-    // Alphanumeric section
-    key <TLDE> {	[	   at,	  numbersign,	periodcentered,  	Ydiaeresis	]	};
-    key <ENTR> {        [    KP_Enter                   ]       };
-    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	dead_acute	]	}; // MISSING: Apple
-    key <AE02> {	[      eacute,	  2,		ediaeresis,	  	Eacute	]	};
-    key <AE03> {	[    quotedbl,	  3,		leftdoublequotemark, 	rightdoublequotemark	] 	};
-    key <AE04> {	[  apostrophe,	  4,		leftsinglequotemark, 	rightsinglequotemark	] 	};
-    key <AE05> {	[   parenleft,	  5,		braceleft,	  	bracketleft	]	};
-    key <AE06> {	[     section,	  6,		paragraph,	  	aring		]	};
-    key <AE07> {	[      egrave,	  7,		guillemotleft,	  	guillemotright]	};
-    key <AE08> {	[      exclam,	  8,		exclamdown,	  	Ucircumflex	]	};
-    key <AE09> {	[    ccedilla,	  9,		Ccedilla,	  	Aacute	]	};
-    key <AE10> {	[      agrave,	  0,		oslash,	  		Oslash	]	};
-    key <AE11> {	[  parenright,	  degree,	braceright,	  	bracketright	]	};
-    key <AE12> {	[	minus,	  underscore,	emdash,	  		endash	]	};
-    key <BKSP> {	[   BackSpace,    VoidSymbol,	Delete,	  		VoidSymbol	]	};
-
-    key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[	    a,	A,		ae,			AE		]	};
-    key <AD02> {	[	    z,	Z,		Acircumflex,		Aring		]	};
-    key <AD03> {	[	    e,	E,		ecircumflex,		Ecircumflex	]	};
-    key <AD04> {	[	    r,	R,		registered,		currency	]	};
-    key <AD05> {	[	    t,	T,		dagger,			trademark	]	};
-    key <AD06> {	[	    y,	Y,		Uacute,  		Ydiaeresis	]	};
-    key <AD07> {	[	    u,	U,		masculine,		ordfeminine	]	};
-    key <AD08> {	[	    i,	I,		icircumflex,		idiaeresis	]	};
-    key <AD09> {	[	    o,	O,		oe,			OE		]	};
-    key <AD10> {	[	    p,	P,		Greek_pi,  		Greek_PI	]	};
-    key <AD11> {	[dead_circumflex,dead_diaeresis,ocircumflex, 		Ocircumflex	]	};
-    key <AD12> {	[      dollar,	asterisk,	EuroSign,  		yen   	        ]	};
-    key <CAPS> {	[	Caps_Lock		]	};
-    key <AC01> {	[	  q,	Q,		doubledagger,		Greek_OMEGA	]	};
-    key <AC02> {	[	  s,	S,		Ograve,			Greek_SIGMA	]	};
-    key <AC03> {	[         d,	D,		Greek_delta,		Greek_DELTA	]	};
-    key <AC04> {	[	  f,	F,		VoidSymbol,		periodcentered	]	};
-    key <AC05> {	[	  g,	G,		VoidSymbol,		VoidSymbol	]	}; // MISSING: ligature fi,fl
-    key <AC06> {	[	  h,	H,		Igrave,			Icircumflex	]	};
-    key <AC07> {	[	  j,	J,		Idiaeresis,		Iacute		]	};
-    key <AC08> {	[	  k,	K,		Egrave,			Ediaeresis	]	};
-    key <AC09> {	[	  l,	L,		notsign,		bar		]	};
-    key <AC10> {	[	  m,	M,		mu,			Oacute		]	};
-    key <AC11> {	[    ugrave,	percent,	Ugrave,			0x1002030	]	};
-    key <BKSL> {	[ dead_grave,	sterling,	at,			numbersign	]	};
-    key <RTRN> {	[    Return			]	};
-
-    key <LSGT> {	[	 less,	  greater,	lessthanequal,		greaterthanequal	]	};
-    key <AB01> {	[	  w,	W,		guilsinglleft,		guilsinglright	]	}; // MISSING: half-guillemot (single angle bracket)
-    key <AB02> {	[	  x,	X,		VoidSymbol,		VoidSymbol	]	}; // CHECK: similarequal; MISSING: extra-slanted slash
-    key <AB03> {	[	  c,	C,		copyright,		cent		]	};
-    key <AB04> {	[	  v,	V,		diamond,		radical		]	}; // CHECK diamond
-    key <AB05> {	[	  b,	B,		ssharp,    		integral	]	};
-    key <AB06> {	[	  n,	N,		dead_tilde,		asciitilde	]	};
-    key <AB07> {	[     comma,	question,	infinity,		questiondown	]	};
-    key <AB08> {	[ semicolon,	period,		ellipsis,		periodcentered	]	};
-    key <AB09> {	[     colon,	slash,		division,		backslash	]	};
-    key <AB10> {	[     equal,	plus,		notequal,		plusminus	]	};
-
-    key <SPCE> {	[     space,	space,		nobreakspace,		nobreakspace	]	};
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
-};
-
-
-
-xkb_symbols "nodeadkeys" {
-include "macintosh_vndr/fr(extended)"
-    name[Group1]= "France - Mac, eliminate dead keys";
-    
-    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	acute	]	}; // MISSING: Apple
-    key <AD11> {	[asciicircum,diaeresis,ocircumflex, 		Ocircumflex	]	};
-    key <BKSL> {	[ grave,	sterling,	at,			numbersign	]	};
-
-    key <AB06> {	[	  n,	N,		asciitilde,		dead_tilde	]	};
-};
+// Marc.Shapiro@inria.fr 19-sep-1998

+// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000

+// adapted to the new input layer :

+//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001

+//////////////////////////////////////////////////////////////////

+// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : 

+// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE 

+// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign"

+// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. )

+// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L

+// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée

+// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html

+//////////////////////////////////////////////////////////////////

+// This map is an almost-complete mapping of the standard French

+// MacIntosh keyboard under Xwindows.  I tried to remain as faithful

+// as possible to the Mac meaning of each key.	I did this entirely by

+// hand and by intuition, relying on the Clavier (Keyboard?) Desktop

+// Accessory for the Mac meaning of keys, and on reading keysymdef.h

+// to intuit the corresponding X names.	 Lacking proper documentation,

+// I may have made some mistakes.

+

+// Entries marked CHECK are particularly uncertain

+

+// Entries marked MISSING mark Mac characters for which I was unable

+// to find a corresponding keysym.  (Some for sure don't: e.g. the

+// Apple mark and the oe/OE character; others I may have simply not

+// found.)

+

+default

+xkb_symbols "extended" {

+

+    name[Group1]= "France - Mac";

+

+    key <ESC>  {	[ Escape			]	};

+

+    // Alphanumeric section

+    key <TLDE> {	[	   at,	  numbersign,	periodcentered,  	Ydiaeresis	]	};

+    key <ENTR> {        [    KP_Enter                   ]       };

+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	dead_acute	]	}; // MISSING: Apple

+    key <AE02> {	[      eacute,	  2,		ediaeresis,	  	Eacute	]	};

+    key <AE03> {	[    quotedbl,	  3,		leftdoublequotemark, 	rightdoublequotemark	] 	};

+    key <AE04> {	[  apostrophe,	  4,		leftsinglequotemark, 	rightsinglequotemark	] 	};

+    key <AE05> {	[   parenleft,	  5,		braceleft,	  	bracketleft	]	};

+    key <AE06> {	[     section,	  6,		paragraph,	  	aring		]	};

+    key <AE07> {	[      egrave,	  7,		guillemotleft,	  	guillemotright]	};

+    key <AE08> {	[      exclam,	  8,		exclamdown,	  	Ucircumflex	]	};

+    key <AE09> {	[    ccedilla,	  9,		Ccedilla,	  	Aacute	]	};

+    key <AE10> {	[      agrave,	  0,		oslash,	  		Oslash	]	};

+    key <AE11> {	[  parenright,	  degree,	braceright,	  	bracketright	]	};

+    key <AE12> {	[	minus,	  underscore,	emdash,	  		endash	]	};

+    key <BKSP> {	[   BackSpace,    VoidSymbol,	Delete,	  		VoidSymbol	]	};

+

+    key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};

+    key <AD01> {	[	    a,	A,		ae,			AE		]	};

+    key <AD02> {	[	    z,	Z,		Acircumflex,		Aring		]	};

+    key <AD03> {	[	    e,	E,		ecircumflex,		Ecircumflex	]	};

+    key <AD04> {	[	    r,	R,		registered,		currency	]	};

+    key <AD05> {	[	    t,	T,		dagger,			trademark	]	};

+    key <AD06> {	[	    y,	Y,		Uacute,  		Ydiaeresis	]	};

+    key <AD07> {	[	    u,	U,		masculine,		ordfeminine	]	};

+    key <AD08> {	[	    i,	I,		icircumflex,		idiaeresis	]	};

+    key <AD09> {	[	    o,	O,		oe,			OE		]	};

+    key <AD10> {	[	    p,	P,		Greek_pi,  		Greek_PI	]	};

+    key <AD11> {	[dead_circumflex,dead_diaeresis,ocircumflex, 		Ocircumflex	]	};

+    key <AD12> {	[      dollar,	asterisk,	EuroSign,  		yen   	        ]	};

+    key <CAPS> {	[	Caps_Lock		]	};

+    key <AC01> {	[	  q,	Q,		doubledagger,		Greek_OMEGA	]	};

+    key <AC02> {	[	  s,	S,		Ograve,			Greek_SIGMA	]	};

+    key <AC03> {	[         d,	D,		Greek_delta,		Greek_DELTA	]	};

+    key <AC04> {	[	  f,	F,		VoidSymbol,		periodcentered	]	};

+    key <AC05> {	[	  g,	G,		VoidSymbol,		VoidSymbol	]	}; // MISSING: ligature fi,fl

+    key <AC06> {	[	  h,	H,		Igrave,			Icircumflex	]	};

+    key <AC07> {	[	  j,	J,		Idiaeresis,		Iacute		]	};

+    key <AC08> {	[	  k,	K,		Egrave,			Ediaeresis	]	};

+    key <AC09> {	[	  l,	L,		notsign,		bar		]	};

+    key <AC10> {	[	  m,	M,		mu,			Oacute		]	};

+    key <AC11> {	[    ugrave,	percent,	Ugrave,			0x1002030	]	};

+    key <BKSL> {	[ dead_grave,	sterling,	at,			numbersign	]	};

+    key <RTRN> {	[    Return			]	};

+

+    key <LSGT> {	[	 less,	  greater,	lessthanequal,		greaterthanequal	]	};

+    key <AB01> {	[	  w,	W,		guilsinglleft,		guilsinglright	]	}; // MISSING: half-guillemot (single angle bracket)

+    key <AB02> {	[	  x,	X,		VoidSymbol,		VoidSymbol	]	}; // CHECK: similarequal; MISSING: extra-slanted slash

+    key <AB03> {	[	  c,	C,		copyright,		cent		]	};

+    key <AB04> {	[	  v,	V,		diamond,		radical		]	}; // CHECK diamond

+    key <AB05> {	[	  b,	B,		ssharp,    		integral	]	};

+    key <AB06> {	[	  n,	N,		dead_tilde,		asciitilde	]	};

+    key <AB07> {	[     comma,	question,	infinity,		questiondown	]	};

+    key <AB08> {	[ semicolon,	period,		ellipsis,		periodcentered	]	};

+    key <AB09> {	[     colon,	slash,		division,		backslash	]	};

+    key <AB10> {	[     equal,	plus,		notequal,		plusminus	]	};

+

+    key <SPCE> {	[     space,	space,		nobreakspace,		nobreakspace	]	};

+    // End alphanumeric section

+

+    include "level3(ralt_switch)"

+};

+

+

+

+xkb_symbols "nodeadkeys" {

+include "macintosh_vndr/fr(extended)"

+    name[Group1]= "France - Mac, eliminate dead keys";

+    

+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	acute	]	}; // MISSING: Apple

+    key <AD11> {	[asciicircum,diaeresis,ocircumflex, 		Ocircumflex	]	};

+    key <BKSL> {	[ grave,	sterling,	at,			numbersign	]	};

+

+    key <AB06> {	[	  n,	N,		asciitilde,		dead_tilde	]	};

+};

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
index 5343673c1..a6bc48e8c 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
@@ -1,17 +1,17 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple en_US

-    // keyboard and a very simple U.K. keyboard layout

-

-    include "latin"

-

-    name[Group1]= "United Kingdom - Mac";

-

-    key <AE02> {	[               2,              at,         EuroSign	]	};

-    key <AE03> {	[               3,        sterling,       numbersign	]	};

-

-    // End alphanumeric section

-    

-    include "level3(ralt_switch)"

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple U.K. keyboard layout
+
+    include "latin"
+
+    name[Group1]= "United Kingdom - Mac";
+
+    key <AE02> {	[               2,              at,         EuroSign	]	};
+    key <AE03> {	[               3,        sterling,       numbersign	]	};
+
+    // End alphanumeric section
+    
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
index d16d92f61..b9870ffe8 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
@@ -1,127 +1,127 @@
-//

-// This file describes the differences between a Macintosh US Extended

-// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X

-//

-// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>

-//

-// Permission to use, copy, modify, distribute, and sell this software and its

-// documentation for any purpose is hereby granted without fee, provided that

-// the above copyright notice appear in all copies and that both that

-// copyright notice and this permission notice appear in supporting

-// documentation.

-//

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-// IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-// OTHER DEALINGS IN THE SOFTWARE.

-//

-// Except as contained in this notice, the name of a copyright holder shall

-// not be used in advertising or otherwise to promote the sale, use or

-// other dealings in this Software without prior written authorization of

-// the copyright holder.

-//

-// = HISTORY

-// * 2004-09-28:

-//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened

-//   TextEdit.app and wrote down what the value produced by each key was when I

-//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the

-//   keymap from that information

-//

-// * 2006-01-14:

-//   Revised the comments in the file

-//

-// = NOTES

-// * 20 characters in this keymap have no named character defined in

-//   include/keysymdef.h and as a result their Unicode code points in

-//   hexadecimal are listed here, these can be generated with the following

-//   perl command:

-//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ

-//   and converted back like:

-//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6

-// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X

-//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it

-//   has no assigned code point in Unicode, the code point Apple uses for it is

-//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)

-// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it

-//   should work on other Apple laptop models which use the same keyboard

-//   layout. It will probably work on standard sized keyboards with little or

-//   no modification but it might not support them fully, please report if

-//   you're able to get it running with such a keyboard

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-    name[Group1]= "Iceland - Mac";

-

-	//-- Row 5 (E) --//

-	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};

-	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};

-	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};

-	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};

-	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};

-	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};

-	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};

-	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};

-	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};

-	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};

-	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};

-	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};

-	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};

-

-	

-	//-- Row 4 (D) --//

-	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};

-	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};

-	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};

-	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};

-	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};

-	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};

-	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};

-	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};

-	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};

-	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};

-	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};

-	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};

-	

-	

-	//-- Row 3 (C) --//

-	key <AC01> {	[	a,		A, 	aring,		Aring		]	};

-	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};

-	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};

-	key <AC04> {	[	f,		F, 	U192,		macron		]	};

-	key <AC05> {	[	g,		G, 	copyright,	breve		]	};

-	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};

-	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};

-	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};

-	key <AC09> {	[	l,		L, 	U2026,		caron		]	};

-	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};

-	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};

-	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};

-	

-	

-	//-- Row 2  (B) --//

-	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};

-	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};

-	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};

-	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};

-	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};

-	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};

-	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};

-	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};

-	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};

-	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};

-	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-    include	"macintosh_vndr/is(basic)" // for consistent naming

-    name[Group1]= "Iceland - Mac, eliminate dead keys";

-};

+//
+// This file describes the differences between a Macintosh US Extended
+// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X
+//
+// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+//
+// Permission to use, copy, modify, distribute, and sell this software and its
+// documentation for any purpose is hereby granted without fee, provided that
+// the above copyright notice appear in all copies and that both that
+// copyright notice and this permission notice appear in supporting
+// documentation.
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder shall
+// not be used in advertising or otherwise to promote the sale, use or
+// other dealings in this Software without prior written authorization of
+// the copyright holder.
+//
+// = HISTORY
+// * 2004-09-28:
+//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
+//   TextEdit.app and wrote down what the value produced by each key was when I
+//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
+//   keymap from that information
+//
+// * 2006-01-14:
+//   Revised the comments in the file
+//
+// = NOTES
+// * 20 characters in this keymap have no named character defined in
+//   include/keysymdef.h and as a result their Unicode code points in
+//   hexadecimal are listed here, these can be generated with the following
+//   perl command:
+//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
+//   and converted back like:
+//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
+// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
+//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
+//   has no assigned code point in Unicode, the code point Apple uses for it is
+//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
+// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
+//   should work on other Apple laptop models which use the same keyboard
+//   layout. It will probably work on standard sized keyboards with little or
+//   no modification but it might not support them fully, please report if
+//   you're able to get it running with such a keyboard
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Iceland - Mac";
+
+	//-- Row 5 (E) --//
+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
+	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
+	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
+	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
+	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
+	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
+	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
+	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
+	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
+	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
+	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
+	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
+
+	
+	//-- Row 4 (D) --//
+	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
+	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
+	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
+	
+	
+	//-- Row 3 (C) --//
+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
+	key <AC04> {	[	f,		F, 	U192,		macron		]	};
+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
+	
+	
+	//-- Row 2  (B) --//
+	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
+	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
+	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include	"macintosh_vndr/is(basic)" // for consistent naming
+    name[Group1]= "Iceland - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
index 889653f8e..2438231cd 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
@@ -1,62 +1,62 @@
-xkb_symbols "extended" {

-

-    name[Group1]= "Italy - Mac";

-

-    // Alphanumeric section

-    key <LSGT> {	[        less,  greater   	]	};

-    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};

-    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};

-    key <AE02> {	[    quotedbl,    2 		]	};

-    key <AE03> {	[  apostrophe,    3         	]	};

-    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};

-    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};

-    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};

-    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};

-    key <AE08> {	[    sterling,    8,   infinity			]	};

-    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};

-    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};

-    key <AE11> {	[       minus,    underscore	]	};

-    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};

-

-    key <AD01> {	[           q,  Q 		]	};

-    key <AD02> {	[	    z,  Z		]	};

-    key <AD03> {	[	    e,  E,     EuroSign		]	};

-    key <AD04> {	[	    r,  R,   registered			] 	};

-    key <AD05> {	[	    t,  T		]	};

-    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};

-    key <AD07> {	[	    u,  U		]	};

-    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};

-    key <AD09> {	[	    o,  O		]	};

-    key <AD10> {	[	    p,  P		]	};

-    key <AD11> {	[      igrave,  asciicircum     ]	};

-    key <AD12> {	[      dollar,	asterisk        ]	};

-    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};

-

-    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};

-    key <AC02> {	[	  s,	S,     ssharp			]	};

-    key <AC03> {	[	  d,	D		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G		]	};

-    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};

-    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};

-    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};

-    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};

-    key <AC10> {	[         m,	M,         mu,    Oacute		]	};

-    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};

-

-    key <AB01> {	[	  w,	W 		]	};

-    key <AB02> {	[	  x,	X		]	};

-    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};

-    key <AB04> {	[	  v,	V		]	};

-    key <AB05> {	[	  b,	B		]	};

-    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };

-    key <AB07> {	[     comma,	question,          questiondown		]	};

-    key <AB08> {	[ semicolon,	period          ]	};

-    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};

-    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};

-

-    // End alphanumeric section

-

-    include "kpdl(dot)"

-    include "level3(ralt_switch)"

-};

+xkb_symbols "extended" {
+
+    name[Group1]= "Italy - Mac";
+
+    // Alphanumeric section
+    key <LSGT> {	[        less,  greater   	]	};
+    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
+    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
+    key <AE02> {	[    quotedbl,    2 		]	};
+    key <AE03> {	[  apostrophe,    3         	]	};
+    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
+    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
+    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
+    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
+    key <AE08> {	[    sterling,    8,   infinity			]	};
+    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
+    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
+    key <AE11> {	[       minus,    underscore	]	};
+    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
+
+    key <AD01> {	[           q,  Q 		]	};
+    key <AD02> {	[	    z,  Z		]	};
+    key <AD03> {	[	    e,  E,     EuroSign		]	};
+    key <AD04> {	[	    r,  R,   registered			] 	};
+    key <AD05> {	[	    t,  T		]	};
+    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
+    key <AD07> {	[	    u,  U		]	};
+    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
+    key <AD09> {	[	    o,  O		]	};
+    key <AD10> {	[	    p,  P		]	};
+    key <AD11> {	[      igrave,  asciicircum     ]	};
+    key <AD12> {	[      dollar,	asterisk        ]	};
+    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
+
+    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
+    key <AC02> {	[	  s,	S,     ssharp			]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
+    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
+    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
+    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
+    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
+    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
+
+    key <AB01> {	[	  w,	W 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
+    key <AB07> {	[     comma,	question,          questiondown		]	};
+    key <AB08> {	[ semicolon,	period          ]	};
+    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
+    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
+
+    // End alphanumeric section
+
+    include "kpdl(dot)"
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
index a588ab27c..dcb9db624 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
@@ -1,37 +1,37 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple mac_US

-    // keyboard and a very simple Spanish keybaord

-

-    include "latin"

-    name[Group1]= "Latin American - Mac";

-

-    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};

-    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};

-    key <AE01> {	[               1,      exclamdown 	]	};

-    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};

-    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};

-    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};

-    key <AE05> {	[               5,         percent	]	};

-    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};

-    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};

-    key <AE08> {	[               8,        asterisk,           degree	]	};

-    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};

-    key <AE10> {	[               0,      parenright     	]	};

-    key <AE11> {	[           minus,      underscore	]	};

-    key <AE12> {	[           equal,            plus,        plusminus	]	};

-    key <AD11> {	[      dead_grave,          degree 	]	};

-    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};

-

-    key <AB08> {	[           comma,    questiondown   	]	};

-    key <AB09> {	[          period,        question     	]	};

-    key <AB10> {	[        ccedilla,        Ccedilla     	]	};

-    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};

-    key <AC11> {	[       semicolon,    	     colon 	]	};

-    key <BKSL> {	[      apostrophe,        quotedbl	]	};

-

-    // End alphanumeric section

-

-    include "level3(ralt_switch)"

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    include "latin"
+    name[Group1]= "Latin American - Mac";
+
+    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+    key <AE01> {	[               1,      exclamdown 	]	};
+    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+    key <AE05> {	[               5,         percent	]	};
+    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+    key <AE08> {	[               8,        asterisk,           degree	]	};
+    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+    key <AE10> {	[               0,      parenright     	]	};
+    key <AE11> {	[           minus,      underscore	]	};
+    key <AE12> {	[           equal,            plus,        plusminus	]	};
+    key <AD11> {	[      dead_grave,          degree 	]	};
+    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+
+    key <AB08> {	[           comma,    questiondown   	]	};
+    key <AB09> {	[          period,        question     	]	};
+    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+    key <AC11> {	[       semicolon,    	     colon 	]	};
+    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
index 05034701e..5eb66c444 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
@@ -1,15 +1,15 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple mac_US

-    // keyboard and a very simple netherland keybaord

-

-    include "latin"

-

-    name[Group1]= "Netherlands - Mac";

-

-    include "level3(ralt_switch)"

-

-// do just nothing

-

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    include "latin"
+
+    name[Group1]= "Netherlands - Mac";
+
+    include "level3(ralt_switch)"
+
+// do just nothing
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
index 442aee9af..fb0cb74a2 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
@@ -1,50 +1,50 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple en_US

-    // keyboard and a very simple Norwegian keybaord

-

-    include "latin"

-

-    name[Group1]= "Norway - Mac";

-

-    key <TLDE> {	[             bar,         section      ]	};

-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};

-    key <AE04> {	[	        4,        currency, 	   dollar,	    dollar	]	};

-    key <AE03> {	[               3,	numbersign,         sterling,        sterling	]	};

-    key <AE06> {	[               6,       ampersand     	]	};

-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]  	};

-    key <AE08> {	[               8,       parenleft,      bracketleft,	 braceleft	]	};

-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};

-    key <AE10> {	[               0,           equal     	]	};

-

-    key <AB08> {	[           comma,       semicolon     	]	};

-    key <AB09> {	[          period,           colon     	]	};

-    key <AB10> {	[           minus,      underscore     	]	};

-    key	<AC10> {	[	   oslash,        Ooblique,       odiaeresis,     Odiaeresis	]	};

-    key <AE11> {	[            plus,        question      ]	};

-    key <AC11> {	[              ae,              AE 	]	};

-    key <AD11> {	[	    aring,           Aring     	]	};

-    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};

-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};

-    key <BKSL> {	[              at,        asterisk	]	};

-    key <LSGT> {	[            less,         greater	]	};

-

-    // End alphanumeric section

-

-    include "eurosign(e)"

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-

-    // Modifies the basic Norwegian layout to eliminate dead keys

-    include "macintosh_vndr/no(basic)"

-    name[Group1]= "Norway - Mac, eliminate dead keys";

-

-    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};

-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};

-

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Norwegian keybaord
+
+    include "latin"
+
+    name[Group1]= "Norway - Mac";
+
+    key <TLDE> {	[             bar,         section      ]	};
+    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
+    key <AE04> {	[	        4,        currency, 	   dollar,	    dollar	]	};
+    key <AE03> {	[               3,	numbersign,         sterling,        sterling	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash, 	      bar,       backslash	]  	};
+    key <AE08> {	[               8,       parenleft,      bracketleft,	 braceleft	]	};
+    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
+    key <AE10> {	[               0,           equal     	]	};
+
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+    key	<AC10> {	[	   oslash,        Ooblique,       odiaeresis,     Odiaeresis	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AC11> {	[              ae,              AE 	]	};
+    key <AD11> {	[	    aring,           Aring     	]	};
+    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+    key <BKSL> {	[              at,        asterisk	]	};
+    key <LSGT> {	[            less,         greater	]	};
+
+    // End alphanumeric section
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+    include "macintosh_vndr/no(basic)"
+    name[Group1]= "Norway - Mac, eliminate dead keys";
+
+    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
index 8c3b7173c..01ac86d85 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
@@ -1,61 +1,61 @@
-// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple en_US

-    // keyboard and a very simple Portuguese keybaord

-

-    include "latin"

-

-    name[Group1]= "Portugal - Mac";

-

-    key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};

-    key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};

-    key <AE04> {	[               4,	    dollar,          section,          dollar	]	};

-    key <AE03> {	[               3,	numbersign,         sterling,        sterling     	]	};

-    key <AE06> {	[               6,       ampersand     	]	};

-    key <AE07> {	[               7,           slash     	]	};

-    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft     	]	};

-    key <AE09> {	[               9,      parenright,     bracketright,      braceright     	]	};

-    key <AE10> {	[               0,           equal      ]	};

-    key <AE11> {	[      apostrophe,        question      ]	};

-    key <AE12> {	[	     plus,        asterisk,             dead_diaeresis             ]	};

-    key <AB08> {	[           comma,       semicolon     	]	};

-    key <AB09> {	[          period,           colon      ]	};

-    key <AB10> {	[           minus,      underscore      ]	};

-    key <AC10> {	[        ccedilla,        Ccedilla      ]	};

-    key <AC11> {	[      dead_tilde, dead_circumflex	]	};

-    key <AC12> {	[       backslash,	       bar     	]	};

-    key <AD11> {	[       masculine,     ordfeminine      ]	};

-    key <AD12> {	[      dead_acute,      dead_grave 	]	};

-    // End alphanumeric section

-

-    include "eurosign(e)"

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "Sundeadkeys" {

-    include "macintosh_vndr/pt(basic)" // for consistent naming

-    name[Group1]= "Portugal - Mac, Sun dead keys";

-    

-    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};

-    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};

-    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};

-};

-

-partial alphanumeric_keys 

-xkb_symbols "sundeadkeys" {

-    include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming

-};

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-    include "macintosh_vndr/pt(basic)" // for consistent naming

-    name[Group1]= "Portugal - Mac, eliminate dead keys";

-

-    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};

-    key <AC11> {	[      asciitilde,     asciicircum	]	};

-    key <AD12> {	[	    acute,           grave 	]	};

-};

+// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Portuguese keybaord
+
+    include "latin"
+
+    name[Group1]= "Portugal - Mac";
+
+    key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
+    key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};
+    key <AE04> {	[               4,	    dollar,          section,          dollar	]	};
+    key <AE03> {	[               3,	numbersign,         sterling,        sterling     	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	]	};
+    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft     	]	};
+    key <AE09> {	[               9,      parenright,     bracketright,      braceright     	]	};
+    key <AE10> {	[               0,           equal      ]	};
+    key <AE11> {	[      apostrophe,        question      ]	};
+    key <AE12> {	[	     plus,        asterisk,             dead_diaeresis             ]	};
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AB09> {	[          period,           colon      ]	};
+    key <AB10> {	[           minus,      underscore      ]	};
+    key <AC10> {	[        ccedilla,        Ccedilla      ]	};
+    key <AC11> {	[      dead_tilde, dead_circumflex	]	};
+    key <AC12> {	[       backslash,	       bar     	]	};
+    key <AD11> {	[       masculine,     ordfeminine      ]	};
+    key <AD12> {	[      dead_acute,      dead_grave 	]	};
+    // End alphanumeric section
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, Sun dead keys";
+    
+    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
+    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
+    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, eliminate dead keys";
+
+    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
+    key <AC11> {	[      asciitilde,     asciicircum	]	};
+    key <AD12> {	[	    acute,           grave 	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
index 56d77bd0f..d2d05f248 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
@@ -1,44 +1,44 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple en_US

-    // keyboard and a very simple Swedish(Sweden) keybaord

-

-    include "latin"

-

-    name[Group1]= "Sweden - Mac";

-

-    key <TLDE> {	[         section,         degree	]	};

-

-    key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};

-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};

-    key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};

-    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};

-    key <AE06> {	[               6,       ampersand     	]	};

-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};

-    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};

-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};

-    key <AB08> {	[           comma,       semicolon     	]	};

-    key <AE10> {	[               0,           equal     	]	};

-    key <AB09> {	[          period,           colon     	]	};

-    key <AB10> {	[           minus,      underscore     	]	};

-    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};

-    key <AE11> {	[            plus,        question      ]	};

-    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};

-    key <AD11> {	[	    aring,           Aring     	]	};

-    key <AE12> {	[           acute,           grave	]	};

-    key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};

-    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};

-    key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };

-

-    include "kpdl(comma)"

-    include "eurosign(e)"

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-    include "macintosh_vndr/se(basic)" // for consistent naming

-    name[Group1]= "Sweden - Mac, eliminate dead keys";

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Swedish(Sweden) keybaord
+
+    include "latin"
+
+    name[Group1]= "Sweden - Mac";
+
+    key <TLDE> {	[         section,         degree	]	};
+
+    key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
+    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};
+    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};
+    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};
+    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AE10> {	[               0,           equal     	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};
+    key <AD11> {	[	    aring,           Aring     	]	};
+    key <AE12> {	[           acute,           grave	]	};
+    key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
+    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
+    key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
+
+    include "kpdl(comma)"
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Sweden - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao
index b62994b2c..ce1b2ea3c 100644
--- a/xorg-server/xkeyboard-config/symbols/mao
+++ b/xorg-server/xkeyboard-config/symbols/mao
@@ -1,21 +1,21 @@
-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    // Adds the macrons needed for the Maori language to

-    // a simple us keyboard layout.

-

-    include "latin"

-

-    name[Group1]="Maori";

-

-    key <AC01>  { [ a,   A,  amacron, Amacron ] };

-    key <AD03>  { [ e,   E,  emacron, Emacron ] };

-    key <AD08>  { [ i,   I,  imacron, Imacron ] };

-

-    key <AD09>  { [ o,   O,  omacron, Omacron ] };

-    key <AD07>  { [ u,   U,  umacron, Umacron ] };

-

-    key <RALT>  { type[Group1]="TWO_LEVEL",

-                  [ ISO_Level3_Shift, Multi_key ]   };

-    modifier_map Mod5   { <RALT> };

-};

+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Adds the macrons needed for the Maori language to
+    // a simple us keyboard layout.
+
+    include "latin"
+
+    name[Group1]="Maori";
+
+    key <AC01>  { [ a,   A,  amacron, Amacron ] };
+    key <AD03>  { [ e,   E,  emacron, Emacron ] };
+    key <AD08>  { [ i,   I,  imacron, Imacron ] };
+
+    key <AD09>  { [ o,   O,  omacron, Omacron ] };
+    key <AD07>  { [ u,   U,  umacron, Umacron ] };
+
+    key <RALT>  { type[Group1]="TWO_LEVEL",
+                  [ ISO_Level3_Shift, Multi_key ]   };
+    modifier_map Mod5   { <RALT> };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
index ff070065a..ac1de6ec9 100644
--- a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/nec_vndr
-
-dist_symbols_DATA = \
-jp
+symbolsdir = $(xkb_base)/symbols/nec_vndr

+

+dist_symbols_DATA = \

+jp

diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
index 10477a43c..29b279c9f 100644
--- a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
@@ -1,163 +1,163 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// symbols for a NEC PC98 keyboard

-default xkb_symbols "pc98" {

-

-    key <ESC>  { [ Escape		]	};

-

-    // Alphanumeric section

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

-    key <AE10> { [ 0 			], [ kana_WA, kana_WO	]	};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	quoteleft ], [ kana_HE		]	};

-    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};

-    key <BKSP> { [ BackSpace		]	};

-

-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U			], [ kana_NA		]	};

-    key <AD08> { [ i, I			], [ kana_NI		]	};

-    key <AD09> { [ o, O			], [ kana_RA		]	};

-    key <AD10> { [ p, P			], [ kana_SE		]	};

-    key <AD11> { [ at, asciitilde	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-    key <RTRN> { [ Return		]	};

-

-    key <LCTL> { [ Control_L		]	};

-    key <CAPS> { [ Caps_Lock		]	};

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J			], [ kana_MA		]	};

-    key <AC08> { [ k, K			], [ kana_NO		]	};

-    key <AC09> { [ l, L			], [ kana_RI		]	};

-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <LFSH> { [ Shift_L		]	};

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		]	};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};

-    key <AB11> { [ NoSymbol, underscore	], [ kana_RO		]	};

-//    key <RTSH> { [ Shift_R		]	};

-

-    key <ALGR> { [ Mode_switch		]	};

-    key <LALT> { [ Alt_L		]	};

-    key <NFER> { [ Muhenkan		]	};

-    key <SPCE> { [ space		]	};

-    key <XFER> { [ Henkan, Kanji	]	};

-

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <BRK>  { [ Break		]	};

-    key <PRSC> { [ Print		]	};

-    key <FK01> { [ F1			]	};

-    key <FK02> { [ F2			]	};

-    key <FK03> { [ F3			]	};

-    key <FK04> { [ F4			]	};

-    key <FK05> { [ F5			]	};

-    key <FK06> { [ F6			]	};

-    key <FK07> { [ F7			]	};

-    key <FK08> { [ F8			]	};

-    key <FK09> { [ F9			]	};

-    key <FK10> { [ F10			]	};

-    key <FK11> { [ F11			]	};

-    key <FK12> { [ F12			]	};

-    key <FK13> { [ F13			]	};

-    key <FK14> { [ F14			]	};

-    key <FK15> { [ F15			]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <INS>  { [ Insert		]	};

-    key <DELE> { [ Delete		]	};

-    key <PGUP> { [ Prior		]	};

-    key <PGDN> { [ Next			]	};

-    key <UP>   { [ Up			]	};

-    key <LEFT> { [ Left			]	};

-    key <RGHT> { [ Right		]	};

-    key <DOWN> { [ Down			]	};

-    // End "Editing" section

-

-    // Begin "Keypad" section

-    key <HOME> { [ Clear, Home		]	 };

-    key <HELP> { [ Help			]	};

-    key <KPSU> { [ KP_Subtract		]	};

-    key <KPDV> { [ KP_Divide		]	};

-

-    key  <KP7> { [ KP_7			]	};

-    key  <KP8> { [ KP_8			]	};

-    key  <KP9> { [ KP_9			]	};

-    key <KPMU> { [ KP_Multiply		]	};

-

-    key  <KP4> { [ KP_4			]	};

-    key  <KP5> { [ KP_5			]	};

-    key  <KP6> { [ KP_6			]	};

-    key <KPAD> { [ KP_Add		]	};

-

-    key  <KP1> { [ KP_1			]	};

-    key  <KP2> { [ KP_2			]	};

-    key  <KP3> { [ KP_3			]	};

-    key <KPEQ> { [ KP_Equal 		]	};

-

-    key  <KP0> { [ KP_0			]	};

-    key <KPSP> { [ KP_Separator		]	};

-    key <KPDC> { [ KP_Decimal		]	};

-//    key <KPEN> { [ KP_Enter		]	}; 

-    // End "Keypad" section

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_L };

-    modifier_map Lock   { Caps_Lock };

-    modifier_map Control{ Control_L };

-    modifier_map Mod1   { Alt_L };

-    modifier_map Mod2   { Mode_switch };

-};

+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// symbols for a NEC PC98 keyboard
+default xkb_symbols "pc98" {
+
+    key <ESC>  { [ Escape		]	};
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0 			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	quoteleft ], [ kana_HE		]	};
+    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, asciitilde	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <LCTL> { [ Control_L		]	};
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};
+    key <AB11> { [ NoSymbol, underscore	], [ kana_RO		]	};
+//    key <RTSH> { [ Shift_R		]	};
+
+    key <ALGR> { [ Mode_switch		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <NFER> { [ Muhenkan		]	};
+    key <SPCE> { [ space		]	};
+    key <XFER> { [ Henkan, Kanji	]	};
+
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break		]	};
+    key <PRSC> { [ Print		]	};
+    key <FK01> { [ F1			]	};
+    key <FK02> { [ F2			]	};
+    key <FK03> { [ F3			]	};
+    key <FK04> { [ F4			]	};
+    key <FK05> { [ F5			]	};
+    key <FK06> { [ F6			]	};
+    key <FK07> { [ F7			]	};
+    key <FK08> { [ F8			]	};
+    key <FK09> { [ F9			]	};
+    key <FK10> { [ F10			]	};
+    key <FK11> { [ F11			]	};
+    key <FK12> { [ F12			]	};
+    key <FK13> { [ F13			]	};
+    key <FK14> { [ F14			]	};
+    key <FK15> { [ F15			]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <INS>  { [ Insert		]	};
+    key <DELE> { [ Delete		]	};
+    key <PGUP> { [ Prior		]	};
+    key <PGDN> { [ Next			]	};
+    key <UP>   { [ Up			]	};
+    key <LEFT> { [ Left			]	};
+    key <RGHT> { [ Right		]	};
+    key <DOWN> { [ Down			]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <HOME> { [ Clear, Home		]	 };
+    key <HELP> { [ Help			]	};
+    key <KPSU> { [ KP_Subtract		]	};
+    key <KPDV> { [ KP_Divide		]	};
+
+    key  <KP7> { [ KP_7			]	};
+    key  <KP8> { [ KP_8			]	};
+    key  <KP9> { [ KP_9			]	};
+    key <KPMU> { [ KP_Multiply		]	};
+
+    key  <KP4> { [ KP_4			]	};
+    key  <KP5> { [ KP_5			]	};
+    key  <KP6> { [ KP_6			]	};
+    key <KPAD> { [ KP_Add		]	};
+
+    key  <KP1> { [ KP_1			]	};
+    key  <KP2> { [ KP_2			]	};
+    key  <KP3> { [ KP_3			]	};
+    key <KPEQ> { [ KP_Equal 		]	};
+
+    key  <KP0> { [ KP_0			]	};
+    key <KPSP> { [ KP_Separator		]	};
+    key <KPDC> { [ KP_Decimal		]	};
+//    key <KPEN> { [ KP_Enter		]	}; 
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod2   { Mode_switch };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
index 71200ec4d..63dc5db6e 100644
--- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
@@ -1,6 +1,6 @@
-symbolsdir = $(xkb_base)/symbols/nokia_vndr
-
-dist_symbols_DATA = \
-rx-44 \
-rx-51 \
-su-8w
+symbolsdir = $(xkb_base)/symbols/nokia_vndr

+

+dist_symbols_DATA = \

+rx-44 \

+rx-51 \

+su-8w

diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
index 515b69eef..7d91d6db3 100644
--- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
@@ -1,303 +1,303 @@
-partial alphanumeric_keys
-xkb_symbols "us" {
-    name[Group1] = "U.S. English";
-    
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		backslash,	backslash	]	};
-    key <AC06>	{	[	h,		H,		slash,		slash		]	};
-    key <AC07>	{	[	j,		J,		parenleft,	parenleft	]	};
-    key <AC08>	{	[	k,		K,		parenright,	parenright	]	};
-    key <AC09>	{	[	l,		L,		asterisk,	asterisk	]	};
-    key <AC11>  {       [       apostrophe,     question,       question,	question	]	};
-
-    key <AB01>	{	[	z,		Z,		yen,		yen		]	};
-    key <AB02>	{	[	x,		X,		asciicircum,	asciicircum	]	};
-    key <AB03>	{	[	c,		C,		asciitilde,	asciitilde	]	};
-    key <AB04>	{	[	v,		V,		percent,	percent		]	};
-    key <AB05>	{	[	b,		B,		ampersand,	ampersand	]	};
-    key <AB06>	{	[	n,		N,		dollar,		dollar		]	};
-    key <AB07>	{	[	m,		M,		EuroSign,	EuroSign	]	};
-    key <AC10>  {       [       semicolon,      colon,          sterling,	sterling	]	};
-    key <AE11>  {       [       minus,          underscore,     underscore,	underscore	]	};
-    key <AE12>  {       [       plus,           equal,          equal,		equal		]	};
-
-    key <AB08>  {       [       comma,          less,           comma,		less		]	};
-    key <AB09>  {       [       period,         greater,        period,		greater		]	};
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "fisenoda" {
-    name[Group1] = "Finnish/Swedish/Norwegian/Danish";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash		]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {       [       aring,          Aring,          question,	question	]	};
-
-    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
-    key <AB03>	{	[	c,		C,		percent,	percent		]	};
-    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
-    key <AB05>	{	[	b,		B,		plus,		plus		]	};
-    key <AB06>	{	[	n,		N,		less,		less		]	};
-    key <AB07>	{	[	m,		M,		greater,	greater		]	};
-    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };
-    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };
-    key <AE12>  {       [       minus,          underscore,     underscore,	underscore	]       };
-
-    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
-    key <AB09>  {       [       period,         colon,          period,		colon		]       };
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "ptes" {
-    name[Group1] = "Portuguese/Spanish";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash		]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {       [       dead_acute,     dead_grave,     dead_diaeresis,	dead_diaeresis	]	};
-
-    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		percent,	percent 	]	};
-    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
-    key <AB04>	{	[	v,		V,		exclamdown,	exclamdown	]	};
-    key <AB05>	{	[	b,		B,		apostrophe,	apostrophe	]	};
-    key <AB06>	{	[	n,		N,		plus,		plus		]	};
-    key <AB07>	{	[	m,		M,		equal,		equal		]	};
-    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};
-    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};
-    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};
-
-    key <AB08>  {       [	comma,		semicolon,	minus,		minus		]	};
-    key <AB09>  {       [	period,		colon,		underscore,	underscore	]	};
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "fr" {
-    name[Group1] = "French";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AD01>	{	[	a,		A,		1,              1               ]	};
-    key <AD02>	{	[	z,		Z,		2,              2               ]	};
-
-    key <AC01>	{	[	q,		Q,		at,             at              ]	};
-    key <AC02>	{	[	s,		S,		percent,        percent         ]	};
-    key <AC03>	{	[	d,		D,		ecircumflex,    Ecircumflex	]	};
-    key <AC04>	{	[	f,		F,		eacute,  	Eacute          ]	};
-    key <AC05>	{	[	g,		G,		egrave,    	Egrave          ]	};
-    key <AC06>	{	[	h,		H,		oe,             OE      	]	};
-    key <AC07>	{	[	j,		J,		parenleft,      parenleft   	]	};
-    key <AC08>	{	[	k,		K,		parenright,     parenright	]	};
-    key <AC09>	{	[	l,		L,		agrave,         Agrave      	]	};
-    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };
-
-    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};
-    key <AB02>	{	[	x,		X,		numbersign,     numbersign 	]	};
-    key <AB03>	{	[	c,		C,		ccedilla,       Ccedilla	]	};
-    key <AB04>	{	[	v,		V,		plus,           plus	        ]	};
-    key <AB05>	{	[	b,		B,		equal,          equal   	]	};
-    key <AB06>	{	[	n,		N,		quotedbl,       quotedbl	]	};
-    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};
-    key <AC10>  {       [       semicolon,      period,         minus,          minus           ]       };
-    key <AE11>  {       [       colon,          slash,          underscore,     underscore      ]       };
-    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };
-
-    key <AB08>  {       [       less,		greater,	less,		greater		]	};
-    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "de" {
-    name[Group1] = "German";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AD06>	{	[	z,		Z,		6,		6		]	};
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		percent,	percent    	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash	  	]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };
-
-    key <AB01>	{	[	y,		Y,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
-    key <AB03>	{	[	c,		C,		asterisk,	asterisk	]	};
-    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
-    key <AB05>	{	[	b,		B,		plus,		plus		]	};
-    key <AB06>	{	[	n,		N,		less,		less		]	};
-    key <AB07>	{	[	m,		M,		greater,	greater		]	};
-    key <AC10>  {	[       odiaeresis,     Odiaeresis,     equal,		equal		]       };
-    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };
-    key <AE12>  {	[       minus,          underscore,     ssharp,		ssharp		]       };
-
-    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]	};
-    key <AB09>  {       [       period,         colon,          period,		colon		]	};
-};
-
-
-// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
-partial alphanumeric_keys
-xkb_symbols "ru" {
-    name[Group1] = "Russian";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};
-    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};
-    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};
-    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};
-    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};
-    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};
-    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};
-    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};
-    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};
-    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};
-
-    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};
-    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};
-    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};
-    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};
-    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};
-    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};
-    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};
-    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};
-    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};
-    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};
-
-    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};
-    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};
-    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};
-    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};
-    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};
-    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};
-    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};
-    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};
-    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};
-    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
-
-    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};
-    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "it" {
-    name[Group1] = "Italian";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash		]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };
-
-    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
-    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
-    key <AB04>	{	[	v,		V,		equal,		equal		]	};
-    key <AB05>	{	[	b,		B,		less,		less		]	};
-    key <AB06>	{	[	n,		N,		greater,	greater		]	};
-    key <AB07>	{	[	m,		M,		plus,		plus		]	};
-    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };
-    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };
-    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };
-
-    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
-    key <AB09>  {       [       period,         colon,          period,		colon		]       };
-};
-
-partial default alphanumeric_keys
-xkb_symbols "base" {
-    key <AD01>	{	[	q,			Q,			1,			1			]	};
-    key <AD02>	{	[	w,			W,			2,			2			]	};
-    key <AD03>	{	[	e,			E,			3,			3			]	};
-    key <AD04>	{	[	r,			R,			4,			4			]	};
-    key <AD05>	{	[	t,			T,			5,			5			]	};
-    key <AD06>	{	[	y,			Y,			6,			6			]	};
-    key <AD07>	{	[	u,			U,			7,			7			]	};
-    key <AD08>	{	[	i,			I,			8,			8			]	};
-    key <AD09>	{	[	o,			O,			9,			9			]	};
-    key <AD10>	{	[	p,			P,			0,			0			]	};
-    key <BKSP>	{	[	BackSpace,		BackSpace,		BackSpace,		BackSpace		]	};
-
-    // broken UI spec.
-    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};
-
-    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};
-    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};
-    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
-    key <SPCE>	{	[	space,			space,			space,			space			]	};
-    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};
-    key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};
-
-    modifier_map Shift { Shift_L };
-    modifier_map Mod5 { ISO_Level3_Shift };
-    modifier_map Control { Control_R };
-
-    key <KPEN>	{	[	Return		]	};
-    key <UP>	{	[	Up		]	};
-    key <DOWN>	{	[	Down		]	};
-    key <LEFT>	{	[	Left		]	};
-    key <RGHT>	{	[	Right		]	};
-
-    key <ESC>	{	[	Escape		]	};
-    key <FK01>	{	[	F1		]	};
-    key <FK02>	{	[	F2		]	};
-    key <FK03>	{	[	F3		]	};
-    key <FK04>	{	[	F4		]	};
-    key <FK05>	{	[	F5		]	};
-    key <FK06>	{	[	F6		]	};
-    key <FK07>	{	[	F7		]	};
-    key <FK08>	{	[	F8		]	};
-    key <FK09>	{	[	F9		]	};
-    key <FK10>	{	[	F10		]	};
-    key <FK11>	{	[	F11		]	};
-    key <FK12>	{	[	F12		]	};
-
-    // generated from the headset, must always be in the map.
-    key <I29>  {	[	XF86Phone	]	};
-};
+partial alphanumeric_keys

+xkb_symbols "us" {

+    name[Group1] = "U.S. English";

+    

+    include "nokia_vndr/rx-44(base)"

+

+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};

+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};

+    key <AC03>	{	[	d,		D,		at,		at		]	};

+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};

+    key <AC05>	{	[	g,		G,		backslash,	backslash	]	};

+    key <AC06>	{	[	h,		H,		slash,		slash		]	};

+    key <AC07>	{	[	j,		J,		parenleft,	parenleft	]	};

+    key <AC08>	{	[	k,		K,		parenright,	parenright	]	};

+    key <AC09>	{	[	l,		L,		asterisk,	asterisk	]	};

+    key <AC11>  {       [       apostrophe,     question,       question,	question	]	};

+

+    key <AB01>	{	[	z,		Z,		yen,		yen		]	};

+    key <AB02>	{	[	x,		X,		asciicircum,	asciicircum	]	};

+    key <AB03>	{	[	c,		C,		asciitilde,	asciitilde	]	};

+    key <AB04>	{	[	v,		V,		percent,	percent		]	};

+    key <AB05>	{	[	b,		B,		ampersand,	ampersand	]	};

+    key <AB06>	{	[	n,		N,		dollar,		dollar		]	};

+    key <AB07>	{	[	m,		M,		EuroSign,	EuroSign	]	};

+    key <AC10>  {       [       semicolon,      colon,          sterling,	sterling	]	};

+    key <AE11>  {       [       minus,          underscore,     underscore,	underscore	]	};

+    key <AE12>  {       [       plus,           equal,          equal,		equal		]	};

+

+    key <AB08>  {       [       comma,          less,           comma,		less		]	};

+    key <AB09>  {       [       period,         greater,        period,		greater		]	};

+};

+

+

+

+partial alphanumeric_keys

+xkb_symbols "fisenoda" {

+    name[Group1] = "Finnish/Swedish/Norwegian/Danish";

+

+    include "nokia_vndr/rx-44(base)"

+

+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};

+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};

+    key <AC03>	{	[	d,		D,		at,		at		]	};

+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};

+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};

+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};

+    key <AC07>	{	[	j,		J,		slash,		slash		]	};

+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};

+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};

+    key <AC11>  {       [       aring,          Aring,          question,	question	]	};

+

+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};

+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};

+    key <AB03>	{	[	c,		C,		percent,	percent		]	};

+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};

+    key <AB05>	{	[	b,		B,		plus,		plus		]	};

+    key <AB06>	{	[	n,		N,		less,		less		]	};

+    key <AB07>	{	[	m,		M,		greater,	greater		]	};

+    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };

+    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };

+    key <AE12>  {       [       minus,          underscore,     underscore,	underscore	]       };

+

+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };

+    key <AB09>  {       [       period,         colon,          period,		colon		]       };

+};

+

+

+

+partial alphanumeric_keys

+xkb_symbols "ptes" {

+    name[Group1] = "Portuguese/Spanish";

+

+    include "nokia_vndr/rx-44(base)"

+

+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};

+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};

+    key <AC03>	{	[	d,		D,		at,		at		]	};

+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};

+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};

+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};

+    key <AC07>	{	[	j,		J,		slash,		slash		]	};

+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};

+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};

+    key <AC11>  {       [       dead_acute,     dead_grave,     dead_diaeresis,	dead_diaeresis	]	};

+

+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};

+    key <AB02>	{	[	x,		X,		percent,	percent 	]	};

+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};

+    key <AB04>	{	[	v,		V,		exclamdown,	exclamdown	]	};

+    key <AB05>	{	[	b,		B,		apostrophe,	apostrophe	]	};

+    key <AB06>	{	[	n,		N,		plus,		plus		]	};

+    key <AB07>	{	[	m,		M,		equal,		equal		]	};

+    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};

+    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};

+    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};

+

+    key <AB08>  {       [	comma,		semicolon,	minus,		minus		]	};

+    key <AB09>  {       [	period,		colon,		underscore,	underscore	]	};

+};

+

+

+

+partial alphanumeric_keys

+xkb_symbols "fr" {

+    name[Group1] = "French";

+

+    include "nokia_vndr/rx-44(base)"

+

+    key <AD01>	{	[	a,		A,		1,              1               ]	};

+    key <AD02>	{	[	z,		Z,		2,              2               ]	};

+

+    key <AC01>	{	[	q,		Q,		at,             at              ]	};

+    key <AC02>	{	[	s,		S,		percent,        percent         ]	};

+    key <AC03>	{	[	d,		D,		ecircumflex,    Ecircumflex	]	};

+    key <AC04>	{	[	f,		F,		eacute,  	Eacute          ]	};

+    key <AC05>	{	[	g,		G,		egrave,    	Egrave          ]	};

+    key <AC06>	{	[	h,		H,		oe,             OE      	]	};

+    key <AC07>	{	[	j,		J,		parenleft,      parenleft   	]	};

+    key <AC08>	{	[	k,		K,		parenright,     parenright	]	};

+    key <AC09>	{	[	l,		L,		agrave,         Agrave      	]	};

+    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };

+

+    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};

+    key <AB02>	{	[	x,		X,		numbersign,     numbersign 	]	};

+    key <AB03>	{	[	c,		C,		ccedilla,       Ccedilla	]	};

+    key <AB04>	{	[	v,		V,		plus,           plus	        ]	};

+    key <AB05>	{	[	b,		B,		equal,          equal   	]	};

+    key <AB06>	{	[	n,		N,		quotedbl,       quotedbl	]	};

+    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};

+    key <AC10>  {       [       semicolon,      period,         minus,          minus           ]       };

+    key <AE11>  {       [       colon,          slash,          underscore,     underscore      ]       };

+    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };

+

+    key <AB08>  {       [       less,		greater,	less,		greater		]	};

+    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };

+};

+

+

+

+partial alphanumeric_keys

+xkb_symbols "de" {

+    name[Group1] = "German";

+

+    include "nokia_vndr/rx-44(base)"

+

+    key <AD06>	{	[	z,		Z,		6,		6		]	};

+

+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};

+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};

+    key <AC03>	{	[	d,		D,		at,		at		]	};

+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};

+    key <AC05>	{	[	g,		G,		percent,	percent    	]	};

+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};

+    key <AC07>	{	[	j,		J,		slash,		slash	  	]	};

+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};

+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};

+    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };

+

+    key <AB01>	{	[	y,		Y,		EuroSign,	EuroSign	]	};

+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};

+    key <AB03>	{	[	c,		C,		asterisk,	asterisk	]	};

+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};

+    key <AB05>	{	[	b,		B,		plus,		plus		]	};

+    key <AB06>	{	[	n,		N,		less,		less		]	};

+    key <AB07>	{	[	m,		M,		greater,	greater		]	};

+    key <AC10>  {	[       odiaeresis,     Odiaeresis,     equal,		equal		]       };

+    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };

+    key <AE12>  {	[       minus,          underscore,     ssharp,		ssharp		]       };

+

+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]	};

+    key <AB09>  {       [       period,         colon,          period,		colon		]	};

+};

+

+

+// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.

+partial alphanumeric_keys

+xkb_symbols "ru" {

+    name[Group1] = "Russian";

+

+    include "nokia_vndr/rx-44(base)"

+

+    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};

+    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};

+    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};

+    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};

+    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};

+    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};

+    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};

+    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};

+    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};

+    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};

+

+    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};

+    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};

+    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};

+    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};

+    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};

+    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};

+    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};

+    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};

+    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};

+    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};

+

+    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};

+    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};

+    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};

+    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};

+    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};

+    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};

+    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};

+    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};

+    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};

+    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};

+

+    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};

+    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};

+};

+

+

+

+partial alphanumeric_keys

+xkb_symbols "it" {

+    name[Group1] = "Italian";

+

+    include "nokia_vndr/rx-44(base)"

+

+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};

+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};

+    key <AC03>	{	[	d,		D,		at,		at		]	};

+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};

+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};

+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};

+    key <AC07>	{	[	j,		J,		slash,		slash		]	};

+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};

+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};

+    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };

+

+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};

+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};

+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};

+    key <AB04>	{	[	v,		V,		equal,		equal		]	};

+    key <AB05>	{	[	b,		B,		less,		less		]	};

+    key <AB06>	{	[	n,		N,		greater,	greater		]	};

+    key <AB07>	{	[	m,		M,		plus,		plus		]	};

+    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };

+    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };

+    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };

+

+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };

+    key <AB09>  {       [       period,         colon,          period,		colon		]       };

+};

+

+partial default alphanumeric_keys

+xkb_symbols "base" {

+    key <AD01>	{	[	q,			Q,			1,			1			]	};

+    key <AD02>	{	[	w,			W,			2,			2			]	};

+    key <AD03>	{	[	e,			E,			3,			3			]	};

+    key <AD04>	{	[	r,			R,			4,			4			]	};

+    key <AD05>	{	[	t,			T,			5,			5			]	};

+    key <AD06>	{	[	y,			Y,			6,			6			]	};

+    key <AD07>	{	[	u,			U,			7,			7			]	};

+    key <AD08>	{	[	i,			I,			8,			8			]	};

+    key <AD09>	{	[	o,			O,			9,			9			]	};

+    key <AD10>	{	[	p,			P,			0,			0			]	};

+    key <BKSP>	{	[	BackSpace,		BackSpace,		BackSpace,		BackSpace		]	};

+

+    // broken UI spec.

+    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};

+

+    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};

+    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};

+    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};

+    key <SPCE>	{	[	space,			space,			space,			space			]	};

+    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};

+    key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};

+

+    modifier_map Shift { Shift_L };

+    modifier_map Mod5 { ISO_Level3_Shift };

+    modifier_map Control { Control_R };

+

+    key <KPEN>	{	[	Return		]	};

+    key <UP>	{	[	Up		]	};

+    key <DOWN>	{	[	Down		]	};

+    key <LEFT>	{	[	Left		]	};

+    key <RGHT>	{	[	Right		]	};

+

+    key <ESC>	{	[	Escape		]	};

+    key <FK01>	{	[	F1		]	};

+    key <FK02>	{	[	F2		]	};

+    key <FK03>	{	[	F3		]	};

+    key <FK04>	{	[	F4		]	};

+    key <FK05>	{	[	F5		]	};

+    key <FK06>	{	[	F6		]	};

+    key <FK07>	{	[	F7		]	};

+    key <FK08>	{	[	F8		]	};

+    key <FK09>	{	[	F9		]	};

+    key <FK10>	{	[	F10		]	};

+    key <FK11>	{	[	F11		]	};

+    key <FK12>	{	[	F12		]	};

+

+    // generated from the headset, must always be in the map.

+    key <I29>  {	[	XF86Phone	]	};

+};

diff --git a/xorg-server/xkeyboard-config/symbols/olpc b/xorg-server/xkeyboard-config/symbols/olpc
index 9e74e47b8..e9e950b1e 100644
--- a/xorg-server/xkeyboard-config/symbols/olpc
+++ b/xorg-server/xkeyboard-config/symbols/olpc
@@ -1,21 +1,21 @@
-//

-// Created by Bernardo Innocenti <bernie@codewiz.org>

-//

-// Additional symbol definitions for the OLPC keyboards

-//

-

-alphanumeric_keys modifier_keys

-xkb_symbols "olpc" {

-    include "pc(pc105)"

-

-    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key

-    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key

-    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key

-    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key

-

-    key <I220> { [ XF86Search    ] }; // search key

-    key <I221> { [ XF86Meeting   ] }; // fn+search key

-    key <I236> { [ XF86Start     ] }; // gear key (fn+space)

-    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)

-    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)

-};

+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Additional symbol definitions for the OLPC keyboards
+//
+
+alphanumeric_keys modifier_keys
+xkb_symbols "olpc" {
+    include "pc(pc105)"
+
+    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key
+    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key
+    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key
+    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key
+
+    key <I220> { [ XF86Search    ] }; // search key
+    key <I221> { [ XF86Meeting   ] }; // fn+search key
+    key <I236> { [ XF86Start     ] }; // gear key (fn+space)
+    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)
+    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)
+};
diff --git a/xorg-server/xkeyboard-config/symbols/rupeesign b/xorg-server/xkeyboard-config/symbols/rupeesign
index 605060af7..efde69cb3 100644
--- a/xorg-server/xkeyboard-config/symbols/rupeesign
+++ b/xorg-server/xkeyboard-config/symbols/rupeesign
@@ -1,5 +1,5 @@
-// keyboards having the RupeeSign on the 4 key

-partial

-xkb_symbols "4" {

-    key <AE04>	{ [  NoSymbol,   NoSymbol,   U20B9 ]	};

-};

+// keyboards having the RupeeSign on the 4 key
+partial
+xkb_symbols "4" {
+    key <AE04>	{ [  NoSymbol,   NoSymbol,   U20B9 ]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
index b1123e70e..0133ca001 100644
--- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/sgi_vndr
-
-dist_symbols_DATA = \
-jp
+symbolsdir = $(xkb_base)/symbols/sgi_vndr

+

+dist_symbols_DATA = \

+jp

diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
index 00f9ede0f..f60c80290 100644
--- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
@@ -1,44 +1,44 @@
-xkb_symbols "jp106" {

-

-    name[group1]="Japan/ASCII";

-

-    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };

-    key <AE01> {         [               1,          exclam ] };

-    key <AE02> {         [               2,        quotedbl ] };

-    key <AE03> {         [               3,      numbersign ] };

-    key <AE04> {         [               4,          dollar ] };

-    key <AE05> {         [               5,         percent ] };

-    key <AE06> {         [               6,       ampersand ] };

-    key <AE07> {         [               7,      apostrophe ] };

-    key <AE08> {         [               8,       parenleft ] };

-    key <AE09> {         [               9,      parenright ] };

-    key <AE10> {         [               0,      asciitilde ] };

-    key <AE11> {         [           minus,           equal ] };

-    key <AE12> {         [     asciicircum,         overbar ] };

-    key <AE13> {         [             yen,             bar ] };

-

-    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard

-    key <AD11> {         [              at,           grave ] };

-    key <AD12> {         [     bracketleft,       braceleft ] };

-

-    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };

-    // keys <AC01> - <AC09> are identical to US/ASCII keyboard

-    key <AC10> {         [       semicolon,            plus ] };

-    key <AC11> {         [           colon,        asterisk ] };

-    key <AC12> {         [    bracketright,      braceright ] };

-

-    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard

-    key <AB11> {         [       backslash,      underscore ] };

-

-    key <NFER> {         [        Muhenkan ] };

-    key <XFER> {         [           Kanji ] };

-    key <HKTG> {         [ Hiragana_Katakana ] };

-};

-

-xkb_symbols "alternate106" {

-    key <AE10> {         [               0,      overbar ] };

-    key <AE12> {         [     asciicircum,      asciitilde] };

-    key <AE13> {         [       backslash,             bar ] };

-    key <AB11> {         [        underbar,      underscore ] };

-    augment "sgi/jp(jp106)"

-};

+xkb_symbols "jp106" {
+
+    name[group1]="Japan/ASCII";
+
+    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };
+    key <AE01> {         [               1,          exclam ] };
+    key <AE02> {         [               2,        quotedbl ] };
+    key <AE03> {         [               3,      numbersign ] };
+    key <AE04> {         [               4,          dollar ] };
+    key <AE05> {         [               5,         percent ] };
+    key <AE06> {         [               6,       ampersand ] };
+    key <AE07> {         [               7,      apostrophe ] };
+    key <AE08> {         [               8,       parenleft ] };
+    key <AE09> {         [               9,      parenright ] };
+    key <AE10> {         [               0,      asciitilde ] };
+    key <AE11> {         [           minus,           equal ] };
+    key <AE12> {         [     asciicircum,         overbar ] };
+    key <AE13> {         [             yen,             bar ] };
+
+    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard
+    key <AD11> {         [              at,           grave ] };
+    key <AD12> {         [     bracketleft,       braceleft ] };
+
+    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };
+    // keys <AC01> - <AC09> are identical to US/ASCII keyboard
+    key <AC10> {         [       semicolon,            plus ] };
+    key <AC11> {         [           colon,        asterisk ] };
+    key <AC12> {         [    bracketright,      braceright ] };
+
+    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard
+    key <AB11> {         [       backslash,      underscore ] };
+
+    key <NFER> {         [        Muhenkan ] };
+    key <XFER> {         [           Kanji ] };
+    key <HKTG> {         [ Hiragana_Katakana ] };
+};
+
+xkb_symbols "alternate106" {
+    key <AE10> {         [               0,      overbar ] };
+    key <AE12> {         [     asciicircum,      asciitilde] };
+    key <AE13> {         [       backslash,             bar ] };
+    key <AB11> {         [        underbar,      underscore ] };
+    augment "sgi/jp(jp106)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/shift b/xorg-server/xkeyboard-config/symbols/shift
index 64dae8e43..6fbec5b2a 100644
--- a/xorg-server/xkeyboard-config/symbols/shift
+++ b/xorg-server/xkeyboard-config/symbols/shift
@@ -1,84 +1,84 @@
-partial modifier_keys 

-xkb_symbols "breaks_caps" {

-    key <LFSH> {

-	type = "ALPHABETIC",

-    	actions [Group1] = [

-	    SetMods(modifiers=Shift),

-	    SetMods(modifiers=Shift+Lock,clearLocks)

-	]

-    };

-    key <RTSH> {

-	type = "ALPHABETIC",

-	actions [Group1] = [

-	    SetMods(modifiers=Shift),

-	    SetMods(modifiers=Shift+Lock,clearLocks)

-	]

-    };

-};

-

-// When pressed together with another Shift key, set/release Lock.

-partial modifier_keys

-xkb_symbols "lshift_both_capslock" {

-  key <LFSH> {

-    type[Group1]="TWO_LEVEL",

-    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]

-  };

-};

-// When pressed together with another Shift key, set or unset Lock.

-partial modifier_keys

-xkb_symbols "rshift_both_capslock" {

-  key <RTSH> {

-    type[Group1]="TWO_LEVEL",

-    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]

-  };

-};

-partial modifier_keys

-xkb_symbols "both_capslock" {

-  include "shift(lshift_both_capslock)"

-  include "shift(rshift_both_capslock)"

-};

-

-// Release Lock when pressed alone and set Lock when pressed with another Shift key.

-partial modifier_keys

-xkb_symbols "lshift_both_capslock_cancel" {

-  key <LFSH> {

-    type[Group1]="ALPHABETIC",

-    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]

-  };

-};

-// Release Lock when pressed alone and set Lock when pressed with another Shift key.

-partial modifier_keys

-xkb_symbols "rshift_both_capslock_cancel" {

-  key <RTSH> {

-    type[Group1]="ALPHABETIC",

-    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]

-  };

-};

-partial modifier_keys

-xkb_symbols "both_capslock_cancel" {

-  include "shift(lshift_both_capslock_cancel)"

-  include "shift(rshift_both_capslock_cancel)"

-};

-

-

-// When pressed together with another Shift key, lock/unlock Shift.

-partial modifier_keys

-xkb_symbols "lshift_both_shiftlock" {

-  key <LFSH> {

-    type[Group1]="TWO_LEVEL",

-    symbols[Group1] = [ Shift_L,                       Shift_Lock ]

-  };

-};

-// When pressed together with another Shift key, lock/unlock Shift.

-partial modifier_keys

-xkb_symbols "rshift_both_shiftlock" {

-  key <RTSH> {

-    type[Group1]="TWO_LEVEL",

-    symbols[Group1] = [ Shift_R,                       Shift_Lock ]

-  };

-};

-partial modifier_keys

-xkb_symbols "both_shiftlock" {

-  include "shift(lshift_both_shiftlock)"

-  include "shift(rshift_both_shiftlock)"

-};

+partial modifier_keys 
+xkb_symbols "breaks_caps" {
+    key <LFSH> {
+	type = "ALPHABETIC",
+    	actions [Group1] = [
+	    SetMods(modifiers=Shift),
+	    SetMods(modifiers=Shift+Lock,clearLocks)
+	]
+    };
+    key <RTSH> {
+	type = "ALPHABETIC",
+	actions [Group1] = [
+	    SetMods(modifiers=Shift),
+	    SetMods(modifiers=Shift+Lock,clearLocks)
+	]
+    };
+};
+
+// When pressed together with another Shift key, set/release Lock.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock" {
+  key <LFSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
+  };
+};
+// When pressed together with another Shift key, set or unset Lock.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock" {
+  key <RTSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_capslock" {
+  include "shift(lshift_both_capslock)"
+  include "shift(rshift_both_capslock)"
+};
+
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock_cancel" {
+  key <LFSH> {
+    type[Group1]="ALPHABETIC",
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
+  };
+};
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock_cancel" {
+  key <RTSH> {
+    type[Group1]="ALPHABETIC",
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_capslock_cancel" {
+  include "shift(lshift_both_capslock_cancel)"
+  include "shift(rshift_both_capslock_cancel)"
+};
+
+
+// When pressed together with another Shift key, lock/unlock Shift.
+partial modifier_keys
+xkb_symbols "lshift_both_shiftlock" {
+  key <LFSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_L,                       Shift_Lock ]
+  };
+};
+// When pressed together with another Shift key, lock/unlock Shift.
+partial modifier_keys
+xkb_symbols "rshift_both_shiftlock" {
+  key <RTSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_R,                       Shift_Lock ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_shiftlock" {
+  include "shift(lshift_both_shiftlock)"
+  include "shift(rshift_both_shiftlock)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
index e1a77d957..5577f7c7c 100644
--- a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/sony_vndr
-
-dist_symbols_DATA = \
-us
+symbolsdir = $(xkb_base)/symbols/sony_vndr

+

+dist_symbols_DATA = \

+us

diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/us b/xorg-server/xkeyboard-config/symbols/sony_vndr/us
index a34d7b931..e91ca11b2 100644
--- a/xorg-server/xkeyboard-config/symbols/sony_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/us
@@ -1,91 +1,91 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// US/ASCII layout for a nwp5461 keyboard

-xkb_symbols "nwp5461" {

-    include "us(basic)"

-

-    key <LALT> { [ Alt_L, Meta_L	]	};

-    key <RTSH> { [ Shift_R	]	};

-    key <AB11> { [ NoSymbol	]	};

-

-    // Begin "Function" section

-    key <FK01> { [ F1		]	};

-    key <FK02> { [ F2		]	};

-    key <FK03> { [ F3		]	};

-    key <FK04> { [ F4		]	};

-    key <FK05> { [ F5		]	};

-    key <FK06> { [ F6		]	};

-    key <FK07> { [ F7		]	};

-    key <FK08> { [ F8		]	};

-    key <FK09> { [ F9		]	};

-    key <FK10> { [ F10		]	};

-    key <FK11> { [ F11		]	};

-    key <FK12> { [ F12		]	};

-    key <HELP> { [ Help		]	};

-    key <STOP> { [ Cancel	]	};

-    key <CUT>  { [ Select	]	};

-    key <EXEC> { [ Execute	]	};

-    key <DELE> { [ Delete	]	};

-    key <LEFT> { [ Left		]	};

-    key <RGHT> { [ Right	]	};

-    key <UP>   { [ Up		]	};

-    key <DOWN> { [ Down		]	};

-    key <PGUP> { [ Prior	]	};

-    key <PGDN> { [ Next		]	};

-    key <INS>  { [ Insert	]	};

-    key <CLR>  { [ Clear	]	};

-    // End "Function" section

-

-    // Begin "Keypad" section

-    key <KPMU> { [ KP_Multiply	]	};

-    key <KPDV> { [ KP_Divide	]	};

-    key <KPAD> { [ KP_Add	]	};

-

-    key  <KP7> { [ KP_7		]	};

-    key  <KP8> { [ KP_8		]	};

-    key  <KP9> { [ KP_9		]	};

-    key <KPSU> { [ KP_Subtract	]	};

-

-    key  <KP4> { [ KP_4		]	};

-    key  <KP5> { [ KP_5		]	};

-    key  <KP6> { [ KP_6		]	};

-    key <KPSP> { [ KP_Separator ]	};

-

-    key  <KP1> { [ KP_1		]	};

-    key  <KP2> { [ KP_2		]	};

-    key  <KP3> { [ KP_3		]	};

-    key <KPEN> { [ KP_Enter	]	}; 

-

-    key  <KP0> { [ KP_0		]	};

-    key <KPDC> { [ KP_Decimal	]	};

-    key <KPTB> { [ KP_Tab	]	};

-    // End "Keypad" section

-

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R };

-    modifier_map Mod3   	{ Alt_L };

-};

+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a nwp5461 keyboard
+xkb_symbols "nwp5461" {
+    include "us(basic)"
+
+    key <LALT> { [ Alt_L, Meta_L	]	};
+    key <RTSH> { [ Shift_R	]	};
+    key <AB11> { [ NoSymbol	]	};
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]	};
+    key <FK02> { [ F2		]	};
+    key <FK03> { [ F3		]	};
+    key <FK04> { [ F4		]	};
+    key <FK05> { [ F5		]	};
+    key <FK06> { [ F6		]	};
+    key <FK07> { [ F7		]	};
+    key <FK08> { [ F8		]	};
+    key <FK09> { [ F9		]	};
+    key <FK10> { [ F10		]	};
+    key <FK11> { [ F11		]	};
+    key <FK12> { [ F12		]	};
+    key <HELP> { [ Help		]	};
+    key <STOP> { [ Cancel	]	};
+    key <CUT>  { [ Select	]	};
+    key <EXEC> { [ Execute	]	};
+    key <DELE> { [ Delete	]	};
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+    key <PGUP> { [ Prior	]	};
+    key <PGDN> { [ Next		]	};
+    key <INS>  { [ Insert	]	};
+    key <CLR>  { [ Clear	]	};
+    // End "Function" section
+
+    // Begin "Keypad" section
+    key <KPMU> { [ KP_Multiply	]	};
+    key <KPDV> { [ KP_Divide	]	};
+    key <KPAD> { [ KP_Add	]	};
+
+    key  <KP7> { [ KP_7		]	};
+    key  <KP8> { [ KP_8		]	};
+    key  <KP9> { [ KP_9		]	};
+    key <KPSU> { [ KP_Subtract	]	};
+
+    key  <KP4> { [ KP_4		]	};
+    key  <KP5> { [ KP_5		]	};
+    key  <KP6> { [ KP_6		]	};
+    key <KPSP> { [ KP_Separator ]	};
+
+    key  <KP1> { [ KP_1		]	};
+    key  <KP2> { [ KP_2		]	};
+    key  <KP3> { [ KP_3		]	};
+    key <KPEN> { [ KP_Enter	]	}; 
+
+    key  <KP0> { [ KP_0		]	};
+    key <KPDC> { [ KP_Decimal	]	};
+    key <KPTB> { [ KP_Tab	]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod3   	{ Alt_L };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
index d62bb6da9..70e1b9b90 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
@@ -1,116 +1,116 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys 

-xkb_symbols "type6" {

-

-    name[Group1]= "Arabic";

-

-    key <TLDE> {  [   Arabic_thal,      Arabic_shadda, grave,    asciitilde   ]	};

-    key <AE01> {  [               1,          exclam, 1,          exclam      ] };

-    key <AE02> {  [               2,              at, 2,              at      ] };

-    key <AE03> {  [               3,      numbersign, 3,      numbersign      ] };

-    key <AE04> {  [               4,          dollar, 4,          dollar      ] };

-    key <AE05> {  [               5,         percent, 5,         percent      ] };

-    key <AE06> {  [               6,     asciicircum, 6,     asciicircum      ] };

-    key <AE07> {  [               7,       ampersand, 7,       ampersand      ] };

-    key <AE08> {  [               8,        asterisk, 8,        asterisk      ] };

-    key <AE09> {  [               9,      parenright, 9,      parenright      ] };

-    key <AE10> {  [               0,       parenleft, 0,       parenleft      ] };

-    key <AE11> {  [       minus,      underscore, minus,      underscore      ] };

-    key <AE12> {  [       equal,            plus, equal,            plus      ] };

-						

-    key <AD01> {  [      Arabic_dad,     Arabic_fatha, q,    Q     ]     };

-    key <AD02> {  [      Arabic_sad,     Arabic_fathatan, w,    W  ]     };

-    key <AD03> {  [     Arabic_theh,     Arabic_damma, e,    E     ]     };

-    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan, r,    R  ]     };

-    key <AD05> {  [      Arabic_feh,     0x100fef9, t,    T        ]     };

-    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef, y,    Y ]     };

-    key <AD07> {  [      Arabic_ain,         grave, u,    U        ]     };

-    key <AD08> {  [       Arabic_ha,        division, i,    I      ]     };

-    key <AD09> {  [     Arabic_khah,       multiply, o,    O       ]     };

-    key <AD10> {  [      Arabic_hah,   Arabic_semicolon, p,    P  ]     };

-    key <AD11> {  [     Arabic_jeem,        greater, bracketleft,  braceleft       ]     };

-    key <AD12> {  [      Arabic_dal,        less,    bracketright, braceright      ]     };

-

-    key <AC01> {  [    Arabic_sheen,   Arabic_kasra, a,    A       ]     };

-    key <AC02> {  [     Arabic_seen,   Arabic_kasratan, s,    S    ]     };

-    key <AC03> {  [      Arabic_yeh,       bracketright, d,    D   ]     };

-    key <AC04> {  [      Arabic_beh,       bracketleft, f,    F    ]     };

-    key <AC05> {  [      Arabic_lam,       0x100fef7, g,    G      ]     };

-    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef, h,    H ]     };

-    key <AC07> {  [      Arabic_teh,      Arabic_tatweel, j,    J  ]     };

-    key <AC08> {  [     Arabic_noon,      Arabic_comma, k,    K    ]     };

-    key <AC09> {  [     Arabic_meem,         slash, l,    L        ]     };

-    key <AC10> {  [      Arabic_kaf,           colon, semicolon,    colon      ]     };

-    key <AC11> {  [      Arabic_tah,        quotedbl, apostrophe,   quotedbl      ]     };

-    key <BKSL> {  [       backslash,             bar, backslash,             bar      ]     };

-

-    key <LSGT> {  [             bar,      brokenbar, bar,      brokenbar	  ]     };

-    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde, z,    Z       ]     };

-    key <AB02> {  [    Arabic_hamza,      Arabic_sukun, x,    X    ]     };

-    key <AB03> {  [Arabic_hamzaonwaw,      braceright, c,    C     ]     };

-    key <AB04> {  [       Arabic_ra,       braceleft, v,    V      ]     };

-    key <AB05> {  [       0x100fefb,       0x100fef5, b,    B      ]     };

-    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef, n,    N ]     };

-    key <AB07> {  [Arabic_tehmarbuta,    apostrophe, m,    M       ]     };

-    key <AB08> {  [      Arabic_waw,         comma,  comma,    less        ]     };

-    key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };

-    key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ara(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "type6" {
+
+    name[Group1]= "Arabic";
+
+    key <TLDE> {  [   Arabic_thal,      Arabic_shadda, grave,    asciitilde   ]	};
+    key <AE01> {  [               1,          exclam, 1,          exclam      ] };
+    key <AE02> {  [               2,              at, 2,              at      ] };
+    key <AE03> {  [               3,      numbersign, 3,      numbersign      ] };
+    key <AE04> {  [               4,          dollar, 4,          dollar      ] };
+    key <AE05> {  [               5,         percent, 5,         percent      ] };
+    key <AE06> {  [               6,     asciicircum, 6,     asciicircum      ] };
+    key <AE07> {  [               7,       ampersand, 7,       ampersand      ] };
+    key <AE08> {  [               8,        asterisk, 8,        asterisk      ] };
+    key <AE09> {  [               9,      parenright, 9,      parenright      ] };
+    key <AE10> {  [               0,       parenleft, 0,       parenleft      ] };
+    key <AE11> {  [       minus,      underscore, minus,      underscore      ] };
+    key <AE12> {  [       equal,            plus, equal,            plus      ] };
+						
+    key <AD01> {  [      Arabic_dad,     Arabic_fatha, q,    Q     ]     };
+    key <AD02> {  [      Arabic_sad,     Arabic_fathatan, w,    W  ]     };
+    key <AD03> {  [     Arabic_theh,     Arabic_damma, e,    E     ]     };
+    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan, r,    R  ]     };
+    key <AD05> {  [      Arabic_feh,     0x100fef9, t,    T        ]     };
+    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef, y,    Y ]     };
+    key <AD07> {  [      Arabic_ain,         grave, u,    U        ]     };
+    key <AD08> {  [       Arabic_ha,        division, i,    I      ]     };
+    key <AD09> {  [     Arabic_khah,       multiply, o,    O       ]     };
+    key <AD10> {  [      Arabic_hah,   Arabic_semicolon, p,    P  ]     };
+    key <AD11> {  [     Arabic_jeem,        greater, bracketleft,  braceleft       ]     };
+    key <AD12> {  [      Arabic_dal,        less,    bracketright, braceright      ]     };
+
+    key <AC01> {  [    Arabic_sheen,   Arabic_kasra, a,    A       ]     };
+    key <AC02> {  [     Arabic_seen,   Arabic_kasratan, s,    S    ]     };
+    key <AC03> {  [      Arabic_yeh,       bracketright, d,    D   ]     };
+    key <AC04> {  [      Arabic_beh,       bracketleft, f,    F    ]     };
+    key <AC05> {  [      Arabic_lam,       0x100fef7, g,    G      ]     };
+    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef, h,    H ]     };
+    key <AC07> {  [      Arabic_teh,      Arabic_tatweel, j,    J  ]     };
+    key <AC08> {  [     Arabic_noon,      Arabic_comma, k,    K    ]     };
+    key <AC09> {  [     Arabic_meem,         slash, l,    L        ]     };
+    key <AC10> {  [      Arabic_kaf,           colon, semicolon,    colon      ]     };
+    key <AC11> {  [      Arabic_tah,        quotedbl, apostrophe,   quotedbl      ]     };
+    key <BKSL> {  [       backslash,             bar, backslash,             bar      ]     };
+
+    key <LSGT> {  [             bar,      brokenbar, bar,      brokenbar	  ]     };
+    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde, z,    Z       ]     };
+    key <AB02> {  [    Arabic_hamza,      Arabic_sukun, x,    X    ]     };
+    key <AB03> {  [Arabic_hamzaonwaw,      braceright, c,    C     ]     };
+    key <AB04> {  [       Arabic_ra,       braceleft, v,    V      ]     };
+    key <AB05> {  [       0x100fefb,       0x100fef5, b,    B      ]     };
+    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef, n,    N ]     };
+    key <AB07> {  [Arabic_tehmarbuta,    apostrophe, m,    M       ]     };
+    key <AB08> {  [      Arabic_waw,         comma,  comma,    less        ]     };
+    key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };
+    key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ara(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
index 58abfd6e6..202e8a4c1 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
@@ -1,98 +1,98 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Belgium";

-

-    key <TLDE>  { [twosuperior, threesuperior                         ] };

-    key <AE01>  { [ ampersand,          1,          bar               ] };

-    key <AE02>  { [    eacute,          2,           at               ] };

-    key <AE03>  { [  quotedbl,          3,   numbersign               ] };

-    key <AE04>  { [apostrophe,          4                             ] };

-    key <AE05>  { [ parenleft,          5                             ] };

-    key <AE06>  { [   section,          6,  asciicircum               ] };

-    key <AE07>  { [    egrave,          7                             ] };

-    key <AE08>  { [    exclam,          8                             ] };

-    key <AE09>  { [  ccedilla,          9,    braceleft               ] };

-    key <AE10>  { [    agrave,          0,   braceright               ] };

-    key <AE11>  { [parenright,     degree                             ] };

-    key <AE12>  { [     minus, underscore                             ] };

-

-    key <AD01>  { [         a,          A                             ] };

-    key <AD02>  { [         z,          Z                             ] };

-    key <AD03>  { [         e,          E,     EuroSign               ] };

-    key <AD09>  { [         o,          O                             ] };

-    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };

-    key <AD12>  { [    dollar,   asterisk, bracketright               ] };

-

-    key <AC01>  { [         q,          Q                             ] };

-    key <AC10>  { [         m,          M                             ] };

-    key <AC11>  { [    ugrave,    percent,   dead_acute               ] };

-    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };

-

-    key <LSGT>  { [      less,    greater,    backslash               ] };

-    key <AB01>  { [         w,          W                             ] };

-    key <AB07>  { [     comma,   question                             ] };

-    key <AB08>  { [ semicolon,     period                             ] };

-    key <AB09>  { [     colon,      slash                             ] };

-    key <AB10>  { [     equal,       plus,   dead_tilde               ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/be(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Belgium";
+
+    key <TLDE>  { [twosuperior, threesuperior                         ] };
+    key <AE01>  { [ ampersand,          1,          bar               ] };
+    key <AE02>  { [    eacute,          2,           at               ] };
+    key <AE03>  { [  quotedbl,          3,   numbersign               ] };
+    key <AE04>  { [apostrophe,          4                             ] };
+    key <AE05>  { [ parenleft,          5                             ] };
+    key <AE06>  { [   section,          6,  asciicircum               ] };
+    key <AE07>  { [    egrave,          7                             ] };
+    key <AE08>  { [    exclam,          8                             ] };
+    key <AE09>  { [  ccedilla,          9,    braceleft               ] };
+    key <AE10>  { [    agrave,          0,   braceright               ] };
+    key <AE11>  { [parenright,     degree                             ] };
+    key <AE12>  { [     minus, underscore                             ] };
+
+    key <AD01>  { [         a,          A                             ] };
+    key <AD02>  { [         z,          Z                             ] };
+    key <AD03>  { [         e,          E,     EuroSign               ] };
+    key <AD09>  { [         o,          O                             ] };
+    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };
+    key <AD12>  { [    dollar,   asterisk, bracketright               ] };
+
+    key <AC01>  { [         q,          Q                             ] };
+    key <AC10>  { [         m,          M                             ] };
+    key <AC11>  { [    ugrave,    percent,   dead_acute               ] };
+    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };
+
+    key <LSGT>  { [      less,    greater,    backslash               ] };
+    key <AB01>  { [         w,          W                             ] };
+    key <AB07>  { [     comma,   question                             ] };
+    key <AB08>  { [ semicolon,     period                             ] };
+    key <AB09>  { [     colon,      slash                             ] };
+    key <AB10>  { [     equal,       plus,   dead_tilde               ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/be(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
index 3cea0bf9c..7ad2dd1cf 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/br
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
@@ -1,101 +1,101 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Brazil";

-

-    key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };

-    key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };

-    key <AE02> { [               2,              at,	twosuperior,           onehalf ] };

-    key <AE03> { [               3,      numbersign,	threesuperior,   threequarters ] };

-    key <AE04> { [               4,          dollar,	sterling,           onequarter ] };

-    key <AE05> { [               5,         percent,	cent                           ] };

-    key <AE06> { [               6,  dead_diaeresis,	notsign,             diaeresis ] };

-    key <AE07> { [               7,       ampersand,	braceleft                      ] };

-    key <AE08> { [               8,        asterisk,	bracketleft                    ] };

-    key <AE09> { [               9,       parenleft,	bracketright                   ] };

-    key <AE10> { [               0,      parenright,	braceright                     ] };

-    key <AE11> { [           minus,      underscore,	backslash                      ] };

-    key <AE12> { [           equal,            plus,	section                        ] };

-

-    key <AD03> { [               e,               E,	EuroSign                       ] };

-    key <AD04> { [               r,               R,	registered                     ] };

-    key <AD11> { [      dead_acute,      dead_grave,	acute,                   grave ] };

-    key <AD12> { [     bracketleft,       braceleft,	ordfeminine                    ] };

-

-    key <AC10> { [        ccedilla,        Ccedilla,	exclamdown		       ] };

-    key <AC11> { [      dead_tilde, dead_circumflex,	asciitilde,        asciicircum ] };

-    key <AC12> { [    bracketright,      braceright,	masculine                      ] };

-    key <BKSL> { [   bracketright,       braceright,    masculine                      ] };

-

-    key <LSGT> { [          slash,              bar,    degree                         ] };

-    key <AB01> { [               z,               Z,	guillemotleft 		       ] };

-    key <AB02> { [               x,               X,	guillemotright                 ] };

-    key <AB03> { [               c,               C,	copyright                      ] };

-    key <AB07> { [               m,               M,	mu                             ] };

-    key <AB08> { [           comma,            less,	question                       ] };

-    key <AB09> { [          period,         greater,	questiondown                   ] };

-    key <AB10> { [       semicolon,           colon                                    ] };

-    key <AB11> { [           slash,        question,	degree,           questiondown ] };

-

-    key <KPPT> { [      KP_Decimal                                                     ] };

-    key <KPDL> { [       KP_Delete,           comma                                    ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/br(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Brazil";
+
+    key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };
+    key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };
+    key <AE02> { [               2,              at,	twosuperior,           onehalf ] };
+    key <AE03> { [               3,      numbersign,	threesuperior,   threequarters ] };
+    key <AE04> { [               4,          dollar,	sterling,           onequarter ] };
+    key <AE05> { [               5,         percent,	cent                           ] };
+    key <AE06> { [               6,  dead_diaeresis,	notsign,             diaeresis ] };
+    key <AE07> { [               7,       ampersand,	braceleft                      ] };
+    key <AE08> { [               8,        asterisk,	bracketleft                    ] };
+    key <AE09> { [               9,       parenleft,	bracketright                   ] };
+    key <AE10> { [               0,      parenright,	braceright                     ] };
+    key <AE11> { [           minus,      underscore,	backslash                      ] };
+    key <AE12> { [           equal,            plus,	section                        ] };
+
+    key <AD03> { [               e,               E,	EuroSign                       ] };
+    key <AD04> { [               r,               R,	registered                     ] };
+    key <AD11> { [      dead_acute,      dead_grave,	acute,                   grave ] };
+    key <AD12> { [     bracketleft,       braceleft,	ordfeminine                    ] };
+
+    key <AC10> { [        ccedilla,        Ccedilla,	exclamdown		       ] };
+    key <AC11> { [      dead_tilde, dead_circumflex,	asciitilde,        asciicircum ] };
+    key <AC12> { [    bracketright,      braceright,	masculine                      ] };
+    key <BKSL> { [   bracketright,       braceright,    masculine                      ] };
+
+    key <LSGT> { [          slash,              bar,    degree                         ] };
+    key <AB01> { [               z,               Z,	guillemotleft 		       ] };
+    key <AB02> { [               x,               X,	guillemotright                 ] };
+    key <AB03> { [               c,               C,	copyright                      ] };
+    key <AB07> { [               m,               M,	mu                             ] };
+    key <AB08> { [           comma,            less,	question                       ] };
+    key <AB09> { [          period,         greater,	questiondown                   ] };
+    key <AB10> { [       semicolon,           colon                                    ] };
+    key <AB11> { [           slash,        question,	degree,           questiondown ] };
+
+    key <KPPT> { [      KP_Decimal                                                     ] };
+    key <KPDL> { [       KP_Delete,           comma                                    ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/br(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 6fb72c462..4705123dc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -1,97 +1,97 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-   name[Group1]="Canada Bilingual";

-

-   key <TLDE> { [           slash, bar,             backslash                  ]};

-   key <AE01> { [               1, exclam,          plusminus                  ]};

-   key <AE02> { [               2, at                                          ]};

-   key <AE03> { [               3, numbersign,      sterling                   ]};

-   key <AE04> { [               4, dollar,          cent                       ]};

-   key <AE05> { [               5, percent,         currency                   ]};

-   key <AE06> { [               6, question,        notsign	               ]};

-   key <AE07> { [               7, ampersand,       braceleft                  ]};

-   key <AE08> { [               8, asterisk,        braceright                 ]};

-   key <AE09> { [               9, parenleft,       bracketleft                ]};

-   key <AE10> { [               0, parenright,      bracketright               ]};

-   key <AE11> { [           minus, underscore,      onehalf	               ]};

-   key <AE12> { [           equal, plus,            notsign                    ]};

-  

-   key <AD03> { [               e, E,               EuroSign		       ]};

-   key <AD09> { [               o, O,               section		       ]};

-   key <AD10> { [               p, P,               paragraph                  ]};

-   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};

-   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};

-

-   key <AC10> { [       semicolon, colon,           degree                     ]};

-   key <AC11> { [          egrave, Egrave,          braceleft                  ]};

-   key <AC12> { [          agrave, Agrave,          braceright                 ]};

-   key <BKSL> { [          agrave, Agrave,          braceright                 ]};

-

-   key <LSGT> { [          uacute, Uacute                                      ]};

-   key <AB01> { [               z, Z,               guillemotleft              ]};

-   key <AB02> { [               x, X,               guillemotright             ]};

-   key <AB07> { [               m, M,               mu                         ]};

-   key <AB08> { [           comma, quoteright,      less                       ]};

-   key <AB09> { [          period, quotedbl,        greater                    ]};

-   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};

-   

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ca(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+   name[Group1]="Canada Bilingual";
+
+   key <TLDE> { [           slash, bar,             backslash                  ]};
+   key <AE01> { [               1, exclam,          plusminus                  ]};
+   key <AE02> { [               2, at                                          ]};
+   key <AE03> { [               3, numbersign,      sterling                   ]};
+   key <AE04> { [               4, dollar,          cent                       ]};
+   key <AE05> { [               5, percent,         currency                   ]};
+   key <AE06> { [               6, question,        notsign	               ]};
+   key <AE07> { [               7, ampersand,       braceleft                  ]};
+   key <AE08> { [               8, asterisk,        braceright                 ]};
+   key <AE09> { [               9, parenleft,       bracketleft                ]};
+   key <AE10> { [               0, parenright,      bracketright               ]};
+   key <AE11> { [           minus, underscore,      onehalf	               ]};
+   key <AE12> { [           equal, plus,            notsign                    ]};
+  
+   key <AD03> { [               e, E,               EuroSign		       ]};
+   key <AD09> { [               o, O,               section		       ]};
+   key <AD10> { [               p, P,               paragraph                  ]};
+   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};
+   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};
+
+   key <AC10> { [       semicolon, colon,           degree                     ]};
+   key <AC11> { [          egrave, Egrave,          braceleft                  ]};
+   key <AC12> { [          agrave, Agrave,          braceright                 ]};
+   key <BKSL> { [          agrave, Agrave,          braceright                 ]};
+
+   key <LSGT> { [          uacute, Uacute                                      ]};
+   key <AB01> { [               z, Z,               guillemotleft              ]};
+   key <AB02> { [               x, X,               guillemotright             ]};
+   key <AB07> { [               m, M,               mu                         ]};
+   key <AB08> { [           comma, quoteright,      less                       ]};
+   key <AB09> { [          period, quotedbl,        greater                    ]};
+   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};
+   
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ca(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index 82c0681cc..8a41ea303 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
@@ -1,133 +1,133 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys 

-xkb_symbols "de_type6" {

-

-    name[Group1]= "Switzerland - German";

-

-    key <TLDE> { [    section,     degree                           ] };

-    key <AE01> { [          1,       plus,          bar             ] };

-    key <AE02> { [          2,   quotedbl,           at             ] };

-    key <AE03> { [          3,   asterisk,   numbersign             ] };

-    key <AE04> { [          4,   ccedilla,  asciicircum             ] };

-    key <AE05> { [          5,    percent,   asciitilde             ] };

-    key <AE06> { [          6,  ampersand,      notsign             ] };

-    key <AE07> { [          7,      slash,    brokenbar             ] };

-    key <AE08> { [          8,  parenleft,         cent             ] };

-    key <AE09> { [          9, parenright                           ] };

-    key <AE10> { [          0,      equal,    quoteleft             ] };

-    key <AE11> { [ quoteright,   question,   dead_acute             ] };

-    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };

-

-    key <AD03> { [          e,          E,     EuroSign             ] };

-    key <AD06> { [          z,          Z                           ] };

-    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };

-    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };

-

-    key <AC10> { [ odiaeresis,     eacute                           ] };

-    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };

-    key <BKSL> { [     dollar,   sterling,   braceright             ] };

-

-    key <LSGT> { [       less,    greater,    backslash             ] };

-    key <AB01> { [          y,          Y                           ] };

-    key <AB08> { [      comma,  semicolon                           ] };

-    key <AB09> { [     period,      colon                           ] };

-    key <AB10> { [      minus, underscore                           ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-

-partial alphanumeric_keys 

-xkb_symbols "fr_type6" {

-

-    name[Group1]= "Switzerland - French, Sun type 6";

-

-    key <TLDE> { [    section,     degree                           ] };

-    key <AE01> { [          1,       plus,          bar             ] };

-    key <AE02> { [          2,   quotedbl,           at             ] };

-    key <AE03> { [          3,   asterisk,   numbersign             ] };

-    key <AE04> { [          4,   ccedilla,  asciicircum             ] };

-    key <AE05> { [          5,    percent,   asciitilde             ] };

-    key <AE06> { [          6,  ampersand,      notsign             ] };

-    key <AE07> { [          7,      slash,    brokenbar             ] };

-    key <AE08> { [          8,  parenleft,         cent             ] };

-    key <AE09> { [          9, parenright                           ] };

-    key <AE10> { [          0,      equal,    quoteleft             ] };

-    key <AE11> { [ quoteright,   question,   dead_acute             ] };

-    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };

-

-    key <AD03> { [          e,          E,     EuroSign             ] };

-    key <AD06> { [          z,          Z                           ] };

-    key <AD11> { [     egrave, udiaeresis,  bracketleft             ] };

-    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };

-

-    key <AC10> { [     eacute, odiaeresis                           ] };

-    key <AC11> { [     agrave, adiaeresis,    braceleft             ] };

-    key <BKSL> { [     dollar,   sterling,   braceright             ] };

-

-    key <LSGT> { [       less,    greater,    backslash             ] };

-    key <AB01> { [          y,          Y                           ] };

-    key <AB08> { [      comma,  semicolon                           ] };

-    key <AB09> { [     period,      colon                           ] };

-    key <AB10> { [      minus, underscore                           ] };

-	

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ch(de_type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "de_type6" {
+
+    name[Group1]= "Switzerland - German";
+
+    key <TLDE> { [    section,     degree                           ] };
+    key <AE01> { [          1,       plus,          bar             ] };
+    key <AE02> { [          2,   quotedbl,           at             ] };
+    key <AE03> { [          3,   asterisk,   numbersign             ] };
+    key <AE04> { [          4,   ccedilla,  asciicircum             ] };
+    key <AE05> { [          5,    percent,   asciitilde             ] };
+    key <AE06> { [          6,  ampersand,      notsign             ] };
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE08> { [          8,  parenleft,         cent             ] };
+    key <AE09> { [          9, parenright                           ] };
+    key <AE10> { [          0,      equal,    quoteleft             ] };
+    key <AE11> { [ quoteright,   question,   dead_acute             ] };
+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
+
+    key <AD03> { [          e,          E,     EuroSign             ] };
+    key <AD06> { [          z,          Z                           ] };
+    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };
+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
+
+    key <AC10> { [ odiaeresis,     eacute                           ] };
+    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };
+    key <BKSL> { [     dollar,   sterling,   braceright             ] };
+
+    key <LSGT> { [       less,    greater,    backslash             ] };
+    key <AB01> { [          y,          Y                           ] };
+    key <AB08> { [      comma,  semicolon                           ] };
+    key <AB09> { [     period,      colon                           ] };
+    key <AB10> { [      minus, underscore                           ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+
+partial alphanumeric_keys 
+xkb_symbols "fr_type6" {
+
+    name[Group1]= "Switzerland - French, Sun type 6";
+
+    key <TLDE> { [    section,     degree                           ] };
+    key <AE01> { [          1,       plus,          bar             ] };
+    key <AE02> { [          2,   quotedbl,           at             ] };
+    key <AE03> { [          3,   asterisk,   numbersign             ] };
+    key <AE04> { [          4,   ccedilla,  asciicircum             ] };
+    key <AE05> { [          5,    percent,   asciitilde             ] };
+    key <AE06> { [          6,  ampersand,      notsign             ] };
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE08> { [          8,  parenleft,         cent             ] };
+    key <AE09> { [          9, parenright                           ] };
+    key <AE10> { [          0,      equal,    quoteleft             ] };
+    key <AE11> { [ quoteright,   question,   dead_acute             ] };
+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
+
+    key <AD03> { [          e,          E,     EuroSign             ] };
+    key <AD06> { [          z,          Z                           ] };
+    key <AD11> { [     egrave, udiaeresis,  bracketleft             ] };
+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
+
+    key <AC10> { [     eacute, odiaeresis                           ] };
+    key <AC11> { [     agrave, adiaeresis,    braceleft             ] };
+    key <BKSL> { [     dollar,   sterling,   braceright             ] };
+
+    key <LSGT> { [       less,    greater,    backslash             ] };
+    key <AB01> { [          y,          Y                           ] };
+    key <AB08> { [      comma,  semicolon                           ] };
+    key <AB09> { [     period,      colon                           ] };
+    key <AB10> { [      minus, underscore                           ] };
+	
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ch(de_type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index 55859db9a..b46f01c2b 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
@@ -1,105 +1,105 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Czech";

-

-    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};

-    key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};

-    key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};

-    key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};

-    key <AE04>	{ [    ccaron,          4,	dollar,     dead_breve 		]	};

-    key <AE05>	{ [    rcaron,          5,	percent, dead_abovering 	] 	};

-    key <AE06>	{ [    zcaron,          6,	asciicircum,  dead_ogonek 	]	};

-    key <AE07>	{ [    yacute,          7,	ampersand,          grave 	]	};

-    key <AE08>	{ [    aacute,          8,	asterisk,  dead_abovedot	]	};

-    key <AE09>	{ [    iacute,          9,	parenleft,    dead_acute    	]	};

-    key <AE10>	{ [    eacute,          0,	parenright, dead_doubleacute	]	};

-    key <AE11>	{ [     equal,    percent,	dead_diaeresis, backslash 	]	};

-    key <AE12>	{ [ dead_acute, dead_caron,	dead_cedilla, minus 		]	};

-

-    key <AD01>	{ [         q,          Q,	backslash 		]	};

-    key <AD02>	{ [         w,          W,	bar 			]	};

-    key <AD03>	{ [         e,          E,	EuroSign 		]	};

-    key <AD06>	{ [         z,          Z 				]	};

-    key <AD11>	{ [    uacute,      slash,	division 		]	};

-    key <AD12>	{ [parenright,  parenleft,	multiply 		]	};

-

-    key <AC02>	{ [         s,          S,	dstroke			]	};

-    key <AC03>	{ [         d,          D,	Dstroke 		]	};

-    key <AC04>	{ [         f,          F,	bracketleft 		]	};

-    key <AC05>	{ [         g,          G,	bracketright 		]	};

-    key <AC08>	{ [         k,          K,	lstroke 		]	};

-    key <AC09>	{ [         l,          L,	Lstroke 		]	};              

-    key <AC10>	{ [      uring,       quotedbl,	dollar 			]	};

-    key <AC11>	{ [    section,         exclam,	ssharp,       currency	]	};

-    key <BKSL>	{ [ dead_diaeresis, apostrophe,	backslash,         bar	]	};

-

-    key <LSGT>	{ [  backslash,       asterisk,	slash,	     brokenbar	]	};

-    key <AB01>	{ [          y,          Y,	less	 		]	};

-    key <AB02>	{ [          x,          X,	greater,    numbersign  ]	};

-    key <AB04>	{ [          v,          V,	at 			]	};

-    key <AB05>	{ [          b,          B,	braceleft 		]	};

-    key <AB06>	{ [          n,          N,	braceright	 	]	};

-    key <AB08>	{ [      comma,       question,	less			]	};

-    key <AB09>	{ [     period,          colon,	greater			]	};

-    key <AB10>	{ [      minus,     underscore                   	]	};

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/cz(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Czech";
+
+    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};
+    key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};
+    key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};
+    key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};
+    key <AE04>	{ [    ccaron,          4,	dollar,     dead_breve 		]	};
+    key <AE05>	{ [    rcaron,          5,	percent, dead_abovering 	] 	};
+    key <AE06>	{ [    zcaron,          6,	asciicircum,  dead_ogonek 	]	};
+    key <AE07>	{ [    yacute,          7,	ampersand,          grave 	]	};
+    key <AE08>	{ [    aacute,          8,	asterisk,  dead_abovedot	]	};
+    key <AE09>	{ [    iacute,          9,	parenleft,    dead_acute    	]	};
+    key <AE10>	{ [    eacute,          0,	parenright, dead_doubleacute	]	};
+    key <AE11>	{ [     equal,    percent,	dead_diaeresis, backslash 	]	};
+    key <AE12>	{ [ dead_acute, dead_caron,	dead_cedilla, minus 		]	};
+
+    key <AD01>	{ [         q,          Q,	backslash 		]	};
+    key <AD02>	{ [         w,          W,	bar 			]	};
+    key <AD03>	{ [         e,          E,	EuroSign 		]	};
+    key <AD06>	{ [         z,          Z 				]	};
+    key <AD11>	{ [    uacute,      slash,	division 		]	};
+    key <AD12>	{ [parenright,  parenleft,	multiply 		]	};
+
+    key <AC02>	{ [         s,          S,	dstroke			]	};
+    key <AC03>	{ [         d,          D,	Dstroke 		]	};
+    key <AC04>	{ [         f,          F,	bracketleft 		]	};
+    key <AC05>	{ [         g,          G,	bracketright 		]	};
+    key <AC08>	{ [         k,          K,	lstroke 		]	};
+    key <AC09>	{ [         l,          L,	Lstroke 		]	};              
+    key <AC10>	{ [      uring,       quotedbl,	dollar 			]	};
+    key <AC11>	{ [    section,         exclam,	ssharp,       currency	]	};
+    key <BKSL>	{ [ dead_diaeresis, apostrophe,	backslash,         bar	]	};
+
+    key <LSGT>	{ [  backslash,       asterisk,	slash,	     brokenbar	]	};
+    key <AB01>	{ [          y,          Y,	less	 		]	};
+    key <AB02>	{ [          x,          X,	greater,    numbersign  ]	};
+    key <AB04>	{ [          v,          V,	at 			]	};
+    key <AB05>	{ [          b,          B,	braceleft 		]	};
+    key <AB06>	{ [          n,          N,	braceright	 	]	};
+    key <AB08>	{ [      comma,       question,	less			]	};
+    key <AB09>	{ [     period,          colon,	greater			]	};
+    key <AB10>	{ [      minus,     underscore                   	]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/cz(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
index 2c46ea941..5177b989a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
@@ -1,140 +1,140 @@
-//

-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Germany";

-

-    key <TLDE> { [     asciicircum,           degree                   ] };

-    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 

-    key <AE03> { [               3,          section,   threesuperior  ] };

-    key <AE04> { [               4,           dollar                   ] };

-    key <AE06> { [               6,        ampersand,         section  ] };

-    key <AE07> { [               7,            slash,       braceleft  ] };

-    key <AE08> { [               8,        parenleft,     bracketleft  ] };

-    key <AE09> { [               9,       parenright,    bracketright  ] };

-    key <AE10> { [               0,            equal,      braceright  ] };

-    key <AE11> { [          ssharp,         question,       backslash  ] };

-    key <AE12> { [      dead_acute,       dead_grave                   ] };

-    key <AD01> { [               q,                Q,              at  ] };

-    key <AD03> { [               e,                E,        EuroSign  ] };

-    key <AD06> { [               z,                Z                   ] };

-    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };

-    key <AD12> { [            plus,         asterisk,      asciitilde  ] };

-    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };

-    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };

-    key <AB01> { [               y,                Y                   ] };

-    key <AB07> { [               m,                M,              mu  ] };

-    key <AB08> { [           comma,        semicolon                   ] };

-    key <AB09> { [          period,            colon                   ] };

-    key <AB10> { [           minus,       underscore                   ] };

-    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };

-    key <LSGT> { [            less,          greater,             bar  ] };

-

-        include "level3(ralt_switch)"

-        include "kpdl(comma)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-    name[Group1]="Germany - Sun type 4";

-

-    key <BKSL>  { [           less,     braceleft     					      ] };

-    key <BRCR>  { [        greater,    braceright     					      ] };

-    key <DELE>  { [         Delete                                                            ] };

-

-    key <AE01> { [               1,          plus,               exclam                       ] };

-    key <AE02> { [               2,      quotedbl,                   at,            oneeighth ]	};

-    key <AE03> { [               3,      asterisk,           numbersign,             sterling ]	};

-    key <AE04> { [               4,      ccedilla,                 cent                       ]	};

-    key <AE05> { [               5,       percent,           asciitilde                       ] };

-    key <AE06> { [               6,     ampersand,              section                       ] };

-    key <AE07> { [               7,         slash,                  bar                       ] };

-    key <AE08> { [               8,     parenleft,               degree                       ] };

-    key <AE09> { [               9,    parenright,            backslash                       ] };

-    key <AE10> { [               0,         equal,          asciicircum                       ] };

-    Key <AE11> { [      quoteright,      question,            quoteleft                       ] };

-    key <AE12> { [ dead_circumflex,    dead_grave                                             ] };

-

-    key <AD03>	{ [              e,             E,             EuroSign,             EuroSign ]	};

-    key <AD06>	{ [              z,             Z,            leftarrow,                  yen ]	};

-    key <AD11>	{ [     udiaeresis,        egrave,       dead_diaeresis,       dead_abovering ] };

-    key <AD12>	{ [ dead_diaeresis,    dead_acute                                             ] };

-

-    key <AC02>  { [              s,             S                                             ] };

-    key <AC07>  { [              j,             J,        dead_belowdot,        dead_abovedot ] };

-    key <AC10>	{ [     odiaeresis,        eacute,     dead_doubleacute,        dead_belowdot ] };

-    key <AC11>	{ [     adiaeresis,        agrave,      dead_circumflex,           dead_caron ] };

-    key <TLDE>	{ [         dollar,    dead_tilde,             sterling                       ] };

-

-    key <AB01>	{ [              y,             Y,       guillemotright                       ] };

-    key <AB02>	{ [              x,             X,        guillemotleft 	              ] };

-    key <AB04>	{ [              v,             V,   doublelowquotemark,   singlelowquotemark ]	};

-    key <AB05>	{ [              b,             B,  leftdoublequotemark,  leftsinglequotemark ] };

-    key <AB06>	{ [              n,             N, rightdoublequotemark, rightsinglequotemark ]	};    

-    key <AB07>  { [              m,             M,                   mu                       ] };

-    key <AB08>  { [          comma,     semicolon,       periodcentered,             multiply ] };

-    key <AB09>	{ [         period,         colon                                             ] };

-    key <AB10>	{ [          minus,    underscore                                             ] };

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/de(type6)"

-};

+//
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Germany";
+
+    key <TLDE> { [     asciicircum,           degree                   ] };
+    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 
+    key <AE03> { [               3,          section,   threesuperior  ] };
+    key <AE04> { [               4,           dollar                   ] };
+    key <AE06> { [               6,        ampersand,         section  ] };
+    key <AE07> { [               7,            slash,       braceleft  ] };
+    key <AE08> { [               8,        parenleft,     bracketleft  ] };
+    key <AE09> { [               9,       parenright,    bracketright  ] };
+    key <AE10> { [               0,            equal,      braceright  ] };
+    key <AE11> { [          ssharp,         question,       backslash  ] };
+    key <AE12> { [      dead_acute,       dead_grave                   ] };
+    key <AD01> { [               q,                Q,              at  ] };
+    key <AD03> { [               e,                E,        EuroSign  ] };
+    key <AD06> { [               z,                Z                   ] };
+    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };
+    key <AD12> { [            plus,         asterisk,      asciitilde  ] };
+    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };
+    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };
+    key <AB01> { [               y,                Y                   ] };
+    key <AB07> { [               m,                M,              mu  ] };
+    key <AB08> { [           comma,        semicolon                   ] };
+    key <AB09> { [          period,            colon                   ] };
+    key <AB10> { [           minus,       underscore                   ] };
+    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };
+    key <LSGT> { [            less,          greater,             bar  ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Germany - Sun type 4";
+
+    key <BKSL>  { [           less,     braceleft     					      ] };
+    key <BRCR>  { [        greater,    braceright     					      ] };
+    key <DELE>  { [         Delete                                                            ] };
+
+    key <AE01> { [               1,          plus,               exclam                       ] };
+    key <AE02> { [               2,      quotedbl,                   at,            oneeighth ]	};
+    key <AE03> { [               3,      asterisk,           numbersign,             sterling ]	};
+    key <AE04> { [               4,      ccedilla,                 cent                       ]	};
+    key <AE05> { [               5,       percent,           asciitilde                       ] };
+    key <AE06> { [               6,     ampersand,              section                       ] };
+    key <AE07> { [               7,         slash,                  bar                       ] };
+    key <AE08> { [               8,     parenleft,               degree                       ] };
+    key <AE09> { [               9,    parenright,            backslash                       ] };
+    key <AE10> { [               0,         equal,          asciicircum                       ] };
+    Key <AE11> { [      quoteright,      question,            quoteleft                       ] };
+    key <AE12> { [ dead_circumflex,    dead_grave                                             ] };
+
+    key <AD03>	{ [              e,             E,             EuroSign,             EuroSign ]	};
+    key <AD06>	{ [              z,             Z,            leftarrow,                  yen ]	};
+    key <AD11>	{ [     udiaeresis,        egrave,       dead_diaeresis,       dead_abovering ] };
+    key <AD12>	{ [ dead_diaeresis,    dead_acute                                             ] };
+
+    key <AC02>  { [              s,             S                                             ] };
+    key <AC07>  { [              j,             J,        dead_belowdot,        dead_abovedot ] };
+    key <AC10>	{ [     odiaeresis,        eacute,     dead_doubleacute,        dead_belowdot ] };
+    key <AC11>	{ [     adiaeresis,        agrave,      dead_circumflex,           dead_caron ] };
+    key <TLDE>	{ [         dollar,    dead_tilde,             sterling                       ] };
+
+    key <AB01>	{ [              y,             Y,       guillemotright                       ] };
+    key <AB02>	{ [              x,             X,        guillemotleft 	              ] };
+    key <AB04>	{ [              v,             V,   doublelowquotemark,   singlelowquotemark ]	};
+    key <AB05>	{ [              b,             B,  leftdoublequotemark,  leftsinglequotemark ] };
+    key <AB06>	{ [              n,             N, rightdoublequotemark, rightsinglequotemark ]	};    
+    key <AB07>  { [              m,             M,                   mu                       ] };
+    key <AB08>  { [          comma,     semicolon,       periodcentered,             multiply ] };
+    key <AB09>	{ [         period,         colon                                             ] };
+    key <AB10>	{ [          minus,    underscore                                             ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/de(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
index 0cc81153d..e5db30e7f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
@@ -1,147 +1,147 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Denmark";

-

-    key <TLDE> { [         onehalf,         section                ] };

-    key <AE02> { [               2,        quotedbl,            at ] };

-    key <AE03> { [               3,      numbersign,      sterling ] };

-    key <AE04> { [               4,        currency,        dollar ] };

-    key <AE05> { [               5,         percent,    asciitilde ] };

-    key <AE06> { [               6,       ampersand,   asciicircum ] };

-    key <AE07> { [               7,           slash,     braceleft ] };

-    key <AE08> { [               8,       parenleft,   bracketleft ] };

-    key <AE09> { [               9,      parenright,  bracketright ] };

-    key <AE10> { [               0,           equal,    braceright ] };

-    key <AE11> { [            plus,        question                ] };

-    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 

-    key <AD03> { [               e,               E,      EuroSign ] }; 

-    key <AD11> { [           aring,           Aring                ] };

-    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };

-    key <BKSL> { [      apostrophe,        asterisk,         grave ] };

-    key <AC10> { [              ae,              AE                ] };

-    key <AC11> { [          oslash,        Ooblique                ] };

-    key <AB08> { [           comma,       semicolon                ] };

-    key <AB09> { [          period,           colon                ] };

-    key <AB10> { [           minus,      underscore                ] };

-    key <LSGT> { [            less,         greater,     backslash ] };

-

-        include "level3(ralt_switch)"

-        include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-   name[Group1]="Denmark - Sun type 4";

-

-   key <BKSL> { [ onehalf,        section                        ] };

-   key <BRCR> { [ asciitilde,     asciicircum                    ] };

-   key <AE02> { [ 2,              quotedbl,       at             ] };

-   key <AE03> { [ 3,              numbersign,     sterling       ] };

-   key <AE04> { [ 4,              currency,       dollar         ] };

-   key <AE06> { [ 6,              ampersand                      ] };

-   key <AE07> { [ 7,              slash,          braceleft      ] };

-   key <AE08> { [ 8,              parenleft,      bracketleft    ] };

-   key <AE09> { [ 9,              parenright,     bracketright   ] };

-   key <AE10> { [ 0,              equal,          braceright     ] };

-   key <AE11> { [ plus,           question                       ] };

-   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };

-   key <AD03> { [ e,              E,              EuroSign       ] };

-   key <AD11> { [ aring,          Aring                          ] };

-   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };

-   key <LCTL> { [ Caps_Lock                                      ] };

-   key <AC10> { [ ae,             AE                             ] };

-   key <AC11> { [ ooblique,       Ooblique                       ] };

-   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };

-   key <LSGT> { [ less,           greater,         backslash     ] };

-   key <AB08> { [ comma,          semicolon                      ] };

-   key <AB09> { [ period,         colon                          ] };

-   key <AB10> { [ minus,          underscore                     ] };

-   key <CAPS> { [ Control_L                                      ] };

-   key <COMP> { [ SunAltGraph                                    ] };

-   key <ALGR> { [ SunCompose                                     ] };

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type5" {

-

-   include "sun_vndr/dk(type4)"

-

-    name[Group1]="Denmark - Sun type 5";

-

-    key <AE05> { [ 5,           percent,     asciitilde                 ] };

-    key <AE06> { [ 6,           ampersand,   asciicircum                ] };

-    key <AE07> { [ 7,           slash,       braceleft                  ] };

-    key <AE08> { [ 8,           parenleft,   bracketleft                ] };

-    key <AE09> { [ 9,           parenright,  bracketright               ] };

-    key <AE10> { [ 0,           equal,       braceright                 ] };

-    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };

-    

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/dk(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Denmark";
+
+    key <TLDE> { [         onehalf,         section                ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,      numbersign,      sterling ] };
+    key <AE04> { [               4,        currency,        dollar ] };
+    key <AE05> { [               5,         percent,    asciitilde ] };
+    key <AE06> { [               6,       ampersand,   asciicircum ] };
+    key <AE07> { [               7,           slash,     braceleft ] };
+    key <AE08> { [               8,       parenleft,   bracketleft ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,    braceright ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 
+    key <AD03> { [               e,               E,      EuroSign ] }; 
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };
+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
+    key <AC10> { [              ae,              AE                ] };
+    key <AC11> { [          oslash,        Ooblique                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+    key <LSGT> { [            less,         greater,     backslash ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+   name[Group1]="Denmark - Sun type 4";
+
+   key <BKSL> { [ onehalf,        section                        ] };
+   key <BRCR> { [ asciitilde,     asciicircum                    ] };
+   key <AE02> { [ 2,              quotedbl,       at             ] };
+   key <AE03> { [ 3,              numbersign,     sterling       ] };
+   key <AE04> { [ 4,              currency,       dollar         ] };
+   key <AE06> { [ 6,              ampersand                      ] };
+   key <AE07> { [ 7,              slash,          braceleft      ] };
+   key <AE08> { [ 8,              parenleft,      bracketleft    ] };
+   key <AE09> { [ 9,              parenright,     bracketright   ] };
+   key <AE10> { [ 0,              equal,          braceright     ] };
+   key <AE11> { [ plus,           question                       ] };
+   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };
+   key <AD03> { [ e,              E,              EuroSign       ] };
+   key <AD11> { [ aring,          Aring                          ] };
+   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };
+   key <LCTL> { [ Caps_Lock                                      ] };
+   key <AC10> { [ ae,             AE                             ] };
+   key <AC11> { [ ooblique,       Ooblique                       ] };
+   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };
+   key <LSGT> { [ less,           greater,         backslash     ] };
+   key <AB08> { [ comma,          semicolon                      ] };
+   key <AB09> { [ period,         colon                          ] };
+   key <AB10> { [ minus,          underscore                     ] };
+   key <CAPS> { [ Control_L                                      ] };
+   key <COMP> { [ SunAltGraph                                    ] };
+   key <ALGR> { [ SunCompose                                     ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+
+   include "sun_vndr/dk(type4)"
+
+    name[Group1]="Denmark - Sun type 5";
+
+    key <AE05> { [ 5,           percent,     asciitilde                 ] };
+    key <AE06> { [ 6,           ampersand,   asciicircum                ] };
+    key <AE07> { [ 7,           slash,       braceleft                  ] };
+    key <AE08> { [ 8,           parenleft,   bracketleft                ] };
+    key <AE09> { [ 9,           parenright,  bracketright               ] };
+    key <AE10> { [ 0,           equal,       braceright                 ] };
+    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };
+    
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/dk(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
index 914a80dde..0530f9e2f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
@@ -1,117 +1,117 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Estonia";

-

-

-   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };

-   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };

-   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };

-   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };

-   key <AE04> { [              4,      currency,	dollar,        dollar ] };

-   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };

-   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };

-   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };

-   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };

-   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };

-   key <AE10> { [              0,         equal,	braceright,        degree ] };

-   key <AE11> { [           plus,      question,	backslash,  questiondown ] };

-   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };

-

-   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };

-   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };

-   key <AD03> { [              e,             E,	EuroSign,          cent ] };

-   key <AD04> { [              r,             R,	paragraph,    registered ] };

-   key <AD05> { [              t,             T,	tslash,        Tslash ] };

-   key <AD06> { [              y,             Y,	leftarrow,           yen ] };

-   key <AD07> { [              u,             U,	downarrow,       uparrow ] };

-   key <AD08> { [              i,             I,	rightarrow,      idotless ] };

-   key <AD09> { [              o,             O,	oslash,      Ooblique ] };

-   key <AD10> { [              p,             P,	thorn,         THORN ] };

-   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };

-   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };

-

-   key <AC01> { [              a,             A,	ae,            AE ] };

-   key <AC02> { [              s,             S,	ssharp,       section ] };

-   key <AC03> { [              d,             D,	eth,           ETH ] };

-   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };

-   key <AC05> { [              g,             G,	eng,           ENG ] };

-   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };

-   key <AC07> { [              j,             J,	j,             J ] };

-   key <AC08> { [              k,             K,	kra,     ampersand ] };

-   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };

-   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };

-   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };

-   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };

-

-   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };

-   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };

-   key <AB02> { [              x,             X,	guillemotright,       greater ] };

-   key <AB03> { [              c,             C,	cent,     copyright ] };

-   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };

-   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };

-   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };

-   key <AB07> { [              m,             M,	mu,     masculine ] };

-   key <AB08> { [          comma,     semicolon,	less,      multiply ] };

-   key <AB09> { [         period,         colon,	greater,      division ] };

-   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ee(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Estonia";
+
+
+   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };
+   key <AE04> { [              4,      currency,	dollar,        dollar ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };
+   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };
+   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };
+   key <AE10> { [              0,         equal,	braceright,        degree ] };
+   key <AE11> { [           plus,      question,	backslash,  questiondown ] };
+   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };
+
+   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };
+   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };
+   key <AD03> { [              e,             E,	EuroSign,          cent ] };
+   key <AD04> { [              r,             R,	paragraph,    registered ] };
+   key <AD05> { [              t,             T,	tslash,        Tslash ] };
+   key <AD06> { [              y,             Y,	leftarrow,           yen ] };
+   key <AD07> { [              u,             U,	downarrow,       uparrow ] };
+   key <AD08> { [              i,             I,	rightarrow,      idotless ] };
+   key <AD09> { [              o,             O,	oslash,      Ooblique ] };
+   key <AD10> { [              p,             P,	thorn,         THORN ] };
+   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };
+   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };
+
+   key <AC01> { [              a,             A,	ae,            AE ] };
+   key <AC02> { [              s,             S,	ssharp,       section ] };
+   key <AC03> { [              d,             D,	eth,           ETH ] };
+   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };
+   key <AC05> { [              g,             G,	eng,           ENG ] };
+   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kra,     ampersand ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };
+   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	guillemotright,       greater ] };
+   key <AB03> { [              c,             C,	cent,     copyright ] };
+   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };
+   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	mu,     masculine ] };
+   key <AB08> { [          comma,     semicolon,	less,      multiply ] };
+   key <AB09> { [         period,         colon,	greater,      division ] };
+   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ee(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
index 9cb25f382..6d28bc541 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
@@ -1,145 +1,145 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-//

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

- 

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Spain";

-

-    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };

-    key <LSGT> { [            less,         greater                ] };

-    key <AE01> { [               1,          exclam,           bar ] };

-    key <AE02> { [               2,        quotedbl,            at ] };

-    key <AE03> { [               3,  periodcentered,    numbersign ] };

-    key <AE04> { [               4,          dollar,   asciicircum ] };

-    key <AE05> { [               5,         percent,    asciitilde ] };

-    key <AE06> { [               6,       ampersand,       notsign ] };

-    key <AE07> { [               7,           slash                ] };

-    key <AE08> { [               8,       parenleft                ] };

-    key <AE09> { [               9,      parenright                ] }; 

-    key <AE10> { [               0,           equal                ] };

-    key <AE11> { [      apostrophe,        question,         grave ] };

-    key <AE12> { [      exclamdown,    questiondown                ] };

-    key <AD03> { [               e,               E,      EuroSign ] };

-    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };

-    key <AD12> { [            plus,        asterisk,  bracketright ] };

-    key <AC10> { [          ntilde,          Ntilde                ] };

-    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };

-    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };

-    key <AB08> { [           comma,       semicolon                ] };

-    key <AB09> { [          period,           colon                ] };

-    key <AB10> { [           minus,      underscore                ] };

-   

-        include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-    

-    name[Group1]="Spain - Sun type 4";

-

-    key <BKSL> { [ bracketleft, braceleft,  guillemotleft    ] };

-    key <BRCR> { [ bracketright, braceright,  guillemotright ] };

-    key <AE02> { [ 2, quotedbl,  at                 ] };

-    key <AE03> { [ 3, periodcentered,  numbersign       ] };

-    key <AE05> { [ 5, percent,  degree           ] };

-    key <AE06> { [ 6, ampersand,  notsign          ] };

-    key <AE07> { [ 7, slash             ]                       };

-    key <AE08> { [ 8, parenleft         ]                       };

-    key <AE09> { [ 9, parenright, backslash        ] };

-    key <AE10> { [ 0, equal,  bar              ] };

-    key <AE11> { [ quoteright, question,  quoteleft        ] };

-    key <AE12> { [ exclamdown, questiondown ] };

-    key <AD03> { [ e, E,  EuroSign         ] };

-    key <AD09> { [ o, O,  masculine        ] };

-    key <AD11> { [ dead_grave, dead_circumflex,  asciicircum ] };

-    key <AD12> { [ plus, asterisk,  asciitilde       ] };

-    key <AC01> { [ a, A,  ordfeminine      ] };

-    key <AC10> { [ ntilde, Ntilde               ]                       };

-    key <AC11> { [ dead_acute, dead_diaeresis ]                       };

-    key <TLDE> { [ ccedilla, Ccedilla             ]                       };

-    key <RALT> { [ Alt_R                ]                       };

-    key <LCTL> { [ Caps_Lock ] };

-    key <CAPS> { [ Control_L ] };

-    key <LSGT> { [ less, greater        ]                       };

-    key <AB08> { [ comma, semicolon     ]                       };

-    key <AB09> { [ period, colon        ]                       };

-    key <AB10> { [ minus, underscore    ]                       };

-    

-};

- 

-

-partial alphanumeric_keys

-xkb_symbols "type5" {

-    include "sun_vndr/es(type4)"

-

-    name[Group1]="Spain - Sun type 5";

- 

-    key <AE03> { [ 3, periodcentered,  numbersign                 ] };

-    key <AE04> { [ 4, dollar,  asciicircum                ] };

-    key <AE05> { [ 5, percent,  asciitilde                 ] };

-    key <AE07> { [ 7, slash,  braceleft                  ]};

-    key <AE08> { [ 8, parenleft,  bracketleft                ]};

-    key <AE09> { [ 9, parenright,  bracketright               ]};

-    key <AE10> { [ 0, equal,  braceright                 ]};

-    key <AE11> { [ quoteright, question,  quoteleft                  ] };

-    key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };

-    key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };

- 

-	include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/es(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+ 
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Spain";
+
+    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <AE01> { [               1,          exclam,           bar ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,  periodcentered,    numbersign ] };
+    key <AE04> { [               4,          dollar,   asciicircum ] };
+    key <AE05> { [               5,         percent,    asciitilde ] };
+    key <AE06> { [               6,       ampersand,       notsign ] };
+    key <AE07> { [               7,           slash                ] };
+    key <AE08> { [               8,       parenleft                ] };
+    key <AE09> { [               9,      parenright                ] }; 
+    key <AE10> { [               0,           equal                ] };
+    key <AE11> { [      apostrophe,        question,         grave ] };
+    key <AE12> { [      exclamdown,    questiondown                ] };
+    key <AD03> { [               e,               E,      EuroSign ] };
+    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };
+    key <AD12> { [            plus,        asterisk,  bracketright ] };
+    key <AC10> { [          ntilde,          Ntilde                ] };
+    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };
+    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+   
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+    
+    name[Group1]="Spain - Sun type 4";
+
+    key <BKSL> { [ bracketleft, braceleft,  guillemotleft    ] };
+    key <BRCR> { [ bracketright, braceright,  guillemotright ] };
+    key <AE02> { [ 2, quotedbl,  at                 ] };
+    key <AE03> { [ 3, periodcentered,  numbersign       ] };
+    key <AE05> { [ 5, percent,  degree           ] };
+    key <AE06> { [ 6, ampersand,  notsign          ] };
+    key <AE07> { [ 7, slash             ]                       };
+    key <AE08> { [ 8, parenleft         ]                       };
+    key <AE09> { [ 9, parenright, backslash        ] };
+    key <AE10> { [ 0, equal,  bar              ] };
+    key <AE11> { [ quoteright, question,  quoteleft        ] };
+    key <AE12> { [ exclamdown, questiondown ] };
+    key <AD03> { [ e, E,  EuroSign         ] };
+    key <AD09> { [ o, O,  masculine        ] };
+    key <AD11> { [ dead_grave, dead_circumflex,  asciicircum ] };
+    key <AD12> { [ plus, asterisk,  asciitilde       ] };
+    key <AC01> { [ a, A,  ordfeminine      ] };
+    key <AC10> { [ ntilde, Ntilde               ]                       };
+    key <AC11> { [ dead_acute, dead_diaeresis ]                       };
+    key <TLDE> { [ ccedilla, Ccedilla             ]                       };
+    key <RALT> { [ Alt_R                ]                       };
+    key <LCTL> { [ Caps_Lock ] };
+    key <CAPS> { [ Control_L ] };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    
+};
+ 
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    include "sun_vndr/es(type4)"
+
+    name[Group1]="Spain - Sun type 5";
+ 
+    key <AE03> { [ 3, periodcentered,  numbersign                 ] };
+    key <AE04> { [ 4, dollar,  asciicircum                ] };
+    key <AE05> { [ 5, percent,  asciitilde                 ] };
+    key <AE07> { [ 7, slash,  braceleft                  ]};
+    key <AE08> { [ 8, parenleft,  bracketleft                ]};
+    key <AE09> { [ 9, parenright,  bracketright               ]};
+    key <AE10> { [ 0, equal,  braceright                 ]};
+    key <AE11> { [ quoteright, question,  quoteleft                  ] };
+    key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };
+    key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };
+ 
+	include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/es(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index a2f8cd8f4..eaa19e848 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
@@ -1,89 +1,89 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-//

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

- 

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Finland";

-

-    key <TLDE> { [  section,         onehalf                                  ] };

-    key <AE01> { [  1,               exclam                                   ] };

-    key <AE02> { [  2,               quotedbl,         at                     ] };

-    key <AE03> { [  3,               numbersign,       sterling               ] };

-    key <AE04> { [  4,               currency,         dollar                 ] };

-    key <AE05> { [  5,               percent                                  ] };

-    key <AE06> { [  6,               ampersand                                ] };

-    key <AE07> { [  7,               slash,            braceleft              ] };

-    key <AE08> { [  8,               parenleft,        bracketleft            ] };

-    key <AE09> { [  9,               parenright,       bracketright           ] };

-    key <AE10> { [  0,               equal,            braceright             ] };

-    key <AE11> { [  plus,            question,         backslash              ] };

-    key <AE12> { [  dead_acute,      dead_grave                               ] };

-    key <AD03> { [  e,               E,                EuroSign               ] };

-    key <AD11> { [  aring,           Aring                                    ] };

-    key <AD12> { [  dead_diaeresis,  asciicircum,      asciitilde             ] };

-    key <AC10> { [  odiaeresis,      Odiaeresis                               ] };

-    key <AC11> { [  adiaeresis,      Adiaeresis                               ] };

-    key <BKSL> { [  apostrophe,      asterisk,         quoteleft              ] };

-    key <LSGT> { [  less,            greater,          bar                    ] };

-    key <AB08> { [  comma,           semicolon                                ] };

-    key <AB09> { [  period,          colon                                    ] };

-    key <AB10> { [  minus,           underscore                               ] };

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/fi(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+ 
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Finland";
+
+    key <TLDE> { [  section,         onehalf                                  ] };
+    key <AE01> { [  1,               exclam                                   ] };
+    key <AE02> { [  2,               quotedbl,         at                     ] };
+    key <AE03> { [  3,               numbersign,       sterling               ] };
+    key <AE04> { [  4,               currency,         dollar                 ] };
+    key <AE05> { [  5,               percent                                  ] };
+    key <AE06> { [  6,               ampersand                                ] };
+    key <AE07> { [  7,               slash,            braceleft              ] };
+    key <AE08> { [  8,               parenleft,        bracketleft            ] };
+    key <AE09> { [  9,               parenright,       bracketright           ] };
+    key <AE10> { [  0,               equal,            braceright             ] };
+    key <AE11> { [  plus,            question,         backslash              ] };
+    key <AE12> { [  dead_acute,      dead_grave                               ] };
+    key <AD03> { [  e,               E,                EuroSign               ] };
+    key <AD11> { [  aring,           Aring                                    ] };
+    key <AD12> { [  dead_diaeresis,  asciicircum,      asciitilde             ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis                               ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis                               ] };
+    key <BKSL> { [  apostrophe,      asterisk,         quoteleft              ] };
+    key <LSGT> { [  less,            greater,          bar                    ] };
+    key <AB08> { [  comma,           semicolon                                ] };
+    key <AB09> { [  period,          colon                                    ] };
+    key <AB10> { [  minus,           underscore                               ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fi(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
index e3e6828ef..a3850ba5f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
@@ -1,96 +1,96 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="France";

-

-    key <TLDE>  { [     twosuperior                              ] };

-    key <AE01>	{ [       ampersand,          1                  ] };

-    key <AE02>	{ [          eacute,          2,   asciitilde    ] };

-    key <AE03>	{ [        quotedbl,          3,   numbersign    ] };

-    key <AE04>	{ [      apostrophe,          4,    braceleft    ] };

-    key <AE05>	{ [       parenleft,          5,  bracketleft    ] };

-    key <AE06>	{ [           minus,          6,          bar    ] };

-    key <AE07>	{ [          egrave,          7,        grave    ] };

-    key <AE08>	{ [      underscore,          8,    backslash    ] };

-    key <AE09>	{ [        ccedilla,          9,  asciicircum    ] };

-    key <AE10>	{ [          agrave,          0,           at    ] };

-    key <AE11>	{ [      parenright,     degree, bracketright    ] };

-    key <AE12>	{ [           equal,       plus,   braceright    ] };

-

-    key <AD01>	{ [               a,          A                  ] };

-    key <AD02>	{ [               z,          Z                  ] };

-    key <AD03>	{ [               e,          E,     EuroSign    ] };

-    key <AD11>	{ [ dead_circumflex, dead_diaeresis              ] };

-    key <AD12>	{ [          dollar,   sterling,     currency    ] };

-

-    key <AC01>	{ [               q,          Q                  ] };

-    key <AC10>	{ [               m,          M                  ] };

-    key <AC11>	{ [          ugrave,    percent                  ] };

-    key <BKSL>	{ [        asterisk,         mu                  ] };

-

-    key <LSGT>  { [            less,    greater                  ] };

-    key <AB01>	{ [               w,          W                  ] };

-    key <AB07>	{ [           comma,   question                  ] };

-    key <AB08>	{ [       semicolon,     period                  ] };

-    key <AB09>	{ [           colon,      slash                  ] };

-    key <AB10>	{ [          exclam,    section                  ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/fr(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="France";
+
+    key <TLDE>  { [     twosuperior                              ] };
+    key <AE01>	{ [       ampersand,          1                  ] };
+    key <AE02>	{ [          eacute,          2,   asciitilde    ] };
+    key <AE03>	{ [        quotedbl,          3,   numbersign    ] };
+    key <AE04>	{ [      apostrophe,          4,    braceleft    ] };
+    key <AE05>	{ [       parenleft,          5,  bracketleft    ] };
+    key <AE06>	{ [           minus,          6,          bar    ] };
+    key <AE07>	{ [          egrave,          7,        grave    ] };
+    key <AE08>	{ [      underscore,          8,    backslash    ] };
+    key <AE09>	{ [        ccedilla,          9,  asciicircum    ] };
+    key <AE10>	{ [          agrave,          0,           at    ] };
+    key <AE11>	{ [      parenright,     degree, bracketright    ] };
+    key <AE12>	{ [           equal,       plus,   braceright    ] };
+
+    key <AD01>	{ [               a,          A                  ] };
+    key <AD02>	{ [               z,          Z                  ] };
+    key <AD03>	{ [               e,          E,     EuroSign    ] };
+    key <AD11>	{ [ dead_circumflex, dead_diaeresis              ] };
+    key <AD12>	{ [          dollar,   sterling,     currency    ] };
+
+    key <AC01>	{ [               q,          Q                  ] };
+    key <AC10>	{ [               m,          M                  ] };
+    key <AC11>	{ [          ugrave,    percent                  ] };
+    key <BKSL>	{ [        asterisk,         mu                  ] };
+
+    key <LSGT>  { [            less,    greater                  ] };
+    key <AB01>	{ [               w,          W                  ] };
+    key <AB07>	{ [           comma,   question                  ] };
+    key <AB08>	{ [       semicolon,     period                  ] };
+    key <AB09>	{ [           colon,      slash                  ] };
+    key <AB10>	{ [          exclam,    section                  ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index fc775cd98..78287ec06 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -1,102 +1,102 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="United Kingdom";

-

-    key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };

-

-    key <AE02> { [          2,   quotedbl             ] };

-    key <AE03> { [          3,   sterling             ] };

-    key <AE04> { [          4,     dollar,   EuroSign ] };

-    key <BKSL> { [ numbersign, asciitilde             ] };

-    key <AC11> { [ apostrophe,         at             ] };

-    key <LSGT> { [  backslash,        bar             ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type5" {

-

-    name[Group1]="United Kingdom - Sun type 5";

-

-    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };

-    key <AD03> {        [               e,      E,          EuroSign          ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-    name[Group1]="United Kingdom - Sun type 4";

-

-    key <AE01> { [      1,     exclam,   brokenbar ] };

-    key <AE03> { [      3,   sterling,  numbersign ] };

-    key <AE04> { [      4,     dollar,    EuroSign ] };

-    key <AE11> { [  minus, underscore,     notsign ] };

-    key <AD03> { [      e,          E,    EuroSign ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/gb(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="United Kingdom";
+
+    key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };
+
+    key <AE02> { [          2,   quotedbl             ] };
+    key <AE03> { [          3,   sterling             ] };
+    key <AE04> { [          4,     dollar,   EuroSign ] };
+    key <BKSL> { [ numbersign, asciitilde             ] };
+    key <AC11> { [ apostrophe,         at             ] };
+    key <LSGT> { [  backslash,        bar             ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+
+    name[Group1]="United Kingdom - Sun type 5";
+
+    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };
+    key <AD03> {        [               e,      E,          EuroSign          ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="United Kingdom - Sun type 4";
+
+    key <AE01> { [      1,     exclam,   brokenbar ] };
+    key <AE03> { [      3,   sterling,  numbersign ] };
+    key <AE04> { [      4,     dollar,    EuroSign ] };
+    key <AE11> { [  minus, underscore,     notsign ] };
+    key <AD03> { [      e,          E,    EuroSign ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gb(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
index c3a83dad0..1f3fac799 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
@@ -1,117 +1,117 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Greece";

-

-

-	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };

-	key <AE01> { [                     1,         exclam ] };

-	key <AE02> { [                     2,             at ] };

-	key <AE03> { [                     3,     numbersign,	sterling ] };

-	key <AE04> { [                     4,         dollar,	EuroSign ] };

-	key <AE05> { [                     5,        percent,	EuroSign ] };

-	key <AE06> { [                     6,    asciicircum,	notsign ] };

-	key <AE07> { [                     7,      ampersand ] };

-	key <AE08> { [                     8,       asterisk ] };

-	key <AE09> { [                     9,      parenleft ] };

-	key <AE10> { [                     0,     parenright,	degree ] };

-	key <AE11> { [                 minus,     underscore,	plusminus ] };

-	key <AE12> { [                 equal,           plus ] };

-

-	key <AD01> { [             semicolon,          colon,	periodcentered ] };

-	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };

-	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };

-	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };

-	key <AD05> { [             Greek_tau,      Greek_TAU ] };

-	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };

-	key <AD07> { [           Greek_theta,    Greek_THETA ] };

-	key <AD08> { [            Greek_iota,     Greek_IOTA ] };

-	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };

-	key <AD10> { [              Greek_pi,       Greek_PI ] };

-	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };

-	key <AD12> { [          bracketright,     braceright,	guillemotright ] };

-

-	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };

-	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };

-	key <AC03> { [           Greek_delta,    Greek_DELTA ] };

-	key <AC04> { [             Greek_phi,      Greek_PHI ] };

-	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };

-	key <AC06> { [             Greek_eta,      Greek_ETA ] };

-	key <AC07> { [              Greek_xi,       Greek_XI ] };

-	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };

-	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };

-	key <AC10> { [            dead_acute, dead_diaeresis ] };

-	key <AC11> { [            apostrophe,       quotedbl ] };

-	key <BKSL> { [             backslash,            bar,	brokenbar ] };

-

-	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };

-        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };

-        key <AB02> { [             Greek_chi,      Greek_CHI ] };

-        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };

-        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };

-        key <AB05> { [            Greek_beta,     Greek_BETA ] };

-        key <AB06> { [              Greek_nu,       Greek_NU ] };

-        key <AB07> { [              Greek_mu,       Greek_MU ] };

-	key <AB08> { [                 comma,           less,	guillemotleft ] };

-	key <AB09> { [                period,        greater,	guillemotright ] };

-	key <AB10> { [                 slash,       question ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/gr(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Greece";
+
+
+	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };
+	key <AE01> { [                     1,         exclam ] };
+	key <AE02> { [                     2,             at ] };
+	key <AE03> { [                     3,     numbersign,	sterling ] };
+	key <AE04> { [                     4,         dollar,	EuroSign ] };
+	key <AE05> { [                     5,        percent,	EuroSign ] };
+	key <AE06> { [                     6,    asciicircum,	notsign ] };
+	key <AE07> { [                     7,      ampersand ] };
+	key <AE08> { [                     8,       asterisk ] };
+	key <AE09> { [                     9,      parenleft ] };
+	key <AE10> { [                     0,     parenright,	degree ] };
+	key <AE11> { [                 minus,     underscore,	plusminus ] };
+	key <AE12> { [                 equal,           plus ] };
+
+	key <AD01> { [             semicolon,          colon,	periodcentered ] };
+	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };
+	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };
+	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };
+	key <AD05> { [             Greek_tau,      Greek_TAU ] };
+	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };
+	key <AD07> { [           Greek_theta,    Greek_THETA ] };
+	key <AD08> { [            Greek_iota,     Greek_IOTA ] };
+	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };
+	key <AD10> { [              Greek_pi,       Greek_PI ] };
+	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };
+	key <AD12> { [          bracketright,     braceright,	guillemotright ] };
+
+	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };
+	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };
+	key <AC03> { [           Greek_delta,    Greek_DELTA ] };
+	key <AC04> { [             Greek_phi,      Greek_PHI ] };
+	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };
+	key <AC06> { [             Greek_eta,      Greek_ETA ] };
+	key <AC07> { [              Greek_xi,       Greek_XI ] };
+	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };
+	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };
+	key <AC10> { [            dead_acute, dead_diaeresis ] };
+	key <AC11> { [            apostrophe,       quotedbl ] };
+	key <BKSL> { [             backslash,            bar,	brokenbar ] };
+
+	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };
+        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
+        key <AB02> { [             Greek_chi,      Greek_CHI ] };
+        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
+        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
+        key <AB05> { [            Greek_beta,     Greek_BETA ] };
+        key <AB06> { [              Greek_nu,       Greek_NU ] };
+        key <AB07> { [              Greek_mu,       Greek_MU ] };
+	key <AB08> { [                 comma,           less,	guillemotleft ] };
+	key <AB09> { [                period,        greater,	guillemotright ] };
+	key <AB10> { [                 slash,       question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
index 7149b0996..acd94a2fb 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
@@ -1,140 +1,140 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Italy";

-

-    key <LSGT> { [            less,         greater                                ] };

-    key <TLDE> { [       backslash,             bar                                ] };

-    key <AE02> { [               2,        quotedbl                                ] };

-    key <AE03> { [               3,        sterling                                ] };

-    key <AE06> { [               6,       ampersand                                ] };

-    key <AE07> { [               7,           slash                                ] };

-    key <AE08> { [               8,       parenleft,    braceleft                  ] };     

-    key <AE09> { [               9,      parenright,   braceright                  ] };     

-    key <AE10> { [               0,           equal                                ] };

-    key <AE11> { [      apostrophe,        question,        grave                  ] };     

-    key <AE12> { [          igrave,     asciicircum                                ] };

-    key <AD03> { [               e,               E,     EuroSign                  ] };

-    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };

-    key <AD12> { [            plus,        asterisk, bracketright                  ] };      

-    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };

-    key <AC10> { [          ograve,        ccedilla,           at                  ] };      

-    key <AC11> { [          agrave,          degree,   numbersign                  ] };

-    key <AB08> { [           comma,       semicolon                                ] };

-    key <AB09> { [          period,           colon                                ] };

-    key <AB10> { [           minus,      underscore                                ] };

-

-        include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-    name[Group1]="Italy - Sun type 4";

- 

-    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };

-    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };

-    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };

-    key <AE03> { [ 3,            sterling,     threesuperior    ] };

-    key <AE06> { [ 6,            ampersand,    notsign          ] };

-    key <AE06> { [ 7,            slash                          ] };

-    key <AE06> { [ 8,            parenleft                      ] };

-    key <AE09> { [ 9,            parenright,   backslash        ] };

-    key <AE10> { [ 0,            equal,        bar              ] };

-    key <AE11> { [ quoteright,   question,     quoteleft        ] };

-    key <AE12> { [ igrave,       asciicircum                    ] };

- 

-    key <AD11> { [ egrave,       eacute                         ] };

-    key <AD12> { [ plus,         asterisk,     asciitilde       ] };

- 

-    key <AC10> { [ ograve,       ccedilla,     at               ] };

-    key <AC11> { [ agrave,       degree,       numbersign       ] };

-    key <TLDE> { [ ugrave,       section                        ] };

- 

-    key <LSGT> { [ less, greater        ] };

-    key <AB08> { [ comma, semicolon     ] };

-    key <AB09> { [ period, colon        ] };

-    key <AB10> { [ minus, underscore    ] };

-     

- 

-    key <LALT> { [ Alt_L                ] };

-    key <COMP> { [ SunCompose           ] };

-    key <RALT> { [ SunAltGraph          ] };

-    key <LCTL> { [ Caps_Lock            ] };

-    key <CAPS> { [ Control_L            ] };

- 

-	include "level3(ralt_switch)"

-

-};

-

- 

-partial alphanumeric_keys

-xkb_symbols "type5" {

-

-    name[Group1]="Italy - Sun type 5";

-

-    key <AE08> { [ 8,      parenleft,   braceleft                  ] };

-    key <AE09> { [ 9,      parenright,  braceright                 ] };

-    key <BKSL> { [ ugrave, section,     asciitilde                 ] };

-

-	include "level3(ralt_switch)"

-

-};

- 

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/it(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Italy";
+
+    key <LSGT> { [            less,         greater                                ] };
+    key <TLDE> { [       backslash,             bar                                ] };
+    key <AE02> { [               2,        quotedbl                                ] };
+    key <AE03> { [               3,        sterling                                ] };
+    key <AE06> { [               6,       ampersand                                ] };
+    key <AE07> { [               7,           slash                                ] };
+    key <AE08> { [               8,       parenleft,    braceleft                  ] };     
+    key <AE09> { [               9,      parenright,   braceright                  ] };     
+    key <AE10> { [               0,           equal                                ] };
+    key <AE11> { [      apostrophe,        question,        grave                  ] };     
+    key <AE12> { [          igrave,     asciicircum                                ] };
+    key <AD03> { [               e,               E,     EuroSign                  ] };
+    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };
+    key <AD12> { [            plus,        asterisk, bracketright                  ] };      
+    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };
+    key <AC10> { [          ograve,        ccedilla,           at                  ] };      
+    key <AC11> { [          agrave,          degree,   numbersign                  ] };
+    key <AB08> { [           comma,       semicolon                                ] };
+    key <AB09> { [          period,           colon                                ] };
+    key <AB10> { [           minus,      underscore                                ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Italy - Sun type 4";
+ 
+    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };
+    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };
+    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };
+    key <AE03> { [ 3,            sterling,     threesuperior    ] };
+    key <AE06> { [ 6,            ampersand,    notsign          ] };
+    key <AE06> { [ 7,            slash                          ] };
+    key <AE06> { [ 8,            parenleft                      ] };
+    key <AE09> { [ 9,            parenright,   backslash        ] };
+    key <AE10> { [ 0,            equal,        bar              ] };
+    key <AE11> { [ quoteright,   question,     quoteleft        ] };
+    key <AE12> { [ igrave,       asciicircum                    ] };
+ 
+    key <AD11> { [ egrave,       eacute                         ] };
+    key <AD12> { [ plus,         asterisk,     asciitilde       ] };
+ 
+    key <AC10> { [ ograve,       ccedilla,     at               ] };
+    key <AC11> { [ agrave,       degree,       numbersign       ] };
+    key <TLDE> { [ ugrave,       section                        ] };
+ 
+    key <LSGT> { [ less, greater        ] };
+    key <AB08> { [ comma, semicolon     ] };
+    key <AB09> { [ period, colon        ] };
+    key <AB10> { [ minus, underscore    ] };
+     
+ 
+    key <LALT> { [ Alt_L                ] };
+    key <COMP> { [ SunCompose           ] };
+    key <RALT> { [ SunAltGraph          ] };
+    key <LCTL> { [ Caps_Lock            ] };
+    key <CAPS> { [ Control_L            ] };
+ 
+	include "level3(ralt_switch)"
+
+};
+
+ 
+partial alphanumeric_keys
+xkb_symbols "type5" {
+
+    name[Group1]="Italy - Sun type 5";
+
+    key <AE08> { [ 8,      parenleft,   braceleft                  ] };
+    key <AE09> { [ 9,      parenright,  braceright                 ] };
+    key <BKSL> { [ ugrave, section,     asciitilde                 ] };
+
+	include "level3(ralt_switch)"
+
+};
+ 
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/it(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index 9b6579e2a..26911494a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
@@ -1,816 +1,816 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-//

-//Copyright 1996, 1998  The Open Group

-//

-//All Rights Reserved.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// US/ASCII layout for a Type 4 Sun keyboard

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-xkb_symbols "basic" {

-    // Alphanumeric section

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

-    key <BKSP> { [ BackSpace		]	};

-

-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U			], [ kana_NA		]	};

-    key <AD08> { [ i, I			], [ kana_NI		]	};

-    key <AD09> { [ o, O			], [ kana_RA		]	};

-    key <AD10> { [ p, P			], [ kana_SE		]	};

-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-    key <RTRN> { [ Return		]	};

-

-    key <CAPS> { [ Caps_Lock		]	};

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J			], [ kana_MA		]	};

-    key <AC08> { [ k, K			], [ kana_NO		]	};

-    key <AC09> { [ l, L			], [ kana_RI		]	};

-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		]	};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

-

-    key <SPCE> { [ space		]			};

-    key <KANJ> { [ Kanji		]			};

-    key <HENK> { [ Henkan_Mode		]			};

-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <ESC>  { [ Escape		]			};

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };

-//    key <BRCR> { [ Linefeed		]			};

-    key <EXEC> { [ Execute		]			};

-};

-xkb_symbols "type4" {

-

-    // Alphanumeric section

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

-    key <BKSP> { [ BackSpace		]	};

-

-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U			], [ kana_NA		]	};

-    key <AD08> { [ i, I			], [ kana_NI		]	};

-    key <AD09> { [ o, O			], [ kana_RA		]	};

-    key <AD10> { [ p, P			], [ kana_SE		]	};

-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-    key <RTRN> { [ Return		]	};

-

-    key <CAPS> { [ Caps_Lock		]	};

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J			], [ kana_MA		]	};

-    key <AC08> { [ k, K			], [ kana_NO		]	};

-    key <AC09> { [ l, L			], [ kana_RI		]	};

-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <LFSH> { [ Shift_L		]	};

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		]	};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

-    key <RTSH> { [ Shift_R		]	};

-

-    key <LCTL> { [ Control_L		]			};

-    key <SPCE> { [ space		]			};

-    key <KANJ> { [ Kanji		]			};

-    key <HENK> { [ Henkan_Mode		]			};

-    key <LALT> { [ Alt_L		]			};

-    key <ALGR> { [ Mode_switch		]			};

-    key <LMTA> { [ Meta_L		]			};

-    key <RMTA> { [ Meta_R		]			};

-    key <LNFD> { [ backslash, underscore], [ kana_RO		]};

-    key <COMP> { [ Multi_key		]			};

-    key <EXEC> { [ Execute		]			};

-//    key <TLFD> { [ Linefeed		]			};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <ESC>  { [ Escape		]			};

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };

-    key <BRCR> { [ Linefeed		]			};

-

-    key <STOP> { [ L1,	L1		], [ SunStop	]	};

-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};

-    key <PROP> { [ L3,	L3		], [ SunProps	]	};

-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};

-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};

-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};

-    key <FIND> { [ L9,	L9		], [ SunFind	]	};

-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2,	R2		], [ Print		] };

-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };

-    key <PAUS> { [ R1,	R1		], [ Pause		] };

-    key <DELE> { [ Delete		]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-    key <NMLK> { [ Num_Lock 		]			};

-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };

-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };

-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };

-    key <KPSU> { [ KP_Subtract		]			};

-

-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };

-    key  <KP8> { [ Up,	R8		], [ KP_8		] };

-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };

-    key <KPAD> { [ KP_Add		]			};

-

-    key  <KP4> { [ Left, R10		], [ KP_4		] };

-    key  <KP5> { [ R11,	R11		], [ KP_5		] };

-    key  <KP6> { [ Right, R12		], [ KP_6		] };

-

-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };

-    key  <KP2> { [ Down, R14		], [ KP_2		] };

-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };

-    key <KPEN> { [ KP_Enter		]			}; 

-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};

-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};

-    // End "Keypad" section

-

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R, Shift_L };

-    modifier_map Mod1   	{ Meta_L, Meta_R };

-    modifier_map Mod2   	{ Mode_switch };

-    modifier_map Mod3   	{ Num_Lock };

-    modifier_map Mod4		{ Alt_L };

-};

-

-// US/ASCII layout for a Type 5 Sun keyboard

-xkb_symbols "type5" {

-

-    // Alphanumeric section

-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

-    key <BKSP> { [ BackSpace		]	};

-

-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U			], [ kana_NA		]	};

-    key <AD08> { [ i, I			], [ kana_NI		]	};

-    key <AD09> { [ o, O			], [ kana_RA		]	};

-    key <AD10> { [ p, P			], [ kana_SE		]	};

-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-    key <RTRN> { [ Return		]	};

-

-    key <CAPS> { [ Caps_Lock		]	};

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J			], [ kana_MA		]	};

-    key <AC08> { [ k, K			], [ kana_NO		]	};

-    key <AC09> { [ l, L			], [ kana_RI		]	};

-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <LFSH> { [ Shift_L		]	};

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		]	};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

-    key <RTSH> { [ Shift_R		]	};

-

-    key <LCTL> { [ Control_L		]			};

-//    key <RCTL> { [ Control_R		]			};

-    key <EXEC> { [ Execute		]			};

-    key <SPCE> { [ space		]			};

-    key <KANJ> { [ Kanji		]			};

-    key <HENK> { [ Henkan_Mode		]			};

-    key <LALT> { [ Alt_L		]	};

-    key <ALGR> { [ Mode_switch		]	};

-    key <LMTA> { [ Meta_L		]	};

-    key <RMTA> { [ Meta_R		]	};

-    key <COMP> { [ Multi_key		]	};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <ESC>  { [ Escape		]			};

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <STOP> { [ L1, L1		], [ SunStop	]	};

-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

-    key <PROP> { [ L3, L3		], [ SunProps	]	};

-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5, L5		], [ SunFront	]	};

-    key <COPY> { [ L6, L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

-    key <PAST> { [ L8, L8		], [ SunPaste	]	};

-    key <FIND> { [ L9, L9		], [ SunFind	]	};

-    key <CUT>  { [ L10, L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

-    key <LEFT> { [ Left			]			};

-    key <RGHT> { [ Right		]			};

-    key <UP>   { [ Up			]			};

-    key <DOWN> { [ Down			]			};

-

-    key <DELE> { [ Delete		]			};

-    key <INS>  { [ Insert		]			};

-    key <PGUP> { [ Prior		]			};

-    key <PGDN> { [ Next			]			};

-    key <HOME> { [ Home			]			};

-    key <END>  { [ End			]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-    key <NMLK> { [ Num_Lock 		]				};

-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

-

-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

-    key  <KP8> { [ Up, R8		], [ KP_8		]	};

-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

-    key <KPAD> { [ KP_Add		]				};

-

-    key  <KP4> { [ Left, R10		], [ KP_4		]	};

-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};

-    key  <KP6> { [ Right, R12		], [ KP_6		]	};

-

-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

-    key  <KP2> { [ Down, R14		], [ KP_2		]	};

-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};

-    key <KPEN> { [ KP_Enter		]				};

-

-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

-    // End "Keypad" section, 

-    // begin "four keys up on the right"

-

-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_R };

-    modifier_map Mod1	{ Meta_L, Meta_R };

-    modifier_map Mod2	{ Alt_R };

-    modifier_map Mod3	{ Num_Lock };

-    modifier_map Mod4	{ Alt_L };

-};

-

-xkb_symbols "type5hobo" {

-

-    // Alphanumeric section

-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};

-    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

-    key <BKSP> { [ BackSpace		]	};

-

-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};

-    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};

-    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};

-    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};

-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };

-

-    key <CAPS> { [ Caps_Lock		]	};

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};

-    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};

-    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};

-    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <LFSH> { [ Shift_L		]	};

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};

-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

-    key <RTSH> { [ Shift_R		]	};

-

-    key <LCTL> { [ Control_L		]			};

-    key <EXEC> { [ Execute		]			};

-    key <SPCE> { [ space		]			};

-    key <KANJ> { [ Kanji		]			};

-    key <HENK> { [ Henkan_Mode		]			};

-    key <LALT> { [ Alt_L		]	};

-    key <ALGR> { [ Mode_switch		]	};

-    key <LMTA> { [ Meta_L		]	};

-    key <RMTA> { [ Meta_R		]	};

-    key <COMP> { [ Multi_key		]	};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <ESC>  { [ Escape		]			};

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <STOP> { [ L1, L1		], [ SunStop	]	};

-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

-    key <PROP> { [ L3, L3		], [ SunProps	]	};

-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5, L5		], [ SunFront	]	};

-    key <COPY> { [ L6, L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

-    key <PAST> { [ L8, L8		], [ SunPaste	]	};

-    key <FIND> { [ L9, L9		], [ SunFind	]	};

-    key <CUT>  { [ L10, L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

-    key <LEFT> { [ Left			]			};

-    key <RGHT> { [ Right		]			};

-    key <UP>   { [ Up			]			};

-    key <DOWN> { [ Down			]			};

-

-    key <DELE> { [ Delete		]			};

-    key <INS>  { [ Insert		]			};

-    key <PGUP> { [ Prior		]			};

-    key <PGDN> { [ Next			]			};

-    key <HOME> { [ Home			]			};

-    key <END>  { [ End			]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-     key <NMLK> { [ Num_Lock 		]				};

-//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

-//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

-//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

-

-//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

-//     key  <KP8> { [ Up, R8		], [ KP_8		]	};

-//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

-//     key <KPAD> { [ KP_Add		]				};

-

-//     key  <KP4> { [ Left, R10		], [ KP_4		]	};

-//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};

-//     key  <KP6> { [ Right, R12		], [ KP_6		]	};

-

-//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

-//     key  <KP2> { [ Down, R14		], [ KP_2		]	};

-//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};

-//     key <KPEN> { [ KP_Enter		]				};

-

-//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

-//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

-    // End "Keypad" section, 

-    // begin "four keys up on the right"

-

-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_R };

-    modifier_map Mod1	{ Meta_L, Meta_R };

-    modifier_map Mod2	{ Alt_R };

-    modifier_map Mod3	{ Num_Lock };

-    modifier_map Mod4	{ Alt_L };

-};

-

-// layout for a Japanese Type 6 Sun keyboard

-// Just shows differences from Type 6 US layout 

-partial

-xkb_symbols "type6" {

-

-    // Alphanumeric section

-    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.

-    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

-

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U			], [ kana_NA		]	};

-    key <AD08> { [ i, I			], [ kana_NI		]	};

-    key <AD09> { [ o, O			], [ kana_RA		]	};

-    key <AD10> { [ p, P			], [ kana_SE		]	};

-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J			], [ kana_MA		]	};

-    key <AC08> { [ k, K			], [ kana_NO		]	};

-    key <AC09> { [ l, L			], [ kana_RI		]	};

-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		]	};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

-    key <AB11> { [ backslash, underscore], [ kana_RO		]	};

-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

-

-    key <EXEC> { [ Execute		]			};

-    key <KANJ> { [ Kanji		]			};

-    key <HENK> { [ Henkan_Mode		]			};

-    key <ALGR> { [ Kana_Lock, Mode_switch ]	};

-    // End alphanumeric section

-};

-

-xkb_symbols "x86" {

-    include "sun_vndr/us(pc101)"

-    include "sun_vndr/jp(basic)"

-    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };

-

-    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};

-    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};

-

-    

-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};

-

-    key <ALGR> { [ Mode_switch ]	       };

-    key <RALT> { [ Alt_R ]	       };

-

-};

-

-xkb_symbols "J3100" {

-    include "sun_vndr/us(pc101)"

-

-    // Alphanumeric section

-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

-    key <AE11> { [ minus, equal		], [ kana_HO		]	};

-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

-    key <BKSP> { [ BackSpace		]	};

-

-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

-    key <AD01> { [ q, Q 		], [ kana_TA		]	};

-    key <AD02> { [ w, W			], [ kana_TE		]	};

-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

-    key <AD04> { [ r, R			], [ kana_SU		]	};

-    key <AD05> { [ t, T			], [ kana_KA		]	};

-    key <AD06> { [ y, Y			], [ kana_N		]	};

-    key <AD07> { [ u, U			], [ kana_NA		]	};

-    key <AD08> { [ i, I			], [ kana_NI		]	};

-    key <AD09> { [ o, O			], [ kana_RA		]	};

-    key <AD10> { [ p, P			], [ kana_SE		]	};

-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

-    key <RTRN> { [ Return		]	};

-

-    key <CAPS> { [ Caps_Lock		]	};

-    key <AC01> { [ a, A 		], [ kana_CHI		]	};

-    key <AC02> { [ s, S			], [ kana_TO		]	};

-    key <AC03> { [ d, D			], [ kana_SHI		]	};

-    key <AC04> { [ f, F			], [ kana_HA		]	};

-    key <AC05> { [ g, G			], [ kana_KI		]	};

-    key <AC06> { [ h, H			], [ kana_KU		]	};

-    key <AC07> { [ j, J			], [ kana_MA		]	};

-    key <AC08> { [ k, K			], [ kana_NO		]	};

-    key <AC09> { [ l, L			], [ kana_RI		]	};

-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

-

-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

-    key <AB02> { [ x, X			], [ kana_SA		]	};

-    key <AB03> { [ c, C			], [ kana_SO		]	};

-    key <AB04> { [ v, V			], [ kana_HI		]	};

-    key <AB05> { [ b, B			], [ kana_KO		]	};

-    key <AB06> { [ n, N			], [ kana_MI		]	};

-    key <AB07> { [ m, M			], [ kana_MO		]	};

-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

-//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

-

-    key <SPCE> { [ space		]			};

-//    key <KANJ> { [ Kanji		]			};

-//    key <HENK> { [ Henkan_Mode		]			};

-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <ESC>  { [ Escape		]			};

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };

-//    key <BRCR> { [ Linefeed		]			};

-//    key <EXEC> { [ Execute		]			};

-

-    key <ESC>  { [ Escape, 3 ] };

-

-    key <AE02> { [ 2, at		], [ kana_FU			]};

-    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};

-    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};

-    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};

-    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};

-    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};

-    key <AE11> { [ minus, underscore	], [ kana_HO			]};

-    key <AE12> { [ equal, plus		], [ kana_HE			]};

-

-    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};

-    key <AE12> { [ equal, plus		], [ kana_HE			]};

-

-    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    

-    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    

-

-    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    

-    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    

-

-    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};

-    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};

-//    key <ALGR> { [ Mode_switch ]	       };

-    key <RALT> { [ Henkan_Mode ]	       };

-    key <RCTL> { [ Mode_switch ]	       };

-

-};

-

-xkb_symbols "Muhenkan_x86" {

-    include "sun_vndr/jp(x86)"

-

-    key <EXEC> { [ Muhenkan ] };

-};

-

-

-

-partial

-xkb_symbols "type7" {

-    include "sun_vndr/jp(type6)"

-    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };

-    key <TLDE> { [ Henkan_Mode ] };

-    key <HENK> { [ Kana_Lock, Mode_switch ] };

-    key <ALGR> { [ Alt_R, Alt_R ] };

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "basic" {
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+    key <EXEC> { [ Execute		]			};
+};
+xkb_symbols "type4" {
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    key <COMP> { [ Multi_key		]			};
+    key <EXEC> { [ Execute		]			};
+//    key <TLFD> { [ Linefeed		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+    key <BRCR> { [ Linefeed		]			};
+
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+//    key <RCTL> { [ Control_R		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5hobo" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
+    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
+    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
+    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
+    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
+    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
+    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+     key <NMLK> { [ Num_Lock 		]				};
+//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
+//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+//     key <KPAD> { [ KP_Add		]				};
+
+//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
+//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
+//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+//     key <KPEN> { [ KP_Enter		]				};
+
+//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+// layout for a Japanese Type 6 Sun keyboard
+// Just shows differences from Type 6 US layout 
+partial
+xkb_symbols "type6" {
+
+    // Alphanumeric section
+    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
+    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <EXEC> { [ Execute		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
+    // End alphanumeric section
+};
+
+xkb_symbols "x86" {
+    include "sun_vndr/us(pc101)"
+    include "sun_vndr/jp(basic)"
+    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
+
+    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
+    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
+
+    
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
+
+    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Alt_R ]	       };
+
+};
+
+xkb_symbols "J3100" {
+    include "sun_vndr/us(pc101)"
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+//    key <KANJ> { [ Kanji		]			};
+//    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+//    key <EXEC> { [ Execute		]			};
+
+    key <ESC>  { [ Escape, 3 ] };
+
+    key <AE02> { [ 2, at		], [ kana_FU			]};
+    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
+    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
+    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
+    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
+    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
+    key <AE11> { [ minus, underscore	], [ kana_HO			]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
+    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
+
+    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
+    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
+
+    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
+    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
+//    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Henkan_Mode ]	       };
+    key <RCTL> { [ Mode_switch ]	       };
+
+};
+
+xkb_symbols "Muhenkan_x86" {
+    include "sun_vndr/jp(x86)"
+
+    key <EXEC> { [ Muhenkan ] };
+};
+
+
+
+partial
+xkb_symbols "type7" {
+    include "sun_vndr/jp(type6)"
+    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
+    key <TLDE> { [ Henkan_Mode ] };
+    key <HENK> { [ Kana_Lock, Mode_switch ] };
+    key <ALGR> { [ Alt_R, Alt_R ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index 0973943bf..62cf63d71 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
@@ -1,97 +1,97 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-// Korean layout for a Type 6 Sun keyboard

-partial

-xkb_symbols "type6" {

-

-    // A few keys are different

-    key <ALGR> { [ Hangul                       ]       };

-    key <COMP> { [ Hangul_Hanja                 ]       };

-    key <KANA> { [ Hangul                       ]       };

-    key <EISU> { [ Hangul_Hanja                 ]       };

-    key <BKSL> { [ backslash, bar,  brokenbar   ]       };

-

-        include "level3(ralt_switch)"

-

-};

-

-

-// Korean layout for a Type 4 Sun keyboard

-xkb_symbols "type4" {

-

-    key <BKSL> { [ backslash, bar,  brokenbar	]		};

-

-    key <LNFD> { [ Hangul		]			};

-    key <RALT> { [ Linefeed		]			};

-    key <COMP> { [ Hangul_Hanja		]			};

-

-	include "level3(ralt_switch)"

-

-};

-

-// Korean layout for a Type 5 Sun keyboard

-xkb_symbols "type5" {

-

-    // A few keys are different

-    key <ALGR> { [ Hangul		]				  };

-    key <COMP> { [ Hangul_Hanja		]				  };

-    key <BKSL> { [ backslash, bar,  brokenbar			] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial default alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/kr(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Korean layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+
+    // A few keys are different
+    key <ALGR> { [ Hangul                       ]       };
+    key <COMP> { [ Hangul_Hanja                 ]       };
+    key <KANA> { [ Hangul                       ]       };
+    key <EISU> { [ Hangul_Hanja                 ]       };
+    key <BKSL> { [ backslash, bar,  brokenbar   ]       };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+// Korean layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+
+    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+
+    key <LNFD> { [ Hangul		]			};
+    key <RALT> { [ Linefeed		]			};
+    key <COMP> { [ Hangul_Hanja		]			};
+
+	include "level3(ralt_switch)"
+
+};
+
+// Korean layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // A few keys are different
+    key <ALGR> { [ Hangul		]				  };
+    key <COMP> { [ Hangul_Hanja		]				  };
+    key <BKSL> { [ backslash, bar,  brokenbar			] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/kr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index b82ebcfb9..8e8bee0f8 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -1,118 +1,118 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Lithuania";

-

-

-

-    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };

-    key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };

-    key <AE02>  { [    ccaron,       Ccaron,	2,          at ]    };

-    key <AE03>  { [   eogonek,      Eogonek,	3,  numbersign ]    };

-    key <AE04>  { [ eabovedot,    Eabovedot,	4,      dollar ]    };

-    key <AE05>  { [   iogonek,      Iogonek,	5,     percent ]    };

-    key <AE06>  { [    scaron,       Scaron,	6, asciicircum ]    };

-    key <AE07>  { [   uogonek,      Uogonek,	7,   ampersand ]    };

-    key <AE08>  { [   umacron,      Umacron,	8,    asterisk ]    };

-    key <AE09>  { [  doublelowquotemark,  parenleft,	9,  parenleft ]    };

-    key <AE10>  { [ leftdoublequotemark, parenright,	0, parenright ]    };

-    key <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };

-    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };

-

-    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };

-    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };

-    key <AD03>  { [         e,          E,	EuroSign               ] };

-    key <AD04>  { [         r,          R,	paragraph,   registered ] };

-    key <AD05>  { [         t,          T,	tslash,       Tslash ] };

-    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };

-    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };

-    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };

-    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };

-    key <AD10>  { [         p,          P,	thorn,        THORN ] };

-    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };

-    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };

-

-    key <AC01>  { [         a,          A,	ae,           AE ] };

-    key <AC02>  { [         s,          S,	ssharp,      section ] };

-    key <AC03>  { [         d,          D,	eth,          ETH ] };

-    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };

-    key <AC05>  { [         g,          G,	eng,          ENG ] };

-    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };

-    key <AC07>  { [         j,          J ] 				    };

-    key <AC08>  { [         k,          K,	kra,    ampersand ] };

-    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };

-    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };

-    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };

-    key <LSGT>  { [  backslash,       bar,	dead_grave,   dead_breve ] };

-

-    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };

-    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };

-    key <AB02>  { [         x,          X,	guillemotright,    greater ] };

-    key <AB03>  { [         c,          C,	cent,    copyright ] };

-    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };

-    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };

-    key <AB06>  { [         n,          N ]     };

-    key <AB07>  { [         m,          M,	mu,    masculine ] };

-    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };

-    key <AB09>  { [    period,    greater,	periodcentered,   division ] };

-    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/lt(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Lithuania";
+
+
+
+    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
+    key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };
+    key <AE02>  { [    ccaron,       Ccaron,	2,          at ]    };
+    key <AE03>  { [   eogonek,      Eogonek,	3,  numbersign ]    };
+    key <AE04>  { [ eabovedot,    Eabovedot,	4,      dollar ]    };
+    key <AE05>  { [   iogonek,      Iogonek,	5,     percent ]    };
+    key <AE06>  { [    scaron,       Scaron,	6, asciicircum ]    };
+    key <AE07>  { [   uogonek,      Uogonek,	7,   ampersand ]    };
+    key <AE08>  { [   umacron,      Umacron,	8,    asterisk ]    };
+    key <AE09>  { [  doublelowquotemark,  parenleft,	9,  parenleft ]    };
+    key <AE10>  { [ leftdoublequotemark, parenright,	0, parenright ]    };
+    key <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };
+    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };
+
+    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };
+    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };
+    key <AD03>  { [         e,          E,	EuroSign               ] };
+    key <AD04>  { [         r,          R,	paragraph,   registered ] };
+    key <AD05>  { [         t,          T,	tslash,       Tslash ] };
+    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };
+    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };
+    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };
+    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };
+    key <AD10>  { [         p,          P,	thorn,        THORN ] };
+    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };
+    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };
+
+    key <AC01>  { [         a,          A,	ae,           AE ] };
+    key <AC02>  { [         s,          S,	ssharp,      section ] };
+    key <AC03>  { [         d,          D,	eth,          ETH ] };
+    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };
+    key <AC05>  { [         g,          G,	eng,          ENG ] };
+    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };
+    key <AC07>  { [         j,          J ] 				    };
+    key <AC08>  { [         k,          K,	kra,    ampersand ] };
+    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };
+    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };
+    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };
+    key <LSGT>  { [  backslash,       bar,	dead_grave,   dead_breve ] };
+
+    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };
+    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };
+    key <AB02>  { [         x,          X,	guillemotright,    greater ] };
+    key <AB03>  { [         c,          C,	cent,    copyright ] };
+    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };
+    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };
+    key <AB06>  { [         n,          N ]     };
+    key <AB07>  { [         m,          M,	mu,    masculine ] };
+    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };
+    key <AB09>  { [    period,    greater,	periodcentered,   division ] };
+    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lt(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
index d1573868b..befcfc679 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
@@ -1,117 +1,117 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Latvia";

-

-

-   key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };

-   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };

-   key <AE02> { [              2,            at,	twosuperior,     oneeighth ] };

-   key <AE03> { [              3,    numbersign,	threesuperior,      sterling ] };

-   key <AE04> { [              4,        dollar,	EuroSign,          cent ] };

-   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };

-   key <AE06> { [              6,   asciicircum,	threequarters,   fiveeighths ] };

-   key <AE07> { [              7,     ampersand,	braceleft,  seveneighths ] };

-   key <AE08> { [              8,      asterisk,	bracketleft,     trademark ] };

-   key <AE09> { [              9,     parenleft,	bracketright,     plusminus ] };

-   key <AE10> { [              0,    parenright,	braceright,        degree ] };

-   key <AE11> { [          minus,    underscore,	backslash,  questiondown ] };

-   key <AE12> { [          equal,          plus,	endash,        emdash ] };

-

-   key <AD01> { [              q,             Q,	q,             Q ] };

-   key <AD02> { [              w,             W,	w,             W ] };

-   key <AD03> { [              e,             E,	emacron,       Emacron ] };

-   key <AD04> { [              r,             R,	rcedilla,      Rcedilla ] };

-   key <AD05> { [              t,             T,	t,             T ] };

-   key <AD06> { [              y,             Y,	y,             Y ] };

-   key <AD07> { [              u,             U,	umacron,       Umacron ] };

-   key <AD08> { [              i,             I,	imacron,       Imacron ] };

-   key <AD09> { [              o,             O,	omacron,       Omacron ] };

-   key <AD10> { [              p,             P,	p,             P ] };

-   key <AD11> { [    bracketleft,     braceleft,	guillemotleft, leftdoublequotemark ] };

-   key <AD12> { [   bracketright,    braceright,	guillemotright, rightdoublequotemark ] };

-

-   key <AC01> { [              a,             A,	amacron,       Amacron ] };

-   key <AC02> { [              s,             S,	scaron,        Scaron ] };

-   key <AC03> { [              d,             D,	d,             D ] };

-   key <AC04> { [              f,             F,	f,             F ] };

-   key <AC05> { [              g,             G,	gcedilla,      Gcedilla ] };

-   key <AC06> { [              h,             H,	h,             H ] };

-   key <AC07> { [              j,             J,	j,             J ] };

-   key <AC08> { [              k,             K,	kcedilla,      Kcedilla ] };

-   key <AC09> { [              l,             L,	lcedilla,      Lcedilla ] };

-   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };

-   key <AC11> { [     apostrophe,      quotedbl,	leftdoublequotemark, doublelowquotemark ] };

-   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };

-

-   key <BKSL> { [      backslash,           bar,	grave,         breve ] };

-   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };

-   key <AB02> { [              x,             X,	x,             X ] };

-   key <AB03> { [              c,             C,	ccaron,        Ccaron ] };

-   key <AB04> { [              v,             V,	v,             V ] };

-   key <AB05> { [              b,             B,	b,             B ] };

-   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };

-   key <AB07> { [              m,             M,	m,             M ] };

-   key <AB08> { [          comma,          less,	horizconnector,      multiply ] };

-   key <AB09> { [         period,       greater,	periodcentered,      division ] };

-   key <AB10> { [          slash,      question,	slash,      abovedot ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/lv(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Latvia";
+
+
+   key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,            at,	twosuperior,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	threesuperior,      sterling ] };
+   key <AE04> { [              4,        dollar,	EuroSign,          cent ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,   asciicircum,	threequarters,   fiveeighths ] };
+   key <AE07> { [              7,     ampersand,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,      asterisk,	bracketleft,     trademark ] };
+   key <AE09> { [              9,     parenleft,	bracketright,     plusminus ] };
+   key <AE10> { [              0,    parenright,	braceright,        degree ] };
+   key <AE11> { [          minus,    underscore,	backslash,  questiondown ] };
+   key <AE12> { [          equal,          plus,	endash,        emdash ] };
+
+   key <AD01> { [              q,             Q,	q,             Q ] };
+   key <AD02> { [              w,             W,	w,             W ] };
+   key <AD03> { [              e,             E,	emacron,       Emacron ] };
+   key <AD04> { [              r,             R,	rcedilla,      Rcedilla ] };
+   key <AD05> { [              t,             T,	t,             T ] };
+   key <AD06> { [              y,             Y,	y,             Y ] };
+   key <AD07> { [              u,             U,	umacron,       Umacron ] };
+   key <AD08> { [              i,             I,	imacron,       Imacron ] };
+   key <AD09> { [              o,             O,	omacron,       Omacron ] };
+   key <AD10> { [              p,             P,	p,             P ] };
+   key <AD11> { [    bracketleft,     braceleft,	guillemotleft, leftdoublequotemark ] };
+   key <AD12> { [   bracketright,    braceright,	guillemotright, rightdoublequotemark ] };
+
+   key <AC01> { [              a,             A,	amacron,       Amacron ] };
+   key <AC02> { [              s,             S,	scaron,        Scaron ] };
+   key <AC03> { [              d,             D,	d,             D ] };
+   key <AC04> { [              f,             F,	f,             F ] };
+   key <AC05> { [              g,             G,	gcedilla,      Gcedilla ] };
+   key <AC06> { [              h,             H,	h,             H ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kcedilla,      Kcedilla ] };
+   key <AC09> { [              l,             L,	lcedilla,      Lcedilla ] };
+   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
+   key <AC11> { [     apostrophe,      quotedbl,	leftdoublequotemark, doublelowquotemark ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [      backslash,           bar,	grave,         breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	x,             X ] };
+   key <AB03> { [              c,             C,	ccaron,        Ccaron ] };
+   key <AB04> { [              v,             V,	v,             V ] };
+   key <AB05> { [              b,             B,	b,             B ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	m,             M ] };
+   key <AB08> { [          comma,          less,	horizconnector,      multiply ] };
+   key <AB09> { [         period,       greater,	periodcentered,      division ] };
+   key <AB10> { [          slash,      question,	slash,      abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lv(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 8469039f7..3e0ba2011 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -1,148 +1,148 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-default partial alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Netherlands";

-

-    key <TLDE>  { [        at,    section,      notsign ] };

-    key <AE01>  { [         1,     exclam,  onesuperior ] };

-    key <AE02>  { [         2,   quotedbl,  twosuperior ] };

-    key <AE03>  { [         3,    numbersign, threesuperior ] };

-    key <AE04>  { [         4,    dollar,  onequarter ] };

-    key <AE05>  { [         5,    percent,   onehalf ] };

-    key <AE06>  { [         6,  ampersand, threequarters ] };

-    key <AE07>  { [         7, underscore,     sterling ] };

-    key <AE08>  { [         8,  parenleft,    braceleft ] };

-    key <AE09>  { [         9, parenright,   braceright ] };

-    key <AE10>  { [         0, quoteright,   quoteleft ] };

-    key <AE11>  { [     slash,   question,    backslash ] };

-    key <AE12>  { [    degree, dead_tilde, dead_cedilla ] };

-

-    key <AD03>  { [         e,          E,     EuroSign ] };

-    key <AD05>  { [         t,          T ] };

-    key <AD06>  { [         y,          Y ] };

-    key <AD07>  { [         u,          U ] };

-    key <AD08>  { [         i,          I ] };

-    key <AD09>  { [         o,          O ] };

-    key <AD10>  { [         p,          P ] };

-    key <AD11>  { [dead_diaeresis, dead_circumflex ]    };

-    key <AD12>  { [  asterisk,        bar,  asciitilde ] };

-

-    key <AC01>  { [         a,          A ] };

-    key <AC02>  { [         s,    S, ssharp ] };

-    key <AC04>  { [         f,          F ] };

-    key <AC10>  { [      plus,  plusminus ] };

-    key <AC11>  { [dead_acute, dead_grave ] };

-    key <BKSL>  { [      less,    greater,   asciicircum ] };

-

-    key <LSGT>  { [bracketright, bracketleft,       brokenbar ] };

-    key <AB01>  { [         z,    Z, guillemotleft ] };

-    key <AB02>  { [         x,    X, guillemotright ] };

-    key <AB03>  { [         c,    C, cent                     ] };

-    key <AB06>  { [         n,          N ] };

-    key <AB07>  { [         m,          M,     mu ] };

-    key <AB08>  { [     comma,  semicolon ] };

-    key <AB09>  { [    period,      colon ] };

-    key <AB10>  { [     minus,      equal ] };

-

-        include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-    name[Group1]="Netherlands - Sun type 4";

-

-    key <BKSL> { [ at, section, notsign ]           };

-    key <BRCR> { [ backslash, bar       ]                       };

-    key <AE01> { [ 1, exclam, onesuperior ]       };

-    key <AE02> { [ 2, quotedbl, twosuperior ]       };

-    key <AE03> { [ 3, numbersign, threesuperior]      };

-    key <AE04> { [ 4, dollar, onequarter  ]       };

-    key <AE05> { [ 5, percent, onehalf     ]       };

-    key <AE06> { [ 6, ampersand, threequarters]      };

-    key <AE07> { [ 7, underscore, sterling    ]       };

-    key <AE08> { [ 8, parenleft, braceleft   ]       };

-    key <AE09> { [ 9, parenright, braceright  ]       };

-    key <AE10> { [ 0, quoteright, quoteleft   ]       };

-    key <AE11> { [ slash, question, backslash  ]        };

-    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };

-    key <AD03> { [ e, E, EuroSign, Eacute    ]};

-    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};

-    key <AD12> { [ asterisk, bar, asciitilde  ]       };

-    key <AC02> { [ S, S, ssharp      ]               };

-    key <AC10> { [ plus, plusminus      ]                       };

-    key <AC11> { [ dead_acute, dead_grave ]                    };

-    key <TLDE> { [ less, greater, asciicircum ]       };

-    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };

-    key <AB01> { [ z, Z, guillemotleft]      };

-    key <AB02> { [ x, X, guillemotright]     };

-    key <AB03> { [ c, C, cent        ]       };

-    key <AB07> { [ m, M, Greek_mu, masculine ]       };

-    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };

-    key <AB09> { [ period, colon, periodcentered, guillemotright ] };

-    key <AB10> { [ minus, equal, hyphen ]            };

-    key <CAPS> { [ SunAltGraph          ]                       };

-//    key <COMP> { [ SunCompose         ]                       };

-    key <ALGR> { [ Caps_Lock            ]                       }; 

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/nl(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+default partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Netherlands";
+
+    key <TLDE>  { [        at,    section,      notsign ] };
+    key <AE01>  { [         1,     exclam,  onesuperior ] };
+    key <AE02>  { [         2,   quotedbl,  twosuperior ] };
+    key <AE03>  { [         3,    numbersign, threesuperior ] };
+    key <AE04>  { [         4,    dollar,  onequarter ] };
+    key <AE05>  { [         5,    percent,   onehalf ] };
+    key <AE06>  { [         6,  ampersand, threequarters ] };
+    key <AE07>  { [         7, underscore,     sterling ] };
+    key <AE08>  { [         8,  parenleft,    braceleft ] };
+    key <AE09>  { [         9, parenright,   braceright ] };
+    key <AE10>  { [         0, quoteright,   quoteleft ] };
+    key <AE11>  { [     slash,   question,    backslash ] };
+    key <AE12>  { [    degree, dead_tilde, dead_cedilla ] };
+
+    key <AD03>  { [         e,          E,     EuroSign ] };
+    key <AD05>  { [         t,          T ] };
+    key <AD06>  { [         y,          Y ] };
+    key <AD07>  { [         u,          U ] };
+    key <AD08>  { [         i,          I ] };
+    key <AD09>  { [         o,          O ] };
+    key <AD10>  { [         p,          P ] };
+    key <AD11>  { [dead_diaeresis, dead_circumflex ]    };
+    key <AD12>  { [  asterisk,        bar,  asciitilde ] };
+
+    key <AC01>  { [         a,          A ] };
+    key <AC02>  { [         s,    S, ssharp ] };
+    key <AC04>  { [         f,          F ] };
+    key <AC10>  { [      plus,  plusminus ] };
+    key <AC11>  { [dead_acute, dead_grave ] };
+    key <BKSL>  { [      less,    greater,   asciicircum ] };
+
+    key <LSGT>  { [bracketright, bracketleft,       brokenbar ] };
+    key <AB01>  { [         z,    Z, guillemotleft ] };
+    key <AB02>  { [         x,    X, guillemotright ] };
+    key <AB03>  { [         c,    C, cent                     ] };
+    key <AB06>  { [         n,          N ] };
+    key <AB07>  { [         m,          M,     mu ] };
+    key <AB08>  { [     comma,  semicolon ] };
+    key <AB09>  { [    period,      colon ] };
+    key <AB10>  { [     minus,      equal ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Netherlands - Sun type 4";
+
+    key <BKSL> { [ at, section, notsign ]           };
+    key <BRCR> { [ backslash, bar       ]                       };
+    key <AE01> { [ 1, exclam, onesuperior ]       };
+    key <AE02> { [ 2, quotedbl, twosuperior ]       };
+    key <AE03> { [ 3, numbersign, threesuperior]      };
+    key <AE04> { [ 4, dollar, onequarter  ]       };
+    key <AE05> { [ 5, percent, onehalf     ]       };
+    key <AE06> { [ 6, ampersand, threequarters]      };
+    key <AE07> { [ 7, underscore, sterling    ]       };
+    key <AE08> { [ 8, parenleft, braceleft   ]       };
+    key <AE09> { [ 9, parenright, braceright  ]       };
+    key <AE10> { [ 0, quoteright, quoteleft   ]       };
+    key <AE11> { [ slash, question, backslash  ]        };
+    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };
+    key <AD03> { [ e, E, EuroSign, Eacute    ]};
+    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
+    key <AD12> { [ asterisk, bar, asciitilde  ]       };
+    key <AC02> { [ S, S, ssharp      ]               };
+    key <AC10> { [ plus, plusminus      ]                       };
+    key <AC11> { [ dead_acute, dead_grave ]                    };
+    key <TLDE> { [ less, greater, asciicircum ]       };
+    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
+    key <AB01> { [ z, Z, guillemotleft]      };
+    key <AB02> { [ x, X, guillemotright]     };
+    key <AB03> { [ c, C, cent        ]       };
+    key <AB07> { [ m, M, Greek_mu, masculine ]       };
+    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
+    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
+    key <AB10> { [ minus, equal, hyphen ]            };
+    key <CAPS> { [ SunAltGraph          ]                       };
+//    key <COMP> { [ SunCompose         ]                       };
+    key <ALGR> { [ Caps_Lock            ]                       }; 
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/nl(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
index bbb414da7..bcc8c30cc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
@@ -1,144 +1,144 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Norway";

-

-    key <TLDE> { [             bar,         section                ] };

-    key <LSGT> { [            less,         greater                ] };

-    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };

-    key <AE02> { [               2,        quotedbl,  at           ] };

-    key <AE03> { [               3,      numbersign,  sterling     ] };

-    key <AE04> { [               4,        currency,  dollar       ] };

-    key <AE05> { [               5,         percent,  asciitilde   ] };

-    key <AE06> { [               6,       ampersand,  asciicircum  ] };

-    key <AE07> { [               7,           slash,  braceleft    ] };

-    key <AE08> { [               8,       parenleft,  bracketleft  ] };

-    key <AE09> { [               9,      parenright,  bracketright ] };

-    key <AE10> { [               0,           equal,  braceright   ] };

-    key <AE11> { [            plus,        question                ] };

-    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };

-    key <AD03> { [               e,               E,  EuroSign     ] };

-    key <AD11> { [           aring,           Aring                ] };

-    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };

-    key <AC10> { [          oslash,          Oslash                ] }; 

-    key <AC11> { [              ae,              AE                ] };

-    key <AB08> { [           comma,       semicolon                ] };

-    key <AB09> { [          period,           colon                ] };

-    key <AB10> { [           minus,      underscore                ] };

-

-        include "level3(ralt_switch)"

-        include "kpdl(comma)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-     name[Group1]="Norway - Sun type 4";

-

-    key <BKSL> { [ bar, section         ]                       };

-    key <BRCR> { [ asciitilde, asciicircum]                     };

-    key <AE02> { [ 2, quotedbl, at          ]       };

-    key <AE03> { [ 3, numbersign, sterling    ]       };

-    key <AE04> { [ 4, currency, dollar      ]       };

-    key <AE06> { [ 6, ampersand         ]                       };

-    key <AE07> { [ 7, slash, braceleft   ]       };

-    key <AE08> { [ 8, parenleft, bracketleft ]       };

-    key <AE09> { [ 9, parenright, bracketright]       };

-    key <AE10> { [ 0, equal, braceright  ]       };

-    key <AE11> { [ plus, question       ]                       };

-    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };

-    key <AD03> { [ e, E, EuroSign    ]       };

-    key <AD11> { [ aring, Aring                ]                       };

-    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };

-    key <LCTL> { [ Caps_Lock            ]                       };

-    key <AC10> { [ Ooblique             ]                       };

-    key <AC11> { [ ae, AE                   ]                       };

-    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };

-    key <LSGT> { [ less, greater        ]                       };

-    key <AB08> { [ comma, semicolon     ]                       };

-    key <AB09> { [ period, colon        ]                       };

-    key <AB10> { [ minus, underscore    ]                       };

-    key <CAPS> { [ Control_L            ]                       };

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type5" {

-    

-    name[Group1]="Norway - Sun type 5";

-

-    key <AE05> { [ 5, percent, asciitilde               ] };

-    key <AE06> { [ 6, ampersand, asciicircum            ] };

-    key <AE07> { [ 7, slash,  braceleft                 ] };

-    key <AE08> { [ 8, parenleft,  bracketright          ] };

-    key <AE09> { [ 9, parenright,  bracketright         ] };

-    key <AE10> { [ 0, equal,  braceright                ] };

-

-    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };

-    key <LSGT> { [ less, greater                        ] };

-

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-

-};

-

-

-partial default alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/no(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Norway";
+
+    key <TLDE> { [             bar,         section                ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };
+    key <AE02> { [               2,        quotedbl,  at           ] };
+    key <AE03> { [               3,      numbersign,  sterling     ] };
+    key <AE04> { [               4,        currency,  dollar       ] };
+    key <AE05> { [               5,         percent,  asciitilde   ] };
+    key <AE06> { [               6,       ampersand,  asciicircum  ] };
+    key <AE07> { [               7,           slash,  braceleft    ] };
+    key <AE08> { [               8,       parenleft,  bracketleft  ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,  braceright   ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };
+    key <AD03> { [               e,               E,  EuroSign     ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };
+    key <AC10> { [          oslash,          Oslash                ] }; 
+    key <AC11> { [              ae,              AE                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+     name[Group1]="Norway - Sun type 4";
+
+    key <BKSL> { [ bar, section         ]                       };
+    key <BRCR> { [ asciitilde, asciicircum]                     };
+    key <AE02> { [ 2, quotedbl, at          ]       };
+    key <AE03> { [ 3, numbersign, sterling    ]       };
+    key <AE04> { [ 4, currency, dollar      ]       };
+    key <AE06> { [ 6, ampersand         ]                       };
+    key <AE07> { [ 7, slash, braceleft   ]       };
+    key <AE08> { [ 8, parenleft, bracketleft ]       };
+    key <AE09> { [ 9, parenright, bracketright]       };
+    key <AE10> { [ 0, equal, braceright  ]       };
+    key <AE11> { [ plus, question       ]                       };
+    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };
+    key <AD03> { [ e, E, EuroSign    ]       };
+    key <AD11> { [ aring, Aring                ]                       };
+    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };
+    key <LCTL> { [ Caps_Lock            ]                       };
+    key <AC10> { [ Ooblique             ]                       };
+    key <AC11> { [ ae, AE                   ]                       };
+    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <CAPS> { [ Control_L            ]                       };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    
+    name[Group1]="Norway - Sun type 5";
+
+    key <AE05> { [ 5, percent, asciitilde               ] };
+    key <AE06> { [ 6, ampersand, asciicircum            ] };
+    key <AE07> { [ 7, slash,  braceleft                 ] };
+    key <AE08> { [ 8, parenleft,  bracketright          ] };
+    key <AE09> { [ 9, parenright,  bracketright         ] };
+    key <AE10> { [ 0, equal,  braceright                ] };
+
+    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };
+    key <LSGT> { [ less, greater                        ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/no(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
index 6295c3206..2fdf1fe06 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
@@ -1,101 +1,101 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Polish Developers";

-

-    key <TLDE> { [ grave, 	 asciitilde					] };

-    key <AE01> { [ 1,		 exclam						] };

-    key <AE02> { [ 2,		 at						] };

-    key <AE03> { [ 3,		 numbersign 					] };

-    key <AE04> { [ 4,		 dollar	 					] };

-    key <AE05> { [ 5,		 percent 					] };

-    key <AE06> { [ 6,		 asciicirum					] };

-    key <AE07> { [ 7,		 ampersand					] };

-    key <AE08> { [ 8,		 asterisk					] };

-    key <AE09> { [ 9,		 parenleft					] };

-    key <AE10> { [ 0,		 parenright					] };

-    key <AE11> { [ minus,	 underscore 					] };

-    key <AE12> { [ equal,	 plus	 					] };

-

-    key <AD03> { [ e,		 E,		eogonek,	Eogonek		] };       

-    key <AD07> { [ u,		 U,		EuroSign			] };

-    key <AD09> { [ o,		 O,		oacute,		Oacute		] };

-    key <AD11> { [ bracketleft,  braceleft					] };

-    key <AD12> { [ bracketright, braceright					] };

-

-    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };

-    key <AC02> { [ s,		 S,		sacute,		Sacute		] };

-    key <AC09> { [ l,		 L,		lstroke,        Lstroke		] };

-    key <AC10> { [ semicolon,	 colon						] };

-    key <AC11> { [ apostrophe,	 quotedbl 					] };

-    key <BKSL> { [ backslash,	 bar,		brokenbar			] };

-

-    key <LSGT> { [ less,         greater,       bar,            brokenbar	] };

-    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };

-    key <AB02> { [ x,		 X,		zacute,		Zacute		] };

-    key <AB03> { [ c,		 C,		cacute,		Cacute		] };

-    key <AB06> { [ n,		 N,		nacute,		Nacute		] };

-    key <AB08> { [ comma,	 less 						] };

-    key <AB09> { [ period,	 greater				 	] };

-    key <AB10> { [ slash,	 question					] };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/pl(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Polish Developers";
+
+    key <TLDE> { [ grave, 	 asciitilde					] };
+    key <AE01> { [ 1,		 exclam						] };
+    key <AE02> { [ 2,		 at						] };
+    key <AE03> { [ 3,		 numbersign 					] };
+    key <AE04> { [ 4,		 dollar	 					] };
+    key <AE05> { [ 5,		 percent 					] };
+    key <AE06> { [ 6,		 asciicirum					] };
+    key <AE07> { [ 7,		 ampersand					] };
+    key <AE08> { [ 8,		 asterisk					] };
+    key <AE09> { [ 9,		 parenleft					] };
+    key <AE10> { [ 0,		 parenright					] };
+    key <AE11> { [ minus,	 underscore 					] };
+    key <AE12> { [ equal,	 plus	 					] };
+
+    key <AD03> { [ e,		 E,		eogonek,	Eogonek		] };       
+    key <AD07> { [ u,		 U,		EuroSign			] };
+    key <AD09> { [ o,		 O,		oacute,		Oacute		] };
+    key <AD11> { [ bracketleft,  braceleft					] };
+    key <AD12> { [ bracketright, braceright					] };
+
+    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };
+    key <AC02> { [ s,		 S,		sacute,		Sacute		] };
+    key <AC09> { [ l,		 L,		lstroke,        Lstroke		] };
+    key <AC10> { [ semicolon,	 colon						] };
+    key <AC11> { [ apostrophe,	 quotedbl 					] };
+    key <BKSL> { [ backslash,	 bar,		brokenbar			] };
+
+    key <LSGT> { [ less,         greater,       bar,            brokenbar	] };
+    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };
+    key <AB02> { [ x,		 X,		zacute,		Zacute		] };
+    key <AB03> { [ c,		 C,		cacute,		Cacute		] };
+    key <AB06> { [ n,		 N,		nacute,		Nacute		] };
+    key <AB08> { [ comma,	 less 						] };
+    key <AB09> { [ period,	 greater				 	] };
+    key <AB10> { [ slash,	 question					] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pl(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index b5b108632..9e0ec9502 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
@@ -1,142 +1,142 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Portugal";

-

-    key <LSGT> { [            less,          greater                  ] };

-    key <TLDE> { [       backslash,              bar                  ] };

-    key <AE02> { [               2,         quotedbl,              at ] };

-    key <AE03> { [               3,       numbersign,        sterling ] };

-    key <AE04> { [               4,           dollar,         section ] };

-    key <AE05> { [               5,          percent,      asciitilde ] };

-    key <AE06> { [               6,        ampersand,     asciicircum ] };

-    key <AE07> { [               7,            slash,       braceleft ] };

-    key <AE08> { [               8,        parenleft,     bracketleft ] };

-    key <AE09> { [               9,       parenright,    bracketright ] };

-    key <AE10> { [               0,            equal,      braceright ] };

-    key <AE11> { [      quoteright,         question,       quoteleft ] };

-    key <AE12> { [   guillemotleft,   guillemotright                  ] };

-    key <AD03> { [               e,                E,        EuroSign ] };

-    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 

-    key <AD12> { [      dead_acute,       dead_grave                  ] };

-    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };

-    key <AC10> { [        ccedilla,         Ccedilla                  ] };

-    key <AC11> { [       masculine,      ordfeminine                  ] };

-    key <AB08> { [           comma,        semicolon                  ] };

-    key <AB09> { [          period,            colon                  ] };

-    key <AB10> { [           minus,       underscore                  ] };

-

-        include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "type4" {

-

-     name[Group1]="Portugal - Sun type 4";

-

-    key <BKSL> { [ bracketleft, braceleft, guillemotleft]     };

-    key <BRCR> { [ bracketright, braceright, guillemotright]  };

-    key <AE02> { [ 2, quotedbl, at          ]       };

-    key <AE03> { [ 3, numbersign, sterling    ]       };

-    key <AE04> { [ 4, dollar, section     ]       };

-    key <AE06> { [ 6, ampersand, notsign     ]       };

-    key <AE07> { [ 7, slash             ]                       };

-    key <AE08> { [ 8, parenleft         ]                       };

-    key <AE09> { [ 9, parenright, backslash   ]       };

-    key <AE10> { [ 0, equal, bar         ]       };

-    key <AE11> { [ quoteright, question, quoteleft   ]       };

-    key <AE12> { [ exclamdown, questiondown ]                    };

-    key <AD03> { [ e, E, EuroSign    ]       };

-    key <AD11> { [ dead_diaeresis, asterisk, plus    ]       };

-    key <AD12> { [ dead_acute, dead_grave, asciitilde ]      };

-    key <LCTL> { [ Caps_Lock            ]                       };

-    key <AC10> { [ ccedilla, Ccedilla             ]                       };

-    key <AC11> { [ masculine, ordfeminine]                      };

-    key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ]    };

-    key <LSGT> { [ less, greater        ]                       };

-    key <AB08> { [ comma, semicolon     ]                       };

-    key <AB09> { [ period, colon        ]                       };

-    key <AB10> { [ minus, underscore    ]                       };

-    key <CAPS> { [ Control_L            ]                       };

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "type5" {

-    

-    name[Group1]="Portugal - Sun type 5";

-

-    key <TLDE> { [ backslash, bar       ]                               };

-    key <AE05> { [ 5, percent, asciitilde                  ]};

-    key <AE06> { [ 6, ampersand, asciicircum                 ]};

-    key <AE07> { [ 7, slash,  braceleft                  ]};

-    key <AE08> { [ 8, parenleft,  bracketleft                ]};

-    key <AE09> { [ 9, parenright,  bracketright               ]};

-    key <AE10> { [ 0, equal,  braceright                 ]};

-    key <AE11> { [ quoteright, question, quoteleft                   ]};

-

-    key <AD11> { [ plus, asterisk, dead_diaeresis         ]};

-

-	include "level3(ralt_switch)"

-

-};

-

-

-partial default alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/pt(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Portugal";
+
+    key <LSGT> { [            less,          greater                  ] };
+    key <TLDE> { [       backslash,              bar                  ] };
+    key <AE02> { [               2,         quotedbl,              at ] };
+    key <AE03> { [               3,       numbersign,        sterling ] };
+    key <AE04> { [               4,           dollar,         section ] };
+    key <AE05> { [               5,          percent,      asciitilde ] };
+    key <AE06> { [               6,        ampersand,     asciicircum ] };
+    key <AE07> { [               7,            slash,       braceleft ] };
+    key <AE08> { [               8,        parenleft,     bracketleft ] };
+    key <AE09> { [               9,       parenright,    bracketright ] };
+    key <AE10> { [               0,            equal,      braceright ] };
+    key <AE11> { [      quoteright,         question,       quoteleft ] };
+    key <AE12> { [   guillemotleft,   guillemotright                  ] };
+    key <AD03> { [               e,                E,        EuroSign ] };
+    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 
+    key <AD12> { [      dead_acute,       dead_grave                  ] };
+    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };
+    key <AC10> { [        ccedilla,         Ccedilla                  ] };
+    key <AC11> { [       masculine,      ordfeminine                  ] };
+    key <AB08> { [           comma,        semicolon                  ] };
+    key <AB09> { [          period,            colon                  ] };
+    key <AB10> { [           minus,       underscore                  ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+     name[Group1]="Portugal - Sun type 4";
+
+    key <BKSL> { [ bracketleft, braceleft, guillemotleft]     };
+    key <BRCR> { [ bracketright, braceright, guillemotright]  };
+    key <AE02> { [ 2, quotedbl, at          ]       };
+    key <AE03> { [ 3, numbersign, sterling    ]       };
+    key <AE04> { [ 4, dollar, section     ]       };
+    key <AE06> { [ 6, ampersand, notsign     ]       };
+    key <AE07> { [ 7, slash             ]                       };
+    key <AE08> { [ 8, parenleft         ]                       };
+    key <AE09> { [ 9, parenright, backslash   ]       };
+    key <AE10> { [ 0, equal, bar         ]       };
+    key <AE11> { [ quoteright, question, quoteleft   ]       };
+    key <AE12> { [ exclamdown, questiondown ]                    };
+    key <AD03> { [ e, E, EuroSign    ]       };
+    key <AD11> { [ dead_diaeresis, asterisk, plus    ]       };
+    key <AD12> { [ dead_acute, dead_grave, asciitilde ]      };
+    key <LCTL> { [ Caps_Lock            ]                       };
+    key <AC10> { [ ccedilla, Ccedilla             ]                       };
+    key <AC11> { [ masculine, ordfeminine]                      };
+    key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ]    };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <CAPS> { [ Control_L            ]                       };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    
+    name[Group1]="Portugal - Sun type 5";
+
+    key <TLDE> { [ backslash, bar       ]                               };
+    key <AE05> { [ 5, percent, asciitilde                  ]};
+    key <AE06> { [ 6, ampersand, asciicircum                 ]};
+    key <AE07> { [ 7, slash,  braceleft                  ]};
+    key <AE08> { [ 8, parenleft,  bracketleft                ]};
+    key <AE09> { [ 9, parenright,  bracketright               ]};
+    key <AE10> { [ 0, equal,  braceright                 ]};
+    key <AE11> { [ quoteright, question, quoteleft                   ]};
+
+    key <AD11> { [ plus, asterisk, dead_diaeresis         ]};
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pt(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
index f21f9f624..07241a3ee 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
@@ -1,117 +1,117 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Romania";

-

-

-   key <TLDE> { [          grave,    asciitilde,	grave,    asciitilde ] };

-   key <AE01> { [              1,        exclam,	dead_tilde                ] };

-   key <AE02> { [              2,            at,	dead_caron                ] };

-   key <AE03> { [              3,    numbersign,	dead_circumflex                ] };

-   key <AE04> { [              4,        dollar,	dead_breve                ] };

-   key <AE05> { [              5,       percent,	dead_abovering                ] };

-   key <AE06> { [              6,   asciicircum,	dead_ogonek                ] };

-   key <AE07> { [              7,     ampersand,	dead_grave                ] };

-   key <AE08> { [              8,      asterisk,	dead_abovedot                ] };

-   key <AE09> { [              9,     parenleft,	dead_acute                ] };

-   key <AE10> { [              0,    parenright,	dead_doubleacute                ] };

-   key <AE11> { [          minus,    underscore,	dead_diaeresis,        endash ] };

-   key <AE12> { [          equal,          plus,	dead_cedilla,     plusminus ] };

-

-   key <AD01> { [              q,             Q,	acircumflex,   Acircumflex ] };

-   key <AD02> { [              w,             W,	ssharp                ] };

-   key <AD03> { [              e,             E,	EuroSign                ] };

-   key <AD04> { [              r,             R,	r,             R ] };

-   key <AD05> { [              t,             T,	0x100021b,     0x100021a ] };

-   key <AD06> { [              y,             Y,	y,             Y ] };

-   key <AD07> { [              u,             U,	u,             U ] };

-   key <AD08> { [              i,             I,	icircumflex,   Icircumflex ] };

-   key <AD09> { [              o,             O,	o,             O ] };

-   key <AD10> { [              p,             P,	section                ] };

-   key <AD11> { [    bracketleft,     braceleft,	doublelowquotemark              ] };

-   key <AD12> { [   bracketright,    braceright,	rightdoublequotemark            ] };

-

-   key <AC01> { [              a,             A,	abreve,        Abreve ] };

-   key <AC02> { [              s,             S,	0x1000219,     0x1000218 ] };

-   key <AC03> { [              d,             D,	dstroke,       Dstroke ] };

-   key <AC04> { [              f,             F,	f,             F ] };

-   key <AC05> { [              g,             G,	g,             G ] };

-   key <AC06> { [              h,             H,	h,             H ] };

-   key <AC07> { [              j,             J,	j,             J ] };

-   key <AC08> { [              k,             K,	k,             K ] };

-   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };

-   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };

-   key <AC11> { [     apostrophe,      quotedbl,	apostrophe,      quotedbl ] };

-   key <LSGT> { [      backslash,           bar,	backslash,     brokenbar ] };

-

-   key <BKSL> { [      backslash,           bar,	backslash,     brokenbar ] };

-   key <AB01> { [              z,             Z,	z,             Z ] };

-   key <AB02> { [              x,             X,	x,             X ] };

-   key <AB03> { [              c,             C,	copyright                ] };

-   key <AB04> { [              v,             V,	v,             V ] };

-   key <AB05> { [              b,             B,	b,             B ] };

-   key <AB06> { [              n,             N,	n,             N ] };

-   key <AB07> { [              m,             M,	m,             M ] };

-   key <AB08> { [          comma,          less,	guillemotleft,      multiply ] };

-   key <AB09> { [         period,       greater,	guillemotright,      division ] };

-   key <AB10> { [          slash,      question,	slash,      question ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ro(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Romania";
+
+
+   key <TLDE> { [          grave,    asciitilde,	grave,    asciitilde ] };
+   key <AE01> { [              1,        exclam,	dead_tilde                ] };
+   key <AE02> { [              2,            at,	dead_caron                ] };
+   key <AE03> { [              3,    numbersign,	dead_circumflex                ] };
+   key <AE04> { [              4,        dollar,	dead_breve                ] };
+   key <AE05> { [              5,       percent,	dead_abovering                ] };
+   key <AE06> { [              6,   asciicircum,	dead_ogonek                ] };
+   key <AE07> { [              7,     ampersand,	dead_grave                ] };
+   key <AE08> { [              8,      asterisk,	dead_abovedot                ] };
+   key <AE09> { [              9,     parenleft,	dead_acute                ] };
+   key <AE10> { [              0,    parenright,	dead_doubleacute                ] };
+   key <AE11> { [          minus,    underscore,	dead_diaeresis,        endash ] };
+   key <AE12> { [          equal,          plus,	dead_cedilla,     plusminus ] };
+
+   key <AD01> { [              q,             Q,	acircumflex,   Acircumflex ] };
+   key <AD02> { [              w,             W,	ssharp                ] };
+   key <AD03> { [              e,             E,	EuroSign                ] };
+   key <AD04> { [              r,             R,	r,             R ] };
+   key <AD05> { [              t,             T,	0x100021b,     0x100021a ] };
+   key <AD06> { [              y,             Y,	y,             Y ] };
+   key <AD07> { [              u,             U,	u,             U ] };
+   key <AD08> { [              i,             I,	icircumflex,   Icircumflex ] };
+   key <AD09> { [              o,             O,	o,             O ] };
+   key <AD10> { [              p,             P,	section                ] };
+   key <AD11> { [    bracketleft,     braceleft,	doublelowquotemark              ] };
+   key <AD12> { [   bracketright,    braceright,	rightdoublequotemark            ] };
+
+   key <AC01> { [              a,             A,	abreve,        Abreve ] };
+   key <AC02> { [              s,             S,	0x1000219,     0x1000218 ] };
+   key <AC03> { [              d,             D,	dstroke,       Dstroke ] };
+   key <AC04> { [              f,             F,	f,             F ] };
+   key <AC05> { [              g,             G,	g,             G ] };
+   key <AC06> { [              h,             H,	h,             H ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	k,             K ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
+   key <AC11> { [     apostrophe,      quotedbl,	apostrophe,      quotedbl ] };
+   key <LSGT> { [      backslash,           bar,	backslash,     brokenbar ] };
+
+   key <BKSL> { [      backslash,           bar,	backslash,     brokenbar ] };
+   key <AB01> { [              z,             Z,	z,             Z ] };
+   key <AB02> { [              x,             X,	x,             X ] };
+   key <AB03> { [              c,             C,	copyright                ] };
+   key <AB04> { [              v,             V,	v,             V ] };
+   key <AB05> { [              b,             B,	b,             B ] };
+   key <AB06> { [              n,             N,	n,             N ] };
+   key <AB07> { [              m,             M,	m,             M ] };
+   key <AB08> { [          comma,          less,	guillemotleft,      multiply ] };
+   key <AB09> { [         period,       greater,	guillemotright,      division ] };
+   key <AB10> { [          slash,      question,	slash,      question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ro(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
index ec19c9ba3..cfa27d08a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
@@ -1,111 +1,111 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial alphanumeric_keys

-xkb_symbols "type6" {

-

-     name[Group1]= "Russia";

-

-     key.type[group1]="FOUR_LEVEL";

-

-

-    key	<AE01> { [		1,	    exclam 	] };

-    key	<AE02> { [		2,        quotedbl, 2, at	] };

-    key	<AE03> { [		3,      numerosign, 3,  numbersign	] };

-    key	<AE04> { [		4,       percent, 4,      dollar 	] };

-    key	<AE05> { [		5,	     colon, 5, percent	] };

-    key	<AE07> { [		7,	    period, 7, ampersand	] };

-    key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };

-    key	<BKSL> { [           slash,        question, backslash,             bar	] };

-    key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };

-    key <LSGT> { [       backslash,             bar      ] };

-

-    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };

-    key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };

-    key	<AD03> { [      Cyrillic_u,	Cyrillic_U, e, E	] };

-    key	<AD04> { [     Cyrillic_ka,     Cyrillic_KA, r, R	] };

-    key	<AD05> { [     Cyrillic_ie,     Cyrillic_IE, t, T	] };

-    key	<AD06> { [     Cyrillic_en,     Cyrillic_EN, y, Y	] };

-    key	<AD07> { [    Cyrillic_ghe,    Cyrillic_GHE, u, U	] };

-    key	<AD08> { [    Cyrillic_sha,    Cyrillic_SHA, i, I	] };

-    key	<AD09> { [  Cyrillic_shcha,  Cyrillic_SHCHA, o, O	] };

-    key	<AD10> { [     Cyrillic_ze,     Cyrillic_ZE, p, P	] };

-    key	<AD11> { [     Cyrillic_ha,     Cyrillic_HA, bracketleft,       braceleft	] };

-    key	<AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright,      braceright	] };

-    key	<AC01> { [     Cyrillic_ef,     Cyrillic_EF, a, A	] };

-    key	<AC02> { [   Cyrillic_yeru,   Cyrillic_YERU, s, S	] };

-    key	<AC03> { [     Cyrillic_ve,     Cyrillic_VE, d, D	] };

-    key	<AC04> { [      Cyrillic_a,	Cyrillic_A, f, F	] };

-    key	<AC05> { [     Cyrillic_pe,     Cyrillic_PE, g, G	] };

-    key	<AC06> { [     Cyrillic_er,     Cyrillic_ER, h, H	] };

-    key	<AC07> { [      Cyrillic_o,	Cyrillic_O, j, J	] };

-    key	<AC08> { [     Cyrillic_el,     Cyrillic_EL, k, K	] };

-    key	<AC09> { [     Cyrillic_de,     Cyrillic_DE, l, L	] };

-    key	<AC10> { [    Cyrillic_zhe,    Cyrillic_ZHE, semicolon,           colon	] };

-    key	<AC11> { [      Cyrillic_e,	Cyrillic_E, apostrophe,        quotedbl	] };

-    key	<AB01> { [     Cyrillic_ya,     Cyrillic_YA, z, Z	] };

-    key	<AB02> { [    Cyrillic_che,    Cyrillic_CHE, x, X	] };

-    key	<AB03> { [     Cyrillic_es,     Cyrillic_ES, c, C	] };

-    key	<AB04> { [     Cyrillic_em,     Cyrillic_EM, v, V	] };

-    key	<AB05> { [      Cyrillic_i,	Cyrillic_I, b, B	] };

-    key	<AB06> { [     Cyrillic_te,     Cyrillic_TE, n, N	] };

-    key	<AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M	] };

-    key	<AB08> { [     Cyrillic_be,     Cyrillic_BE, comma,            less	] };

-    key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };

-

-    include "level3(ralt_switch)"

-

-};

-

-

-partial default alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ru(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+     name[Group1]= "Russia";
+
+     key.type[group1]="FOUR_LEVEL";
+
+
+    key	<AE01> { [		1,	    exclam 	] };
+    key	<AE02> { [		2,        quotedbl, 2, at	] };
+    key	<AE03> { [		3,      numerosign, 3,  numbersign	] };
+    key	<AE04> { [		4,       percent, 4,      dollar 	] };
+    key	<AE05> { [		5,	     colon, 5, percent	] };
+    key	<AE07> { [		7,	    period, 7, ampersand	] };
+    key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };
+    key	<BKSL> { [           slash,        question, backslash,             bar	] };
+    key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };
+    key <LSGT> { [       backslash,             bar      ] };
+
+    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };
+    key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };
+    key	<AD03> { [      Cyrillic_u,	Cyrillic_U, e, E	] };
+    key	<AD04> { [     Cyrillic_ka,     Cyrillic_KA, r, R	] };
+    key	<AD05> { [     Cyrillic_ie,     Cyrillic_IE, t, T	] };
+    key	<AD06> { [     Cyrillic_en,     Cyrillic_EN, y, Y	] };
+    key	<AD07> { [    Cyrillic_ghe,    Cyrillic_GHE, u, U	] };
+    key	<AD08> { [    Cyrillic_sha,    Cyrillic_SHA, i, I	] };
+    key	<AD09> { [  Cyrillic_shcha,  Cyrillic_SHCHA, o, O	] };
+    key	<AD10> { [     Cyrillic_ze,     Cyrillic_ZE, p, P	] };
+    key	<AD11> { [     Cyrillic_ha,     Cyrillic_HA, bracketleft,       braceleft	] };
+    key	<AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright,      braceright	] };
+    key	<AC01> { [     Cyrillic_ef,     Cyrillic_EF, a, A	] };
+    key	<AC02> { [   Cyrillic_yeru,   Cyrillic_YERU, s, S	] };
+    key	<AC03> { [     Cyrillic_ve,     Cyrillic_VE, d, D	] };
+    key	<AC04> { [      Cyrillic_a,	Cyrillic_A, f, F	] };
+    key	<AC05> { [     Cyrillic_pe,     Cyrillic_PE, g, G	] };
+    key	<AC06> { [     Cyrillic_er,     Cyrillic_ER, h, H	] };
+    key	<AC07> { [      Cyrillic_o,	Cyrillic_O, j, J	] };
+    key	<AC08> { [     Cyrillic_el,     Cyrillic_EL, k, K	] };
+    key	<AC09> { [     Cyrillic_de,     Cyrillic_DE, l, L	] };
+    key	<AC10> { [    Cyrillic_zhe,    Cyrillic_ZHE, semicolon,           colon	] };
+    key	<AC11> { [      Cyrillic_e,	Cyrillic_E, apostrophe,        quotedbl	] };
+    key	<AB01> { [     Cyrillic_ya,     Cyrillic_YA, z, Z	] };
+    key	<AB02> { [    Cyrillic_che,    Cyrillic_CHE, x, X	] };
+    key	<AB03> { [     Cyrillic_es,     Cyrillic_ES, c, C	] };
+    key	<AB04> { [     Cyrillic_em,     Cyrillic_EM, v, V	] };
+    key	<AB05> { [      Cyrillic_i,	Cyrillic_I, b, B	] };
+    key	<AB06> { [     Cyrillic_te,     Cyrillic_TE, n, N	] };
+    key	<AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M	] };
+    key	<AB08> { [     Cyrillic_be,     Cyrillic_BE, comma,            less	] };
+    key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };
+
+    include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ru(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
index 4efaf85fa..d27001466 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
@@ -1,279 +1,279 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-partial alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Sweden";

-

-    key <TLDE> { [         section,         onehalf                ] };

-    key <LSGT> { [            less,         greater,           bar ] };

-    key <AE02> { [               2,        quotedbl,            at ] };

-    key <AE03> { [               3,      numbersign,      sterling ] };

-    key <AE04> { [               4,        currency,        dollar ] };

-    key <AE06> { [               6,       ampersand                ] };

-    key <AE07> { [               7,           slash,     braceleft ] };

-    key <AE08> { [               8,       parenleft,   bracketleft ] };

-    key <AE09> { [               9,      parenright,  bracketright ] };

-    key <AE10> { [               0,           equal,    braceright ] };

-    key <AE11> { [            plus,        question,     backslash ] };

-    key <AE12> { [      dead_acute,      dead_grave                ] };

-    key <AD03> { [               e,               E,      EuroSign ] };

-    key <AD11> { [           aring,           Aring                ] };

-    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };

-    key <AC10> { [      odiaeresis,      Odiaeresis                ] };

-    key <AC11> { [      adiaeresis,      Adiaeresis                ] };

-    key <BKSL> { [      apostrophe,        asterisk,         grave ] };

-    key <AB08> { [           comma,       semicolon                ] };

-    key <AB09> { [          period,           colon                ] };

-    key <AB10> { [           minus,      underscore                ] };

-

-        include "level3(ralt_switch)"

-        include "kpdl(comma)"

-

-};

-

-// Swedish layout for a Type 5/5c Sun keyboard

-xkb_symbols "type5" {

-    include "sun_vndr/us(type5)+se(basic)"

-

-    // Begin alphanumeric section

-    // These two are not supposed to be dead.

-    // A few others supposedly ARE dead, but don't care for now.

-    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };

-    key <AD12> { [                      ],      [  asciitilde ] };

-

-    key <RTSH> { [      Shift_R         ]       };

-

-    key <LALT> { [      Alt_L           ]       };

-    key <ALGR> { [      Mode_switch     ]       };

-    key <LMTA> { [      Meta_L          ]       };

-    key <RMTA> { [      Meta_R          ]       };

-    key <COMP> { [      Multi_key       ]       };

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> { [ F1           ]                       };

-    key <FK02> { [ F2           ]                       };

-    key <FK03> { [ F3           ]                       };

-    key <FK04> { [ F4           ]                       };

-    key <FK05> { [ F5           ]                       };

-    key <FK06> { [ F6           ]                       };

-    key <FK07> { [ F7           ]                       };

-    key <FK08> { [ F8           ]                       };

-    key <FK09> { [ F9           ]                       };

-    key <FK10> { [ F10          ]                       };

-    key <FK11> { [ F11          ],      [ SunF36]       };

-    key <FK12> { [ F12          ],      [ SunF37]       };

-    key <STOP> { [ Cancel       ],      [ F11   ]       };

-    key <AGAI> { [ Redo         ],      [ F12   ]       };

-    key <PROP> { [ SunProps     ],      [ F13   ]       };

-    key <UNDO> { [ Undo         ],      [ F14   ]       };

-    key <FRNT> { [ SunFront     ],      [ F15   ]       };

-    key <COPY> { [ SunCopy      ],      [ F16   ]       };

-    key <OPEN> { [ SunOpen      ],      [ F17   ]       };

-    key <PAST> { [ SunPaste     ],      [ F18   ]       };

-    key <FIND> { [ Find         ],      [ F19   ]       };

-    key <CUT>  { [ SunCut       ],      [ F20   ]       };

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };

-    key <SCLK> { [ Scroll_Lock  ]                       };

-    key <PAUS> { [ Pause        ],      [ Break ]       };

-    key <LEFT> { [ Left         ]                       };

-    key <RGHT> { [ Right        ]                       };

-    key <UP>   { [ Up           ]                       };

-    key <DOWN> { [ Down         ]                       };

-

-    key <DELE> { [ Delete       ]                       };

-    key <INS>  { [ Insert       ]                       };

-    key <PGUP> { [ Prior        ]                       };

-    key <PGDN> { [ Next         ]                       };

-    key <HOME> { [ Home         ]                       };

-    key <END>  { [ End          ]                       };

-    key <HELP> { [ Help         ]                       };

-    // End "Editing" section

-    

-    // Begin "Keypad" section

-    key <NMLK> { [ Num_Lock             ]                               };

-    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };

-    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };

-    key <KPSU> { [ KP_Subtract          ]                               };

-

-    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };

-    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };

-    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };

-    key <KPAD> { [      KP_Add          ]                               };

-

-    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };

-    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };

-    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };

-

-    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };

-    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };

-    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };

-    key <KPEN> { [      KP_Enter        ]                               };

-

-    key  <KP0> { [  KP_Insert,  KP_0    ]                               };

-    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };

-    // End "Keypad" section, 

-

-    // Begin "four keys up on the right"

-    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };

-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };

-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };

-    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };

-    // End "four keys up on the right"

-

-    // Begin modifier mappings

-    modifier_map Shift  { Shift_R };

-    modifier_map Mod1   { Meta_L, Meta_R };

-    modifier_map Mod2   { Num_Lock };

-    modifier_map Mod3   { Mode_switch };

-    modifier_map Mod4   { Alt_L };

-    // End modifier mappings

-};

-

-// Swedish layout for a Type 4 Sun keyboard

-xkb_symbols "type4" {

-    include "sun_vndr/us(type4basic)+se(basic)"

-

-    // Begin alphanumeric section

-    // These two are not supposed to be dead.

-    // A few others supposedly ARE dead, but don't care for now.

-    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };

-    key <AD12> { [                      ],      [  asciitilde ] };

-

-    key <AF14> { [      asciitilde,     asciicircum     ] };

-

-    key <RTSH> { [      Shift_R         ]       };

-

-    key <LALT> { [      Alt_L           ]       };

-    key <ALGR> { [      Mode_switch     ]       };

-    key <LMTA> { [      Meta_L          ]       };

-    key <RMTA> { [      Meta_R          ]       };

-    key <COMP> { [      Multi_key       ]       };

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> { [ F1           ]                       };

-    key <FK02> { [ F2           ]                       };

-    key <FK03> { [ F3           ]                       };

-    key <FK04> { [ F4           ]                       };

-    key <FK05> { [ F5           ]                       };

-    key <FK06> { [ F6           ]                       };

-    key <FK07> { [ F7           ]                       };

-    key <FK08> { [ F8           ]                       };

-    key <FK09> { [ F9           ]                       };

-    key <FK10> { [ F10          ]                       };

-    key <FK11> { [ F11          ],      [ SunF36]       };

-    key <FK12> { [ F12          ],      [ SunF37]       };

-    key <STOP> { [ Cancel       ],      [ F11   ]       };

-    key <AGAI> { [ Redo         ],      [ F12   ]       };

-    key <PROP> { [ SunProps     ],      [ F13   ]       };

-    key <UNDO> { [ Undo         ],      [ F14   ]       };

-    key <FRNT> { [ SunFront     ],      [ F15   ]       };

-    key <COPY> { [ SunCopy      ],      [ F16   ]       };

-    key <OPEN> { [ SunOpen      ],      [ F17   ]       };

-    key <PAST> { [ SunPaste     ],      [ F18   ]       };

-    key <FIND> { [ Find         ],      [ F19   ]       };

-    key <CUT>  { [ SunCut       ],      [ F20   ]       };

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <LNFD> { [ Linefeed     ]       };

-    key <DELE> { [ Delete       ]                       };

-    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };

-    key <SCLK> { [ Scroll_Lock  ]                       };

-    key <PAUS> { [ Pause        ],      [ Break ]       };

-    key <HELP> { [ Help         ]                       };

-    // End "Editing" section

-    

-   // Begin "Keypad" section

-    key <NMLK> { [ Num_Lock             ]                               };

-    key <KPEQ> { [ KP_Equal             ]                               };

-    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };

-    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };

-    key <KPSU> { [ KP_Subtract          ]                               };

-

-    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };

-    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };

-    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };

-    key <KPAD> { [      KP_Add          ]                               };

-

-    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };

-    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };

-    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };

-

-    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };

-    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };

-    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };

-    key <KPEN> { [      KP_Enter        ]                               };

-

-    key  <KP0> { [  KP_Insert,  KP_0    ]                               };

-    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };

-    // End "Keypad" section, 

-

-    // Begin modifier mappings

-    modifier_map Shift  { Shift_R };

-    modifier_map Mod1   { Alt_L };

-    modifier_map Mod2   { Num_Lock };

-    modifier_map Mod3   { Mode_switch };

-    modifier_map Mod4   { Meta_L };

-    modifier_map Mod5   { Meta_R };

-    // End modifier mappings

-};

-

-

-partial default alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/se(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Sweden";
+
+    key <TLDE> { [         section,         onehalf                ] };
+    key <LSGT> { [            less,         greater,           bar ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,      numbersign,      sterling ] };
+    key <AE04> { [               4,        currency,        dollar ] };
+    key <AE06> { [               6,       ampersand                ] };
+    key <AE07> { [               7,           slash,     braceleft ] };
+    key <AE08> { [               8,       parenleft,   bracketleft ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,    braceright ] };
+    key <AE11> { [            plus,        question,     backslash ] };
+    key <AE12> { [      dead_acute,      dead_grave                ] };
+    key <AD03> { [               e,               E,      EuroSign ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };
+    key <AC10> { [      odiaeresis,      Odiaeresis                ] };
+    key <AC11> { [      adiaeresis,      Adiaeresis                ] };
+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+// Swedish layout for a Type 5/5c Sun keyboard
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
+    key <AD12> { [                      ],      [  asciitilde ] };
+
+    key <RTSH> { [      Shift_R         ]       };
+
+    key <LALT> { [      Alt_L           ]       };
+    key <ALGR> { [      Mode_switch     ]       };
+    key <LMTA> { [      Meta_L          ]       };
+    key <RMTA> { [      Meta_R          ]       };
+    key <COMP> { [      Multi_key       ]       };
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1           ]                       };
+    key <FK02> { [ F2           ]                       };
+    key <FK03> { [ F3           ]                       };
+    key <FK04> { [ F4           ]                       };
+    key <FK05> { [ F5           ]                       };
+    key <FK06> { [ F6           ]                       };
+    key <FK07> { [ F7           ]                       };
+    key <FK08> { [ F8           ]                       };
+    key <FK09> { [ F9           ]                       };
+    key <FK10> { [ F10          ]                       };
+    key <FK11> { [ F11          ],      [ SunF36]       };
+    key <FK12> { [ F12          ],      [ SunF37]       };
+    key <STOP> { [ Cancel       ],      [ F11   ]       };
+    key <AGAI> { [ Redo         ],      [ F12   ]       };
+    key <PROP> { [ SunProps     ],      [ F13   ]       };
+    key <UNDO> { [ Undo         ],      [ F14   ]       };
+    key <FRNT> { [ SunFront     ],      [ F15   ]       };
+    key <COPY> { [ SunCopy      ],      [ F16   ]       };
+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
+    key <PAST> { [ SunPaste     ],      [ F18   ]       };
+    key <FIND> { [ Find         ],      [ F19   ]       };
+    key <CUT>  { [ SunCut       ],      [ F20   ]       };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
+    key <SCLK> { [ Scroll_Lock  ]                       };
+    key <PAUS> { [ Pause        ],      [ Break ]       };
+    key <LEFT> { [ Left         ]                       };
+    key <RGHT> { [ Right        ]                       };
+    key <UP>   { [ Up           ]                       };
+    key <DOWN> { [ Down         ]                       };
+
+    key <DELE> { [ Delete       ]                       };
+    key <INS>  { [ Insert       ]                       };
+    key <PGUP> { [ Prior        ]                       };
+    key <PGDN> { [ Next         ]                       };
+    key <HOME> { [ Home         ]                       };
+    key <END>  { [ End          ]                       };
+    key <HELP> { [ Help         ]                       };
+    // End "Editing" section
+    
+    // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock             ]                               };
+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
+    key <KPSU> { [ KP_Subtract          ]                               };
+
+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
+    key <KPAD> { [      KP_Add          ]                               };
+
+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
+
+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
+    key <KPEN> { [      KP_Enter        ]                               };
+
+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
+    // End "Keypad" section, 
+
+    // Begin "four keys up on the right"
+    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };
+    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };
+    // End "four keys up on the right"
+
+    // Begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1   { Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3   { Mode_switch };
+    modifier_map Mod4   { Alt_L };
+    // End modifier mappings
+};
+
+// Swedish layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
+    key <AD12> { [                      ],      [  asciitilde ] };
+
+    key <AF14> { [      asciitilde,     asciicircum     ] };
+
+    key <RTSH> { [      Shift_R         ]       };
+
+    key <LALT> { [      Alt_L           ]       };
+    key <ALGR> { [      Mode_switch     ]       };
+    key <LMTA> { [      Meta_L          ]       };
+    key <RMTA> { [      Meta_R          ]       };
+    key <COMP> { [      Multi_key       ]       };
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1           ]                       };
+    key <FK02> { [ F2           ]                       };
+    key <FK03> { [ F3           ]                       };
+    key <FK04> { [ F4           ]                       };
+    key <FK05> { [ F5           ]                       };
+    key <FK06> { [ F6           ]                       };
+    key <FK07> { [ F7           ]                       };
+    key <FK08> { [ F8           ]                       };
+    key <FK09> { [ F9           ]                       };
+    key <FK10> { [ F10          ]                       };
+    key <FK11> { [ F11          ],      [ SunF36]       };
+    key <FK12> { [ F12          ],      [ SunF37]       };
+    key <STOP> { [ Cancel       ],      [ F11   ]       };
+    key <AGAI> { [ Redo         ],      [ F12   ]       };
+    key <PROP> { [ SunProps     ],      [ F13   ]       };
+    key <UNDO> { [ Undo         ],      [ F14   ]       };
+    key <FRNT> { [ SunFront     ],      [ F15   ]       };
+    key <COPY> { [ SunCopy      ],      [ F16   ]       };
+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
+    key <PAST> { [ SunPaste     ],      [ F18   ]       };
+    key <FIND> { [ Find         ],      [ F19   ]       };
+    key <CUT>  { [ SunCut       ],      [ F20   ]       };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <LNFD> { [ Linefeed     ]       };
+    key <DELE> { [ Delete       ]                       };
+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
+    key <SCLK> { [ Scroll_Lock  ]                       };
+    key <PAUS> { [ Pause        ],      [ Break ]       };
+    key <HELP> { [ Help         ]                       };
+    // End "Editing" section
+    
+   // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock             ]                               };
+    key <KPEQ> { [ KP_Equal             ]                               };
+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
+    key <KPSU> { [ KP_Subtract          ]                               };
+
+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
+    key <KPAD> { [      KP_Add          ]                               };
+
+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
+
+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
+    key <KPEN> { [      KP_Enter        ]                               };
+
+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
+    // End "Keypad" section, 
+
+    // Begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3   { Mode_switch };
+    modifier_map Mod4   { Meta_L };
+    modifier_map Mod5   { Meta_R };
+    // End modifier mappings
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/se(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index ee49a7008..9c909763f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
@@ -1,109 +1,109 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Slovakia";

-

-

-    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};

-    key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};

-    key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};

-    key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};

-    key <AE04>  {	[          ccaron,         4,	dollar,               dead_breve  ]	};

-    key <AE05>  {	[	   tcaron,         5,	percent,          dead_abovering  ]	};

-    key <AE06>  {	[	   zcaron,         6,	asciicircum,         dead_ogonek  ]	};

-    key <AE07>  {	[	   yacute,         7,	ampersand,                 grave  ]	};

-    key <AE08>  {	[	   aacute,         8,	asterisk,          dead_abovedot  ]	};

-    key <AE09>  {	[	   iacute,         9,	parenleft,            apostrophe  ]	};

-    key <AE10>  {	[	   eacute,         0,	parenright,     dead_doubleacute  ]	};

-    key <AE11>  {	[	    equal,   percent,	dead_diaeresis,        backslash  ]	};

-    key <AE12>  {	[      dead_acute, dead_caron,	dead_cedilla,              minus  ]	};

-

-    key <AD01>  {	[ 		q,         Q,	backslash		          ]	};

-    key <AD02>  {	[	        w,         W,	bar	                          ]	};

-    key <AD03>  {	[	        e,         E,	EuroSign 		          ]	};

-    key <AD06>  {       [               z,         Z                                      ]     };

-    key <AD10>  {       [               p,         P,	apostrophe   		          ]	};

-    key <AD11>  {	[	   uacute,     slash,	division		          ]	};

-    key <AD12>  {	[      adiaeresis, parenleft,	multiply      		          ]	};

-

-    key <AC02>  {	[	        s,         S,	dstroke		       		  ]	};

-    key <AC03>  {	[	        d,         D,	Dstroke			          ]	};

-    key <AC04>  {	[	        f,         F,	bracketleft		          ]	};

-    key <AC05>  {	[	        g,         G,	bracketright		          ]	};

-    key <AC08>  {	[		k,         K,	lstroke 		       	  ]	};

-    key <AC09>  {	[	        l,         L,	Lstroke		                  ]	};

-    key <AC10>  {	[     ocircumflex,  quotedbl,	dollar		                  ]	};

-    key <AC11>  {	[         section,    exclam,	ssharp   		          ]	};

-    key <AC12>  {	[          ncaron, parenright,	currency,               currency  ]	};

-    key <BKSL>  {	[          ncaron, parenright,	backslash,                   bar  ]	};

-

-    key <LSGT>  { 	[       backslash,       bar,	slash,                 brokenbar  ]     };

-    key <AB01>  {       [               y,        Y,	less  	                          ]	};

-    key <AB02>  {	[	        x,        X,	greater,              numbersign  ]	};

-    key <AB03>  {	[		c,        C,	ampersand	 	          ]	};

-    key <AB04>  {	[	        v,        V,	at 		                  ]	};

-    key <AB05>  {	[	        b,        B,	braceleft              	          ]	};

-    key <AB06>  {	[        	n,        N,	braceright              	  ]	};

-    key <AB08>  {	[  	    comma, question,	less 		                  ]	};

-    key <AB09>  {	[	   period,    colon,	greater		                  ]	};

-    key <AB10>  {	[ 	    minus, underscore,	asterisk 			  ]	};

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/sk(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Slovakia";
+
+
+    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};
+    key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};
+    key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};
+    key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};
+    key <AE04>  {	[          ccaron,         4,	dollar,               dead_breve  ]	};
+    key <AE05>  {	[	   tcaron,         5,	percent,          dead_abovering  ]	};
+    key <AE06>  {	[	   zcaron,         6,	asciicircum,         dead_ogonek  ]	};
+    key <AE07>  {	[	   yacute,         7,	ampersand,                 grave  ]	};
+    key <AE08>  {	[	   aacute,         8,	asterisk,          dead_abovedot  ]	};
+    key <AE09>  {	[	   iacute,         9,	parenleft,            apostrophe  ]	};
+    key <AE10>  {	[	   eacute,         0,	parenright,     dead_doubleacute  ]	};
+    key <AE11>  {	[	    equal,   percent,	dead_diaeresis,        backslash  ]	};
+    key <AE12>  {	[      dead_acute, dead_caron,	dead_cedilla,              minus  ]	};
+
+    key <AD01>  {	[ 		q,         Q,	backslash		          ]	};
+    key <AD02>  {	[	        w,         W,	bar	                          ]	};
+    key <AD03>  {	[	        e,         E,	EuroSign 		          ]	};
+    key <AD06>  {       [               z,         Z                                      ]     };
+    key <AD10>  {       [               p,         P,	apostrophe   		          ]	};
+    key <AD11>  {	[	   uacute,     slash,	division		          ]	};
+    key <AD12>  {	[      adiaeresis, parenleft,	multiply      		          ]	};
+
+    key <AC02>  {	[	        s,         S,	dstroke		       		  ]	};
+    key <AC03>  {	[	        d,         D,	Dstroke			          ]	};
+    key <AC04>  {	[	        f,         F,	bracketleft		          ]	};
+    key <AC05>  {	[	        g,         G,	bracketright		          ]	};
+    key <AC08>  {	[		k,         K,	lstroke 		       	  ]	};
+    key <AC09>  {	[	        l,         L,	Lstroke		                  ]	};
+    key <AC10>  {	[     ocircumflex,  quotedbl,	dollar		                  ]	};
+    key <AC11>  {	[         section,    exclam,	ssharp   		          ]	};
+    key <AC12>  {	[          ncaron, parenright,	currency,               currency  ]	};
+    key <BKSL>  {	[          ncaron, parenright,	backslash,                   bar  ]	};
+
+    key <LSGT>  { 	[       backslash,       bar,	slash,                 brokenbar  ]     };
+    key <AB01>  {       [               y,        Y,	less  	                          ]	};
+    key <AB02>  {	[	        x,        X,	greater,              numbersign  ]	};
+    key <AB03>  {	[		c,        C,	ampersand	 	          ]	};
+    key <AB04>  {	[	        v,        V,	at 		                  ]	};
+    key <AB05>  {	[	        b,        B,	braceleft              	          ]	};
+    key <AB06>  {	[        	n,        N,	braceright              	  ]	};
+    key <AB08>  {	[  	    comma, question,	less 		                  ]	};
+    key <AB09>  {	[	   period,    colon,	greater		                  ]	};
+    key <AB10>  {	[ 	    minus, underscore,	asterisk 			  ]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/sk(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
index 4eb8d6511..18ff4f0b1 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
@@ -1,92 +1,92 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Turkey - (Q)";

-

-    key <TLDE>  { [  quotedbl,     eacute                ] };

-    key <AE01>	{ [         1,     exclam                ] };

-    key <AE02>	{ [         2, apostrophe                ] };

-    key <AE03>	{ [        3, asciicircum,    numbersign ] };

-    key <AE04>	{ [         4,       plus,        dollar ] };

-    key <AE06>	{ [         6,  ampersand                ] };

-    key <AE07>	{ [         7,      slash,     braceleft ] };

-    key <AE08>	{ [         8,  parenleft,   bracketleft ] };

-    key <AE09>	{ [         9, parenright,  bracketright ] };

-    key <AE10>	{ [         0,      equal,    braceright ] };

-    key <AE11>	{ [  asterisk,   question,     backslash ] };

-    key <AE12>	{ [     minus, underscore                ] };

-

-    key <AD01>  { [         q,          Q,           at ] };

-    key <AD03>	{ [         e,          E,     EuroSign ] };

-    key <AD08>	{ [  idotless,          I               ] };

-    key <AD11>	{ [    gbreve,     Gbreve               ] };

-    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde ] };

-

-    key <AC10>	{ [  scedilla,   Scedilla,        acute ] };

-    key <AC11>	{ [         i,  Iabovedot               ] }; 

-    key <BKSL>	{ [     comma,  semicolon,        grave ] };

-

-    key <LSGT>	{ [      less,    greater,          bar ] };

-    key <AB08>	{ [odiaeresis, Odiaeresis               ] };

-    key <AB09>	{ [  ccedilla,   Ccedilla               ] };

-    key <AB10>	{ [    period,      colon               ] };

-

-	include "level3(ralt_switch)"

-

-};

-

-partial default alphanumeric_keys

-        xkb_symbols "basic" {

-        include "sun_vndr/tr(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Turkey - (Q)";
+
+    key <TLDE>  { [  quotedbl,     eacute                ] };
+    key <AE01>	{ [         1,     exclam                ] };
+    key <AE02>	{ [         2, apostrophe                ] };
+    key <AE03>	{ [        3, asciicircum,    numbersign ] };
+    key <AE04>	{ [         4,       plus,        dollar ] };
+    key <AE06>	{ [         6,  ampersand                ] };
+    key <AE07>	{ [         7,      slash,     braceleft ] };
+    key <AE08>	{ [         8,  parenleft,   bracketleft ] };
+    key <AE09>	{ [         9, parenright,  bracketright ] };
+    key <AE10>	{ [         0,      equal,    braceright ] };
+    key <AE11>	{ [  asterisk,   question,     backslash ] };
+    key <AE12>	{ [     minus, underscore                ] };
+
+    key <AD01>  { [         q,          Q,           at ] };
+    key <AD03>	{ [         e,          E,     EuroSign ] };
+    key <AD08>	{ [  idotless,          I               ] };
+    key <AD11>	{ [    gbreve,     Gbreve               ] };
+    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde ] };
+
+    key <AC10>	{ [  scedilla,   Scedilla,        acute ] };
+    key <AC11>	{ [         i,  Iabovedot               ] }; 
+    key <BKSL>	{ [     comma,  semicolon,        grave ] };
+
+    key <LSGT>	{ [      less,    greater,          bar ] };
+    key <AB08>	{ [odiaeresis, Odiaeresis               ] };
+    key <AB09>	{ [  ccedilla,   Ccedilla               ] };
+    key <AB10>	{ [    period,      colon               ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial default alphanumeric_keys
+        xkb_symbols "basic" {
+        include "sun_vndr/tr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
index 64037ac42..f098f9f27 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
@@ -1,261 +1,261 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-//

-//Copyright 1996, 1998  The Open Group

-//

-//All Rights Reserved.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-//OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-// US/ASCII layout for a Type 4 Sun keyboard

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-xkb_symbols "type4basic" {

-    include "us(basic)"

-

-    key <RTSH> { [ Shift_R		]			};

-    key <LALT> { [ Alt_L		]			};

-    key <ALGR> { [ Mode_switch		]			};

-    key <LMTA> { [ Meta_L		]			};

-    key <RMTA> { [ Meta_R		]			};

-    key <LNFD> { [ Linefeed		]			};

-    key <COMP> { [ Multi_key		]			};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <STOP> { [ L1,	L1		], [ SunStop	]	};

-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};

-    key <PROP> { [ L3,	L3		], [ SunProps	]	};

-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};

-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};

-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};

-    key <FIND> { [ L9,	L9		], [ SunFind	]	};

-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2,	R2		], [ Print		] };

-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };

-    key <PAUS> { [ R1,	R1		], [ Pause		] };

-    key <DELE> { [ Delete		]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-    key <NMLK> { [ Num_Lock 		]			};

-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };

-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };

-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };

-    key <KPSU> { [ KP_Subtract		]			};

-

-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };

-    key  <KP8> { [ Up, R8               ], [ KP_8               ] };

-//    key  <KP8> { [ R8,	R8		], [ KP_8		] };

-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };

-    key <KPAD> { [ KP_Add		]			};

-

-    key  <KP4> { [ Left, R10		], [ KP_4		] };

-    key  <KP5> { [ R11,	R11		], [ KP_5		] };

-    key  <KP6> { [ Right, R12		], [ KP_6		] };

-

-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };

-    key  <KP2> { [ Down, R14		], [ KP_2		] };

-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };

-    key <KPEN> { [ KP_Enter		]			}; 

-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};

-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};

-    // End "Keypad" section

-

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R, Shift_L };

-    modifier_map Mod1   	{ Meta_L, Meta_R };

-    modifier_map Mod2           { Num_Lock };

-    modifier_map Mod3   	{ Mode_switch };

-    modifier_map Mod4		{ Alt_L };

-};

-

-xkb_symbols "type4" {

-    include "sun_vndr/us(type4basic)"

-

-    // A few alphanumeric keys are different

-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

-    key <AE05> { [ 5, percent		], [ EuroSign	]	};

-    key <AD03> { [ e, E			], [ EuroSign	]	};

-};

-

-// US/ASCII layout for a Type 5 Sun keyboard

-xkb_symbols "type5basic" {

-    include "us(basic)"

-

-    key <RTSH> { [ Shift_R		]	};

-    key <LALT> { [ Alt_L		]	};

-    key <ALGR> { [ Mode_switch		]	};

-    key <LMTA> { [ Meta_L		]	};

-    key <RMTA> { [ Meta_R		]	};

-    key <COMP> { [ Multi_key		]	};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <STOP> { [ L1, L1		], [ SunStop	]	};

-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

-    key <PROP> { [ L3, L3		], [ SunProps	]	};

-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5, L5		], [ SunFront	]	};

-    key <COPY> { [ L6, L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

-    key <PAST> { [ L8, L8		], [ SunPaste	]	};

-    key <FIND> { [ L9, L9		], [ SunFind	]	};

-    key <CUT>  { [ L10, L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

-    key <LEFT> { [ Left			]			};

-    key <RGHT> { [ Right		]			};

-    key <UP>   { [ Up			]			};

-    key <DOWN> { [ Down			]			};

-

-    key <DELE> { [ Delete		]			};

-    key <INS>  { [ Insert		]			};

-    key <PGUP> { [ Prior		]			};

-    key <PGDN> { [ Next			]			};

-    key <HOME> { [ Home			]			};

-    key <END>  { [ End			]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-    key <NMLK> { [ Num_Lock 		]				};

-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

-

-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

-    key  <KP8> { [ Up, R8		], [ KP_8		]	};

-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

-    key <KPAD> { [ KP_Add		]				};

-

-    key  <KP4> { [ Left, R10		], [ KP_4		]	};

-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};

-    key  <KP6> { [ Right, R12		], [ KP_6		]	};

-

-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

-    key  <KP2> { [ Down, R14		], [ KP_2		]	};

-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};

-    key <KPEN> { [ KP_Enter		]				};

-

-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

-    // End "Keypad" section, 

-    // begin "four keys up on the right"

-

-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_R };

-    modifier_map Mod1	{ Meta_L, Meta_R };

-    modifier_map Mod2   { Num_Lock };

-    modifier_map Mod3	{ Alt_R };

-    modifier_map Mod4	{ Alt_L };

-};

-

-xkb_symbols "type5" {

-    include "sun_vndr/us(type5basic)"

-

-    // A few alphanumeric keys are different

-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

-    key <AE05> { [ 5, percent		], [ EuroSign	]	};

-    key <AD03> { [ e, E			], [ EuroSign	]	};

-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type4basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ Linefeed		]			};
+    key <COMP> { [ Multi_key		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3   	{ Mode_switch };
+    modifier_map Mod4		{ Alt_L };
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3	{ Alt_R };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
index 3f6569d2a..d2d3952e4 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
@@ -1,78 +1,78 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-// Taiwanese layout for a Type 6 Sun keyboard

-partial

-xkb_symbols "type6" {

-    // A few keys are different from US layout - only those are shown here

-    key <ALGR> { [ Henkan_Mode          ]                       };

-    key <BKSL> { [ backslash, bar,  brokenbar   ]               };

-

-};

-

-

-// Taiwanese layout for a Type 4 Sun keyboard

-

-xkb_symbols "type4" {

-

-    key <BKSL> { [ backslash, bar,  brokenbar	]		};

-

-    key <COMP> { [ Henkan_Mode		]			};

-

-};

-

-// Taiwanese layout for a Type 5 Sun keyboard

-xkb_symbols "type5" {

-

-    // A few keys are different

-    key <ALGR> { [ Henkan_Mode		]			};

-    key <BKSL> { [ backslash, bar,  brokenbar	]		};

-

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Taiwanese layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+    // A few keys are different from US layout - only those are shown here
+    key <ALGR> { [ Henkan_Mode          ]                       };
+    key <BKSL> { [ backslash, bar,  brokenbar   ]               };
+
+};
+
+
+// Taiwanese layout for a Type 4 Sun keyboard
+
+xkb_symbols "type4" {
+
+    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+
+    key <COMP> { [ Henkan_Mode		]			};
+
+};
+
+// Taiwanese layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // A few keys are different
+    key <ALGR> { [ Henkan_Mode		]			};
+    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
index b18fad4d7..98d39ecde 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
@@ -1,117 +1,117 @@
-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a

-// copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-partial default alphanumeric_keys

-xkb_symbols "type6" {

-

-    name[Group1]="Ukraine";

-

-

-    key	<TLDE> {	[	    grave,	asciitilde,	apostrophe,	asciitilde	]	};

-    key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};

-    key	<AE02> {	[		2,		at,	2,        quotedbl	]	};

-    key	<AE03> {	[		3,	numbersign,	3,      numbersign	]	};

-    key	<AE04> {	[		4,	    dollar,	4,        asterisk	]	};

-    key	<AE05> {	[		5,	   percent,	5,	     colon	]	};

-    key	<AE06> {	[		6,     asciicircum,	6,	     comma	]	};

-    key	<AE07> {	[		7,	 ampersand,	7,	    period	]	};

-    key	<AE08> {	[		8,	  asterisk,	8,	 semicolon	]	};

-    key	<AE09> {	[		9,	 parenleft,	9,	 parenleft	]	};

-    key	<AE10> {	[		0,	parenright,	0,	parenright	]	};

-    key	<AE11> {	[	    minus,	underscore,	minus,	underscore	]	};

-    key	<AE12> {	[	    equal,	      plus,	equal,	      plus	]	};

-

-    key	<AD01> {	[		q,		 Q,	Cyrillic_shorti, Cyrillic_SHORTI	]	};

-    key	<AD02> {	[		w,		 W,	Cyrillic_tse,    Cyrillic_TSE	]	};

-    key	<AD03> {	[		e,		 E,	Cyrillic_u,	Cyrillic_U	]	};

-    key	<AD04> {	[		r,		 R,	Cyrillic_ka,     Cyrillic_KA	]	};

-    key	<AD05> {	[		t,		 T,	Cyrillic_ie,     Cyrillic_IE	]	};

-    key	<AD06> {	[		y,		 Y,	Cyrillic_en,     Cyrillic_EN	]	};

-    key	<AD07> {	[		u,		 U,	Cyrillic_ghe,    Cyrillic_GHE	]	};

-    key	<AD08> {	[		i,		 I,	Cyrillic_sha,    Cyrillic_SHA	]	};

-    key	<AD09> {	[		o,		 O,	Cyrillic_shcha,  Cyrillic_SHCHA	]	};

-    key	<AD10> {	[		p,		 P,	Cyrillic_ze,     Cyrillic_ZE	]	};

-    key	<AD11> {	[     bracketleft,	 braceleft,	Cyrillic_ha,     Cyrillic_HA	]	};

-    key	<AD12> {	[    bracketright,	braceright,	Ukrainian_yi,    Ukrainian_YI	]	};

-

-    key	<AC01> {	[		a,		 A,	Cyrillic_ef,     Cyrillic_EF	]	};

-    key	<AC02> {	[		s,		 S,	Ukrainian_i,     Ukrainian_I	]	};

-    key	<AC03> {	[		d,		 D,	Cyrillic_ve,     Cyrillic_VE	]	};

-    key	<AC04> {	[		f,		 F,	Cyrillic_a,	Cyrillic_A	]	};

-    key	<AC05> {	[		g,		 G,	Cyrillic_pe,     Cyrillic_PE	]	};

-    key	<AC06> {	[		h,		 H,	Cyrillic_er,     Cyrillic_ER	]	};

-    key	<AC07> {	[		j,		 J,	Cyrillic_o,	Cyrillic_O	]	};

-    key	<AC08> {	[		k,		 K,	Cyrillic_el,     Cyrillic_EL	]	};

-    key	<AC09> {	[		l,		 L,	Cyrillic_de,     Cyrillic_DE	]	};

-    key	<AC10> {	[	semicolon,	     colon,	Cyrillic_zhe,    Cyrillic_ZHE	]	};

-    key	<AC11> {	[      apostrophe,	  quotedbl,	Ukrainian_ie,    Ukrainian_IE	]	};

-    key <BKSL> {        [       backslash,             bar,     Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };

-

-    key <LSGT> {        [            less,         greater,     slash,           bar            ]       };

-    key	<AB01> {	[		z,		 Z,	Cyrillic_ya,     Cyrillic_YA	]	};

-    key	<AB02> {	[		x,		 X,	Cyrillic_che,    Cyrillic_CHE	]	};

-    key	<AB03> {	[		c,		 C,	Cyrillic_es,     Cyrillic_ES	]	};

-    key	<AB04> {	[		v,		 V,	Cyrillic_em,     Cyrillic_EM	]	};

-    key	<AB06> {	[		n,		 N,	Cyrillic_te,     Cyrillic_TE	]	};

-    key	<AB05> {	[		b,		 B,	Cyrillic_i,	Cyrillic_I	]	};

-    key	<AB07> {	[		m,		 M,	Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

-    key	<AB08> {	[	    comma,	      less,	Cyrillic_be,     Cyrillic_BE	]	};

-    key	<AB09> {	[	   period,	   greater,	Cyrillic_yu,     Cyrillic_YU	]	};

-    key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};

-

-	include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-	xkb_symbols "basic" {

-	include "sun_vndr/ua(type6)"

-};

+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Ukraine";
+
+
+    key	<TLDE> {	[	    grave,	asciitilde,	apostrophe,	asciitilde	]	};
+    key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};
+    key	<AE02> {	[		2,		at,	2,        quotedbl	]	};
+    key	<AE03> {	[		3,	numbersign,	3,      numbersign	]	};
+    key	<AE04> {	[		4,	    dollar,	4,        asterisk	]	};
+    key	<AE05> {	[		5,	   percent,	5,	     colon	]	};
+    key	<AE06> {	[		6,     asciicircum,	6,	     comma	]	};
+    key	<AE07> {	[		7,	 ampersand,	7,	    period	]	};
+    key	<AE08> {	[		8,	  asterisk,	8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft,	9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright,	0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore,	minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus,	equal,	      plus	]	};
+
+    key	<AD01> {	[		q,		 Q,	Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[		w,		 W,	Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[		e,		 E,	Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[		r,		 R,	Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[		t,		 T,	Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[		y,		 Y,	Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[		u,		 U,	Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[		i,		 I,	Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[		o,		 O,	Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[		p,		 P,	Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     bracketleft,	 braceleft,	Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[    bracketright,	braceright,	Ukrainian_yi,    Ukrainian_YI	]	};
+
+    key	<AC01> {	[		a,		 A,	Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[		s,		 S,	Ukrainian_i,     Ukrainian_I	]	};
+    key	<AC03> {	[		d,		 D,	Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[		f,		 F,	Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[		g,		 G,	Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[		h,		 H,	Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[		j,		 J,	Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[		k,		 K,	Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[		l,		 L,	Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[	semicolon,	     colon,	Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      apostrophe,	  quotedbl,	Ukrainian_ie,    Ukrainian_IE	]	};
+    key <BKSL> {        [       backslash,             bar,     Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key <LSGT> {        [            less,         greater,     slash,           bar            ]       };
+    key	<AB01> {	[		z,		 Z,	Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[		x,		 X,	Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[		c,		 C,	Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[		v,		 V,	Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[		n,		 N,	Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[		b,		 B,	Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[		m,		 M,	Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[	    comma,	      less,	Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[	   period,	   greater,	Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ua(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index 5cbf6be3e..ed4a2774b 100644
--- a/xorg-server/xkeyboard-config/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
@@ -1,51 +1,51 @@
-// typographic keyboard

-// Sergei Stolyarov <sergei@regolit.com>

-//

-// Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>

-//

-// Based on the layout proposed by Ilya Birman, 

-// http://ilyabirman.ru/typography-layout/

-//

-

-// default layout

-default partial

-xkb_symbols "base" {

-// 1st keyboard row

-    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };

-    key <AE01> { [NoSymbol, NoSymbol, onesuperior] };

-    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };

-    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };

-    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };

-    key <AE05> { [NoSymbol, NoSymbol, U2030] };

-    key <AE07> { [NoSymbol, NoSymbol, ampersand] };

-    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };

-    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };

-    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };

-

-// 2nd keyboard row

-    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"

-    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"

-    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"

-    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"

-    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"

-    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [

-    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ]

-

-// 3rd keyboard row

-    key <AC01> { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a"

-    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"

-    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"

-    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"

-    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"

-    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"

-    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"

-    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"

-    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"

-

-// 4th keyboard row

-    key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"

-    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"

-    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","

-    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."

-    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"

-};

+// typographic keyboard
+// Sergei Stolyarov <sergei@regolit.com>
+//
+// Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
+//
+// Based on the layout proposed by Ilya Birman, 
+// http://ilyabirman.ru/typography-layout/
+//
+
+// default layout
+default partial
+xkb_symbols "base" {
+// 1st keyboard row
+    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
+    key <AE01> { [NoSymbol, NoSymbol, onesuperior] };
+    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };
+    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };
+    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };
+    key <AE05> { [NoSymbol, NoSymbol, U2030] };
+    key <AE07> { [NoSymbol, NoSymbol, ampersand] };
+    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };
+    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };
+    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };
+
+// 2nd keyboard row
+    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
+    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
+    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
+    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
+    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
+    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [
+    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ]
+
+// 3rd keyboard row
+    key <AC01> { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a"
+    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"
+    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
+    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"
+    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
+    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
+    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
+    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
+    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
+
+// 4th keyboard row
+    key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
+    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
+    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
+    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
+    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
index 50be49bb4..e7b931bf0 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/xfree68_vndr
-
-dist_symbols_DATA = \
-amiga ataritt
+symbolsdir = $(xkb_base)/symbols/xfree68_vndr

+

+dist_symbols_DATA = \

+amiga ataritt

diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
index 48ea37ca4..e9d43ff60 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
@@ -1,126 +1,126 @@
-default xkb_symbols "usa1" {

-

-    name[Group1]= "usa1";

-    key <ESC>  {	[	 Escape			]	};

-

-    // Begin "Function" section

-    key <FK01> {	[	 F1			]	};

-    key <FK02> {	[	 F2			]	};

-    key <FK03> {	[	 F3			]	};

-    key <FK04> {	[	 F4			]	};

-    key <FK05> {	[	 F5			]	};

-    key <FK06> {	[	 F6			]	};

-    key <FK07> {	[	 F7			]	};

-    key <FK08> {	[	 F8			]	};

-    key <FK09> {	[	 F9			]	};

-    key <FK10> {	[	 F10			]	};

-    // End "Function" section

-

-    // Alphanumeric section

-    key <TLDE> {	[ quoteleft,	asciitilde	]	};

-    key <AE01> {	[	  1,	exclam 		]	};

-    key <AE02> {	[	  2,	at		]	};

-    key <AE03> {	[	  3,	numbersign	]	};

-    key <AE04> {	[	  4,	dollar		]	};

-    key <AE05> {	[	  5,	percent		]	};

-    key <AE06> {	[	  6,	asciicircum	]	};

-    key <AE07> {	[	  7,	ampersand	]	};

-    key <AE08> {	[	  8,	asterisk	]	};

-    key <AE09> {	[	  9,	parenleft	]	};

-    key <AE10> {	[	  0,	parenright	]	};

-    key <AE11> {	[ minus,	underscore	]	};

-    key <AE12> {	[ equal,	plus		]	};

-    key <BKSL> {	[ backslash,	bar		]	};

-    key <BKSP> {	[	BackSpace		]	};

-

-    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};

-    key <AD01> {	[	  q,	Q 		]	};

-    key <AD02> {	[	  w,	W		]	};

-    key <AD03> {	[	  e,	E		]	};

-    key <AD04> {	[	  r,	R		]	};

-    key <AD05> {	[	  t,	T		]	};

-    key <AD06> {	[	  y,	Y		]	};

-    key <AD07> {	[	  u,	U		]	};

-    key <AD08> {	[	  i,	I		]	};

-    key <AD09> {	[	  o,	O		]	};

-    key <AD10> {	[	  p,	P		]	};

-    key <AD11> {	[ bracketleft,	braceleft	]	};

-    key <AD12> {	[ bracketright,	braceright	]	};

-    key <RTRN> {	[	 Return			]	};

-

-    key <LCTL> {	[	 Control_L		]	};

-    key <CAPS> {	[	 Caps_Lock		]	};

-    key <AC01> {	[	  a,	A 		]	};

-    key <AC02> {	[	  s,	S		]	};

-    key <AC03> {	[	  d,	D		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G		]	};

-    key <AC06> {	[	  h,	H		]	};

-    key <AC07> {	[	  j,	J		]	};

-    key <AC08> {	[	  k,	K		]	};

-    key <AC09> {	[	  l,	L		]	};

-    key <AC10> {	[ semicolon,	colon		]	};

-    key <AC11> {	[ quoteright,	quotedbl	]	};

-

-    key <LFSH> {	[ 	 Shift_L		]	};

-    key <AB01> {	[	  z,	Z 		]	};

-    key <AB02> {	[	  x,	X		]	};

-    key <AB03> {	[	  c,	C		]	};

-    key <AB04> {	[	  v,	V		]	};

-    key <AB05> {	[	  b,	B		]	};

-    key <AB06> {	[	  n,	N		]	};

-    key <AB07> {	[	  m,	M		]	};

-    key <AB08> {	[ comma,	less		]	};

-    key <AB09> {	[ period,	greater		]	};

-    key <AB10> {	[ slash,	question	]	};

-    key <RTSH> {	[	 Shift_R		]	};

-

-    key <LALT> {	[ Alt_L,	Meta_L 		]	};

-    key <LAMI>  {	[	 Mode_switch		]	};

-    key <SPCE> {	[	 space			]	};

-    key <RAMI>  {	[	 Multi_key		]	};

-    key <RALT> {	[ Alt_R,	Meta_R		]	};

-    // End alphanumeric section

-

-    // Begin "Editing" section

-    key <DELE> {	[	 Delete		]	};

-    key <HELP> {	[	 Help		]	};

-    key <UP>   {	[	 Up		]	};

-    key <LEFT> {	[	 Left		]	};

-    key <DOWN> {	[	 Down		]	};

-    key <RGHT> {	[	 Right		]	};

-    // End "Editing" section

-

-    // Begin "Keypad" section

-    key <KPLP> {	[	 Num_Lock		]	};

-    key <KPRP> {	[	 Scroll_Lock		]	};

-    key <KPDV> {	[	 KP_Divide		]	};

-    key <KPMU> {	[ KP_Multiply,	Print		]	};

-

-    key <KP7>  {	[ KP_7,		KP_Home		]	};

-    key <KP8>  {	[ KP_8,		KP_Up		]	};

-    key <KP9>  {	[ KP_9,		KP_Prior	]	};

-    key <KPSU> {	[	 KP_Subtract		]	};

-

-    key <KP4>  {	[ KP_4,		KP_Left		]	};

-    key <KP5>  {	[	 KP_5			]	};

-    key <KP6>  {	[ KP_6,		KP_Right	]	};

-    key <KPAD> {	[	 KP_Add			]	};

-

-    key <KP1>  {	[ KP_1,		KP_End		]	};

-    key <KP2>  {	[ KP_2,		KP_Down		]	};

-    key <KP3>  {	[ KP_3,		KP_Next		]	};

-

-    key <KP0>  {	[ KP_0,		KP_Insert	]	};

-    key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};

-    key <KPEN> {	[	 KP_Enter	]	};

-    // End "Keypad" section

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_L, Shift_R };

-    modifier_map Lock   { Caps_Lock };

-    modifier_map Control{ Control_L };

-    modifier_map Mod1	{ Alt_L, Alt_R };

-    modifier_map Mod2	{ Mode_switch };

-    modifier_map Mod3	{ Meta_L, Meta_R };

-};

+default xkb_symbols "usa1" {
+
+    name[Group1]= "usa1";
+    key <ESC>  {	[	 Escape			]	};
+
+    // Begin "Function" section
+    key <FK01> {	[	 F1			]	};
+    key <FK02> {	[	 F2			]	};
+    key <FK03> {	[	 F3			]	};
+    key <FK04> {	[	 F4			]	};
+    key <FK05> {	[	 F5			]	};
+    key <FK06> {	[	 F6			]	};
+    key <FK07> {	[	 F7			]	};
+    key <FK08> {	[	 F8			]	};
+    key <FK09> {	[	 F9			]	};
+    key <FK10> {	[	 F10			]	};
+    // End "Function" section
+
+    // Alphanumeric section
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[ minus,	underscore	]	};
+    key <AE12> {	[ equal,	plus		]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <BKSP> {	[	BackSpace		]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <RTRN> {	[	 Return			]	};
+
+    key <LCTL> {	[	 Control_L		]	};
+    key <CAPS> {	[	 Caps_Lock		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[ comma,	less		]	};
+    key <AB09> {	[ period,	greater		]	};
+    key <AB10> {	[ slash,	question	]	};
+    key <RTSH> {	[	 Shift_R		]	};
+
+    key <LALT> {	[ Alt_L,	Meta_L 		]	};
+    key <LAMI>  {	[	 Mode_switch		]	};
+    key <SPCE> {	[	 space			]	};
+    key <RAMI>  {	[	 Multi_key		]	};
+    key <RALT> {	[ Alt_R,	Meta_R		]	};
+    // End alphanumeric section
+
+    // Begin "Editing" section
+    key <DELE> {	[	 Delete		]	};
+    key <HELP> {	[	 Help		]	};
+    key <UP>   {	[	 Up		]	};
+    key <LEFT> {	[	 Left		]	};
+    key <DOWN> {	[	 Down		]	};
+    key <RGHT> {	[	 Right		]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <KPLP> {	[	 Num_Lock		]	};
+    key <KPRP> {	[	 Scroll_Lock		]	};
+    key <KPDV> {	[	 KP_Divide		]	};
+    key <KPMU> {	[ KP_Multiply,	Print		]	};
+
+    key <KP7>  {	[ KP_7,		KP_Home		]	};
+    key <KP8>  {	[ KP_8,		KP_Up		]	};
+    key <KP9>  {	[ KP_9,		KP_Prior	]	};
+    key <KPSU> {	[	 KP_Subtract		]	};
+
+    key <KP4>  {	[ KP_4,		KP_Left		]	};
+    key <KP5>  {	[	 KP_5			]	};
+    key <KP6>  {	[ KP_6,		KP_Right	]	};
+    key <KPAD> {	[	 KP_Add			]	};
+
+    key <KP1>  {	[ KP_1,		KP_End		]	};
+    key <KP2>  {	[ KP_2,		KP_Down		]	};
+    key <KP3>  {	[ KP_3,		KP_Next		]	};
+
+    key <KP0>  {	[ KP_0,		KP_Insert	]	};
+    key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};
+    key <KPEN> {	[	 KP_Enter	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2	{ Mode_switch };
+    modifier_map Mod3	{ Meta_L, Meta_R };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
index 8c6277fb1..813311dcf 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
@@ -1,155 +1,155 @@
-default xkb_symbols "us" {

-

-    name[Group1]= "US/ASCII";

-    key <ESC>  {	[	Escape			]	};

-

-    // Alphanumeric section

-    key <AE01> {	[	  1,	exclam 		]	};

-    key <AE02> {	[	  2,	at		]	};

-    key <AE03> {	[	  3,	numbersign	]	};

-    key <AE04> {	[	  4,	dollar		]	};

-    key <AE05> {	[	  5,	percent		]	};

-    key <AE06> {	[	  6,	asciicircum	]	};

-    key <AE07> {	[	  7,	ampersand	]	};

-    key <AE08> {	[	  8,	asterisk	]	};

-    key <AE09> {	[	  9,	parenleft	]	};

-    key <AE10> {	[	  0,	parenright	]	};

-    key <AE11> {	[ minus,	underscore	]	};

-    key <AE12> {	[ equal,	plus		]	};

-    key <TLDE> {	[ quoteleft,	asciitilde	]	};

-    key <BKSP> {	[	BackSpace		]	};

-

-    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};

-    key <AD01> {	[	  q,	Q 		]	};

-    key <AD02> {	[	  w,	W		]	};

-    key <AD03> {	[	  e,	E		]	};

-    key <AD04> {	[	  r,	R		]	};

-    key <AD05> {	[	  t,	T		]	};

-    key <AD06> {	[	  y,	Y		]	};

-    key <AD07> {	[	  u,	U		]	};

-    key <AD08> {	[	  i,	I		]	};

-    key <AD09> {	[	  o,	O		]	};

-    key <AD10> {	[	  p,	P		]	};

-    key <AD11> {	[ bracketleft,	braceleft	]	};

-    key <AD12> {	[ bracketright,	braceright	]	};

-    key <RTRN> {	[	Return			]	};

-    key <DELE> {	[	Delete			]	};

-

-    key <LCTL> {	[	Control_L		]	};

-    key <AC01> {	[	  a,	A 		]	};

-    key <AC02> {	[	  s,	S		]	};

-    key <AC03> {	[	  d,	D		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G		]	};

-    key <AC06> {	[	  h,	H		]	};

-    key <AC07> {	[	  j,	J		]	};

-    key <AC08> {	[	  k,	K		]	};

-    key <AC09> {	[	  l,	L		]	};

-    key <AC10> {	[ semicolon,	colon		]	};

-    key <AC11> {	[ quoteright,	quotedbl	]	};

-    key <BKSL> {	[ backslash,	bar		]	};

-

-    key <LFSH> {	[ 	 Shift_L		]	};

-    key <AB01> {	[	  z,	Z 		]	};

-    key <AB02> {	[	  x,	X		]	};

-    key <AB03> {	[	  c,	C		]	};

-    key <AB04> {	[	  v,	V		]	};

-    key <AB05> {	[	  b,	B		]	};

-    key <AB06> {	[	  n,	N		]	};

-    key <AB07> {	[	  m,	M		]	};

-    key <AB08> {	[ comma,	less		]	};

-    key <AB09> {	[ period,	greater		]	};

-    key <AB10> {	[ slash,	question	]	};

-    key <RTSH> {	[	 Shift_R		]	};

-

-    key <ALT>  {	[	 Meta_L			]	};

-    key <SPCE> {	[	 space			]	};

-    key <CAPS> {	[	 Caps_Lock		]	};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> {	[	F1		]	};

-    key <FK02> {	[	F2		]	};

-    key <FK03> {	[	F3		]	};

-    key <FK04> {	[	F4		]	};

-    key <FK05> {	[	F5		]	};

-    key <FK06> {	[	F6		]	};

-    key <FK07> {	[	F7		]	};

-    key <FK08> {	[	F8		]	};

-    key <FK09> {	[	F9		]	};

-    key <FK10> {	[	F10		]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <HELP> {	[	Help		]	};

-    key <UNDO> {	[	Undo		]	};

-    key <INS>  {	[	Insert		]	};

-    key <UP>   {	[	Up		]	};

-    key <HOME> {	[	Home,	Clear	]	};

-    key <LEFT> {	[	Left		]	};

-    key <DOWN> {	[	Down		]	};

-    key <RGHT> {	[	Right		]	};

-    // End "Editing" section

-

-    // Begin "Keypad" section

-    key <KPLP> {	[	KP_F1		]	};

-    key <KPRP> {	[	KP_F2		]	};

-    key <KPDV> {	[	KP_Divide	]	};

-    key <KPMU> {	[	KP_Multiply	]	};

-    key <KP7>  {	[	KP_7		]	};

-    key <KP8>  {	[	KP_8		]	};

-    key <KP9>  {	[	KP_9		]	};

-    key <KPSU> {	[	KP_Subtract	]	};

-    key <KP4>  {	[	KP_4		]	};

-    key <KP5>  {	[	KP_5		]	};

-    key <KP6>  {	[	KP_6		]	};

-    key <KPAD> {	[	KP_Add		]	};

-    key <KP1>  {	[	KP_1		]	};

-    key <KP2>  {	[	KP_2		]	};

-    key <KP3>  {	[	KP_3		]	};

-    key <KP0>  {	[	KP_0		]	};

-    key <KPDC> {	[	KP_Decimal	]	};

-    key <KPEN> {	[	KP_Enter	]	};

-    // End "Keypad" section

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_L, Shift_R };

-    modifier_map Lock   { Caps_Lock };

-    modifier_map Control{ Control_L };

-    modifier_map Mod1	{ Meta_L };

-};

-

-xkb_symbols "de" {

-    include "ataritt(us)"

-

-    name[Group1]= "German";

-

-    // Alphanumeric section

-    key <AE02> {	[	  2,	quotedbl	]	};

-    key <AE03> {	[	  3,	section		]	};

-    key <AE06> {	[	  6,	ampersand	]	};

-    key <AE07> {	[	  7,	slash		]	};

-    key <AE08> {	[	  8,	parenleft	]	};

-    key <AE09> {	[	  9,	parenright	]	};

-    key <AE10> {	[	  0,	equal		]	};

-    key <AE11> {	[    ssharp,	question	]	};

-    key <AE12> {	[ quoteright,	quoteleft	]	};

-    key <TLDE> {	[ numbersign,	asciicircum	]	};

-

-    key <AD06> {	[	  z,	Z		]	};

-    key <AD11> {	[ udiaeresis,	Udiaeresis	],

-			[        at,	backslash	]	};

-    key <AD12> {	[      plus,	asterisk	]	};

-

-    key <AC10> {	[ odiaeresis,	Odiaeresis	],

-			[ bracketleft,	braceleft	]	};

-    key <AC11> {	[ adiaeresis,	Adiaeresis	],

-			[ bracketright,	braceright	]	};

-    key <BKSL> {	[ asciitilde,	bar		]	};

-

-    key <LSGT> {	[      less,	greater		]	};

-    key <AB01> {	[	  y,	Y 		]	};

-    key <AB08> {	[     comma,	semicolon	]	};

-    key <AB09> {	[    period,	colon		]	};

-    key <AB10> {	[     minus,	underscore	]	};

-};

+default xkb_symbols "us" {
+
+    name[Group1]= "US/ASCII";
+    key <ESC>  {	[	Escape			]	};
+
+    // Alphanumeric section
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[ minus,	underscore	]	};
+    key <AE12> {	[ equal,	plus		]	};
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <BKSP> {	[	BackSpace		]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <RTRN> {	[	Return			]	};
+    key <DELE> {	[	Delete			]	};
+
+    key <LCTL> {	[	Control_L		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[ comma,	less		]	};
+    key <AB09> {	[ period,	greater		]	};
+    key <AB10> {	[ slash,	question	]	};
+    key <RTSH> {	[	 Shift_R		]	};
+
+    key <ALT>  {	[	 Meta_L			]	};
+    key <SPCE> {	[	 space			]	};
+    key <CAPS> {	[	 Caps_Lock		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> {	[	F1		]	};
+    key <FK02> {	[	F2		]	};
+    key <FK03> {	[	F3		]	};
+    key <FK04> {	[	F4		]	};
+    key <FK05> {	[	F5		]	};
+    key <FK06> {	[	F6		]	};
+    key <FK07> {	[	F7		]	};
+    key <FK08> {	[	F8		]	};
+    key <FK09> {	[	F9		]	};
+    key <FK10> {	[	F10		]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <HELP> {	[	Help		]	};
+    key <UNDO> {	[	Undo		]	};
+    key <INS>  {	[	Insert		]	};
+    key <UP>   {	[	Up		]	};
+    key <HOME> {	[	Home,	Clear	]	};
+    key <LEFT> {	[	Left		]	};
+    key <DOWN> {	[	Down		]	};
+    key <RGHT> {	[	Right		]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <KPLP> {	[	KP_F1		]	};
+    key <KPRP> {	[	KP_F2		]	};
+    key <KPDV> {	[	KP_Divide	]	};
+    key <KPMU> {	[	KP_Multiply	]	};
+    key <KP7>  {	[	KP_7		]	};
+    key <KP8>  {	[	KP_8		]	};
+    key <KP9>  {	[	KP_9		]	};
+    key <KPSU> {	[	KP_Subtract	]	};
+    key <KP4>  {	[	KP_4		]	};
+    key <KP5>  {	[	KP_5		]	};
+    key <KP6>  {	[	KP_6		]	};
+    key <KPAD> {	[	KP_Add		]	};
+    key <KP1>  {	[	KP_1		]	};
+    key <KP2>  {	[	KP_2		]	};
+    key <KP3>  {	[	KP_3		]	};
+    key <KP0>  {	[	KP_0		]	};
+    key <KPDC> {	[	KP_Decimal	]	};
+    key <KPEN> {	[	KP_Enter	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1	{ Meta_L };
+};
+
+xkb_symbols "de" {
+    include "ataritt(us)"
+
+    name[Group1]= "German";
+
+    // Alphanumeric section
+    key <AE02> {	[	  2,	quotedbl	]	};
+    key <AE03> {	[	  3,	section		]	};
+    key <AE06> {	[	  6,	ampersand	]	};
+    key <AE07> {	[	  7,	slash		]	};
+    key <AE08> {	[	  8,	parenleft	]	};
+    key <AE09> {	[	  9,	parenright	]	};
+    key <AE10> {	[	  0,	equal		]	};
+    key <AE11> {	[    ssharp,	question	]	};
+    key <AE12> {	[ quoteright,	quoteleft	]	};
+    key <TLDE> {	[ numbersign,	asciicircum	]	};
+
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis	],
+			[        at,	backslash	]	};
+    key <AD12> {	[      plus,	asterisk	]	};
+
+    key <AC10> {	[ odiaeresis,	Odiaeresis	],
+			[ bracketleft,	braceleft	]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis	],
+			[ bracketright,	braceright	]	};
+    key <BKSL> {	[ asciitilde,	bar		]	};
+
+    key <LSGT> {	[      less,	greater		]	};
+    key <AB01> {	[	  y,	Y 		]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon		]	};
+    key <AB10> {	[     minus,	underscore	]	};
+};