types: consistently mention Shift before Lock (except for neater types)

Also, use leading tabs where possible, and normalize other whitespace.

10 files changed, 274 insertions, 279 deletions

diff --git a/types/basic b/types/basic
index 32f05b9..fe0ec91 100644
--- a/types/basic
+++ b/types/basic
@@ -1,10 +1,9 @@
 default xkb_types "basic" {
 
-    // Fairly standard definitions for
-    // three of the four required key types.
+    // Standard definitions for three of the four required key types.
     // The fourth type "KEYPAD" is defined in the "numpad" file.
 
-    virtual_modifiers NumLock;
+    virtual_modifiers  NumLock;
 
     type "ONE_LEVEL" {
 	modifiers = None;
@@ -26,5 +25,4 @@ default xkb_types "basic" {
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Caps";
     };
-
 };
diff --git a/types/cancel b/types/cancel
index b738559..43c567f 100644
--- a/types/cancel
+++ b/types/cancel
@@ -1,11 +1,10 @@
 default partial xkb_types "Shift_Cancels_Caps" {
 
-override type "TWO_LEVEL" {
-    modifiers = Shift + Lock;
-    map[Shift] = Level2;
-    preserve[Lock]= Lock;
-    level_name[Level1] = "Base";
-    level_name[Level2] = "Shift";
-};
-
+    override type "TWO_LEVEL" {
+	modifiers = Shift + Lock;
+	map[Shift] = Level2;
+	preserve[Lock]= Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+    };
 };
diff --git a/types/caps b/types/caps
index 75e2bca..cc2097c 100644
--- a/types/caps
+++ b/types/caps
@@ -16,8 +16,8 @@ partial xkb_types "internal" {
 	preserve[Lock] = Lock;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level3;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level3;
 	preserve[Lock+LevelThree] = Lock;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
@@ -32,10 +32,10 @@ partial xkb_types "internal" {
 	preserve[Lock] = Lock;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level4;
 	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Shift+Lock+LevelThree] = Lock;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
 	level_name[Level3] = "Alt Base";
@@ -94,11 +94,11 @@ partial xkb_types "shift" {
 	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock]  = Level2;
+	map[Lock] = Level2;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Shift+Lock+LevelThree] =  Level3;
+	map[Lock+LevelThree] = Level4;
+	map[Shift+Lock+LevelThree] = Level3;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
 	level_name[Level3] = "Alt Base";
@@ -109,13 +109,13 @@ partial xkb_types "shift" {
 	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock]  = Level2;
+	map[Lock] = Level2;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level4;
 	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Shift+Lock+LevelThree] = Lock;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
 	level_name[Level3] = "Alt Base";
@@ -137,13 +137,13 @@ partial xkb_types "shift_nocancel" {
 
     type "FOUR_LEVEL_ALPHABETIC" {
 	modifiers = Shift + Lock + LevelThree;
-	map[None] =  Level1;
+	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock] =  Level2;
+	map[Lock] = Level2;
 	map[Shift+Lock] = Level2;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
+	map[Lock+LevelThree] = Level4;
 	map[Shift+Lock+LevelThree] = Level4;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
@@ -153,16 +153,16 @@ partial xkb_types "shift_nocancel" {
 
     type "FOUR_LEVEL_SEMIALPHABETIC" {
 	modifiers = Shift + Lock + LevelThree;
-	map[None] =  Level1;
+	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock] =  Level2;
+	map[Lock] = Level2;
 	map[Shift+Lock] = Level2;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level4;
 	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Shift+Lock+LevelThree] = Lock;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
 	level_name[Level3] = "Alt Base";
diff --git a/types/extra b/types/extra
index 3cf7ba7..ca38d2e 100644
--- a/types/extra
+++ b/types/extra
@@ -1,9 +1,9 @@
 default partial xkb_types "default" {
 
-    // Defines a type with a four-level shift, similar to the three-level
-    // type used for iso9995, but it lets the Shift key behave "normally".
+    // Defines types with a four-level shift, similar to the three-level
+    // type from iso9995, but they let the Shift key behave "normally".
 
-    virtual_modifiers LevelThree;
+    virtual_modifiers  LevelThree;
 
     type "FOUR_LEVEL" {
 	modifiers = Shift + LevelThree;
@@ -21,11 +21,11 @@ default partial xkb_types "default" {
 	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock]  = Level2;
+	map[Lock] = Level2;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Lock+Shift+LevelThree] =  Level3;
+	map[Lock+LevelThree] = Level4;
+	map[Shift+Lock+LevelThree] = Level3;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
 	level_name[Level3] = "Alt Base";
@@ -36,13 +36,13 @@ default partial xkb_types "default" {
 	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock]  = Level2;
+	map[Lock] = Level2;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level4;
 	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Shift+Lock+LevelThree] = Lock;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
 	level_name[Level3] = "Alt Base";
@@ -53,32 +53,32 @@ default partial xkb_types "default" {
     // NumLock (with active shifting like in KEYPAD).  LevelThree overrides
     // this mode, with two additional shifted levels.
     type "FOUR_LEVEL_MIXED_KEYPAD" {
-        modifiers = Shift + NumLock + LevelThree;
-        map[None] = Level1;
-        map[Shift+NumLock] = Level1;
-        map[NumLock] = Level2;
-        map[Shift] = Level2;
-        map[LevelThree] = Level3;
-        map[NumLock+LevelThree] = Level3;
-        map[Shift+LevelThree] = Level4;
-        map[Shift+NumLock+LevelThree] = Level4;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Number";
-        level_name[Level3] = "Alt Base";
-        level_name[Level4] = "Shift Alt";
+	modifiers = Shift + NumLock + LevelThree;
+	map[None] = Level1;
+	map[Shift+NumLock] = Level1;
+	map[NumLock] = Level2;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[NumLock+LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Shift+NumLock+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
     };
 
     // Base level, two shifted LevelThree levels, one Ctrl+Alt command level.
     type "FOUR_LEVEL_X" {
-        modifiers = Shift + LevelThree + Control + Alt;
-        map[None] = Level1;
-        map[LevelThree] = Level2;
-        map[Shift+LevelThree] = Level3;
-        map[Control+Alt] = Level4;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Alt Base";
-        level_name[Level3] = "Shift Alt";
-        level_name[Level4] = "Ctrl+Alt";
+	modifiers = Shift + LevelThree + Control + Alt;
+	map[None] = Level1;
+	map[LevelThree] = Level2;
+	map[Shift+LevelThree] = Level3;
+	map[Control+Alt] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Alt Base";
+	level_name[Level3] = "Shift Alt";
+	level_name[Level4] = "Ctrl+Alt";
     };
 
     // A special type for keys used in the Serbian Latin Unicode keymap.
@@ -86,47 +86,47 @@ default partial xkb_types "default" {
     // present in Unicode that are made up of two separate letters
     // (forms like LJ, Lj, and lj; NJ, Nj, and nj; etcetera).
     type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" {
-        modifiers = Shift + Lock + LevelThree;
-        map[None] = Level1;
-        map[Shift] = Level2;
-        map[Lock] = Level4;
-        map[LevelThree] = Level3;
-        map[Shift+LevelThree] = Level4;
-        map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level3;
-        preserve[Lock]= Lock;
-        preserve[Lock+LevelThree]= Lock;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Shift";
-        level_name[Level3] = "AltGr Base";
-        level_name[Level4] = "Shift AltGr";
+	modifiers = Shift + Lock + LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock] = Level4;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level3;
+	preserve[Lock]= Lock;
+	preserve[Lock+LevelThree]= Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "AltGr Base";
+	level_name[Level4] = "Shift AltGr";
     };
 
     // Five levels: the normal four levels with Shift and LevelThree,
     // plus a fifth level when CapsLock (and only CapsLock) is active
     // -- CapsLock is ignored when Shift and/or LevelThree is held.
     type "FOUR_LEVEL_PLUS_LOCK" {
-        modifiers = Shift + Lock + LevelThree;
-        map[None] = Level1;
-        map[Shift] = Level2;
-        map[LevelThree] = Level3;
-        map[Shift+LevelThree] = Level4;
-        map[Lock] = Level5;
-        map[Lock+Shift] = Level2;
-        map[Lock+LevelThree] = Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Shift";
-        level_name[Level3] = "Alt Base";
-        level_name[Level4] = "Shift Alt";
-        level_name[Level5] = "Lock";
+	modifiers = Shift + Lock + LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock] = Level5;
+	map[Shift+Lock] = Level2;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "Lock";
     };
 };
 
 // This enables the four-level shifting also for the keypad.
 partial xkb_types "keypad" {
 
-    virtual_modifiers LevelThree;
+    virtual_modifiers  LevelThree;
 
     type "FOUR_LEVEL_KEYPAD" {
 	modifiers = Shift + NumLock + LevelThree;
diff --git a/types/iso9995 b/types/iso9995
index 74b3ff9..9d12a92 100644
--- a/types/iso9995
+++ b/types/iso9995
@@ -3,7 +3,7 @@ default partial xkb_types "default" {
     // A key type which can be used to implement
     // an ISO9995-style level-three shift.
 
-    virtual_modifiers LevelThree;
+    virtual_modifiers  LevelThree;
 
     type "THREE_LEVEL" {
 	modifiers = Shift + LevelThree;
diff --git a/types/level5 b/types/level5
index 95c0fdd..9b790f1 100644
--- a/types/level5
+++ b/types/level5
@@ -29,21 +29,21 @@ default partial xkb_types "default" {
 	modifiers = Shift + Lock + LevelThree + LevelFive;
 	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[Lock+Shift] = Level1;
+	map[Lock] = Level2;
+	map[Shift+Lock] = Level1;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Lock+Shift+LevelThree] = Level3;
+	map[Lock+LevelThree] = Level4;
+	map[Shift+Lock+LevelThree] = Level3;
 
 	map[LevelFive] = Level5;
 	map[Shift+LevelFive] = Level6;
-	map[Lock+LevelFive]  = Level6;
-	map[Lock+Shift+LevelFive] = Level5;
+	map[Lock+LevelFive] = Level6;
+	map[Shift+Lock+LevelFive] = Level5;
 	map[LevelThree+LevelFive] = Level7;
 	map[Shift+LevelThree+LevelFive] = Level8;
-	map[Lock+LevelThree+LevelFive] =  Level8;
-	map[Lock+Shift+LevelThree+LevelFive] = Level7;
+	map[Lock+LevelThree+LevelFive] = Level8;
+	map[Shift+Lock+LevelThree+LevelFive] = Level7;
 
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
@@ -59,26 +59,26 @@ default partial xkb_types "default" {
 	modifiers = Shift + Lock + LevelThree + LevelFive;
 	map[None] = Level1;
 	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[Lock+Shift] = Level1;
+	map[Lock] = Level2;
+	map[Shift+Lock] = Level1;
 	map[LevelThree] = Level3;
 	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] = Level3;
+	map[Shift+Lock+LevelThree] = Level4;
 
 	map[LevelFive] = Level5;
 	map[Shift+LevelFive] = Level6;
-	map[Lock+LevelFive]  = Level6;
-	map[Lock+Shift+LevelFive] = Level5;
+	map[Lock+LevelFive] = Level6;
+	map[Shift+Lock+LevelFive] = Level5;
 	map[LevelThree+LevelFive] = Level7;
 	map[Shift+LevelThree+LevelFive] = Level8;
-	map[Lock+LevelThree+LevelFive] =  Level7;
-	map[Lock+Shift+LevelThree+LevelFive] = Level8;
+	map[Lock+LevelThree+LevelFive] = Level7;
+	map[Shift+Lock+LevelThree+LevelFive] = Level8;
 
 	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Shift+Lock+LevelThree] = Lock;
 	preserve[Lock+LevelThree+LevelFive] = Lock;
-	preserve[Lock+Shift+LevelThree+LevelFive] = Lock;
+	preserve[Shift+Lock+LevelThree+LevelFive] = Lock;
 
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift";
@@ -91,123 +91,123 @@ default partial xkb_types "default" {
     };
 
     type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
-        // Level5-Lock is implemented with virtual modifier NumLock.
-
-        modifiers = Shift + Lock + LevelThree + LevelFive + NumLock;
-
-        map[None]                                    = Level1;
-        map[Shift]                                   = Level2;
-        map[LevelThree]                              = Level3;
-        map[LevelThree+Shift]                        = Level4;
-
-        map[LevelFive]                               = Level5;
-        map[LevelFive+Shift]                         = Level6;
-        map[LevelFive+LevelThree]                    = Level7;
-        map[LevelFive+LevelThree+Shift]              = Level8;
-
-        map[NumLock]                                 = Level5;
-        map[NumLock+Shift]                           = Level6;
-        map[NumLock+LevelThree]                      = Level7;
-        map[NumLock+LevelThree+Shift]                = Level8;
-
-        map[NumLock+LevelFive]                       = Level1;
-        map[NumLock+LevelFive+Shift]                 = Level2;
-        map[NumLock+LevelFive+LevelThree]            = Level3;
-        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
-
-        // Lock has no effect
-        map[Lock]                                    = Level1;
-        map[Lock+Shift]                              = Level2;
-        map[Lock+LevelThree]                         = Level3;
-        map[Lock+LevelThree+Shift]                   = Level4;
-
-        map[Lock+LevelFive]                          = Level5;
-        map[Lock+LevelFive+Shift]                    = Level6;
-        map[Lock+LevelFive+LevelThree]               = Level7;
-        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
-
-        map[Lock+NumLock]                            = Level5;
-        map[Lock+NumLock+Shift]                      = Level6;
-        map[Lock+NumLock+LevelThree]                 = Level7;
-        map[Lock+NumLock+LevelThree+Shift]           = Level8;
-
-        map[Lock+NumLock+LevelFive]                  = Level1;
-        map[Lock+NumLock+LevelFive+Shift]            = Level2;
-        map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
-        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
-
-        preserve[LevelFive+Shift] = Shift;
-        preserve[NumLock+Shift] = Shift;
-        preserve[Lock+LevelFive+Shift] = Shift;
-        preserve[Lock+NumLock+Shift] = Shift;
-
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Shift";
-        level_name[Level3] = "Alt Base";
-        level_name[Level4] = "Shift Alt";
-        level_name[Level5] = "X";
-        level_name[Level6] = "X Shift";
-        level_name[Level7] = "X Alt Base";
-        level_name[Level8] = "X Shift Alt";
+	// Level5-Lock is implemented with virtual modifier NumLock.
+
+	modifiers = Shift + Lock + LevelThree + LevelFive + NumLock;
+
+	map[None]                                    = Level1;
+	map[Shift]                                   = Level2;
+	map[LevelThree]                              = Level3;
+	map[LevelThree+Shift]                        = Level4;
+
+	map[LevelFive]                               = Level5;
+	map[LevelFive+Shift]                         = Level6;
+	map[LevelFive+LevelThree]                    = Level7;
+	map[LevelFive+LevelThree+Shift]              = Level8;
+
+	map[NumLock]                                 = Level5;
+	map[NumLock+Shift]                           = Level6;
+	map[NumLock+LevelThree]                      = Level7;
+	map[NumLock+LevelThree+Shift]                = Level8;
+
+	map[NumLock+LevelFive]                       = Level1;
+	map[NumLock+LevelFive+Shift]                 = Level2;
+	map[NumLock+LevelFive+LevelThree]            = Level3;
+	map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+
+	// Lock has no effect
+	map[Lock]                                    = Level1;
+	map[Lock+Shift]                              = Level2;
+	map[Lock+LevelThree]                         = Level3;
+	map[Lock+LevelThree+Shift]                   = Level4;
+
+	map[Lock+LevelFive]                          = Level5;
+	map[Lock+LevelFive+Shift]                    = Level6;
+	map[Lock+LevelFive+LevelThree]               = Level7;
+	map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+
+	map[Lock+NumLock]                            = Level5;
+	map[Lock+NumLock+Shift]                      = Level6;
+	map[Lock+NumLock+LevelThree]                 = Level7;
+	map[Lock+NumLock+LevelThree+Shift]           = Level8;
+
+	map[Lock+NumLock+LevelFive]                  = Level1;
+	map[Lock+NumLock+LevelFive+Shift]            = Level2;
+	map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
+	map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
+
+	preserve[LevelFive+Shift] = Shift;
+	preserve[NumLock+Shift] = Shift;
+	preserve[Lock+LevelFive+Shift] = Shift;
+	preserve[Lock+NumLock+Shift] = Shift;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
     };
 
     type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
-        // Level5-Lock is implemented with virtual modifier NumLock.
-
-        modifiers = Shift + Lock + LevelThree + LevelFive + NumLock;
-
-        map[None]                                    = Level1;
-        map[Shift]                                   = Level2;
-        map[LevelThree]                              = Level3;
-        map[LevelThree+Shift]                        = Level4;
-
-        map[LevelFive]                               = Level5;
-        map[LevelFive+Shift]                         = Level6;
-        map[LevelFive+LevelThree]                    = Level7;
-        map[LevelFive+LevelThree+Shift]              = Level8;
-
-        map[NumLock]                                 = Level5;
-        map[NumLock+Shift]                           = Level6;
-        map[NumLock+LevelThree]                      = Level7;
-        map[NumLock+LevelThree+Shift]                = Level8;
-
-        map[NumLock+LevelFive]                       = Level1;
-        map[NumLock+LevelFive+Shift]                 = Level2;
-        map[NumLock+LevelFive+LevelThree]            = Level3;
-        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
-
-        // Lock interchanges Level1 and Level2
-        map[Lock]                                    = Level2;
-        map[Lock+Shift]                              = Level1;
-        map[Lock+LevelThree]                         = Level3;
-        map[Lock+LevelThree+Shift]                   = Level4;
-
-        map[Lock+LevelFive]                          = Level5;
-        map[Lock+LevelFive+Shift]                    = Level6;
-        map[Lock+LevelFive+LevelThree]               = Level7;
-        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
-
-        map[Lock+NumLock]                            = Level5;
-        map[Lock+NumLock+Shift]                      = Level6;
-        map[Lock+NumLock+LevelThree]                 = Level7;
-        map[Lock+NumLock+LevelThree+Shift]           = Level8;
-
-        map[Lock+NumLock+LevelFive]                  = Level2;
-        map[Lock+NumLock+LevelFive+Shift]            = Level1;
-        map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
-        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
-
-        preserve[LevelFive+Shift] = Shift;
-        preserve[NumLock+Shift] = Shift;
-
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Shift";
-        level_name[Level3] = "Alt Base";
-        level_name[Level4] = "Shift Alt";
-        level_name[Level5] = "X";
-        level_name[Level6] = "X Shift";
-        level_name[Level7] = "X Alt Base";
-        level_name[Level8] = "X Shift Alt";
+	// Level5-Lock is implemented with virtual modifier NumLock.
+
+	modifiers = Shift + Lock + LevelThree + LevelFive + NumLock;
+
+	map[None]                                    = Level1;
+	map[Shift]                                   = Level2;
+	map[LevelThree]                              = Level3;
+	map[LevelThree+Shift]                        = Level4;
+
+	map[LevelFive]                               = Level5;
+	map[LevelFive+Shift]                         = Level6;
+	map[LevelFive+LevelThree]                    = Level7;
+	map[LevelFive+LevelThree+Shift]              = Level8;
+
+	map[NumLock]                                 = Level5;
+	map[NumLock+Shift]                           = Level6;
+	map[NumLock+LevelThree]                      = Level7;
+	map[NumLock+LevelThree+Shift]                = Level8;
+
+	map[NumLock+LevelFive]                       = Level1;
+	map[NumLock+LevelFive+Shift]                 = Level2;
+	map[NumLock+LevelFive+LevelThree]            = Level3;
+	map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+
+	// Lock interchanges Level1 and Level2
+	map[Lock]                                    = Level2;
+	map[Lock+Shift]                              = Level1;
+	map[Lock+LevelThree]                         = Level3;
+	map[Lock+LevelThree+Shift]                   = Level4;
+
+	map[Lock+LevelFive]                          = Level5;
+	map[Lock+LevelFive+Shift]                    = Level6;
+	map[Lock+LevelFive+LevelThree]               = Level7;
+	map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+
+	map[Lock+NumLock]                            = Level5;
+	map[Lock+NumLock+Shift]                      = Level6;
+	map[Lock+NumLock+LevelThree]                 = Level7;
+	map[Lock+NumLock+LevelThree+Shift]           = Level8;
+
+	map[Lock+NumLock+LevelFive]                  = Level2;
+	map[Lock+NumLock+LevelFive+Shift]            = Level1;
+	map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
+	map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
+
+	preserve[LevelFive+Shift] = Shift;
+	preserve[NumLock+Shift] = Shift;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
     };
 
 };
diff --git a/types/mousekeys b/types/mousekeys
index 36434ed..daaafed 100644
--- a/types/mousekeys
+++ b/types/mousekeys
@@ -1,6 +1,6 @@
 default partial xkb_types "default" {
 
-    virtual_modifiers Alt;
+    virtual_modifiers  Alt;
 
     type "SHIFT+ALT" {
 	modifiers = Shift + Alt;
diff --git a/types/nokia b/types/nokia
index 15286f1..9eaaa4e 100644
--- a/types/nokia
+++ b/types/nokia
@@ -2,7 +2,7 @@ default partial xkb_types "default" {
 
     // A type that is used by Nokia devices and keyboards.
 
-    virtual_modifiers LevelThree;
+    virtual_modifiers  LevelThree;
 
     type "PC_FN_LEVEL2" {
 	modifiers = LevelThree;
diff --git a/types/numpad b/types/numpad
index 458a64f..71ef9b1 100644
--- a/types/numpad
+++ b/types/numpad
@@ -22,12 +22,12 @@ partial xkb_types "mac" {
 
 partial xkb_types "microsoft" {
     type "KEYPAD" {
-        modifiers = Shift + NumLock;
-        map[None] = Level1;
-        preserve[Shift] = Shift;
-        map[NumLock] = Level2;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Number";
+	modifiers = Shift + NumLock;
+	map[None] = Level1;
+	preserve[Shift] = Shift;
+	map[NumLock] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
     };
     include "extra(keypad)"
 };
@@ -39,27 +39,27 @@ partial xkb_types "microsoft" {
 // FOUR_LEVEL_MIXED_KEYPAD, so that's the one we are going to override.
 partial xkb_types "shift3" {
     type "FOUR_LEVEL_MIXED_KEYPAD" {
-        modifiers = Shift + NumLock + Control + Alt;
+	modifiers = Shift + NumLock + Control + Alt;
 
-        // NumLock Off => navigate using cursor keys
-        map[None] = Level1;
+	// NumLock Off => navigate using cursor keys
+	map[None] = Level1;
 
-        // NumLock Off + Shift pressed => select using cursor keys
-        preserve[Shift] = Shift;
+	// NumLock Off + Shift pressed => select using cursor keys
+	preserve[Shift] = Shift;
 
-        // NumLock On => decimal digits
-        map[NumLock] = Level2;
+	// NumLock On => decimal digits
+	map[NumLock] = Level2;
 
-        // NumLock On + Shift pressed => auxiliary symbols,
-        // e.g. hexadecimal digits
-        map[Shift+NumLock] = Level3;
+	// NumLock On + Shift pressed => auxiliary symbols,
+	// e.g. hexadecimal digits
+	map[Shift+NumLock] = Level3;
 
-        // Ctrl + Alt, regardless of NumLock and Shift => command keys
-        map[Control+Alt] = Level4;
+	// Ctrl + Alt, regardless of NumLock and Shift => command keys
+	map[Control+Alt] = Level4;
 
-        level_name[Level1] = "Base";
-        level_name[Level2] = "NumLock";
-        level_name[Level3] = "Shift+NumLock";
-        level_name[Level4] = "Ctrl+Alt";
+	level_name[Level1] = "Base";
+	level_name[Level2] = "NumLock";
+	level_name[Level3] = "Shift+NumLock";
+	level_name[Level4] = "Ctrl+Alt";
     };
 };
diff --git a/types/pc b/types/pc
index d0b6ea6..a97deae 100644
--- a/types/pc
+++ b/types/pc
@@ -4,15 +4,14 @@ default partial xkb_types "default" {
     // for a full implementation of
     // a PC-compatible keyboard.
 
-    virtual_modifiers Alt;
-    virtual_modifiers LevelThree;
+    virtual_modifiers  Alt, LevelThree;
 
     type "PC_SUPER_LEVEL2" {
-       modifiers = Mod4;
-       map[None] = Level1;
-       map[Mod4] = Level2;
-       level_name[Level1] = "Base";
-       level_name[Level2] = "Super";
+	modifiers = Mod4;
+	map[None] = Level1;
+	map[Mod4] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Super";
     };
 
     type "PC_CONTROL_LEVEL2" {
@@ -32,29 +31,29 @@ default partial xkb_types "default" {
     };
 
     type "CTRL+ALT" {
-        modifiers = Shift + LevelThree + Control + Alt;
-        map[None] = Level1;
-        map[Shift] = Level2;
-        map[LevelThree] = Level3;
-        map[Shift+LevelThree] = Level4;
-        map[Control+Alt] = Level5;
-        preserve[Shift] = Shift;
-        preserve[Shift+LevelThree] = Shift;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Shift";
-        level_name[Level3] = "Alt Base";
-        level_name[Level4] = "Shift Alt";
-        level_name[Level5] = "Ctrl+Alt";
+	modifiers = Shift + LevelThree + Control + Alt;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Control+Alt] = Level5;
+	preserve[Shift] = Shift;
+	preserve[Shift+LevelThree] = Shift;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "Ctrl+Alt";
     };
 
-   // Local eight level.
-   // Needed when you want part of your layout eight-level but cannot use
-   // LevelFive as modifier, as this will take over the right Ctrl by default
-   // for the whole layout and is too invasive for the average four-level user.
-   // Needed to fix bug #9529.
-   // FIXME: Should really use RControl but it seems not to be enabled by
-   // default and touching this requires a lot of testing.
-   type "LOCAL_EIGHT_LEVEL" {
+    // Local eight level.
+    // Needed when you want part of your layout eight-level but cannot use
+    // LevelFive as modifier, as this will take over the right Ctrl by default
+    // for the whole layout and is too invasive for the average four-level user.
+    // Needed to fix bug #9529.
+    // FIXME: Should really use RControl but it seems not to be enabled by
+    // default and touching this requires a lot of testing.
+    type "LOCAL_EIGHT_LEVEL" {
 	modifiers = Shift + Lock + LevelThree + Control;
 
 	map[None]       = Level1;
@@ -86,5 +85,4 @@ default partial xkb_types "default" {
 	level_name[Level7] = "Level3 Ctrl";
 	level_name[Level8] = "Shift Level3 Ctrl";
     };
-
 };