apply patch from Hideaki ABE.

1 files changed, 42 insertions, 11 deletions

diff --git a/engine/tables.py b/engine/tables.py
index 6a19979..bd77920 100644
--- a/engine/tables.py
+++ b/engine/tables.py
@@ -21,7 +21,7 @@
 
 # string, result, cont
 romaji_typing_rule = {
-    u"-" : u"ー",
+    u"-" : u"－",
     u"a" : u"あ",
     u"i" : u"い",
     u"u" : u"う",
@@ -188,6 +188,11 @@ romaji_typing_rule = {
     u"fu" : u"ふ",
     u"fe" : u"ふぇ",
     u"fo" : u"ふぉ",
+    u"fya" : u"ふゃ",
+    u"fyi" : u"ふぃ",
+    u"fyu" : u"ふゅ",
+    u"fye" : u"ふぇ",
+    u"fyo" : u"ふょ",
     u"ma" : u"ま",
     u"mi" : u"み",
     u"mu" : u"む",
@@ -232,21 +237,21 @@ symbol_rule = {
     u","  : u"、",
     u"."  : u"。",
     u"!"  : u"！",
-    u"\"" : u"”",
+    u"\"" : u"＂",
     u"#"  : u"＃",
     u"$"  : u"＄",
     u"%"  : u"％",
     u"&"  : u"＆",
-    u"'"  : u"’",
+    u"'"  : u"＇",
     u"("  : u"（",
     u")"  : u"）",
-    u"~"  : u"〜",
-    u"-"  : u"ー",
+    u"~"  : u"～",
+    u"-"  : u"－",
     u"="  : u"＝",
     u"^"  : u"＾",
     u"\\" : u"＼",
     u"|"  : u"｜",
-    u"`"  : u"‘",
+    u"`"  : u"｀",
     u"@"  : u"＠",
     u"{"  : u"｛",
     u"["  : u"「",
@@ -262,6 +267,18 @@ symbol_rule = {
     u"/"  : u"／",
     u"_"  : u"＿",
     u"¥"  : u"￥",
+
+    # numbers
+    u'0': u'０',
+    u'1': u'１',
+    u'2': u'２',
+    u'3': u'３',
+    u'4': u'４',
+    u'5': u'５',
+    u'6': u'６',
+    u'7': u'７',
+    u'8': u'８',
+    u'9': u'９',
 }
 
 # this is only used with romaji_typing_rule
@@ -308,6 +325,8 @@ romaji_correction_rule = {
     u"nx" : (u"ん", u"x"),
     u"nz" : (u"ん", u"z"),
     u"n\0" : (u"ん", u""),
+    u"n," : (u"ん", u","),
+    u"n." : (u"ん", u"."),
 }
 
 # a port of 101kana.sty from scim-anthy
@@ -420,7 +439,7 @@ kana_typing_rule = {
     u"?" : u"・",
     u"_" : u"ろ",
 
-    u"¥" : u"ー",
+    u"¥" : u"－",
 }
 
 kana_voiced_consonant_rule = {
@@ -565,20 +584,20 @@ hiragana_katakana_table = {
     u"、" : (u"、", u"､"),
     u"。" : (u"。", u"｡"),
     u"！" : (u"！", u"!"),
-    u"”"  : (u"”", u"\""),
+    u"＂" : (u"＂", u"\""),
     u"＃" : (u"＃", u"#"),
     u"＄" : (u"＄", u"$"),
     u"％" : (u"％", u"%"),
     u"＆" : (u"＆", u"&"),
-    u"’"  : (u"’", u"'"),
+    u"＇" : (u"＇", u"'"),
     u"（" : (u"（", u"("),
     u"）" : (u"）", u")"),
-    u"〜" : (u"〜", u"~"),
+    u"～" : (u"～", u"~"),
     u"＝" : (u"＝", u"="),
     u"＾" : (u"＾", u"^"),
     u"＼" : (u"＼", u"\\"),
     u"｜" : (u"｜", u"|"),
-    u"‘"  : (u"‘", u"`"),
+    u"｀" : (u"｀", u"`"),
     u"＠" : (u"＠", u"@"),
     u"｛" : (u"｛", u"{"),
     u"「" : (u"「", u"｢"),
@@ -594,4 +613,16 @@ hiragana_katakana_table = {
     u"／" : (u"／", u"/"),
     u"＿" : (u"＿", u"_"),
     u"￥" : (u"￥", u"¥"),
+
+    # numbers
+    u'０': (u'０', u'0'),
+    u'１': (u'１', u'1'),
+    u'２': (u'２', u'2'),
+    u'３': (u'３', u'3'),
+    u'４': (u'４', u'4'),
+    u'５': (u'５', u'5'),
+    u'６': (u'６', u'6'),
+    u'７': (u'７', u'7'),
+    u'８': (u'８', u'8'),
+    u'９': (u'９', u'9'),
 }