make the "Both Alts" option for switching between groups work again

Seemingly unintentionally bundled together with massive OLPC changes,
commit a8551efb70 from fifteen years ago changed the alts_toggle and
ctrls_toggle to use new key types that relied on virtual modifiers,
in order to address issue #122.  But specifying a virtual modifier in
a key assignment does not work, apparenly due to some limitation of
XKM (https://gitlab.freedesktop.org/xorg/xserver/-/issues/297).

It does not look like that limitation will be fixed.  So, let's roll
back the alts_toggle to what it was fifteen years ago when it worked.

This refreshed alts_toggle may cause problems for programs that cannot
cope with an Alt key that produces a different symbol upon key release
than upon key press -- the user will then have to choose a different
option for switching between layouts.

(The ctrls_toggle was restored in commit 4346c44713, six years ago.)

This fixes issue #316.

It also fixes issue #43, reported by Mohammed Adnène Trojette,
originally by Itaï Ben Yaacov in https://bugs.debian.org/463373.

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

6 files changed, 5 insertions, 11 deletions

diff --git a/rules/0036-lo_s.part b/rules/0036-lo_s.part
index 6564e07..f0dce01 100644
--- a/rules/0036-lo_s.part
+++ b/rules/0036-lo_s.part
@@ -1,6 +1,5 @@
 ! layout		option			= symbols
-
-  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle)
+  *			grp:alts_toggle		= +group(alts_toggle)
   *			lv3:ralt_alt		= +level3(ralt_alt)
   *			misc:typo		= +typo(base)
   *			misc:apl		= +apl(level3)
diff --git a/rules/0037-l1o_s.part b/rules/0037-l1o_s.part
index cbb61e8..bff67ea 100644
--- a/rules/0037-l1o_s.part
+++ b/rules/0037-l1o_s.part
@@ -1,6 +1,5 @@
 ! layout[1]		option			= symbols
-
-  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):1
+  *			grp:alts_toggle		= +group(alts_toggle):1
   *			lv3:ralt_alt		= +level3(ralt_alt):1
   *			misc:typo		= +typo(base):1
   *			misc:apl		= +apl(level3):1
diff --git a/rules/0038-l2o_s.part b/rules/0038-l2o_s.part
index f298d93..fd711c0 100644
--- a/rules/0038-l2o_s.part
+++ b/rules/0038-l2o_s.part
@@ -1,6 +1,5 @@
 ! layout[2]		option			= symbols
-
-  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):2
+  *			grp:alts_toggle		= +group(alts_toggle):2
   *			lv3:ralt_alt		= +level3(ralt_alt):2
   *			misc:typo		= +typo(base):2
   *			misc:apl		= +apl(level3):2
diff --git a/rules/0039-l3o_s.part b/rules/0039-l3o_s.part
index 2f27b81..1e7d5e9 100644
--- a/rules/0039-l3o_s.part
+++ b/rules/0039-l3o_s.part
@@ -1,6 +1,5 @@
 ! layout[3]		option			= symbols
-
-  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):3
+  *			grp:alts_toggle		= +group(alts_toggle):3
   *			lv3:ralt_alt		= +level3(ralt_alt):3
   *			misc:typo		= +typo(base):3
   *			misc:apl		= +apl(level3):3
diff --git a/rules/0040-l4o_s.part b/rules/0040-l4o_s.part
index 8246a15..46ef893 100644
--- a/rules/0040-l4o_s.part
+++ b/rules/0040-l4o_s.part
@@ -1,6 +1,5 @@
 ! layout[4]		option			= symbols
-
-  $threelevellayouts	grp:alts_toggle		= +level3(ralt_switch_for_alts_toggle):4
+  *			grp:alts_toggle		= +group(alts_toggle):4
   *			lv3:ralt_alt		= +level3(ralt_alt):4
   *			misc:typo		= +typo(base):4
   *			misc:apl		= +apl(level3):4
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part
index 3fd14e6..717101c 100644
--- a/rules/0042-o_s.part
+++ b/rules/0042-o_s.part
@@ -23,7 +23,6 @@
   grp:toggle		=	+group(toggle)
   grp:shifts_toggle	=	+group(shifts_toggle)
   grp:ctrls_toggle	=	+group(ctrls_toggle)
-  grp:alts_toggle	=	+group(alts_toggle)
   grp:caps_toggle	=	+capslock(grouplock)
   grp:caps_switch	=	+capslock(groupshift)
   grp:shift_caps_toggle	=	+group(shift_caps_toggle)