From e66a0ed332506a24b2107eb413a7087f7d0daf23 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 20 Apr 2023 16:15:53 +0200 Subject: rules: put the `grp:` rules last, as they should have the last word When using a `grp:` option, one doesn't want other options to interfere with this option, so the rules for `grp:` options should come last in the list. This fixes issue #383. Reported-by: Sergey Stolyarov Signed-off-by: Benno Schulenberg --- rules/0036-lo_s.part | 6 +++--- rules/0037-l1o_s.part | 6 +++--- rules/0038-l2o_s.part | 6 +++--- rules/0039-l3o_s.part | 6 +++--- rules/0040-l4o_s.part | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rules/0036-lo_s.part b/rules/0036-lo_s.part index 09f545d..39f579d 100644 --- a/rules/0036-lo_s.part +++ b/rules/0036-lo_s.part @@ -1,4 +1,7 @@ ! layout option = symbols + * misc:apl = +apl(level3) + * misc:typo = +typo(base) + * lv3:ralt_alt = +level3(ralt_alt) * grp:toggle = +group(toggle) * grp:alts_toggle = +group(alts_toggle) * grp:alt_altgr_toggle = +group(alt_altgr_toggle) @@ -6,6 +9,3 @@ * grp:win_space_toggle = +group(win_space_toggle) * grp:ctrl_space_toggle = +group(ctrl_space_toggle) * grp:rctrl_rshift_toggle = +group(rctrl_rshift_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 e90b570..1775512 100644 --- a/rules/0037-l1o_s.part +++ b/rules/0037-l1o_s.part @@ -1,4 +1,7 @@ ! layout[1] option = symbols + * misc:apl = +apl(level3):1 + * misc:typo = +typo(base):1 + * lv3:ralt_alt = +level3(ralt_alt):1 * grp:toggle = +group(toggle):1 * grp:alts_toggle = +group(alts_toggle):1 * grp:alt_altgr_toggle = +group(alt_altgr_toggle):1 @@ -6,6 +9,3 @@ * grp:win_space_toggle = +group(win_space_toggle):1 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):1 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_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 485642d..fbac126 100644 --- a/rules/0038-l2o_s.part +++ b/rules/0038-l2o_s.part @@ -1,4 +1,7 @@ ! layout[2] option = symbols + * misc:apl = +apl(level3):2 + * misc:typo = +typo(base):2 + * lv3:ralt_alt = +level3(ralt_alt):2 * grp:toggle = +group(toggle):2 * grp:alts_toggle = +group(alts_toggle):2 * grp:alt_altgr_toggle = +group(alt_altgr_toggle):2 @@ -6,6 +9,3 @@ * grp:win_space_toggle = +group(win_space_toggle):2 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):2 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_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 02ba758..9a10f48 100644 --- a/rules/0039-l3o_s.part +++ b/rules/0039-l3o_s.part @@ -1,4 +1,7 @@ ! layout[3] option = symbols + * misc:apl = +apl(level3):3 + * misc:typo = +typo(base):3 + * lv3:ralt_alt = +level3(ralt_alt):3 * grp:toggle = +group(toggle):3 * grp:alts_toggle = +group(alts_toggle):3 * grp:alt_altgr_toggle = +group(alt_altgr_toggle):3 @@ -6,6 +9,3 @@ * grp:win_space_toggle = +group(win_space_toggle):3 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):3 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_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 04227aa..11fe901 100644 --- a/rules/0040-l4o_s.part +++ b/rules/0040-l4o_s.part @@ -1,4 +1,7 @@ ! layout[4] option = symbols + * misc:apl = +apl(level3):4 + * misc:typo = +typo(base):4 + * lv3:ralt_alt = +level3(ralt_alt):4 * grp:toggle = +group(toggle):4 * grp:alts_toggle = +group(alts_toggle):4 * grp:alt_altgr_toggle = +group(alt_altgr_toggle):4 @@ -6,6 +9,3 @@ * grp:win_space_toggle = +group(win_space_toggle):4 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):4 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle):4 - * lv3:ralt_alt = +level3(ralt_alt):4 - * misc:typo = +typo(base):4 - * misc:apl = +apl(level3):4 -- cgit v1.2.1