Add caps:digits_row_independent_lock option

`Shift + Caps` locks the digits on the digits row, `Caps Lock` alone
behaves as usual (Azerty layouts).

The `Shift + Caps Lock` combination inverts the first two levels only.
Originally designed for layouts with digits on the second level of the
digits row (e.g. Azerty layouts).
This allows users to have direct access to digits while keeping
usual capitalization via `Caps Lock`.

Also add the `FOUR_LEVEL_LOCKABLE_LEVEL2` key type, a variant of
`FOUR_LEVEL_MIXED_KEYPAD` that uses `LevelFive` instead of `NumLock`,
to avoid interaction with the keypad. Originally created to lock the
digits on layouts with digits on the second level of the digits row
(e.g. Azerty layouts).

6 files changed, 76 insertions, 65 deletions

diff --git a/rules/0036-layoutoption_symbols.part b/rules/0036-layoutoption_symbols.part
index 73aa02ab..9420fbd7 100644
--- a/rules/0036-layoutoption_symbols.part
+++ b/rules/0036-layoutoption_symbols.part
@@ -1,13 +1,14 @@
-! 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)
-  *			grp:alt_space_toggle	= +group(alt_space_toggle)
-  *			grp:win_space_toggle	= +group(win_space_toggle)
-  *			grp:ctrl_space_toggle	= +group(ctrl_space_toggle)
-  *			grp:rctrl_rshift_toggle	= +group(rctrl_rshift_toggle)
-  *			grp:shifts_toggle	= +group(shifts_toggle)
-  $azerty		caps:digits_row		= +capslock(digits_row)
+! 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)
+  *		grp:alt_space_toggle			= +group(alt_space_toggle)
+  *		grp:win_space_toggle			= +group(win_space_toggle)
+  *		grp:ctrl_space_toggle			= +group(ctrl_space_toggle)
+  *		grp:rctrl_rshift_toggle			= +group(rctrl_rshift_toggle)
+  *		grp:shifts_toggle			= +group(shifts_toggle)
+  $azerty	caps:digits_row				= +capslock(digits_row)
+  $azerty	caps:digits_row_independent_lock	= +capslock(digits_row_independent_lock)
diff --git a/rules/0037-layout1option_symbols.part b/rules/0037-layout1option_symbols.part
index 376d90f0..2ad0fc30 100644
--- a/rules/0037-layout1option_symbols.part
+++ b/rules/0037-layout1option_symbols.part
@@ -1,13 +1,14 @@
-! 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
-  *			grp:alt_space_toggle	= +group(alt_space_toggle):1
-  *			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
-  *			grp:shifts_toggle	= +group(shifts_toggle):1
-  $azerty		caps:digits_row		= +capslock(digits_row):1
+! 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
+  *		grp:alt_space_toggle			= +group(alt_space_toggle):1
+  *		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
+  *		grp:shifts_toggle			= +group(shifts_toggle):1
+  $azerty	caps:digits_row				= +capslock(digits_row):1
+  $azerty	caps:digits_row_independent_lock	= +capslock(digits_row_independent_lock):1
diff --git a/rules/0038-layout2option_symbols.part b/rules/0038-layout2option_symbols.part
index 7eeee13a..fefccda6 100644
--- a/rules/0038-layout2option_symbols.part
+++ b/rules/0038-layout2option_symbols.part
@@ -1,13 +1,14 @@
-! 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
-  *			grp:alt_space_toggle	= +group(alt_space_toggle):2
-  *			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
-  *			grp:shifts_toggle	= +group(shifts_toggle):2
-  $azerty		caps:digits_row		= +capslock(digits_row):2
+! 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
+  *		grp:alt_space_toggle			= +group(alt_space_toggle):2
+  *		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
+  *		grp:shifts_toggle			= +group(shifts_toggle):2
+  $azerty	caps:digits_row				= +capslock(digits_row):2
+  $azerty	caps:digits_row_independent_lock	= +capslock(digits_row_independent_lock):2
diff --git a/rules/0039-layout3option_symbols.part b/rules/0039-layout3option_symbols.part
index 17c2163f..5d8e97a8 100644
--- a/rules/0039-layout3option_symbols.part
+++ b/rules/0039-layout3option_symbols.part
@@ -1,13 +1,14 @@
-! 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
-  *			grp:alt_space_toggle	= +group(alt_space_toggle):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
-  *			grp:shifts_toggle	= +group(shifts_toggle):3
-  $azerty		caps:digits_row		= +capslock(digits_row):3
+! 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
+  *		grp:alt_space_toggle			= +group(alt_space_toggle):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
+  *		grp:shifts_toggle			= +group(shifts_toggle):3
+  $azerty	caps:digits_row				= +capslock(digits_row):3
+  $azerty	caps:digits_row_independent_lock	= +capslock(digits_row_independent_lock):3
diff --git a/rules/0040-layout4option_symbols.part b/rules/0040-layout4option_symbols.part
index 0bad6897..07d40908 100644
--- a/rules/0040-layout4option_symbols.part
+++ b/rules/0040-layout4option_symbols.part
@@ -1,13 +1,14 @@
-! 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
-  *			grp:alt_space_toggle	= +group(alt_space_toggle):4
-  *			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
-  *			grp:shifts_toggle	= +group(shifts_toggle):4
-  $azerty		caps:digits_row		= +capslock(digits_row):4
+! 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
+  *		grp:alt_space_toggle			= +group(alt_space_toggle):4
+  *		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
+  *		grp:shifts_toggle			= +group(shifts_toggle):4
+  $azerty	caps:digits_row				= +capslock(digits_row):4
+  $azerty	caps:digits_row_independent_lock	= +capslock(digits_row_independent_lock):4
diff --git a/rules/base.xml b/rules/base.xml
index 65bb4b41..f35f0c37 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -7661,6 +7661,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:digits_row_independent_lock</name>
+          <description>Shift + Caps locks the digits on the digits row, Caps Lock alone behaves as usual (Azerty layouts)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:none</name>
           <description>Caps Lock is disabled</description>
         </configItem>