Updates for open_jtalk 1.11 (#7)

* Update code for open jtalk 1.11

based on open_jtalk-1.11.tar.gz
https://sourceforge.net/projects/open-jtalk/

* Update version in CMakeLists.txt

src/CMakeLists.txt

@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 # set library version
-set(OPEN_JTALK_VERSION 1.10)
+set(OPEN_JTALK_VERSION 1.11)
 set(PACKAGE "open_jtalk")
 set(PACKAGE_BUGREPORT "https://github.com/r9y9/open_jtalk/")
 set(PACKAGE_NAME "open_jtalk")

src/NEWS

@@ -1,3 +1,9 @@
+Version 1.11:
+ * add UniDic.
+ * add digit rules for digits including comma.
+ * add pronunciation rules for filler.
+ * fix some bugs.
+
 Version 1.10:
  * modify digit rules.
  * add many words to dictionary.

src/README

@@ -1,6 +1,6 @@
 ===============================================================================
-               The Japanese TTS System "Open JTalk" version 1.10
-                           release December 25, 2016
+               The Japanese TTS System "Open JTalk" version 1.11
+                           release December 25, 2018
 
 
 The Open JTalk is a Japanese TTS System. It has been being developed by HTS
@@ -24,7 +24,7 @@ the conditions in the following license:
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2018  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */

src/bin/open_jtalk.c

@@ -4,7 +4,7 @@
 /*           http://open-jtalk.sourceforge.net/                      */
 /* ----------------------------------------------------------------- */
 /*                                                                   */
-/*  Copyright (c) 2008-2016  Nagoya Institute of Technology          */
+/*  Copyright (c) 2008-2018  Nagoya Institute of Technology          */
 /*                           Department of Computer Science          */
 /*                                                                   */
 /* All rights reserved.                                              */
@@ -228,6 +228,11 @@ static void usage()
    fprintf(stderr, "Copyright (C) 2009 Nara Institute of Science and Technology\n");
    fprintf(stderr, "All rights reserved.\n");
    fprintf(stderr, "\n");
+   fprintf(stderr, "UniDic\n");
+   fprintf(stderr, "Version 2.2.0 (https://unidic.ninjal.ac.jp/)\n");
+   fprintf(stderr, "Copyright (C) 2011-2017 The UniDic Consortium\n");
+   fprintf(stderr, "All rights reserved.\n");
+   fprintf(stderr, "\n");
    fprintf(stderr, "open_jtalk - The Japanese TTS system \"Open JTalk\"\n");
    fprintf(stderr, "\n");
    fprintf(stderr, "  usage:\n");

src/configure.ac

@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(open_jtalk, 1.10, [email protected])
+AC_INIT(open_jtalk, 1.11, [email protected])
 AC_CONFIG_AUX_DIR([config])
-AC_COPYRIGHT(Copyright 2008-2016 Nagoya Institute of Technology)
+AC_COPYRIGHT(Copyright 2008-2018 Nagoya Institute of Technology)
 AM_INIT_AUTOMAKE
 
 # Checks for C/C++ compiler

src/jpcommon/jpcommon_label.c

@@ -174,7 +174,7 @@ static void JPCommonLabelWord_initialize(JPCommonLabelWord * w, const char *pron
    }
    if (find == 0) {
       fprintf(stderr,
-              "WARNING: JPCommonLabelWord_initializel() in jpcommon_label.c: %s is unknown POS.\n",
+              "WARNING: JPCommonLabelWord_initialize() in jpcommon_label.c: %s is unknown POS.\n",
               pos);
       i = 0;
    }
@@ -187,7 +187,7 @@ static void JPCommonLabelWord_initialize(JPCommonLabelWord * w, const char *pron
    }
    if (find == 0) {
       fprintf(stderr,
-              "WARNING: JPCommonLabelWord_initializel() in jpcommon_label.c: %s is unknown conjugation type.\n",
+              "WARNING: JPCommonLabelWord_initialize() in jpcommon_label.c: %s is unknown conjugation type.\n",
               ctype);
       i = 0;
    }
@@ -200,7 +200,7 @@ static void JPCommonLabelWord_initialize(JPCommonLabelWord * w, const char *pron
    }
    if (find == 0) {
       fprintf(stderr,
-              "WARNING: JPCommonLabelWord_initializel() in jpcommon_label.c: %s is unknown conjugation form .\n",
+              "WARNING: JPCommonLabelWord_initialize() in jpcommon_label.c: %s is unknown conjugation form .\n",
               cform);
       i = 0;
    }
@@ -411,6 +411,9 @@ void JPCommonLabel_initialize(JPCommonLabel * label)
    label->mora_tail = NULL;
    label->phoneme_head = NULL;
    label->phoneme_tail = NULL;
+
+   label->size = 0;
+   label->feature = NULL;
 }
 
 static void JPCommonLabel_insert_pause(JPCommonLabel * label)
@@ -420,7 +423,7 @@ static void JPCommonLabel_insert_pause(JPCommonLabel * label)
       if (label->phoneme_tail != NULL) {
          if (strcmp(label->phoneme_tail->phoneme, JPCOMMON_PHONEME_SHORT_PAUSE) == 0) {
             fprintf(stderr,
-                    "WARNING: JPCommonLabel_insert_word() in jpcommon_label.c: Short pause should not be chained.\n");
+                    "WARNING: JPCommonLabel_insert_pause() in jpcommon_label.c: Short pause should not be chained.\n");
             return;
          }
          label->phoneme_tail->next =
@@ -430,7 +433,7 @@ static void JPCommonLabel_insert_pause(JPCommonLabel * label)
          label->phoneme_tail = label->phoneme_tail->next;
       } else {
          fprintf(stderr,
-                 "WARNING: JPCommonLabel_insert_word() in jpcommon_label.c: First mora should not be short pause.\n");
+                 "WARNING: JPCommonLabel_insert_pause() in jpcommon_label.c: First mora should not be short pause.\n");
       }
       label->short_pause_flag = 0;
    }