remove pieces that are no longer needed after the previous two commits

And some pieces that became redundant after commit 4346c44713 from six
years ago: it made the Ctrls toggle rely on the plain Control modifier
again instead of on the non-working LControl/RControl virtual modifiers.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

4 files changed, 4 insertions, 87 deletions

diff --git a/rules/0001-lists.part b/rules/0001-lists.part
index bd56ca3..14109d8 100644
--- a/rules/0001-lists.part
+++ b/rules/0001-lists.part
@@ -34,30 +34,6 @@
 ! $azerty = be fr
 ! $qwertz = al ch cz de hr hu ro si sk
 
-
-// All layouts with 3rd and 4th levels:
-! $threelevellayouts = af al az \
-              bd be bg br bt \
-              ca ch cm cn cz \
-              de dk dz \
-              ee es eu \
-              fi fo fr \
-              gb ge gh gr \
-              hr hu \
-              ie il in ir is it \
-              kh kz \
-              latam \
-              lk lt lv \
-              ml mm mn mt \
-              ng nl no \
-              ph pk pl pt \
-              ro rs \
-              se si sk sn sy \
-              tg tm tr tw \
-              ua us \
-              vn \
-              za
-
 ! $thinkpads = thinkpad thinkpad60 thinkpadz60
 
 ! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
diff --git a/symbols/group b/symbols/group
index ab37724..e26d2c5 100644
--- a/symbols/group
+++ b/symbols/group
@@ -330,16 +330,13 @@ xkb_symbols "rwin_toggle" {
 // (depending on which Ctrl is pressed first).
 partial modifier_keys
 xkb_symbols "ctrls_toggle" {
-    virtual_modifiers LControl, RControl;
     key <LCTL> {
         type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Prev_Group ],
-        virtualMods= LControl
+        symbols[Group1] = [ NoSymbol, ISO_Prev_Group ]
     };
     key <RCTL> {
         type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Next_Group ],
-        virtualMods= RControl
+        symbols[Group1] = [ NoSymbol, ISO_Next_Group ]
     };
 };
 
@@ -347,16 +344,13 @@ xkb_symbols "ctrls_toggle" {
 // (depending on which Alt is pressed first).
 partial modifier_keys
 xkb_symbols "alts_toggle" {
-    virtual_modifiers LAlt, RAlt;
     key <LALT> {
         type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Alt_L, ISO_Prev_Group ],
-        virtualMods= LAlt
+        symbols[Group1] = [ Alt_L, ISO_Prev_Group ]
     };
     key <RALT> {
         type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Alt_R, ISO_Next_Group ],
-        virtualMods= RAlt
+        symbols[Group1] = [ Alt_R, ISO_Next_Group ]
     };
 };
 
diff --git a/symbols/level3 b/symbols/level3
index 0b3f9c5..11f4607 100644
--- a/symbols/level3
+++ b/symbols/level3
@@ -46,23 +46,6 @@ xkb_symbols "ralt_switch_multikey" {
   include "level3(modifier_mapping)"
 };
 
-// A special case of the right-Alt switch -- for use with grp:alts_toggle.
-hidden partial modifier_keys
-xkb_symbols "ralt_switch_for_alts_toggle" {
-  virtual_modifiers LAlt, AltGr;
-  key <LALT> {
-    type[Group1]="PC_RALT_LEVEL2",
-    symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ],
-    virtualMods= LAlt
-  };
-  key <RALT> {
-    type[Group1]="PC_ALT_LEVEL2",
-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],
-    virtualMods= AltGr
-  };
-  include "level3(modifier_mapping)"
-};
-
 // Either Alt key (while pressed) chooses the third shift level.
 // (To be used mostly to imitate Mac OS functionality.)
 partial modifier_keys
diff --git a/types/pc b/types/pc
index a980664..03fe1c8 100644
--- a/types/pc
+++ b/types/pc
@@ -6,10 +6,6 @@ default partial xkb_types "default" {
 
     virtual_modifiers Alt;
     virtual_modifiers LevelThree;
-    virtual_modifiers LAlt;
-    virtual_modifiers RAlt;
-    virtual_modifiers RControl;
-    virtual_modifiers LControl;
 
     type "PC_SUPER_LEVEL2" {
        modifiers = Mod4;
@@ -27,22 +23,6 @@ default partial xkb_types "default" {
 	level_name[Level2] = "Control";
     };
 
-    type "PC_LCONTROL_LEVEL2" {
-	modifiers = LControl;
-	map[None] = Level1;
-	map[LControl] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "LControl";
-    };
-
-    type "PC_RCONTROL_LEVEL2" {
-	modifiers = RControl;
-	map[None] = Level1;
-	map[RControl] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "RControl";
-    };
-
     type "PC_ALT_LEVEL2" {
 	modifiers = Alt;
 	map[None] = Level1;
@@ -51,22 +31,6 @@ default partial xkb_types "default" {
 	level_name[Level2] = "Alt";
     };
 
-    type "PC_LALT_LEVEL2" {
-	modifiers = LAlt;
-	map[None] = Level1;
-	map[LAlt] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "LAlt";
-    };
-
-    type "PC_RALT_LEVEL2" {
-	modifiers = RAlt;
-	map[None] = Level1;
-	map[RAlt] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "RAlt";
-    };
-
     type "CTRL+ALT" {
         modifiers = Control+Alt+Shift+LevelThree;
         map[None] = Level1;