diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-12-11 16:19:04 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-12-11 16:19:04 +0100 |
| commit | 41eb4ac9c8bf9e5961a7b97b87e0db37714f2375 (patch) | |
| tree | 2131d540f18b6fac9ca2c8b2d01789e34b9dd7ee | |
| parent | whitespace (diff) | |
| download | mds-41eb4ac9c8bf9e5961a7b97b87e0db37714f2375.tar.gz mds-41eb4ac9c8bf9e5961a7b97b87e0db37714f2375.tar.bz2 mds-41eb4ac9c8bf9e5961a7b97b87e0db37714f2375.tar.xz | |
m + fix errors in layout files
Signed-off-by: Mattias Andrée <maandree@operamail.com>
| -rw-r--r-- | res/keyboard/layout/common/base | 12 | ||||
| -rw-r--r-- | res/keyboard/layout/es/latin_american_dvorak | 12 | ||||
| -rw-r--r-- | res/keyboard/layout/fi/colemak_classic | 2 | ||||
| -rw-r--r-- | res/keyboard/layout/fi/qwerty_classic | 2 | ||||
| -rw-r--r-- | src/mds-kbdc/compile-layout.c | 1 |
5 files changed, 21 insertions, 8 deletions
diff --git a/res/keyboard/layout/common/base b/res/keyboard/layout/common/base index 40bca3a..eb78fd1 100644 --- a/res/keyboard/layout/common/base +++ b/res/keyboard/layout/common/base @@ -1,3 +1,15 @@ +assumption + function digit/1 + \add(\1 "0") + end function + function comma/0 + "," + end function + function altcomma/0 + "." + end function +end assumption + include "control_keys" include "keypad" include "../../compose/dead" diff --git a/res/keyboard/layout/es/latin_american_dvorak b/res/keyboard/layout/es/latin_american_dvorak index ff839d7..ec8c672 100644 --- a/res/keyboard/layout/es/latin_american_dvorak +++ b/res/keyboard/layout/es/latin_american_dvorak @@ -143,12 +143,12 @@ nocaps("r" "®" "™") caps("t" "þ" "Þ") caps("n" "ŋ" "Ŋ") nocaps("s" "ß" "§") -<letter {"> : "{" -<shift letter {"> : "[" -<altgr letter {"> : <dead letter `> -<altgr shift letter {"> : <dead letter ¨> -<letter }"> : "}" -<shift letter }"> : "]" +<letter \{> : "{" +<shift letter \{> : "[" +<altgr letter \{> : <dead letter `> +<altgr shift letter \{> : <dead letter ¨> +<letter \}> : "}" +<shift letter \}> : "]" caps("}" "ç" "Ç") diff --git a/res/keyboard/layout/fi/colemak_classic b/res/keyboard/layout/fi/colemak_classic index 26b29d7..5d80a9f 100644 --- a/res/keyboard/layout/fi/colemak_classic +++ b/res/keyboard/layout/fi/colemak_classic @@ -122,7 +122,7 @@ key("<" ">" "|" "¦") <altgr "T"> : "Þ" <altgr letter y> : "←" -<altgr shift letter y> : →" +<altgr shift letter y> : "→" <altgr letter u> : "↓" <altgr shift letter u> : "↑" diff --git a/res/keyboard/layout/fi/qwerty_classic b/res/keyboard/layout/fi/qwerty_classic index 295e32f..65b497b 100644 --- a/res/keyboard/layout/fi/qwerty_classic +++ b/res/keyboard/layout/fi/qwerty_classic @@ -144,7 +144,7 @@ key("<" ">" "|" "¦") <altgr "A"> : "Ə" <altgr "s"> : "š" -<altgr "S"> : "Š +<altgr "S"> : "Š" <altgr "d"> : "ð" <altgr "D"> : "Ð" diff --git a/src/mds-kbdc/compile-layout.c b/src/mds-kbdc/compile-layout.c index f8202a6..32acf80 100644 --- a/src/mds-kbdc/compile-layout.c +++ b/src/mds-kbdc/compile-layout.c @@ -18,6 +18,7 @@ #include "compile-layout.h" /* TODO add call stack */ /* XXX fix so that for-loops do not generate the same errors/warnings in all iterations [loopy_error]. */ +/* XXX add pragma support */ #include "include-stack.h" #include "builtin-functions.h" |