Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch.

18 files changed, 0 insertions, 1187 deletions

diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
deleted file mode 100644
index 1d43f40c2..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-symbolsdir = $(xkb_base)/symbols/macintosh_vndr

-

-dist_symbols_DATA = \

-apple ch de dk \

-fi fr \

-gb is it jp \

-latam nl no pt \

-se us

diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple b/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple
deleted file mode 100644
index fc1742c45..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple
+++ /dev/null
@@ -1,142 +0,0 @@
-//

-// 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" {

-

-    key <KPEQ> { [ KP_Equal ] }; 

-

-// The key in the PC's Insert position is sometimes engraved Help (at least

-// in Switzerland and Great Britain), with Insert sometimes above. But in the

-// US and Canada, it remains Insert. So this should probably be an XkbOption,

-// but I have to do more research.

-// Perhaps Help should be the primary symbol with Insert in the 1st shift-level

-//    key  <INS> { [ Help, Insert ] };

-// The keys next to F12, labeled F13, F14, & F15 generate codes that XFree86

-// claims not to generate. I think they should be equivalent to the PC keys

-// Print Screen / SysRq, Scroll Lock, and Pause. Linux kernel bug?

-//    key <PRSC> { [ F13 ] }; // should be keycode 93 or

-//    key <FK13> { [ F13 ] }; // should be keycode 118

-//    key <SCLK> { [ F14 ] }; // should be keycode 123 or

-//    key <FK14> { [ F14 ] }; // should be keycode 119

-//    key <PAUS> { [ F15 ] }; // should be keycode 127 or

-//    key <FK15> { [ F15 ] }; // should be keycode 120

-};

-

-partial modifier_keys

-xkb_symbols "laptop" {

-

-    include "macintosh_vndr/apple(extended)"

-

-    // The real numlock key on the iBook (shared with F5) works internally to

-    // the keyboard. It illuminates the Num_Lock led and locks the fn-key to

-    // type only the keypad keys on the letter keys (U=4, I=5, O=6, P=*, etc.).

-    // The key in the Num_lock position is engraved with Clear.

-    override key <NMLK> { [ Clear ] };

-    // The key engraved Delete sends BKSP. To get Delete, use Shift-Delete

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

-    // These keyboards only generate a <RALT> when pressing fn+Alt. This makes

-    // it impossible to get to the third shift level on keys that are on

-    // the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch,

-    // and use fn+Enter (Apple's code for Menu) for KP_Enter.

-    replace key <KPEN> { [ ISO_Level3_Shift ] };

-    modifier_map Mod5  { ISO_Level3_Shift };	

-    // Linux kernel bug with Menu on macs means this doesn't work yet

-//    replace key <MENU> { [ KP_Enter ] }; // should be keycode 117

-};

-

-partial modifier_keys

-xkb_symbols "laptop_bad_switch" {

-    // Kept for backward compatibility

-    include "macintosh_vndr/apple(laptop)"

-};

-

-// Long Aluminium Keyboards

-partial function_keys

-xkb_symbols "alukbd" {

-    // The base is a inet PC keyboard

-    include "pc"

-

-    // Additional Fxx keys

-    key <FK13> { [ F13 ] };

-    key <FK14> { [ F14 ] };

-    key <FK15> { [ F15 ] };

-    key <FK16> { [ F16 ] };

-    key <FK17> { [ F17 ] };

-    key <FK18> { [ F18 ] };

-    key <FK19> { [ F19 ] };

-

-    // On aluminium keyboards, Num_Lock is replace by Clear

-    replace key <NMLK> { [ XF86Clear ] };

-    // CAPS key is always Caps_Lock, even for JIS keyboards

-    replace key <CAPS> { [ Caps_Lock ] };

-

-    // F1..F12 are multimedia keys when used with the 'Fn' key

-    // Make those multimedia actions available via ISO_Level3_Shift too,

-    // it is useful when the Fn key is remapped to something else (e.g. Insert)

-    key <FK01> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86KbdBrightnessDown, NoSymbol, XF86_Switch_VT_1 ]

-    };

-    key <FK02> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86KbdBrightnessUp, NoSymbol, XF86_Switch_VT_2 ]

-    };

-    key <FK03> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_3 ]

-    };

-    key <FK04> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_4 ]

-    };

-    key <FK05> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_5 ]

-    };

-    key <FK06> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_6 ]

-    };

-    key <FK07> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86AudioPrev, NoSymbol, XF86_Switch_VT_7 ]

-    };

-    key <FK08> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86AudioPlay, NoSymbol, XF86_Switch_VT_8 ]

-    };

-    key <FK09> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86AudioNext, NoSymbol, XF86_Switch_VT_9 ]

-    };

-    key <FK10> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86AudioMute, NoSymbol, XF86_Switch_VT_10 ]

-    };

-    key <FK11> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86AudioLowerVolume, NoSymbol, XF86_Switch_VT_11 ]

-    };

-    key <FK12> {

-      type= "FOUR_LEVEL_X",

-      symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ]

-    };

-};

-

-// Aluminium Keyboard: make F13, F14, F15 PC-ish (Print, Scroll_Lock, Pause)

-partial function_keys keypad_keys

-xkb_symbols "alupckeys" {

-    key <FK13> {

-      type= "PC_ALT_LEVEL2",

-      symbols[Group1]= [ Print, Sys_Req ]

-    };

-    key <FK14> { [ Scroll_Lock ] };

-    key <FK15> {

-      type= "PC_CONTROL_LEVEL2",

-      symbols[Group1]= [ Pause, Break ]

-    };

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

-};

diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch b/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch
deleted file mode 100644
index 4932eb89a..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch
+++ /dev/null
@@ -1,102 +0,0 @@
-// $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
-};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de b/xorg-server/xkbdata.src/symbols/macintosh_vndr/de
deleted file mode 100644
index 92c54916c..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de
+++ /dev/null
@@ -1,97 +0,0 @@
-// $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			]	};
-};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk b/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk
deleted file mode 100644
index 56ef85bf6..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk
+++ /dev/null
@@ -1,79 +0,0 @@
-// $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 ] };
-};
-
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi
deleted file mode 100644
index 6cb5fa314..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi
+++ /dev/null
@@ -1,18 +0,0 @@
-
-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/xkbdata.src/symbols/macintosh_vndr/fr b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr
deleted file mode 100644
index 9a8f8de23..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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/xkbdata.src/symbols/macintosh_vndr/gb b/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb
deleted file mode 100644
index 8eb82eb70..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb
+++ /dev/null
@@ -1,21 +0,0 @@
-// $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)"
-};
-
-
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is b/xorg-server/xkbdata.src/symbols/macintosh_vndr/is
deleted file mode 100644
index 000bcdb0b..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is
+++ /dev/null
@@ -1,128 +0,0 @@
-// $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";
-};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it b/xorg-server/xkbdata.src/symbols/macintosh_vndr/it
deleted file mode 100644
index 44435201b..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it
+++ /dev/null
@@ -1,64 +0,0 @@
-
-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/xkbdata.src/symbols/macintosh_vndr/jp b/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp
deleted file mode 100644
index a4af79f35..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp
+++ /dev/null
@@ -1,35 +0,0 @@
-// JIS symbol mapping for Apple Aluminium Keyboard

-// (Damien Ciabrini <damien.ciabrini@gmail.com>)

-//

-// The JIS version of the Aluminium Keyboard is made of

-//   QWERTY-like map for the latin part

-//   PC98-like map for the kana part

-//   EISU and KANA keys found on other Apple keyboards

-

-partial default alphanumeric_keys

-xkb_symbols "usmac" {

-    name[Group1]	= "Japan - Macintosh, US map";

-    include "jp(common)"

-

-    key <JPCM> { [ KP_Separator ] };

-    key <AE13> { [ yen, bar 	] };

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

-    replace key <AB11> { [ underscore	] };

-    replace key <CAPS> { [ Caps_Lock ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "mac" {

-    name[Group1]	= "Japan - Macintosh";

-    include "jp(kana)"

-

-    replace key <CAPS> { [ Caps_Lock ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "alujiskeys" {

-    // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja

-    // see keycodes macintosh(jisevdev)

-    replace key <HJCV> { [ Hiragana_Katakana ] };

-    replace key <HNGL> { [ Eisu_toggle ] };

-};

diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam b/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam
deleted file mode 100644
index 085de0e4b..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam
+++ /dev/null
@@ -1,38 +0,0 @@
-
-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/xkbdata.src/symbols/macintosh_vndr/makefile b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
deleted file mode 100644
index 0c54d7bdd..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\macintosh_vndr
-
-dist_symbols_DATA = \
-apple ch de dk \
-fi fr \
-gb is it jp \
-latam nl no pt \
-se us
-
-DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
-
-include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl b/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl
deleted file mode 100644
index b60690e4d..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-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/xkbdata.src/symbols/macintosh_vndr/no b/xorg-server/xkbdata.src/symbols/macintosh_vndr/no
deleted file mode 100644
index d8bf0d650..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/no
+++ /dev/null
@@ -1,52 +0,0 @@
-// $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     	]      	};
-
-};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt b/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt
deleted file mode 100644
index 8f1785742..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt
+++ /dev/null
@@ -1,63 +0,0 @@
-// $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 	]	};
-};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se b/xorg-server/xkbdata.src/symbols/macintosh_vndr/se
deleted file mode 100644
index d5d8c1c4c..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se
+++ /dev/null
@@ -1,46 +0,0 @@
-// $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";
-};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us b/xorg-server/xkbdata.src/symbols/macintosh_vndr/us
deleted file mode 100644
index fed3253cf..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us
+++ /dev/null
@@ -1,151 +0,0 @@
-// $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
-
-};