kbd misc

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

2 files changed, 45 insertions, 21 deletions

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