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

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

1 files changed, 61 insertions, 61 deletions

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;