svn merge ^/branches/released .

14 files changed, 849 insertions, 877 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple
index fc1742c45..cbbf110d3 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/apple
@@ -1,7 +1,6 @@
 //

 // Keyboard modification for Apple keyboards

 //

-// $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $

 

 partial default modifier_keys

 xkb_symbols "extended" {

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 4932eb89a..09c2fb32f 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
@@ -1,102 +1,101 @@
-// $XKeyboardConfig$
-//
-// 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 92c54916c..4c8bebdf4 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
@@ -1,97 +1,94 @@
-// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/de,v 3.7.2.2 1999/07/13 07:09:56 hohndel Exp $
-
-// 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/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index 56ef85bf6..a2ac773e7 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
@@ -1,79 +1,76 @@
-// $XConsortium: dk /main/3 1996/08/31 12:19:29 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.3.2.1 1999/12/20 12:56:01 hohndel Exp $
-partial alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Danish keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
-
-    include "latin"
-    name[Group1]= "Denmark - Mac";
-
-    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};
-    key <LSGT> {	[     less,         greater,        backslash,         notsign	]};
-    key <SPCE> {	[    space,           space,     nobreakspace,    nobreakspace	]};
-    key <AE01> {	[        1,          exclam,       exclamdown,     onesuperior	]};
-    key <AE02> {	[        2,        quotedbl,               at,     twosuperior	]};
-    key <AE03> {	[        3,      numbersign,         sterling,   threesuperior	]};
-    key <AE04> {	[        4,        EuroSign,           dollar,      onequarter	]};
-    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};
-    key <AE06> {	[        6,       ampersand,              yen,        NoSymbol	]};
-    key <AE07> {	[        7,           slash,        braceleft,        division	]};
-    key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};
-    key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};
-    key <AE10> {	[        0,           equal,       braceright,          degree	]};
-    key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};
-    key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};
-    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
-    key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
-    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
-    key <AC03> {        [        d,               D,              eth,             ETH      ]};
-    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
-    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
-    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
-    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
-    key <AD09> {        [        o,               O,               oe,              OE      ]};
-    key	<AC10> {	[	ae,               AE	]};
-    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
-    key <AC11> {	[   oslash,        Ooblique 	]};
-    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
-    key <AD11> {	[    aring,           Aring 	]};
-    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
-    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
-
-    // End alphanumeric section
-
-    include "eurosign(e)"
-    include "level3(ralt_switch)"
-};
-
-
-partial default alphanumeric_keys 
-xkb_symbols "full" {
-    include "iso9995-3(full)"
-    include "dk(basic)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "macintosh_vndr/dk(basic)"
-    name[Group1]= "Denmark - Mac, eliminate dead keys";
-
-    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "macbookpro" {
-
-    include "level3(win_switch)"
-    include "macintosh_vndr/dk(basic)"
-
-    name[Group1]= "Denmark - Mac, MacBook Pro";
-
-    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };
-    key <TLDE>  { [    dollar,  section,    dollar,    dollar ] };
-};
-
+partial alphanumeric_keys 

+xkb_symbols "basic" {

+

+    // Describes the differences between a very simple en_US

+    // keyboard and a Danish keyboard with dead key support

+    // and all of ISO-8859-1 characters available.

+

+    include "latin"

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

+

+    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};

+    key <LSGT> {	[     less,         greater,        backslash,         notsign	]};

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

+    key <AE01> {	[        1,          exclam,       exclamdown,     onesuperior	]};

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

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

+    key <AE04> {	[        4,        EuroSign,           dollar,      onequarter	]};

+    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};

+    key <AE06> {	[        6,       ampersand,              yen,        NoSymbol	]};

+    key <AE07> {	[        7,           slash,        braceleft,        division	]};

+    key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};

+    key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};

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

+    key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};

+    key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};

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

+    key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};

+    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};

+    key <AC03> {        [        d,               D,              eth,             ETH      ]};

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

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

+    key <AD05> {        [        t,               T,            thorn,           THORN      ]};

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

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

+    key	<AC10> {	[	ae,               AE	]};

+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};

+    key <AC11> {	[   oslash,        Ooblique 	]};

+    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};

+    key <AD11> {	[    aring,           Aring 	]};

+    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};

+    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};

+

+    // End alphanumeric section

+

+    include "eurosign(e)"

+    include "level3(ralt_switch)"

+};

+

+

+partial default alphanumeric_keys 

+xkb_symbols "full" {

+    include "iso9995-3(full)"

+    include "dk(basic)"

+};

+

+

+partial alphanumeric_keys 

+xkb_symbols "nodeadkeys" {

+    include "macintosh_vndr/dk(basic)"

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

+

+    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};

+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "macbookpro" {

+

+    include "level3(win_switch)"

+    include "macintosh_vndr/dk(basic)"

+

+    name[Group1]= "Denmark - Mac, MacBook Pro";

+

+    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };

+    key <TLDE>  { [    dollar,  section,    dollar,    dollar ] };

+};

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
index 6cb5fa314..177913737 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
@@ -1,18 +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/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
index 8eb82eb70..5343673c1 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
@@ -1,21 +1,17 @@
-// $XConsortium: gb /main/3 1996/08/31 12:19:51 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/gb,v 3.3 1996/12/23 07:13:25 dawes Exp $
-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 000bcdb0b..d16d92f61 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
@@ -1,128 +1,127 @@
-// $XKeyboardConfig$
-//
-// 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 44435201b..889653f8e 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
@@ -1,64 +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 085de0e4b..a588ab27c 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
@@ -1,38 +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 b60690e4d..05034701e 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
@@ -1,17 +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 d8bf0d650..442aee9af 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
@@ -1,52 +1,50 @@
-// $XConsortium: no /main/3 1996/08/31 12:20:02 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/no,v 3.3.2.1 1997/07/26 06:31:01 dawes Exp $
-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 8f1785742..8c3b7173c 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
@@ -1,63 +1,61 @@
-// $XConsortium: pt /main/3 1996/08/31 12:20:08 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/pt,v 3.3.2.1 1999/11/18 15:37:37 hohndel Exp $
-// 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 d5d8c1c4c..56d77bd0f 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
@@ -1,46 +1,44 @@
-// $XConsortium: se /main/3 1996/08/31 12:20:15 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/macintosh/se,v 1.1 2000/09/19 12:46:26 eich Exp $
-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/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index fed3253cf..6da1c67bf 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
@@ -1,151 +1,148 @@
-// $XConsortium: macintosh /main/10 1996/01/29 19:54:54 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/macintosh/us,v 1.8 2003/08/04 10:32:31 eich Exp $
-
-// symbols definition for a Macintosh "Extended" keyboard
-
-xkb_symbols "extended" {
-
-    name[Group1]= "USA";
-    key <ESC>  {	[ Escape			]	};
-
-    // 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 <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 <BKSL> {	[ backslash,	bar		]	};
-
-    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 <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 <SPCE> {	[  space			]	};
-    // End alphanumeric section
-
-
-    include "eurosign(e)"
-    include "keypad"
-
-    key <KPEQ> {	[  equal				]	};
-};
-
-hidden
-xkb_symbols "oldmac" {
-
-    include "macintosh_vndr/us(extended)"
-
-    // 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 <FK13> {	[  Print	]	};
-    key <FK14> {	[  Scroll_Lock	]	};
-    key <FK15> {	[  Pause	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    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	]	};
-    // End "Editing" section
-
-    key <BKSP> {	[ BackSpace			]	};
-    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
-    key <RTRN> {	[ Return	]	};
-    key <CAPS> {	[ Caps_Lock	]	};
-    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
-
-    // Begin "Modifier" section
-    key <LFSH> {	[  Shift_L	]	};
-    key <RTSH> {	[  Shift_R	]	};
-    key <LCTL> {	[  Control_L	]	};
-    key <RCTL> {	[  Control_R	]	};
-    key <LALT> {	[  Alt_L, Meta_L ]	};
-    key <RALT> {	[  Alt_R, Meta_R ]	};
-    key <LWIN> {	[  Super_L	]	};
-    key <RWIN> {	[  Super_R	]	};
-    // End "Modifier" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod2   { Num_Lock };
-
-    //  Fake keys for virtual<->real modifiers mapping 
-    key <LVL3> {	[ ISO_Level3_Shift	]	};
-    key <MDSW> {	[ Mode_switch 		]	};
-    modifier_map Mod5   { <LVL3>, <MDSW> };
-
-    key <ALT>  {	[ NoSymbol, Alt_L	]	};
-    modifier_map Mod1   { <ALT>, <LALT> };
-
-    key <META> {	[ NoSymbol, Meta_L	]	};
-    modifier_map Mod1   { <META> };
-
-    key <SUPR> {	[ NoSymbol, Super_L	]	};
-    modifier_map Mod4   { <SUPR> };
-
-    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
-    modifier_map Mod4   { <HYPR> };
-    // end modifier mappings
-
-};
+// symbols definition for a Macintosh "Extended" keyboard

+

+xkb_symbols "extended" {

+

+    name[Group1]= "USA";

+    key <ESC>  {	[ Escape			]	};

+

+    // 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 <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 <BKSL> {	[ backslash,	bar		]	};

+

+    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 <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 <SPCE> {	[  space			]	};

+    // End alphanumeric section

+

+

+    include "eurosign(e)"

+    include "keypad"

+

+    key <KPEQ> {	[  equal				]	};

+};

+

+hidden

+xkb_symbols "oldmac" {

+

+    include "macintosh_vndr/us(extended)"

+

+    // 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 <FK13> {	[  Print	]	};

+    key <FK14> {	[  Scroll_Lock	]	};

+    key <FK15> {	[  Pause	]	};

+    // End "Function" section

+

+    // Begin "Editing" section

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

+    // End "Editing" section

+

+    key <BKSP> {	[ BackSpace			]	};

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

+    key <RTRN> {	[ Return	]	};

+    key <CAPS> {	[ Caps_Lock	]	};

+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};

+

+    // Begin "Modifier" section

+    key <LFSH> {	[  Shift_L	]	};

+    key <RTSH> {	[  Shift_R	]	};

+    key <LCTL> {	[  Control_L	]	};

+    key <RCTL> {	[  Control_R	]	};

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

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

+    key <LWIN> {	[  Super_L	]	};

+    key <RWIN> {	[  Super_R	]	};

+    // End "Modifier" section

+

+    // begin modifier mappings

+    modifier_map Shift  { Shift_L, Shift_R };

+    modifier_map Lock   { Caps_Lock, ISO_Lock };

+    modifier_map Control{ Control_L, Control_R };

+    modifier_map Mod2   { Num_Lock };

+

+    //  Fake keys for virtual<->real modifiers mapping 

+    key <LVL3> {	[ ISO_Level3_Shift	]	};

+    key <MDSW> {	[ Mode_switch 		]	};

+    modifier_map Mod5   { <LVL3>, <MDSW> };

+

+    key <ALT>  {	[ NoSymbol, Alt_L	]	};

+    modifier_map Mod1   { <ALT>, <LALT> };

+

+    key <META> {	[ NoSymbol, Meta_L	]	};

+    modifier_map Mod1   { <META> };

+

+    key <SUPR> {	[ NoSymbol, Super_L	]	};

+    modifier_map Mod4   { <SUPR> };

+

+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};

+    modifier_map Mod4   { <HYPR> };

+    // end modifier mappings

+

+};