symbols/group: unwrap a bunch of lines, for clarity

This makes it easier to see the difference between similar options.

1 files changed, 33 insertions, 115 deletions

diff --git a/symbols/group b/symbols/group
index 684798a..38b2b86 100644
--- a/symbols/group
+++ b/symbols/group
@@ -76,40 +76,29 @@ xkb_symbols "caps_toggle" {
     key <CAPS> {[  ISO_Next_Group,  Caps_Lock  ], type[group1] = "TWO_LEVEL" };
 };
 
-// Pressing Shift+Caps_Lock switches to the next group.
+// Pressing Shift+Caps_Lock switches to the next group,
+// while plain Caps_Lock toggles CapsLock.
 partial modifier_keys
 xkb_symbols "shift_caps_toggle" {
-    key <CAPS> {
-        type[group1] = "TWO_LEVEL",
-        [  Caps_Lock,  ISO_Next_Group  ]
-    };
+    key <CAPS> {[  Caps_Lock,  ISO_Next_Group  ], type[group1] = "TWO_LEVEL" };
 };
 
 // Pressing Alt+Space switches to the next group.
 partial modifier_keys
 xkb_symbols "alt_space_toggle" {
-    key <SPCE> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  space,  ISO_Next_Group  ]
-    };
+    key <SPCE> {[  space,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 // Pressing Win+Space switches to the next group.
 partial modifier_keys
 xkb_symbols "win_space_toggle" {
-    key <SPCE> {
-        type[Group1] = "PC_SUPER_LEVEL2",
-        symbols[Group1] = [  space,  ISO_Next_Group  ]
-  };
+    key <SPCE> {[  space,  ISO_Next_Group  ], type[group1] = "PC_SUPER_LEVEL2" };
 };
 
 // Pressing Ctrl+Space switches to the next group.
 partial modifier_keys
 xkb_symbols "ctrl_space_toggle" {
-    key <SPCE> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  space,  ISO_Next_Group  ]
-  };
+    key <SPCE> {[  space,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
 };
 
 
@@ -143,28 +132,19 @@ xkb_symbols "ctrl_select" {
 //
 partial modifier_keys
 xkb_symbols "lctrl_lshift_toggle" {
-    key <LFSH> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  Shift_L,  ISO_Next_Group  ]
-    };
+    key <LFSH> {[  Shift_L,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
     key <LCTL> {[  Control_L,  ISO_Next_Group  ]};
 };
 
 partial modifier_keys
 xkb_symbols "lctrl_lshift_toggle_rev" {
-    key <LFSH> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  Shift_L,  ISO_Prev_Group  ]
-    };
+    key <LFSH> {[  Shift_L,  ISO_Prev_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
     key <LCTL> {[  Control_L,  ISO_Prev_Group  ]};
 };
 
 partial modifier_keys
 xkb_symbols "rctrl_rshift_toggle" {
-    key <RTSH> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  Shift_R,  ISO_Next_Group  ]
-    };
+    key <RTSH> {[  Shift_R,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
     key <RCTL> {[  Control_R,  ISO_Next_Group  ]};
 };
 
@@ -186,38 +166,20 @@ xkb_symbols "ctrl_shift_toggle_bidir" {
 //
 partial modifier_keys
 xkb_symbols "lctrl_lalt_toggle" {
-    key <LALT> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
-    };
-    key <LCTL> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Control_L,  ISO_Next_Group  ]
-    };
+    key <LALT> {[  NoSymbol,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
+    key <LCTL> {[  Control_L,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 partial modifier_keys
 xkb_symbols "lctrl_lalt_toggle_rev" {
-    key <LALT> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  NoSymbol,  ISO_Prev_Group  ]
-    };
-    key <LCTL> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Control_L,  ISO_Prev_Group  ]
-    };
+    key <LALT> {[  NoSymbol,  ISO_Prev_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
+    key <LCTL> {[  Control_L,  ISO_Prev_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 partial modifier_keys
 xkb_symbols "rctrl_ralt_toggle" {
-    key <RALT> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
-    };
-    key <RCTL> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Control_R,  ISO_Next_Group  ]
-    };
+    key <RALT> {[  NoSymbol,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
+    key <RCTL> {[  Control_R,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 partial modifier_keys
@@ -238,35 +200,20 @@ xkb_symbols "ctrl_alt_toggle_bidir" {
 //
 partial modifier_keys
 xkb_symbols "lalt_lshift_toggle" {
-    key <LALT> {
-        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
-    };
-    key <LFSH> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Shift_L,  ISO_Next_Group  ]
-    };
+    key <LALT> {[  NoSymbol,  ISO_Next_Group  ], type[group1] = "TWO_LEVEL" };
+    key <LFSH> {[  Shift_L,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 partial modifier_keys
 xkb_symbols "lalt_lshift_toggle_rev" {
-    key <LALT> {
-        symbols[Group1] = [  NoSymbol,  ISO_Prev_Group  ]
-    };
-    key <LFSH> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Shift_L,  ISO_Prev_Group  ]
-    };
+    key <LALT> {[  NoSymbol,  ISO_Prev_Group  ], type[group1] = "TWO_LEVEL" };
+    key <LFSH> {[  Shift_L,  ISO_Prev_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 partial modifier_keys
 xkb_symbols "ralt_rshift_toggle" {
-    key <RALT> {
-        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
-    };
-    key <RTSH> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Shift_R,  ISO_Next_Group  ]
-    };
+    key <RALT> {[  NoSymbol,  ISO_Next_Group  ], type[group1] = "TWO_LEVEL" };
+    key <RTSH> {[  Shift_R,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 partial modifier_keys
@@ -305,42 +252,25 @@ xkb_symbols "rwin_toggle" {
 // (depending on which Ctrl is pressed first).
 partial modifier_keys
 xkb_symbols "ctrls_toggle" {
-    key <LCTL> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  NoSymbol,  ISO_Prev_Group  ]
-    };
-    key <RCTL> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
-    };
+    key <LCTL> {[  NoSymbol,  ISO_Prev_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
+    key <RCTL> {[  NoSymbol,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
 };
 
-// Pressing both Alt switches to the next or previous group
+// Pressing both Alt keys switches to the next or previous group
 // (depending on which Alt is pressed first).
 partial modifier_keys
 xkb_symbols "alts_toggle" {
-    key <LALT> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Alt_L,  ISO_Prev_Group  ]
-    };
-    key <RALT> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  Alt_R,  ISO_Next_Group  ]
-    };
+    key <LALT> {[  Alt_L,  ISO_Prev_Group  ], type[group1] = "PC_ALT_LEVEL2" };
+    key <RALT> {[  Alt_R,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 // Pressing Alt plus AltGr switches to the next or previous group
 // (depending on which one is pressed first).
 partial modifier_keys
 xkb_symbols "alt_altgr_toggle" {
-    key <LALT> {
-        type[Group1] = "FOUR_LEVEL",
-        symbols[Group1] = [  Alt_L,  Alt_L,  ISO_Prev_Group,  ISO_Prev_Group  ]
-    };
-    key <RALT> {
-        type[Group1] = "PC_ALT_LEVEL2",
-        symbols[Group1] = [  ISO_Level3_Shift,  ISO_Next_Group  ]
-    };
+    key <LALT> {[  Alt_L,  Alt_L,  ISO_Prev_Group,  ISO_Prev_Group  ],
+							type[group1] = "FOUR_LEVEL" };
+    key <RALT> {[  ISO_Level3_Shift,  ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 // Pressing the left Shift key switches to the next group.
@@ -371,10 +301,7 @@ xkb_symbols "rctrl_toggle" {
 // while pressing Caps_Lock alone toggles CapsLock.
 partial modifier_keys
 xkb_symbols "alt_caps_toggle" {
-    key <CAPS> {
-        type[group1] = "PC_ALT_LEVEL2",
-        [  Caps_Lock,  ISO_Next_Group  ]
-    };
+    key <CAPS> {[  Caps_Lock, ISO_Next_Group  ], type[group1] = "PC_ALT_LEVEL2" };
 };
 
 hidden partial modifier_keys
@@ -392,21 +319,12 @@ xkb_symbols "sclk_toggle" {
 // pressing Ctrl + the Menu key selects the second group.
 partial modifier_keys
 xkb_symbols "lctrl_lwin_rctrl_menu" {
-    key <LWIN> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  Super_L,  ISO_First_Group  ]
-    };
-    key <MENU> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  Menu,  ISO_Last_Group  ]
-    };
+    key <LWIN> {[  Super_L,  ISO_First_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
+    key <MENU> {[  Menu,  ISO_Last_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
 };
 
 // Pressing Ctrl + the left Win key switches to the next group.
 partial modifier_keys
 xkb_symbols "lctrl_lwin_toggle" {
-    key <LWIN> {
-        type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [  Super_L,  ISO_Next_Group  ]
-    };
+    key <LWIN> {[  Super_L,  ISO_Next_Group  ], type[group1] = "PC_CONTROL_LEVEL2" };
 };