Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

15 files changed, 717 insertions, 717 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
index 69184024b..063fc8d57 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
@@ -1,5 +1,5 @@
-symbolsdir = $(xkb_base)/symbols/digital_vndr

-

-dist_symbols_DATA = \

-lk pc us \

-vt

+symbolsdir = $(xkb_base)/symbols/digital_vndr
+
+dist_symbols_DATA = \
+lk pc us \
+vt
diff --git a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
index bbcd6d58d..fb128fd19 100644
--- a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
+++ b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
@@ -1,3 +1,3 @@
-#!/bin/sh

-

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

+#!/bin/sh
+
+grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
index 5c9b0b833..4e3a96ee1 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/fujitsu_vndr

-

-dist_symbols_DATA = \

-jp us

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

-

-dist_symbols_DATA = \

-us

+symbolsdir = $(xkb_base)/symbols/hp_vndr
+
+dist_symbols_DATA = \
+us
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am
index 1d43f40c2..f39662e4c 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/Makefile.am
@@ -1,8 +1,8 @@
-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

+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/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
index c76551d30..9a8f8de23 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
@@ -1,110 +1,110 @@
-// Marc.Shapiro@inria.fr 19-sep-1998

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

-// adapted to the new input layer :

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

-//////////////////////////////////////////////////////////////////

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

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

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

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

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

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

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

-//////////////////////////////////////////////////////////////////

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

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

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

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

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

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

-// I may have made some mistakes.

-

-// Entries marked CHECK are particularly uncertain

-

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

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

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

-// found.)

-

-default

-xkb_symbols "extended" {

-

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

-

-    key <ESC>  {	[ Escape			]	};

-

-    // Alphanumeric section

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

-    key <ENTR> {        [    KP_Enter                   ]       };

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

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

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

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

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

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

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

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

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

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

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

-    key <CAPS> {	[	Caps_Lock		]	};

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

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

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

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

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

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

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

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

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

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

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

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

-    key <RTRN> {	[    Return			]	};

-

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

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

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

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

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

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

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

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

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

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

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

-

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

-    // End alphanumeric section

-

-    include "level3(ralt_switch)"

-};

-

-

-

-xkb_symbols "nodeadkeys" {

-include "macintosh_vndr/fr(extended)"

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

-    

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

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

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

-

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

-};

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

-};

+// 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/xkeyboard-config/symbols/nec_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
index ac1de6ec9..ff070065a 100644
--- a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/nec_vndr

-

-dist_symbols_DATA = \

-jp

+symbolsdir = $(xkb_base)/symbols/nec_vndr
+
+dist_symbols_DATA = \
+jp
diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
index 63dc5db6e..71200ec4d 100644
--- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
@@ -1,6 +1,6 @@
-symbolsdir = $(xkb_base)/symbols/nokia_vndr

-

-dist_symbols_DATA = \

-rx-44 \

-rx-51 \

-su-8w

+symbolsdir = $(xkb_base)/symbols/nokia_vndr
+
+dist_symbols_DATA = \
+rx-44 \
+rx-51 \
+su-8w
diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
index 7d91d6db3..515b69eef 100644
--- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
@@ -1,303 +1,303 @@
-partial alphanumeric_keys

-xkb_symbols "us" {

-    name[Group1] = "U.S. English";

-    

-    include "nokia_vndr/rx-44(base)"

-

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

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

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

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

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

-

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

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

-};

-

-

-

-partial alphanumeric_keys

-xkb_symbols "fisenoda" {

-    name[Group1] = "Finnish/Swedish/Norwegian/Danish";

-

-    include "nokia_vndr/rx-44(base)"

-

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

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

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

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

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

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

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

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

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

-    key <AC11>  {       [       aring,          Aring,          question,	question	]	};

-

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

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

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

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

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

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

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

-    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };

-    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };

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

-

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

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

-};

-

-

-

-partial alphanumeric_keys

-xkb_symbols "ptes" {

-    name[Group1] = "Portuguese/Spanish";

-

-    include "nokia_vndr/rx-44(base)"

-

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

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

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

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

-    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};

-    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};

-    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};

-

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

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

-};

-

-

-

-partial alphanumeric_keys

-xkb_symbols "fr" {

-    name[Group1] = "French";

-

-    include "nokia_vndr/rx-44(base)"

-

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

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

-

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

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

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

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

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

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

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

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

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

-    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };

-

-    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};

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

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

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

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

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

-    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};

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

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

-    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };

-

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

-    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };

-};

-

-

-

-partial alphanumeric_keys

-xkb_symbols "de" {

-    name[Group1] = "German";

-

-    include "nokia_vndr/rx-44(base)"

-

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

-

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

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

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

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

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

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

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

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

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

-    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };

-

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

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

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

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

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

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

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

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

-    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };

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

-

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

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

-};

-

-

-// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.

-partial alphanumeric_keys

-xkb_symbols "ru" {

-    name[Group1] = "Russian";

-

-    include "nokia_vndr/rx-44(base)"

-

-    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};

-    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};

-    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};

-    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};

-    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};

-    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};

-    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};

-    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};

-    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};

-    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};

-

-    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};

-    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};

-    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};

-    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};

-    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};

-    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};

-    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};

-    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};

-    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};

-    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};

-

-    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};

-    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};

-    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};

-    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};

-    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};

-    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};

-    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};

-    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};

-    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};

-    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};

-

-    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};

-    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};

-};

-

-

-

-partial alphanumeric_keys

-xkb_symbols "it" {

-    name[Group1] = "Italian";

-

-    include "nokia_vndr/rx-44(base)"

-

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

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

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

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

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

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

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

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

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

-    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };

-

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

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

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

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

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

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

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

-    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };

-    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };

-    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };

-

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

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

-};

-

-partial default alphanumeric_keys

-xkb_symbols "base" {

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

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

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

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

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

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

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

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

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

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

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

-

-    // broken UI spec.

-    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};

-

-    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};

-    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};

-    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};

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

-    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};

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

-

-    modifier_map Shift { Shift_L };

-    modifier_map Mod5 { ISO_Level3_Shift };

-    modifier_map Control { Control_R };

-

-    key <KPEN>	{	[	Return		]	};

-    key <UP>	{	[	Up		]	};

-    key <DOWN>	{	[	Down		]	};

-    key <LEFT>	{	[	Left		]	};

-    key <RGHT>	{	[	Right		]	};

-

-    key <ESC>	{	[	Escape		]	};

-    key <FK01>	{	[	F1		]	};

-    key <FK02>	{	[	F2		]	};

-    key <FK03>	{	[	F3		]	};

-    key <FK04>	{	[	F4		]	};

-    key <FK05>	{	[	F5		]	};

-    key <FK06>	{	[	F6		]	};

-    key <FK07>	{	[	F7		]	};

-    key <FK08>	{	[	F8		]	};

-    key <FK09>	{	[	F9		]	};

-    key <FK10>	{	[	F10		]	};

-    key <FK11>	{	[	F11		]	};

-    key <FK12>	{	[	F12		]	};

-

-    // generated from the headset, must always be in the map.

-    key <I29>  {	[	XF86Phone	]	};

-};

+partial alphanumeric_keys
+xkb_symbols "us" {
+    name[Group1] = "U.S. English";
+    
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		backslash,	backslash	]	};
+    key <AC06>	{	[	h,		H,		slash,		slash		]	};
+    key <AC07>	{	[	j,		J,		parenleft,	parenleft	]	};
+    key <AC08>	{	[	k,		K,		parenright,	parenright	]	};
+    key <AC09>	{	[	l,		L,		asterisk,	asterisk	]	};
+    key <AC11>  {       [       apostrophe,     question,       question,	question	]	};
+
+    key <AB01>	{	[	z,		Z,		yen,		yen		]	};
+    key <AB02>	{	[	x,		X,		asciicircum,	asciicircum	]	};
+    key <AB03>	{	[	c,		C,		asciitilde,	asciitilde	]	};
+    key <AB04>	{	[	v,		V,		percent,	percent		]	};
+    key <AB05>	{	[	b,		B,		ampersand,	ampersand	]	};
+    key <AB06>	{	[	n,		N,		dollar,		dollar		]	};
+    key <AB07>	{	[	m,		M,		EuroSign,	EuroSign	]	};
+    key <AC10>  {       [       semicolon,      colon,          sterling,	sterling	]	};
+    key <AE11>  {       [       minus,          underscore,     underscore,	underscore	]	};
+    key <AE12>  {       [       plus,           equal,          equal,		equal		]	};
+
+    key <AB08>  {       [       comma,          less,           comma,		less		]	};
+    key <AB09>  {       [       period,         greater,        period,		greater		]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fisenoda" {
+    name[Group1] = "Finnish/Swedish/Norwegian/Danish";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       aring,          Aring,          question,	question	]	};
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		percent,	percent		]	};
+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
+    key <AB05>	{	[	b,		B,		plus,		plus		]	};
+    key <AB06>	{	[	n,		N,		less,		less		]	};
+    key <AB07>	{	[	m,		M,		greater,	greater		]	};
+    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };
+    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };
+    key <AE12>  {       [       minus,          underscore,     underscore,	underscore	]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
+    key <AB09>  {       [       period,         colon,          period,		colon		]       };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ptes" {
+    name[Group1] = "Portuguese/Spanish";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       dead_acute,     dead_grave,     dead_diaeresis,	dead_diaeresis	]	};
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		percent,	percent 	]	};
+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
+    key <AB04>	{	[	v,		V,		exclamdown,	exclamdown	]	};
+    key <AB05>	{	[	b,		B,		apostrophe,	apostrophe	]	};
+    key <AB06>	{	[	n,		N,		plus,		plus		]	};
+    key <AB07>	{	[	m,		M,		equal,		equal		]	};
+    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};
+    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};
+    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};
+
+    key <AB08>  {       [	comma,		semicolon,	minus,		minus		]	};
+    key <AB09>  {       [	period,		colon,		underscore,	underscore	]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fr" {
+    name[Group1] = "French";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD01>	{	[	a,		A,		1,              1               ]	};
+    key <AD02>	{	[	z,		Z,		2,              2               ]	};
+
+    key <AC01>	{	[	q,		Q,		at,             at              ]	};
+    key <AC02>	{	[	s,		S,		percent,        percent         ]	};
+    key <AC03>	{	[	d,		D,		ecircumflex,    Ecircumflex	]	};
+    key <AC04>	{	[	f,		F,		eacute,  	Eacute          ]	};
+    key <AC05>	{	[	g,		G,		egrave,    	Egrave          ]	};
+    key <AC06>	{	[	h,		H,		oe,             OE      	]	};
+    key <AC07>	{	[	j,		J,		parenleft,      parenleft   	]	};
+    key <AC08>	{	[	k,		K,		parenright,     parenright	]	};
+    key <AC09>	{	[	l,		L,		agrave,         Agrave      	]	};
+    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };
+
+    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};
+    key <AB02>	{	[	x,		X,		numbersign,     numbersign 	]	};
+    key <AB03>	{	[	c,		C,		ccedilla,       Ccedilla	]	};
+    key <AB04>	{	[	v,		V,		plus,           plus	        ]	};
+    key <AB05>	{	[	b,		B,		equal,          equal   	]	};
+    key <AB06>	{	[	n,		N,		quotedbl,       quotedbl	]	};
+    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};
+    key <AC10>  {       [       semicolon,      period,         minus,          minus           ]       };
+    key <AE11>  {       [       colon,          slash,          underscore,     underscore      ]       };
+    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };
+
+    key <AB08>  {       [       less,		greater,	less,		greater		]	};
+    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "de" {
+    name[Group1] = "German";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD06>	{	[	z,		Z,		6,		6		]	};
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		percent,	percent    	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash	  	]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };
+
+    key <AB01>	{	[	y,		Y,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		asterisk,	asterisk	]	};
+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
+    key <AB05>	{	[	b,		B,		plus,		plus		]	};
+    key <AB06>	{	[	n,		N,		less,		less		]	};
+    key <AB07>	{	[	m,		M,		greater,	greater		]	};
+    key <AC10>  {	[       odiaeresis,     Odiaeresis,     equal,		equal		]       };
+    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };
+    key <AE12>  {	[       minus,          underscore,     ssharp,		ssharp		]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]	};
+    key <AB09>  {       [       period,         colon,          period,		colon		]	};
+};
+
+
+// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
+partial alphanumeric_keys
+xkb_symbols "ru" {
+    name[Group1] = "Russian";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};
+    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};
+    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};
+    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};
+    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};
+    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};
+    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};
+    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};
+    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};
+    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};
+
+    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};
+    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};
+    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};
+    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};
+    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};
+    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};
+    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};
+    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};
+    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};
+    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};
+
+    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};
+    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};
+    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};
+    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};
+    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};
+    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};
+    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};
+    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};
+    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};
+    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+
+    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};
+    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "it" {
+    name[Group1] = "Italian";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
+    key <AB04>	{	[	v,		V,		equal,		equal		]	};
+    key <AB05>	{	[	b,		B,		less,		less		]	};
+    key <AB06>	{	[	n,		N,		greater,	greater		]	};
+    key <AB07>	{	[	m,		M,		plus,		plus		]	};
+    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };
+    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };
+    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
+    key <AB09>  {       [       period,         colon,          period,		colon		]       };
+};
+
+partial default alphanumeric_keys
+xkb_symbols "base" {
+    key <AD01>	{	[	q,			Q,			1,			1			]	};
+    key <AD02>	{	[	w,			W,			2,			2			]	};
+    key <AD03>	{	[	e,			E,			3,			3			]	};
+    key <AD04>	{	[	r,			R,			4,			4			]	};
+    key <AD05>	{	[	t,			T,			5,			5			]	};
+    key <AD06>	{	[	y,			Y,			6,			6			]	};
+    key <AD07>	{	[	u,			U,			7,			7			]	};
+    key <AD08>	{	[	i,			I,			8,			8			]	};
+    key <AD09>	{	[	o,			O,			9,			9			]	};
+    key <AD10>	{	[	p,			P,			0,			0			]	};
+    key <BKSP>	{	[	BackSpace,		BackSpace,		BackSpace,		BackSpace		]	};
+
+    // broken UI spec.
+    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};
+
+    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};
+    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};
+    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
+    key <SPCE>	{	[	space,			space,			space,			space			]	};
+    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};
+    key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};
+
+    modifier_map Shift { Shift_L };
+    modifier_map Mod5 { ISO_Level3_Shift };
+    modifier_map Control { Control_R };
+
+    key <KPEN>	{	[	Return		]	};
+    key <UP>	{	[	Up		]	};
+    key <DOWN>	{	[	Down		]	};
+    key <LEFT>	{	[	Left		]	};
+    key <RGHT>	{	[	Right		]	};
+
+    key <ESC>	{	[	Escape		]	};
+    key <FK01>	{	[	F1		]	};
+    key <FK02>	{	[	F2		]	};
+    key <FK03>	{	[	F3		]	};
+    key <FK04>	{	[	F4		]	};
+    key <FK05>	{	[	F5		]	};
+    key <FK06>	{	[	F6		]	};
+    key <FK07>	{	[	F7		]	};
+    key <FK08>	{	[	F8		]	};
+    key <FK09>	{	[	F9		]	};
+    key <FK10>	{	[	F10		]	};
+    key <FK11>	{	[	F11		]	};
+    key <FK12>	{	[	F12		]	};
+
+    // generated from the headset, must always be in the map.
+    key <I29>  {	[	XF86Phone	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
index 0133ca001..b1123e70e 100644
--- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/sgi_vndr

-

-dist_symbols_DATA = \

-jp

+symbolsdir = $(xkb_base)/symbols/sgi_vndr
+
+dist_symbols_DATA = \
+jp
diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
index 5577f7c7c..e1a77d957 100644
--- a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/sony_vndr

-

-dist_symbols_DATA = \

-us

+symbolsdir = $(xkb_base)/symbols/sony_vndr
+
+dist_symbols_DATA = \
+us
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
index 00692e334..cc4c5b620 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
@@ -1,10 +1,10 @@
-symbolsdir = $(xkb_base)/symbols/sun_vndr

-

-dist_symbols_DATA = \

- ara be br ca ch \

- cz de dk ee es \

- fi fr gb gr it \

- jp kr lt lv nl \

- no pl pt ro ru \

- se sk solaris tr tuv \

- tw ua us

+symbolsdir = $(xkb_base)/symbols/sun_vndr
+
+dist_symbols_DATA = \
+ ara be br ca ch \
+ cz de dk ee es \
+ fi fr gb gr it \
+ jp kr lt lv nl \
+ no pl pt ro ru \
+ se sk solaris tr tuv \
+ tw ua us
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
index d07b150d1..c435744ee 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
@@ -1,213 +1,213 @@
-//-------------------------------------------------------------------------

-//

-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

-//

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

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

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

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

-// distribute, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-//

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

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

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

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-//

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

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

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

-// of the copyright holder.

-//

-//-------------------------------------------------------------------------

-//

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-// Default map provides backwards compatibility with Sun keyboards from

-// long ago and the key mappings still used in Solaris Xsun today

-

-partial default

-xkb_symbols "defaults_common" {

-

-    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards

-    // and the names have stuck (you can spot a longtime Sun admin when you

-    // hear them say to hit "L1-A" to enter the OpenBoot PROM)

-    // These names get mapped to the keysyms F11-F20

-    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };

-    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };

-    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };

-    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };

-    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };

-    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };

-    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };

-    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };

-    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };

-    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };

-

-    // And on the right side, the function keys were labeled R1-R15,

-    // which get mapped to the keysyms F21-F35

-    // This includes the keys that became the numeric keypad

-    key <PAUS> { [ R1,  R1              ], [ Pause              ] };

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

-    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };

-

-    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };

-    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };

-    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };

-

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

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

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

-

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

-    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };

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

-

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

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

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

-

-    // F11 & F12 are mapped to SunF36 and SunF37 since they were added

-    // after F11-F35 were already assigned on Sun keyboards

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

-    key <FK12> { [ SunF37               ], [ F12                ] };

-

-    // These were added to the keyboard much later and simply got mapped

-    // to their logical names

-    key <HELP> { [ Help                 ]                       };

-    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};

-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};

-    key <POWR> { [  XF86Sleep,		XF86Hibernate		]	};

-

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

-//    key <LMTA> { [ Meta_L               ]                       };

-//    key <RMTA> { [ Meta_R               ]                       };

-//    key <COMP> { [ Multi_key            ]                       };

-};

-

-partial default

-xkb_symbols "defaults" {

-    include "sun_vndr/solaris(defaults_common)"

-//    key <RALT> { [ Mode_switch          ]                       };

-//    key <ALGR> { [ Mode_switch          ]                       };

-

-    // begin modifier mappings

-//    modifier_map Shift          { Shift_R, Shift_L };

-//    modifier_map Mod1           { Alt_L };

-//    modifier_map Mod2           { Num_Lock };

-//    modifier_map Mod3           { Alt_R, Mode_switch };

-//    modifier_map Mod4           { Meta_L, Meta_R };

-};

-

-partial default

-xkb_symbols "defaults_type7jp" {

-    include "sun_vndr/solaris(defaults_common)"

-    // begin modifier mappings

-    modifier_map Shift          { Shift_R, Shift_L };

-    modifier_map Mod1           { Alt_L , Alt_R};

-    modifier_map Mod2           { Num_Lock };

-    modifier_map Mod3           { Mode_switch };

-    modifier_map Mod4           { Meta_L, Meta_R };

-};

-

-// Map the keys to the actual key names instead of the ancient Sun function

-// keys

-partial

-xkb_symbols "keynames" {

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

-    key <FK12> { [ F12          ],      [ SunF37   ]    };

-

-    key <STOP> { [ Cancel	],	[ F11	]	};

-    key <AGAI> { [ Redo		],	[ F12	]	};

-    key <PROP> { [ SunProps	],	[ F13	]	};

-    key <UNDO> { [ Undo		],	[ F14	]	};

-    key <FRNT> { [ SunFront	],	[ F15	]	};

-    key <COPY> { [ SunCopy	],	[ F16	]	};

-    key <OPEN> { [ SunOpen	],	[ F17	]	};

-    key <PAST> { [ SunPaste	],	[ F18	]	};

-    key <FIND> { [ Find		],	[ F19	]	};

-    key <CUT>  { [ SunCut	],	[ F20	]	};

-

-    key <HELP> { [ Help		]	                };

-

-    key <PAUS> {  [  Pause                      ]       };

-    key <PRSC> {  [  Print                      ]       };

-    key <SCLK> {  [  Scroll_Lock, Break         ]       };

-

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

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

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

-

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

-    key  <KP5> {        [  KP_Begin,    KP_5    ]       };

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

-

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

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

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

-

-    key <KPEN> {        [       KP_Enter        ]       };

-    key <KPEQ> {        [       KP_Equal        ]       };

-

-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};

-    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};

-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

-

-    key <LALT> { [ Alt_L                ]                       };

-    key <RALT> { [ Mode_switch          ]                       };

-    key <ALGR> { [ Mode_switch          ]                       };

-    key <LMTA> { [ Meta_L               ]                       };

-    key <RMTA> { [ Meta_R               ]                       };

-    key <COMP> { [ Multi_key            ]                       };

-

-};

-

-// Map the keys to the XFree86 key names instead of the Sun key names

-partial

-xkb_symbols "xf86keynames" {

-    key <STOP> { [ XF86Stop	],	[ F11	]	};

-    key <AGAI> { [ Redo		],	[ F12	]	};

-    key <PROP> { [ SunProps	],	[ F13	]	};

-    key <UNDO> { [ Undo		],	[ F14	]	};

-    key <FRNT> { [ SunFront	],	[ F15	]	};

-    key <COPY> { [ XF86Copy	],	[ F16	]	};

-    key <OPEN> { [ XF86Open	],	[ F17	]	};

-    key <PAST> { [ XF86Paste	],	[ F18	]	};

-    key <FIND> { [ Find		],	[ F19	]	};

-    key <CUT>  { [ XF86Cut	],	[ F20	]	};

-

-    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};

-    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};

-    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};

-};

+//-------------------------------------------------------------------------
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//-------------------------------------------------------------------------
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Default map provides backwards compatibility with Sun keyboards from
+// long ago and the key mappings still used in Solaris Xsun today
+
+partial default
+xkb_symbols "defaults_common" {
+
+    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards
+    // and the names have stuck (you can spot a longtime Sun admin when you
+    // hear them say to hit "L1-A" to enter the OpenBoot PROM)
+    // These names get mapped to the keysyms F11-F20
+    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };
+    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };
+    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };
+    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };
+    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };
+    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };
+    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };
+    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };
+    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };
+    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };
+
+    // And on the right side, the function keys were labeled R1-R15,
+    // which get mapped to the keysyms F21-F35
+    // This includes the keys that became the numeric keypad
+    key <PAUS> { [ R1,  R1              ], [ Pause              ] };
+    key <PRSC> { [ R2,  R2              ], [ Print              ] };
+    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };
+
+    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };
+    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };
+    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };
+
+    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };
+    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };
+    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };
+
+    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };
+    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };
+    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };
+
+    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };
+    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };
+    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };
+
+    // F11 & F12 are mapped to SunF36 and SunF37 since they were added
+    // after F11-F35 were already assigned on Sun keyboards
+    key <FK11> { [ SunF36               ], [ F11                ] };
+    key <FK12> { [ SunF37               ], [ F12                ] };
+
+    // These were added to the keyboard much later and simply got mapped
+    // to their logical names
+    key <HELP> { [ Help                 ]                       };
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  XF86Sleep,		XF86Hibernate		]	};
+
+//    key <LALT> { [ Alt_L                ]                       };
+//    key <LMTA> { [ Meta_L               ]                       };
+//    key <RMTA> { [ Meta_R               ]                       };
+//    key <COMP> { [ Multi_key            ]                       };
+};
+
+partial default
+xkb_symbols "defaults" {
+    include "sun_vndr/solaris(defaults_common)"
+//    key <RALT> { [ Mode_switch          ]                       };
+//    key <ALGR> { [ Mode_switch          ]                       };
+
+    // begin modifier mappings
+//    modifier_map Shift          { Shift_R, Shift_L };
+//    modifier_map Mod1           { Alt_L };
+//    modifier_map Mod2           { Num_Lock };
+//    modifier_map Mod3           { Alt_R, Mode_switch };
+//    modifier_map Mod4           { Meta_L, Meta_R };
+};
+
+partial default
+xkb_symbols "defaults_type7jp" {
+    include "sun_vndr/solaris(defaults_common)"
+    // begin modifier mappings
+    modifier_map Shift          { Shift_R, Shift_L };
+    modifier_map Mod1           { Alt_L , Alt_R};
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3           { Mode_switch };
+    modifier_map Mod4           { Meta_L, Meta_R };
+};
+
+// Map the keys to the actual key names instead of the ancient Sun function
+// keys
+partial
+xkb_symbols "keynames" {
+    key <FK11> { [ F11          ],      [ SunF36   ]    };
+    key <FK12> { [ F12          ],      [ SunF37   ]    };
+
+    key <STOP> { [ Cancel	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+
+    key <HELP> { [ Help		]	                };
+
+    key <PAUS> {  [  Pause                      ]       };
+    key <PRSC> {  [  Print                      ]       };
+    key <SCLK> {  [  Scroll_Lock, Break         ]       };
+
+    key  <KP7> {        [  KP_Home,     KP_7    ]       };
+    key  <KP8> {        [  KP_Up,       KP_8    ]       };
+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
+
+    key  <KP4> {        [  KP_Left,     KP_4    ]       };
+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
+    key  <KP6> {        [  KP_Right,    KP_6    ]       };
+
+    key  <KP1> {        [  KP_End,      KP_1    ]       };
+    key  <KP2> {        [  KP_Down,     KP_2    ]       };
+    key  <KP3> {        [  KP_Next,     KP_3    ]       };
+
+    key <KPEN> {        [       KP_Enter        ]       };
+    key <KPEQ> {        [       KP_Equal        ]       };
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    key <LALT> { [ Alt_L                ]                       };
+    key <RALT> { [ Mode_switch          ]                       };
+    key <ALGR> { [ Mode_switch          ]                       };
+    key <LMTA> { [ Meta_L               ]                       };
+    key <RMTA> { [ Meta_R               ]                       };
+    key <COMP> { [ Multi_key            ]                       };
+
+};
+
+// Map the keys to the XFree86 key names instead of the Sun key names
+partial
+xkb_symbols "xf86keynames" {
+    key <STOP> { [ XF86Stop	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ XF86Copy	],	[ F16	]	};
+    key <OPEN> { [ XF86Open	],	[ F17	]	};
+    key <PAST> { [ XF86Paste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ XF86Cut	],	[ F20	]	};
+
+    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
index e7b931bf0..50be49bb4 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/xfree68_vndr

-

-dist_symbols_DATA = \

-amiga ataritt

+symbolsdir = $(xkb_base)/symbols/xfree68_vndr
+
+dist_symbols_DATA = \
+amiga ataritt