update pinyin_parser_table.h.in

1 files changed, 10 insertions, 12 deletions

diff --git a/scripts2/templates/pinyin_parser_table.h.in b/scripts2/templates/pinyin_parser_table.h.in
index 33fc0ee..9c48395 100644
--- a/scripts2/templates/pinyin_parser_table.h.in
+++ b/scripts2/templates/pinyin_parser_table.h.in
@@ -1,9 +1,9 @@
 #ifndef PINYIN_PARSER_TABLE_H
 #define PINYIN_PARSER_TABLE_H
 
-namespace zhuyin{
+namespace pinyin{
 
-const pinyin_index_item_t hanyu_pinyin_index[] = {
+const pinyin_index_item_t pinyin_index[] = {
 @PINYIN_INDEX@
 };
 
@@ -11,19 +11,19 @@ const pinyin_index_item_t luoma_pinyin_index[] = {
 @LUOMA_PINYIN_INDEX@
 };
 
-const chewing_index_item_t bopomofo_index[] = {
-@ZHUYIN_INDEX@
+const pinyin_index_item_t secondary_zhuyin_index[] = {
+@SECONDARY_ZHUYIN_INDEX@
 };
 
-const pinyin_index_item_t secondary_bopomofo_index[] = {
-@SECONDARY_ZHUYIN_INDEX@
+const chewing_index_item_t zhuyin_index[] = {
+@ZHUYIN_INDEX@
 };
 
-const chewing_index_item_t hsu_bopomofo_index[] = {
+const chewing_index_item_t hsu_zhuyin_index[] = {
 @HSU_ZHUYIN_INDEX@
 };
 
-const chewing_index_item_t eten26_bopomofo_index[] = {
+const chewing_index_item_t eten26_zhuyin_index[] = {
 @ETEN26_ZHUYIN_INDEX@
 };
 
@@ -31,15 +31,13 @@ const content_table_item_t content_table[] = {
 @CONTENT_TABLE@
 };
 
-#if 0
 const divided_table_item_t divided_table[] = {
-
+@DIVIDED_TABLE@
 };
 
 const resplit_table_item_t resplit_table[] = {
-
+@RESPLIT_TABLE@
 };
-#endif
 
 const gint chewing_key_table[CHEWING_NUMBER_OF_INITIALS *
                              CHEWING_NUMBER_OF_MIDDLES *