update chewing_table.h

1 files changed, 76 insertions, 116 deletions

diff --git a/src/storage/chewing_table.h b/src/storage/chewing_table.h
index 18b23b5..661be86 100644
--- a/src/storage/chewing_table.h
+++ b/src/storage/chewing_table.h
@@ -6,10 +6,18 @@
 
 namespace zhuyin{
 
-const chewing_symbol_item_t chewing_standard_initials[] = {
+const chewing_symbol_item_t chewing_standard_symbols[] = {
+{','  , "ㄝ"},
+{'-'  , "ㄦ"},
+{'.'  , "ㄡ"},
+{'/'  , "ㄥ"},
+{'0'  , "ㄢ"},
 {'1'  , "ㄅ"},
 {'2'  , "ㄉ"},
 {'5'  , "ㄓ"},
+{'8'  , "ㄚ"},
+{'9'  , "ㄞ"},
+{';'  , "ㄤ"},
 {'a'  , "ㄇ"},
 {'b'  , "ㄖ"},
 {'c'  , "ㄏ"},
@@ -18,11 +26,19 @@ const chewing_symbol_item_t chewing_standard_initials[] = {
 {'f'  , "ㄑ"},
 {'g'  , "ㄕ"},
 {'h'  , "ㄘ"},
+{'i'  , "ㄛ"},
+{'j'  , "ㄨ"},
+{'k'  , "ㄜ"},
+{'l'  , "ㄠ"},
+{'m'  , "ㄩ"},
 {'n'  , "ㄙ"},
+{'o'  , "ㄟ"},
+{'p'  , "ㄣ"},
 {'q'  , "ㄆ"},
 {'r'  , "ㄐ"},
 {'s'  , "ㄋ"},
 {'t'  , "ㄔ"},
+{'u'  , "ㄧ"},
 {'v'  , "ㄒ"},
 {'w'  , "ㄊ"},
 {'x'  , "ㄌ"},
@@ -31,30 +47,6 @@ const chewing_symbol_item_t chewing_standard_initials[] = {
 {'\0', NULL}
 };
 
-const chewing_symbol_item_t chewing_standard_middles[] = {
-{'j'  , "ㄨ"},
-{'m'  , "ㄩ"},
-{'u'  , "ㄧ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_standard_finals[] = {
-{','  , "ㄝ"},
-{'-'  , "ㄦ"},
-{'.'  , "ㄡ"},
-{'/'  , "ㄥ"},
-{'0'  , "ㄢ"},
-{'8'  , "ㄚ"},
-{'9'  , "ㄞ"},
-{';'  , "ㄤ"},
-{'i'  , "ㄛ"},
-{'k'  , "ㄜ"},
-{'l'  , "ㄠ"},
-{'o'  , "ㄟ"},
-{'p'  , "ㄣ"},
-{'\0', NULL}
-};
-
 const chewing_tone_item_t chewing_standard_tones[] = {
 {' '  , 1},
 {'3'  , 3},
@@ -64,10 +56,21 @@ const chewing_tone_item_t chewing_standard_tones[] = {
 {'\0', 0}
 };
 
-const chewing_symbol_item_t chewing_ginyieh_initials[] = {
+const chewing_symbol_item_t chewing_ginyieh_symbols[] = {
+{'\'' , "ㄥ"},
+{','  , "ㄚ"},
+{'-'  , "ㄣ"},
+{'.'  , "ㄞ"},
+{'/'  , "ㄢ"},
+{'0'  , "ㄟ"},
 {'2'  , "ㄅ"},
 {'3'  , "ㄉ"},
 {'6'  , "ㄓ"},
+{'8'  , "ㄧ"},
+{'9'  , "ㄛ"},
+{';'  , "ㄡ"},
+{'='  , "ㄦ"},
+{'['  , "ㄤ"},
 {'b'  , "ㄒ"},
 {'c'  , "ㄌ"},
 {'d'  , "ㄋ"},
@@ -75,9 +78,14 @@ const chewing_symbol_item_t chewing_ginyieh_initials[] = {
 {'f'  , "ㄎ"},
 {'g'  , "ㄑ"},
 {'h'  , "ㄕ"},
+{'i'  , "ㄨ"},
 {'j'  , "ㄘ"},
+{'k'  , "ㄩ"},
+{'l'  , "ㄝ"},
 {'m'  , "ㄙ"},
 {'n'  , "ㄖ"},
+{'o'  , "ㄜ"},
+{'p'  , "ㄠ"},
 {'r'  , "ㄍ"},
 {'s'  , "ㄇ"},
 {'t'  , "ㄐ"},
@@ -89,30 +97,6 @@ const chewing_symbol_item_t chewing_ginyieh_initials[] = {
 {'\0', NULL}
 };
 
-const chewing_symbol_item_t chewing_ginyieh_middles[] = {
-{'8'  , "ㄧ"},
-{'i'  , "ㄨ"},
-{'k'  , "ㄩ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_ginyieh_finals[] = {
-{'\'' , "ㄥ"},
-{','  , "ㄚ"},
-{'-'  , "ㄣ"},
-{'.'  , "ㄞ"},
-{'/'  , "ㄢ"},
-{'0'  , "ㄟ"},
-{'9'  , "ㄛ"},
-{';'  , "ㄡ"},
-{'='  , "ㄦ"},
-{'['  , "ㄤ"},
-{'l'  , "ㄝ"},
-{'o'  , "ㄜ"},
-{'p'  , "ㄠ"},
-{'\0', NULL}
-};
-
 const chewing_tone_item_t chewing_ginyieh_tones[] = {
 {' '  , 1},
 {'1'  , 5},
@@ -122,50 +106,42 @@ const chewing_tone_item_t chewing_ginyieh_tones[] = {
 {'\0', 0}
 };
 
-const chewing_symbol_item_t chewing_eten_initials[] = {
+const chewing_symbol_item_t chewing_eten_symbols[] = {
 {'\'' , "ㄘ"},
 {','  , "ㄓ"},
+{'-'  , "ㄥ"},
 {'.'  , "ㄔ"},
 {'/'  , "ㄕ"},
+{'0'  , "ㄤ"},
 {'7'  , "ㄑ"},
+{'8'  , "ㄢ"},
+{'9'  , "ㄣ"},
 {';'  , "ㄗ"},
+{'='  , "ㄦ"},
+{'a'  , "ㄚ"},
 {'b'  , "ㄅ"},
 {'c'  , "ㄒ"},
 {'d'  , "ㄉ"},
+{'e'  , "ㄧ"},
 {'f'  , "ㄈ"},
 {'g'  , "ㄐ"},
 {'h'  , "ㄏ"},
+{'i'  , "ㄞ"},
 {'j'  , "ㄖ"},
 {'k'  , "ㄎ"},
 {'l'  , "ㄌ"},
 {'m'  , "ㄇ"},
 {'n'  , "ㄋ"},
+{'o'  , "ㄛ"},
 {'p'  , "ㄆ"},
+{'q'  , "ㄟ"},
+{'r'  , "ㄜ"},
 {'s'  , "ㄙ"},
 {'t'  , "ㄊ"},
-{'v'  , "ㄍ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_eten_middles[] = {
-{'e'  , "ㄧ"},
 {'u'  , "ㄩ"},
-{'x'  , "ㄨ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_eten_finals[] = {
-{'-'  , "ㄥ"},
-{'0'  , "ㄤ"},
-{'8'  , "ㄢ"},
-{'9'  , "ㄣ"},
-{'='  , "ㄦ"},
-{'a'  , "ㄚ"},
-{'i'  , "ㄞ"},
-{'o'  , "ㄛ"},
-{'q'  , "ㄟ"},
-{'r'  , "ㄜ"},
+{'v'  , "ㄍ"},
 {'w'  , "ㄝ"},
+{'x'  , "ㄨ"},
 {'y'  , "ㄡ"},
 {'z'  , "ㄠ"},
 {'\0', NULL}
@@ -180,7 +156,7 @@ const chewing_tone_item_t chewing_eten_tones[] = {
 {'\0', 0}
 };
 
-const chewing_symbol_item_t chewing_ibm_initials[] = {
+const chewing_symbol_item_t chewing_ibm_symbols[] = {
 {'-'  , "ㄏ"},
 {'0'  , "ㄎ"},
 {'1'  , "ㄅ"},
@@ -192,39 +168,31 @@ const chewing_symbol_item_t chewing_ibm_initials[] = {
 {'7'  , "ㄋ"},
 {'8'  , "ㄌ"},
 {'9'  , "ㄍ"},
-{'e'  , "ㄒ"},
-{'i'  , "ㄗ"},
-{'o'  , "ㄘ"},
-{'p'  , "ㄙ"},
-{'q'  , "ㄐ"},
-{'r'  , "ㄓ"},
-{'t'  , "ㄔ"},
-{'u'  , "ㄖ"},
-{'w'  , "ㄑ"},
-{'y'  , "ㄕ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_ibm_middles[] = {
-{'a'  , "ㄧ"},
-{'d'  , "ㄩ"},
-{'s'  , "ㄨ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_ibm_finals[] = {
 {';'  , "ㄠ"},
+{'a'  , "ㄧ"},
 {'b'  , "ㄥ"},
 {'c'  , "ㄣ"},
+{'d'  , "ㄩ"},
+{'e'  , "ㄒ"},
 {'f'  , "ㄚ"},
 {'g'  , "ㄛ"},
 {'h'  , "ㄜ"},
+{'i'  , "ㄗ"},
 {'j'  , "ㄝ"},
 {'k'  , "ㄞ"},
 {'l'  , "ㄟ"},
 {'n'  , "ㄦ"},
+{'o'  , "ㄘ"},
+{'p'  , "ㄙ"},
+{'q'  , "ㄐ"},
+{'r'  , "ㄓ"},
+{'s'  , "ㄨ"},
+{'t'  , "ㄔ"},
+{'u'  , "ㄖ"},
 {'v'  , "ㄤ"},
+{'w'  , "ㄑ"},
 {'x'  , "ㄢ"},
+{'y'  , "ㄕ"},
 {'z'  , "ㄡ"},
 {'\0', NULL}
 };
@@ -354,51 +322,43 @@ const chewing_tone_item_t chewing_eten26_tones[] = {
 {'\0', 0}
 };
 
-const chewing_symbol_item_t chewing_standard_dvorak_initials[] = {
+const chewing_symbol_item_t chewing_standard_dvorak_symbols[] = {
 {'\'' , "ㄆ"},
 {','  , "ㄊ"},
 {'.'  , "ㄍ"},
+{'0'  , "ㄢ"},
 {'1'  , "ㄅ"},
 {'2'  , "ㄉ"},
 {'5'  , "ㄓ"},
+{'8'  , "ㄚ"},
+{'9'  , "ㄞ"},
 {';'  , "ㄈ"},
+{'['  , "ㄦ"},
 {'a'  , "ㄇ"},
 {'b'  , "ㄙ"},
+{'c'  , "ㄛ"},
 {'d'  , "ㄘ"},
 {'e'  , "ㄎ"},
 {'f'  , "ㄗ"},
+{'g'  , "ㄧ"},
+{'h'  , "ㄨ"},
 {'i'  , "ㄕ"},
 {'j'  , "ㄏ"},
 {'k'  , "ㄒ"},
+{'l'  , "ㄣ"},
+{'m'  , "ㄩ"},
+{'n'  , "ㄠ"},
 {'o'  , "ㄋ"},
 {'p'  , "ㄐ"},
 {'q'  , "ㄌ"},
-{'u'  , "ㄑ"},
-{'x'  , "ㄖ"},
-{'y'  , "ㄔ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_standard_dvorak_middles[] = {
-{'g'  , "ㄧ"},
-{'h'  , "ㄨ"},
-{'m'  , "ㄩ"},
-{'\0', NULL}
-};
-
-const chewing_symbol_item_t chewing_standard_dvorak_finals[] = {
-{'0'  , "ㄢ"},
-{'8'  , "ㄚ"},
-{'9'  , "ㄞ"},
-{'['  , "ㄦ"},
-{'c'  , "ㄛ"},
-{'l'  , "ㄣ"},
-{'n'  , "ㄠ"},
 {'r'  , "ㄟ"},
 {'s'  , "ㄤ"},
 {'t'  , "ㄜ"},
+{'u'  , "ㄑ"},
 {'v'  , "ㄡ"},
 {'w'  , "ㄝ"},
+{'x'  , "ㄖ"},
+{'y'  , "ㄔ"},
 {'z'  , "ㄥ"},
 {'\0', NULL}
 };