rebased master and fixed some issues.

jg1uaa · May 11, 2015 · 68ad4b5 · 68ad4b5
1 parent a792dcf
commit 68ad4b5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/data/rules/atok/Makefile.am b/data/rules/atok/Makefile.am
@@ -9,24 +9,16 @@ files =						\
 	keymap/wide-latin.json			\
 	keymap/direct.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json                           \
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/atok/keymap/default.json b/data/rules/atok/keymap/default.json
@@ -6,13 +6,13 @@
         "keymap": {
             "C-[": "abort",
             "C-g": "delete-forward",
-            "C-q": "null",
+            "C-q": null,
             "C-F7": "register",
             "C-Down": "next-candidate",
             "S-space": "next-candidate",
             "S-Henkan_Mode": "next-candidate",
             "C-Up": "previous-candidate",
-            "Muhenkan": "null",
+            "Muhenkan": null,
             "C-l": "expand-segment",
             "C-k": "shrink-segment",
             "Right": "expand-segment",

diff --git a/data/rules/atok/metadata.json b/data/rules/atok/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "ATOK",
+    "description": "The commercial Input Method ATOK like style",
+    "priority": 90
+}
diff --git a/data/rules/atok/metadata.json.in b/data/rules/atok/metadata.json.in
diff --git a/data/rules/atok/rom-kana/default.json b/data/rules/atok/rom-kana/default.json
@@ -21,7 +21,7 @@
             "wyi": ["", "ゐ" ],
             "xye": ["", "ぇ" ],
             "yi": ["", "い" ],
-            "zya": ["", "null" ],
+            "zya": ["", null ],
             "/": ["", "・", "／"]
        }
     }

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -2,6 +2,7 @@ libkkc/keymap.vala
 tools/kkc.vala
 data/rules/tutcode/metadata.pot
 data/rules/azik/metadata.pot
+data/rules/atok/metadata.pot
 data/rules/trycode/metadata.pot
 data/rules/default/metadata.pot
 data/rules/azik-jp106/metadata.pot