From 41eb4ac9c8bf9e5961a7b97b87e0db37714f2375 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Thu, 11 Dec 2014 16:19:04 +0100
Subject: m + fix errors in layout files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 res/keyboard/layout/common/base              | 12 ++++++++++++
 res/keyboard/layout/es/latin_american_dvorak | 12 ++++++------
 res/keyboard/layout/fi/colemak_classic       |  2 +-
 res/keyboard/layout/fi/qwerty_classic        |  2 +-
 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"
-- 
cgit v1.2.3-70-g09d2