16 files changed, 913 insertions, 961 deletions
diff --git a/xorg-server/xkeyboard-config/compat/accessx b/xorg-server/xkeyboard-config/compat/accessx
index 3e4b46163..26cafab7a 100644
--- a/xorg-server/xkeyboard-config/compat/accessx
+++ b/xorg-server/xkeyboard-config/compat/accessx
@@ -1,54 +1,52 @@
-// $Xorg: accessx,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-default partial xkb_compatibility "basic" {
-    interpret AccessX_Enable { 
-	action= LockControls(controls=AccessXKeys); 
-    };
-};
-
-partial xkb_compatibility "full" {
-
-    interpret AccessX_Enable {
-	action= LockControls(controls=AccessXKeys); 
-    };
-
-    interpret AccessX_Feedback_Enable { 
-	action= LockControls(controls=AccessXFeedback); 
-    };
-
-    interpret RepeatKeys_Enable {
-	action= LockControls(controls=RepeatKeys);
-    };
-
-    interpret SlowKeys_Enable {
-	action= LockControls(controls=SlowKeys);
-    };
-
-    interpret BounceKeys_Enable {
-	action= LockControls(controls=BounceKeys);
-    };
-
-    interpret StickyKeys_Enable {
-	action= LockControls(controls=StickyKeys);
-    };
-
-    interpret MouseKeys_Enable {
-	action= LockControls(controls=MouseKeys);
-    };
-
-    interpret MouseKeys_Accel_Enable {
-	action= LockControls(controls=MouseKeysAccel);
-    };
-
-    interpret Overlay1_Enable {
-	action= LockControls(controls=Overlay1);
-    };
-
-    interpret Overlay2_Enable {
-	action= LockControls(controls=Overlay2);
-    };
-
-    interpret AudibleBell_Enable {
-	action= LockControls(controls=AudibleBell);
-    };
-};
+default partial xkb_compatibility "basic" {
+    interpret AccessX_Enable { 
+	action= LockControls(controls=AccessXKeys); 
+    };
+};
+
+partial xkb_compatibility "full" {
+
+    interpret AccessX_Enable {
+	action= LockControls(controls=AccessXKeys); 
+    };
+
+    interpret AccessX_Feedback_Enable { 
+	action= LockControls(controls=AccessXFeedback); 
+    };
+
+    interpret RepeatKeys_Enable {
+	action= LockControls(controls=RepeatKeys);
+    };
+
+    interpret SlowKeys_Enable {
+	action= LockControls(controls=SlowKeys);
+    };
+
+    interpret BounceKeys_Enable {
+	action= LockControls(controls=BounceKeys);
+    };
+
+    interpret StickyKeys_Enable {
+	action= LockControls(controls=StickyKeys);
+    };
+
+    interpret MouseKeys_Enable {
+	action= LockControls(controls=MouseKeys);
+    };
+
+    interpret MouseKeys_Accel_Enable {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+
+    interpret Overlay1_Enable {
+	action= LockControls(controls=Overlay1);
+    };
+
+    interpret Overlay2_Enable {
+	action= LockControls(controls=Overlay2);
+    };
+
+    interpret AudibleBell_Enable {
+	action= LockControls(controls=AudibleBell);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/basic b/xorg-server/xkeyboard-config/compat/basic
index 8f99c7b73..ba7e52a6f 100644
--- a/xorg-server/xkeyboard-config/compat/basic
+++ b/xorg-server/xkeyboard-config/compat/basic
@@ -1,52 +1,48 @@
-// $Xorg: basic,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Minimal set of symbol interpretations to provide 
-// reasonable default behavior (Num lock, shift and 
-// caps lock and mode switch) and set up the 
-// automatic updating of common keyboard LEDs.
-
-// $XFree86: xc/programs/xkbcomp/compat/basic,v 1.2 2000/11/06 19:24:10 dawes Exp $
-
-default xkb_compatibility "basic"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Shift_Lock+AnyOf(Shift+Lock) {
-	action= LockMods(modifiers=Shift);
-    };
-
-    interpret Any+Lock {
-	action= LockMods(modifiers=Lock);
-    };
-
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockMods(modifiers=NumLock);
-    };
-
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=+1);
-    };
-
-    interpret Any + Any {
-	action= SetMods(modifiers=modMapMods);
-    };
-
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
-
-    include "ledcaps"
-    include "lednum"
-    indicator "Shift Lock" {
-	!allowExplicit;
-	whichModState= Locked;
-	modifiers= Shift;
-    };
-};
+// Minimal set of symbol interpretations to provide 
+// reasonable default behavior (Num lock, shift and 
+// caps lock and mode switch) and set up the 
+// automatic updating of common keyboard LEDs.
+
+default xkb_compatibility "basic"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= LockMods(modifiers=Shift);
+    };
+
+    interpret Any+Lock {
+	action= LockMods(modifiers=Lock);
+    };
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=+1);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    include "ledcaps"
+    include "lednum"
+    indicator "Shift Lock" {
+	!allowExplicit;
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/complete b/xorg-server/xkeyboard-config/compat/complete
index cd8d059a7..0bf171db3 100644
--- a/xorg-server/xkeyboard-config/compat/complete
+++ b/xorg-server/xkeyboard-config/compat/complete
@@ -1,13 +1,10 @@
-// $XKeyboardConfig$
-// $Xorg: complete,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-default xkb_compatibility "complete"  {
-    include "basic"
-    augment "iso9995"
-    augment "mousekeys"
-    augment "accessx(full)"
-    augment "misc"
-    augment "xfree86"
-    augment "level5"
-    augment "caps(caps_lock)"
-};
-
+default xkb_compatibility "complete"  {
+    include "basic"
+    augment "iso9995"
+    augment "mousekeys"
+    augment "accessx(full)"
+    augment "misc"
+    augment "xfree86"
+    augment "level5"
+    augment "caps(caps_lock)"
+};
diff --git a/xorg-server/xkeyboard-config/compat/default.in b/xorg-server/xkeyboard-config/compat/default.in
index 090793fd7..4c4461fb9 100644
--- a/xorg-server/xkeyboard-config/compat/default.in
+++ b/xorg-server/xkeyboard-config/compat/default.in
@@ -1,5 +1,3 @@
-// $XKeyboardConfig$
-// $Xorg: default,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
 default xkb_compatibility "default"  {
     include "basic"
     augment "mousekeys"
diff --git a/xorg-server/xkeyboard-config/compat/iso9995 b/xorg-server/xkeyboard-config/compat/iso9995
index d513c1ce4..4dea5bf01 100644
--- a/xorg-server/xkeyboard-config/compat/iso9995
+++ b/xorg-server/xkeyboard-config/compat/iso9995
@@ -1,84 +1,80 @@
-// $Xorg: iso9995,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Fairly complete set of symbol interpretations 
-// to provide reasonable default behavior
-
-// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.3 2003/02/21 03:16:34 dawes Exp $
-
-default partial xkb_compatibility "default"  {
-    virtual_modifiers LevelThree,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret ISO_Lock+Any {
-	action= ISOLock(affect= all,modifiers=modMapMods);
-    };
-
-    interpret ISO_Level2_Latch+Shift {
-	useModMapMods= level1;
-	action= LatchMods(modifiers=Shift);
-    };
-
-    interpret ISO_Level3_Shift+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelThree;
-	action= SetMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Shift {
-	action= SetMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Latch+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelThree;
-	action= LatchMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Latch {
-	action= LatchMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Lock+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelThree;
-	action= LockMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Level3_Lock {
-	action= LockMods(modifiers=LevelThree);
-    };
-
-    interpret ISO_Group_Latch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= LatchGroup(group=2);
-    };
-
-    interpret ISO_Next_Group {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= LockGroup(group=+1);
-    };
-
-    interpret ISO_Prev_Group {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= LockGroup(group=-1);
-    };
-    interpret ISO_First_Group {
-	action= LockGroup(group=1);
-    };
-
-    interpret ISO_Last_Group {
-	action= LockGroup(group=2);
-    };
-
-    indicator "Group 2" {
-	!allowExplicit;
-	groups= All-Group1;
-    };
-};
+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelThree,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret ISO_Lock+Any {
+	action= ISOLock(affect= all,modifiers=modMapMods);
+    };
+
+    interpret ISO_Level2_Latch+Shift {
+	useModMapMods= level1;
+	action= LatchMods(modifiers=Shift);
+    };
+
+    interpret ISO_Level3_Shift+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= SetMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Shift {
+	action= SetMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Latch+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= LatchMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Latch {
+	action= LatchMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Lock+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= LockMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Lock {
+	action= LockMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Group_Latch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LatchGroup(group=2);
+    };
+
+    interpret ISO_Next_Group {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LockGroup(group=+1);
+    };
+
+    interpret ISO_Prev_Group {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LockGroup(group=-1);
+    };
+    interpret ISO_First_Group {
+	action= LockGroup(group=1);
+    };
+
+    interpret ISO_Last_Group {
+	action= LockGroup(group=2);
+    };
+
+    indicator "Group 2" {
+	!allowExplicit;
+	groups= All-Group1;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/japan b/xorg-server/xkeyboard-config/compat/japan
index 00187d00f..e9a6728d4 100644
--- a/xorg-server/xkeyboard-config/compat/japan
+++ b/xorg-server/xkeyboard-config/compat/japan
@@ -1,48 +1,45 @@
-// $Xorg: japan,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Japanese keyboards need Eisu and Kana shift and 
-// lock keys, which are typically bound to the
-// second shift level for some other modifier key.
-// These interpretations disable the default
-// interpretation (which would have these keys set
-// the same modifier as the level one symbol).
-
-default partial xkb_compatibility "japan"  {
-
-    interpret.repeat= False;
-
-    interpret Eisu_Shift+Lock {
-	action= NoAction();
-    };
-
-    interpret Eisu_toggle+Lock {
-	action= NoAction();
-    };
-
-    interpret Kana_Shift+Lock {
-	action= NoAction();
-    };
-
-    interpret Kana_Lock+Lock {
-	action= NoAction();
-    };
-};
-
-// Some Japanese keyboards have an explict Kana Lock key & matching LED
-
-partial xkb_compatibility "kana_lock"  {
-
-    virtual_modifiers Kana_Lock;
-
-    interpret Kana_Lock+AnyOfOrNone(all) {
-        virtualModifier= Kana_Lock;
-        useModMapMods=level1;
-        action= LockGroup(group=+1);
-    };
-
-    indicator "Kana" {
-        !allowExplicit;
-	groups= All-Group1;
-    };
-};
-
+// Japanese keyboards need Eisu and Kana shift and 
+// lock keys, which are typically bound to the
+// second shift level for some other modifier key.
+// These interpretations disable the default
+// interpretation (which would have these keys set
+// the same modifier as the level one symbol).
+
+default partial xkb_compatibility "japan"  {
+
+    interpret.repeat= False;
+
+    interpret Eisu_Shift+Lock {
+	action= NoAction();
+    };
+
+    interpret Eisu_toggle+Lock {
+	action= NoAction();
+    };
+
+    interpret Kana_Shift+Lock {
+	action= NoAction();
+    };
+
+    interpret Kana_Lock+Lock {
+	action= NoAction();
+    };
+};
+
+// Some Japanese keyboards have an explict Kana Lock key & matching LED
+
+partial xkb_compatibility "kana_lock"  {
+
+    virtual_modifiers Kana_Lock;
+
+    interpret Kana_Lock+AnyOfOrNone(all) {
+        virtualModifier= Kana_Lock;
+        useModMapMods=level1;
+        action= LockGroup(group=+1);
+    };
+
+    indicator "Kana" {
+        !allowExplicit;
+	groups= All-Group1;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/keypad b/xorg-server/xkeyboard-config/compat/keypad
index 469edec28..f28ca1497 100644
--- a/xorg-server/xkeyboard-config/compat/keypad
+++ b/xorg-server/xkeyboard-config/compat/keypad
@@ -1,60 +1,58 @@
-// $Xorg: keypad,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Interpretations needed to implement the numeric keypad
-// as an overlay instead of a modifier.
-
-partial hidden xkb_compatibility "overlay"  {
-    include "keypad(overlay1)"
-};
-partial hidden xkb_compatibility "overlay1"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Num_Lock {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay1);
-    };
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay1);
-    };
-
-    indicator.allowExplicit= True;
-    indicator.driveskbd= True;
-    replace indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-	controls= Overlay1;
-    };
-    indicator.allowExplicit= True;
-};
-partial hidden xkb_compatibility "overlay2"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Num_Lock {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay2);
-    };
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay1);
-    };
-
-    indicator.allowExplicit= True;
-    indicator.driveskbd= True;
-    replace indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-	controls= Overlay2;
-    };
-    indicator.allowExplicit= True;
-};
+// Interpretations needed to implement the numeric keypad
+// as an overlay instead of a modifier.
+
+partial hidden xkb_compatibility "overlay"  {
+    include "keypad(overlay1)"
+};
+partial hidden xkb_compatibility "overlay1"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Num_Lock {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay1);
+    };
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay1);
+    };
+
+    indicator.allowExplicit= True;
+    indicator.driveskbd= True;
+    replace indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+	controls= Overlay1;
+    };
+    indicator.allowExplicit= True;
+};
+partial hidden xkb_compatibility "overlay2"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Num_Lock {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay2);
+    };
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay1);
+    };
+
+    indicator.allowExplicit= True;
+    indicator.driveskbd= True;
+    replace indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+	controls= Overlay2;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/xorg-server/xkeyboard-config/compat/level5 b/xorg-server/xkeyboard-config/compat/level5
index 47693549f..69296e9f0 100644
--- a/xorg-server/xkeyboard-config/compat/level5
+++ b/xorg-server/xkeyboard-config/compat/level5
@@ -1,56 +1,51 @@
-// $XKeyboardConfig$
-// $Xorg: level5,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Fairly complete set of symbol interpretations 
-// to provide reasonable default behavior
-
-// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.3 2003/02/21 03:16:34 dawes Exp $
-
-default partial xkb_compatibility "default"  {
-    virtual_modifiers LevelFive;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret ISO_Level5_Shift+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelFive;
-	action= SetMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Shift {
-	action= SetMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Latch+Any {
-	virtualModifier= LevelFive;
-	action= LatchMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Latch {
-	action= LatchMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Lock+Any {
-	virtualModifier= LevelFive;
-	action= LockMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Lock {
-	action= LockMods(modifiers=LevelFive);
-    };
-};
-partial xkb_compatibility "level5_lock"  {
-	// This defines a Level5-Lock using the NumLock real modifier in order to
-	// create arbitrary level-behaviour, which would not be possible with the
-	// virtual modifier.
-	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
-	// See also: symbols/level5(lock)
-    virtual_modifiers NumLock;
-    
-    interpret ISO_Level5_Lock {
-        action = LockMods(modifiers = NumLock);
-    };
-};
+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelFive;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret ISO_Level5_Shift+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelFive;
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Shift {
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Latch+Any {
+	virtualModifier= LevelFive;
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Latch {
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Lock+Any {
+	virtualModifier= LevelFive;
+	action= LockMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Lock {
+	action= LockMods(modifiers=LevelFive);
+    };
+};
+partial xkb_compatibility "level5_lock"  {
+	// This defines a Level5-Lock using the NumLock real modifier in order to
+	// create arbitrary level-behaviour, which would not be possible with the
+	// virtual modifier.
+	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+	// See also: symbols/level5(lock)
+    virtual_modifiers NumLock;
+    
+    interpret ISO_Level5_Lock {
+        action = LockMods(modifiers = NumLock);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/misc b/xorg-server/xkeyboard-config/compat/misc
index 184fedc42..6a8b20217 100644
--- a/xorg-server/xkeyboard-config/compat/misc
+++ b/xorg-server/xkeyboard-config/compat/misc
@@ -1,129 +1,122 @@
-// $XdotOrg: xc/programs/xkbcomp/compat/misc,v 1.1.4.4 2004/03/05 13:41:28 eich Exp $
-// $Xorg: misc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-//
-//
-//
-// $XFree86: xc/programs/xkbcomp/compat/misc,v 1.4 2003/05/15 13:31:57 pascal Exp $
-
-default partial xkb_compatibility "misc"  {
-
-    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
-
-    // Interpretations for some other useful keys
-
-    interpret Terminate_Server {
-        action = Terminate();
-    };
-
-    setMods.clearLocks= True;
-
-    // Sets the "Alt" virtual modifier
-
-    interpret Alt_L+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Alt_L	{
-	action = SetMods(modifiers=Alt);
-    };
-
-    interpret Alt_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Alt_R	{
-	action = SetMods(modifiers=Alt);
-    };
-
-    // Sets the "Meta" virtual modifier
-
-    interpret Meta_L+Any     {
-//        useModMapMods= level1;
-	virtualModifier= Meta;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Meta_L	{
-	action = SetMods(modifiers=Meta);
-    };
-
-    interpret Meta_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Meta;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Meta_R	{
-	action = SetMods(modifiers=Meta);
-    };
-
-    // Sets the "Super" virtual modifier
-
-    interpret Super_L+Any     {
-//        useModMapMods= level1;
-	virtualModifier= Super;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Super_L	{
-	action = SetMods(modifiers=Super);
-    };
-
-    interpret Super_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Super;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Super_R	{
-	action = SetMods(modifiers=Super);
-    };
-
-    // Sets the "Hyper" virtual modifier
-
-    interpret Hyper_L+Any     {
-//        useModMapMods= level1;
-	virtualModifier= Hyper;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Hyper_L	{
-	action = SetMods(modifiers=Hyper);
-    };
-
-    interpret Hyper_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Hyper;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Hyper_R	{
-	action = SetMods(modifiers=Hyper);
-    };
-
-    // Sets the "ScrollLock" virtual modifier and
-    // makes it actually lock when pressed.  Sets
-    // up a map for the scroll lock indicator.
-    interpret Scroll_Lock+Any	{
-	virtualModifier= ScrollLock;
-	action = LockMods(modifiers=modMapMods);
-    };
-
-    include "ledscroll"
-	
-    include "misc(assign_shift_left_action)"
-};
-
-partial xkb_compatibility "assign_shift_left_action"  {
-    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 
-    // getting bound to the Lock modifier when using 
-    // symbols/shift(both_capslock), creating unwanted behaviour. 
-    // This is a quirk, to circumvent the problem.
-    interpret Shift_L {
-        action = SetMods(modifiers = Shift);
-    };
-};
+default partial xkb_compatibility "misc"  {
+
+    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
+
+    // Interpretations for some other useful keys
+
+    interpret Terminate_Server {
+        action = Terminate();
+    };
+
+    setMods.clearLocks= True;
+
+    // Sets the "Alt" virtual modifier
+
+    interpret Alt_L+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_L	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    interpret Alt_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    // Sets the "Meta" virtual modifier
+
+    interpret Meta_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_L	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    interpret Meta_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_R	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    // Sets the "Super" virtual modifier
+
+    interpret Super_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_L	{
+	action = SetMods(modifiers=Super);
+    };
+
+    interpret Super_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_R	{
+	action = SetMods(modifiers=Super);
+    };
+
+    // Sets the "Hyper" virtual modifier
+
+    interpret Hyper_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_L	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    interpret Hyper_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_R	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    // Sets the "ScrollLock" virtual modifier and
+    // makes it actually lock when pressed.  Sets
+    // up a map for the scroll lock indicator.
+    interpret Scroll_Lock+Any	{
+	virtualModifier= ScrollLock;
+	action = LockMods(modifiers=modMapMods);
+    };
+
+    include "ledscroll"
+	
+    include "misc(assign_shift_left_action)"
+};
+
+partial xkb_compatibility "assign_shift_left_action"  {
+    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 
+    // getting bound to the Lock modifier when using 
+    // symbols/shift(both_capslock), creating unwanted behaviour. 
+    // This is a quirk, to circumvent the problem.
+    interpret Shift_L {
+        action = SetMods(modifiers = Shift);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/mousekeys b/xorg-server/xkeyboard-config/compat/mousekeys
index fbd2b889a..bdd3d7c5d 100644
--- a/xorg-server/xkeyboard-config/compat/mousekeys
+++ b/xorg-server/xkeyboard-config/compat/mousekeys
@@ -1,205 +1,202 @@
-
-// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Interpretations for arrow keys and a bunch of other 
-// common keysyms which make it possible to bind "mouse" 
-// keys using xmodmap and activate or deactivate them 
-// from the keyboard.
-
-default partial xkb_compatibility "mousekeys" {
-
-    // Keypad actions.
-    //
-    interpret.repeat= True;
-
-    interpret KP_1 { 
-	action = MovePtr(x=-1,y= +1); 
-    };
-    interpret KP_End { 
-	action = MovePtr(x=-1,y= +1); 
-    };
-
-    interpret KP_2 { 
-	action = MovePtr(x=+0,y= +1); 
-    };
-    interpret KP_Down { 
-	action = MovePtr(x=+0,y= +1); 
-    };
-
-    interpret KP_3 { 
-	action = MovePtr(x=+1,y=+1); 
-    };
-    interpret KP_Next { 
- 	action = MovePtr(x=+1,y=+1); 
-    };
-
-    interpret KP_4 { 
-	action = MovePtr(x=-1,y=+0); 
-    };
-    interpret KP_Left { 
-	action = MovePtr(x=-1,y=+0); 
-    };
-
-    interpret KP_6 { 
-	action = MovePtr(x=+1,y=+0); 
-    };
-    interpret KP_Right { 
- 	action = MovePtr(x=+1,y=+0); 
-    };
-
-    interpret KP_7 { 
-	action = MovePtr(x=-1,y=-1); 
-    };
-    interpret KP_Home { 
-	action = MovePtr(x=-1,y=-1); 
-    };
-
-    interpret KP_8 { 
-	action = MovePtr(x=+0,y=-1); 
-    };
-    interpret KP_Up { 
-	action = MovePtr(x=+0,y=-1); 
-    };
-
-    interpret KP_9 { 
-	action = MovePtr(x=+1,y=-1); 
-    };
-    interpret KP_Prior { 
-	action = MovePtr(x=+1,y=-1); 
-    };
-
-    interpret KP_5 { 
-	action = PointerButton(button=default); 
-    };
-    interpret KP_Begin { 
-	action = PointerButton(button=default); 
-    };
-
-    interpret KP_F2 { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-    interpret KP_Divide { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-
-    interpret KP_F3 { 
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-    interpret KP_Multiply { 
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-
-    interpret KP_F4 { 
-	action = SetPtrDflt(affect=defaultButton,button=3); 
-    };
-    interpret KP_Subtract { 
-	action = SetPtrDflt(affect=defaultButton,button=3); 
-    };
-
-    interpret KP_Separator { 
-	action = PointerButton(button=default,count=2); 
-    };
-    interpret KP_Add { 
-	action = PointerButton(button=default,count=2);
-    };
-
-    interpret KP_0 { 
-	action = LockPointerButton(button=default,affect=lock); 
-    };
-    interpret KP_Insert { 
-	action = LockPointerButton(button=default,affect=lock); 
-    };
-
-    interpret KP_Decimal { 
-	action = LockPointerButton(button=default,affect=unlock); 
-    };
-    interpret KP_Delete { 
-	action = LockPointerButton(button=default,affect=unlock); 
-    };
-
-    // Additional mappings for Solaris keypad compatibility
-    interpret F25 { // aka KP_Divide
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-    interpret F26 { // aka KP_Multiply
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-    interpret F27 { // aka KP_Home
-	action = MovePtr(x=-1,y=-1); 
-    };
-    interpret F29 { // aka KP_Prior
-	action = MovePtr(x=+1,y=-1); 
-    };
-    interpret F31 { // aka KP_Begin
-	action = PointerButton(button=default); 
-    };
-    interpret F33 { // aka KP_End
-	action = MovePtr(x=-1,y= +1); 
-    };
-    interpret F35 { // aka KP_Next
- 	action = MovePtr(x=+1,y=+1); 
-    };
-
-    interpret.repeat= False;
-
-
-    // New Keysym Actions.
-    //
-    interpret Pointer_Button_Dflt {
-	action= PointerButton(button=default);
-    };
-    interpret Pointer_Button1 {
-	action= PointerButton(button=1);
-    };
-    interpret Pointer_Button2 {
-	action= PointerButton(button=2);
-    };
-    interpret Pointer_Button3 {
-	action= PointerButton(button=3);
-    };
-    interpret Pointer_DblClick_Dflt {
-	action= PointerButton(button=default,count=2);
-    };
-    interpret Pointer_DblClick1 {
-	action= PointerButton(button=1,count=2);
-    };
-    interpret Pointer_DblClick2 {
-	action= PointerButton(button=2,count=2);
-    };
-    interpret Pointer_DblClick3 {
-	action= PointerButton(button=3,count=2);
-    };
-    interpret Pointer_Drag_Dflt	{
-	action= LockPointerButton(button=default);
-    };
-    interpret Pointer_Drag1 {
-	action= LockPointerButton(button=1);
-    };
-    interpret Pointer_Drag2 {
-	action= LockPointerButton(button=2);
-    };
-    interpret Pointer_Drag3 {
-	action= LockPointerButton(button=3);
-    };
-
-    interpret Pointer_EnableKeys {
-	action= LockControls(controls=MouseKeys);
-    };
-    interpret Pointer_Accelerate {
-	action= LockControls(controls=MouseKeysAccel);
-    };
-    interpret Pointer_DfltBtnNext {
-	action= SetPtrDflt(affect=defaultButton,button= +1);
-    };
-    interpret Pointer_DfltBtnPrev {
-	action= SetPtrDflt(affect=defaultButton,button= -1);
-    };
-
-
-    // Allow an indicator for MouseKeys.
-    indicator "Mouse Keys" {
-//	!allowExplicit;
-	indicatorDrivesKeyboard;
-	controls= MouseKeys;
-    };
-};
+// Interpretations for arrow keys and a bunch of other 
+// common keysyms which make it possible to bind "mouse" 
+// keys using xmodmap and activate or deactivate them 
+// from the keyboard.
+
+default partial xkb_compatibility "mousekeys" {
+
+    // Keypad actions.
+    //
+    interpret.repeat= True;
+
+    interpret KP_1 { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret KP_End { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+
+    interpret KP_2 { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+    interpret KP_Down { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+
+    interpret KP_3 { 
+	action = MovePtr(x=+1,y=+1); 
+    };
+    interpret KP_Next { 
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret KP_4 { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+    interpret KP_Left { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+
+    interpret KP_6 { 
+	action = MovePtr(x=+1,y=+0); 
+    };
+    interpret KP_Right { 
+ 	action = MovePtr(x=+1,y=+0); 
+    };
+
+    interpret KP_7 { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret KP_Home { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+
+    interpret KP_8 { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+    interpret KP_Up { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+
+    interpret KP_9 { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret KP_Prior { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+
+    interpret KP_5 { 
+	action = PointerButton(button=default); 
+    };
+    interpret KP_Begin { 
+	action = PointerButton(button=default); 
+    };
+
+    interpret KP_F2 { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret KP_Divide { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+
+    interpret KP_F3 { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret KP_Multiply { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+
+    interpret KP_F4 { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+    interpret KP_Subtract { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+
+    interpret KP_Separator { 
+	action = PointerButton(button=default,count=2); 
+    };
+    interpret KP_Add { 
+	action = PointerButton(button=default,count=2);
+    };
+
+    interpret KP_0 { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+    interpret KP_Insert { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+
+    interpret KP_Decimal { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+    interpret KP_Delete { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+
+    // Additional mappings for Solaris keypad compatibility
+    interpret F25 { // aka KP_Divide
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret F26 { // aka KP_Multiply
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret F27 { // aka KP_Home
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret F29 { // aka KP_Prior
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret F31 { // aka KP_Begin
+	action = PointerButton(button=default); 
+    };
+    interpret F33 { // aka KP_End
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret F35 { // aka KP_Next
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret.repeat= False;
+
+
+    // New Keysym Actions.
+    //
+    interpret Pointer_Button_Dflt {
+	action= PointerButton(button=default);
+    };
+    interpret Pointer_Button1 {
+	action= PointerButton(button=1);
+    };
+    interpret Pointer_Button2 {
+	action= PointerButton(button=2);
+    };
+    interpret Pointer_Button3 {
+	action= PointerButton(button=3);
+    };
+    interpret Pointer_DblClick_Dflt {
+	action= PointerButton(button=default,count=2);
+    };
+    interpret Pointer_DblClick1 {
+	action= PointerButton(button=1,count=2);
+    };
+    interpret Pointer_DblClick2 {
+	action= PointerButton(button=2,count=2);
+    };
+    interpret Pointer_DblClick3 {
+	action= PointerButton(button=3,count=2);
+    };
+    interpret Pointer_Drag_Dflt	{
+	action= LockPointerButton(button=default);
+    };
+    interpret Pointer_Drag1 {
+	action= LockPointerButton(button=1);
+    };
+    interpret Pointer_Drag2 {
+	action= LockPointerButton(button=2);
+    };
+    interpret Pointer_Drag3 {
+	action= LockPointerButton(button=3);
+    };
+
+    interpret Pointer_EnableKeys {
+	action= LockControls(controls=MouseKeys);
+    };
+    interpret Pointer_Accelerate {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+    interpret Pointer_DfltBtnNext {
+	action= SetPtrDflt(affect=defaultButton,button= +1);
+    };
+    interpret Pointer_DfltBtnPrev {
+	action= SetPtrDflt(affect=defaultButton,button= -1);
+    };
+
+
+    // Allow an indicator for MouseKeys.
+    indicator "Mouse Keys" {
+//	!allowExplicit;
+	indicatorDrivesKeyboard;
+	controls= MouseKeys;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/norepeat b/xorg-server/xkeyboard-config/compat/norepeat
index 07b0b7a60..1f47d7e17 100644
--- a/xorg-server/xkeyboard-config/compat/norepeat
+++ b/xorg-server/xkeyboard-config/compat/norepeat
@@ -1,11 +1,9 @@
-// $Xorg: norepeat,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-// Put any otherwise normal keys that you don't want to repeat in
-// this file
-
-default partial xkb_compatibility "norepeat"  {
-    interpret Return {
-	action= NoAction();
-	repeat= False;
-    };
-};
+// Put any otherwise normal keys that you don't want to repeat in
+// this file
+
+default partial xkb_compatibility "norepeat"  {
+    interpret Return {
+	action= NoAction();
+	repeat= False;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/olpc b/xorg-server/xkeyboard-config/compat/olpc
index 001da12c1..b8fe667d2 100644
--- a/xorg-server/xkeyboard-config/compat/olpc
+++ b/xorg-server/xkeyboard-config/compat/olpc
@@ -1,52 +1,51 @@
-// $XKeyboardConfig$
-//
-// Created by Bernardo Innocenti <bernie@codewiz.org>
-//
-// Map the OLPC game keys to virtual modifiers
-//
-
-default xkb_compatibility "olpc"  {
-    include "complete"
-
-    virtual_modifiers  Square,Cross,Triangle,Circle;
-
-    interpret KP_Home+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Square;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_Home  {
-       action = SetMods(modifiers=Square);
-    };
-
-    interpret KP_Next+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Cross;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_Next  {
-       action = SetMods(modifiers=Cross);
-    };
-
-    interpret KP_End+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Circle;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_End   {
-       action = SetMods(modifiers=Circle);
-    };
-
-    interpret KP_Prior+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Triangle;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_Prior {
-       action = SetMods(modifiers=Triangle);
-    };
-};
+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Map the OLPC game keys to virtual modifiers
+//
+
+default xkb_compatibility "olpc"  {
+    include "complete"
+
+    virtual_modifiers  Square,Cross,Triangle,Circle;
+
+    interpret KP_Home+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Square;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Home  {
+       action = SetMods(modifiers=Square);
+    };
+
+    interpret KP_Next+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Cross;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Next  {
+       action = SetMods(modifiers=Cross);
+    };
+
+    interpret KP_End+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Circle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_End   {
+       action = SetMods(modifiers=Circle);
+    };
+
+    interpret KP_Prior+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Triangle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Prior {
+       action = SetMods(modifiers=Triangle);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/pc b/xorg-server/xkeyboard-config/compat/pc
index 5ce7d767d..14ba9c3cc 100644
--- a/xorg-server/xkeyboard-config/compat/pc
+++ b/xorg-server/xkeyboard-config/compat/pc
@@ -1,18 +1,17 @@
-// $Xorg: pc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-default partial xkb_compatibility "pc"  {
-
-    // Sets the "Alt" virtual modifier
-
-    virtual_modifiers	Alt;
-
-    setMods.clearLocks= True;
-    interpret Alt_L+Any     { 
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Alt_R+Any	{
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-};
+default partial xkb_compatibility "pc"  {
+
+    // Sets the "Alt" virtual modifier
+
+    virtual_modifiers	Alt;
+
+    setMods.clearLocks= True;
+    interpret Alt_L+Any     { 
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R+Any	{
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/pc98 b/xorg-server/xkeyboard-config/compat/pc98
index 23f3f7987..93a620036 100644
--- a/xorg-server/xkeyboard-config/compat/pc98
+++ b/xorg-server/xkeyboard-config/compat/pc98
@@ -1,62 +1,55 @@
-// $Xorg: pc98,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-
-
-
-// $XFree86: xc/programs/xkbcomp/compat/pc98,v 3.1 1997/10/26 13:25:33 dawes Exp $
-
-// Minimal set of symbol interpretations to provide 
-// reasonable default behavior (Num lock, shift and 
-// caps lock and mode switch) and set up the 
-// automatic updating of common keyboard LEDs.
-
-default xkb_compatibility "basic"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Shift_Lock+AnyOf(Shift+Lock) {
-	action= LockMods(modifiers=Shift);
-    };
-
-//    interpret Any+Lock {
-//	action= LockMods(modifiers=Lock);
-//   }; 
-
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockMods(modifiers=NumLock);
-    };
-
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=2,clearLocks);
-    };
-
-    interpret Any + Any {
-	action= SetMods(modifiers=modMapMods);
-    };
-
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
-
-    indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
-	whichModState= Locked;
-	modifiers= Lock;
-    };
-    indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-    };
-    indicator "Shift Lock" {
-	whichModState= Locked;
-	modifiers= Shift;
-    };
-    indicator.allowExplicit= True;
-};
+// Minimal set of symbol interpretations to provide 
+// reasonable default behavior (Num lock, shift and 
+// caps lock and mode switch) and set up the 
+// automatic updating of common keyboard LEDs.
+
+default xkb_compatibility "basic"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= LockMods(modifiers=Shift);
+    };
+
+//    interpret Any+Lock {
+//	action= LockMods(modifiers=Lock);
+//   }; 
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=2,clearLocks);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	whichModState= Locked;
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/xorg-server/xkeyboard-config/compat/xfree86 b/xorg-server/xkeyboard-config/compat/xfree86
index 2da65fd6a..c511ae264 100644
--- a/xorg-server/xkeyboard-config/compat/xfree86
+++ b/xorg-server/xkeyboard-config/compat/xfree86
@@ -1,57 +1,56 @@
-// $XFree86$
-//  XFree86 special keysyms
-
-default partial xkb_compatibility "basic"  {
-
-    interpret.repeat= True;
-
-    interpret  XF86_Switch_VT_1 {
-        action = SwitchScreen(Screen=1, !SameServer);
-    };
-    interpret  XF86_Switch_VT_2 {
-        action = SwitchScreen(Screen=2, !SameServer);
-    };
-    interpret  XF86_Switch_VT_3 {
-        action = SwitchScreen(Screen=3, !SameServer);
-    };
-    interpret  XF86_Switch_VT_4 {
-        action = SwitchScreen(Screen=4, !SameServer);
-    };
-    interpret  XF86_Switch_VT_5 {
-        action = SwitchScreen(Screen=5, !SameServer);
-    };
-    interpret  XF86_Switch_VT_6 {
-        action = SwitchScreen(Screen=6, !SameServer);
-    };
-    interpret  XF86_Switch_VT_7 {
-        action = SwitchScreen(Screen=7, !SameServer);
-    };
-    interpret  XF86_Switch_VT_8 {
-        action = SwitchScreen(Screen=8, !SameServer);
-    };
-    interpret  XF86_Switch_VT_9 {
-        action = SwitchScreen(Screen=9, !SameServer);
-    };
-    interpret  XF86_Switch_VT_10 {
-        action = SwitchScreen(Screen=10, !SameServer);
-    };
-    interpret  XF86_Switch_VT_11 {
-        action = SwitchScreen(Screen=11, !SameServer);
-    };
-    interpret  XF86_Switch_VT_12 {
-        action = SwitchScreen(Screen=12, !SameServer);
-    };
-
-    interpret XF86_Ungrab {
-        action = Private(type=0x86, data="Ungrab");
-    };
-    interpret XF86_ClearGrab {
-        action = Private(type=0x86, data="ClsGrb");
-    };
-    interpret XF86_Next_VMode {
-        action = Private(type=0x86, data="+VMode");
-    };
-    interpret XF86_Prev_VMode {
-        action = Private(type=0x86, data="-VMode");
-    };
-};
+//  XFree86 special keysyms
+
+default partial xkb_compatibility "basic"  {
+
+    interpret.repeat= True;
+
+    interpret  XF86_Switch_VT_1 {
+        action = SwitchScreen(Screen=1, !SameServer);
+    };
+    interpret  XF86_Switch_VT_2 {
+        action = SwitchScreen(Screen=2, !SameServer);
+    };
+    interpret  XF86_Switch_VT_3 {
+        action = SwitchScreen(Screen=3, !SameServer);
+    };
+    interpret  XF86_Switch_VT_4 {
+        action = SwitchScreen(Screen=4, !SameServer);
+    };
+    interpret  XF86_Switch_VT_5 {
+        action = SwitchScreen(Screen=5, !SameServer);
+    };
+    interpret  XF86_Switch_VT_6 {
+        action = SwitchScreen(Screen=6, !SameServer);
+    };
+    interpret  XF86_Switch_VT_7 {
+        action = SwitchScreen(Screen=7, !SameServer);
+    };
+    interpret  XF86_Switch_VT_8 {
+        action = SwitchScreen(Screen=8, !SameServer);
+    };
+    interpret  XF86_Switch_VT_9 {
+        action = SwitchScreen(Screen=9, !SameServer);
+    };
+    interpret  XF86_Switch_VT_10 {
+        action = SwitchScreen(Screen=10, !SameServer);
+    };
+    interpret  XF86_Switch_VT_11 {
+        action = SwitchScreen(Screen=11, !SameServer);
+    };
+    interpret  XF86_Switch_VT_12 {
+        action = SwitchScreen(Screen=12, !SameServer);
+    };
+
+    interpret XF86_Ungrab {
+        action = Private(type=0x86, data="Ungrab");
+    };
+    interpret XF86_ClearGrab {
+        action = Private(type=0x86, data="ClsGrb");
+    };
+    interpret XF86_Next_VMode {
+        action = Private(type=0x86, data="+VMode");
+    };
+    interpret XF86_Prev_VMode {
+        action = Private(type=0x86, data="-VMode");
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/xtest b/xorg-server/xkeyboard-config/compat/xtest
index a35ced915..6700bedd6 100644
--- a/xorg-server/xkeyboard-config/compat/xtest
+++ b/xorg-server/xkeyboard-config/compat/xtest
@@ -1,58 +1,57 @@
-// $Xorg: xtest,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-default xkb_compatibility "xtest"  {
-
-    // Minimal set of symbol interpretations to provide
-    // reasonable behavior for testing.   The X Test 
-    // Suite assumes that it can set any modifier by 
-    // simulating a KeyPress and clear it by simulating 
-    // a KeyRelease.  Because of the way that XKB 
-    // implements locking/latching modifiers, this 
-    // approach fails in some cases (typically the 
-    // lock or num lock modifiers).  These symbol
-    // interpretations make all modifier keys just
-    // set the corresponding modifier so that xtest
-    // will see the behavior it expects.
-
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= False;
-
-    interpret Shift_Lock+AnyOf(Shift+Lock) {
-	action= SetMods(modifiers=Shift);
-    };
-
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= SetMods(modifiers=NumLock);
-    };
-
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=2);
-    };
-
-    interpret Any + Any {
-	action= SetMods(modifiers=modMapMods);
-    };
-
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
-
-    indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
-	modifiers= Lock;
-    };
-    indicator "Num Lock" {
-	modifiers= NumLock;
-    };
-    indicator "Shift Lock" {
-	whichModState= Locked;
-	modifiers= Shift;
-    };
-    indicator.allowExplicit= True;
-};
+default xkb_compatibility "xtest"  {
+
+    // Minimal set of symbol interpretations to provide
+    // reasonable behavior for testing.   The X Test 
+    // Suite assumes that it can set any modifier by 
+    // simulating a KeyPress and clear it by simulating 
+    // a KeyRelease.  Because of the way that XKB 
+    // implements locking/latching modifiers, this 
+    // approach fails in some cases (typically the 
+    // lock or num lock modifiers).  These symbol
+    // interpretations make all modifier keys just
+    // set the corresponding modifier so that xtest
+    // will see the behavior it expects.
+
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= False;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= SetMods(modifiers=Shift);
+    };
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= SetMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=2);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};