modify digit rules

Author: uratec

src/njd_set_digit/njd_set_digit.c

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */

src/njd_set_digit/njd_set_digit.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */

src/njd_set_digit/njd_set_digit_rule_ascii_for_euc_jp.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -306,7 +306,7 @@ static const char *njd_set_digit_rule_numerative_class1g[] = {
    "\xb3\xf4", "\xb4\xa7", "\xb4\xac", "\xb4\xcc", "\xb4\xd3", "\xb4\xd3\xcc\xdc", "\xb4\xd6", "\xb4\xf0", "\xb4\xfc", "\xb4\xfc\xc0\xb8", "\xb5\xa1", "\xb5\xa4\xb0\xb5", "\xb5\xa8", "\xb5\xb3",
    "\xb5\xd2", "\xb5\xd3", "\xb5\xe5", "\xb5\xe9", "\xb6\xb6", "\xb6\xc9", "\xb6\xca", "\xb6\xcb", "\xbd\xc5\xa4\xcd", "\xb6\xd4", "\xb6\xe2", "\xb6\xe7", "\xb6\xe8", "\xb6\xed", "\xb7\xd7",
    "\xb7\xe5", "\xa5\xb1\xa5\xbf", "\xb9\xbb", "\xb9\xc1", "\xb9\xd4", "\xb9\xe0", "\xc1\xc8", "\xb7\xef", "\xb8\xae", "\xb8\xc0", "\xb8\xcd", "\xb8\xd0", "\xb8\xf7\xc7\xaf", "\xc0\xd0",
-   "\xa4\xd4\xa4\xad", "\xa4\xda\xa4\xf3", "\xc7\xc8", "\xc7\xc9", "\xc7\xd4", "\xc7\xd5", "\xc7\xef", "\xc7\xf1", "\xc8\xc7", "\xc8\xc8", "\xc8\xc9", "\xc9\xa4", "\xc9\xa4", "\xc9\xae", "\xc9\xb6",
+   "\xa4\xd4\xa4\xad", "\xa4\xda\xa4\xf3", "\xc7\xc8", "\xc7\xc9", "\xc7\xd4", "\xc7\xd5", "\xc7\xef", "\xc7\xf1", "\xc8\xc7", "\xc8\xc8", "\xc8\xc9", "\xc9\xa4", "\xc9\xa5", "\xc9\xae", "\xc9\xb6",
    "\xc9\xbc", "\xc9\xca", "\xca\xac\xb4\xd6", "\xca\xac\xcc\xdc", "\xca\xd2", "\xca\xd2", "\xca\xd3", "\xca\xd4", "\xca\xd5", "\xca\xd7", "\xca\xe2", "\xca\xe2", "\xca\xf3", "\xca\xfd", "\xca\xfd",
    "\xcb\xa1", "\xcb\xdc\xce\xa9\xa4\xc6", "\xc6\xac\xbf\xc8",
    NULL
@@ -420,7 +420,7 @@ static const char *njd_set_digit_rule_conv_table2b[] = {
 
 static const char *njd_set_digit_rule_numerative_class2c[] = {
    /* from paper */
-   "\xcb\xdc", "\xc9\xa4", "\xc9\xbc", "\xc9\xb6", "\xc8\xa2",
+   "\xcb\xdc", "\xc9\xa4", "\xc9\xa5", "\xc9\xbc", "\xc9\xb6", "\xc8\xa2",
    /* from dictionary */
    "\xcb\xdc\xce\xa9\xa4\xc6", "\xc7\xd5", "\xbf\xcb", "\xc3\xec",
    NULL

src/njd_set_digit/njd_set_digit_rule_ascii_for_shift_jis.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -306,7 +306,7 @@ static const char *njd_set_digit_rule_numerative_class1g[] = {
    "\x8a\x94", "\x8a\xa5", "\x8a\xaa", "\x8a\xca", "\x8a\xd1", "\x8a\xd1\x96\xda", "\x8a\xd4", "\x8a\xee", "\x8a\xfa", "\x8a\xfa\x90\xb6", "\x8b\x40", "\x8b\x43\x88\xb3", "\x8b\x47", "\x8b\x52",
    "\x8b\x71", "\x8b\x72", "\x8b\x85", "\x8b\x89", "\x8b\xb4", "\x8b\xc7", "\x8b\xc8", "\x8b\xc9", "\x8f\x64\x82\xcb", "\x8b\xd2", "\x8b\xe0", "\x8b\xe5", "\x8b\xe6", "\x8b\xeb", "\x8c\x76",
    "\x8c\x85", "\x83\x50\x83\x5e", "\x8d\x5a", "\x8d\x60", "\x8d\x73", "\x8d\x80", "\x91\x67", "\x8c\x8f", "\x8c\xac", "\x8c\xbe", "\x8c\xcb", "\x8c\xce", "\x8c\xf5\x94\x4e", "\x90\xce",
-   "\x82\xd2\x82\xab", "\x82\xd8\x82\xf1", "\x94\x67", "\x94\x68", "\x94\x73", "\x94\x74", "\x94\x8f", "\x94\x91", "\x94\xc5", "\x94\xc6", "\x94\xc7", "\x95\x43", "\x95\x43", "\x95\x4d", "\x95\x55",
+   "\x82\xd2\x82\xab", "\x82\xd8\x82\xf1", "\x94\x67", "\x94\x68", "\x94\x73", "\x94\x74", "\x94\x8f", "\x94\x91", "\x94\xc5", "\x94\xc6", "\x94\xc7", "\x95\x43", "\x95\x44", "\x95\x4d", "\x95\x55",
    "\x95\x5b", "\x95\x69", "\x95\xaa\x8a\xd4", "\x95\xaa\x96\xda", "\x95\xd0", "\x95\xd0", "\x95\xd1", "\x95\xd2", "\x95\xd3", "\x95\xd5", "\x95\xe0", "\x95\xe0", "\x95\xf1", "\x95\xfb", "\x95\xfb",
    "\x96\x40", "\x96\x7b\x97\xa7\x82\xc4", "\x93\xaa\x90\x67",
    NULL
@@ -420,7 +420,7 @@ static const char *njd_set_digit_rule_conv_table2b[] = {
 
 static const char *njd_set_digit_rule_numerative_class2c[] = {
    /* from paper */
-   "\x96\x7b", "\x95\x43", "\x95\x5b", "\x95\x55", "\x94\xa0",
+   "\x96\x7b", "\x95\x43", "\x95\x44", "\x95\x5b", "\x95\x55", "\x94\xa0",
    /* from dictionary */
    "\x96\x7b\x97\xa7\x82\xc4", "\x94\x74", "\x90\x6a", "\x92\x8c",
    NULL

src/njd_set_digit/njd_set_digit_rule_ascii_for_utf_8.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -306,7 +306,7 @@ static const char *njd_set_digit_rule_numerative_class1g[] = {
    "\xe6\xa0\xaa", "\xe5\x86\xa0", "\xe5\xb7\xbb", "\xe7\xbc\xb6", "\xe8\xb2\xab", "\xe8\xb2\xab\xe7\x9b\xae", "\xe9\x96\x93", "\xe5\x9f\xba", "\xe6\x9c\x9f", "\xe6\x9c\x9f\xe7\x94\x9f", "\xe6\xa9\x9f", "\xe6\xb0\x97\xe5\x9c\xa7", "\xe5\xad\xa3", "\xe9\xa8\x8e",
    "\xe5\xae\xa2", "\xe8\x84\x9a", "\xe7\x90\x83", "\xe7\xb4\x9a", "\xe6\xa9\x8b", "\xe5\xb1\x80", "\xe6\x9b\xb2", "\xe6\xa5\xb5", "\xe9\x87\x8d\xe3\x81\xad", "\xe6\x96\xa4", "\xe9\x87\x91", "\xe5\x8f\xa5", "\xe5\x8c\xba", "\xe8\xba\xaf", "\xe8\xa8\x88",
    "\xe6\xa1\x81", "\xe3\x82\xb1\xe3\x82\xbf", "\xe6\xa0\xa1", "\xe6\xb8\xaf", "\xe8\xa1\x8c", "\xe9\xa0\x85", "\xe7\xb5\x84", "\xe4\xbb\xb6", "\xe8\xbb\x92", "\xe8\xa8\x80", "\xe6\x88\xb8", "\xe6\xb9\x96", "\xe5\x85\x89\xe5\xb9\xb4", "\xe7\x9f\xb3",
-   "\xe3\x81\xb4\xe3\x81\x8d", "\xe3\x81\xba\xe3\x82\x93", "\xe6\xb3\xa2", "\xe6\xb4\xbe", "\xe6\x95\x97", "\xe6\x9d\xaf", "\xe6\x8b\x8d", "\xe6\xb3\x8a", "\xe7\x89\x88", "\xe7\x8a\xaf", "\xe7\x8f\xad", "\xe5\x8c\xb9", "\xe5\x8c\xb9", "\xe7\xad\x86", "\xe4\xbf\xb5",
+   "\xe3\x81\xb4\xe3\x81\x8d", "\xe3\x81\xba\xe3\x82\x93", "\xe6\xb3\xa2", "\xe6\xb4\xbe", "\xe6\x95\x97", "\xe6\x9d\xaf", "\xe6\x8b\x8d", "\xe6\xb3\x8a", "\xe7\x89\x88", "\xe7\x8a\xaf", "\xe7\x8f\xad", "\xe5\x8c\xb9", "\xe7\x96\x8b", "\xe7\xad\x86", "\xe4\xbf\xb5",
    "\xe7\xa5\xa8", "\xe5\x93\x81", "\xe5\x88\x86\xe9\x96\x93", "\xe5\x88\x86\xe7\x9b\xae", "\xe7\x89\x87", "\xe7\x89\x87", "\xe7\xaf\x87", "\xe7\xb7\xa8", "\xe8\xbe\xba", "\xe9\x81\x8d", "\xe6\xad\xa9", "\xe6\xad\xa9", "\xe5\xa0\xb1", "\xe6\x96\xb9", "\xe6\x96\xb9",
    "\xe6\xb3\x95", "\xe6\x9c\xac\xe7\xab\x8b\xe3\x81\xa6", "\xe9\xa0\xad\xe8\xba\xab",
    NULL
@@ -420,7 +420,7 @@ static const char *njd_set_digit_rule_conv_table2b[] = {
 
 static const char *njd_set_digit_rule_numerative_class2c[] = {
    /* from paper */
-   "\xe6\x9c\xac", "\xe5\x8c\xb9", "\xe7\xa5\xa8", "\xe4\xbf\xb5", "\xe7\xae\xb1",
+   "\xe6\x9c\xac", "\xe5\x8c\xb9", "\xe7\x96\x8b", "\xe7\xa5\xa8", "\xe4\xbf\xb5", "\xe7\xae\xb1",
    /* from dictionary */
    "\xe6\x9c\xac\xe7\xab\x8b\xe3\x81\xa6", "\xe6\x9d\xaf", "\xe9\x87\x9d", "\xe6\x9f\xb1",
    NULL

src/njd_set_digit/njd_set_digit_rule_euc_jp.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -306,7 +306,7 @@ static const char *njd_set_digit_rule_numerative_class1g[] = {
    "株", "冠", "巻", "缶", "貫", "貫目", "間", "基", "期", "期生", "機", "気圧", "季", "騎",
    "客", "脚", "球", "級", "橋", "局", "曲", "極", "重ね", "斤", "金", "句", "区", "躯", "計",
    "桁", "ケタ", "校", "港", "行", "項", "組", "件", "軒", "言", "戸", "湖", "光年", "石",
-   "ぴき", "ぺん", "波", "派", "敗", "杯", "拍", "泊", "版", "犯", "班", "匹", "匹", "筆", "俵",
+   "ぴき", "ぺん", "波", "派", "敗", "杯", "拍", "泊", "版", "犯", "班", "匹", "疋", "筆", "俵",
    "票", "品", "分間", "分目", "片", "片", "篇", "編", "辺", "遍", "歩", "歩", "報", "方", "方",
    "法", "本立て", "頭身",
    NULL
@@ -420,7 +420,7 @@ static const char *njd_set_digit_rule_conv_table2b[] = {
 
 static const char *njd_set_digit_rule_numerative_class2c[] = {
    /* from paper */
-   "本", "匹", "票", "俵", "箱",
+   "本", "匹", "疋", "票", "俵", "箱",
    /* from dictionary */
    "本立て", "杯", "針", "柱",
    NULL

src/njd_set_digit/njd_set_digit_rule_shift_jis.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -306,7 +306,7 @@ static const char *njd_set_digit_rule_numerative_class1g[] = {
    "株", "冠", "巻", "缶", "貫", "貫目", "間", "基", "期", "期生", "機", "気圧", "季", "騎",
    "客", "脚", "球", "級", "橋", "局", "曲", "極", "重ね", "斤", "金", "句", "区", "躯", "計",
    "桁", "ケタ", "校", "港", "行", "項", "組", "件", "軒", "言", "戸", "湖", "光年", "石",
-   "ぴき", "ぺん", "波", "派", "敗", "杯", "拍", "泊", "版", "犯", "班", "匹", "匹", "筆", "俵",
+   "ぴき", "ぺん", "波", "派", "敗", "杯", "拍", "泊", "版", "犯", "班", "匹", "疋", "筆", "俵",
    "票", "品", "分間", "分目", "片", "片", "篇", "編", "辺", "遍", "歩", "歩", "報", "方", "方",
    "法", "本立て", "頭身",
    NULL
@@ -420,7 +420,7 @@ static const char *njd_set_digit_rule_conv_table2b[] = {
 
 static const char *njd_set_digit_rule_numerative_class2c[] = {
    /* from paper */
-   "本", "匹", "票", "俵", "箱",
+   "本", "匹", "疋", "票", "俵", "箱",
    /* from dictionary */
    "本立て", "杯", "針", "柱",
    NULL

src/njd_set_digit/njd_set_digit_rule_utf_8.h

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2015  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -306,7 +306,7 @@ static const char *njd_set_digit_rule_numerative_class1g[] = {
    "株", "冠", "巻", "缶", "貫", "貫目", "間", "基", "期", "期生", "機", "気圧", "季", "騎",
    "客", "脚", "球", "級", "橋", "局", "曲", "極", "重ね", "斤", "金", "句", "区", "躯", "計",
    "桁", "ケタ", "校", "港", "行", "項", "組", "件", "軒", "言", "戸", "湖", "光年", "石",
-   "ぴき", "ぺん", "波", "派", "敗", "杯", "拍", "泊", "版", "犯", "班", "匹", "匹", "筆", "俵",
+   "ぴき", "ぺん", "波", "派", "敗", "杯", "拍", "泊", "版", "犯", "班", "匹", "疋", "筆", "俵",
    "票", "品", "分間", "分目", "片", "片", "篇", "編", "辺", "遍", "歩", "歩", "報", "方", "方",
    "法", "本立て", "頭身",
    NULL
@@ -420,7 +420,7 @@ static const char *njd_set_digit_rule_conv_table2b[] = {
 
 static const char *njd_set_digit_rule_numerative_class2c[] = {
    /* from paper */
-   "本", "匹", "票", "俵", "箱",
+   "本", "匹", "疋", "票", "俵", "箱",
    /* from dictionary */
    "本立て", "杯", "針", "柱",
    NULL