updated mecab dictionary. work around nvdajp ticket 32140

diff --git a/include/jtalk/custom_dic_maker.py b/include/jtalk/custom_dic_maker.py
index 2ce8a02..3f24b69 100644 (file)
--- a/include/jtalk/custom_dic_maker.py
+++ b/include/jtalk/custom_dic_maker.py
@@ -272,6 +272,8 @@ jdic = [
         'pos':"感動詞,*,*,*,*,*"\r
         },\r
 \r
+       {'text':'テンカイ', 'braille':'テンカイ'},\r
+\r
        ['きゃ', 'キャ',            "1/1",          15000,          "記号,一般,*,*,*,*"],\r
        ['きゅ', 'キュ',            "1/1",          15000,          "記号,一般,*,*,*,*"],\r
        ['きょ', 'キョ',            "1/1",          15000,          "記号,一般,*,*,*,*"],\r

diff --git a/include/jtalk/make_jdic.py b/include/jtalk/make_jdic.py
index d9e3728..db5cda1 100644 (file)
--- a/include/jtalk/make_jdic.py
+++ b/include/jtalk/make_jdic.py
@@ -98,8 +98,11 @@ def filter_jdic(s):
        elif a[0] == '繕う' and a[12] == 'ツクロウ':\r
                a[12] = 'ツクロー'\r
                s = ",".join(a)\r
-       elif a[0] == '大きい' and a[12] == 'オーキイ':\r
-               a[12] = 'オオキイ'\r
+       elif a[0] in ('大きい', 'おおきい') and a[12] == 'オーキイ' and len(a) == 15:\r
+               a.append('オオキイ')\r
+               s = ",".join(a)\r
+       elif a[0] in ('大まか', 'おおまか') and a[12] == 'オーマカ' and len(a) == 15:\r
+               a.append('オオマカ')\r
                s = ",".join(a)\r
        elif a[0] == '仰せ' and a[12] == 'オーセ':\r
                a[12] = 'オオセ'\r

diff --git a/jptools/harness.py b/jptools/harness.py
index 25a0c65..827d1a8 100644 (file)
--- a/jptools/harness.py
+++ b/jptools/harness.py
@@ -1246,6 +1246,27 @@ tests = [
                'inpos1': [0,1,2,3],\r
                },\r
        {\r
+               'comment': '点訳のてびき第3版 第2章 その1 1 5',\r
+               'text': 'おおきい',\r
+               'input': 'オオキイ',\r
+               'output': '⠊⠊⠣⠃',\r
+               'inpos1': [0,1,2,3],\r
+               },\r
+       {\r
+               'comment': '点訳のてびき第3版 第2章 その1 1 5 「大きい」の派生語',\r
+               'text': '大まか',\r
+               'input': 'オオマカ',\r
+               'output': '⠊⠊⠵⠡',\r
+               'inpos1': [0,1,2,3],\r
+               },\r
+       {\r
+               'comment': '点訳のてびき第3版 第2章 その1 1 5 「大きい」の派生語',\r
+               'text': 'おおまか',\r
+               'input': 'オオマカ',\r
+               'output': '⠊⠊⠵⠡',\r
+               'inpos1': [0,1,2,3],\r
+               },\r
+       {\r
                'comment': '点訳のてびき第3版 第2章 その1 1 5 No.62',\r
                'text': '仰せ',\r
                'input': 'オオセ',\r

diff --git a/jptools/mecabHarness.py b/jptools/mecabHarness.py
index 2d086bf..64e18b0 100644 (file)
--- a/jptools/mecabHarness.py
+++ b/jptools/mecabHarness.py
@@ -369,4 +369,7 @@ tasks = [
        {'text':'ありがとう', 'braille':'アリガトー'},\r
        {'text':'有り難う', 'braille':'アリガトー'},\r
        {'text':'有り難うございました', 'braille':'アリガトー/ゴザイ/マシ/タ'},\r
+\r
+       {'text':'展開', 'braille':'テンカイ'},\r
+       {'text':'テンカイ', 'braille':'テンカイ'},\r
 ]\r

diff --git a/source/synthDrivers/jtalk/dic/DIC_VERSION b/source/synthDrivers/jtalk/dic/DIC_VERSION
index a6a7042..f1ae93e 100644 (file)
--- a/source/synthDrivers/jtalk/dic/DIC_VERSION
+++ b/source/synthDrivers/jtalk/dic/DIC_VERSION
@@ -1 +1 @@
-nvdajp-jtalk-dic (utf-8) 20131106-022733\r
+nvdajp-jtalk-dic (utf-8) 20131107-044457\r

diff --git a/source/synthDrivers/jtalk/dic/sys.dic b/source/synthDrivers/jtalk/dic/sys.dic
index 21ffd58..26fdd11 100644 (file)
Binary files a/source/synthDrivers/jtalk/dic/sys.dic and b/source/synthDrivers/jtalk/dic/sys.dic differ

diff --git a/source/synthDrivers/jtalk/dic/unk.dic b/source/synthDrivers/jtalk/dic/unk.dic
index a2dd426..aaf88e5 100644 (file)
Binary files a/source/synthDrivers/jtalk/dic/unk.dic and b/source/synthDrivers/jtalk/dic/unk.dic differ