compat/*: Removing trailing whitespace, and standardizing the tabbing.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

17 files changed, 190 insertions, 185 deletions

diff --git a/compat/accessx b/compat/accessx
index 0ed34ce..6dd6ca9 100644
--- a/compat/accessx
+++ b/compat/accessx
@@ -1,17 +1,17 @@
 default partial xkb_compatibility "basic" {
-    interpret AccessX_Enable { 
-	action= LockControls(controls=AccessXKeys); 
+    interpret AccessX_Enable {
+	action= LockControls(controls=AccessXKeys);
     };
 };
 
 partial xkb_compatibility "full" {
 
     interpret AccessX_Enable {
-	action= LockControls(controls=AccessXKeys); 
+	action= LockControls(controls=AccessXKeys);
     };
 
-    interpret AccessX_Feedback_Enable { 
-	action= LockControls(controls=AccessXFeedback); 
+    interpret AccessX_Feedback_Enable {
+	action= LockControls(controls=AccessXFeedback);
     };
 
     interpret RepeatKeys_Enable {
diff --git a/compat/basic b/compat/basic
index cfba5f5..745cbba 100644
--- a/compat/basic
+++ b/compat/basic
@@ -1,10 +1,11 @@
-// Minimal set of symbol interpretations to provide 
+// Minimal set of symbol interpretations to provide
 // reasonable default behavior (Num lock, Shift lock,
 // Caps lock, and Mode switch) and set up the
 // automatic updating of common keyboard LEDs.
 
-default xkb_compatibility "basic"  {
-    virtual_modifiers NumLock,AltGr;
+default xkb_compatibility "basic" {
+
+    virtual_modifiers  NumLock,AltGr;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
diff --git a/compat/caps b/compat/caps
index d0b7bdd..4793051 100644
--- a/compat/caps
+++ b/compat/caps
@@ -1,4 +1,4 @@
-partial xkb_compatibility "caps_lock"  {
+partial xkb_compatibility "caps_lock" {
     // Keysym Caps_Lock locks the Lock modifier.
     // With this definition, the keysym Caps_Lock can be used without binding
     // the whole key to a real modifier.  This is essential when you don't
diff --git a/compat/complete b/compat/complete
index d33c4db..8f77538 100644
--- a/compat/complete
+++ b/compat/complete
@@ -1,4 +1,4 @@
-default xkb_compatibility "complete"  {
+default xkb_compatibility "complete" {
     include "basic"
     augment "iso9995"
     augment "mousekeys"
diff --git a/compat/iso9995 b/compat/iso9995
index a92a520..0f3025b 100644
--- a/compat/iso9995
+++ b/compat/iso9995
@@ -1,8 +1,9 @@
-// Fairly complete set of symbol interpretations 
+// Fairly complete set of symbol interpretations
 // to provide reasonable default behavior.
 
-default partial xkb_compatibility "default"  {
-    virtual_modifiers LevelThree,AltGr;
+default partial xkb_compatibility "default" {
+
+    virtual_modifiers  LevelThree,AltGr;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
diff --git a/compat/japan b/compat/japan
index b16f2e7..322bbdb 100644
--- a/compat/japan
+++ b/compat/japan
@@ -5,7 +5,7 @@
 // interpretation (which would have these keys set
 // to the same modifier as the level one symbol).
 
-default partial xkb_compatibility "japan"  {
+default partial xkb_compatibility "japan" {
 
     interpret.repeat= False;
 
@@ -28,14 +28,14 @@ default partial xkb_compatibility "japan"  {
 
 // Some Japanese keyboards have an explict
 // Kana Lock key and matching LED.
-partial xkb_compatibility "kana_lock"  {
+partial xkb_compatibility "kana_lock" {
 
-    virtual_modifiers Kana_Lock;
+    virtual_modifiers  Kana_Lock;
 
     interpret Kana_Lock+AnyOfOrNone(all) {
-        virtualModifier= Kana_Lock;
-        useModMapMods=level1;
-        action= LockGroup(group=+1);
+	virtualModifier= Kana_Lock;
+	useModMapMods=level1;
+	action= LockGroup(group=+1);
     };
 
     indicator "Kana" {
diff --git a/compat/ledcaps b/compat/ledcaps
index c0ffcc7..f1460ba 100644
--- a/compat/ledcaps
+++ b/compat/ledcaps
@@ -1,24 +1,24 @@
 // Use the Caps Lock LED to show either
 // Caps Lock, Group, or Shift Lock state.
 
-default partial xkb_compatibility "caps_lock"   {
-   indicator "Caps Lock" {
-       !allowExplicit;
-       whichModState= Locked;
-       modifiers= Lock;
-   };
+default partial xkb_compatibility "caps_lock" {
+    indicator "Caps Lock" {
+	!allowExplicit;
+	whichModState= Locked;
+	modifiers= Lock;
+    };
 };
 
-partial xkb_compatibility "group_lock"   {
-   indicator "Caps Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
+partial xkb_compatibility "group_lock" {
+    indicator "Caps Lock" {
+	modifiers= None;
+	groups=All-group1;
+    };
 };
 
-partial xkb_compatibility "shift_lock"   {
-   indicator "Caps Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
+partial xkb_compatibility "shift_lock" {
+    indicator "Caps Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
 };
diff --git a/compat/lednum b/compat/lednum
index da24014..bfdcd74 100644
--- a/compat/lednum
+++ b/compat/lednum
@@ -1,24 +1,24 @@
 // Use the Num Lock LED to show either
 // Num Lock, Group, or Shift Lock state.
 
-default partial xkb_compatibility "num_lock"   {
+default partial xkb_compatibility "num_lock" {
     indicator "Num Lock" {
-       !allowExplicit;
-       whichModState= Locked;
-       modifiers= NumLock;
-   };
+	!allowExplicit;
+	whichModState= Locked;
+	modifiers= NumLock;
+    };
 };
 
-partial xkb_compatibility "group_lock"   {
-   indicator "Num Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
+partial xkb_compatibility "group_lock" {
+    indicator "Num Lock" {
+	modifiers= None;
+	groups=All-group1;
+    };
 };
 
-partial xkb_compatibility "shift_lock"   {
-   indicator "Num Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
+partial xkb_compatibility "shift_lock" {
+    indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
 };
diff --git a/compat/ledscroll b/compat/ledscroll
index 0237330..a241698 100644
--- a/compat/ledscroll
+++ b/compat/ledscroll
@@ -1,24 +1,24 @@
 // Use the Scroll Lock LED to show either
 // Scroll Lock, Group, or Shift Lock state.
 
-default partial xkb_compatibility "scroll_lock"   {
-   indicator "Scroll Lock" {
-       allowExplicit;
-       whichModState= Locked;
-       modifiers= ScrollLock;
-   };
+default partial xkb_compatibility "scroll_lock" {
+    indicator "Scroll Lock" {
+	allowExplicit;
+	whichModState= Locked;
+	modifiers= ScrollLock;
+    };
 };
 
-partial xkb_compatibility "group_lock"   {
-   indicator "Scroll Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
+partial xkb_compatibility "group_lock" {
+    indicator "Scroll Lock" {
+	modifiers= None;
+	groups=All-group1;
+    };
 };
 
-partial xkb_compatibility "shift_lock"   {
-   indicator "Scroll Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
+partial xkb_compatibility "shift_lock" {
+    indicator "Scroll Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
 };
diff --git a/compat/level5 b/compat/level5
index ac5799e..54f749d 100644
--- a/compat/level5
+++ b/compat/level5
@@ -1,8 +1,9 @@
-// Fairly complete set of symbol interpretations 
+// Fairly complete set of symbol interpretations
 // to provide reasonable default behavior.
 
-default partial xkb_compatibility "default"  {
-    virtual_modifiers LevelFive;
+default partial xkb_compatibility "default" {
+
+    virtual_modifiers  LevelFive;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -40,15 +41,16 @@ default partial xkb_compatibility "default"  {
     };
 };
 
-partial xkb_compatibility "level5_lock"  {
+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;
-    
+
+    virtual_modifiers  NumLock;
+
     interpret ISO_Level5_Lock {
-        action = LockMods(modifiers = NumLock);
+	action = LockMods(modifiers = NumLock);
     };
 };
diff --git a/compat/misc b/compat/misc
index bc0cb7a..964f471 100644
--- a/compat/misc
+++ b/compat/misc
@@ -1,122 +1,122 @@
-default partial xkb_compatibility "misc"  {
+default partial xkb_compatibility "misc" {
 
-    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
+    virtual_modifiers  Alt,Meta,Super,Hyper,ScrollLock;
 
     // Interpretations for some other useful keys.
 
     interpret Terminate_Server {
-        action = Terminate();
+	action = Terminate();
     };
 
     setMods.clearLocks= True;
 
     // Sets the "Alt" virtual modifier.
 
-    interpret Alt_L+Any     {
+    interpret Alt_L+Any {
         //useModMapMods= level1;
 	virtualModifier= Alt;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Alt_L	{
+    interpret Alt_L {
 	action = SetMods(modifiers=Alt);
     };
 
-    interpret Alt_R+Any     {
+    interpret Alt_R+Any {
         //useModMapMods= level1;
 	virtualModifier= Alt;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Alt_R	{
+    interpret Alt_R {
 	action = SetMods(modifiers=Alt);
     };
 
     // Sets the "Meta" virtual modifier.
 
-    interpret Meta_L+Any     {
+    interpret Meta_L+Any {
         //useModMapMods= level1;
 	virtualModifier= Meta;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Meta_L	{
+    interpret Meta_L {
 	action = SetMods(modifiers=Meta);
     };
 
-    interpret Meta_R+Any     {
+    interpret Meta_R+Any {
         //useModMapMods= level1;
 	virtualModifier= Meta;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Meta_R	{
+    interpret Meta_R {
 	action = SetMods(modifiers=Meta);
     };
 
     // Sets the "Super" virtual modifier.
 
-    interpret Super_L+Any     {
+    interpret Super_L+Any {
         //useModMapMods= level1;
 	virtualModifier= Super;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Super_L	{
+    interpret Super_L {
 	action = SetMods(modifiers=Super);
     };
 
-    interpret Super_R+Any     {
+    interpret Super_R+Any {
         //useModMapMods= level1;
 	virtualModifier= Super;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Super_R	{
+    interpret Super_R {
 	action = SetMods(modifiers=Super);
     };
 
     // Sets the "Hyper" virtual modifier.
 
-    interpret Hyper_L+Any     {
+    interpret Hyper_L+Any {
         //useModMapMods= level1;
 	virtualModifier= Hyper;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Hyper_L	{
+    interpret Hyper_L {
 	action = SetMods(modifiers=Hyper);
     };
 
-    interpret Hyper_R+Any     {
+    interpret Hyper_R+Any {
         //useModMapMods= level1;
 	virtualModifier= Hyper;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Hyper_R	{
+    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	{
+    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"  {
+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. 
+    // symbols/shift(both_capslock), creating unwanted behaviour.
     // This is a quirk, to circumvent the problem.
     interpret Shift_L {
-        action = SetMods(modifiers = Shift);
+	action = SetMods(modifiers = Shift);
     };
 };
diff --git a/compat/mousekeys b/compat/mousekeys
index 82c87b8..6b96fbc 100644
--- a/compat/mousekeys
+++ b/compat/mousekeys
@@ -9,133 +9,133 @@ default partial xkb_compatibility "mousekeys" {
 
     interpret.repeat= True;
 
-    interpret KP_1 { 
-	action = MovePtr(x=-1,y= +1); 
+    interpret KP_1 {
+	action = MovePtr(x=-1,y= +1);
     };
-    interpret KP_End { 
-	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_2 {
+	action = MovePtr(x=+0,y= +1);
     };
-    interpret KP_Down { 
-	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_3 {
+	action = MovePtr(x=+1,y=+1);
     };
-    interpret KP_Next { 
- 	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_4 {
+	action = MovePtr(x=-1,y=+0);
     };
-    interpret KP_Left { 
-	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_6 {
+	action = MovePtr(x=+1,y=+0);
     };
-    interpret KP_Right { 
- 	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_7 {
+	action = MovePtr(x=-1,y=-1);
     };
-    interpret KP_Home { 
-	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_8 {
+	action = MovePtr(x=+0,y=-1);
     };
-    interpret KP_Up { 
-	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_9 {
+	action = MovePtr(x=+1,y=-1);
     };
-    interpret KP_Prior { 
-	action = MovePtr(x=+1,y=-1); 
+    interpret KP_Prior {
+	action = MovePtr(x=+1,y=-1);
     };
 
-    interpret KP_5 { 
-	action = PointerButton(button=default); 
+    interpret KP_5 {
+	action = PointerButton(button=default);
     };
-    interpret KP_Begin { 
-	action = PointerButton(button=default); 
+    interpret KP_Begin {
+	action = PointerButton(button=default);
     };
 
-    interpret KP_F2 { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
+    interpret KP_F2 {
+	action = SetPtrDflt(affect=defaultButton,button=1);
     };
-    interpret KP_Divide { 
-	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_F3 {
+	action = SetPtrDflt(affect=defaultButton,button=2);
     };
-    interpret KP_Multiply { 
-	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_F4 {
+	action = SetPtrDflt(affect=defaultButton,button=3);
     };
-    interpret KP_Subtract { 
-	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_Separator {
+	action = PointerButton(button=default,count=2);
     };
-    interpret KP_Add { 
+    interpret KP_Add {
 	action = PointerButton(button=default,count=2);
     };
 
-    interpret KP_0 { 
-	action = LockPointerButton(button=default,affect=lock); 
+    interpret KP_0 {
+	action = LockPointerButton(button=default,affect=lock);
     };
-    interpret KP_Insert { 
-	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_Decimal {
+	action = LockPointerButton(button=default,affect=unlock);
     };
-    interpret KP_Delete { 
-	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); 
+	action = SetPtrDflt(affect=defaultButton,button=1);
     };
     interpret F26 { // aka KP_Multiply
-	action = SetPtrDflt(affect=defaultButton,button=2); 
+	action = SetPtrDflt(affect=defaultButton,button=2);
     };
     interpret F27 { // aka KP_Home
-	action = MovePtr(x=-1,y=-1); 
+	action = MovePtr(x=-1,y=-1);
     };
     interpret F29 { // aka KP_Prior
-	action = MovePtr(x=+1,y=-1); 
+	action = MovePtr(x=+1,y=-1);
     };
     interpret F31 { // aka KP_Begin
-	action = PointerButton(button=default); 
+	action = PointerButton(button=default);
     };
     interpret F33 { // aka KP_End
-	action = MovePtr(x=-1,y= +1); 
+	action = MovePtr(x=-1,y= +1);
     };
     interpret F35 { // aka KP_Next
- 	action = MovePtr(x=+1,y=+1); 
+	action = MovePtr(x=+1,y=+1);
     };
 
     interpret.repeat= False;
@@ -166,7 +166,7 @@ default partial xkb_compatibility "mousekeys" {
     interpret Pointer_DblClick3 {
 	action= PointerButton(button=3,count=2);
     };
-    interpret Pointer_Drag_Dflt	{
+    interpret Pointer_Drag_Dflt {
 	action= LockPointerButton(button=default);
     };
     interpret Pointer_Drag1 {
diff --git a/compat/olpc b/compat/olpc
index 6eae12d..747b444 100644
--- a/compat/olpc
+++ b/compat/olpc
@@ -4,42 +4,42 @@
 // Created by Bernardo Innocenti <bernie@codewiz.org>
 //
 
-default xkb_compatibility "olpc"  {
+default xkb_compatibility "olpc" {
     include "complete"
 
     virtual_modifiers  Square,Cross,Triangle,Circle;
 
-    interpret KP_Home+Any     {
+    interpret KP_Home+Any {
         //useModMapMods= level1;
         virtualModifier= Square;
         action = SetMods(modifiers=modMapMods);
     };
 
-    interpret KP_Home  {
+    interpret KP_Home {
         action = SetMods(modifiers=Square);
     };
 
-    interpret KP_Next+Any     {
+    interpret KP_Next+Any {
         //useModMapMods= level1;
         virtualModifier= Cross;
         action = SetMods(modifiers=modMapMods);
     };
 
-    interpret KP_Next  {
+    interpret KP_Next {
         action = SetMods(modifiers=Cross);
     };
 
-    interpret KP_End+Any     {
+    interpret KP_End+Any {
         //useModMapMods= level1;
         virtualModifier= Circle;
         action = SetMods(modifiers=modMapMods);
     };
 
-    interpret KP_End   {
+    interpret KP_End {
         action = SetMods(modifiers=Circle);
     };
 
-    interpret KP_Prior+Any     {
+    interpret KP_Prior+Any {
         //useModMapMods= level1;
         virtualModifier= Triangle;
         action = SetMods(modifiers=modMapMods);
diff --git a/compat/pc b/compat/pc
index 4eef0d9..f69b54d 100644
--- a/compat/pc
+++ b/compat/pc
@@ -1,16 +1,16 @@
-default partial xkb_compatibility "pc"  {
+default partial xkb_compatibility "pc" {
 
     // Sets the "Alt" virtual modifier.
 
-    virtual_modifiers	Alt;
+    virtual_modifiers  Alt;
 
     setMods.clearLocks= True;
-    interpret Alt_L+Any     { 
+    interpret Alt_L+Any {
 	virtualModifier= Alt;
 	action = SetMods(modifiers=modMapMods);
     };
 
-    interpret Alt_R+Any	{
+    interpret Alt_R+Any {
 	virtualModifier= Alt;
 	action = SetMods(modifiers=modMapMods);
     };
diff --git a/compat/pc98 b/compat/pc98
index 3265599..0abd623 100644
--- a/compat/pc98
+++ b/compat/pc98
@@ -1,10 +1,11 @@
-// Minimal set of symbol interpretations to provide 
+// Minimal set of symbol interpretations to provide
 // reasonable default behavior (Num lock, Shift lock,
 // and Mode switch) and set up the automatic updating
 // of common keyboard LEDs.
 
-default xkb_compatibility "basic"  {
-    virtual_modifiers NumLock,AltGr;
+default xkb_compatibility "basic" {
+
+    virtual_modifiers  NumLock,AltGr;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -17,7 +18,7 @@ default xkb_compatibility "basic"  {
 
 //    interpret Any+Lock {
 //	action= LockMods(modifiers=Lock);
-//   }; 
+//    };
 
     interpret Num_Lock+Any {
 	virtualModifier= NumLock;
@@ -39,7 +40,7 @@ default xkb_compatibility "basic"  {
     group 4 = AltGr;
 
     indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
+    indicator "Caps Lock" {
 	whichModState= Locked;
 	modifiers= Lock;
     };
diff --git a/compat/xfree86 b/compat/xfree86
index 313f1a2..cc43819 100644
--- a/compat/xfree86
+++ b/compat/xfree86
@@ -1,6 +1,6 @@
 // XFree86 special keysyms.
 
-default partial xkb_compatibility "basic"  {
+default partial xkb_compatibility "basic" {
 
     interpret.repeat= True;
 
diff --git a/compat/xtest b/compat/xtest
index 0f534f5..f2ca643 100644
--- a/compat/xtest
+++ b/compat/xtest
@@ -1,4 +1,4 @@
-default xkb_compatibility "xtest"  {
+default xkb_compatibility "xtest" {
 
     // Minimal set of symbol interpretations to provide
     // reasonable behavior for testing.
@@ -11,7 +11,7 @@ default xkb_compatibility "xtest"  {
     // just set the corresponding modifier so that xtest
     // will see the behavior it expects.
 
-    virtual_modifiers NumLock,AltGr;
+    virtual_modifiers  NumLock,AltGr;
 
     interpret.repeat= False;
     setMods.clearLocks= True;
@@ -42,7 +42,7 @@ default xkb_compatibility "xtest"  {
     group 4 = AltGr;
 
     indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
+    indicator "Caps Lock" {
 	modifiers= Lock;
     };
     indicator "Num Lock" {