kbd misc

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

31 files changed, 248 insertions, 137 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"