Menu
▾
▴
open-jtalk-cvs — For CVS.
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(2) |
Feb
|
Mar
|
Apr
(16) |
May
|
Jun
(16) |
Jul
|
Aug
|
Sep
|
Oct
(25) |
Nov
(2) |
Dec
(32) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(7) |
May
(2) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(9) |
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(14) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(13) |
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|
From: Keiichiro O. <ur...@us...> - 2016-12-25 02:36:04
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24467/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 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** njd_set_pronunciation_rule_ascii_for_utf_8.h 23 Dec 2015 03:54:48 -0000 1.5 --- njd_set_pronunciation_rule_ascii_for_utf_8.h 25 Dec 2016 02:36:02 -0000 1.6 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** njd_set_pronunciation_rule_ascii_for_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.5 --- njd_set_pronunciation_rule_ascii_for_euc_jp.h 25 Dec 2016 02:36:02 -0000 1.6 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** njd_set_pronunciation_rule_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.11 --- njd_set_pronunciation_rule_euc_jp.h 25 Dec 2016 02:36:02 -0000 1.12 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: njd_set_pronunciation.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_pronunciation.h 23 Dec 2015 03:54:48 -0000 1.9 --- njd_set_pronunciation.h 25 Dec 2016 02:36:02 -0000 1.10 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** njd_set_pronunciation_rule_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.11 --- njd_set_pronunciation_rule_shift_jis.h 25 Dec 2016 02:36:02 -0000 1.12 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** njd_set_pronunciation_rule_ascii_for_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.5 --- njd_set_pronunciation_rule_ascii_for_shift_jis.h 25 Dec 2016 02:36:02 -0000 1.6 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: njd_set_pronunciation.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** njd_set_pronunciation.c 23 Dec 2015 03:54:48 -0000 1.11 --- njd_set_pronunciation.c 25 Dec 2016 02:36:02 -0000 1.12 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** njd_set_pronunciation_rule_utf_8.h 23 Dec 2015 03:54:48 -0000 1.11 --- njd_set_pronunciation_rule_utf_8.h 25 Dec 2016 02:36:02 -0000 1.12 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2016-12-25 02:36:03
|
Update of /cvsroot/open-jtalk/open_jtalk/src/bin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24467/bin Modified Files: open_jtalk.c Log Message: update copyright Index: open_jtalk.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/bin/open_jtalk.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** open_jtalk.c 23 Dec 2015 03:54:46 -0000 1.22 --- open_jtalk.c 25 Dec 2016 02:36:01 -0000 1.23 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 212,217 **** { fprintf(stderr, "The Japanese TTS System \"Open JTalk\"\n"); ! fprintf(stderr, "Version 1.09 (http://open-jtalk.sourceforge.net/)\n"); ! fprintf(stderr, "Copyright (C) 2008-2015 Nagoya Institute of Technology\n"); fprintf(stderr, "All rights reserved.\n"); fprintf(stderr, "\n"); --- 212,217 ---- { fprintf(stderr, "The Japanese TTS System \"Open JTalk\"\n"); ! fprintf(stderr, "Version 1.10 (http://open-jtalk.sourceforge.net/)\n"); ! fprintf(stderr, "Copyright (C) 2008-2016 Nagoya Institute of Technology\n"); fprintf(stderr, "All rights reserved.\n"); fprintf(stderr, "\n"); |
|
From: Keiichiro O. <ur...@us...> - 2016-12-25 02:32:26
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24329/njd_set_digit Modified Files: njd_set_digit.c njd_set_digit.h njd_set_digit_rule_ascii_for_euc_jp.h njd_set_digit_rule_ascii_for_shift_jis.h njd_set_digit_rule_ascii_for_utf_8.h njd_set_digit_rule_euc_jp.h njd_set_digit_rule_shift_jis.h njd_set_digit_rule_utf_8.h Log Message: modify digit rules Index: njd_set_digit_rule_ascii_for_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit_rule_ascii_for_utf_8.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** njd_set_digit_rule_ascii_for_utf_8.h 23 Dec 2015 03:54:48 -0000 1.4 --- njd_set_digit_rule_ascii_for_utf_8.h 25 Dec 2016 02:32:23 -0000 1.5 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 307,311 **** "\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", "\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", --- 307,311 ---- "\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", "\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", *************** *** 421,425 **** 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", /* from dictionary */ "\xe6\x9c\xac\xe7\xab\x8b\xe3\x81\xa6", "\xe6\x9d\xaf", "\xe9\x87\x9d", "\xe6\x9f\xb1", --- 421,425 ---- static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "\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", Index: njd_set_digit.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_digit.h 23 Dec 2015 03:54:47 -0000 1.9 --- njd_set_digit.h 25 Dec 2016 02:32:23 -0000 1.10 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: njd_set_digit_rule_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit_rule_shift_jis.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** njd_set_digit_rule_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.12 --- njd_set_digit_rule_shift_jis.h 25 Dec 2016 02:32:23 -0000 1.13 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 307,311 **** "q", "r", " ", "", "´", "Ç", "È", "É", "dË", "Ò", "à", "å", "æ", "ë", "v", " ", "P^", "Z", "`", "s", "", "g", "", "¬", "¾", "Ë", "Î", "õN", "Î", ! "Ò«", "Øñ", "g", "h", "s", "t", "", "", "Å", "Æ", "Ç", "C", "C", "M", "U", "[", "i", "ªÔ", "ªÚ", "Ð", "Ð", "Ñ", "Ò", "Ó", "Õ", "à", "à", "ñ", "û", "û", "@", "{§Ä", "ªg", --- 307,311 ---- "q", "r", " ", "", "´", "Ç", "È", "É", "dË", "Ò", "à", "å", "æ", "ë", "v", " ", "P^", "Z", "`", "s", "", "g", "", "¬", "¾", "Ë", "Î", "õN", "Î", ! "Ò«", "Øñ", "g", "h", "s", "t", "", "", "Å", "Æ", "Ç", "C", "D", "M", "U", "[", "i", "ªÔ", "ªÚ", "Ð", "Ð", "Ñ", "Ò", "Ó", "Õ", "à", "à", "ñ", "û", "û", "@", "{§Ä", "ªg", *************** *** 421,425 **** static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "{", "C", "[", "U", " ", /* from dictionary */ "{§Ä", "t", "j", "", --- 421,425 ---- static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "{", "C", "D", "[", "U", " ", /* from dictionary */ "{§Ä", "t", "j", "", Index: njd_set_digit.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** njd_set_digit.c 23 Dec 2015 03:54:47 -0000 1.16 --- njd_set_digit.c 25 Dec 2016 02:32:23 -0000 1.17 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: njd_set_digit_rule_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit_rule_euc_jp.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** njd_set_digit_rule_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.12 --- njd_set_digit_rule_euc_jp.h 25 Dec 2016 02:32:23 -0000 1.13 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 307,311 **** "µÒ", "µÓ", "µå", "µé", "¶¶", "¶É", "¶Ê", "¶Ë", "½Å¤Í", "¶Ô", "¶â", "¶ç", "¶è", "¶í", "·×", "·å", "¥±¥¿", "¹»", "¹Á", "¹Ô", "¹à", "ÁÈ", "·ï", "¸®", "¸À", "¸Í", "¸Ð", "¸÷ǯ", "ÀÐ", ! "¤Ô¤", "¤Ú¤ó", "ÇÈ", "ÇÉ", "ÇÔ", "ÇÕ", "Çï", "Çñ", "ÈÇ", "ÈÈ", "ÈÉ", "ɤ", "ɤ", "É®", "ɶ", "ɼ", "ÉÊ", "ʬ´Ö", "ʬÌÜ", "ÊÒ", "ÊÒ", "ÊÓ", "ÊÔ", "ÊÕ", "Ê×", "Êâ", "Êâ", "Êó", "Êý", "Êý", "Ë¡", "ËÜΩ¤Æ", "Ƭ¿È", --- 307,311 ---- "µÒ", "µÓ", "µå", "µé", "¶¶", "¶É", "¶Ê", "¶Ë", "½Å¤Í", "¶Ô", "¶â", "¶ç", "¶è", "¶í", "·×", "·å", "¥±¥¿", "¹»", "¹Á", "¹Ô", "¹à", "ÁÈ", "·ï", "¸®", "¸À", "¸Í", "¸Ð", "¸÷ǯ", "ÀÐ", ! "¤Ô¤", "¤Ú¤ó", "ÇÈ", "ÇÉ", "ÇÔ", "ÇÕ", "Çï", "Çñ", "ÈÇ", "ÈÈ", "ÈÉ", "ɤ", "É¥", "É®", "ɶ", "ɼ", "ÉÊ", "ʬ´Ö", "ʬÌÜ", "ÊÒ", "ÊÒ", "ÊÓ", "ÊÔ", "ÊÕ", "Ê×", "Êâ", "Êâ", "Êó", "Êý", "Êý", "Ë¡", "ËÜΩ¤Æ", "Ƭ¿È", *************** *** 421,425 **** static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "ËÜ", "ɤ", "ɼ", "ɶ", "È¢", /* from dictionary */ "ËÜΩ¤Æ", "ÇÕ", "¿Ë", "Ãì", --- 421,425 ---- static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "ËÜ", "ɤ", "É¥", "ɼ", "ɶ", "È¢", /* from dictionary */ "ËÜΩ¤Æ", "ÇÕ", "¿Ë", "Ãì", Index: njd_set_digit_rule_ascii_for_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit_rule_ascii_for_shift_jis.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** njd_set_digit_rule_ascii_for_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.4 --- njd_set_digit_rule_ascii_for_shift_jis.h 25 Dec 2016 02:32:23 -0000 1.5 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 307,311 **** "\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", "\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", --- 307,311 ---- "\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\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", *************** *** 421,425 **** static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "\x96\x7b", "\x95\x43", "\x95\x5b", "\x95\x55", "\x94\xa0", /* from dictionary */ "\x96\x7b\x97\xa7\x82\xc4", "\x94\x74", "\x90\x6a", "\x92\x8c", --- 421,425 ---- static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "\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", Index: njd_set_digit_rule_ascii_for_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit_rule_ascii_for_euc_jp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** njd_set_digit_rule_ascii_for_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.4 --- njd_set_digit_rule_ascii_for_euc_jp.h 25 Dec 2016 02:32:23 -0000 1.5 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 307,311 **** "\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", "\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", --- 307,311 ---- "\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\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", *************** *** 421,425 **** static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "\xcb\xdc", "\xc9\xa4", "\xc9\xbc", "\xc9\xb6", "\xc8\xa2", /* from dictionary */ "\xcb\xdc\xce\xa9\xa4\xc6", "\xc7\xd5", "\xbf\xcb", "\xc3\xec", --- 421,425 ---- static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "\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", Index: njd_set_digit_rule_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_digit/njd_set_digit_rule_utf_8.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** njd_set_digit_rule_utf_8.h 23 Dec 2015 03:54:48 -0000 1.12 --- njd_set_digit_rule_utf_8.h 25 Dec 2016 02:32:23 -0000 1.13 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 307,311 **** "客", "è", "ç", "ç´", "æ©", "å±", "æ²", "極", "éã", "æ¤", "é", "å¥", "åº", "躯", "è¨", "æ¡", "ã±ã¿", "æ ¡", "港", "è¡", "é ", "çµ", "件", "è»", "è¨", "æ¸", "æ¹", "å å¹´", "ç³", ! "ã´ã", "ãºã", "æ³¢", "æ´¾", "æ", "æ¯", "æ", "æ³", "ç", "ç¯", "ç", "å¹", "å¹", "ç", "俵", "票", "å", "åé", "åç®", "ç", "ç", "ç¯", "ç·¨", "辺", "é", "æ©", "æ©", "å ±", "æ¹", "æ¹", "æ³", "æ¬ç«ã¦", "é 身", --- 307,311 ---- "客", "è", "ç", "ç´", "æ©", "å±", "æ²", "極", "éã", "æ¤", "é", "å¥", "åº", "躯", "è¨", "æ¡", "ã±ã¿", "æ ¡", "港", "è¡", "é ", "çµ", "件", "è»", "è¨", "æ¸", "æ¹", "å å¹´", "ç³", ! "ã´ã", "ãºã", "æ³¢", "æ´¾", "æ", "æ¯", "æ", "æ³", "ç", "ç¯", "ç", "å¹", "ç", "ç", "俵", "票", "å", "åé", "åç®", "ç", "ç", "ç¯", "ç·¨", "辺", "é", "æ©", "æ©", "å ±", "æ¹", "æ¹", "æ³", "æ¬ç«ã¦", "é 身", *************** *** 421,425 **** static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "æ¬", "å¹", "票", "俵", "ç®±", /* from dictionary */ "æ¬ç«ã¦", "æ¯", "é", "æ±", --- 421,425 ---- static const char *njd_set_digit_rule_numerative_class2c[] = { /* from paper */ ! "æ¬", "å¹", "ç", "票", "俵", "ç®±", /* from dictionary */ "æ¬ç«ã¦", "æ¯", "é", "æ±", |
|
From: Keiichiro O. <ur...@us...> - 2016-12-25 02:30:15
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24207 Modified Files: COPYING Makefile.am Added Files: _left-id.def _pos-id.def _rewrite.def _right-id.def Removed Files: left-id.def pos-id.def rewrite.def right-id.def Log Message: fix bug of default charset --- rewrite.def DELETED --- --- NEW FILE: _left-id.def --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _pos-id.def --- (This appears to be a binary file; contents omitted.) --- pos-id.def DELETED --- --- NEW FILE: _rewrite.def --- (This appears to be a binary file; contents omitted.) Index: Makefile.am =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 23 Dec 2015 03:21:53 -0000 1.3 --- Makefile.am 25 Dec 2016 02:30:12 -0000 1.4 *************** *** 1,16 **** ! EXTRA_DIST = COPYING Makefile.mak naist-jdic.csv matrix.def left-id.def pos-id.def rewrite.def right-id.def char.def unk.def feature.def DISTCLEANFILES = *.log *.out *~ ! MAINTAINERCLEANFILES = Makefile.in char.bin matrix.bin sys.dic unk.dic dicdir = @prefix@/dic ! dic_DATA = char.bin matrix.bin sys.dic unk.dic ! char.bin matrix.bin sys.dic unk.dic: naist-jdic.csv matrix.def left-id.def rewrite.def pos-id.def right-id.def char.def unk.def feature.def ../mecab/src/mecab-dict-index -d . -o . -f UTF-8 -t @MECAB_CHARSET@ clean: ! rm -f char.bin matrix.bin sys.dic unk.dic --- 1,24 ---- ! EXTRA_DIST = COPYING Makefile.mak naist-jdic.csv matrix.def _left-id.def _pos-id.def _rewrite.def _right-id.def char.def unk.def feature.def DISTCLEANFILES = *.log *.out *~ ! MAINTAINERCLEANFILES = Makefile.in char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def dicdir = @prefix@/dic ! dic_DATA = char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def ! char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def: naist-jdic.csv matrix.def _left-id.def _rewrite.def _pos-id.def _right-id.def char.def unk.def feature.def ! cp _left-id.def left-id.def ! cp _rewrite.def rewrite.def ! cp _pos-id.def pos-id.def ! cp _right-id.def right-id.def ../mecab/src/mecab-dict-index -d . -o . -f UTF-8 -t @MECAB_CHARSET@ + iconv -f UTF-8 -t @MECAB_CHARSET@ < _left-id.def > left-id.def + iconv -f UTF-8 -t @MECAB_CHARSET@ < _rewrite.def > rewrite.def + iconv -f UTF-8 -t @MECAB_CHARSET@ < _pos-id.def > pos-id.def + iconv -f UTF-8 -t @MECAB_CHARSET@ < _right-id.def > right-id.def clean: ! rm -f char.bin matrix.bin sys.dic unk.dic left-id.def rewrite.def pos-id.def right-id.def Index: COPYING =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic/COPYING,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** COPYING 23 Dec 2015 03:21:53 -0000 1.8 --- COPYING 25 Dec 2016 02:30:12 -0000 1.9 *************** *** 35,39 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 35,39 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- right-id.def DELETED --- --- NEW FILE: _right-id.def --- (This appears to be a binary file; contents omitted.) --- left-id.def DELETED --- |
|
From: Keiichiro O. <ur...@us...> - 2016-12-25 02:25:34
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23876/mecab-naist-jdic Modified Files: naist-jdic.csv Log Message: add many words to dict Index: naist-jdic.csv =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic/naist-jdic.csv,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** naist-jdic.csv 23 Dec 2015 04:18:13 -0000 1.16 --- naist-jdic.csv 25 Dec 2016 02:25:14 -0000 1.17 *************** *** 56,60 **** â,5,5,1526,è¨å·,ä¸è¬,*,*,*,*,â,â,â,*/*,* â,6,6,923,è¨å·,æ¬å¼§é,*,*,*,*,â,â,â,*/*,* ! â,7,7,934,è¨å·,æ¬å¼§é,*,*,*,*,â,â,â,*/*,* â,6,6,915,è¨å·,æ¬å¼§é,*,*,*,*,â,â,â,*/*,* â,7,7,927,è¨å·,æ¬å¼§é,*,*,*,*,â,â,â,*/*,* --- 56,60 ---- â,5,5,1526,è¨å·,ä¸è¬,*,*,*,*,â,â,â,*/*,* â,6,6,923,è¨å·,æ¬å¼§é,*,*,*,*,â,â,â,*/*,* ! â,7,7,934,è¨å·,æ¬å¼§é,*,*,*,*,â,ã,ã,*/*,* â,6,6,915,è¨å·,æ¬å¼§é,*,*,*,*,â,â,â,*/*,* [...78963 lines suppressed...] *** 483117,483121 **** é¾,1345,1345,6371,åè©,ä¸è¬,*,*,*,*,é¾,ã¬ã³,ã¬ã³,1/2,C3 é¾ç¯,1345,1345,5746,åè©,ä¸è¬,*,*,*,*,é¾ç¯,ã¬ã³ãã¦,ã¬ã³ãã¼,0/4,C2 ! é¾ç¯æç¯,1345,1345,5746,åè©,ä¸è¬,*,*,*,*,é¾ç¯æç¯,ã¬ã³ãã¦ãã§ã¦ãã³,ã¬ã³ãã¼ã¸ã§ã¼ãã³,5/9,C1 é¾ç¯è¿ã,1345,1345,5746,åè©,ä¸è¬,*,*,*,*,é¾ç¯è¿ã,ã¬ã³ãã¦ã¬ã¨ã·,ã¬ã³ãã¼ã¬ã¨ã·,5/7,C1 é¾,1345,1345,5934,åè©,ä¸è¬,*,*,*,*,é¾,ã«ã¡,ã«ã¡,1/2,C3 --- 484973,484977 ---- é¾,1345,1345,6371,åè©,ä¸è¬,*,*,*,*,é¾,ã¬ã³,ã¬ã³,1/2,C3 é¾ç¯,1345,1345,5746,åè©,ä¸è¬,*,*,*,*,é¾ç¯,ã¬ã³ãã¦,ã¬ã³ãã¼,0/4,C2 ! é¾ç¯æç¯,1345,1345,5746,åè©,ä¸è¬,*,*,*,*,é¾ç¯æç¯,ã¬ã³ãã¦ãã§ã¦ãã³,ã¬ã³ãã¼ã¸ã§ã¼ãã³,5/8,C1 é¾ç¯è¿ã,1345,1345,5746,åè©,ä¸è¬,*,*,*,*,é¾ç¯è¿ã,ã¬ã³ãã¦ã¬ã¨ã·,ã¬ã³ãã¼ã¬ã¨ã·,5/7,C1 é¾,1345,1345,5934,åè©,ä¸è¬,*,*,*,*,é¾,ã«ã¡,ã«ã¡,1/2,C3 *************** *** 483153,483156 **** --- 485009,485013 ---- æ±æ°´é¢,1353,1353,148,åè©,åºæåè©,å°å,ä¸è¬,*,*,æ±æ°´é¢,ã·ã¹ã¤ã«ã³,ã·ã¹ã¤ã«ã³,2/5,* æ¿è²,1353,1353,148,åè©,åºæåè©,å°å,ä¸è¬,*,*,æ¿è²,ã¯ã¤ãã¯,ã¯ã¤ãã¯,0/4,* + 誾å代,1351,1351,10000,åè©,åºæåè©,人å,å,*,*,誾å代,ã®ã³ãã¨,ã®ã³ãã¨,0/4,* é§å°å¹³,1349,1349,516,åè©,åºæåè©,人å,ä¸è¬,*,*,é§å°å¹³,ãã¦ã·ã§ã¦ãã¤,ãã¼ã·ã§ã¼ãã¼,3/6,* é§è¾,1349,1349,516,åè©,åºæåè©,人å,ä¸è¬,*,*,é§è¾,ãã¦ã¬ã¤,ãã¼ã¬ã¤,1/4,* |
|
From: Keiichiro O. <ur...@us...> - 2016-12-25 02:17:09
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23577/mecab Modified Files: COPYING Log Message: change mecab API from c to c++ Index: COPYING =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/COPYING,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** COPYING 23 Dec 2015 03:54:46 -0000 1.8 --- COPYING 25 Dec 2016 02:17:07 -0000 1.9 *************** *** 35,39 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 35,39 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2016 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2015-12-25 01:17:05
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7183/mecab/src Modified Files: dictionary.cpp Log Message: add CR code checker to dict compiler Index: dictionary.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/dictionary.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dictionary.cpp 23 Dec 2015 03:54:47 -0000 1.4 --- dictionary.cpp 25 Dec 2015 01:17:03 -0000 1.5 *************** *** 326,329 **** --- 326,343 ---- while (is->getline(line.get(), line.size())) { + #if 1 /* for Open JTalk */ + { + /* if there is CR code, it should be removed */ + char *tmpstr = line.get(); + if(tmpstr != NULL){ + size_t tmplen = strlen(tmpstr); + if(tmplen > 0){ + if(tmpstr[tmplen-1] == '\r'){ + tmpstr[tmplen-1] = '\0'; + } + } + } + } + #endif char *col[8]; const size_t n = tokenizeCSV(line.get(), col, 5); |
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 08:27:57
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5043/njd_set_long_vowel Modified Files: njd_set_long_vowel.c Log Message: remove compile error in long vowel estimator Index: njd_set_long_vowel.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** njd_set_long_vowel.c 23 Dec 2015 03:54:48 -0000 1.10 --- njd_set_long_vowel.c 23 Dec 2015 08:27:54 -0000 1.11 *************** *** 119,126 **** { #if 1 ! { /* long vowel estimator is deprecated */ ! return; ! } ! #endif int i, j; NJDNode *node; --- 119,125 ---- { #if 1 ! /* long vowel estimator is deprecated */ ! return; ! #else int i, j; NJDNode *node; *************** *** 155,158 **** --- 154,158 ---- NJDNode_set_pron(node, buff); } + #endif } |
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 03:55:19
|
Update of /cvsroot/open-jtalk/open_jtalk/src/jpcommon In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23707/jpcommon Modified Files: jpcommon.c jpcommon.h jpcommon_label.c jpcommon_node.c jpcommon_rule_ascii_for_euc_jp.h jpcommon_rule_ascii_for_shift_jis.h jpcommon_rule_ascii_for_utf_8.h jpcommon_rule_euc_jp.h jpcommon_rule_shift_jis.h jpcommon_rule_utf_8.h Log Message: update copyright. modify digit rules. assume unknown input as pause. Index: jpcommon_rule_ascii_for_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_ascii_for_shift_jis.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jpcommon_rule_ascii_for_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.4 --- jpcommon_rule_ascii_for_shift_jis.h 23 Dec 2015 03:54:46 -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 */ /* */ *************** *** 156,160 **** "\x83\x66\x83\x85", "dy", "u", "\x83\x66\x83\x83", "dy", "a", - "\x83\x66\x83\x46", "dy", "e", "\x83\x66\x83\x42", "d", "i", "\x83\x66", "d", "e", --- 156,159 ---- Index: jpcommon_node.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_node.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jpcommon_node.c 11 Dec 2014 05:12:14 -0000 1.8 --- jpcommon_node.c 23 Dec 2015 03:54:46 -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: jpcommon_rule_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_utf_8.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** jpcommon_rule_utf_8.h 22 Dec 2014 02:08:53 -0000 1.10 --- jpcommon_rule_utf_8.h 23 Dec 2015 03:54:46 -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 */ /* */ *************** *** 156,160 **** "ãã¥", "dy", "u", "ãã£", "dy", "a", - "ãã§", "dy", "e", "ãã£", "d", "i", "ã", "d", "e", --- 156,159 ---- Index: jpcommon_rule_ascii_for_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_ascii_for_utf_8.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jpcommon_rule_ascii_for_utf_8.h 22 Dec 2014 02:08:53 -0000 1.4 --- jpcommon_rule_ascii_for_utf_8.h 23 Dec 2015 03:54:46 -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 */ /* */ *************** *** 156,160 **** "\xe3\x83\x87\xe3\x83\xa5", "dy", "u", "\xe3\x83\x87\xe3\x83\xa3", "dy", "a", - "\xe3\x83\x87\xe3\x82\xa7", "dy", "e", "\xe3\x83\x87\xe3\x82\xa3", "d", "i", "\xe3\x83\x87", "d", "e", --- 156,159 ---- Index: jpcommon_rule_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_shift_jis.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** jpcommon_rule_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.10 --- jpcommon_rule_shift_jis.h 23 Dec 2015 03:54:46 -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 */ /* */ *************** *** 156,160 **** "f ", "dy", "u", "f", "dy", "a", - "fF", "dy", "e", "fB", "d", "i", "f", "d", "e", --- 156,159 ---- Index: jpcommon_rule_ascii_for_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_ascii_for_euc_jp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jpcommon_rule_ascii_for_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.4 --- jpcommon_rule_ascii_for_euc_jp.h 23 Dec 2015 03:54:46 -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 */ /* */ *************** *** 156,160 **** "\xa5\xc7\xa5\xe5", "dy", "u", "\xa5\xc7\xa5\xe3", "dy", "a", - "\xa5\xc7\xa5\xa7", "dy", "e", "\xa5\xc7\xa5\xa3", "d", "i", "\xa5\xc7", "d", "e", --- 156,159 ---- Index: jpcommon.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jpcommon.h 11 Dec 2014 05:12:14 -0000 1.8 --- jpcommon.h 23 Dec 2015 03:54:46 -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: jpcommon_label.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_label.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** jpcommon_label.c 11 Dec 2014 05:12:14 -0000 1.14 --- jpcommon_label.c 23 Dec 2015 03:54:46 -0000 1.15 *************** *** 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: jpcommon_rule_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_euc_jp.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** jpcommon_rule_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.10 --- jpcommon_rule_euc_jp.h 23 Dec 2015 03:54:46 -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 */ /* */ *************** *** 156,160 **** "¥Ç¥å", "dy", "u", "¥Ç¥ã", "dy", "a", - "¥Ç¥§", "dy", "e", "¥Ç¥£", "d", "i", "¥Ç", "d", "e", --- 156,159 ---- Index: jpcommon.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jpcommon.c 11 Dec 2014 05:12:14 -0000 1.8 --- jpcommon.c 23 Dec 2015 03:54:46 -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 */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 03:55:18
|
Update of /cvsroot/open-jtalk/open_jtalk/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23707 Modified Files: COPYING NEWS README configure.ac Log Message: update copyright. modify digit rules. assume unknown input as pause. Index: README =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/README,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** README 11 Dec 2014 05:12:14 -0000 1.16 --- README 23 Dec 2015 03:54:46 -0000 1.17 *************** *** 1,5 **** =============================================================================== ! The Japanese TTS System "Open JTalk" version 1.08 ! release December 25, 2014 --- 1,5 ---- =============================================================================== ! The Japanese TTS System "Open JTalk" version 1.09 ! release December 25, 2015 *************** *** 25,29 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 25,29 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 101,105 **** (Design and Development, Main Maintainer) Kei Hashimoto http://www.sp.nitech.ac.jp/~bonanza/ - Sayaka Shiota http://www.sp.nitech.ac.jp/~sayaka/ Shinji Takaki http://www.sp.nitech.ac.jp/~k-prr44/ Heiga Zen --- 101,104 ---- Index: NEWS =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/NEWS,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** NEWS 25 Dec 2014 10:13:51 -0000 1.13 --- NEWS 23 Dec 2015 03:54:46 -0000 1.14 *************** *** 1,2 **** --- 1,10 ---- + Version 1.09: + * change default charset from EUC-JP to UTF-8. + * add long vowels to dictionary instead of njd_set_long_vowel function. + * modify digit rules. + * assume unknown input as pause. + * update dictionary. + * fix some bugs. + Version 1.08: * add '-g' option for changing volume. Index: configure.ac =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/configure.ac,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** configure.ac 11 Dec 2014 05:12:14 -0000 1.12 --- configure.ac 23 Dec 2015 03:54:46 -0000 1.13 *************** *** 1,7 **** # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) ! AC_INIT(open_jtalk, 1.08, ope...@li...) AC_CONFIG_AUX_DIR([config]) ! AC_COPYRIGHT(Copyright 2008-2014 Nagoya Institute of Technology) AM_INIT_AUTOMAKE --- 1,7 ---- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) ! AC_INIT(open_jtalk, 1.09, ope...@li...) AC_CONFIG_AUX_DIR([config]) ! AC_COPYRIGHT(Copyright 2008-2015 Nagoya Institute of Technology) AM_INIT_AUTOMAKE *************** *** 257,261 **** [ --with-charset specify charset (EUC-JP/SHIFT_JIS/UTF-8)], [charset=$withval], ! [charset='euc-jp']) AC_MSG_CHECKING(charset) AC_MSG_RESULT($charset) --- 257,261 ---- [ --with-charset specify charset (EUC-JP/SHIFT_JIS/UTF-8)], [charset=$withval], ! [charset='UTF-8']) AC_MSG_CHECKING(charset) AC_MSG_RESULT($charset) *************** *** 279,282 **** --- 279,284 ---- if test x$charset = xeucjp -o x$charset = xeuc-jp -o x$charset = xeuc_jp -o x$charset = xEUCJP -o x$charset = xEUC-JP -o x$charset = xEUC_JP ; then CHARSET="-D CHARSET_EUC_JP" + CFLAGS="$CFLAGS -finput-charset=EUC-JP -fexec-charset=EUC-JP " + CXXFLAGS="$CXXFLAGS -finput-charset=EUC-JP -fexec-charset=EUC-JP " elif test x$charset = xsjis -o x$charset = xshift-jis -o x$charset = xshift_jis -o x$charset = xSJIS -o x$charset = xSHIFT-JIS -o x$charset = xSHIFT_JIS ; then CHARSET="-D CHARSET_SHIFT_JIS" Index: COPYING =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/COPYING,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** COPYING 11 Dec 2014 05:12:14 -0000 1.9 --- COPYING 23 Dec 2015 03:54:46 -0000 1.10 *************** *** 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 */ /* */ |
|
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; |
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 03:54:50
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23707/njd_set_long_vowel Modified Files: njd_set_long_vowel.c njd_set_long_vowel.h njd_set_long_vowel_rule_ascii_for_euc_jp.h njd_set_long_vowel_rule_ascii_for_shift_jis.h njd_set_long_vowel_rule_ascii_for_utf_8.h njd_set_long_vowel_rule_euc_jp.h njd_set_long_vowel_rule_shift_jis.h njd_set_long_vowel_rule_utf_8.h Log Message: update copyright. modify digit rules. assume unknown input as pause. Index: njd_set_long_vowel.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd_set_long_vowel.h 11 Dec 2014 05:12:15 -0000 1.8 --- njd_set_long_vowel.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_long_vowel_rule_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel_rule_euc_jp.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_long_vowel_rule_euc_jp.h 11 Dec 2014 05:12:15 -0000 1.9 --- njd_set_long_vowel_rule_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.10 *************** *** 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_long_vowel.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_long_vowel.c 11 Dec 2014 05:12:15 -0000 1.9 --- njd_set_long_vowel.c 23 Dec 2015 03:54:48 -0000 1.10 *************** *** 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 */ /* */ *************** *** 118,121 **** --- 118,126 ---- void njd_set_long_vowel(NJD * njd) { + #if 1 + { /* long vowel estimator is deprecated */ + return; + } + #endif int i, j; NJDNode *node; Index: njd_set_long_vowel_rule_ascii_for_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel_rule_ascii_for_euc_jp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** njd_set_long_vowel_rule_ascii_for_euc_jp.h 11 Dec 2014 05:12:15 -0000 1.3 --- njd_set_long_vowel_rule_ascii_for_euc_jp.h 23 Dec 2015 03:54:48 -0000 1.4 *************** *** 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_long_vowel_rule_ascii_for_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel_rule_ascii_for_shift_jis.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** njd_set_long_vowel_rule_ascii_for_shift_jis.h 11 Dec 2014 05:12:15 -0000 1.3 --- njd_set_long_vowel_rule_ascii_for_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.4 *************** *** 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_long_vowel_rule_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel_rule_shift_jis.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_long_vowel_rule_shift_jis.h 11 Dec 2014 05:12:15 -0000 1.9 --- njd_set_long_vowel_rule_shift_jis.h 23 Dec 2015 03:54:48 -0000 1.10 *************** *** 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_long_vowel_rule_ascii_for_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel_rule_ascii_for_utf_8.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** njd_set_long_vowel_rule_ascii_for_utf_8.h 11 Dec 2014 05:12:15 -0000 1.3 --- njd_set_long_vowel_rule_ascii_for_utf_8.h 23 Dec 2015 03:54:48 -0000 1.4 *************** *** 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_long_vowel_rule_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_long_vowel/njd_set_long_vowel_rule_utf_8.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_long_vowel_rule_utf_8.h 11 Dec 2014 05:12:15 -0000 1.9 --- njd_set_long_vowel_rule_utf_8.h 23 Dec 2015 03:54:48 -0000 1.10 *************** *** 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 */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 03:54:49
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab2njd In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23707/mecab2njd Modified Files: mecab2njd.c mecab2njd.h Log Message: update copyright. modify digit rules. assume unknown input as pause. Index: mecab2njd.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab2njd/mecab2njd.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mecab2njd.c 11 Dec 2014 05:12:15 -0000 1.8 --- mecab2njd.c 23 Dec 2015 03:54:47 -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: mecab2njd.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab2njd/mecab2njd.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mecab2njd.h 11 Dec 2014 05:12:15 -0000 1.8 --- mecab2njd.h 23 Dec 2015 03:54:47 -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 */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2014-12-30 04:58:32
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4342/mecab-naist-jdic Modified Files: char.def Log Message: Modify byte sequence in dictionary: suggested by Open JTalk users. Index: char.def =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic/char.def,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** char.def 16 Dec 2009 16:01:01 -0000 1.1 --- char.def 30 Dec 2014 04:58:28 -0000 1.2 *************** *** 35,39 **** # SPACE 0x0020 SPACE # DO NOT REMOVE THIS LINE, 0x0020 is reserved for SPACE ! 0x00D0 SPACE 0x0009 SPACE 0x000B SPACE --- 35,39 ---- # SPACE 0x0020 SPACE # DO NOT REMOVE THIS LINE, 0x0020 is reserved for SPACE ! 0x000D SPACE 0x0009 SPACE 0x000B SPACE |
|
From: Keiichiro O. <ur...@us...> - 2014-12-22 04:45:25
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26249/mecab/src Modified Files: utils.cpp Log Message: remove stdint.h for Windows. Index: utils.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/utils.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** utils.cpp 11 Dec 2014 07:06:48 -0000 1.10 --- utils.cpp 22 Dec 2014 04:45:23 -0000 1.11 *************** *** 67,73 **** #include <windows.h> #include <stdlib.h> #endif ! #include <stdint.h> /* for Open JTalk --- 67,75 ---- #include <windows.h> #include <stdlib.h> + #else + #include <stdint.h> /* for Open JTalk */ #endif ! /* for Open JTalk |
|
From: Keiichiro O. <ur...@us...> - 2014-12-22 02:08:56
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21330/njd_set_pronunciation Modified Files: 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: remove mora 'tye' 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** njd_set_pronunciation_rule_ascii_for_utf_8.h 11 Dec 2014 05:09:07 -0000 1.3 --- njd_set_pronunciation_rule_ascii_for_utf_8.h 22 Dec 2014 02:08:53 -0000 1.4 *************** *** 143,147 **** "\xe3\x83\x86\xe3\x83\xa5", "\xe3\x83\x86\xe3\x83\xa5", "1", "\xe3\x83\x86\xe3\x83\xa3", "\xe3\x83\x86\xe3\x83\xa3", "1", - "\xe3\x83\x86\xe3\x82\xa7", "\xe3\x83\x86\xe3\x82\xa7", "1", "\xe3\x83\x86\xe3\x82\xa3", "\xe3\x83\x86\xe3\x82\xa3", "1", "\xe3\x83\x86", "\xe3\x83\x86", "1", --- 143,146 ---- *************** *** 295,299 **** "\xe3\x81\xa6\xe3\x82\x85", "\xe3\x83\x86\xe3\x83\xa5", "1", "\xe3\x81\xa6\xe3\x82\x83", "\xe3\x83\x86\xe3\x83\xa3", "1", - "\xe3\x81\xa6\xe3\x81\x87", "\xe3\x83\x86\xe3\x82\xa7", "1", "\xe3\x81\xa6\xe3\x81\x83", "\xe3\x83\x86\xe3\x82\xa3", "1", "\xe3\x81\xa6", "\xe3\x83\x86", "1", --- 294,297 ---- 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** njd_set_pronunciation_rule_ascii_for_euc_jp.h 11 Dec 2014 05:09:07 -0000 1.3 --- njd_set_pronunciation_rule_ascii_for_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.4 *************** *** 143,147 **** "\xa5\xc6\xa5\xe5", "\xa5\xc6\xa5\xe5", "1", "\xa5\xc6\xa5\xe3", "\xa5\xc6\xa5\xe3", "1", - "\xa5\xc6\xa5\xa7", "\xa5\xc6\xa5\xa7", "1", "\xa5\xc6\xa5\xa3", "\xa5\xc6\xa5\xa3", "1", "\xa5\xc6", "\xa5\xc6", "1", --- 143,146 ---- *************** *** 295,299 **** "\xa4\xc6\xa4\xe5", "\xa5\xc6\xa5\xe5", "1", "\xa4\xc6\xa4\xe3", "\xa5\xc6\xa5\xe3", "1", - "\xa4\xc6\xa4\xa7", "\xa5\xc6\xa5\xa7", "1", "\xa4\xc6\xa4\xa3", "\xa5\xc6\xa5\xa3", "1", "\xa4\xc6", "\xa5\xc6", "1", --- 294,297 ---- 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.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_pronunciation_rule_euc_jp.h 11 Dec 2014 05:09:07 -0000 1.9 --- njd_set_pronunciation_rule_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.10 *************** *** 143,147 **** "¥Æ¥å", "¥Æ¥å", "1", "¥Æ¥ã", "¥Æ¥ã", "1", - "¥Æ¥§", "¥Æ¥§", "1", "¥Æ¥£", "¥Æ¥£", "1", "¥Æ", "¥Æ", "1", --- 143,146 ---- *************** *** 295,299 **** "¤Æ¤å", "¥Æ¥å", "1", "¤Æ¤ã", "¥Æ¥ã", "1", - "¤Æ¤§", "¥Æ¥§", "1", "¤Æ¤£", "¥Æ¥£", "1", "¤Æ", "¥Æ", "1", --- 294,297 ---- 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.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_pronunciation_rule_shift_jis.h 11 Dec 2014 05:09:07 -0000 1.9 --- njd_set_pronunciation_rule_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.10 *************** *** 143,147 **** "e ", "e ", "1", "e", "e", "1", - "eF", "eF", "1", "eB", "eB", "1", "e", "e", "1", --- 143,146 ---- *************** *** 295,299 **** "Äã", "e ", "1", "Äá", "e", "1", - "Ä¥", "eF", "1", "Ä¡", "eB", "1", "Ä", "e", "1", --- 294,297 ---- 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** njd_set_pronunciation_rule_ascii_for_shift_jis.h 11 Dec 2014 05:09:07 -0000 1.3 --- njd_set_pronunciation_rule_ascii_for_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.4 *************** *** 143,147 **** "\x83\x65\x83\x85", "\x83\x65\x83\x85", "1", "\x83\x65\x83\x83", "\x83\x65\x83\x83", "1", - "\x83\x65\x83\x46", "\x83\x65\x83\x46", "1", "\x83\x65\x83\x42", "\x83\x65\x83\x42", "1", "\x83\x65", "\x83\x65", "1", --- 143,146 ---- *************** *** 295,299 **** "\x82\xc4\x82\xe3", "\x83\x65\x83\x85", "1", "\x82\xc4\x82\xe1", "\x83\x65\x83\x83", "1", - "\x82\xc4\x82\xa5", "\x83\x65\x83\x46", "1", "\x82\xc4\x82\xa1", "\x83\x65\x83\x42", "1", "\x82\xc4", "\x83\x65", "1", --- 294,297 ---- 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.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_pronunciation_rule_utf_8.h 11 Dec 2014 05:09:07 -0000 1.9 --- njd_set_pronunciation_rule_utf_8.h 22 Dec 2014 02:08:53 -0000 1.10 *************** *** 143,147 **** "ãã¥", "ãã¥", "1", "ãã£", "ãã£", "1", - "ãã§", "ãã§", "1", "ãã£", "ãã£", "1", "ã", "ã", "1", --- 143,146 ---- *************** *** 295,299 **** "ã¦ã ", "ãã¥", "1", "ã¦ã", "ãã£", "1", - "ã¦ã", "ãã§", "1", "ã¦ã", "ãã£", "1", "ã¦", "ã", "1", --- 294,297 ---- |
|
From: Keiichiro O. <ur...@us...> - 2014-12-22 02:08:55
|
Update of /cvsroot/open-jtalk/open_jtalk/src/jpcommon In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21330/jpcommon Modified Files: jpcommon_rule_ascii_for_euc_jp.h jpcommon_rule_ascii_for_shift_jis.h jpcommon_rule_ascii_for_utf_8.h jpcommon_rule_euc_jp.h jpcommon_rule_shift_jis.h jpcommon_rule_utf_8.h Log Message: remove mora 'tye' Index: jpcommon_rule_ascii_for_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_ascii_for_shift_jis.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jpcommon_rule_ascii_for_shift_jis.h 11 Dec 2014 05:12:14 -0000 1.3 --- jpcommon_rule_ascii_for_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.4 *************** *** 162,166 **** "\x83\x65\x83\x85", "ty", "u", "\x83\x65\x83\x83", "ty", "a", - "\x83\x65\x83\x46", "ty", "e", "\x83\x65\x83\x42", "t", "i", "\x83\x65", "t", "e", --- 162,165 ---- Index: jpcommon_rule_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_utf_8.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** jpcommon_rule_utf_8.h 11 Dec 2014 05:12:15 -0000 1.9 --- jpcommon_rule_utf_8.h 22 Dec 2014 02:08:53 -0000 1.10 *************** *** 162,166 **** "ãã¥", "ty", "u", "ãã£", "ty", "a", - "ãã§", "ty", "e", "ãã£", "t", "i", "ã", "t", "e", --- 162,165 ---- Index: jpcommon_rule_ascii_for_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_ascii_for_utf_8.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jpcommon_rule_ascii_for_utf_8.h 11 Dec 2014 05:12:14 -0000 1.3 --- jpcommon_rule_ascii_for_utf_8.h 22 Dec 2014 02:08:53 -0000 1.4 *************** *** 162,166 **** "\xe3\x83\x86\xe3\x83\xa5", "ty", "u", "\xe3\x83\x86\xe3\x83\xa3", "ty", "a", - "\xe3\x83\x86\xe3\x82\xa7", "ty", "e", "\xe3\x83\x86\xe3\x82\xa3", "t", "i", "\xe3\x83\x86", "t", "e", --- 162,165 ---- Index: jpcommon_rule_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_shift_jis.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** jpcommon_rule_shift_jis.h 11 Dec 2014 05:12:14 -0000 1.9 --- jpcommon_rule_shift_jis.h 22 Dec 2014 02:08:53 -0000 1.10 *************** *** 162,166 **** "e ", "ty", "u", "e", "ty", "a", - "eF", "ty", "e", "eB", "t", "i", "e", "t", "e", --- 162,165 ---- Index: jpcommon_rule_ascii_for_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_ascii_for_euc_jp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jpcommon_rule_ascii_for_euc_jp.h 11 Dec 2014 05:12:14 -0000 1.3 --- jpcommon_rule_ascii_for_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.4 *************** *** 162,166 **** "\xa5\xc6\xa5\xe5", "ty", "u", "\xa5\xc6\xa5\xe3", "ty", "a", - "\xa5\xc6\xa5\xa7", "ty", "e", "\xa5\xc6\xa5\xa3", "t", "i", "\xa5\xc6", "t", "e", --- 162,165 ---- Index: jpcommon_rule_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/jpcommon/jpcommon_rule_euc_jp.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** jpcommon_rule_euc_jp.h 11 Dec 2014 05:12:14 -0000 1.9 --- jpcommon_rule_euc_jp.h 22 Dec 2014 02:08:53 -0000 1.10 *************** *** 162,166 **** "¥Æ¥å", "ty", "u", "¥Æ¥ã", "ty", "a", - "¥Æ¥§", "ty", "e", "¥Æ¥£", "t", "i", "¥Æ", "t", "e", --- 162,165 ---- |
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19535/mecab/src Modified Files: Makefile.am char_property.h dictionary.cpp dictionary.h dictionary_compiler.cpp dictionary_generator.cpp feature_index.cpp learner.cpp learner_tagger.cpp libmecab.cpp mecab.h mmap.h string_buffer.h tagger.cpp thread.h tokenizer.cpp tokenizer.h utils.cpp viterbi.cpp viterbi.h winmain.h Removed Files: viterbisub.h Log Message: update MeCab to 0.996 --- viterbisub.h DELETED --- Index: utils.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/utils.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** utils.cpp 11 Dec 2014 05:12:15 -0000 1.9 --- utils.cpp 11 Dec 2014 07:06:48 -0000 1.10 *************** *** 69,72 **** --- 69,74 ---- #endif + #include <stdint.h> + /* for Open JTalk #if defined(_WIN32) && !defined(__CYGWIN__) *************** *** 400,404 **** if (vt != 0) { scoped_fixed_array<wchar_t, _MAX_DRIVE> drive; ! scoped_fixed_array<wchar_t, _MAX_DRIVE> dir; _wsplitpath(v.get(), drive.get(), dir.get(), NULL, NULL); const std::wstring path = --- 402,406 ---- if (vt != 0) { scoped_fixed_array<wchar_t, _MAX_DRIVE> drive; ! scoped_fixed_array<wchar_t, _MAX_DIR> dir; _wsplitpath(v.get(), drive.get(), dir.get(), NULL, NULL); const std::wstring path = *************** *** 456,460 **** #else // defined(_MSC_VER) ! #define FORCE_INLINE __attribute__((always_inline)) inline uint32_t rotl32 ( uint32_t x, uint8_t r ) { --- 458,462 ---- #else // defined(_MSC_VER) ! #define FORCE_INLINE inline __attribute__((always_inline)) inline uint32_t rotl32 ( uint32_t x, uint8_t r ) { Index: viterbi.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/viterbi.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** viterbi.cpp 11 Jun 2012 15:28:36 -0000 1.5 --- viterbi.cpp 11 Dec 2014 07:06:48 -0000 1.6 *************** *** 38,63 **** } } - - bool partial_match(const char *f1, const char *f2) { - scoped_fixed_array<char, BUF_SIZE> buf1; - scoped_fixed_array<char, BUF_SIZE> buf2; - scoped_fixed_array<char *, 64> c1; - scoped_fixed_array<char *, 64> c2; - - std::strncpy(buf1.get(), f1, buf1.size()); - std::strncpy(buf2.get(), f2, buf2.size()); - - const size_t n1 = MeCab::tokenizeCSV(buf1.get(), c1.get(), c1.size()); - const size_t n2 = MeCab::tokenizeCSV(buf2.get(), c2.get(), c2.size()); - const size_t n = std::min(n1, n2); - - for (size_t i = 0; i < n; ++i) { - if (std::strcmp(c1[i], "*") != 0 && - std::strcmp(c1[i], c2[i]) != 0) { - return false; - } - } - return true; - } } // namespace --- 38,41 ---- *************** *** 99,111 **** } if (lattice->has_request_type(MECAB_NBEST) || lattice->has_request_type(MECAB_MARGINAL_PROB)) { ! if (!viterbiWithAllPath(lattice)) { ! return false; } } else { ! if (!viterbi(lattice)) { ! return false; } } --- 77,100 ---- } + bool result = false; if (lattice->has_request_type(MECAB_NBEST) || lattice->has_request_type(MECAB_MARGINAL_PROB)) { ! // IsAllPath=true ! if (lattice->has_constraint()) { ! result = viterbi<true, true>(lattice); ! } else { ! result = viterbi<true, false>(lattice); } } else { ! // IsAllPath=false ! if (lattice->has_constraint()) { ! result = viterbi<false, true>(lattice); ! } else { ! result = viterbi<false, false>(lattice); ! } } + + if (!result) { + return false; } *************** *** 207,210 **** --- 196,228 ---- // static + bool Viterbi::buildAlternative(Lattice *lattice) { + Node **begin_node_list = lattice->begin_nodes(); + + const Node *bos_node = lattice->bos_node(); + for (const Node *node = bos_node; node; node = node->next) { + if (node->stat == MECAB_BOS_NODE || node->stat == MECAB_EOS_NODE) { + continue; + } + const size_t pos = node->surface - lattice->sentence() - + node->rlength + node->length; + std::cout.write(node->surface, node->length); + std::cout << "\t" << node->feature << std::endl; + for (const Node *anode = begin_node_list[pos]; + anode; anode = anode->bnext) { + if (anode->rlength == node->rlength && + anode->length == node->length) { + std::cout << "@ "; + std::cout.write(anode->surface, anode->length); + std::cout << "\t" << anode->feature << std::endl; + } + } + } + + std::cout << "EOS" << std::endl; + + return true; + } + + // static bool Viterbi::buildBestLattice(Lattice *lattice) { Node *node = lattice->eos_node(); *************** *** 231,234 **** --- 249,257 ---- bool Viterbi::initPartial(Lattice *lattice) { if (!lattice->has_request_type(MECAB_PARTIAL)) { + if (lattice->has_constraint()) { + lattice->set_boundary_constraint(0, MECAB_TOKEN_BOUNDARY); + lattice->set_boundary_constraint(lattice->size(), + MECAB_TOKEN_BOUNDARY); + } return true; } *************** *** 240,258 **** std::vector<char *> lines; const size_t lsize = tokenize(str, "\n", ! std::back_inserter(lines), 0xffff); ! if (lsize >= 0xffff) { ! lattice->set_what("too long lines"); ! return false; ! } ! char* column[2]; scoped_array<char> buf(new char[lattice->size() + 1]); StringBuffer os(buf.get(), lattice->size() + 1); - os << ' '; std::vector<std::pair<char *, char *> > tokens; tokens.reserve(lsize); ! size_t pos = 1; for (size_t i = 0; i < lsize; ++i) { const size_t size = tokenize(lines[i], "\t", column, 2); --- 263,276 ---- std::vector<char *> lines; const size_t lsize = tokenize(str, "\n", ! std::back_inserter(lines), ! lattice->size() + 1); char* column[2]; scoped_array<char> buf(new char[lattice->size() + 1]); StringBuffer os(buf.get(), lattice->size() + 1); std::vector<std::pair<char *, char *> > tokens; tokens.reserve(lsize); ! size_t pos = 0; for (size_t i = 0; i < lsize; ++i) { const size_t size = tokenize(lines[i], "\t", column, 2); *************** *** 261,265 **** } const size_t len = std::strlen(column[0]); - os << column[0] << ' '; if (size == 2) { tokens.push_back(std::make_pair(column[0], column[1])); --- 279,282 ---- *************** *** 267,298 **** tokens.push_back(std::make_pair(column[0], reinterpret_cast<char *>(0))); } ! pos += len + 1; } os << '\0'; - lattice->set_sentence(os.str(), pos - 1); ! pos = 1; ! Node **begin_node_list = lattice->begin_nodes(); for (size_t i = 0; i < tokens.size(); ++i) { const char *surface = tokens[i].first; const char *feature = tokens[i].second; const size_t len = std::strlen(surface); if (feature) { ! if (*feature == '\0') { ! lattice->set_what("use \\t as separator"); ! return false; } - Node *node = allocator->newNode(); - node->surface = surface; - node->feature = feature; - node->length = len; - node->rlength = len + 1; - node->bnext = 0; - node->wcost = 0; - begin_node_list[pos - 1] = node; } ! pos += len + 1; } --- 284,310 ---- tokens.push_back(std::make_pair(column[0], reinterpret_cast<char *>(0))); } ! os << column[0]; ! pos += len; } os << '\0'; ! lattice->set_sentence(os.str()); + pos = 0; for (size_t i = 0; i < tokens.size(); ++i) { const char *surface = tokens[i].first; const char *feature = tokens[i].second; const size_t len = std::strlen(surface); + lattice->set_boundary_constraint(pos, MECAB_TOKEN_BOUNDARY); + lattice->set_boundary_constraint(pos + len, MECAB_TOKEN_BOUNDARY); if (feature) { ! lattice->set_feature_constraint(pos, pos + len, feature); ! for (size_t n = 1; n < len; ++n) { ! lattice->set_boundary_constraint(pos + n, ! MECAB_INSIDE_TOKEN); } } ! pos += len; } *************** *** 300,340 **** } ! // static ! Node *Viterbi::filterNode(Node *constrained_node, Node *node) { ! if (!constrained_node) { ! return node; ! } ! Node *prev = 0; ! Node *result = 0; ! for (Node *n = node; n; n = n->bnext) { ! if (constrained_node->length == n->length && ! (std::strcmp(constrained_node->feature, "*") == 0 || ! partial_match(constrained_node->feature, n->feature))) { ! if (prev) { ! prev->bnext = n; ! prev = n; ! } else { ! result = n; ! prev = result; } } } ! if (!result) { ! result = constrained_node; } ! if (prev) { ! prev->bnext = 0; } ! return result; } } ! #undef VITERBI_WITH_ALL_PATH_ ! #include "viterbisub.h" ! #define VITERBI_WITH_ALL_PATH_ ! #include "viterbisub.h" --- 312,413 ---- } ! namespace { ! template <bool IsAllPath> bool connect(size_t pos, Node *rnode, ! Node **begin_node_list, ! Node **end_node_list, ! const Connector *connector, ! Allocator<Node, Path> *allocator) { ! for (;rnode; rnode = rnode->bnext) { ! register long best_cost = 2147483647; ! Node* best_node = 0; ! for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) { ! register int lcost = connector->cost(lnode, rnode); // local cost ! register long cost = lnode->cost + lcost; ! if (cost < best_cost) { ! best_node = lnode; ! best_cost = cost; ! } ! if (IsAllPath) { ! Path *path = allocator->newPath(); ! path->cost = lcost; ! path->rnode = rnode; ! path->lnode = lnode; ! path->lnext = rnode->lpath; ! rnode->lpath = path; ! path->rnext = lnode->rpath; ! lnode->rpath = path; } } + + // overflow check 2003/03/09 + if (!best_node) { + return false; } ! rnode->prev = best_node; ! rnode->next = 0; ! rnode->cost = best_cost; ! const size_t x = rnode->rlength + pos; ! rnode->enext = end_node_list[x]; ! end_node_list[x] = rnode; } ! return true; } + } // namespace ! template <bool IsAllPath, bool IsPartial> ! bool Viterbi::viterbi(Lattice *lattice) const { ! Node **end_node_list = lattice->end_nodes(); ! Node **begin_node_list = lattice->begin_nodes(); ! Allocator<Node, Path> *allocator = lattice->allocator(); ! const size_t len = lattice->size(); ! const char *begin = lattice->sentence(); ! const char *end = begin + len; ! ! Node *bos_node = tokenizer_->getBOSNode(lattice->allocator()); ! bos_node->surface = lattice->sentence(); ! end_node_list[0] = bos_node; ! ! for (size_t pos = 0; pos < len; ++pos) { ! if (end_node_list[pos]) { ! Node *right_node = tokenizer_->lookup<IsPartial>(begin + pos, end, ! allocator, lattice); ! begin_node_list[pos] = right_node; ! if (!connect<IsAllPath>(pos, right_node, ! begin_node_list, ! end_node_list, ! connector_.get(), ! allocator)) { ! lattice->set_what("too long sentence."); ! return false; ! } } } ! Node *eos_node = tokenizer_->getEOSNode(lattice->allocator()); ! eos_node->surface = lattice->sentence() + lattice->size(); ! begin_node_list[lattice->size()] = eos_node; ! ! for (long pos = len; static_cast<long>(pos) >= 0; --pos) { ! if (end_node_list[pos]) { ! if (!connect<IsAllPath>(pos, eos_node, ! begin_node_list, ! end_node_list, ! connector_.get(), ! allocator)) { ! lattice->set_what("too long sentence."); ! return false; ! } ! break; ! } ! } ! ! end_node_list[0] = bos_node; ! begin_node_list[lattice->size()] = eos_node; ! ! return true; ! } ! } // Mecab Index: tokenizer.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/tokenizer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tokenizer.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- tokenizer.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 40,45 **** template class Tokenizer<Node, Path>; template class Tokenizer<LearnerNode, LearnerPath>; - - #if __GNUC__ >= 4 template Tokenizer<Node, Path>::Tokenizer(); template void Tokenizer<Node, Path>::close(); --- 40,43 ---- *************** *** 48,54 **** template Node* Tokenizer<Node, Path>::getBOSNode(Allocator<Node, Path> *) const; template Node* Tokenizer<Node, Path>::getEOSNode(Allocator<Node, Path> *) const; ! template Node* Tokenizer<Node, Path>::lookup(const char*, const char*, ! Allocator<Node, Path> *) const; template bool Tokenizer<Node, Path>::open(const Param &); template Tokenizer<LearnerNode, LearnerPath>::Tokenizer(); --- 46,59 ---- template Node* Tokenizer<Node, Path>::getBOSNode(Allocator<Node, Path> *) const; template Node* Tokenizer<Node, Path>::getEOSNode(Allocator<Node, Path> *) const; ! template Node* Tokenizer<Node, Path>::lookup<false>( ! const char *, ! const char *, ! Allocator<Node, Path> *, ! Lattice *) const; ! template Node* Tokenizer<Node, Path>::lookup<true>( ! const char *, const char*, ! Allocator<Node, Path> *, ! Lattice *) const; template bool Tokenizer<Node, Path>::open(const Param &); template Tokenizer<LearnerNode, LearnerPath>::Tokenizer(); *************** *** 60,70 **** template LearnerNode* Tokenizer<LearnerNode, LearnerPath>::getBOSNode( Allocator<LearnerNode, LearnerPath> *) const; ! template LearnerNode* ! Tokenizer<LearnerNode, LearnerPath>::lookup( const char*, const char*, ! Allocator<LearnerNode, LearnerPath> *) const; template bool Tokenizer<LearnerNode, LearnerPath>::open(const Param &); - #endif template <typename N, typename P> --- 65,73 ---- template LearnerNode* Tokenizer<LearnerNode, LearnerPath>::getBOSNode( Allocator<LearnerNode, LearnerPath> *) const; ! template LearnerNode *Tokenizer<LearnerNode, LearnerPath>::lookup<false>( const char*, const char*, ! Allocator<LearnerNode, LearnerPath> *, Lattice *) const; template bool Tokenizer<LearnerNode, LearnerPath>::open(const Param &); template <typename N, typename P> *************** *** 177,180 **** --- 180,232 ---- } + namespace { + inline bool partial_match(const char *f1, const char *f2) { + if (std::strcmp(f1, "*") == 0) { + return true; + } + + scoped_fixed_array<char, BUF_SIZE> buf1; + scoped_fixed_array<char, BUF_SIZE> buf2; + scoped_fixed_array<char *, 64> c1; + scoped_fixed_array<char *, 64> c2; + + std::strncpy(buf1.get(), f1, buf1.size()); + std::strncpy(buf2.get(), f2, buf2.size()); + + const size_t n1 = tokenizeCSV(buf1.get(), c1.get(), c1.size()); + const size_t n2 = tokenizeCSV(buf2.get(), c2.get(), c2.size()); + const size_t n = std::min(n1, n2); + + for (size_t i = 0; i < n; ++i) { + if (std::strcmp(c1[i], "*") != 0 && + std::strcmp(c1[i], c2[i]) != 0) { + return false; + } + } + + return true; + } + + template <typename N> + bool is_valid_node(const Lattice *lattice, N *node) { + const size_t end_pos = node->surface - lattice->sentence() + node->length; + if (lattice->boundary_constraint(end_pos) == MECAB_INSIDE_TOKEN) { + return false; + } + const size_t begin_pos = + node->surface - lattice->sentence() + node->length - node->rlength; + const char *feature = lattice->feature_constraint(begin_pos); + if (!feature) { + return true; + } + if (lattice->boundary_constraint(begin_pos) == MECAB_TOKEN_BOUNDARY && + lattice->boundary_constraint(end_pos) == MECAB_TOKEN_BOUNDARY && + partial_match(feature, node->feature)) { + return true; + } + return false; + } + } // namespace + #define ADDUNKNWON do { \ const Token *token = unk_tokens_[cinfo.default_type].first; \ *************** *** 187,198 **** new_node->length = begin3 - begin2; \ new_node->rlength = begin3 - begin; \ - new_node->bnext = result_node; \ new_node->stat = MECAB_UNK_NODE; \ if (unk_feature_.get()) new_node->feature = unk_feature_.get(); \ result_node = new_node; } } while (0) template <typename N, typename P> N *Tokenizer<N, P>::lookup(const char *begin, const char *end, ! Allocator<N, P> *allocator) const { CharInfo cinfo; N *result_node = 0; --- 239,252 ---- new_node->length = begin3 - begin2; \ new_node->rlength = begin3 - begin; \ new_node->stat = MECAB_UNK_NODE; \ + new_node->bnext = result_node; \ if (unk_feature_.get()) new_node->feature = unk_feature_.get(); \ + if (isPartial && !is_valid_node(lattice, new_node)) { continue; } \ result_node = new_node; } } while (0) template <typename N, typename P> + template <bool isPartial> N *Tokenizer<N, P>::lookup(const char *begin, const char *end, ! Allocator<N, P> *allocator, Lattice *lattice) const { CharInfo cinfo; N *result_node = 0; *************** *** 201,204 **** --- 255,269 ---- end = static_cast<size_t>(end - begin) >= 65535 ? begin + 65535 : end; + + if (isPartial) { + const size_t begin_pos = begin - lattice->sentence(); + for (size_t n = begin_pos + 1; n < lattice->size(); ++n) { + if (lattice->boundary_constraint(n) == MECAB_TOKEN_BOUNDARY) { + end = lattice->sentence() + n; + break; + } + } + } + const char *begin2 = property_.seekToOtherType(begin, end, space_, &cinfo, &mblen, &clen); *************** *** 225,228 **** --- 290,296 ---- new_node->stat = MECAB_NOR_NODE; new_node->char_type = cinfo.default_type; + if (isPartial && !is_valid_node(lattice, new_node)) { + continue; + } new_node->bnext = result_node; result_node = new_node; *************** *** 240,245 **** --- 308,315 ---- if (begin3 > end) { ADDUNKNWON; + if (result_node) { return result_node; } + } if (cinfo.group) { *************** *** 274,277 **** --- 344,375 ---- } + if (isPartial && !result_node) { + begin3 = begin2; + while (true) { + cinfo = property_.getCharInfo(begin3, end, &mblen); + begin3 += mblen; + if (begin3 > end || + lattice->boundary_constraint(begin3 - lattice->sentence()) + != MECAB_INSIDE_TOKEN) { + break; + } + } + ADDUNKNWON; + + if (!result_node) { + N *new_node = allocator->newNode(); + new_node->char_type = cinfo.default_type; + new_node->surface = begin2; + new_node->length = begin3 - begin2; + new_node->rlength = begin3 - begin; + new_node->stat = MECAB_UNK_NODE; + new_node->bnext = result_node; + new_node->feature = + lattice->feature_constraint(begin - lattice->sentence()); + CHECK_DIE(new_node->feature); + result_node = new_node; + } + } + return result_node; } Index: winmain.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/winmain.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** winmain.h 11 Dec 2014 05:12:15 -0000 1.3 --- winmain.h 11 Dec 2014 07:06:48 -0000 1.4 *************** *** 104,107 **** --- 104,110 ---- int wmain_to_main_wrapper(int argc, char **argv); + #if defined(__MINGW32__) + extern "C" + #endif int wmain(int argc, wchar_t **argv) { CommandLine cmd(argc, argv); Index: tagger.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/tagger.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tagger.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- tagger.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- #include <cstring> #include <iostream> + #include <iterator> #include "common.h" #include "connector.h" *************** *** 47,50 **** --- 48,53 ---- { "marginal", 'm', 0, 0, "output marginal probability (default false)" }, + { "max-grouping-size", 'M', "24", + "INT", "maximum grouping size for unknown words (default 24)" }, { "node-format", 'F', "%m\\t%H\\n", "STR", "use STR as the user-defined node format" }, *************** *** 109,114 **** Node *lookup(const char *begin, const char *end, Lattice *lattice) const { ! return viterbi_->tokenizer()->lookup(begin, end, ! lattice->allocator()); } --- 112,118 ---- Node *lookup(const char *begin, const char *end, Lattice *lattice) const { ! return viterbi_->tokenizer()->lookup<false>( ! begin, end, ! lattice->allocator(), lattice); } *************** *** 280,283 **** --- 284,299 ---- } + bool has_constraint() const; + int boundary_constraint(size_t pos) const; + const char *feature_constraint(size_t begin_pos) const; + + void set_boundary_constraint(size_t pos, + int boundary_constraint_type); + + void set_feature_constraint(size_t begin_pos, size_t end_pos, + const char *feature); + + void set_result(const char *result); + const char *what() const { return what_.c_str(); } *************** *** 303,306 **** --- 319,324 ---- std::vector<Node *> end_nodes_; std::vector<Node *> begin_nodes_; + std::vector<const char *> feature_constraint_; + std::vector<unsigned char> boundary_constraint_; const Writer *writer_; scoped_ptr<StringBuffer> ostrs_; *************** *** 376,380 **** return false; #else ! ModelImpl *m = dynamic_cast<ModelImpl *>(model_data.get()); if (!m) { setGlobalError("Invalid model is passed"); --- 394,398 ---- return false; #else ! ModelImpl *m = static_cast<ModelImpl *>(model_data.get()); if (!m) { setGlobalError("Invalid model is passed"); *************** *** 732,735 **** --- 750,755 ---- begin_nodes_.clear(); end_nodes_.clear(); + feature_constraint_.clear(); + boundary_constraint_.clear(); size_ = 0; theta_ = kDefaultTheta; *************** *** 776,779 **** --- 796,866 ---- } + void LatticeImpl::set_result(const char *result) { + char *str = allocator()->strdup(result, std::strlen(result)); + std::vector<char *> lines; + const size_t lsize = tokenize(str, "\n", + std::back_inserter(lines), + std::strlen(result)); + CHECK_DIE(lsize == lines.size()); + + std::string sentence; + std::vector<std::string> surfaces, features; + for (size_t i = 0; i < lines.size(); ++i) { + if (::strcmp("EOS", lines[i]) == 0) { + break; + } + char *cols[2]; + if (tokenize(lines[i], "\t", cols, 2) != 2) { + break; + } + sentence += cols[0]; + surfaces.push_back(cols[0]); + features.push_back(cols[1]); + } + + CHECK_DIE(features.size() == surfaces.size()); + + set_sentence(allocator()->strdup(sentence.c_str(), sentence.size())); + + Node *bos_node = allocator()->newNode(); + bos_node->surface = const_cast<const char *>(BOS_KEY); // dummy + bos_node->feature = "BOS/EOS"; + bos_node->isbest = 1; + bos_node->stat = MECAB_BOS_NODE; + + Node *eos_node = allocator()->newNode(); + eos_node->surface = const_cast<const char *>(BOS_KEY); // dummy + eos_node->feature = "BOS/EOS"; + eos_node->isbest = 1; + eos_node->stat = MECAB_EOS_NODE; + + bos_node->surface = sentence_; + end_nodes_[0] = bos_node; + + size_t offset = 0; + Node *prev = bos_node; + for (size_t i = 0; i < surfaces.size(); ++i) { + Node *node = allocator()->newNode(); + node->prev = prev; + prev->next = node; + node->surface = sentence_ + offset; + node->length = surfaces[i].size(); + node->rlength = surfaces[i].size(); + node->isbest = 1; + node->stat = MECAB_NOR_NODE; + node->wcost = 0; + node->cost = 0; + node->feature = allocator()->strdup(features[i].c_str(), + features[i].size()); + begin_nodes_[offset] = node; + end_nodes_[offset + node->length] = node; + offset += node->length; + prev = node; + } + + prev->next = eos_node; + eos_node->prev = prev; + } + // default implementation of Lattice formatter. namespace { *************** *** 899,902 **** --- 986,1036 ---- return os->str(); } + + bool LatticeImpl::has_constraint() const { + return !boundary_constraint_.empty(); + } + + int LatticeImpl::boundary_constraint(size_t pos) const { + if (!boundary_constraint_.empty()) { + return boundary_constraint_[pos]; + } + return MECAB_ANY_BOUNDARY; + } + + const char *LatticeImpl::feature_constraint(size_t begin_pos) const { + if (!feature_constraint_.empty()) { + return feature_constraint_[begin_pos]; + } + return 0; + } + + void LatticeImpl::set_boundary_constraint(size_t pos, + int boundary_constraint_type) { + if (boundary_constraint_.empty()) { + boundary_constraint_.resize(size() + 4, MECAB_ANY_BOUNDARY); + } + boundary_constraint_[pos] = boundary_constraint_type; + } + + void LatticeImpl::set_feature_constraint(size_t begin_pos, size_t end_pos, + const char *feature) { + if (begin_pos >= end_pos || !feature) { + return; + } + + if (feature_constraint_.empty()) { + feature_constraint_.resize(size() + 4, 0); + } + + end_pos = std::min(end_pos, size()); + + set_boundary_constraint(begin_pos, MECAB_TOKEN_BOUNDARY); + set_boundary_constraint(end_pos, MECAB_TOKEN_BOUNDARY); + for (size_t i = begin_pos + 1; i < end_pos; ++i) { + set_boundary_constraint(i, MECAB_INSIDE_TOKEN); + } + + feature_constraint_[begin_pos] = feature; + } } // namespace Index: dictionary.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/dictionary.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dictionary.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- dictionary.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 34,41 **** int calcCost(const std::string &w, const std::string &feature, int factor, ! DecoderFeatureIndex *fi, DictionaryRewriter *rewrite, CharProperty *property) { CHECK_DIE(fi); ! CHECK_DIE(rewrite); CHECK_DIE(property); --- 34,41 ---- int calcCost(const std::string &w, const std::string &feature, int factor, ! DecoderFeatureIndex *fi, DictionaryRewriter *rewriter, CharProperty *property) { CHECK_DIE(fi); ! CHECK_DIE(rewriter); CHECK_DIE(property); *************** *** 55,59 **** path.rnode->char_type = cinfo.default_type; std::string ufeature, lfeature, rfeature; ! rewrite->rewrite2(feature, &ufeature, &lfeature, &rfeature); fi->buildUnigramFeature(&path, ufeature.c_str()); fi->calcCost(&rnode); --- 55,59 ---- path.rnode->char_type = cinfo.default_type; std::string ufeature, lfeature, rfeature; ! rewriter->rewrite2(feature, &ufeature, &lfeature, &rfeature); fi->buildUnigramFeature(&path, ufeature.c_str()); fi->calcCost(&rnode); *************** *** 130,133 **** --- 130,224 ---- } + #define DCONF(file) create_filename(dicdir, std::string(file)); + + bool Dictionary::assignUserDictionaryCosts( + const Param ¶m, + const std::vector<std::string> &dics, + const char *output) { + Connector matrix; + DictionaryRewriter rewriter; + DecoderFeatureIndex fi; + ContextID cid; + CharProperty property; + + const std::string dicdir = param.get<std::string>("dicdir"); + + const std::string matrix_file = DCONF(MATRIX_DEF_FILE); + const std::string matrix_bin_file = DCONF(MATRIX_FILE); + const std::string left_id_file = DCONF(LEFT_ID_FILE); + const std::string right_id_file = DCONF(RIGHT_ID_FILE); + const std::string rewrite_file = DCONF(REWRITE_FILE); + + const std::string from = param.get<std::string>("dictionary-charset"); + + const int factor = param.get<int>("cost-factor"); + CHECK_DIE(factor > 0) << "cost factor needs to be positive value"; + + std::string config_charset = param.get<std::string>("config-charset"); + if (config_charset.empty()) { + config_charset = from; + } + + CHECK_DIE(!from.empty()) << "input dictionary charset is empty"; + + Iconv config_iconv; + CHECK_DIE(config_iconv.open(config_charset.c_str(), from.c_str())) + << "iconv_open() failed with from=" << config_charset << " to=" << from; + + rewriter.open(rewrite_file.c_str(), &config_iconv); + CHECK_DIE(fi.open(param)) << "cannot open feature index"; + + CHECK_DIE(property.open(param)); + property.set_charset(from.c_str()); + + if (!matrix.openText(matrix_file.c_str()) && + !matrix.open(matrix_bin_file.c_str())) { + matrix.set_left_size(1); + matrix.set_right_size(1); + } + + cid.open(left_id_file.c_str(), + right_id_file.c_str(), &config_iconv); + CHECK_DIE(cid.left_size() == matrix.left_size() && + cid.right_size() == matrix.right_size()) + << "Context ID files(" + << left_id_file + << " or " + << right_id_file << " may be broken: " + << cid.left_size() << " " << matrix.left_size() << " " + << cid.right_size() << " " << matrix.right_size(); + + std::ofstream ofs(output); + CHECK_DIE(ofs) << "permission denied: " << output; + + for (size_t i = 0; i < dics.size(); ++i) { + std::ifstream ifs(WPATH(dics[i].c_str())); + CHECK_DIE(ifs) << "no such file or directory: " << dics[i]; + std::cout << "reading " << dics[i] << " ... "; + scoped_fixed_array<char, BUF_SIZE> line; + while (ifs.getline(line.get(), line.size())) { + char *col[8]; + const size_t n = tokenizeCSV(line.get(), col, 5); + CHECK_DIE(n == 5) << "format error: " << line.get(); + std::string w = col[0]; + const std::string feature = col[4]; + const int cost = calcCost(w, feature, factor, + &fi, &rewriter, &property); + std::string ufeature, lfeature, rfeature; + CHECK_DIE(rewriter.rewrite(feature, &ufeature, &lfeature, &rfeature)) + << "rewrite failed: " << feature; + const int lid = cid.lid(lfeature.c_str()); + const int rid = cid.rid(rfeature.c_str()); + CHECK_DIE(lid >= 0 && rid >= 0 && matrix.is_valid(lid, rid)) + << "invalid ids are found lid=" << lid << " rid=" << rid; + escape_csv_element(&w); + ofs << w << ',' << lid << ',' << rid << ',' + << cost << ',' << feature << '\n'; + } + } + + return true; + } + bool Dictionary::compile(const Param ¶m, const std::vector<std::string> &dics, *************** *** 146,151 **** const std::string dicdir = param.get<std::string>("dicdir"); - #define DCONF(file) create_filename(dicdir, std::string(file)); - const std::string matrix_file = DCONF(MATRIX_DEF_FILE); const std::string matrix_bin_file = DCONF(MATRIX_FILE); --- 237,240 ---- *************** *** 169,177 **** CHECK_DIE(factor > 0) << "cost factor needs to be positive value"; - std::string model_file = param.get<std::string>("model"); - if (model_file.empty()) { - model_file = DCONF(MODEL_FILE); - } - // for backward compatibility std::string config_charset = param.get<std::string>("config-charset"); --- 258,261 ---- *************** *** 256,261 **** if (lid < 0 || rid < 0 || lid == INT_MAX || rid == INT_MAX) { - CHECK_DIE(type == MECAB_USR_DIC) - << "lid/rid fields should not be empty in sys/unk dic."; if (!rewrite.get()) { rewrite.reset(new DictionaryRewriter); --- 340,343 ---- Index: viterbi.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/viterbi.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** viterbi.h 11 Jun 2012 15:28:36 -0000 1.2 --- viterbi.h 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 36,48 **** private: ! bool viterbiWithAllPath(Lattice *lattice) const; ! bool viterbi(Lattice *lattice) const; static bool forwardbackward(Lattice *lattice); static bool initPartial(Lattice *lattice); static bool initNBest(Lattice *lattice); - static Node *filterNode(Node *constrained_node, Node *node); static bool buildBestLattice(Lattice *lattice); static bool buildAllLattice(Lattice *lattice); scoped_ptr<Tokenizer<Node, Path> > tokenizer_; --- 36,47 ---- private: ! template <bool IsAllPath, bool IsPartial> bool viterbi(Lattice *lattice) const; static bool forwardbackward(Lattice *lattice); static bool initPartial(Lattice *lattice); static bool initNBest(Lattice *lattice); static bool buildBestLattice(Lattice *lattice); static bool buildAllLattice(Lattice *lattice); + static bool buildAlternative(Lattice *lattice); scoped_ptr<Tokenizer<Node, Path> > tokenizer_; Index: Makefile.am =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 11 Dec 2014 05:12:15 -0000 1.4 --- Makefile.am 11 Dec 2014 07:06:48 -0000 1.5 *************** *** 67,71 **** viterbi.cpp \ viterbi.h \ - viterbisub.h \ winmain.h \ writer.cpp \ --- 67,70 ---- Index: dictionary.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/dictionary.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dictionary.h 11 Jun 2012 15:28:36 -0000 1.2 --- dictionary.h 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 70,73 **** --- 70,79 ---- const char *output); // outputs + static bool assignUserDictionaryCosts( + const Param ¶m, + const std::vector<std::string> &dics, + const char *output); // outputs + + const char *what() { return what_.str(); } Index: learner_tagger.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/learner_tagger.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** learner_tagger.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- learner_tagger.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 279,283 **** return begin_node_list_[pos]; } ! LearnerNode *m = tokenizer_->lookup(begin_ + pos, end_, allocator_); begin_node_list_[pos] = m; return m; --- 279,283 ---- return begin_node_list_[pos]; } ! LearnerNode *m = tokenizer_->lookup<false>(begin_ + pos, end_, allocator_, 0); begin_node_list_[pos] = m; return m; Index: char_property.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/char_property.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** char_property.h 11 Jun 2012 15:28:36 -0000 1.2 --- char_property.h 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- unsigned int group: 1; unsigned int invoke: 1; + CharInfo() : type(0), default_type(0), length(0), group(0), invoke(0) {} bool isKindOf(CharInfo c) const { return type & c.type; } }; Index: thread.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/thread.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thread.h 11 Dec 2014 05:12:15 -0000 1.4 --- thread.h 11 Dec 2014 07:06:48 -0000 1.5 *************** *** 92,96 **** #define atomic_add(a, b) ::InterlockedExchangeAdd(a, b) #define compare_and_swap(a, b, c) ::InterlockedCompareExchange(a, c, b) ! #define yield_processor() ::YieldProcessor() #define HAVE_ATOMIC_OPS 1 #endif --- 92,96 ---- #define atomic_add(a, b) ::InterlockedExchangeAdd(a, b) #define compare_and_swap(a, b, c) ::InterlockedCompareExchange(a, c, b) ! #define yield_processor() YieldProcessor() #define HAVE_ATOMIC_OPS 1 #endif Index: string_buffer.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/string_buffer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** string_buffer.h 11 Dec 2014 05:12:15 -0000 1.2 --- string_buffer.h 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 89,92 **** --- 89,95 ---- #endif StringBuffer& operator<<(unsigned long int n) { _UITOA(n); } + #ifdef HAVE_UNSIGNED_LONG_LONG_INT + StringBuffer& operator<<(unsigned long long int n) { _UITOA(n); } + #endif StringBuffer& operator<< (char n) { Index: learner.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/learner.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** learner.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- learner.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 249,253 **** &expected[0], false, C); ! CHECK_DIE(ret > 0) << "unexpected error in LBFGS routin"; } --- 249,257 ---- &expected[0], false, C); ! CHECK_DIE(ret >= 0) << "unexpected error in LBFGS routin"; ! ! if (ret == 0) { ! break; ! } } Index: mmap.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/mmap.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mmap.h 21 Dec 2012 04:22:45 -0000 1.3 --- mmap.h 11 Dec 2014 07:06:48 -0000 1.4 *************** *** 55,65 **** #endif - #if !defined(_WIN32) || defined(__CYGWIN__) - namespace { - int open__(const char* name, int flag) { return open(name, flag); } - int close__(int fd) { return close(fd); } - } - #endif - namespace MeCab { --- 55,58 ---- *************** *** 161,168 **** CHECK_FALSE(false) << "unknown open mode: " << filename; ! CHECK_FALSE((fd = open__(filename, flag | O_BINARY)) >= 0) << "open failed: " << filename; ! CHECK_FALSE(fstat(fd, &st) >= 0) << "failed to get file size: " << filename; --- 154,161 ---- CHECK_FALSE(false) << "unknown open mode: " << filename; ! CHECK_FALSE((fd = ::open(filename, flag | O_BINARY)) >= 0) << "open failed: " << filename; ! CHECK_FALSE(::fstat(fd, &st) >= 0) << "failed to get file size: " << filename; *************** *** 174,178 **** char *p; CHECK_FALSE((p = reinterpret_cast<char *> ! (mmap(0, length, prot, MAP_SHARED, fd, 0))) != MAP_FAILED) << "mmap() failed: " << filename; --- 167,171 ---- char *p; CHECK_FALSE((p = reinterpret_cast<char *> ! (::mmap(0, length, prot, MAP_SHARED, fd, 0))) != MAP_FAILED) << "mmap() failed: " << filename; *************** *** 181,188 **** #else text = new T[length]; ! CHECK_FALSE(read(fd, text, length) >= 0) << "read() failed: " << filename; #endif ! close__(fd); fd = -1; --- 174,181 ---- #else text = new T[length]; ! CHECK_FALSE(::read(fd, text, length) >= 0) << "read() failed: " << filename; #endif ! ::close(fd); fd = -1; *************** *** 192,196 **** void close() { if (fd >= 0) { ! close__(fd); fd = -1; } --- 185,189 ---- void close() { if (fd >= 0) { ! ::close(fd); fd = -1; } *************** *** 198,209 **** if (text) { #ifdef HAVE_MMAP ! munmap(reinterpret_cast<char *>(text), length); text = 0; #else if (flag == O_RDWR) { int fd2; ! if ((fd2 = open__(fileName.c_str(), O_RDWR)) >= 0) { ! write(fd2, text, length); ! close__(fd2); } } --- 191,202 ---- if (text) { #ifdef HAVE_MMAP ! ::munmap(reinterpret_cast<char *>(text), length); text = 0; #else if (flag == O_RDWR) { int fd2; ! if ((fd2 = ::open(fileName.c_str(), O_RDWR)) >= 0) { ! ::write(fd2, text, length); ! ::close(fd2); } } Index: libmecab.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/libmecab.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** libmecab.cpp 11 Dec 2014 05:12:15 -0000 1.8 --- libmecab.cpp 11 Dec 2014 07:06:48 -0000 1.9 *************** *** 439,442 **** --- 439,477 ---- } + int mecab_lattice_has_constraint(mecab_lattice_t *lattice) { + return static_cast<bool>(reinterpret_cast<MeCab::Lattice *>( + lattice)->has_constraint()); + } + + int mecab_lattice_get_boundary_constraint(mecab_lattice_t *lattice, + size_t pos) { + return reinterpret_cast<MeCab::Lattice *>( + lattice)->boundary_constraint(pos); + } + + const char *mecab_lattice_get_feature_constraint(mecab_lattice_t *lattice, + size_t pos) { + return reinterpret_cast<MeCab::Lattice *>( + lattice)->feature_constraint(pos); + } + + void mecab_lattice_set_boundary_constraint(mecab_lattice_t *lattice, + size_t pos, int boundary_type) { + return reinterpret_cast<MeCab::Lattice *>( + lattice)->set_boundary_constraint(pos, boundary_type); + } + + void mecab_lattice_set_feature_constraint(mecab_lattice_t *lattice, + size_t begin_pos, size_t end_pos, + const char *feature) { + return reinterpret_cast<MeCab::Lattice *>( + lattice)->set_feature_constraint(begin_pos, end_pos, feature); + } + + void mecab_lattice_set_result(mecab_lattice_t *lattice, + const char *result) { + return reinterpret_cast<MeCab::Lattice *>(lattice)->set_result(result); + } + const char *mecab_lattice_strerror(mecab_lattice_t *lattice) { return reinterpret_cast<MeCab::Lattice *>(lattice)->what(); Index: dictionary_compiler.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/dictionary_compiler.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dictionary_compiler.cpp 11 Jun 2012 15:28:36 -0000 1.6 --- dictionary_compiler.cpp 11 Dec 2014 07:06:48 -0000 1.7 *************** *** 30,33 **** --- 30,35 ---- { "model", 'm', 0, "FILE", "use FILE as model file" }, { "userdic", 'u', 0, "FILE", "build user dictionary" }, + { "assign-user-dictionary-costs", 'a', 0, 0, + "only assign costs/ids to user dictionary" }, { "build-unknown", 'U', 0, 0, "build parameters for unknown words" }, *************** *** 71,74 **** --- 73,78 ---- bool opt_sysdic = param.get<bool>("build-sysdic"); bool opt_model = param.get<bool>("build-model"); + bool opt_assign_user_dictionary_costs = param.get<bool> + ("assign-user-dictionary-costs"); const std::string userdic = param.get<std::string>("userdic"); *************** *** 89,93 **** --- 93,102 ---- CHECK_DIE(dic.size()) << "no dictionaries are specified"; param.set("type", static_cast<int>(MECAB_USR_DIC)); + if (opt_assign_user_dictionary_costs) { + Dictionary::assignUserDictionaryCosts(param, dic, + userdic.c_str()); + } else { Dictionary::compile(param, dic, userdic.c_str()); + } } else { if (!opt_unknown && !opt_matrix && !opt_charcategory && Index: tokenizer.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/tokenizer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tokenizer.h 11 Jun 2012 15:28:36 -0000 1.2 --- tokenizer.h 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 118,124 **** N *getBOSNode(Allocator<N, P> *allocator) const; N *getEOSNode(Allocator<N, P> *allocator) const; ! N *lookup(const char *begin, const char *end, ! Allocator<N, P> *allocator) const; ! bool open(const Param ¶m); void close(); --- 118,124 ---- N *getBOSNode(Allocator<N, P> *allocator) const; N *getEOSNode(Allocator<N, P> *allocator) const; ! template <bool IsPartial> N *lookup(const char *begin, const char *end, ! Allocator<N, P> *allocator, ! Lattice *lattice) const; bool open(const Param ¶m); void close(); Index: dictionary_generator.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/dictionary_generator.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dictionary_generator.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- dictionary_generator.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 83,88 **** const std::map<std::string, int> &right = cid.right_ids(); ! CHECK_DIE(left.size()) << "left id size is empty"; ! CHECK_DIE(right.size()) << "right id size is empty"; ofs << right.size() << ' ' << left.size() << std::endl; --- 83,88 ---- const std::map<std::string, int> &right = cid.right_ids(); ! CHECK_DIE(left.size() > 0) << "left id size is empty"; ! CHECK_DIE(right.size() > 0) << "right id size is empty"; ofs << right.size() << ' ' << left.size() << std::endl; Index: mecab.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/mecab.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mecab.h 11 Dec 2014 05:12:15 -0000 1.10 --- mecab.h 11 Dec 2014 07:06:48 -0000 1.11 *************** *** 188,192 **** /** ! * length of the surface form/. */ unsigned short length; --- 188,192 ---- /** ! * length of the surface form. */ unsigned short length; *************** *** 218,222 **** /** ! * statis of this model. * This value is MECAB_NOR_NODE, MECAB_UNK_NODE, MECAB_BOS_NODE, MECAB_EOS_NODE, or MECAB_EON_NODE. */ --- 218,222 ---- /** ! * status of this model. * This value is MECAB_NOR_NODE, MECAB_UNK_NODE, MECAB_BOS_NODE, MECAB_EOS_NODE, or MECAB_EON_NODE. */ *************** *** 318,321 **** --- 318,323 ---- /** * Set this flag if you want to enable a partial parsing mode. + * When this flag is set, the input |sentence| needs to be written + * in partial parsing format. */ MECAB_PARTIAL = 4, *************** *** 344,347 **** --- 346,369 ---- }; + /** + * Parameters for MeCab::Lattice::boundary_constraint_type + */ + enum { + /** + * The token boundary is not specified. + */ + MECAB_ANY_BOUNDARY = 0, + + /** + * The position is a strong token boundary. + */ + MECAB_TOKEN_BOUNDARY = 1, + + /** + * The position is not a token boundary. + */ + MECAB_INSIDE_TOKEN = 2 + }; + /* C interface */ #ifdef __cplusplus *************** *** 693,696 **** --- 715,749 ---- /** + * C wrapper of MeCab::Lattice::has_constraint() + */ + MECAB_DLL_EXTERN int mecab_lattice_has_constraint(mecab_lattice_t *lattice); + + /** + * C wrapper of MeCab::Lattice::boundary_constraint(pos) + */ + MECAB_DLL_EXTERN int mecab_lattice_get_boundary_constraint(mecab_lattice_t *lattice, size_t pos); + + + /** + * C wrapper of MeCab::Lattice::feature_constraint(pos) + */ + MECAB_DLL_EXTERN const char *mecab_lattice_get_feature_constraint(mecab_lattice_t *lattice, size_t pos); + + /** + * C wrapper of MeCab::Lattice::boundary_constraint(pos, type) + */ + MECAB_DLL_EXTERN void mecab_lattice_set_boundary_constraint(mecab_lattice_t *lattice, size_t pos, int boundary_type); + + /** + * C wrapper of MeCab::Lattice::set_feature_constraint(begin_pos, end_pos, feature) + */ + MECAB_DLL_EXTERN void mecab_lattice_set_feature_constraint(mecab_lattice_t *lattice, size_t begin_pos, size_t end_pos, const char *feature); + + /** + * C wrapper of MeCab::Lattice::set_result(result); + */ + MECAB_DLL_EXTERN void mecab_lattice_set_result(mecab_lattice_t *lattice, const char *result); + + /** * C wrapper of MeCab::Lattice::what() */ *************** *** 993,996 **** --- 1046,1092 ---- /** + * Returns true if any parsing constraint is set + */ + virtual bool has_constraint() const = 0; + + /** + * Returns the boundary constraint at the position. + * @param pos the position of constraint + * @return boundary constraint type + */ + virtual int boundary_constraint(size_t pos) const = 0; + + /** + * Returns the token constraint at the position. + * @param pos the beginning position of constraint. + * @return constrained node starting at the position. + */ + virtual const char *feature_constraint(size_t pos) const = 0; + + /** + * Set parsing constraint for partial parsing mode. + * @param pos the position of the boundary + * @param boundary_constraint_type the type of boundary + */ + virtual void set_boundary_constraint(size_t pos, + int boundary_constraint_type) = 0; + + /** + * Set parsing constraint for partial parsing mode. + * @param begin_pos the starting position of the constrained token. + * @param end_pos the the ending position of the constrained token. + * @param feature the feature of the constrained token. + */ + virtual void set_feature_constraint( + size_t begin_pos, size_t end_pos, + const char *feature) = 0; + + /** + * Set golden parsing results for unittesting. + * @param result the parsing result written in the standard mecab output. + */ + virtual void set_result(const char *result) = 0; + + /** * Return error string. * @return error string Index: feature_index.cpp =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab/src/feature_index.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** feature_index.cpp 11 Jun 2012 15:28:36 -0000 1.2 --- feature_index.cpp 11 Dec 2014 07:06:48 -0000 1.3 *************** *** 356,359 **** --- 356,363 ---- case 't': os_ << (size_t)path->rnode->char_type; break; case 'u': os_ << ufeature; break; + case 'w': + if (path->rnode->stat == MECAB_NOR_NODE) { + os_.write(path->rnode->surface, path->rnode->length); + } default: CHECK_DIE(false) << "unknown meta char: " << *p; |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 07:06:50
|
Update of /cvsroot/open-jtalk/open_jtalk/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19535 Modified Files: NEWS Log Message: update MeCab to 0.996 Index: NEWS =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/NEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NEWS 11 Dec 2014 06:00:54 -0000 1.11 --- NEWS 11 Dec 2014 07:06:48 -0000 1.12 *************** *** 5,8 **** --- 5,9 ---- * assume unknown words as filler * update dictionary. + * update MeCab to version 0.996. * fix some bugs. |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 06:00:57
|
Update of /cvsroot/open-jtalk/open_jtalk/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16710 Modified Files: NEWS Log Message: add volume option Index: NEWS =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/NEWS,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NEWS 11 Dec 2014 05:12:14 -0000 1.10 --- NEWS 11 Dec 2014 06:00:54 -0000 1.11 *************** *** 1,3 **** --- 1,4 ---- Version 1.08: + * add '-g' option for changing volume. * modify digit rules * modify unvoicing rules |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 05:25:00
|
Update of /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14683/mecab-naist-jdic Modified Files: naist-jdic.csv Log Message: update dictionary. Index: naist-jdic.csv =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/mecab-naist-jdic/naist-jdic.csv,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** naist-jdic.csv 11 Dec 2013 05:26:19 -0000 1.13 --- naist-jdic.csv 11 Dec 2014 05:24:46 -0000 1.14 *************** *** 140,145 **** £°,1355,1355,4438,̾»ì,¿ô,*,*,*,*,£°,¥ì¥¤,¥ì¥¤,1/2,C3 £°,1355,1355,9828,̾»ì,¿ô,*,*,*,*,£°,¥ì¥¤,¥ì¥¤,1/2,C3 - £°£°£·,1349,1349,2474,̾»ì,¸ÇÍ̾»ì,¿Í̾,°ìÈÌ,*,*,£°£°£·,¥¼¥í¥¼¥í¥»¥Ö¥ó,¥¼¥í¥¼¥í¥»¥Ö¥ó,5/7,C1 - £°£²£²£±,1345,1345,49,̾»ì,°ìÈÌ,*,*,*,*,£°£²:£²£±,¥¼¥í¥Ë¡¼:¥Ë¡¼¥¤¥Á,¥¼¥í¥Ë¡¼:¥Ë¡¼¥¤¥Á,3/4:3/4,C1 £±,1355,1355,3025,̾»ì,¿ô,*,*,*,*,£±,¥¤¥Á,¥¤¥Á,2/2,C3 £±,1355,1355,4298,̾»ì,¿ô,*,*,*,*,£±,¥¤¥Á,¥¤¥Á,2/2,C3 --- 140,143 ---- *************** *** 155,159 **** £±£¶£í£í,1345,1345,2802,̾»ì,°ìÈÌ,*,*,*,*,£±£¶£í£í,¥¸¥å¥¦¥í¥¯¥ß¥ê,¥¸¥å¡¼¥í¥¯¥ß¥ê,0/6,C1 [...2528 lines suppressed...] ζµÈ,1351,1351,8304,̾»ì,¸ÇÍ̾»ì,¿Í̾,̾,*,*,ζµÈ,¥ê¥å¥¦¥¥Á,¥ê¥å¡¼¥¥Á,0/4,C1 + ζµÜ¾ë,1348,1348,698,̾»ì,¸ÇÍ̾»ì,°ìÈÌ,*,*,*,ζµÜ¾ë,¥ê¥å¥¦¥°¥¦¥¸¥ç¥¦,¥ê¥å¡¼¥°¡¼¥¸¥ç¡¼,0/6,C1 ζµÜÉ¡,1348,1348,8609,̾»ì,¸ÇÍ̾»ì,°ìÈÌ,*,*,*,ζµÜÉ¡,¥ê¥å¥¦¥°¥¦¥Ð¥Ê,¥ê¥å¡¼¥°¡¼¥Ð¥Ê,3/6,C1 ζ¶¿,1353,1353,8561,̾»ì,¸ÇÍ̾»ì,ÃÏ°è,°ìÈÌ,*,*,ζ¶¿,¥¿¥Ä¥´¥¦,¥¿¥Ä¥´¡¼,0/4,C2 *************** *** 467339,467342 **** --- 467477,467481 ---- Ϫºê,1350,1350,7521,̾»ì,¸ÇÍ̾»ì,¿Í̾,À«,*,*,Ϫºê,¥Ä¥æ¥µ¥,¥Ä¥æ¥µ¥,2/4,C2 Ϫ»Ò,1351,1351,8304,̾»ì,¸ÇÍ̾»ì,¿Í̾,̾,*,*,Ϫ»Ò,¥Ä¥æ¥³,¥Ä¥æ¥³,0/3,C1 + Ϫ¼óÁê,1345,1345,49,̾»ì,°ìÈÌ,*,*,*,*,Ϫ:¼óÁê,¥í¥·¥¢:¥·¥å¥·¥ç¥¦,¥í¥·¥¢:¥·¥å¥·¥ç¡¼,1/3:0/3,* Ϫ½Ð,1343,1343,4417,̾»ì,¥µÊÑÀܳ,*,*,*,*,Ϫ½Ð,¥í¥·¥å¥Ä,¥í¥·¥å¥Ä,0/3,C2 ϪÀ¾°¡,1354,1354,6913,̾»ì,¸ÇÍ̾»ì,ÃÏ°è,¹ñ,*,*,ϪÀ¾°¡,¥í¥·¥¢,¥í¥·¥¢,1/3,C1 *************** *** 467345,467348 **** --- 467484,467488 ---- ϪÁú,1345,1345,5746,̾»ì,°ìÈÌ,*,*,*,*,ϪÁú,¥Ä¥æ¥¸¥â,¥Ä¥æ¥¸¥â,0/4,C2 ϪÂæ,1345,1345,5746,̾»ì,°ìÈÌ,*,*,*,*,ϪÂæ,¥í¥À¥¤,¥í¥À¥¤,0/3,C2 + ϪÂçÅýÎÎ,1345,1345,49,̾»ì,°ìÈÌ,*,*,*,*,Ϫ:ÂçÅýÎÎ,¥í¥·¥¢:¥À¥¤¥È¥¦¥ê¥ç¥¦,¥í¥·¥¢:¥À¥¤¥È¡¼¥ê¥ç¡¼,1/3:3/6,* Ϫë,1353,1353,8562,̾»ì,¸ÇÍ̾»ì,ÃÏ°è,°ìÈÌ,*,*,Ϫë,¥Ä¥æ¥À¥Ë,¥Ä¥æ¥À¥Ë,0/4,C2 ϪÃÏ,1345,1345,5541,̾»ì,°ìÈÌ,*,*,*,*,ϪÃÏ,¥í¥¸,¥í¥¸,1/2,C3 |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 05:12:18
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14056/njd Modified Files: Makefile.am njd.c njd.h njd_node.c Log Message: remove some bugs Index: njd.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/njd.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd.c 11 Dec 2013 06:33:06 -0000 1.8 --- njd.c 11 Dec 2014 05:12:15 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 286,332 **** } - void NJD_insert_node(NJD * njd, NJDNode * prev, NJDNode * next, NJDNode * node) - { - NJDNode *tail; /* for additional node sequence */ - - if (prev == NULL && next == NULL) { - fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are not specified.\n"); - exit(1); - } - tail = node; - while (tail->next != NULL) - tail = tail->next; - if (prev == NULL) { - if (next != njd->head) { - fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are wrong.\n"); - exit(1); - } - tail->next = njd->head; - node->prev = NULL; - njd->head->prev = tail; - njd->head = node; - } else if (next == NULL) { - if (prev != njd->tail) { - fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are wrong.\n"); - exit(1); - } - tail->next = NULL; - node->prev = njd->tail; - njd->tail->next = node; - njd->tail = tail; - } else { - if (prev->next != next || prev != next->prev) { - fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are wrong.\n"); - exit(1); - } - prev->next = node; - node->prev = prev; - next->prev = tail; - tail->next = next; - } - } - /* remove node and return next node */ ! NJDNode *NJD_remove_node(NJD * njd, NJDNode * node) { NJDNode *next; --- 286,291 ---- } /* remove node and return next node */ ! static NJDNode *NJD_remove_node(NJD * njd, NJDNode * node) { NJDNode *next; Index: njd.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/njd.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd.h 11 Dec 2013 06:33:06 -0000 1.8 --- njd.h 11 Dec 2014 05:12:15 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 126,131 **** int NJD_get_size(NJD * njd); void NJD_push_node(NJD * njd, NJDNode * node); - void NJD_insert_node(NJD * njd, NJDNode * prev, NJDNode * next, NJDNode * node); - NJDNode *NJD_remove_node(NJD * njd, NJDNode * node); void NJD_remove_silent_node(NJD * njd); void NJD_print(NJD * njd); --- 126,129 ---- Index: njd_node.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/njd_node.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_node.c 11 Dec 2013 06:33:06 -0000 1.9 --- njd_node.c 11 Dec 2014 05:12:15 -0000 1.10 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: Makefile.am =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 21 Dec 2012 04:37:42 -0000 1.3 --- Makefile.am 11 Dec 2014 05:12:15 -0000 1.4 *************** *** 6,10 **** MAINTAINERCLEANFILES = Makefile.in ! INCLUDES = @CHARSET@ noinst_LIBRARIES = libnjd.a --- 6,10 ---- MAINTAINERCLEANFILES = Makefile.in ! AM_CPPFLAGS = @CHARSET@ noinst_LIBRARIES = libnjd.a |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 05:12:17
|
Update of /cvsroot/open-jtalk/open_jtalk/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14056 Modified Files: COPYING NEWS README configure.ac Log Message: remove some bugs Index: COPYING =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/COPYING,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** COPYING 11 Dec 2013 06:33:05 -0000 1.8 --- COPYING 11 Dec 2014 05:12:14 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: configure.ac =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/configure.ac,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** configure.ac 23 Dec 2013 08:03:38 -0000 1.11 --- configure.ac 11 Dec 2014 05:12:14 -0000 1.12 *************** *** 1,8 **** # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) ! AC_INIT(open_jtalk, 1.07, ope...@li...) AC_CONFIG_AUX_DIR([config]) ! AC_COPYRIGHT(Copyright 2008-2013 Nagoya Institute of Technology) ! AM_INIT_AUTOMAKE(open_jtalk, 1.07, nostdinc no-installinfo no-installman) # Checks for C/C++ compiler --- 1,8 ---- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) ! AC_INIT(open_jtalk, 1.08, ope...@li...) AC_CONFIG_AUX_DIR([config]) ! AC_COPYRIGHT(Copyright 2008-2014 Nagoya Institute of Technology) ! AM_INIT_AUTOMAKE # Checks for C/C++ compiler Index: README =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/README,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** README 11 Dec 2013 06:33:05 -0000 1.15 --- README 11 Dec 2014 05:12:14 -0000 1.16 *************** *** 1,5 **** =============================================================================== ! The Japanese TTS System "Open JTalk" version 1.07 ! release December 25, 2013 --- 1,5 ---- =============================================================================== ! The Japanese TTS System "Open JTalk" version 1.08 ! release December 25, 2014 *************** *** 25,29 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 25,29 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: NEWS =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/NEWS,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NEWS 11 Dec 2013 06:33:05 -0000 1.9 --- NEWS 11 Dec 2014 05:12:14 -0000 1.10 *************** *** 1,3 **** ! Versin 1.07: * add ASCII header for no multibyte environment. * add pronunciation rules for digit. --- 1,10 ---- ! Version 1.08: ! * modify digit rules ! * modify unvoicing rules ! * assume unknown words as filler ! * update dictionary. ! * fix some bugs. ! ! Version 1.07: * add ASCII header for no multibyte environment. * add pronunciation rules for digit. |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 05:09:09
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13930/njd_set_pronunciation Modified Files: Makefile.am 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: assume unknown word as fillter 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** njd_set_pronunciation_rule_ascii_for_utf_8.h 11 Dec 2013 06:33:06 -0000 1.2 --- njd_set_pronunciation_rule_ascii_for_utf_8.h 11 Dec 2014 05:09:07 -0000 1.3 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 143,146 **** --- 143,147 ---- "\xe3\x83\x86\xe3\x83\xa5", "\xe3\x83\x86\xe3\x83\xa5", "1", "\xe3\x83\x86\xe3\x83\xa3", "\xe3\x83\x86\xe3\x83\xa3", "1", + "\xe3\x83\x86\xe3\x82\xa7", "\xe3\x83\x86\xe3\x82\xa7", "1", "\xe3\x83\x86\xe3\x82\xa3", "\xe3\x83\x86\xe3\x82\xa3", "1", "\xe3\x83\x86", "\xe3\x83\x86", "1", *************** *** 294,297 **** --- 295,299 ---- "\xe3\x81\xa6\xe3\x82\x85", "\xe3\x83\x86\xe3\x83\xa5", "1", "\xe3\x81\xa6\xe3\x82\x83", "\xe3\x83\x86\xe3\x83\xa3", "1", + "\xe3\x81\xa6\xe3\x81\x87", "\xe3\x83\x86\xe3\x82\xa7", "1", "\xe3\x81\xa6\xe3\x81\x83", "\xe3\x83\x86\xe3\x82\xa3", "1", "\xe3\x81\xa6", "\xe3\x83\x86", "1", *************** *** 514,517 **** --- 516,521 ---- }; + #define NJD_SET_PRONUNCIATION_FILLER "\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xa9\xe3\x83\xbc" + #define NJD_SET_PRONUNCIATION_U "\xe3\x82\xa6" #define NJD_SET_PRONUNCIATION_DOUSHI "\xe5\x8b\x95\xe8\xa9\x9e" 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** njd_set_pronunciation_rule_ascii_for_euc_jp.h 11 Dec 2013 06:33:06 -0000 1.2 --- njd_set_pronunciation_rule_ascii_for_euc_jp.h 11 Dec 2014 05:09:07 -0000 1.3 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 143,146 **** --- 143,147 ---- "\xa5\xc6\xa5\xe5", "\xa5\xc6\xa5\xe5", "1", "\xa5\xc6\xa5\xe3", "\xa5\xc6\xa5\xe3", "1", + "\xa5\xc6\xa5\xa7", "\xa5\xc6\xa5\xa7", "1", "\xa5\xc6\xa5\xa3", "\xa5\xc6\xa5\xa3", "1", "\xa5\xc6", "\xa5\xc6", "1", *************** *** 294,297 **** --- 295,299 ---- "\xa4\xc6\xa4\xe5", "\xa5\xc6\xa5\xe5", "1", "\xa4\xc6\xa4\xe3", "\xa5\xc6\xa5\xe3", "1", + "\xa4\xc6\xa4\xa7", "\xa5\xc6\xa5\xa7", "1", "\xa4\xc6\xa4\xa3", "\xa5\xc6\xa5\xa3", "1", "\xa4\xc6", "\xa5\xc6", "1", *************** *** 514,517 **** --- 516,521 ---- }; + #define NJD_SET_PRONUNCIATION_FILLER "\xa5\xd5\xa5\xa3\xa5\xe9\xa1\xbc" + #define NJD_SET_PRONUNCIATION_U "\xa5\xa6" #define NJD_SET_PRONUNCIATION_DOUSHI "\xc6\xb0\xbb\xec" Index: Makefile.am =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 11 Dec 2013 05:52:52 -0000 1.3 --- Makefile.am 11 Dec 2014 05:09:07 -0000 1.4 *************** *** 6,10 **** MAINTAINERCLEANFILES = Makefile.in ! INCLUDES = -I @top_srcdir@/njd @CHARSET@ noinst_LIBRARIES = libnjd_set_pronunciation.a --- 6,10 ---- MAINTAINERCLEANFILES = Makefile.in ! AM_CPPFLAGS = -I @top_srcdir@/njd @CHARSET@ noinst_LIBRARIES = libnjd_set_pronunciation.a 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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd_set_pronunciation_rule_euc_jp.h 11 Dec 2013 06:33:06 -0000 1.8 --- njd_set_pronunciation_rule_euc_jp.h 11 Dec 2014 05:09:07 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 143,146 **** --- 143,147 ---- "¥Æ¥å", "¥Æ¥å", "1", "¥Æ¥ã", "¥Æ¥ã", "1", + "¥Æ¥§", "¥Æ¥§", "1", "¥Æ¥£", "¥Æ¥£", "1", "¥Æ", "¥Æ", "1", *************** *** 294,297 **** --- 295,299 ---- "¤Æ¤å", "¥Æ¥å", "1", "¤Æ¤ã", "¥Æ¥ã", "1", + "¤Æ¤§", "¥Æ¥§", "1", "¤Æ¤£", "¥Æ¥£", "1", "¤Æ", "¥Æ", "1", *************** *** 514,517 **** --- 516,521 ---- }; + #define NJD_SET_PRONUNCIATION_FILLER "¥Õ¥£¥é¡¼" + #define NJD_SET_PRONUNCIATION_U "¥¦" #define NJD_SET_PRONUNCIATION_DOUSHI "Æ°»ì" Index: njd_set_pronunciation.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** njd_set_pronunciation.h 11 Dec 2013 06:33:06 -0000 1.7 --- njd_set_pronunciation.h 11 Dec 2014 05:09:07 -0000 1.8 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd_set_pronunciation_rule_shift_jis.h 11 Dec 2013 06:33:06 -0000 1.8 --- njd_set_pronunciation_rule_shift_jis.h 11 Dec 2014 05:09:07 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 143,146 **** --- 143,147 ---- "e ", "e ", "1", "e", "e", "1", + "eF", "eF", "1", "eB", "eB", "1", "e", "e", "1", *************** *** 294,297 **** --- 295,299 ---- "Äã", "e ", "1", "Äá", "e", "1", + "Ä¥", "eF", "1", "Ä¡", "eB", "1", "Ä", "e", "1", *************** *** 514,517 **** --- 516,521 ---- }; + #define NJD_SET_PRONUNCIATION_FILLER "tB[" + #define NJD_SET_PRONUNCIATION_U "E" #define NJD_SET_PRONUNCIATION_DOUSHI "®" 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** njd_set_pronunciation_rule_ascii_for_shift_jis.h 11 Dec 2013 06:33:06 -0000 1.2 --- njd_set_pronunciation_rule_ascii_for_shift_jis.h 11 Dec 2014 05:09:07 -0000 1.3 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 143,146 **** --- 143,147 ---- "\x83\x65\x83\x85", "\x83\x65\x83\x85", "1", "\x83\x65\x83\x83", "\x83\x65\x83\x83", "1", + "\x83\x65\x83\x46", "\x83\x65\x83\x46", "1", "\x83\x65\x83\x42", "\x83\x65\x83\x42", "1", "\x83\x65", "\x83\x65", "1", *************** *** 294,297 **** --- 295,299 ---- "\x82\xc4\x82\xe3", "\x83\x65\x83\x85", "1", "\x82\xc4\x82\xe1", "\x83\x65\x83\x83", "1", + "\x82\xc4\x82\xa5", "\x83\x65\x83\x46", "1", "\x82\xc4\x82\xa1", "\x83\x65\x83\x42", "1", "\x82\xc4", "\x83\x65", "1", *************** *** 514,517 **** --- 516,521 ---- }; + #define NJD_SET_PRONUNCIATION_FILLER "\x83\x74\x83\x42\x83\x89\x81\x5b" + #define NJD_SET_PRONUNCIATION_U "\x83\x45" #define NJD_SET_PRONUNCIATION_DOUSHI "\x93\xae\x8e\x8c" Index: njd_set_pronunciation.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_pronunciation/njd_set_pronunciation.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** njd_set_pronunciation.c 11 Dec 2013 06:33:06 -0000 1.9 --- njd_set_pronunciation.c 11 Dec 2014 05:09:07 -0000 1.10 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 134,137 **** --- 134,141 ---- } } + NJDNode_set_pos(node, NJD_SET_PRONUNCIATION_FILLER); + NJDNode_set_pos_group1(node, NULL); + NJDNode_set_pos_group2(node, NULL); + NJDNode_set_pos_group3(node, NULL); } } 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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** njd_set_pronunciation_rule_utf_8.h 11 Dec 2013 06:33:06 -0000 1.8 --- njd_set_pronunciation_rule_utf_8.h 11 Dec 2014 05:09:07 -0000 1.9 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 143,146 **** --- 143,147 ---- "ãã¥", "ãã¥", "1", "ãã£", "ãã£", "1", + "ãã§", "ãã§", "1", "ãã£", "ãã£", "1", "ã", "ã", "1", *************** *** 294,297 **** --- 295,299 ---- "ã¦ã ", "ãã¥", "1", "ã¦ã", "ãã£", "1", + "ã¦ã", "ãã§", "1", "ã¦ã", "ãã£", "1", "ã¦", "ã", "1", *************** *** 514,517 **** --- 516,521 ---- }; + #define NJD_SET_PRONUNCIATION_FILLER "ãã£ã©ã¼" + #define NJD_SET_PRONUNCIATION_U "ã¦" #define NJD_SET_PRONUNCIATION_DOUSHI "åè©" |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 05:07:02
|
Update of /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13813/njd_set_unvoiced_vowel Modified Files: Makefile.am njd_set_unvoiced_vowel.c njd_set_unvoiced_vowel.h njd_set_unvoiced_vowel_rule_ascii_for_euc_jp.h njd_set_unvoiced_vowel_rule_ascii_for_shift_jis.h njd_set_unvoiced_vowel_rule_ascii_for_utf_8.h njd_set_unvoiced_vowel_rule_euc_jp.h njd_set_unvoiced_vowel_rule_shift_jis.h njd_set_unvoiced_vowel_rule_utf_8.h Log Message: modify unvoicing rules Index: njd_set_unvoiced_vowel.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** njd_set_unvoiced_vowel.h 11 Dec 2013 06:33:06 -0000 1.7 --- njd_set_unvoiced_vowel.h 11 Dec 2014 05:06:59 -0000 1.8 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: njd_set_unvoiced_vowel_rule_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel_rule_euc_jp.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** njd_set_unvoiced_vowel_rule_euc_jp.h 11 Dec 2013 06:33:06 -0000 1.7 --- njd_set_unvoiced_vowel_rule_euc_jp.h 11 Dec 2014 05:06:59 -0000 1.8 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 54,69 **** /* ̵À¼»Ò²»: k ky s sh t ty ch ts h f hy p py ! Rule 1 ½õÆ°»ì¤Î¡Ö¤Ç¤¹¡×¤È¡Ö¤Þ¤¹¡×¤Î¡Ö¤¹¡×¤¬ÌµÀ¼²½ (¼½ñ½¤ÀµºÑ) ! Rule 2 ³¤±¤Æ̵À¼²½¤·¤Ê¤¤ ! Rule 3 ¥¢¥¯¥»¥ó¥È³Ë¤Ç̵À¼²½¤·¤Ê¤¤ ! Rule 4 ̵À¼»Ò²»(k ky s sh t ty ch ts h f hy p py)¤Ë°Ï¤Þ¤ì¤¿¡Öi¡×¤È¡Öu¡×¤¬ÌµÀ¼²½ Îã³°¡§s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_QUOTATION "¡Ç" ! #define NJD_SET_UNVOICED_VOWEL_QUESTION "¡©" ! #define NJD_SET_UNVOICED_VOWEL_TOUTEN "¡¢" ! #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "½õÆ°»ì" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { --- 54,79 ---- /* ̵À¼»Ò²»: k ky s sh t ty ch ts h f hy p py ! Rule 0 ¥Õ¥£¥é¡¼¤Ï̵À¼²½¤·¤Ê¤¤ ! Rule 1 ½õÆ°»ì¤Î¡Ö¤Ç¤¹¡×¤È¡Ö¤Þ¤¹¡×¤Î¡Ö¤¹¡×¤¬ÌµÀ¼²½ ! Rule 2 Æ°»ì¡¤½õÆ°»ì¡¤½õ»ì¤Î¡Ö¤·¡×¤Ï̵À¼²½¤·¤ä¤¹¤¤ ! Rule 3 ³¤±¤Æ̵À¼²½¤·¤Ê¤¤ ! Rule 4 ¥¢¥¯¥»¥ó¥È³Ë¤Ç̵À¼²½¤·¤Ê¤¤ ! Rule 5 ̵À¼»Ò²»(k ky s sh t ty ch ts h f hy p py)¤Ë°Ï¤Þ¤ì¤¿¡Öi¡×¤È¡Öu¡×¤¬ÌµÀ¼²½ Îã³°¡§s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_FILLER "¥Õ¥£¥é¡¼" ! #define NJD_SET_UNVOICED_VOWEL_DOUSHI "Æ°»ì" #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "½õÆ°»ì" + #define NJD_SET_UNVOICED_VOWEL_JOSHI "½õ»ì" + #define NJD_SET_UNVOICED_VOWEL_KANDOUSHI "´¶Æ°»ì" + #define NJD_SET_UNVOICED_VOWEL_TOUTEN "¡¢" + #define NJD_SET_UNVOICED_VOWEL_QUESTION "¡©" + #define NJD_SET_UNVOICED_VOWEL_QUOTATION "¡Ç" + #define NJD_SET_UNVOICED_VOWEL_SHI "¥·" + #define NJD_SET_UNVOICED_VOWEL_MA "¥Þ" + #define NJD_SET_UNVOICED_VOWEL_DE "¥Ç" + #define NJD_SET_UNVOICED_VOWEL_CHOUON "¡¼" + #define NJD_SET_UNVOICED_VOWEL_SU "¥¹" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { *************** *** 268,271 **** --- 278,282 ---- "¥Æ¥å", "¥Æ¥ã", + "¥Æ¥§", "¥Æ¥£", "¥Æ", Index: njd_set_unvoiced_vowel.c =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** njd_set_unvoiced_vowel.c 11 Dec 2013 06:33:06 -0000 1.10 --- njd_set_unvoiced_vowel.c 11 Dec 2014 05:06:59 -0000 1.11 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 97,254 **** } ! static int strcat_unvoiced(char *buff, const char *str, int *last_unvoiced_flag, ! int *mora_in_accent_phrase) { ! strcat(buff, str); ! strcat(buff, NJD_SET_UNVOICED_VOWEL_QUOTATION); ! *last_unvoiced_flag = 1; ! *mora_in_accent_phrase += 1; ! return strlen(str); ! } ! static int strcat_skip(char *buff, const char *str, int *last_unvoiced_flag, ! int *mora_in_accent_phrase) ! { ! int i, byte; for (i = 0; njd_set_unvoiced_vowel_mora_list[i] != NULL; i++) { ! byte = strtopcmp(str, njd_set_unvoiced_vowel_mora_list[i]); ! if (byte > 0) { ! strncat(buff, njd_set_unvoiced_vowel_mora_list[i], byte); ! *last_unvoiced_flag = 0; ! *mora_in_accent_phrase += 1; ! return strlen(njd_set_unvoiced_vowel_mora_list[i]); } } ! if (strtopcmp(str, NJD_SET_UNVOICED_VOWEL_TOUTEN) > 0) { ! strcat(buff, NJD_SET_UNVOICED_VOWEL_TOUTEN); ! *last_unvoiced_flag = 0; ! return strlen(NJD_SET_UNVOICED_VOWEL_TOUTEN); } ! if (strtopcmp(str, NJD_SET_UNVOICED_VOWEL_QUESTION) > 0) { ! strcat(buff, NJD_SET_UNVOICED_VOWEL_QUESTION); ! *last_unvoiced_flag = 0; ! return strlen(NJD_SET_UNVOICED_VOWEL_QUESTION); } ! if (strtopcmp(str, NJD_SET_UNVOICED_VOWEL_QUOTATION) > 0) { ! strcat(buff, NJD_SET_UNVOICED_VOWEL_QUOTATION); ! *last_unvoiced_flag = 1; ! return strlen(NJD_SET_UNVOICED_VOWEL_QUOTATION); } ! fprintf(stderr, "WARNING: strcat_voiced() in njd_set_unvoiced_vowel.c: Wrong pron."); ! return 1; } ! static void set_unvoiced_vowel(NJDNode * node, int *acc_in_accent_phrase, ! int *mora_in_accent_phrase, int *last_unvoiced_flag) { ! int i, j, k; int len; char buff[MAXBUFLEN]; const char *str; - const char *tmp; - const char *pat; - int find; ! /* initialize */ ! str = NJDNode_get_pron(node); ! buff[0] = '\0'; ! len = strlen(str); ! for (i = 0; i < len;) { ! if (*last_unvoiced_flag == 1) { ! /* Rule 2 */ ! i += strcat_skip(buff, &str[i], last_unvoiced_flag, mora_in_accent_phrase); ! } else if (*acc_in_accent_phrase == *mora_in_accent_phrase + 1) { ! /* Rule 3 */ ! i += strcat_skip(buff, &str[i], last_unvoiced_flag, mora_in_accent_phrase); ! } else { ! /* Rule 4 */ ! tmp = NULL; ! for (j = 0; njd_set_unvoiced_vowel_mora_list[j] != NULL; j++) { ! if (strtopcmp(&str[i], njd_set_unvoiced_vowel_mora_list[j]) > 0) { ! tmp = njd_set_unvoiced_vowel_mora_list[j]; ! break; ! } } ! if (tmp == NULL) { ! /* unknown mora */ ! i += strcat_skip(buff, &str[i], last_unvoiced_flag, mora_in_accent_phrase); ! } else { ! j = i + strlen(tmp); ! pat = NULL; ! if (j < len) ! pat = &str[j]; ! else if (node->next != NULL) ! pat = NJDNode_get_pron(node->next); ! if (pat != NULL) ! find = -1; else ! find = 0; ! if (find < 0) { ! for (j = 0; njd_set_unvoiced_vowel_candidate_list1[j] != NULL; j++) { ! if (strcmp(tmp, njd_set_unvoiced_vowel_candidate_list1[j]) == 0) { ! find = 0; ! for (k = 0; njd_set_unvoiced_vowel_next_mora_list1[k] != NULL; k++) { ! if (strtopcmp(pat, njd_set_unvoiced_vowel_next_mora_list1[k]) > 0) { ! find = 1; ! break; ! } ! } ! break; ! } ! } } ! if (find < 0) { ! for (j = 0; njd_set_unvoiced_vowel_candidate_list2[j] != NULL; j++) { ! if (strcmp(tmp, njd_set_unvoiced_vowel_candidate_list2[j]) == 0) { ! find = 0; ! for (k = 0; njd_set_unvoiced_vowel_next_mora_list2[k] != NULL; k++) { ! if (strtopcmp(pat, njd_set_unvoiced_vowel_next_mora_list2[k]) > 0) { ! find = 1; ! break; ! } ! } ! break; ! } ! } } ! if (find < 0) { ! for (j = 0; njd_set_unvoiced_vowel_candidate_list3[j] != NULL; j++) { ! if (strcmp(tmp, njd_set_unvoiced_vowel_candidate_list3[j]) == 0) { ! find = 0; ! for (k = 0; njd_set_unvoiced_vowel_next_mora_list3[k] != NULL; k++) { ! if (strtopcmp(pat, njd_set_unvoiced_vowel_next_mora_list3[k]) > 0) { ! find = 1; ! break; ! } ! } ! break; ! } ! } } - if (find == 1) /* unvoiced */ - i += strcat_unvoiced(buff, tmp, last_unvoiced_flag, mora_in_accent_phrase); - else /* skip */ - i += strcat_skip(buff, tmp, last_unvoiced_flag, mora_in_accent_phrase); } ! } ! } ! NJDNode_set_pron(node, buff); ! } ! void njd_set_unvoiced_vowel(NJD * njd) ! { ! int acc_in_accent_phrase = 0; ! int mora_in_accent_phrase = 0; ! int last_unvoiced_flag = 0; ! NJDNode *node; ! for (node = njd->head; node != NULL; node = node->next) { ! if (NJDNode_get_chain_flag(node) != 1) { ! acc_in_accent_phrase = NJDNode_get_acc(node); ! mora_in_accent_phrase = 0; } ! set_unvoiced_vowel(node, &acc_in_accent_phrase, &mora_in_accent_phrase, &last_unvoiced_flag); } } --- 97,338 ---- } ! static void get_mora_information(NJDNode * node, int index, const char **mora, NJDNode ** nlink, ! int *flag, int *size, int *midx, int *atype) { ! int i; ! int matched_size; ! const char *str = NJDNode_get_pron(node); ! int len = strlen(str); ! /* find next word */ ! if (index >= len) { ! if (node->next != NULL) { ! get_mora_information(node->next, index - len, mora, nlink, flag, size, midx, atype); ! } else { ! *mora = NULL; ! *nlink = NULL; ! *flag = -1; ! *size = 0; ! *midx = 0; ! *atype = 0; ! } ! return; ! } ! ! *nlink = node; ! ! /* reset mora index and accent type for new word */ ! if (index == 0 && NJDNode_get_chain_flag(node) != 1) { ! *midx = 0; ! *atype = NJDNode_get_acc(node); ! } ! ! /* special symbol */ ! if (strcmp(str, NJD_SET_UNVOICED_VOWEL_TOUTEN) == 0) { ! *mora = NJD_SET_UNVOICED_VOWEL_TOUTEN; ! *flag = 0; ! *size = strlen(NJD_SET_UNVOICED_VOWEL_TOUTEN); ! return; ! } ! if (strcmp(str, NJD_SET_UNVOICED_VOWEL_QUESTION) == 0) { ! *mora = NJD_SET_UNVOICED_VOWEL_QUESTION; ! *flag = 0; ! *size = strlen(NJD_SET_UNVOICED_VOWEL_QUESTION); ! return; ! } + /* reset */ + *mora = NULL; + *flag = -1; + *size = 0; + + /* get mora */ for (i = 0; njd_set_unvoiced_vowel_mora_list[i] != NULL; i++) { ! matched_size = strtopcmp(&str[index], njd_set_unvoiced_vowel_mora_list[i]); ! if (matched_size > 0) { ! *mora = njd_set_unvoiced_vowel_mora_list[i]; ! *size = matched_size; ! break; } } ! ! /* get unvoice flag */ ! matched_size = strtopcmp(&str[index + (*size)], NJD_SET_UNVOICED_VOWEL_QUOTATION); ! if (matched_size > 0) { ! *flag = 1; ! *size += matched_size; } ! } ! ! static int apply_unvoice_rule(const char *current, const char *next) ! { ! int i, j; ! ! if (next == NULL) ! return 0; ! ! for (i = 0; njd_set_unvoiced_vowel_candidate_list1[i] != NULL; i++) { ! if (strcmp(current, njd_set_unvoiced_vowel_candidate_list1[i]) == 0) { ! for (j = 0; njd_set_unvoiced_vowel_next_mora_list1[j] != NULL; j++) ! if (strtopcmp(next, njd_set_unvoiced_vowel_next_mora_list1[j]) > 0) ! return 1; ! return 0; ! } } ! for (i = 0; njd_set_unvoiced_vowel_candidate_list2[i] != NULL; i++) { ! if (strcmp(current, njd_set_unvoiced_vowel_candidate_list2[i]) == 0) { ! for (j = 0; njd_set_unvoiced_vowel_next_mora_list2[j] != NULL; j++) ! if (strtopcmp(next, njd_set_unvoiced_vowel_next_mora_list2[j]) > 0) ! return 1; ! return 0; ! } } ! for (i = 0; njd_set_unvoiced_vowel_candidate_list3[i] != NULL; i++) { ! if (strcmp(current, njd_set_unvoiced_vowel_candidate_list3[i]) == 0) { ! for (j = 0; njd_set_unvoiced_vowel_next_mora_list3[j] != NULL; j++) { ! if (strtopcmp(next, njd_set_unvoiced_vowel_next_mora_list3[j]) > 0) ! return 1; ! } ! return 0; ! } ! } ! ! return -1; /* unknown */ } ! void njd_set_unvoiced_vowel(NJD * njd) { ! NJDNode *node; ! int index; int len; char buff[MAXBUFLEN]; const char *str; ! /* mora information for current, next, and next-next moras */ ! const char *mora1 = NULL, *mora2 = NULL, *mora3 = NULL; ! NJDNode *nlink1 = NULL, *nlink2 = NULL, *nlink3 = NULL; ! int size1 = 0, size2 = 0, size3 = 0; ! int flag1 = -1, flag2 = -1, flag3 = -1; /* unknown:-1, voice:0, unvoiced:1 */ ! int midx1 = 0, midx2 = 1, midx3 = 2; ! int atype1 = 0, atype2 = 0, atype3 = 0; ! for (node = njd->head; node != NULL; node = node->next) { ! buff[0] = '\0'; ! ! /* get pronunciation */ ! str = NJDNode_get_pron(node); ! len = strlen(str); ! ! /* parse pronunciation */ ! for (index = 0; index < len;) { ! /* get mora information */ ! if (mora1 == NULL) ! get_mora_information(node, index, &mora1, &nlink1, &flag1, &size1, &midx1, &atype1); ! if (mora1 == NULL) { ! fprintf(stderr, ! "WARNING: set_unvoiced_vowel() in njd_set_unvoiced_vowel.c: Wrong pron."); ! return; } ! if (mora2 == NULL) { ! midx2 = midx1 + 1; ! atype2 = atype1; ! get_mora_information(node, index + size1, &mora2, &nlink2, &flag2, &size2, &midx2, ! &atype2); ! } ! if (mora3 == NULL) { ! midx3 = midx2 + 1; ! atype3 = atype2; ! get_mora_information(node, index + size1 + size2, &mora3, &nlink3, &flag3, &size3, ! &midx3, &atype3); ! } ! ! /* rule 1: look-ahead for 'masu' and 'desu' */ ! if (mora2 != NULL && mora3 != NULL && nlink1 == nlink2 && nlink2 != nlink3 && ! (strcmp(mora1, NJD_SET_UNVOICED_VOWEL_MA) == 0 ! || strcmp(mora1, NJD_SET_UNVOICED_VOWEL_DE) == 0) ! && strcmp(mora2, NJD_SET_UNVOICED_VOWEL_SU) == 0 ! && (strcmp(NJDNode_get_pos(nlink2), NJD_SET_UNVOICED_VOWEL_DOUSHI) == 0 ! || strcmp(NJDNode_get_pos(nlink2), NJD_SET_UNVOICED_VOWEL_JODOUSHI) == 0 ! || strcmp(NJDNode_get_pos(nlink2), NJD_SET_UNVOICED_VOWEL_KANDOUSHI) == 0) ! ) { ! if (strcmp(NJDNode_get_pron(nlink3), NJD_SET_UNVOICED_VOWEL_QUESTION) == 0 ! || strcmp(NJDNode_get_pron(nlink3), NJD_SET_UNVOICED_VOWEL_CHOUON) == 0) ! flag2 = 0; else ! flag2 = 1; ! } ! ! /* rule 2: look-ahead for 'shi' */ ! if (flag1 != 1 && flag2 == -1 && flag3 != 1 && mora2 != NULL && ! strcmp(NJDNode_get_pron(nlink2), NJD_SET_UNVOICED_VOWEL_SHI) == 0 && ! (strcmp(NJDNode_get_pos(nlink2), NJD_SET_UNVOICED_VOWEL_DOUSHI) == 0 || ! strcmp(NJDNode_get_pos(nlink2), NJD_SET_UNVOICED_VOWEL_JODOUSHI) == 0 || ! strcmp(NJDNode_get_pos(nlink2), NJD_SET_UNVOICED_VOWEL_JOSHI) == 0)) { ! if (atype2 == midx2 + 1) { ! /* rule 4 */ ! flag2 = 0; ! } else { ! /* rule 5 */ ! flag2 = apply_unvoice_rule(mora2, mora3); } ! if (flag2 == 1) { ! if (flag1 == -1) ! flag1 = 0; ! if (flag3 == -1) ! flag3 = 0; } ! } ! ! /* estimate unvoice */ ! if (flag1 == -1) { ! if (strcmp(NJDNode_get_pos(nlink1), NJD_SET_UNVOICED_VOWEL_FILLER) == 0) { ! /* rule 0 */ ! flag1 = 0; ! } else if (flag2 == 1) { ! /* rule 3 */ ! flag1 = 0; ! } else if (atype1 == midx1 + 1) { ! /* rule 4 */ ! flag1 = 0; ! } else { ! /* rule 5 */ ! flag1 = apply_unvoice_rule(mora1, mora2); } } ! if (flag1 == 1 && flag2 == -1) { ! flag2 = 0; ! } ! /* store pronunciation */ ! strcat(buff, mora1); ! if (flag1 == 1) ! strcat(buff, NJD_SET_UNVOICED_VOWEL_QUOTATION); ! /* prepare next step */ ! index += size1; ! ! mora1 = mora2; ! nlink1 = nlink2; ! size1 = size2; ! flag1 = flag2; ! midx1 = midx2; ! atype1 = atype2; ! ! mora2 = mora3; ! nlink2 = nlink3; ! size2 = size3; ! flag2 = flag3; ! midx2 = midx3; ! atype2 = atype3; ! ! mora3 = NULL; ! nlink3 = NULL; ! size3 = 0; ! flag3 = -1; ! midx3 = 0; ! atype3 = 0; } ! ! NJDNode_set_pron(node, buff); } } Index: njd_set_unvoiced_vowel_rule_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel_rule_utf_8.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** njd_set_unvoiced_vowel_rule_utf_8.h 11 Dec 2013 06:33:06 -0000 1.7 --- njd_set_unvoiced_vowel_rule_utf_8.h 11 Dec 2014 05:06:59 -0000 1.8 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 54,69 **** /* ç¡å£°åé³: k ky s sh t ty ch ts h f hy p py ! Rule 1 å©åè©ã®ãã§ããã¨ãã¾ããã®ããããç¡å£°å (è¾æ¸ä¿®æ£æ¸) ! Rule 2 ç¶ãã¦ç¡å£°åããªã ! Rule 3 ã¢ã¯ã»ã³ãæ ¸ã§ç¡å£°åããªã ! Rule 4 ç¡å£°åé³(k ky s sh t ty ch ts h f hy p py)ã«å²ã¾ãããiãã¨ãuããç¡å£°å ä¾å¤ï¼s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_QUOTATION "â" ! #define NJD_SET_UNVOICED_VOWEL_QUESTION "ï¼" ! #define NJD_SET_UNVOICED_VOWEL_TOUTEN "ã" ! #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "å©åè©" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { --- 54,79 ---- /* ç¡å£°åé³: k ky s sh t ty ch ts h f hy p py ! Rule 0 ãã£ã©ã¼ã¯ç¡å£°åããªã ! Rule 1 å©åè©ã®ãã§ããã¨ãã¾ããã®ããããç¡å£°å ! Rule 2 åè©ï¼å©åè©ï¼å©è©ã®ãããã¯ç¡å£°åãããã ! Rule 3 ç¶ãã¦ç¡å£°åããªã ! Rule 4 ã¢ã¯ã»ã³ãæ ¸ã§ç¡å£°åããªã ! Rule 5 ç¡å£°åé³(k ky s sh t ty ch ts h f hy p py)ã«å²ã¾ãããiãã¨ãuããç¡å£°å ä¾å¤ï¼s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_FILLER "ãã£ã©ã¼" ! #define NJD_SET_UNVOICED_VOWEL_DOUSHI "åè©" #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "å©åè©" + #define NJD_SET_UNVOICED_VOWEL_JOSHI "å©è©" + #define NJD_SET_UNVOICED_VOWEL_KANDOUSHI "æåè©" + #define NJD_SET_UNVOICED_VOWEL_TOUTEN "ã" + #define NJD_SET_UNVOICED_VOWEL_QUESTION "ï¼" + #define NJD_SET_UNVOICED_VOWEL_QUOTATION "â" + #define NJD_SET_UNVOICED_VOWEL_SHI "ã·" + #define NJD_SET_UNVOICED_VOWEL_MA "ã" + #define NJD_SET_UNVOICED_VOWEL_DE "ã" + #define NJD_SET_UNVOICED_VOWEL_CHOUON "ã¼" + #define NJD_SET_UNVOICED_VOWEL_SU "ã¹" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { *************** *** 268,271 **** --- 278,282 ---- "ãã¥", "ãã£", + "ãã§", "ãã£", "ã", Index: njd_set_unvoiced_vowel_rule_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel_rule_shift_jis.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** njd_set_unvoiced_vowel_rule_shift_jis.h 11 Dec 2013 06:33:06 -0000 1.7 --- njd_set_unvoiced_vowel_rule_shift_jis.h 11 Dec 2014 05:06:59 -0000 1.8 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 54,69 **** /* ³ºq¹: k ky s sh t ty ch ts h f hy p py ! Rule 1 ®ÌuÅ·vÆuÜ·vÌu·vª³º» («C³Ï) ! Rule 2 ±¯Ä³º»µÈ¢ ! Rule 3 ANZgjųº»µÈ¢ ! Rule 4 ³ºq¹(k ky s sh t ty ch ts h f hy p py)ÉÍÜê½uivÆuuvª³º» áOFs->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_QUOTATION "f" ! #define NJD_SET_UNVOICED_VOWEL_QUESTION "H" ! #define NJD_SET_UNVOICED_VOWEL_TOUTEN "A" ! #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "®" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { --- 54,79 ---- /* ³ºq¹: k ky s sh t ty ch ts h f hy p py ! Rule 0 tB[ͳº»µÈ¢ ! Rule 1 ®ÌuÅ·vÆuÜ·vÌu·vª³º» ! Rule 2 ®C®CÌuµvͳº»µâ·¢ ! Rule 3 ±¯Ä³º»µÈ¢ ! Rule 4 ANZgjųº»µÈ¢ ! Rule 5 ³ºq¹(k ky s sh t ty ch ts h f hy p py)ÉÍÜê½uivÆuuvª³º» áOFs->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_FILLER "tB[" ! #define NJD_SET_UNVOICED_VOWEL_DOUSHI "®" #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "®" + #define NJD_SET_UNVOICED_VOWEL_JOSHI "" + #define NJD_SET_UNVOICED_VOWEL_KANDOUSHI "´®" + #define NJD_SET_UNVOICED_VOWEL_TOUTEN "A" + #define NJD_SET_UNVOICED_VOWEL_QUESTION "H" + #define NJD_SET_UNVOICED_VOWEL_QUOTATION "f" + #define NJD_SET_UNVOICED_VOWEL_SHI "V" + #define NJD_SET_UNVOICED_VOWEL_MA "}" + #define NJD_SET_UNVOICED_VOWEL_DE "f" + #define NJD_SET_UNVOICED_VOWEL_CHOUON "[" + #define NJD_SET_UNVOICED_VOWEL_SU "X" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { *************** *** 268,271 **** --- 278,282 ---- "e ", "e", + "eF", "eB", "e", Index: njd_set_unvoiced_vowel_rule_ascii_for_shift_jis.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel_rule_ascii_for_shift_jis.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** njd_set_unvoiced_vowel_rule_ascii_for_shift_jis.h 11 Dec 2013 06:33:06 -0000 1.2 --- njd_set_unvoiced_vowel_rule_ascii_for_shift_jis.h 11 Dec 2014 05:06:59 -0000 1.3 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 54,69 **** /* \x96\xb3\x90\xba\x8e\x71\x89\xb9: k ky s sh t ty ch ts h f hy p py ! Rule 1 \x8f\x95\x93\xae\x8e\x8c\x82\xcc\x81\x75\x82\xc5\x82\xb7\x81\x76\x82\xc6\x81\x75\x82\xdc\x82\xb7\x81\x76\x82\xcc\x81\x75\x82\xb7\x81\x76\x82\xaa\x96\xb3\x90\xba\x89\xbb (\x8e\xab\x8f\x91\x8f\x43\x90\xb3\x8d\xcf) ! Rule 2 \x91\xb1\x82\xaf\x82\xc4\x96\xb3\x90\xba\x89\xbb\x82\xb5\x82\xc8\x82\xa2 ! Rule 3 \x83\x41\x83\x4e\x83\x5a\x83\x93\x83\x67\x8a\x6a\x82\xc5\x96\xb3\x90\xba\x89\xbb\x82\xb5\x82\xc8\x82\xa2 ! Rule 4 \x96\xb3\x90\xba\x8e\x71\x89\xb9(k ky s sh t ty ch ts h f hy p py)\x82\xc9\x88\xcd\x82\xdc\x82\xea\x82\xbd\x81\x75i\x81\x76\x82\xc6\x81\x75u\x81\x76\x82\xaa\x96\xb3\x90\xba\x89\xbb \x97\xe1\x8a\x4f\x81\x46s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_QUOTATION "\x81\x66" ! #define NJD_SET_UNVOICED_VOWEL_QUESTION "\x81\x48" ! #define NJD_SET_UNVOICED_VOWEL_TOUTEN "\x81\x41" ! #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "\x8f\x95\x93\xae\x8e\x8c" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { --- 54,79 ---- /* \x96\xb3\x90\xba\x8e\x71\x89\xb9: k ky s sh t ty ch ts h f hy p py ! Rule 0 \x83\x74\x83\x42\x83\x89\x81\x5b\x82\xcd\x96\xb3\x90\xba\x89\xbb\x82\xb5\x82\xc8\x82\xa2 ! Rule 1 \x8f\x95\x93\xae\x8e\x8c\x82\xcc\x81\x75\x82\xc5\x82\xb7\x81\x76\x82\xc6\x81\x75\x82\xdc\x82\xb7\x81\x76\x82\xcc\x81\x75\x82\xb7\x81\x76\x82\xaa\x96\xb3\x90\xba\x89\xbb ! Rule 2 \x93\xae\x8e\x8c\x81\x43\x8f\x95\x93\xae\x8e\x8c\x81\x43\x8f\x95\x8e\x8c\x82\xcc\x81\x75\x82\xb5\x81\x76\x82\xcd\x96\xb3\x90\xba\x89\xbb\x82\xb5\x82\xe2\x82\xb7\x82\xa2 ! Rule 3 \x91\xb1\x82\xaf\x82\xc4\x96\xb3\x90\xba\x89\xbb\x82\xb5\x82\xc8\x82\xa2 ! Rule 4 \x83\x41\x83\x4e\x83\x5a\x83\x93\x83\x67\x8a\x6a\x82\xc5\x96\xb3\x90\xba\x89\xbb\x82\xb5\x82\xc8\x82\xa2 ! Rule 5 \x96\xb3\x90\xba\x8e\x71\x89\xb9(k ky s sh t ty ch ts h f hy p py)\x82\xc9\x88\xcd\x82\xdc\x82\xea\x82\xbd\x81\x75i\x81\x76\x82\xc6\x81\x75u\x81\x76\x82\xaa\x96\xb3\x90\xba\x89\xbb \x97\xe1\x8a\x4f\x81\x46s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_FILLER "\x83\x74\x83\x42\x83\x89\x81\x5b" ! #define NJD_SET_UNVOICED_VOWEL_DOUSHI "\x93\xae\x8e\x8c" #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "\x8f\x95\x93\xae\x8e\x8c" + #define NJD_SET_UNVOICED_VOWEL_JOSHI "\x8f\x95\x8e\x8c" + #define NJD_SET_UNVOICED_VOWEL_KANDOUSHI "\x8a\xb4\x93\xae\x8e\x8c" + #define NJD_SET_UNVOICED_VOWEL_TOUTEN "\x81\x41" + #define NJD_SET_UNVOICED_VOWEL_QUESTION "\x81\x48" + #define NJD_SET_UNVOICED_VOWEL_QUOTATION "\x81\x66" + #define NJD_SET_UNVOICED_VOWEL_SHI "\x83\x56" + #define NJD_SET_UNVOICED_VOWEL_MA "\x83\x7d" + #define NJD_SET_UNVOICED_VOWEL_DE "\x83\x66" + #define NJD_SET_UNVOICED_VOWEL_CHOUON "\x81\x5b" + #define NJD_SET_UNVOICED_VOWEL_SU "\x83\x58" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { *************** *** 268,271 **** --- 278,282 ---- "\x83\x65\x83\x85", "\x83\x65\x83\x83", + "\x83\x65\x83\x46", "\x83\x65\x83\x42", "\x83\x65", Index: njd_set_unvoiced_vowel_rule_ascii_for_utf_8.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel_rule_ascii_for_utf_8.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** njd_set_unvoiced_vowel_rule_ascii_for_utf_8.h 11 Dec 2013 06:33:06 -0000 1.2 --- njd_set_unvoiced_vowel_rule_ascii_for_utf_8.h 11 Dec 2014 05:06:59 -0000 1.3 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 54,69 **** /* \xe7\x84\xa1\xe5\xa3\xb0\xe5\xad\x90\xe9\x9f\xb3: k ky s sh t ty ch ts h f hy p py ! Rule 1 \xe5\x8a\xa9\xe5\x8b\x95\xe8\xa9\x9e\xe3\x81\xae\xe3\x80\x8c\xe3\x81\xa7\xe3\x81\x99\xe3\x80\x8d\xe3\x81\xa8\xe3\x80\x8c\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x8d\xe3\x81\xae\xe3\x80\x8c\xe3\x81\x99\xe3\x80\x8d\xe3\x81\x8c\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96 (\xe8\xbe\x9e\xe6\x9b\xb8\xe4\xbf\xae\xe6\xad\xa3\xe6\xb8\x88) ! Rule 2 \xe7\xb6\x9a\xe3\x81\x91\xe3\x81\xa6\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96\xe3\x81\x97\xe3\x81\xaa\xe3\x81\x84 ! Rule 3 \xe3\x82\xa2\xe3\x82\xaf\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x88\xe6\xa0\xb8\xe3\x81\xa7\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96\xe3\x81\x97\xe3\x81\xaa\xe3\x81\x84 ! Rule 4 \xe7\x84\xa1\xe5\xa3\xb0\xe5\xad\x90\xe9\x9f\xb3(k ky s sh t ty ch ts h f hy p py)\xe3\x81\xab\xe5\x9b\xb2\xe3\x81\xbe\xe3\x82\x8c\xe3\x81\x9f\xe3\x80\x8ci\xe3\x80\x8d\xe3\x81\xa8\xe3\x80\x8cu\xe3\x80\x8d\xe3\x81\x8c\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96 \xe4\xbe\x8b\xe5\xa4\x96\xef\xbc\x9as->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_QUOTATION "\xe2\x80\x99" ! #define NJD_SET_UNVOICED_VOWEL_QUESTION "\xef\xbc\x9f" ! #define NJD_SET_UNVOICED_VOWEL_TOUTEN "\xe3\x80\x81" ! #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "\xe5\x8a\xa9\xe5\x8b\x95\xe8\xa9\x9e" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { --- 54,79 ---- /* \xe7\x84\xa1\xe5\xa3\xb0\xe5\xad\x90\xe9\x9f\xb3: k ky s sh t ty ch ts h f hy p py ! Rule 0 \xe3\x83\x95\xe3\x82\xa3\xe3\x83\xa9\xe3\x83\xbc\xe3\x81\xaf\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96\xe3\x81\x97\xe3\x81\xaa\xe3\x81\x84 ! Rule 1 \xe5\x8a\xa9\xe5\x8b\x95\xe8\xa9\x9e\xe3\x81\xae\xe3\x80\x8c\xe3\x81\xa7\xe3\x81\x99\xe3\x80\x8d\xe3\x81\xa8\xe3\x80\x8c\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x8d\xe3\x81\xae\xe3\x80\x8c\xe3\x81\x99\xe3\x80\x8d\xe3\x81\x8c\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96 ! Rule 2 \xe5\x8b\x95\xe8\xa9\x9e\xef\xbc\x8c\xe5\x8a\xa9\xe5\x8b\x95\xe8\xa9\x9e\xef\xbc\x8c\xe5\x8a\xa9\xe8\xa9\x9e\xe3\x81\xae\xe3\x80\x8c\xe3\x81\x97\xe3\x80\x8d\xe3\x81\xaf\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96\xe3\x81\x97\xe3\x82\x84\xe3\x81\x99\xe3\x81\x84 ! Rule 3 \xe7\xb6\x9a\xe3\x81\x91\xe3\x81\xa6\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96\xe3\x81\x97\xe3\x81\xaa\xe3\x81\x84 ! Rule 4 \xe3\x82\xa2\xe3\x82\xaf\xe3\x82\xbb\xe3\x83\xb3\xe3\x83\x88\xe6\xa0\xb8\xe3\x81\xa7\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96\xe3\x81\x97\xe3\x81\xaa\xe3\x81\x84 ! Rule 5 \xe7\x84\xa1\xe5\xa3\xb0\xe5\xad\x90\xe9\x9f\xb3(k ky s sh t ty ch ts h f hy p py)\xe3\x81\xab\xe5\x9b\xb2\xe3\x81\xbe\xe3\x82\x8c\xe3\x81\x9f\xe3\x80\x8ci\xe3\x80\x8d\xe3\x81\xa8\xe3\x80\x8cu\xe3\x80\x8d\xe3\x81\x8c\xe7\x84\xa1\xe5\xa3\xb0\xe5\x8c\x96 \xe4\xbe\x8b\xe5\xa4\x96\xef\xbc\x9as->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_FILLER "\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xa9\xe3\x83\xbc" ! #define NJD_SET_UNVOICED_VOWEL_DOUSHI "\xe5\x8b\x95\xe8\xa9\x9e" #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "\xe5\x8a\xa9\xe5\x8b\x95\xe8\xa9\x9e" + #define NJD_SET_UNVOICED_VOWEL_JOSHI "\xe5\x8a\xa9\xe8\xa9\x9e" + #define NJD_SET_UNVOICED_VOWEL_KANDOUSHI "\xe6\x84\x9f\xe5\x8b\x95\xe8\xa9\x9e" + #define NJD_SET_UNVOICED_VOWEL_TOUTEN "\xe3\x80\x81" + #define NJD_SET_UNVOICED_VOWEL_QUESTION "\xef\xbc\x9f" + #define NJD_SET_UNVOICED_VOWEL_QUOTATION "\xe2\x80\x99" + #define NJD_SET_UNVOICED_VOWEL_SHI "\xe3\x82\xb7" + #define NJD_SET_UNVOICED_VOWEL_MA "\xe3\x83\x9e" + #define NJD_SET_UNVOICED_VOWEL_DE "\xe3\x83\x87" + #define NJD_SET_UNVOICED_VOWEL_CHOUON "\xe3\x83\xbc" + #define NJD_SET_UNVOICED_VOWEL_SU "\xe3\x82\xb9" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { *************** *** 268,271 **** --- 278,282 ---- "\xe3\x83\x86\xe3\x83\xa5", "\xe3\x83\x86\xe3\x83\xa3", + "\xe3\x83\x86\xe3\x82\xa7", "\xe3\x83\x86\xe3\x82\xa3", "\xe3\x83\x86", Index: Makefile.am =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 11 Dec 2013 05:52:52 -0000 1.3 --- Makefile.am 11 Dec 2014 05:06:59 -0000 1.4 *************** *** 6,10 **** MAINTAINERCLEANFILES = Makefile.in ! INCLUDES = -I @top_srcdir@/njd @CHARSET@ noinst_LIBRARIES = libnjd_set_unvoiced_vowel.a --- 6,10 ---- MAINTAINERCLEANFILES = Makefile.in ! AM_CPPFLAGS = -I @top_srcdir@/njd @CHARSET@ noinst_LIBRARIES = libnjd_set_unvoiced_vowel.a Index: njd_set_unvoiced_vowel_rule_ascii_for_euc_jp.h =================================================================== RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd_set_unvoiced_vowel/njd_set_unvoiced_vowel_rule_ascii_for_euc_jp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** njd_set_unvoiced_vowel_rule_ascii_for_euc_jp.h 11 Dec 2013 06:33:06 -0000 1.2 --- njd_set_unvoiced_vowel_rule_ascii_for_euc_jp.h 11 Dec 2014 05:06:59 -0000 1.3 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2008-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 54,69 **** /* \xcc\xb5\xc0\xbc\xbb\xd2\xb2\xbb: k ky s sh t ty ch ts h f hy p py ! Rule 1 \xbd\xf5\xc6\xb0\xbb\xec\xa4\xce\xa1\xd6\xa4\xc7\xa4\xb9\xa1\xd7\xa4\xc8\xa1\xd6\xa4\xde\xa4\xb9\xa1\xd7\xa4\xce\xa1\xd6\xa4\xb9\xa1\xd7\xa4\xac\xcc\xb5\xc0\xbc\xb2\xbd (\xbc\xad\xbd\xf1\xbd\xa4\xc0\xb5\xba\xd1) ! Rule 2 \xc2\xb3\xa4\xb1\xa4\xc6\xcc\xb5\xc0\xbc\xb2\xbd\xa4\xb7\xa4\xca\xa4\xa4 ! Rule 3 \xa5\xa2\xa5\xaf\xa5\xbb\xa5\xf3\xa5\xc8\xb3\xcb\xa4\xc7\xcc\xb5\xc0\xbc\xb2\xbd\xa4\xb7\xa4\xca\xa4\xa4 ! Rule 4 \xcc\xb5\xc0\xbc\xbb\xd2\xb2\xbb(k ky s sh t ty ch ts h f hy p py)\xa4\xcb\xb0\xcf\xa4\xde\xa4\xec\xa4\xbf\xa1\xd6i\xa1\xd7\xa4\xc8\xa1\xd6u\xa1\xd7\xa4\xac\xcc\xb5\xc0\xbc\xb2\xbd \xce\xe3\xb3\xb0\xa1\xa7s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_QUOTATION "\xa1\xc7" ! #define NJD_SET_UNVOICED_VOWEL_QUESTION "\xa1\xa9" ! #define NJD_SET_UNVOICED_VOWEL_TOUTEN "\xa1\xa2" ! #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "\xbd\xf5\xc6\xb0\xbb\xec" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { --- 54,79 ---- /* \xcc\xb5\xc0\xbc\xbb\xd2\xb2\xbb: k ky s sh t ty ch ts h f hy p py ! Rule 0 \xa5\xd5\xa5\xa3\xa5\xe9\xa1\xbc\xa4\xcf\xcc\xb5\xc0\xbc\xb2\xbd\xa4\xb7\xa4\xca\xa4\xa4 ! Rule 1 \xbd\xf5\xc6\xb0\xbb\xec\xa4\xce\xa1\xd6\xa4\xc7\xa4\xb9\xa1\xd7\xa4\xc8\xa1\xd6\xa4\xde\xa4\xb9\xa1\xd7\xa4\xce\xa1\xd6\xa4\xb9\xa1\xd7\xa4\xac\xcc\xb5\xc0\xbc\xb2\xbd ! Rule 2 \xc6\xb0\xbb\xec\xa1\xa4\xbd\xf5\xc6\xb0\xbb\xec\xa1\xa4\xbd\xf5\xbb\xec\xa4\xce\xa1\xd6\xa4\xb7\xa1\xd7\xa4\xcf\xcc\xb5\xc0\xbc\xb2\xbd\xa4\xb7\xa4\xe4\xa4\xb9\xa4\xa4 ! Rule 3 \xc2\xb3\xa4\xb1\xa4\xc6\xcc\xb5\xc0\xbc\xb2\xbd\xa4\xb7\xa4\xca\xa4\xa4 ! Rule 4 \xa5\xa2\xa5\xaf\xa5\xbb\xa5\xf3\xa5\xc8\xb3\xcb\xa4\xc7\xcc\xb5\xc0\xbc\xb2\xbd\xa4\xb7\xa4\xca\xa4\xa4 ! Rule 5 \xcc\xb5\xc0\xbc\xbb\xd2\xb2\xbb(k ky s sh t ty ch ts h f hy p py)\xa4\xcb\xb0\xcf\xa4\xde\xa4\xec\xa4\xbf\xa1\xd6i\xa1\xd7\xa4\xc8\xa1\xd6u\xa1\xd7\xa4\xac\xcc\xb5\xc0\xbc\xb2\xbd \xce\xe3\xb3\xb0\xa1\xa7s->s, s->sh, f->f, f->h, f->hy, h->f, h->h, h->hy */ ! #define NJD_SET_UNVOICED_VOWEL_FILLER "\xa5\xd5\xa5\xa3\xa5\xe9\xa1\xbc" ! #define NJD_SET_UNVOICED_VOWEL_DOUSHI "\xc6\xb0\xbb\xec" #define NJD_SET_UNVOICED_VOWEL_JODOUSHI "\xbd\xf5\xc6\xb0\xbb\xec" + #define NJD_SET_UNVOICED_VOWEL_JOSHI "\xbd\xf5\xbb\xec" + #define NJD_SET_UNVOICED_VOWEL_KANDOUSHI "\xb4\xb6\xc6\xb0\xbb\xec" + #define NJD_SET_UNVOICED_VOWEL_TOUTEN "\xa1\xa2" + #define NJD_SET_UNVOICED_VOWEL_QUESTION "\xa1\xa9" + #define NJD_SET_UNVOICED_VOWEL_QUOTATION "\xa1\xc7" + #define NJD_SET_UNVOICED_VOWEL_SHI "\xa5\xb7" + #define NJD_SET_UNVOICED_VOWEL_MA "\xa5\xde" + #define NJD_SET_UNVOICED_VOWEL_DE "\xa5\xc7" + #define NJD_SET_UNVOICED_VOWEL_CHOUON "\xa1\xbc" + #define NJD_SET_UNVOICED_VOWEL_SU "\xa5\xb9" static const char *njd_set_unvoiced_vowel_candidate_list1[] = { *************** *** 268,271 **** --- 278,282 ---- "\xa5\xc6\xa5\xe5", "\xa5\xc6\xa5\xe3", + "\xa5\xc6\xa5\xa7", "\xa5\xc6\xa5\xa3", "\xa5\xc6", |
