xserver xkeyboard-config libX11 pixman mesa git update 2011

11 files changed, 1702 insertions, 1728 deletions

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/all b/xorg-server/xkeyboard-config/keymap/sun_vndr/all
index 047ae7bc4..71a1813eb 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/all
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/all
@@ -1,1092 +1,1091 @@
-//  x86 KEYBOARDS
-// 
-//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102
-//  (102-key European) categories.  Symbol tables are typically formed by
-//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols
-//  from the type5 definition.  Geometries and keycodes for many of
-//  these fall under sun(x86) or sun(x86tuv).
-// 
-//  USB KEYBOARDS
-//  
-//  Only the keycodes (scancodes) change in the Universal Serial Bus
-//  keyboard definitions.  Symbols are kept the same as in the type5
-//  case.  The USB HID spec is confusing on this point, but the
-//  scancodes described in it relate to physical keys, not symbols, as
-//  it might lead one to believe.
-//
-//  HOBO KEYBOARDS
-//
-//  Hobo keyboards are derived from type5 keyboards, which in turn,
-//  are all derived from the type5 US keyboard.  Use the
-//  appropriate set of keycodes and geometry (either type5hobo or
-//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to
-//  replace sun/us(type5).  For example, Sweden5_Hobo:
-// 
-// xkb_keymap "Sweden5_Hobo" {
-//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-//     xkb_types		{ include "default"		};
-//     xkb_compatibility	{ include "default"		};
-//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
-//     xkb_geometry	{ include "sun(type5tuvhobo)"	};
-// };
-// 
-//  Doing it this way allows all the symbol changes for a particular
-//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in
-//  this case, would use sun/se(type5) to augment the symbols in the
-//  US keboard definition.
-
-xkb_keymap "Belgian6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+be"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Belgian6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+be"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Canada4" {
-    xkb_keycodes	{ include "sun(type4_ca)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/ca(type4)"	};
-    xkb_geometry	{ include "sun(type4_ca)"	};
-};
-
-xkb_keymap "Canada_Fr5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Canada_Fr5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Canada_Fr5_TBITS5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Canada_Fr_x86" {
-    xkb_keycodes	{ include "sun(x86ca)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};
-    xkb_geometry	{ include "sun(x86ca)"		};
-};
-
-xkb_keymap "Switzer_Fr4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/sw(type4fr)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Switzer_Fr6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Switzer_Ge4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/sw(type4de)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Switzer_Ge6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Czech5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/cz(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Germany4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/de(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Germany5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Germany5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+de"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Germany6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Germany6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Germany_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+de"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Denmark4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/dk(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Denmark5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Denmark5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Denmark6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Denmark6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Denmark_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "SpainLatAm4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/es(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Spain5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Spain5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Spain6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Spain6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Spain_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-
-xkb_keymap "Finnish6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Finnish6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-
-xkb_keymap "FranceBelg4" {
-    xkb_keycodes	{ include "sun(type4tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/fr(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "France5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "France5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "France6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "France6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "France_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Greece5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/gr(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Hungary5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Italy4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/it(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Italy5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Italy5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Italy6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Italy6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Italy_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Japan4" {
-    xkb_keycodes	{ include "sun(type4_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type4)"	};
-    xkb_geometry	{ include "sun(type4jp)"	};
-};
-
-xkb_keymap "Japan5" {
-    xkb_keycodes	{ include "sun(type5_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type5)"	};
-    xkb_geometry	{ include "sun(type5jp)"	};
-};
-
-xkb_keymap "Japan5_Hobo" {
-    xkb_keycodes	{ include "sun(type5_jphobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5jphobo)"	};
-};
-
-xkb_keymap "Japan6" {
-    xkb_keycodes	{ include "sun(type6_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default+japan(kana_lock)"	};
-    xkb_symbols		{ include "sun/jp(type6)"	};
-    xkb_geometry	{ include "sun(type6jp)"	};
-};
-
-xkb_keymap "Japan6_usb" {
-    xkb_keycodes	{ include "sun(type6_jp_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default+japan(kana_lock)"	};
-    xkb_symbols		{ include "sun/jp(type6)"	};
-    xkb_geometry	{ include "sun(type6jp)"	};
-};
-
-xkb_keymap "Japan_x86" {
-    xkb_keycodes	{ include "sun(x86jp)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(x86)"		};
-    xkb_geometry	{ include "sun(x86jp)"		};
-};
-
-xkb_keymap "J3100" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(J3100)"		};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Japan_Muhenkan_x86" {
-    xkb_keycodes	{ include "sun(x86jp)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};
-    xkb_geometry	{ include "sun(x86jp)"		};
-};
-
-xkb_keymap "Korea4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/ko(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "Korea5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-
-xkb_keymap "Korea5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};
-    xkb_geometry	{ include "sun(type5hobo)"		};
-};
-
-xkb_keymap "Korea6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "Korea6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "Korea_x86" {
-    xkb_keycodes	{ include "sun(x86ko)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(x86ko)"		};
-};
-
-xkb_keymap "Lithuania5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Latvia5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "MS_US101A_x86" {
-    xkb_keycodes	{ include "sun(MS_x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc104)"		};
-    xkb_geometry	{ include "sun(MS_x86)"		};
-};
-
-xkb_keymap "Netherland4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/nl(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Netherland5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Netherland5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Netherland6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Netherland6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Netherland_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+nl"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Norway4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/no(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Norway5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Norway5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Norway6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Norway6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Norway_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Poland5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/pl"		};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Portugal4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/pt(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Portugal5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Portugal5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Portugal6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Portugal6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Portugal_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-// xkb_keymap "Russia4" {
-//     xkb_keycodes	{ include "sun(type4)"		};
-//     xkb_types		{ include "default"		};
-//     xkb_compatibility	{ include "default"		};
-//     xkb_symbols		{ include "sun/ru"		};
-//     xkb_geometry	{ include "sun(type4)"		};
-// };
-
-xkb_keymap "Russia5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Russia6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Russia6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "SwedenFin4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/se(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Sweden5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Sweden5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Sweden6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Sweden6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Sweden_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Turkey5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Turkey6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Turkey6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyQ6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyQ6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyF6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "TurkeyF6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan4" {
-    xkb_keycodes	{ include "sun(type4)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/tw(type4)"	};
-    xkb_geometry	{ include "sun(type4)"	};
-};
-
-xkb_keymap "Taiwan5" {
-    xkb_keycodes	{ include "sun(type5)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type5)"	};
-};
-
-xkb_keymap "Taiwan5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "Taiwan6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan_x86" {
-    xkb_keycodes	{ include "sun(x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)"	};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "UK4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/gb(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "UK5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "UK5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "UK6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "UK6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "UK_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+gb"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "US101A_PC" {
-    xkb_keycodes	{ include "sun(type5x86)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US101A_Sun" {
-    xkb_keycodes	{ include "sun(type5x86)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US101A_x86" {
-    xkb_keycodes	{ include "sun(x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)"		};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "US5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-
-xkb_keymap "US5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "US_UNIX5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
-
-xkb_keymap "US_UNIX5_Hobo" {
-    // Same as US5_Hobo
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "US6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "US6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "US_UNIX6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6unix)"	};
-};
-
-xkb_keymap "US_UNIX6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6unix)"	};
-};
-
+//  x86 KEYBOARDS

+// 

+//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102

+//  (102-key European) categories.  Symbol tables are typically formed by

+//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols

+//  from the type5 definition.  Geometries and keycodes for many of

+//  these fall under sun(x86) or sun(x86tuv).

+// 

+//  USB KEYBOARDS

+//  

+//  Only the keycodes (scancodes) change in the Universal Serial Bus

+//  keyboard definitions.  Symbols are kept the same as in the type5

+//  case.  The USB HID spec is confusing on this point, but the

+//  scancodes described in it relate to physical keys, not symbols, as

+//  it might lead one to believe.

+//

+//  HOBO KEYBOARDS

+//

+//  Hobo keyboards are derived from type5 keyboards, which in turn,

+//  are all derived from the type5 US keyboard.  Use the

+//  appropriate set of keycodes and geometry (either type5hobo or

+//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to

+//  replace sun/us(type5).  For example, Sweden5_Hobo:

+// 

+// xkb_keymap "Sweden5_Hobo" {

+//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+//     xkb_types		{ include "default"		};

+//     xkb_compatibility	{ include "default"		};

+//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};

+//     xkb_geometry	{ include "sun(type5tuvhobo)"	};

+// };

+// 

+//  Doing it this way allows all the symbol changes for a particular

+//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in

+//  this case, would use sun/se(type5) to augment the symbols in the

+//  US keboard definition.

+

+xkb_keymap "Belgian6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+be"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Belgian6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+be"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Canada4" {

+    xkb_keycodes	{ include "sun(type4_ca)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/ca(type4)"	};

+    xkb_geometry	{ include "sun(type4_ca)"	};

+};

+

+xkb_keymap "Canada_Fr5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Canada_Fr5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Canada_Fr5_TBITS5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Canada_Fr_x86" {

+    xkb_keycodes	{ include "sun(x86ca)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};

+    xkb_geometry	{ include "sun(x86ca)"		};

+};

+

+xkb_keymap "Switzer_Fr4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/sw(type4fr)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Switzer_Fr5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Switzer_Fr5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Switzer_Fr6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Switzer_Fr6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Switzer_Fr_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Switzer_Ge4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/sw(type4de)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Switzer_Ge5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Switzer_Ge5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Switzer_Ge6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Switzer_Ge6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Switzer_Ge_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Czech5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/cz(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+

+xkb_keymap "Germany4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/de(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Germany5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+de"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Germany5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+de"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Germany6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+de"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Germany6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+de"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Germany_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+de"};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Denmark4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/dk(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Denmark5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Denmark5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Denmark6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Denmark6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Denmark_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "SpainLatAm4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/es(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Spain5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Spain5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Spain6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Spain6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Spain_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+

+xkb_keymap "Finnish6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/fi"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Finnish6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/fi"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+

+xkb_keymap "FranceBelg4" {

+    xkb_keycodes	{ include "sun(type4tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/fr(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "France5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "France5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "France6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "France6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "France_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Greece5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/gr(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+

+xkb_keymap "Hungary5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+

+xkb_keymap "Italy4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/it(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Italy5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Italy5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Italy6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Italy6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Italy_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Japan4" {

+    xkb_keycodes	{ include "sun(type4_jp)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/jp(type4)"	};

+    xkb_geometry	{ include "sun(type4jp)"	};

+};

+

+xkb_keymap "Japan5" {

+    xkb_keycodes	{ include "sun(type5_jp)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/jp(type5)"	};

+    xkb_geometry	{ include "sun(type5jp)"	};

+};

+

+xkb_keymap "Japan5_Hobo" {

+    xkb_keycodes	{ include "sun(type5_jphobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/jp(type5hobo)"	};

+    xkb_geometry	{ include "sun(type5jphobo)"	};

+};

+

+xkb_keymap "Japan6" {

+    xkb_keycodes	{ include "sun(type6_jp)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default+japan(kana_lock)"	};

+    xkb_symbols		{ include "sun/jp(type6)"	};

+    xkb_geometry	{ include "sun(type6jp)"	};

+};

+

+xkb_keymap "Japan6_usb" {

+    xkb_keycodes	{ include "sun(type6_jp_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default+japan(kana_lock)"	};

+    xkb_symbols		{ include "sun/jp(type6)"	};

+    xkb_geometry	{ include "sun(type6jp)"	};

+};

+

+xkb_keymap "Japan_x86" {

+    xkb_keycodes	{ include "sun(x86jp)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/jp(x86)"		};

+    xkb_geometry	{ include "sun(x86jp)"		};

+};

+

+xkb_keymap "J3100" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/jp(J3100)"		};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Japan_Muhenkan_x86" {

+    xkb_keycodes	{ include "sun(x86jp)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};

+    xkb_geometry	{ include "sun(x86jp)"		};

+};

+

+xkb_keymap "Korea4" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/ko(type4)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+

+xkb_keymap "Korea5" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};

+    xkb_geometry	{ include "sun(type5)"		};

+};

+

+xkb_keymap "Korea5_Hobo" {

+    xkb_keycodes	{ include "sun(type5hobo)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};

+    xkb_geometry	{ include "sun(type5hobo)"		};

+};

+

+xkb_keymap "Korea6" {

+    xkb_keycodes	{ include "sun(type6)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};

+    xkb_geometry	{ include "sun(type6)"		};

+};

+

+xkb_keymap "Korea6_usb" {

+    xkb_keycodes	{ include "sun(type6_usb)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};

+    xkb_geometry	{ include "sun(type6)"		};

+};

+

+xkb_keymap "Korea_x86" {

+    xkb_keycodes	{ include "sun(x86ko)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};

+    xkb_geometry	{ include "sun(x86ko)"		};

+};

+

+xkb_keymap "Lithuania5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+

+xkb_keymap "Latvia5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "MS_US101A_x86" {

+    xkb_keycodes	{ include "sun(MS_x86)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc104)"		};

+    xkb_geometry	{ include "sun(MS_x86)"		};

+};

+

+xkb_keymap "Netherland4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/nl(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Netherland5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+nl"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Netherland5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Netherland6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+nl"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Netherland6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+nl"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Netherland_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+nl"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Norway4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/no(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Norway5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Norway5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Norway6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Norway6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Norway_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Poland5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/pl"		};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Portugal4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/pt(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Portugal5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Portugal5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Portugal6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Portugal6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Portugal_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+// xkb_keymap "Russia4" {

+//     xkb_keycodes	{ include "sun(type4)"		};

+//     xkb_types		{ include "default"		};

+//     xkb_compatibility	{ include "default"		};

+//     xkb_symbols		{ include "sun/ru"		};

+//     xkb_geometry	{ include "sun(type4)"		};

+// };

+

+xkb_keymap "Russia5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Russia6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Russia6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "SwedenFin4" {

+    xkb_keycodes	{ include "sun(type4tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/se(type4)"	};

+    xkb_geometry	{ include "sun(type4tuv)"	};

+};

+

+xkb_keymap "Sweden5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Sweden5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "Sweden6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Sweden6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Sweden_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "Turkey5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "Turkey6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "Turkey6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "TurkeyQ6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "TurkeyQ6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "TurkeyF6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};

+    xkb_geometry	{ include "sun(type6)"	};

+};

+

+xkb_keymap "TurkeyF6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};

+    xkb_geometry	{ include "sun(type6)"	};

+};

+

+xkb_keymap "Taiwan4" {

+    xkb_keycodes	{ include "sun(type4)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/tw(type4)"	};

+    xkb_geometry	{ include "sun(type4)"	};

+};

+

+xkb_keymap "Taiwan5" {

+    xkb_keycodes	{ include "sun(type5)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};

+    xkb_geometry	{ include "sun(type5)"	};

+};

+

+xkb_keymap "Taiwan5_Hobo" {

+    xkb_keycodes	{ include "sun(type5hobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};

+    xkb_geometry	{ include "sun(type5hobo)"	};

+};

+

+xkb_keymap "Taiwan6" {

+    xkb_keycodes	{ include "sun(type6)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};

+    xkb_geometry	{ include "sun(type6)"	};

+};

+

+xkb_keymap "Taiwan6_usb" {

+    xkb_keycodes	{ include "sun(type6_usb)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};

+    xkb_geometry	{ include "sun(type6)"	};

+};

+

+xkb_keymap "Taiwan_x86" {

+    xkb_keycodes	{ include "sun(x86)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "us(pc101)"	};

+    xkb_geometry	{ include "sun(x86)"		};

+};

+

+xkb_keymap "UK4" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/gb(type4)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+

+xkb_keymap "UK5" {

+    xkb_keycodes	{ include "sun(type5tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};

+    xkb_geometry	{ include "sun(type5tuv)"	};

+};

+

+xkb_keymap "UK5_Hobo" {

+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};

+    xkb_geometry	{ include "sun(type5tuvhobo)"	};

+};

+

+xkb_keymap "UK6" {

+    xkb_keycodes	{ include "sun(type6tuv)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "UK6_usb" {

+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};

+    xkb_geometry	{ include "sun(type6tuv)"	};

+};

+

+xkb_keymap "UK_x86" {

+    xkb_keycodes	{ include "sun(x86tuv)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc102)+gb"	};

+    xkb_geometry	{ include "sun(x86tuv)"		};

+};

+

+xkb_keymap "US101A_PC" {

+    xkb_keycodes	{ include "sun(type5x86)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};

+    xkb_geometry	{ include "sun(x86)"		};

+};

+

+xkb_keymap "US101A_Sun" {

+    xkb_keycodes	{ include "sun(type5x86)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};

+    xkb_geometry	{ include "sun(x86)"		};

+};

+

+xkb_keymap "US101A_x86" {

+    xkb_keycodes	{ include "sun(x86)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "us(pc101)"		};

+    xkb_geometry	{ include "sun(x86)"		};

+};

+

+xkb_keymap "US4" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type4)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+

+xkb_keymap "US5" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type5)"	};

+    xkb_geometry	{ include "sun(type5)"		};

+};

+

+xkb_keymap "US5_Hobo" {

+    xkb_keycodes	{ include "sun(type5hobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type5hobo)"	};

+    xkb_geometry	{ include "sun(type5hobo)"	};

+};

+

+xkb_keymap "US_UNIX5" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type5)"	};

+    xkb_geometry	{ include "sun(type5unix)"	};

+};

+

+xkb_keymap "US_UNIX5_Hobo" {

+    // Same as US5_Hobo

+    xkb_keycodes	{ include "sun(type5hobo)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type5hobo)"	};

+    xkb_geometry	{ include "sun(type5hobo)"	};

+};

+

+xkb_keymap "US6" {

+    xkb_keycodes	{ include "sun(type6)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type6)"	};

+    xkb_geometry	{ include "sun(type6)"		};

+};

+

+xkb_keymap "US6_usb" {

+    xkb_keycodes	{ include "sun(type6_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type6)"	};

+    xkb_geometry	{ include "sun(type6)"		};

+};

+

+xkb_keymap "US_UNIX6" {

+    xkb_keycodes	{ include "sun(type6)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type6)"	};

+    xkb_geometry	{ include "sun(type6unix)"	};

+};

+

+xkb_keymap "US_UNIX6_usb" {

+    xkb_keycodes	{ include "sun(type6_usb)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun/us(type6)"	};

+    xkb_geometry	{ include "sun(type6unix)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/de b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
index 4c1ded3fc..e05fdf384 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
@@ -1,78 +1,77 @@
-// $Xorg: de,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "type4_de" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_de_nodeadkeys" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_de_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_de" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_de_nodeadkeys" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_de_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_de" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_de_nodeadkeys" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_de_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_de" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_de_nodeadkeys" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_de_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/es b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
index 2de81c011..5af8e4222 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/es,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_es" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_es_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_es" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_es_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_es" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_es_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_es" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_es_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fi b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
index 296ef66c4..3e48c7f43 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_fi" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_fi_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_fi" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_fi_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_fi" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_fi_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_fi" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_fi_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
index 9301ce031..8e15ca017 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_fr" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_fr_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_fr" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_fr_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_fr" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_fr_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_fr" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_fr_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/no b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
index 45669237e..200df8910 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/no,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_no" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_no_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_no" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_no_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_no" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_no_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_no" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_no_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/pl b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
index 904ffb2d7..2da430f27 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_pl" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_pl_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_pl" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_pl_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_pl" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_pl_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_pl" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_pl_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
index fc7d75b1e..005f27f3c 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_ru" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_ru_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_ru" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_ru_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_ru" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_ru_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_ru" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_ru_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/se b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
index fad7009e4..cb3cc6d00 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
@@ -1,56 +1,54 @@
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/se,v 1.2 1998/12/20 09:34:42 dawes Exp $
-
-default xkb_keymap "type5c_se_fixdollar" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type5c_se)"	};
-};
-xkb_keymap "type5c_se" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)"
-    };
-    xkb_geometry	{ include "sun(type5c_se)"	};
-};
-xkb_keymap "type5_se" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)"
-    };
-    xkb_geometry	{ include "sun(type5_se)"	};
-};
-xkb_keymap "type4_se_fixdollar_swapctl" {
-    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
-xkb_keymap "type4_se_fixdollar" {
-    xkb_keycodes	{ include "sun(type4_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
-xkb_keymap "type4_se" {
-    xkb_keycodes	{ include "sun(type4_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
+default xkb_keymap "type5c_se_fixdollar" {

+    xkb_keycodes	{ include "sun(type5_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun5)+se(fixdollar)"

+    };

+    xkb_geometry	{ include "sun(type5c_se)"	};

+};

+xkb_keymap "type5c_se" {

+    xkb_keycodes	{ include "sun(type5_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun5)"

+    };

+    xkb_geometry	{ include "sun(type5c_se)"	};

+};

+xkb_keymap "type5_se" {

+    xkb_keycodes	{ include "sun(type5_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun5)"

+    };

+    xkb_geometry	{ include "sun(type5_se)"	};

+};

+xkb_keymap "type4_se_fixdollar_swapctl" {

+    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun4)+se(fixdollar)"

+    };

+    xkb_geometry	{ include "sun(type4_se)"	};

+};

+xkb_keymap "type4_se_fixdollar" {

+    xkb_keycodes	{ include "sun(type4_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun4)+se(fixdollar)"

+    };

+    xkb_geometry	{ include "sun(type4_se)"	};

+};

+xkb_keymap "type4_se" {

+    xkb_keycodes	{ include "sun(type4_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun4)"

+    };

+    xkb_geometry	{ include "sun(type4_se)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/uk b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
index e1fb4970b..11b3efd58 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_uk" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_uk_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_uk" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_uk_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_uk" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_uk_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_uk" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_uk_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/us b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
index 397482f84..68b41de4b 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
@@ -1,68 +1,67 @@
-// $Xorg: us,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "type4_us" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_us_openlook" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_us" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-xkb_keymap "type5_us_openlook" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-xkb_keymap "type5_unix" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
-xkb_keymap "type5_unix_openlook" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

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

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

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

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

+//documentation.

+//

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

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

+//

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

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

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

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

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

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

+//OTHER DEALINGS IN THE SOFTWARE.

+//

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

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

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

+//from The Open Group.

+//

+xkb_keymap "type4_us" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_us_openlook" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_us" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};

+    xkb_geometry	{ include "sun(type5)"		};

+};

+xkb_keymap "type5_us_openlook" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};

+    xkb_geometry	{ include "sun(type5)"		};

+};

+xkb_keymap "type5_unix" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};

+    xkb_geometry	{ include "sun(type5unix)"	};

+};

+xkb_keymap "type5_unix_openlook" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};

+    xkb_geometry	{ include "sun(type5unix)"	};

+};