Menu
▾
▴
[open-jtalk-cvs] open_jtalk/src/njd_set_pronunciation njd_set_pronunciation.c, 1.10, 1.11 njd_set_pronunciation.h, 1.8, 1.9 njd_set_pronunciation_rule_ascii_for_euc_jp.h, 1.4, 1.5 njd_set_pronunciation_rule_ascii_for_shift_jis.h, 1.4, 1.5 njd_set_pronunciation_rule_ascii_for_utf_8.h, 1.4, 1.5 njd_set_pronunciation_rule_euc_jp.h, 1.10, 1.11 njd_set_pronunciation_rule_shift_jis.h, 1.10, 1.11 njd_set_pronunciation_rule_utf_8.h, 1.10, 1.11
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 03:54:51
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23707/njd_set_pronunciation Modified Files: njd_set_pronunciation.c njd_set_pronunciation.h njd_set_pronunciation_rule_ascii_for_euc_jp.h njd_set_pronunciation_rule_ascii_for_shift_jis.h njd_set_pronunciation_rule_ascii_for_utf_8.h njd_set_pronunciation_rule_euc_jp.h njd_set_pronunciation_rule_shift_jis.h njd_set_pronunciation_rule_utf_8.h Log Message: update copyright. modify digit rules. assume unknown input as pause. Index: njd_set_pronunciation_rule_ascii_for_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_utf_8.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** njd_set_pronunciation_rule_ascii_for_utf_8.h 22 Dec 2014 02:08:53 -0000 1.4 --- njd_set_pronunciation_rule_ascii_for_utf_8.h 23 Dec 2015 03:54:48 -0000 1.5 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 137,141 **** "\xe3\x83\x87\xe3\x83\xa5", "\xe3\x83\x87\xe3\x83\xa5", "1", "\xe3\x83\x87\xe3\x83\xa3", "\xe3\x83\x87\xe3\x83\xa3", "1", - "\xe3\x83\x87\xe3\x82\xa7", "\xe3\x83\x87\xe3\x82\xa7", "1", "\xe3\x83\x87\xe3\x82\xa3", "\xe3\x83\x87\xe3\x82\xa3", "1", "\xe3\x83\x87", "\xe3\x83\x87", "1", --- 137,140 ---- *************** *** 212,215 **** --- 211,222 ---- "\xe3\x82\xa2", "\xe3\x82\xa2", "1", "\xe3\x82\xa1", "\xe3\x82\xa1", "1", + "\xe3\x82\x94\xe3\x82\x87", "\xe3\x83\xb4\xe3\x83\xa7", "1", + "\xe3\x82\x94\xe3\x82\x85", "\xe3\x83\xb4\xe3\x83\xa5", "1", + "\xe3\x82\x94\xe3\x82\x83", "\xe3\x83\xb4\xe3\x83\xa3", "1", + "\xe3\x82\x94\xe3\x81\x89", "\xe3\x83\xb4\xe3\x82\xa9", "1", + "\xe3\x82\x94\xe3\x81\x87", "\xe3\x83\xb4\xe3\x82\xa7", "1", + "\xe3\x82\x94\xe3\x81\x83", "\xe3\x83\xb4\xe3\x82\xa3", "1", + "\xe3\x82\x94\xe3\x81\x81", "\xe3\x83\xb4\xe3\x82\xa1", "1", + "\xe3\x82\x94", "\xe3\x83\xb4", "1", "\xe3\x82\x93", "\xe3\x83\xb3", "1", "\xe3\x82\x92", "\xe3\x83\xb2", "1", *************** *** 288,292 **** "\xe3\x81\xa7\xe3\x82\x85", "\xe3\x83\x87\xe3\x83\xa5", "1", "\xe3\x81\xa7\xe3\x82\x83", "\xe3\x83\x87\xe3\x83\xa3", "1", - "\xe3\x81\xa7\xe3\x81\x87", "\xe3\x83\x87\xe3\x82\xa7", "1", "\xe3\x81\xa7\xe3\x81\x83", "\xe3\x83\x87\xe3\x82\xa3", "1", "\xe3\x81\xa7", "\xe3\x83\x87", "1", --- 295,298 ---- *************** *** 388,392 **** "\xef\xbd\x83", "\xe3\x82\xb7\xe3\x83\xbc", "2", "\xef\xbd\x82", "\xe3\x83\x93\xe3\x83\xbc", "2", ! "\xef\xbd\x81", "\xe3\x82\xa8\xe3\x82\xa4", "2", "\xef\xbc\xba", "\xe3\x82\xba\xe3\x82\xa3\xe3\x83\xbc", "2", "\xef\xbc\xb9", "\xe3\x83\xaf\xe3\x82\xa4", "2", --- 394,398 ---- "\xef\xbd\x83", "\xe3\x82\xb7\xe3\x83\xbc", "2", "\xef\xbd\x82", "\xe3\x83\x93\xe3\x83\xbc", "2", ! "\xef\xbd\x81", "\xe3\x82\xa8\xe3\x83\xbc", "2", "\xef\xbc\xba", "\xe3\x82\xba\xe3\x82\xa3\xe3\x83\xbc", "2", "\xef\xbc\xb9", "\xe3\x83\xaf\xe3\x82\xa4", "2", *************** *** 414,418 **** "\xef\xbc\xa3", "\xe3\x82\xb7\xe3\x83\xbc", "2", "\xef\xbc\xa2", "\xe3\x83\x93\xe3\x83\xbc", "2", ! "\xef\xbc\xa1", "\xe3\x82\xa8\xe3\x82\xa4", "2", "\xe3\x83\xbc", "\xe3\x83\xbc", "1", NULL, NULL, NULL --- 420,424 ---- "\xef\xbc\xa3", "\xe3\x82\xb7\xe3\x83\xbc", "2", "\xef\xbc\xa2", "\xe3\x83\x93\xe3\x83\xbc", "2", ! "\xef\xbc\xa1", "\xe3\x82\xa8\xe3\x83\xbc", "2", "\xe3\x83\xbc", "\xe3\x83\xbc", "1", NULL, NULL, NULL *************** *** 423,514 **** static const char *njd_set_pronunciation_symbol_list[] = { - "\xe3\x80\x80", "\xe3\x80\x81", - "\xe3\x80\x81", "\xe3\x80\x81", - "\xe3\x80\x82", "\xe3\x80\x81", - "\xef\xbc\x8c", "\xe3\x80\x81", - "\xef\xbc\x8e", "\xe3\x80\x81", - "\xe3\x83\xbb", "\xe3\x80\x81", - "\xef\xbc\x9a", "\xe3\x80\x81", - "\xef\xbc\x9b", "\xe3\x80\x81", "\xef\xbc\x9f", "\xef\xbc\x9f", - "\xef\xbc\x81", "\xe3\x80\x81", - "\xe3\x82\x9b", "\xe3\x80\x81", - "\xe3\x82\x9c", "\xe3\x80\x81", - "\xc2\xb4", "\xe3\x80\x81", - "\xef\xbd\x80", "\xe3\x80\x81", - "\xc2\xa8", "\xe3\x80\x81", - "\xef\xbc\xbe", "\xe3\x80\x81", - "\xef\xbf\xa3", "\xe3\x80\x81", - "\xef\xbc\xbf", "\xe3\x80\x81", - "\xe3\x83\xbd", "\xe3\x80\x81", - "\xe3\x83\xbe", "\xe3\x80\x81", - "\xe3\x82\x9d", "\xe3\x80\x81", - "\xe3\x82\x9e", "\xe3\x80\x81", - "\xe3\x80\x83", "\xe3\x80\x81", - "\xe4\xbb\x9d", "\xe3\x80\x81", - "\xe3\x80\x85", "\xe3\x80\x81", - "\xe3\x80\x85\xe3\x80\x85", "\xe3\x80\x81", - "\xe3\x80\x86", "\xe3\x80\x81", - "\xe3\x80\x87", "\xe3\x80\x81", - "\xe2\x80\x95", "\xe3\x80\x81", - "\xe2\x80\x95\xe2\x80\x95", "\xe3\x80\x81", - "\xe2\x80\x90", "\xe3\x80\x81", - "\xef\xbc\x8f", "\xe3\x80\x81", - "\xef\xbc\xbc", "\xe3\x80\x81", - "\xe3\x80\x9c", "\xe3\x80\x81", - "\xe2\x80\x96", "\xe3\x80\x81", - "\xef\xbd\x9c", "\xe3\x80\x81", - "\xe2\x80\xa6", "\xe3\x80\x81", - "\xe2\x80\xa5", "\xe3\x80\x81", - "\xe2\x80\x98", "\xe3\x80\x81", - "\xe2\x80\x99", "\xe3\x80\x81", - "\xe2\x80\x9c", "\xe3\x80\x81", - "\xe2\x80\x9d", "\xe3\x80\x81", - "\xef\xbc\x88", "\xe3\x80\x81", - "\xef\xbc\x89", "\xe3\x80\x81", - "\xe3\x80\x94", "\xe3\x80\x81", - "\xe3\x80\x95", "\xe3\x80\x81", - "\xef\xbc\xbb", "\xe3\x80\x81", - "\xef\xbc\xbd", "\xe3\x80\x81", - "\xef\xbd\x9b", "\xe3\x80\x81", - "\xef\xbd\x9d", "\xe3\x80\x81", - "\xe3\x80\x88", "\xe3\x80\x81", - "\xe3\x80\x89", "\xe3\x80\x81", - "\xe3\x80\x8a", "\xe3\x80\x81", - "\xe3\x80\x8b", "\xe3\x80\x81", - "\xe3\x80\x8c", "\xe3\x80\x81", - "\xe3\x80\x8d", "\xe3\x80\x81", - "\xe3\x80\x8e", "\xe3\x80\x81", - "\xe3\x80\x8f", "\xe3\x80\x81", - "\xe3\x80\x90", "\xe3\x80\x81", - "\xe3\x80\x91", "\xe3\x80\x81", - "\xe2\x88\x92\xe2\x88\x92", "\xe3\x80\x81", - "\xef\xbc\x9d", "\xe3\x80\x81", - "\xef\xbc\x9c", "\xe3\x80\x81", - "\xef\xbc\x9e", "\xe3\x80\x81", - "\xe2\x80\xb2", "\xe3\x80\x81", - "\xef\xbc\x8a", "\xe3\x80\x81", - "\xe2\x98\x86", "\xe3\x80\x81", - "\xe2\x98\x85", "\xe3\x80\x81", - "\xe2\x97\x8b", "\xe3\x80\x81", - "\xe2\x97\x8f", "\xe3\x80\x81", - "\xe2\x97\x8e", "\xe3\x80\x81", - "\xe2\x97\x87", "\xe3\x80\x81", - "\xe2\x97\x86", "\xe3\x80\x81", - "\xe2\x96\xa1", "\xe3\x80\x81", - "\xe2\x96\xa0", "\xe3\x80\x81", - "\xe2\x96\xb3", "\xe3\x80\x81", - "\xe2\x96\xb2", "\xe3\x80\x81", - "\xe2\x96\xbd", "\xe3\x80\x81", - "\xe2\x96\xbc", "\xe3\x80\x81", - "\xe2\x80\xbb", "\xe3\x80\x81", - "\xe2\x86\x92", "\xe3\x80\x81", - "\xe2\x86\x90", "\xe3\x80\x81", - "\xe2\x86\x91", "\xe3\x80\x81", - "\xe2\x86\x93", "\xe3\x80\x81", - "\xe3\x80\x93", "\xe3\x80\x81", - "\xe2\x94\x80", "\xe3\x80\x81", - "\xe2\x94\x80\xe2\x94\x80", "\xe3\x80\x81", - "\xe2\x88\x92", "\xe3\x80\x81", NULL, NULL }; --- 429,433 ---- *************** *** 527,530 **** --- 446,451 ---- #define NJD_SET_PRONUNCIATION_MASU_PRON "\xe3\x83\x9e\xe3\x82\xb9" + #define NJD_SET_PRONUNCIATION_TOUTEN "\xe3\x80\x81" + NJD_SET_PRONUNCIATION_RULE_H_END; Index: njd_set_pronunciation_rule_ascii_for_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_euc_jp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** njd_set_pronunciation_rule_ascii_for_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.4 --- njd_set_pronunciation_rule_ascii_for_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.5 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 137,141 **** "\xa5\xc7\xa5\xe5", "\xa5\xc7\xa5\xe5", "1", "\xa5\xc7\xa5\xe3", "\xa5\xc7\xa5\xe3", "1", - "\xa5\xc7\xa5\xa7", "\xa5\xc7\xa5\xa7", "1", "\xa5\xc7\xa5\xa3", "\xa5\xc7\xa5\xa3", "1", "\xa5\xc7", "\xa5\xc7", "1", --- 137,140 ---- *************** *** 212,215 **** --- 211,222 ---- "\xa5\xa2", "\xa5\xa2", "1", "\xa5\xa1", "\xa5\xa1", "1", + "\xa5\xf4\xa4\xe7", "\xa5\xf4\xa5\xe7", "1", /* none in this charcode */ + "\xa5\xf4\xa4\xe5", "\xa5\xf4\xa5\xe5", "1", /* none in this charcode */ + "\xa5\xf4\xa4\xe3", "\xa5\xf4\xa5\xe3", "1", /* none in this charcode */ + "\xa5\xf4\xa4\xa9", "\xa5\xf4\xa5\xa9", "1", /* none in this charcode */ + "\xa5\xf4\xa4\xa7", "\xa5\xf4\xa5\xa7", "1", /* none in this charcode */ + "\xa5\xf4\xa4\xa3", "\xa5\xf4\xa5\xa3", "1", /* none in this charcode */ + "\xa5\xf4\xa4\xa1", "\xa5\xf4\xa5\xa1", "1", /* none in this charcode */ + "\xa5\xf4", "\xa5\xf4", "1", /* none in this charcode */ "\xa4\xf3", "\xa5\xf3", "1", "\xa4\xf2", "\xa5\xf2", "1", *************** *** 288,292 **** "\xa4\xc7\xa4\xe5", "\xa5\xc7\xa5\xe5", "1", "\xa4\xc7\xa4\xe3", "\xa5\xc7\xa5\xe3", "1", - "\xa4\xc7\xa4\xa7", "\xa5\xc7\xa5\xa7", "1", "\xa4\xc7\xa4\xa3", "\xa5\xc7\xa5\xa3", "1", "\xa4\xc7", "\xa5\xc7", "1", --- 295,298 ---- *************** *** 388,392 **** "\xa3\xe3", "\xa5\xb7\xa1\xbc", "2", "\xa3\xe2", "\xa5\xd3\xa1\xbc", "2", ! "\xa3\xe1", "\xa5\xa8\xa5\xa4", "2", "\xa3\xda", "\xa5\xba\xa5\xa3\xa1\xbc", "2", "\xa3\xd9", "\xa5\xef\xa5\xa4", "2", --- 394,398 ---- "\xa3\xe3", "\xa5\xb7\xa1\xbc", "2", "\xa3\xe2", "\xa5\xd3\xa1\xbc", "2", ! "\xa3\xe1", "\xa5\xa8\xa1\xbc", "2", "\xa3\xda", "\xa5\xba\xa5\xa3\xa1\xbc", "2", "\xa3\xd9", "\xa5\xef\xa5\xa4", "2", *************** *** 414,418 **** "\xa3\xc3", "\xa5\xb7\xa1\xbc", "2", "\xa3\xc2", "\xa5\xd3\xa1\xbc", "2", ! "\xa3\xc1", "\xa5\xa8\xa5\xa4", "2", "\xa1\xbc", "\xa1\xbc", "1", NULL, NULL, NULL --- 420,424 ---- "\xa3\xc3", "\xa5\xb7\xa1\xbc", "2", "\xa3\xc2", "\xa5\xd3\xa1\xbc", "2", ! "\xa3\xc1", "\xa5\xa8\xa1\xbc", "2", "\xa1\xbc", "\xa1\xbc", "1", NULL, NULL, NULL *************** *** 423,514 **** static const char *njd_set_pronunciation_symbol_list[] = { - "\xa1\xa1", "\xa1\xa2", - "\xa1\xa2", "\xa1\xa2", - "\xa1\xa3", "\xa1\xa2", - "\xa1\xa4", "\xa1\xa2", - "\xa1\xa5", "\xa1\xa2", - "\xa1\xa6", "\xa1\xa2", - "\xa1\xa7", "\xa1\xa2", - "\xa1\xa8", "\xa1\xa2", "\xa1\xa9", "\xa1\xa9", - "\xa1\xaa", "\xa1\xa2", - "\xa1\xab", "\xa1\xa2", - "\xa1\xac", "\xa1\xa2", - "\xa1\xad", "\xa1\xa2", - "\xa1\xae", "\xa1\xa2", - "\xa1\xaf", "\xa1\xa2", - "\xa1\xb0", "\xa1\xa2", - "\xa1\xb1", "\xa1\xa2", - "\xa1\xb2", "\xa1\xa2", - "\xa1\xb3", "\xa1\xa2", - "\xa1\xb4", "\xa1\xa2", - "\xa1\xb5", "\xa1\xa2", - "\xa1\xb6", "\xa1\xa2", - "\xa1\xb7", "\xa1\xa2", - "\xa1\xb8", "\xa1\xa2", - "\xa1\xb9", "\xa1\xa2", - "\xa1\xb9\xa1\xb9", "\xa1\xa2", - "\xa1\xba", "\xa1\xa2", - "\xa1\xbb", "\xa1\xa2", - "\xa1\xbd", "\xa1\xa2", - "\xa1\xbd\xa1\xbd", "\xa1\xa2", - "\xa1\xbe", "\xa1\xa2", - "\xa1\xbf", "\xa1\xa2", - "\xa1\xc0", "\xa1\xa2", - "\xa1\xc1", "\xa1\xa2", - "\xa1\xc2", "\xa1\xa2", - "\xa1\xc3", "\xa1\xa2", - "\xa1\xc4", "\xa1\xa2", - "\xa1\xc5", "\xa1\xa2", - "\xa1\xc6", "\xa1\xa2", - "\xa1\xc7", "\xa1\xa2", - "\xa1\xc8", "\xa1\xa2", - "\xa1\xc9", "\xa1\xa2", - "\xa1\xca", "\xa1\xa2", - "\xa1\xcb", "\xa1\xa2", - "\xa1\xcc", "\xa1\xa2", - "\xa1\xcd", "\xa1\xa2", - "\xa1\xce", "\xa1\xa2", - "\xa1\xcf", "\xa1\xa2", - "\xa1\xd0", "\xa1\xa2", - "\xa1\xd1", "\xa1\xa2", - "\xa1\xd2", "\xa1\xa2", - "\xa1\xd3", "\xa1\xa2", - "\xa1\xd4", "\xa1\xa2", - "\xa1\xd5", "\xa1\xa2", - "\xa1\xd6", "\xa1\xa2", - "\xa1\xd7", "\xa1\xa2", - "\xa1\xd8", "\xa1\xa2", - "\xa1\xd9", "\xa1\xa2", - "\xa1\xda", "\xa1\xa2", - "\xa1\xdb", "\xa1\xa2", - "\xa1\xdd\xa1\xdd", "\xa1\xa2", - "\xa1\xe1", "\xa1\xa2", - "\xa1\xe3", "\xa1\xa2", - "\xa1\xe4", "\xa1\xa2", - "\xa1\xec", "\xa1\xa2", - "\xa1\xf6", "\xa1\xa2", - "\xa1\xf9", "\xa1\xa2", - "\xa1\xfa", "\xa1\xa2", - "\xa1\xfb", "\xa1\xa2", - "\xa1\xfc", "\xa1\xa2", - "\xa1\xfd", "\xa1\xa2", - "\xa1\xfe", "\xa1\xa2", - "\xa2\xa1", "\xa1\xa2", - "\xa2\xa2", "\xa1\xa2", - "\xa2\xa3", "\xa1\xa2", - "\xa2\xa4", "\xa1\xa2", - "\xa2\xa5", "\xa1\xa2", - "\xa2\xa6", "\xa1\xa2", - "\xa2\xa7", "\xa1\xa2", - "\xa2\xa8", "\xa1\xa2", - "\xa2\xaa", "\xa1\xa2", - "\xa2\xab", "\xa1\xa2", - "\xa2\xac", "\xa1\xa2", - "\xa2\xad", "\xa1\xa2", - "\xa2\xae", "\xa1\xa2", - "\xa8\xa1", "\xa1\xa2", - "\xa8\xa1\xa8\xa1", "\xa1\xa2", - "\xa1\xdd", "\xa1\xa2", NULL, NULL }; --- 429,433 ---- *************** *** 527,530 **** --- 446,451 ---- #define NJD_SET_PRONUNCIATION_MASU_PRON "\xa5\xde\xa5\xb9" + #define NJD_SET_PRONUNCIATION_TOUTEN "\xa1\xa2" + NJD_SET_PRONUNCIATION_RULE_H_END; Index: njd_set_pronunciation_rule_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation_rule_euc_jp.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** njd_set_pronunciation_rule_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.10 --- njd_set_pronunciation_rule_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.11 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 137,141 **** "¥Ç¥å", "¥Ç¥å", "1", "¥Ç¥ã", "¥Ç¥ã", "1", - "¥Ç¥§", "¥Ç¥§", "1", "¥Ç¥£", "¥Ç¥£", "1", "¥Ç", "¥Ç", "1", --- 137,140 ---- *************** *** 212,215 **** --- 211,222 ---- "¥¢", "¥¢", "1", "¥¡", "¥¡", "1", + "¥ô¤ç", "¥ô¥ç", "1", /* none in this charcode */ + "¥ô¤å", "¥ô¥å", "1", /* none in this charcode */ + "¥ô¤ã", "¥ô¥ã", "1", /* none in this charcode */ + "¥ô¤©", "¥ô¥©", "1", /* none in this charcode */ + "¥ô¤§", "¥ô¥§", "1", /* none in this charcode */ + "¥ô¤£", "¥ô¥£", "1", /* none in this charcode */ + "¥ô¤¡", "¥ô¥¡", "1", /* none in this charcode */ + "¥ô", "¥ô", "1", /* none in this charcode */ "¤ó", "¥ó", "1", "¤ò", "¥ò", "1", *************** *** 288,292 **** "¤Ç¤å", "¥Ç¥å", "1", "¤Ç¤ã", "¥Ç¥ã", "1", - "¤Ç¤§", "¥Ç¥§", "1", "¤Ç¤£", "¥Ç¥£", "1", "¤Ç", "¥Ç", "1", --- 295,298 ---- *************** *** 388,392 **** "£ã", "¥·¡¼", "2", "£â", "¥Ó¡¼", "2", ! "£á", "¥¨¥¤", "2", "£Ú", "¥º¥£¡¼", "2", "£Ù", "¥ï¥¤", "2", --- 394,398 ---- "£ã", "¥·¡¼", "2", "£â", "¥Ó¡¼", "2", ! "£á", "¥¨¡¼", "2", "£Ú", "¥º¥£¡¼", "2", "£Ù", "¥ï¥¤", "2", *************** *** 414,418 **** "£Ã", "¥·¡¼", "2", "£Â", "¥Ó¡¼", "2", ! "£Á", "¥¨¥¤", "2", "¡¼", "¡¼", "1", NULL, NULL, NULL --- 420,424 ---- "£Ã", "¥·¡¼", "2", "£Â", "¥Ó¡¼", "2", ! "£Á", "¥¨¡¼", "2", "¡¼", "¡¼", "1", NULL, NULL, NULL *************** *** 423,514 **** static const char *njd_set_pronunciation_symbol_list[] = { - "¡¡", "¡¢", - "¡¢", "¡¢", - "¡£", "¡¢", - "¡¤", "¡¢", - "¡¥", "¡¢", - "¡¦", "¡¢", - "¡§", "¡¢", - "¡¨", "¡¢", "¡©", "¡©", - "¡ª", "¡¢", - "¡«", "¡¢", - "¡¬", "¡¢", - "¡", "¡¢", - "¡®", "¡¢", - "¡¯", "¡¢", - "¡°", "¡¢", - "¡±", "¡¢", - "¡²", "¡¢", - "¡³", "¡¢", - "¡´", "¡¢", - "¡µ", "¡¢", - "¡¶", "¡¢", - "¡·", "¡¢", - "¡¸", "¡¢", - "¡¹", "¡¢", - "¡¹¡¹", "¡¢", - "¡º", "¡¢", - "¡»", "¡¢", - "¡½", "¡¢", - "¡½¡½", "¡¢", - "¡¾", "¡¢", - "¡¿", "¡¢", - "¡À", "¡¢", - "¡Á", "¡¢", - "¡Â", "¡¢", - "¡Ã", "¡¢", - "¡Ä", "¡¢", - "¡Å", "¡¢", - "¡Æ", "¡¢", - "¡Ç", "¡¢", - "¡È", "¡¢", - "¡É", "¡¢", - "¡Ê", "¡¢", - "¡Ë", "¡¢", - "¡Ì", "¡¢", - "¡Í", "¡¢", - "¡Î", "¡¢", - "¡Ï", "¡¢", - "¡Ð", "¡¢", - "¡Ñ", "¡¢", - "¡Ò", "¡¢", - "¡Ó", "¡¢", - "¡Ô", "¡¢", - "¡Õ", "¡¢", - "¡Ö", "¡¢", - "¡×", "¡¢", - "¡Ø", "¡¢", - "¡Ù", "¡¢", - "¡Ú", "¡¢", - "¡Û", "¡¢", - "¡Ý¡Ý", "¡¢", - "¡á", "¡¢", - "¡ã", "¡¢", - "¡ä", "¡¢", - "¡ì", "¡¢", - "¡ö", "¡¢", - "¡ù", "¡¢", - "¡ú", "¡¢", - "¡û", "¡¢", - "¡ü", "¡¢", - "¡ý", "¡¢", - "¡þ", "¡¢", - "¢¡", "¡¢", - "¢¢", "¡¢", - "¢£", "¡¢", - "¢¤", "¡¢", - "¢¥", "¡¢", - "¢¦", "¡¢", - "¢§", "¡¢", - "¢¨", "¡¢", - "¢ª", "¡¢", - "¢«", "¡¢", - "¢¬", "¡¢", - "¢", "¡¢", - "¢®", "¡¢", - "¨¡", "¡¢", - "¨¡¨¡", "¡¢", - "¡Ý", "¡¢", NULL, NULL }; --- 429,433 ---- *************** *** 527,530 **** --- 446,451 ---- #define NJD_SET_PRONUNCIATION_MASU_PRON "¥Þ¥¹" + #define NJD_SET_PRONUNCIATION_TOUTEN "¡¢" + NJD_SET_PRONUNCIATION_RULE_H_END; Index: njd_set_pronunciation.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd_set_pronunciation.h 11 Dec 2014 05:09:07 -0000 1.8 --- njd_set_pronunciation.h 23 Dec 2015 03:54:48 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: njd_set_pronunciation_rule_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation_rule_shift_jis.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** njd_set_pronunciation_rule_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.10 --- njd_set_pronunciation_rule_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.11 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 137,141 **** "f ", "f ", "1", "f", "f", "1", - "fF", "fF", "1", "fB", "fB", "1", "f", "f", "1", --- 137,140 ---- *************** *** 212,215 **** --- 211,222 ---- "A", "A", "1", "@", "@", "1", + "å", "", "1", /* none in this charcode */ + "ã", " ", "1", /* none in this charcode */ + "á", "", "1", /* none in this charcode */ + "§", "H", "1", /* none in this charcode */ + "¥", "F", "1", /* none in this charcode */ + "¡", "B", "1", /* none in this charcode */ + "", "@", "1", /* none in this charcode */ + "", "", "1", /* none in this charcode */ "ñ", "", "1", "ð", "", "1", *************** *** 288,292 **** "Åã", "f ", "1", "Åá", "f", "1", - "Å¥", "fF", "1", "Å¡", "fB", "1", "Å", "f", "1", --- 295,298 ---- *************** *** 388,392 **** "", "V[", "2", "", "r[", "2", ! "", "GC", "2", "y", "YB[", "2", "x", "C", "2", --- 394,398 ---- "", "V[", "2", "", "r[", "2", ! "", "G[", "2", "y", "YB[", "2", "x", "C", "2", *************** *** 414,418 **** "b", "V[", "2", "a", "r[", "2", ! "`", "GC", "2", "[", "[", "1", NULL, NULL, NULL --- 420,424 ---- "b", "V[", "2", "a", "r[", "2", ! "`", "G[", "2", "[", "[", "1", NULL, NULL, NULL *************** *** 423,514 **** static const char *njd_set_pronunciation_symbol_list[] = { - "@", "A", - "A", "A", - "B", "A", - "C", "A", - "D", "A", - "E", "A", - "F", "A", - "G", "A", "H", "H", - "I", "A", - "J", "A", - "K", "A", - "L", "A", - "M", "A", - "N", "A", - "O", "A", - "P", "A", - "Q", "A", - "R", "A", - "S", "A", - "T", "A", - "U", "A", - "V", "A", - "W", "A", - "X", "A", - "XX", "A", - "Y", "A", - "Z", "A", - "\", "A", - "\\", "A", - "]", "A", - "^", "A", - "_", "A", - "`", "A", - "a", "A", - "b", "A", - "c", "A", - "d", "A", - "e", "A", - "f", "A", - "g", "A", - "h", "A", - "i", "A", - "j", "A", - "k", "A", - "l", "A", - "m", "A", - "n", "A", - "o", "A", - "p", "A", - "q", "A", - "r", "A", - "s", "A", - "t", "A", - "u", "A", - "v", "A", - "w", "A", - "x", "A", - "y", "A", - "z", "A", - "||", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - "", "A", - " ", "A", - "¡", "A", - "¢", "A", - "£", "A", - "¤", "A", - "¥", "A", - "¦", "A", - "¨", "A", - "©", "A", - "ª", "A", - "«", "A", - "¬", "A", - "", "A", - "", "A", - "|", "A", NULL, NULL }; --- 429,433 ---- *************** *** 527,530 **** --- 446,451 ---- #define NJD_SET_PRONUNCIATION_MASU_PRON "}X" + #define NJD_SET_PRONUNCIATION_TOUTEN "A" + NJD_SET_PRONUNCIATION_RULE_H_END; Index: njd_set_pronunciation_rule_ascii_for_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_shift_jis.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** njd_set_pronunciation_rule_ascii_for_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.4 --- njd_set_pronunciation_rule_ascii_for_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.5 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 137,141 **** "\x83\x66\x83\x85", "\x83\x66\x83\x85", "1", "\x83\x66\x83\x83", "\x83\x66\x83\x83", "1", - "\x83\x66\x83\x46", "\x83\x66\x83\x46", "1", "\x83\x66\x83\x42", "\x83\x66\x83\x42", "1", "\x83\x66", "\x83\x66", "1", --- 137,140 ---- *************** *** 212,215 **** --- 211,222 ---- "\x83\x41", "\x83\x41", "1", "\x83\x40", "\x83\x40", "1", + "\x83\x94\x82\xe5", "\x83\x94\x83\x87", "1", /* none in this charcode */ + "\x83\x94\x82\xe3", "\x83\x94\x83\x85", "1", /* none in this charcode */ + "\x83\x94\x82\xe1", "\x83\x94\x83\x83", "1", /* none in this charcode */ + "\x83\x94\x82\xa7", "\x83\x94\x83\x48", "1", /* none in this charcode */ + "\x83\x94\x82\xa5", "\x83\x94\x83\x46", "1", /* none in this charcode */ + "\x83\x94\x82\xa1", "\x83\x94\x83\x42", "1", /* none in this charcode */ + "\x83\x94\x82\x9f", "\x83\x94\x83\x40", "1", /* none in this charcode */ + "\x83\x94", "\x83\x94", "1", /* none in this charcode */ "\x82\xf1", "\x83\x93", "1", "\x82\xf0", "\x83\x92", "1", *************** *** 288,292 **** "\x82\xc5\x82\xe3", "\x83\x66\x83\x85", "1", "\x82\xc5\x82\xe1", "\x83\x66\x83\x83", "1", - "\x82\xc5\x82\xa5", "\x83\x66\x83\x46", "1", "\x82\xc5\x82\xa1", "\x83\x66\x83\x42", "1", "\x82\xc5", "\x83\x66", "1", --- 295,298 ---- *************** *** 388,392 **** "\x82\x83", "\x83\x56\x81\x5b", "2", "\x82\x82", "\x83\x72\x81\x5b", "2", ! "\x82\x81", "\x83\x47\x83\x43", "2", "\x82\x79", "\x83\x59\x83\x42\x81\x5b", "2", "\x82\x78", "\x83\x8f\x83\x43", "2", --- 394,398 ---- "\x82\x83", "\x83\x56\x81\x5b", "2", "\x82\x82", "\x83\x72\x81\x5b", "2", ! "\x82\x81", "\x83\x47\x81\x5b", "2", "\x82\x79", "\x83\x59\x83\x42\x81\x5b", "2", "\x82\x78", "\x83\x8f\x83\x43", "2", *************** *** 414,418 **** "\x82\x62", "\x83\x56\x81\x5b", "2", "\x82\x61", "\x83\x72\x81\x5b", "2", ! "\x82\x60", "\x83\x47\x83\x43", "2", "\x81\x5b", "\x81\x5b", "1", NULL, NULL, NULL --- 420,424 ---- "\x82\x62", "\x83\x56\x81\x5b", "2", "\x82\x61", "\x83\x72\x81\x5b", "2", ! "\x82\x60", "\x83\x47\x81\x5b", "2", "\x81\x5b", "\x81\x5b", "1", NULL, NULL, NULL *************** *** 423,514 **** static const char *njd_set_pronunciation_symbol_list[] = { - "\x81\x40", "\x81\x41", - "\x81\x41", "\x81\x41", - "\x81\x42", "\x81\x41", - "\x81\x43", "\x81\x41", - "\x81\x44", "\x81\x41", - "\x81\x45", "\x81\x41", - "\x81\x46", "\x81\x41", - "\x81\x47", "\x81\x41", "\x81\x48", "\x81\x48", - "\x81\x49", "\x81\x41", - "\x81\x4a", "\x81\x41", - "\x81\x4b", "\x81\x41", - "\x81\x4c", "\x81\x41", - "\x81\x4d", "\x81\x41", - "\x81\x4e", "\x81\x41", - "\x81\x4f", "\x81\x41", - "\x81\x50", "\x81\x41", - "\x81\x51", "\x81\x41", - "\x81\x52", "\x81\x41", - "\x81\x53", "\x81\x41", - "\x81\x54", "\x81\x41", - "\x81\x55", "\x81\x41", - "\x81\x56", "\x81\x41", - "\x81\x57", "\x81\x41", - "\x81\x58", "\x81\x41", - "\x81\x58\x81\x58", "\x81\x41", - "\x81\x59", "\x81\x41", - "\x81\x5a", "\x81\x41", - "\x81\x5c", "\x81\x41", - "\x81\x5c\x81\x5c", "\x81\x41", - "\x81\x5d", "\x81\x41", - "\x81\x5e", "\x81\x41", - "\x81\x5f", "\x81\x41", - "\x81\x60", "\x81\x41", - "\x81\x61", "\x81\x41", - "\x81\x62", "\x81\x41", - "\x81\x63", "\x81\x41", - "\x81\x64", "\x81\x41", - "\x81\x65", "\x81\x41", - "\x81\x66", "\x81\x41", - "\x81\x67", "\x81\x41", - "\x81\x68", "\x81\x41", - "\x81\x69", "\x81\x41", - "\x81\x6a", "\x81\x41", - "\x81\x6b", "\x81\x41", - "\x81\x6c", "\x81\x41", - "\x81\x6d", "\x81\x41", - "\x81\x6e", "\x81\x41", - "\x81\x6f", "\x81\x41", - "\x81\x70", "\x81\x41", - "\x81\x71", "\x81\x41", - "\x81\x72", "\x81\x41", - "\x81\x73", "\x81\x41", - "\x81\x74", "\x81\x41", - "\x81\x75", "\x81\x41", - "\x81\x76", "\x81\x41", - "\x81\x77", "\x81\x41", - "\x81\x78", "\x81\x41", - "\x81\x79", "\x81\x41", - "\x81\x7a", "\x81\x41", - "\x81\x7c\x81\x7c", "\x81\x41", - "\x81\x81", "\x81\x41", - "\x81\x83", "\x81\x41", - "\x81\x84", "\x81\x41", - "\x81\x8c", "\x81\x41", - "\x81\x96", "\x81\x41", - "\x81\x99", "\x81\x41", - "\x81\x9a", "\x81\x41", - "\x81\x9b", "\x81\x41", - "\x81\x9c", "\x81\x41", - "\x81\x9d", "\x81\x41", - "\x81\x9e", "\x81\x41", - "\x81\x9f", "\x81\x41", - "\x81\xa0", "\x81\x41", - "\x81\xa1", "\x81\x41", - "\x81\xa2", "\x81\x41", - "\x81\xa3", "\x81\x41", - "\x81\xa4", "\x81\x41", - "\x81\xa5", "\x81\x41", - "\x81\xa6", "\x81\x41", - "\x81\xa8", "\x81\x41", - "\x81\xa9", "\x81\x41", - "\x81\xaa", "\x81\x41", - "\x81\xab", "\x81\x41", - "\x81\xac", "\x81\x41", - "\x84\x9f", "\x81\x41", - "\x84\x9f\x84\x9f", "\x81\x41", - "\x81\x7c", "\x81\x41", NULL, NULL }; --- 429,433 ---- *************** *** 527,530 **** --- 446,451 ---- #define NJD_SET_PRONUNCIATION_MASU_PRON "\x83\x7d\x83\x58" + #define NJD_SET_PRONUNCIATION_TOUTEN "\x81\x41" + NJD_SET_PRONUNCIATION_RULE_H_END; Index: njd_set_pronunciation.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** njd_set_pronunciation.c 11 Dec 2014 05:09:07 -0000 1.10 --- njd_set_pronunciation.c 23 Dec 2015 03:54:48 -0000 1.11 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 109,120 **** NJDNode_set_read(node, NULL); NJDNode_set_pron(node, NULL); ! if (strcmp(NJDNode_get_pos(node), NJD_SET_PRONUNCIATION_KIGOU) == 0 || strcmp(NJDNode_get_pos_group1(node), NJD_SET_PRONUNCIATION_KAZU) == 0) { /* for symbol */ ! for (i = 0; njd_set_pronunciation_symbol_list[i] != NULL; i += 2) ! if (strcmp(NJDNode_get_string(node), njd_set_pronunciation_symbol_list[i]) == 0) { ! NJDNode_set_read(node, (char *) njd_set_pronunciation_symbol_list[i + 1]); ! NJDNode_set_pron(node, (char *) njd_set_pronunciation_symbol_list[i + 1]); ! break; ! } ! } else if (strcmp(NJDNode_get_pron(node), "*") == 0) { /* for others */ str = NJDNode_get_string(node); len = strlen(str); --- 109,114 ---- NJDNode_set_read(node, NULL); NJDNode_set_pron(node, NULL); ! /* if the word is kana, set them as filler */ ! { str = NJDNode_get_string(node); len = strlen(str); *************** *** 139,142 **** --- 133,152 ---- NJDNode_set_pos_group3(node, NULL); } + /* if known symbol, set the pronunciation */ + if (strcmp(NJDNode_get_pron(node), "*") == 0) { + for (i = 0; njd_set_pronunciation_symbol_list[i] != NULL; i += 2) { + if (strcmp(NJDNode_get_string(node), njd_set_pronunciation_symbol_list[i]) == 0) { + NJDNode_set_read(node, (char *) njd_set_pronunciation_symbol_list[i + 1]); + NJDNode_set_pron(node, (char *) njd_set_pronunciation_symbol_list[i + 1]); + break; + } + } + } + /* if the word is not kana, set pause symbol */ + if (strcmp(NJDNode_get_pron(node), "*") == 0) { + NJDNode_set_read(node, NJD_SET_PRONUNCIATION_TOUTEN); + NJDNode_set_pron(node, NJD_SET_PRONUNCIATION_TOUTEN); + NJDNode_set_pos(node, NJD_SET_PRONUNCIATION_KIGOU); + } } } Index: njd_set_pronunciation_rule_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation_rule_utf_8.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** njd_set_pronunciation_rule_utf_8.h 22 Dec 2014 02:08:53 -0000 1.10 --- njd_set_pronunciation_rule_utf_8.h 23 Dec 2015 03:54:48 -0000 1.11 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 137,141 **** "ãã¥", "ãã¥", "1", "ãã£", "ãã£", "1", - "ãã§", "ãã§", "1", "ãã£", "ãã£", "1", "ã", "ã", "1", --- 137,140 ---- *************** *** 212,215 **** --- 211,222 ---- "ã¢", "ã¢", "1", "ã¡", "ã¡", "1", + "ãã", "ã´ã§", "1", + "ãã ", "ã´ã¥", "1", + "ãã", "ã´ã£", "1", + "ãã", "ã´ã©", "1", + "ãã", "ã´ã§", "1", + "ãã", "ã´ã£", "1", + "ãã", "ã´ã¡", "1", + "ã", "ã´", "1", "ã", "ã³", "1", "ã", "ã²", "1", *************** *** 288,292 **** "ã§ã ", "ãã¥", "1", "ã§ã", "ãã£", "1", - "ã§ã", "ãã§", "1", "ã§ã", "ãã£", "1", "ã§", "ã", "1", --- 295,298 ---- *************** *** 388,392 **** "ï½", "ã·ã¼", "2", "ï½", "ãã¼", "2", ! "ï½", "ã¨ã¤", "2", "Ｚ", "ãºã£ã¼", "2", "ï¼¹", "ã¯ã¤", "2", --- 394,398 ---- "ï½", "ã·ã¼", "2", "ï½", "ãã¼", "2", ! "ï½", "ã¨ã¼", "2", "Ｚ", "ãºã£ã¼", "2", "ï¼¹", "ã¯ã¤", "2", *************** *** 414,418 **** "ï¼£", "ã·ã¼", "2", "ï¼¢", "ãã¼", "2", ! "Ａ", "ã¨ã¤", "2", "ã¼", "ã¼", "1", NULL, NULL, NULL --- 420,424 ---- "ï¼£", "ã·ã¼", "2", "ï¼¢", "ãã¼", "2", ! "Ａ", "ã¨ã¼", "2", "ã¼", "ã¼", "1", NULL, NULL, NULL *************** *** 423,514 **** static const char *njd_set_pronunciation_symbol_list[] = { - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ï¼", "ã", - "ï¼", "ã", - "ã»", "ã", - "ï¼", "ã", - "ï¼", "ã", "ï¼", "ï¼", - "ï¼", "ã", - "ã", "ã", - "ã", "ã", - "´", "ã", - "ï½", "ã", - "¨", "ã", - "ï¼¾", "ã", - "ï¿£", "ã", - "＿", "ã", - "ã½", "ã", - "ã¾", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ä»", "ã", - "ã ", "ã", - "ã ã ", "ã", - "ã", "ã", - "ã", "ã", - "â", "ã", - "ââ", "ã", - "â", "ã", - "ï¼", "ã", - "ï¼¼", "ã", - "ã", "ã", - "â", "ã", - "ï½", "ã", - "â¦", "ã", - "â¥", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "ï¼", "ã", - "ï¼", "ã", - "ã", "ã", - "ã", "ã", - "ï¼»", "ã", - "ï¼½", "ã", - "ï½", "ã", - "ï½", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ã", "ã", - "ââ", "ã", - "ï¼", "ã", - "ï¼", "ã", - "ï¼", "ã", - "â²", "ã", - "ï¼", "ã", - "â", "ã", - "â ", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "â¡", "ã", - "â ", "ã", - "â³", "ã", - "â²", "ã", - "â½", "ã", - "â¼", "ã", - "â»", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "â", "ã", - "ã", "ã", - "â", "ã", - "ââ", "ã", - "â", "ã", NULL, NULL }; --- 429,433 ---- *************** *** 527,530 **** --- 446,451 ---- #define NJD_SET_PRONUNCIATION_MASU_PRON "ãã¹" + #define NJD_SET_PRONUNCIATION_TOUTEN "ã" + NJD_SET_PRONUNCIATION_RULE_H_END; |
