symbols/ctrl: specify CAPS precisely, trim redundant modifier mappings

1 files changed, 14 insertions, 15 deletions

diff --git a/symbols/ctrl b/symbols/ctrl
index bf600e5..df2e66d 100644
--- a/symbols/ctrl
+++ b/symbols/ctrl
@@ -1,14 +1,14 @@
 // Eliminate CapsLock, making it another Ctrl.
 partial modifier_keys
 xkb_symbols "nocaps" {
-    replace key <CAPS> { [ Control_L, Control_L ] };
-    modifier_map  Control { <CAPS>, <LCTL> };
+    replace key <CAPS> { [ Control_L ], type[group1] = "ONE_LEVEL" };
+    modifier_map Control { <CAPS> };
 };
 
 // Make the left Ctrl key a left Meta.
 xkb_symbols "lctrl_meta" {
     replace key <LCTL> { [ Meta_L ] };
-    modifier_map  Mod4 { <LCTL> };
+    modifier_map Mod4 { <LCTL> };
 };
 
 // Swap the functions of the CapsLock key and the left Ctrl key.
@@ -17,7 +17,7 @@ xkb_symbols "swapcaps" {
     replace key <CAPS> { [ Control_L ], type[group1] = "ONE_LEVEL" };
     replace key <LCTL> { [ Caps_Lock ] };
     modifier_map Control { <CAPS> };
-    modifier_map  Lock { <LCTL> };
+    modifier_map Lock    { <LCTL> };
 };
 
 // Make the left Ctrl key a left Hyper,
@@ -27,7 +27,7 @@ xkb_symbols "hyper_capscontrol" {
     replace key <CAPS> { [ Control_L ], type[group1] = "ONE_LEVEL" };
     replace key <LCTL> { [ Hyper_L ] };
     modifier_map Control { <CAPS> };
-    modifier_map  Mod4 { <LCTL> };
+    modifier_map Mod4    { <LCTL> };
 };
 
 // Move Ctrl to the leftmost key on the middle row and CapsLock to the
@@ -37,8 +37,8 @@ partial modifier_keys
 xkb_symbols "ac_ctrl" {
     replace key <AC00> { [ Control_L ], type[group1] = "ONE_LEVEL" };
     replace key <AA00> { [ Caps_Lock ] };
-    modifier_map  Control { <AC00> };
-    modifier_map  Lock    { <AA00> };
+    modifier_map Control { <AC00> };
+    modifier_map Lock    { <AA00> };
 };
 
 // Move Ctrl to the leftmost key on the bottom row and CapsLock to the
@@ -48,29 +48,28 @@ partial modifier_keys
 xkb_symbols "aa_ctrl" {
     replace key <AA00> { [ Control_L ] };
     replace key <AC00> { [ Caps_Lock ] };
-    modifier_map  Control { <AA00> };
-    modifier_map  Lock    { <AC00> };
+    modifier_map Control { <AA00> };
+    modifier_map Lock    { <AC00> };
 };
 
 // Right Ctrl functions as another right Alt.
 partial modifier_keys
 xkb_symbols "rctrl_ralt" {
-    key <RCTL> { symbols[Group1]= [ Alt_R ] };
-    modifier_map Mod1{ <RCTL> };
+    key <RCTL> { [ Alt_R ] };
+    modifier_map Mod1 { <RCTL> };
 };
 
 // Menu key functions as another right Ctrl.
 partial modifier_keys
 xkb_symbols "menu_rctrl" {
-    replace key <MENU> { [ Control_R, Control_R ] };
-    modifier_map Control { Control_L, <MENU> };
+    key <MENU> { [ Control_R ] };
+    modifier_map Control { <MENU> };
 };
 
 // Right Alt key functions as another right Ctrl.
 partial modifier_keys
 xkb_symbols "ralt_rctrl" {
-    replace key <RALT> { type[Group1] = "TWO_LEVEL",
-                         symbols[Group1] = [ Control_R, Control_R ] };
+    replace key <RALT> { [ Control_R, Control_R ], type[group1] = "TWO_LEVEL" };
     modifier_map Control { <RALT> };
 };