Merge branch '1.11' of github.com:sophiefy/open_jtalk into 1.11

tsukumijima · Jul 30, 2024 · 7d1c745 · 7d1c745
2 parents de90d81 + 0809fe0
commit 7d1c745
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 0 deletions.
diff --git a/src/njd_set_pronunciation/njd_set_pronunciation.c b/src/njd_set_pronunciation/njd_set_pronunciation.c
@@ -153,6 +153,11 @@ void njd_set_pronunciation(NJD * njd)
             NJDNode_set_read(node, NJD_SET_PRONUNCIATION_TOUTEN);
             NJDNode_set_pron(node, NJD_SET_PRONUNCIATION_TOUTEN);
             NJDNode_set_pos(node, NJD_SET_PRONUNCIATION_KIGOU);
+            NJDNode_set_pos_group1(node, NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1);
+            NJDNode_set_pos_group2(node, "*");
+            NJDNode_set_pos_group3(node, "*");
+            NJDNode_set_ctype(node, "*");
+            NJDNode_set_cform(node, "*");
          }
       }
    }

diff --git a/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_euc_jp.h b/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_euc_jp.h
@@ -446,6 +446,7 @@ static const char *njd_set_pronunciation_symbol_list[] = {
 #define NJD_SET_PRONUNCIATION_MASU_PRON "\xa5\xde\xa5\xb9"
 
 #define NJD_SET_PRONUNCIATION_TOUTEN "\xa1\xa2"
+#define NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1 "\xc6\xc9\xc5\xc0"
 
 NJD_SET_PRONUNCIATION_RULE_H_END;
 

diff --git a/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_shift_jis.h b/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_shift_jis.h
@@ -446,6 +446,7 @@ static const char *njd_set_pronunciation_symbol_list[] = {
 #define NJD_SET_PRONUNCIATION_MASU_PRON "\x83\x7d\x83\x58"
 
 #define NJD_SET_PRONUNCIATION_TOUTEN "\x81\x41"
+#define NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1 "\x93\xc7\x93\x5f"
 
 NJD_SET_PRONUNCIATION_RULE_H_END;
 

diff --git a/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_utf_8.h b/src/njd_set_pronunciation/njd_set_pronunciation_rule_ascii_for_utf_8.h
@@ -446,6 +446,7 @@ static const char *njd_set_pronunciation_symbol_list[] = {
 #define NJD_SET_PRONUNCIATION_MASU_PRON "\xe3\x83\x9e\xe3\x82\xb9"
 
 #define NJD_SET_PRONUNCIATION_TOUTEN "\xe3\x80\x81"
+#define NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1 "\xe8\xaa\xad\xe7\x82\xb9"
 
 NJD_SET_PRONUNCIATION_RULE_H_END;
 

diff --git a/src/njd_set_pronunciation/njd_set_pronunciation_rule_euc_jp.h b/src/njd_set_pronunciation/njd_set_pronunciation_rule_euc_jp.h
@@ -446,6 +446,7 @@ static const char *njd_set_pronunciation_symbol_list[] = {
 #define NJD_SET_PRONUNCIATION_MASU_PRON "マス"
 
 #define NJD_SET_PRONUNCIATION_TOUTEN "、"
+#define NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1 "読点"
 
 NJD_SET_PRONUNCIATION_RULE_H_END;
 

diff --git a/src/njd_set_pronunciation/njd_set_pronunciation_rule_shift_jis.h b/src/njd_set_pronunciation/njd_set_pronunciation_rule_shift_jis.h
@@ -446,6 +446,7 @@ static const char *njd_set_pronunciation_symbol_list[] = {
 #define NJD_SET_PRONUNCIATION_MASU_PRON "マス"
 
 #define NJD_SET_PRONUNCIATION_TOUTEN "、"
+#define NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1 "読点"
 
 NJD_SET_PRONUNCIATION_RULE_H_END;
 

diff --git a/src/njd_set_pronunciation/njd_set_pronunciation_rule_utf_8.h b/src/njd_set_pronunciation/njd_set_pronunciation_rule_utf_8.h
@@ -446,6 +446,7 @@ static const char *njd_set_pronunciation_symbol_list[] = {
 #define NJD_SET_PRONUNCIATION_MASU_PRON "マス"
 
 #define NJD_SET_PRONUNCIATION_TOUTEN "、"
+#define NJD_SET_PRONUNCIATION_TOUTEN_POS_GROUP1 "読点"
 
 NJD_SET_PRONUNCIATION_RULE_H_END;