kbd misc

Signed-off-by: Mattias Andrée <maandree@operamail.com>

56 files changed, 280 insertions, 397 deletions

diff --git a/res/keyboard/layout/ast/colemak b/res/keyboard/layout/ast/colemak
index f068e4e..597d3cf 100644
--- a/res/keyboard/layout/ast/colemak
+++ b/res/keyboard/layout/ast/colemak
@@ -4,10 +4,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/ast/dvorak b/res/keyboard/layout/ast/dvorak
index ca4c19b..072efee 100644
--- a/res/keyboard/layout/ast/dvorak
+++ b/res/keyboard/layout/ast/dvorak
@@ -4,10 +4,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/ast/qwerty b/res/keyboard/layout/ast/qwerty
index 416a2fc..bad6bc6 100644
--- a/res/keyboard/layout/ast/qwerty
+++ b/res/keyboard/layout/ast/qwerty
@@ -4,10 +4,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/ca/colemak b/res/keyboard/layout/ca/colemak
index ea1cf50..ab25b3b 100644
--- a/res/keyboard/layout/ca/colemak
+++ b/res/keyboard/layout/ca/colemak
@@ -4,10 +4,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/ca/dvorak b/res/keyboard/layout/ca/dvorak
index c4b1d8a..07b48c9 100644
--- a/res/keyboard/layout/ca/dvorak
+++ b/res/keyboard/layout/ca/dvorak
@@ -4,10 +4,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/ca/qwerty b/res/keyboard/layout/ca/qwerty
index c6b2de5..0598eb1 100644
--- a/res/keyboard/layout/ca/qwerty
+++ b/res/keyboard/layout/ca/qwerty
@@ -4,10 +4,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/common/keypad b/res/keyboard/layout/common/keypad
index 524bbd4..b4f1b2a 100644
--- a/res/keyboard/layout/common/keypad
+++ b/res/keyboard/layout/common/keypad
@@ -1,13 +1,13 @@
-<num keypad home> : "7"
-<num keypad up> : "8"
-<num keypad pgup> : "9"
-<num keypad left> : "4"
-<num keypad begin> : "5"
-<num keypad right> : "6"
-<num keypad end> : "1"
-<num keypad down> : "2"
-<num keypad pgdown> : "3"
-<num keypad ins> : "0"
+<num keypad home> : "\digit(7)"
+<num keypad up> : "\digit(8)"
+<num keypad pgup> : "\digit(9)"
+<num keypad left> : "\digit(4)"
+<num keypad begin> : "\digit(5)"
+<num keypad right> : "\digit(6)"
+<num keypad end> : "\digit(1)"
+<num keypad down> : "\digit(2)"
+<num keypad pgdown> : "\digit(3)"
+<num keypad ins> : "\digit(0)"
 <num keypad del> : "\comma()"
 
 <num shift keypad home> : <keypad home>
@@ -22,16 +22,16 @@
 <num shift keypad ins> : <keypad ins>
 <num shift keypad del> : <keypad del>
 
-<shift keypad home> : "7"
-<shift keypad up> : "8"
-<shift keypad pgup> : "9"
-<shift keypad left> : "4"
-<shift keypad begin> : "5"
-<shift keypad right> : "6"
-<shift keypad end> : "1"
-<shift keypad down> : "2"
-<shift keypad pgdown> : "3"
-<shift keypad ins> : "0"
+<shift keypad home> : "\digit(7)"
+<shift keypad up> : "\digit(8)"
+<shift keypad pgup> : "\digit(9)"
+<shift keypad left> : "\digit(4)"
+<shift keypad begin> : "\digit(5)"
+<shift keypad right> : "\digit(6)"
+<shift keypad end> : "\digit(1)"
+<shift keypad down> : "\digit(2)"
+<shift keypad pgdown> : "\digit(3)"
+<shift keypad ins> : "\digit(0)"
 <shift keypad del> : "\comma()"
 
 <altgr keypad home> : "↖"
diff --git a/res/keyboard/layout/common/latin b/res/keyboard/layout/common/latin
index ff5d9cc..dc206e7 100644
--- a/res/keyboard/layout/common/latin
+++ b/res/keyboard/layout/common/latin
@@ -1,5 +1,29 @@
+function digit/1
+  if \or(\equals(\1 0) \equals(\1 "0"))
+     "0"
+  else if \or(\equals(\1 1) \equals(\1 "1"))
+     "1"
+  else if \or(\equals(\1 2) \equals(\1 "2"))
+     "2"
+  else if \or(\equals(\1 3) \equals(\1 "3"))
+     "3"
+  else if \or(\equals(\1 4) \equals(\1 "4"))
+     "4"
+  else if \or(\equals(\1 5) \equals(\1 "5"))
+     "5"
+  else if \or(\equals(\1 6) \equals(\1 "6"))
+     "6"
+  else if \or(\equals(\1 7) \equals(\1 "7"))
+     "7"
+  else if \or(\equals(\1 8) \equals(\1 "8"))
+     "8"
+  else
+     "9"
+  end if
+end function
+
 for "0" to "9" as \1
-  <letter \1> : "\1"
+  <letter \1> : "\digit(\1)"
 end for
 
 for "a" to "z" as \1
diff --git a/res/keyboard/layout/da/colemak b/res/keyboard/layout/da/colemak
index 9662619..4399e57 100644
--- a/res/keyboard/layout/da/colemak
+++ b/res/keyboard/layout/da/colemak
@@ -4,10 +4,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/da/dvorak b/res/keyboard/layout/da/dvorak
index d1f6f33..1bf1164 100644
--- a/res/keyboard/layout/da/dvorak
+++ b/res/keyboard/layout/da/dvorak
@@ -4,10 +4,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/da/qwerty b/res/keyboard/layout/da/qwerty
index 06f41f8..429adc3 100644
--- a/res/keyboard/layout/da/qwerty
+++ b/res/keyboard/layout/da/qwerty
@@ -4,10 +4,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/es/colemak b/res/keyboard/layout/es/colemak
index 55f86ef..71e1250 100644
--- a/res/keyboard/layout/es/colemak
+++ b/res/keyboard/layout/es/colemak
@@ -4,10 +4,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/es/dvorak b/res/keyboard/layout/es/dvorak
index 569e40c..51d5928 100644
--- a/res/keyboard/layout/es/dvorak
+++ b/res/keyboard/layout/es/dvorak
@@ -4,10 +4,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/es/latin_american_colemak b/res/keyboard/layout/es/latin_american_colemak
index 4e569da..efaa61e 100644
--- a/res/keyboard/layout/es/latin_american_colemak
+++ b/res/keyboard/layout/es/latin_american_colemak
@@ -23,10 +23,9 @@ information
   variant "Latin American, Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -34,6 +33,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+    
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/es/latin_american_dvorak b/res/keyboard/layout/es/latin_american_dvorak
index 6494cc4..8c1eb08 100644
--- a/res/keyboard/layout/es/latin_american_dvorak
+++ b/res/keyboard/layout/es/latin_american_dvorak
@@ -23,10 +23,9 @@ information
   variant "Latin American, Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -34,6 +33,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/es/latin_american_qwerty b/res/keyboard/layout/es/latin_american_qwerty
index 886e3d6..4aa27c4 100644
--- a/res/keyboard/layout/es/latin_american_qwerty
+++ b/res/keyboard/layout/es/latin_american_qwerty
@@ -23,10 +23,9 @@ information
   variant "Latin American, QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -34,6 +33,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/es/qwerty b/res/keyboard/layout/es/qwerty
index 5c85fe8..ce3743c 100644
--- a/res/keyboard/layout/es/qwerty
+++ b/res/keyboard/layout/es/qwerty
@@ -4,10 +4,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "º"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/fi/colemak b/res/keyboard/layout/fi/colemak
index d197797..489db80 100644
--- a/res/keyboard/layout/fi/colemak
+++ b/res/keyboard/layout/fi/colemak
@@ -4,10 +4,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/fi/colemak_classic b/res/keyboard/layout/fi/colemak_classic
index 6cf7cb7..26b29d7 100644
--- a/res/keyboard/layout/fi/colemak_classic
+++ b/res/keyboard/layout/fi/colemak_classic
@@ -4,10 +4,9 @@ information
   variant "Colemak, classic"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/fi/dvorak b/res/keyboard/layout/fi/dvorak
index d1745da..f1e6330 100644
--- a/res/keyboard/layout/fi/dvorak
+++ b/res/keyboard/layout/fi/dvorak
@@ -4,10 +4,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/fi/qwerty b/res/keyboard/layout/fi/qwerty
index 7362f9d..1d8bae8 100644
--- a/res/keyboard/layout/fi/qwerty
+++ b/res/keyboard/layout/fi/qwerty
@@ -4,10 +4,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/fi/qwerty_classic b/res/keyboard/layout/fi/qwerty_classic
index 5f49fa9..295e32f 100644
--- a/res/keyboard/layout/fi/qwerty_classic
+++ b/res/keyboard/layout/fi/qwerty_classic
@@ -4,10 +4,9 @@ information
   variant "QWERTY, classic"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/no/colemak b/res/keyboard/layout/no/colemak
index 05238a9..b969fea 100644
--- a/res/keyboard/layout/no/colemak
+++ b/res/keyboard/layout/no/colemak
@@ -6,10 +6,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -17,6 +16,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/no/dvorak b/res/keyboard/layout/no/dvorak
index 12b8278..031aedd 100644
--- a/res/keyboard/layout/no/dvorak
+++ b/res/keyboard/layout/no/dvorak
@@ -6,10 +6,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -17,6 +16,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/no/qwerty b/res/keyboard/layout/no/qwerty
index a2139a0..8807d24 100644
--- a/res/keyboard/layout/no/qwerty
+++ b/res/keyboard/layout/no/qwerty
@@ -6,10 +6,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -17,6 +16,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/sv/colemak b/res/keyboard/layout/sv/colemak
index 014ec4f..1e8ab6f 100644
--- a/res/keyboard/layout/sv/colemak
+++ b/res/keyboard/layout/sv/colemak
@@ -4,10 +4,9 @@ information
   variant "Colemak"
 end information
 
-include "../common/colemak"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/colemak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/sv/dvorak b/res/keyboard/layout/sv/dvorak
index 3d499b8..341e52b 100644
--- a/res/keyboard/layout/sv/dvorak
+++ b/res/keyboard/layout/sv/dvorak
@@ -4,10 +4,9 @@ information
   variant "Dvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/sv/programmer b/res/keyboard/layout/sv/programmer
index 9bfe055..1d4314b 100644
--- a/res/keyboard/layout/sv/programmer
+++ b/res/keyboard/layout/sv/programmer
@@ -9,10 +9,9 @@ end information
 # Do not forget the caps_is_ctrl mod.
 
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "|"
+end function
 function comma/0
   ","
 end function
@@ -20,6 +19,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/sv/pure b/res/keyboard/layout/sv/pure
index 101cb42..1408f19 100644
--- a/res/keyboard/layout/sv/pure
+++ b/res/keyboard/layout/sv/pure
@@ -8,10 +8,9 @@ end information
 # type speed when writing purely Swedish text.
 
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -19,6 +18,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/sv/qwerty b/res/keyboard/layout/sv/qwerty
index 15c1efc..e4a1509 100644
--- a/res/keyboard/layout/sv/qwerty
+++ b/res/keyboard/layout/sv/qwerty
@@ -4,10 +4,9 @@ information
   variant "QWERTY"
 end information
 
-include "../common/qwerty"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/qwerty"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/layout/sv/svdvorak b/res/keyboard/layout/sv/svdvorak
index 66ba082..768ecc4 100644
--- a/res/keyboard/layout/sv/svdvorak
+++ b/res/keyboard/layout/sv/svdvorak
@@ -4,10 +4,9 @@ information
   variant "Svdvorak"
 end information
 
-include "../common/dvorak"
-include "../common/base"
-
-
+function before_one/0
+  "§"
+end function
 function comma/0
   ","
 end function
@@ -15,6 +14,10 @@ function altcomma/0
   "."
 end function
 
+include "../common/dvorak"
+include "../common/base"
+
+
 macro mod_letter/2
   <letter \1> : "\1"
   <shift letter \1> : "\2"
diff --git a/res/keyboard/mods/invert_keypad b/res/keyboard/mods/invert_keypad
index 3e688ab..a31064d 100644
--- a/res/keyboard/mods/invert_keypad
+++ b/res/keyboard/mods/invert_keypad
@@ -1,20 +1,20 @@
-<num keypad home> : "1"
-<num keypad up> : "2"
-<num keypad pgup> : "3"
-<num keypad left> : "4"
-<num keypad begin> : "5"
-<num keypad right> : "6"
-<num keypad end> : "7"
-<num keypad down> : "8"
-<num keypad pgdown> : "9"
+<num keypad home> : "\digit(1)"
+<num keypad up> : "\digit(2)"
+<num keypad pgup> : "\digit(3)"
+<num keypad left> : "\digit(4)"
+<num keypad begin> : "\digit(5)"
+<num keypad right> : "\digit(6)"
+<num keypad end> : "\digit(7)"
+<num keypad down> : "\digit(8)"
+<num keypad pgdown> : "\digit(9)"
 
-<shift keypad home> : "1"
-<shift keypad up> : "2"
-<shift keypad pgup> : "3"
-<shift keypad left> : "4"
-<shift keypad begin> : "5"
-<shift keypad right> : "6"
-<shift keypad end> : "7"
-<shift keypad down> : "8"
-<shift keypad pgdown> : "9"
+<shift keypad home> : "\digit(1)"
+<shift keypad up> : "\digit(2)"
+<shift keypad pgup> : "\digit(3)"
+<shift keypad left> : "\digit(4)"
+<shift keypad begin> : "\digit(5)"
+<shift keypad right> : "\digit(6)"
+<shift keypad end> : "\digit(7)"
+<shift keypad down> : "\digit(8)"
+<shift keypad pgdown> : "\digit(9)"
 
diff --git a/res/keyboard/mods/zero_before_one b/res/keyboard/mods/zero_before_one
new file mode 100644
index 0000000..1563e85
--- /dev/null
+++ b/res/keyboard/mods/zero_before_one
@@ -0,0 +1,3 @@
+<letter \before_one()> : "\digit(0)"
+<letter \digit(0)> : "\before_one()"
+
diff --git a/res/keyboard/mods/zero_to_nine b/res/keyboard/mods/zero_to_nine
new file mode 100644
index 0000000..d3d6e86
--- /dev/null
+++ b/res/keyboard/mods/zero_to_nine
@@ -0,0 +1,11 @@
+<letter \digit(1)> : "\digit(0)"
+<letter \digit(2)> : "\digit(1)"
+<letter \digit(3)> : "\digit(2)"
+<letter \digit(4)> : "\digit(3)"
+<letter \digit(5)> : "\digit(4)"
+<letter \digit(6)> : "\digit(5)"
+<letter \digit(7)> : "\digit(6)"
+<letter \digit(8)> : "\digit(7)"
+<letter \digit(9)> : "\digit(8)"
+<letter \digit(0)> : "\digit(9)"
+
diff --git a/res/keyboard/mods/zero_to_nine_asomiya_bengali b/res/keyboard/mods/zero_to_nine_asomiya_bengali
deleted file mode 100644
index c1faa85..0000000
--- a/res/keyboard/mods/zero_to_nine_asomiya_bengali
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "০"
-<keycode 3> : "১"
-<keycode 4> : "২"
-<keycode 5> : "৩"
-<keycode 6> : "৪"
-<keycode 7> : "৫"
-<keycode 8> : "৬"
-<keycode 9> : "৭"
-<keycode 10> : "৮"
-<keycode 11> : "৯"
-
diff --git a/res/keyboard/mods/zero_to_nine_burmese b/res/keyboard/mods/zero_to_nine_burmese
deleted file mode 100644
index c2701e0..0000000
--- a/res/keyboard/mods/zero_to_nine_burmese
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "၀"
-<keycode 3> : "၁"
-<keycode 4> : "၂"
-<keycode 5> : "၃"
-<keycode 6> : "၄"
-<keycode 7> : "၅"
-<keycode 8> : "၆"
-<keycode 9> : "၇"
-<keycode 10> : "၈"
-<keycode 11> : "၉"
-
diff --git a/res/keyboard/mods/zero_to_nine_chinese b/res/keyboard/mods/zero_to_nine_chinese
deleted file mode 100644
index fc9f9df..0000000
--- a/res/keyboard/mods/zero_to_nine_chinese
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "〇"
-<keycode 3> : "一"
-<keycode 4> : "二"
-<keycode 5> : "三"
-<keycode 6> : "四"
-<keycode 7> : "五"
-<keycode 8> : "六"
-<keycode 9> : "七"
-<keycode 10> : "八"
-<keycode 11> : "九"
-
diff --git a/res/keyboard/mods/zero_to_nine_devanagari b/res/keyboard/mods/zero_to_nine_devanagari
deleted file mode 100644
index c83d68f..0000000
--- a/res/keyboard/mods/zero_to_nine_devanagari
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "०"
-<keycode 3> : "१"
-<keycode 4> : "२"
-<keycode 5> : "३"
-<keycode 6> : "४"
-<keycode 7> : "५"
-<keycode 8> : "६"
-<keycode 9> : "७"
-<keycode 10> : "८"
-<keycode 11> : "९"
-
diff --git a/res/keyboard/mods/zero_to_nine_east_arabic b/res/keyboard/mods/zero_to_nine_east_arabic
deleted file mode 100644
index 5924c62..0000000
--- a/res/keyboard/mods/zero_to_nine_east_arabic
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "٠"
-<keycode 3> : "١"
-<keycode 4> : "٢"
-<keycode 5> : "٣"
-<keycode 6> : "٤"
-<keycode 7> : "٥"
-<keycode 8> : "٦"
-<keycode 9> : "٧"
-<keycode 10> : "٨"
-<keycode 11> : "٩"
-
diff --git a/res/keyboard/mods/zero_to_nine_gujarati b/res/keyboard/mods/zero_to_nine_gujarati
deleted file mode 100644
index 60e7428..0000000
--- a/res/keyboard/mods/zero_to_nine_gujarati
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "૦"
-<keycode 3> : "૧"
-<keycode 4> : "૨"
-<keycode 5> : "૩"
-<keycode 6> : "૪"
-<keycode 7> : "૫"
-<keycode 8> : "૬"
-<keycode 9> : "૭"
-<keycode 10> : "૮"
-<keycode 11> : "૯"
-
diff --git a/res/keyboard/mods/zero_to_nine_gurmukhi b/res/keyboard/mods/zero_to_nine_gurmukhi
deleted file mode 100644
index a326e5e..0000000
--- a/res/keyboard/mods/zero_to_nine_gurmukhi
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "੦"
-<keycode 3> : "੧"
-<keycode 4> : "੨"
-<keycode 5> : "੩"
-<keycode 6> : "੪"
-<keycode 7> : "੫"
-<keycode 8> : "੬"
-<keycode 9> : "੭"
-<keycode 10> : "੮"
-<keycode 11> : "੯"
-
diff --git a/res/keyboard/mods/zero_to_nine_kannada b/res/keyboard/mods/zero_to_nine_kannada
deleted file mode 100644
index bb38aa8..0000000
--- a/res/keyboard/mods/zero_to_nine_kannada
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "೦"
-<keycode 3> : "೧"
-<keycode 4> : "೨"
-<keycode 5> : "೩"
-<keycode 6> : "೪"
-<keycode 7> : "೫"
-<keycode 8> : "೬"
-<keycode 9> : "೭"
-<keycode 10> : "೮"
-<keycode 11> : "೯"
-
diff --git a/res/keyboard/mods/zero_to_nine_khmer b/res/keyboard/mods/zero_to_nine_khmer
deleted file mode 100644
index 790bae5..0000000
--- a/res/keyboard/mods/zero_to_nine_khmer
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "០"
-<keycode 3> : "១"
-<keycode 4> : "២"
-<keycode 5> : "៣"
-<keycode 6> : "៤"
-<keycode 7> : "៥"
-<keycode 8> : "៦"
-<keycode 9> : "៧"
-<keycode 10> : "៨"
-<keycode 11> : "៩"
-
diff --git a/res/keyboard/mods/zero_to_nine_lao b/res/keyboard/mods/zero_to_nine_lao
deleted file mode 100644
index e5f81c6..0000000
--- a/res/keyboard/mods/zero_to_nine_lao
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "໐"
-<keycode 3> : "໑"
-<keycode 4> : "໒"
-<keycode 5> : "໓"
-<keycode 6> : "໔"
-<keycode 7> : "໕"
-<keycode 8> : "໖"
-<keycode 9> : "໗"
-<keycode 10> : "໘"
-<keycode 11> : "໙"
-
diff --git a/res/keyboard/mods/zero_to_nine_limbu b/res/keyboard/mods/zero_to_nine_limbu
deleted file mode 100644
index 6590954..0000000
--- a/res/keyboard/mods/zero_to_nine_limbu
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "᥆"
-<keycode 3> : "᥇"
-<keycode 4> : "᥈"
-<keycode 5> : "᥉"
-<keycode 6> : "᥊"
-<keycode 7> : "᥋"
-<keycode 8> : "᥌"
-<keycode 9> : "᥍"
-<keycode 10> : "᥎"
-<keycode 11> : "᥏"
-
diff --git a/res/keyboard/mods/zero_to_nine_malayalam b/res/keyboard/mods/zero_to_nine_malayalam
deleted file mode 100644
index 4961d71..0000000
--- a/res/keyboard/mods/zero_to_nine_malayalam
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "൦"
-<keycode 3> : "൧"
-<keycode 4> : "൨"
-<keycode 5> : "൩"
-<keycode 6> : "൪"
-<keycode 7> : "൫"
-<keycode 8> : "൬"
-<keycode 9> : "൭"
-<keycode 10> : "൮"
-<keycode 11> : "൯"
-
diff --git a/res/keyboard/mods/zero_to_nine_mongolian b/res/keyboard/mods/zero_to_nine_mongolian
deleted file mode 100644
index ea57aa6..0000000
--- a/res/keyboard/mods/zero_to_nine_mongolian
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "᠐"
-<keycode 3> : "᠑"
-<keycode 4> : "᠒"
-<keycode 5> : "᠓"
-<keycode 6> : "᠔"
-<keycode 7> : "᠕"
-<keycode 8> : "᠖"
-<keycode 9> : "᠗"
-<keycode 10> : "᠘"
-<keycode 11> : "᠙"
-
diff --git a/res/keyboard/mods/zero_to_nine_nepali b/res/keyboard/mods/zero_to_nine_nepali
deleted file mode 100644
index c83d68f..0000000
--- a/res/keyboard/mods/zero_to_nine_nepali
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "०"
-<keycode 3> : "१"
-<keycode 4> : "२"
-<keycode 5> : "३"
-<keycode 6> : "४"
-<keycode 7> : "५"
-<keycode 8> : "६"
-<keycode 9> : "७"
-<keycode 10> : "८"
-<keycode 11> : "९"
-
diff --git a/res/keyboard/mods/zero_to_nine_oriya b/res/keyboard/mods/zero_to_nine_oriya
deleted file mode 100644
index 84f9ece..0000000
--- a/res/keyboard/mods/zero_to_nine_oriya
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "୦"
-<keycode 3> : "୧"
-<keycode 4> : "୨"
-<keycode 5> : "୩"
-<keycode 6> : "୪"
-<keycode 7> : "୫"
-<keycode 8> : "୬"
-<keycode 9> : "୭"
-<keycode 10> : "୮"
-<keycode 11> : "୯"
-
diff --git a/res/keyboard/mods/zero_to_nine_persian b/res/keyboard/mods/zero_to_nine_persian
deleted file mode 100644
index b1bcd00..0000000
--- a/res/keyboard/mods/zero_to_nine_persian
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "٠"
-<keycode 3> : "١"
-<keycode 4> : "٢"
-<keycode 5> : "٣"
-<keycode 6> : "۴"
-<keycode 7> : "۵"
-<keycode 8> : "۶"
-<keycode 9> : "٧"
-<keycode 10> : "٨"
-<keycode 11> : "٩"
-
diff --git a/res/keyboard/mods/zero_to_nine_suzhou b/res/keyboard/mods/zero_to_nine_suzhou
deleted file mode 100644
index b4669ec..0000000
--- a/res/keyboard/mods/zero_to_nine_suzhou
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "〇"
-<keycode 3> : "〡"
-<keycode 4> : "〢"
-<keycode 5> : "〣"
-<keycode 6> : "〤"
-<keycode 7> : "〥"
-<keycode 8> : "〦"
-<keycode 9> : "〧"
-<keycode 10> : "〨"
-<keycode 11> : "〩"
-
diff --git a/res/keyboard/mods/zero_to_nine_tamil b/res/keyboard/mods/zero_to_nine_tamil
deleted file mode 100644
index 2009fcd..0000000
--- a/res/keyboard/mods/zero_to_nine_tamil
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "௦"
-<keycode 3> : "௧"
-<keycode 4> : "௨"
-<keycode 5> : "௩"
-<keycode 6> : "௪"
-<keycode 7> : "௫"
-<keycode 8> : "௬"
-<keycode 9> : "௭"
-<keycode 10> : "௮"
-<keycode 11> : "௯"
-
diff --git a/res/keyboard/mods/zero_to_nine_telugu b/res/keyboard/mods/zero_to_nine_telugu
deleted file mode 100644
index 9022b4e..0000000
--- a/res/keyboard/mods/zero_to_nine_telugu
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "౦"
-<keycode 3> : "౧"
-<keycode 4> : "౨"
-<keycode 5> : "౩"
-<keycode 6> : "౪"
-<keycode 7> : "౫"
-<keycode 8> : "౬"
-<keycode 9> : "౭"
-<keycode 10> : "౮"
-<keycode 11> : "౯"
-
diff --git a/res/keyboard/mods/zero_to_nine_thai b/res/keyboard/mods/zero_to_nine_thai
deleted file mode 100644
index 89802b7..0000000
--- a/res/keyboard/mods/zero_to_nine_thai
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "๐"
-<keycode 3> : "๑"
-<keycode 4> : "๒"
-<keycode 5> : "๓"
-<keycode 6> : "๔"
-<keycode 7> : "๕"
-<keycode 8> : "๖"
-<keycode 9> : "๗"
-<keycode 10> : "๘"
-<keycode 11> : "๙"
-
diff --git a/res/keyboard/mods/zero_to_nine_tibetan b/res/keyboard/mods/zero_to_nine_tibetan
deleted file mode 100644
index 853a19f..0000000
--- a/res/keyboard/mods/zero_to_nine_tibetan
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "༠"
-<keycode 3> : "༡"
-<keycode 4> : "༢"
-<keycode 5> : "༣"
-<keycode 6> : "༤"
-<keycode 7> : "༥"
-<keycode 8> : "༦"
-<keycode 9> : "༧"
-<keycode 10> : "༨"
-<keycode 11> : "༩"
-
diff --git a/res/keyboard/mods/zero_to_nine_west_arabic b/res/keyboard/mods/zero_to_nine_west_arabic
deleted file mode 100644
index 3f2f477..0000000
--- a/res/keyboard/mods/zero_to_nine_west_arabic
+++ /dev/null
@@ -1,11 +0,0 @@
-<keycode 2> : "0"
-<keycode 3> : "1"
-<keycode 4> : "2"
-<keycode 5> : "3"
-<keycode 6> : "4"
-<keycode 7> : "5"
-<keycode 8> : "6"
-<keycode 9> : "7"
-<keycode 10> : "8"
-<keycode 11> : "9"
-