From 20a5eab89f11d3943ab667487599b749e85eb3aa Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 24 Oct 2014 18:49:38 +0200 Subject: kbd misc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- res/keyboard/layout/ast/colemak | 11 ++++--- res/keyboard/layout/ast/dvorak | 11 ++++--- res/keyboard/layout/ast/qwerty | 11 ++++--- res/keyboard/layout/ca/colemak | 11 ++++--- res/keyboard/layout/ca/dvorak | 11 ++++--- res/keyboard/layout/ca/qwerty | 11 ++++--- res/keyboard/layout/common/keypad | 40 +++++++++++++------------- res/keyboard/layout/common/latin | 26 ++++++++++++++++- res/keyboard/layout/da/colemak | 11 ++++--- res/keyboard/layout/da/dvorak | 11 ++++--- res/keyboard/layout/da/qwerty | 11 ++++--- res/keyboard/layout/es/colemak | 11 ++++--- res/keyboard/layout/es/dvorak | 11 ++++--- res/keyboard/layout/es/latin_american_colemak | 11 ++++--- res/keyboard/layout/es/latin_american_dvorak | 11 ++++--- res/keyboard/layout/es/latin_american_qwerty | 11 ++++--- res/keyboard/layout/es/qwerty | 11 ++++--- res/keyboard/layout/fi/colemak | 11 ++++--- res/keyboard/layout/fi/colemak_classic | 11 ++++--- res/keyboard/layout/fi/dvorak | 11 ++++--- res/keyboard/layout/fi/qwerty | 11 ++++--- res/keyboard/layout/fi/qwerty_classic | 11 ++++--- res/keyboard/layout/no/colemak | 11 ++++--- res/keyboard/layout/no/dvorak | 11 ++++--- res/keyboard/layout/no/qwerty | 11 ++++--- res/keyboard/layout/sv/colemak | 11 ++++--- res/keyboard/layout/sv/dvorak | 11 ++++--- res/keyboard/layout/sv/programmer | 11 ++++--- res/keyboard/layout/sv/pure | 11 ++++--- res/keyboard/layout/sv/qwerty | 11 ++++--- res/keyboard/layout/sv/svdvorak | 11 ++++--- res/keyboard/mods/invert_keypad | 36 +++++++++++------------ res/keyboard/mods/zero_before_one | 3 ++ res/keyboard/mods/zero_to_nine | 11 +++++++ res/keyboard/mods/zero_to_nine_asomiya_bengali | 11 ------- res/keyboard/mods/zero_to_nine_burmese | 11 ------- res/keyboard/mods/zero_to_nine_chinese | 11 ------- res/keyboard/mods/zero_to_nine_devanagari | 11 ------- res/keyboard/mods/zero_to_nine_east_arabic | 11 ------- res/keyboard/mods/zero_to_nine_gujarati | 11 ------- res/keyboard/mods/zero_to_nine_gurmukhi | 11 ------- res/keyboard/mods/zero_to_nine_kannada | 11 ------- res/keyboard/mods/zero_to_nine_khmer | 11 ------- res/keyboard/mods/zero_to_nine_lao | 11 ------- res/keyboard/mods/zero_to_nine_limbu | 11 ------- res/keyboard/mods/zero_to_nine_malayalam | 11 ------- res/keyboard/mods/zero_to_nine_mongolian | 11 ------- res/keyboard/mods/zero_to_nine_nepali | 11 ------- res/keyboard/mods/zero_to_nine_oriya | 11 ------- res/keyboard/mods/zero_to_nine_persian | 11 ------- res/keyboard/mods/zero_to_nine_suzhou | 11 ------- res/keyboard/mods/zero_to_nine_tamil | 11 ------- res/keyboard/mods/zero_to_nine_telugu | 11 ------- res/keyboard/mods/zero_to_nine_thai | 11 ------- res/keyboard/mods/zero_to_nine_tibetan | 11 ------- res/keyboard/mods/zero_to_nine_west_arabic | 11 ------- src/mds-kbdc/mds-kbdc.c | 10 +++++-- 57 files changed, 288 insertions(+), 399 deletions(-) create mode 100644 res/keyboard/mods/zero_before_one create mode 100644 res/keyboard/mods/zero_to_nine delete mode 100644 res/keyboard/mods/zero_to_nine_asomiya_bengali delete mode 100644 res/keyboard/mods/zero_to_nine_burmese delete mode 100644 res/keyboard/mods/zero_to_nine_chinese delete mode 100644 res/keyboard/mods/zero_to_nine_devanagari delete mode 100644 res/keyboard/mods/zero_to_nine_east_arabic delete mode 100644 res/keyboard/mods/zero_to_nine_gujarati delete mode 100644 res/keyboard/mods/zero_to_nine_gurmukhi delete mode 100644 res/keyboard/mods/zero_to_nine_kannada delete mode 100644 res/keyboard/mods/zero_to_nine_khmer delete mode 100644 res/keyboard/mods/zero_to_nine_lao delete mode 100644 res/keyboard/mods/zero_to_nine_limbu delete mode 100644 res/keyboard/mods/zero_to_nine_malayalam delete mode 100644 res/keyboard/mods/zero_to_nine_mongolian delete mode 100644 res/keyboard/mods/zero_to_nine_nepali delete mode 100644 res/keyboard/mods/zero_to_nine_oriya delete mode 100644 res/keyboard/mods/zero_to_nine_persian delete mode 100644 res/keyboard/mods/zero_to_nine_suzhou delete mode 100644 res/keyboard/mods/zero_to_nine_tamil delete mode 100644 res/keyboard/mods/zero_to_nine_telugu delete mode 100644 res/keyboard/mods/zero_to_nine_thai delete mode 100644 res/keyboard/mods/zero_to_nine_tibetan delete mode 100644 res/keyboard/mods/zero_to_nine_west_arabic 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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 @@ - : "7" - : "8" - : "9" - : "4" - : "5" - : "6" - : "1" - : "2" - : "3" - : "0" + : "\digit(7)" + : "\digit(8)" + : "\digit(9)" + : "\digit(4)" + : "\digit(5)" + : "\digit(6)" + : "\digit(1)" + : "\digit(2)" + : "\digit(3)" + : "\digit(0)" : "\comma()" : @@ -22,16 +22,16 @@ : : - : "7" - : "8" - : "9" - : "4" - : "5" - : "6" - : "1" - : "2" - : "3" - : "0" + : "\digit(7)" + : "\digit(8)" + : "\digit(9)" + : "\digit(4)" + : "\digit(5)" + : "\digit(6)" + : "\digit(1)" + : "\digit(2)" + : "\digit(3)" + : "\digit(0)" : "\comma()" : "↖" 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 - : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 : "\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 @@ - : "1" - : "2" - : "3" - : "4" - : "5" - : "6" - : "7" - : "8" - : "9" + : "\digit(1)" + : "\digit(2)" + : "\digit(3)" + : "\digit(4)" + : "\digit(5)" + : "\digit(6)" + : "\digit(7)" + : "\digit(8)" + : "\digit(9)" - : "1" - : "2" - : "3" - : "4" - : "5" - : "6" - : "7" - : "8" - : "9" + : "\digit(1)" + : "\digit(2)" + : "\digit(3)" + : "\digit(4)" + : "\digit(5)" + : "\digit(6)" + : "\digit(7)" + : "\digit(8)" + : "\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 @@ + : "\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 @@ + : "\digit(0)" + : "\digit(1)" + : "\digit(2)" + : "\digit(3)" + : "\digit(4)" + : "\digit(5)" + : "\digit(6)" + : "\digit(7)" + : "\digit(8)" + : "\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 @@ - : "০" - : "১" - : "২" - : "৩" - : "৪" - : "৫" - : "৬" - : "৭" - : "৮" - : "৯" - 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 @@ - : "၀" - : "၁" - : "၂" - : "၃" - : "၄" - : "၅" - : "၆" - : "၇" - : "၈" - : "၉" - 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 @@ - : "〇" - : "一" - : "二" - : "三" - : "四" - : "五" - : "六" - : "七" - : "八" - : "九" - 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 @@ - : "०" - : "१" - : "२" - : "३" - : "४" - : "५" - : "६" - : "७" - : "८" - : "९" - 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 @@ - : "٠" - : "١" - : "٢" - : "٣" - : "٤" - : "٥" - : "٦" - : "٧" - : "٨" - : "٩" - 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 @@ - : "૦" - : "૧" - : "૨" - : "૩" - : "૪" - : "૫" - : "૬" - : "૭" - : "૮" - : "૯" - 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 @@ - : "੦" - : "੧" - : "੨" - : "੩" - : "੪" - : "੫" - : "੬" - : "੭" - : "੮" - : "੯" - 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 @@ - : "೦" - : "೧" - : "೨" - : "೩" - : "೪" - : "೫" - : "೬" - : "೭" - : "೮" - : "೯" - 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 @@ - : "០" - : "១" - : "២" - : "៣" - : "៤" - : "៥" - : "៦" - : "៧" - : "៨" - : "៩" - 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 @@ - : "໐" - : "໑" - : "໒" - : "໓" - : "໔" - : "໕" - : "໖" - : "໗" - : "໘" - : "໙" - 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 @@ - : "᥆" - : "᥇" - : "᥈" - : "᥉" - : "᥊" - : "᥋" - : "᥌" - : "᥍" - : "᥎" - : "᥏" - 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 @@ - : "൦" - : "൧" - : "൨" - : "൩" - : "൪" - : "൫" - : "൬" - : "൭" - : "൮" - : "൯" - 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 @@ - : "᠐" - : "᠑" - : "᠒" - : "᠓" - : "᠔" - : "᠕" - : "᠖" - : "᠗" - : "᠘" - : "᠙" - 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 @@ - : "०" - : "१" - : "२" - : "३" - : "४" - : "५" - : "६" - : "७" - : "८" - : "९" - 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 @@ - : "୦" - : "୧" - : "୨" - : "୩" - : "୪" - : "୫" - : "୬" - : "୭" - : "୮" - : "୯" - 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 @@ - : "٠" - : "١" - : "٢" - : "٣" - : "۴" - : "۵" - : "۶" - : "٧" - : "٨" - : "٩" - 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 @@ - : "〇" - : "〡" - : "〢" - : "〣" - : "〤" - : "〥" - : "〦" - : "〧" - : "〨" - : "〩" - 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 @@ - : "௦" - : "௧" - : "௨" - : "௩" - : "௪" - : "௫" - : "௬" - : "௭" - : "௮" - : "௯" - 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 @@ - : "౦" - : "౧" - : "౨" - : "౩" - : "౪" - : "౫" - : "౬" - : "౭" - : "౮" - : "౯" - 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 @@ - : "๐" - : "๑" - : "๒" - : "๓" - : "๔" - : "๕" - : "๖" - : "๗" - : "๘" - : "๙" - 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 @@ - : "༠" - : "༡" - : "༢" - : "༣" - : "༤" - : "༥" - : "༦" - : "༧" - : "༨" - : "༩" - 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 @@ - : "0" - : "1" - : "2" - : "3" - : "4" - : "5" - : "6" - : "7" - : "8" - : "9" - diff --git a/src/mds-kbdc/mds-kbdc.c b/src/mds-kbdc/mds-kbdc.c index 2cc6cff..608d0b4 100644 --- a/src/mds-kbdc/mds-kbdc.c +++ b/src/mds-kbdc/mds-kbdc.c @@ -95,14 +95,20 @@ int main(int argc_, char** argv_) \set(\6 \8 \add(\rsh(\get(\6 \8) \8) \mul(2 \rsh(\get(\7 \8))))) end for - if \equals(\and(\1 128)) - let \2 : \or(\2 64) + if \or(\equals(\1 0) \equals(\1 "0")) + "0" + else if \or(\equals(\1 1) \equals(\1 "1")) + "1" + else + "9" end if if \and(\1 128) ## a number is true iff it is not zero let \2 : \or(\2 64) end if + : <-altgr ultra> + */ source_code_destroy(&source_code); -- cgit v1.2.3-70-g09d2