From f4a16d7305063d41f7d106fd77a3cf09c49134ab Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 21 Sep 2013 09:50:09 +0200
Subject: [PATCH] symbols/level[35]: Define the type within the key, as the
 others do.

Also align a bunch of braces and remove some trailing whitespace.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 symbols/level3 | 28 ++++++++++++++--------------
 symbols/level5 |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/symbols/level3 b/symbols/level3
index 8f3da0d..1142c89 100644
--- a/symbols/level3
+++ b/symbols/level3
@@ -4,8 +4,8 @@
 // Ensure a mapping to a real modifier for LevelThree.
 partial modifier_keys
 xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
   replace key <LVL3> {
+    type[Group1] = "ONE_LEVEL";
     symbols[Group1] = [ ISO_Level3_Shift ]
   };
   modifier_map Mod5 { <LVL3> };
@@ -18,7 +18,7 @@ xkb_symbols "ralt_switch" {
   key <RALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -28,16 +28,16 @@ xkb_symbols "ralt_switch" {
 // to map the level3 shift to some other key.
 partial modifier_keys
 xkb_symbols "ralt_alt" {
-  key <RALT> { 
+  key <RALT> {
     type[Group1]="TWO_LEVEL",
     type[Group2]="TWO_LEVEL",
     type[Group3]="TWO_LEVEL",
     type[Group4]="TWO_LEVEL",
-    symbols[Group1] = [ Alt_R, Meta_R ], 
-    symbols[Group2] = [ Alt_R, Meta_R ], 
-    symbols[Group3] = [ Alt_R, Meta_R ], 
+    symbols[Group1] = [ Alt_R, Meta_R ],
+    symbols[Group2] = [ Alt_R, Meta_R ],
+    symbols[Group3] = [ Alt_R, Meta_R ],
     symbols[Group4] = [ Alt_R, Meta_R ]
-    };
+  };
   modifier_map Mod1 { <RALT> };
 };
 
@@ -48,7 +48,7 @@ xkb_symbols "ralt_switch_multikey" {
   key <RALT> {
     type[Group1]="TWO_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -83,7 +83,7 @@ xkb_symbols "lalt_switch" {
   key <LALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -93,7 +93,7 @@ xkb_symbols "switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -103,7 +103,7 @@ xkb_symbols "menu_switch" {
   key <MENU> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -120,7 +120,7 @@ xkb_symbols "lwin_switch" {
   key <LWIN> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -132,7 +132,7 @@ xkb_symbols "rwin_switch" {
   key <RWIN> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
@@ -143,7 +143,7 @@ xkb_symbols "enter_switch" {
   key <KPEN> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
-    };
+  };
   include "level3(modifier_mapping)"
 };
 
diff --git a/symbols/level5 b/symbols/level5
index 84507e5..4c5a833 100644
--- a/symbols/level5
+++ b/symbols/level5
@@ -4,8 +4,8 @@
 // Ensure a mapping to a real modifier for LevelFive.
 partial modifier_keys
 xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
   replace key <MDSW> {
+    type[Group1] = "ONE_LEVEL";
     symbols[Group1] = [ ISO_Level5_Shift ]
   };
   modifier_map Mod3 { <MDSW> };
@@ -17,7 +17,7 @@ xkb_symbols "rctrl_switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
@@ -27,7 +27,7 @@ xkb_symbols "lsgt_switch" {
   key <LSGT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
@@ -37,7 +37,7 @@ xkb_symbols "ralt_switch" {
   key <RALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
-- 
2.7.4