update double_pinyin_table.h

diff --git a/src/storage/double_pinyin_table.h b/src/storage/double_pinyin_table.h
index 390ac96..6af66b7 100644 (file)
--- a/src/storage/double_pinyin_table.h
+++ b/src/storage/double_pinyin_table.h
@@ -7,363 +7,363 @@
 namespace pinyin{
 
 const double_pinyin_scheme_shengmu_item_t double_pinyin_mspy_sheng[] = {
-NULL  /* A */,
-"b"   /* B */,
-"c"   /* C */,
-"d"   /* D */,
-NULL  /* E */,
-"f"   /* F */,
-"g"   /* G */,
-"h"   /* H */,
-"ch"  /* I */,
-"j"   /* J */,
-"k"   /* K */,
-"l"   /* L */,
-"m"   /* M */,
-"n"   /* N */,
-"'"   /* O */,
-"p"   /* P */,
-"q"   /* Q */,
-"r"   /* R */,
-"s"   /* S */,
-"t"   /* T */,
-"sh"  /* U */,
-"zh"  /* V */,
-"w"   /* W */,
-"x"   /* X */,
-"y"   /* Y */,
-"z"   /* Z */,
-NULL  /* ; */
+{NULL } /* A */,
+{"b"  } /* B */,
+{"c"  } /* C */,
+{"d"  } /* D */,
+{NULL } /* E */,
+{"f"  } /* F */,
+{"g"  } /* G */,
+{"h"  } /* H */,
+{"ch" } /* I */,
+{"j"  } /* J */,
+{"k"  } /* K */,
+{"l"  } /* L */,
+{"m"  } /* M */,
+{"n"  } /* N */,
+{"'"  } /* O */,
+{"p"  } /* P */,
+{"q"  } /* Q */,
+{"r"  } /* R */,
+{"s"  } /* S */,
+{"t"  } /* T */,
+{"sh" } /* U */,
+{"zh" } /* V */,
+{"w"  } /* W */,
+{"x"  } /* X */,
+{"y"  } /* Y */,
+{"z"  } /* Z */,
+{NULL } /* ; */
 };
 
 const double_pinyin_scheme_yunmu_item_t double_pinyin_mspy_yun[] = {
-{"a"    , NULL   } /* A */,
-{"ou"   , NULL   } /* B */,
-{"iao"  , NULL   } /* C */,
-{"uang" , "iang" } /* D */,
-{"e"    , NULL   } /* E */,
-{"en"   , NULL   } /* F */,
-{"eng"  , "ng"   } /* G */,
-{"ang"  , NULL   } /* H */,
-{"i"    , NULL   } /* I */,
-{"an"   , NULL   } /* J */,
-{"ao"   , NULL   } /* K */,
-{"ai"   , NULL   } /* L */,
-{"ian"  , NULL   } /* M */,
-{"in"   , NULL   } /* N */,
-{"uo"   , "o"    } /* O */,
-{"un"   , NULL   } /* P */,
-{"iu"   , NULL   } /* Q */,
-{"uan"  , "er"   } /* R */,
-{"ong"  , "iong" } /* S */,
-{"ue"   , NULL   } /* T */,
-{"u"    , NULL   } /* U */,
-{"ui"   , "ue"   } /* V */,
-{"ia"   , "ua"   } /* W */,
-{"ie"   , NULL   } /* X */,
-{"uai"  , "v"    } /* Y */,
-{"ei"   , NULL   } /* Z */,
-{"ing"  , NULL   } /* ; */
+{{"a"    , NULL   }} /* A */,
+{{"ou"   , NULL   }} /* B */,
+{{"iao"  , NULL   }} /* C */,
+{{"uang" , "iang" }} /* D */,
+{{"e"    , NULL   }} /* E */,
+{{"en"   , NULL   }} /* F */,
+{{"eng"  , "ng"   }} /* G */,
+{{"ang"  , NULL   }} /* H */,
+{{"i"    , NULL   }} /* I */,
+{{"an"   , NULL   }} /* J */,
+{{"ao"   , NULL   }} /* K */,
+{{"ai"   , NULL   }} /* L */,
+{{"ian"  , NULL   }} /* M */,
+{{"in"   , NULL   }} /* N */,
+{{"uo"   , "o"    }} /* O */,
+{{"un"   , NULL   }} /* P */,
+{{"iu"   , NULL   }} /* Q */,
+{{"uan"  , "er"   }} /* R */,
+{{"ong"  , "iong" }} /* S */,
+{{"ue"   , NULL   }} /* T */,
+{{"u"    , NULL   }} /* U */,
+{{"ui"   , "ue"   }} /* V */,
+{{"ia"   , "ua"   }} /* W */,
+{{"ie"   , NULL   }} /* X */,
+{{"uai"  , "v"    }} /* Y */,
+{{"ei"   , NULL   }} /* Z */,
+{{"ing"  , NULL   }} /* ; */
 };
 
 const double_pinyin_scheme_shengmu_item_t double_pinyin_zrm_sheng[] = {
-NULL  /* A */,
-"b"   /* B */,
-"c"   /* C */,
-"d"   /* D */,
-NULL  /* E */,
-"f"   /* F */,
-"g"   /* G */,
-"h"   /* H */,
-"ch"  /* I */,
-"j"   /* J */,
-"k"   /* K */,
-"l"   /* L */,
-"m"   /* M */,
-"n"   /* N */,
-"'"   /* O */,
-"p"   /* P */,
-"q"   /* Q */,
-"r"   /* R */,
-"s"   /* S */,
-"t"   /* T */,
-"sh"  /* U */,
-"zh"  /* V */,
-"w"   /* W */,
-"x"   /* X */,
-"y"   /* Y */,
-"z"   /* Z */,
-NULL  /* ; */
+{NULL } /* A */,
+{"b"  } /* B */,
+{"c"  } /* C */,
+{"d"  } /* D */,
+{NULL } /* E */,
+{"f"  } /* F */,
+{"g"  } /* G */,
+{"h"  } /* H */,
+{"ch" } /* I */,
+{"j"  } /* J */,
+{"k"  } /* K */,
+{"l"  } /* L */,
+{"m"  } /* M */,
+{"n"  } /* N */,
+{"'"  } /* O */,
+{"p"  } /* P */,
+{"q"  } /* Q */,
+{"r"  } /* R */,
+{"s"  } /* S */,
+{"t"  } /* T */,
+{"sh" } /* U */,
+{"zh" } /* V */,
+{"w"  } /* W */,
+{"x"  } /* X */,
+{"y"  } /* Y */,
+{"z"  } /* Z */,
+{NULL } /* ; */
 };
 
 const double_pinyin_scheme_yunmu_item_t double_pinyin_zrm_yun[] = {
-{"a"    , NULL   } /* A */,
-{"ou"   , NULL   } /* B */,
-{"iao"  , NULL   } /* C */,
-{"uang" , "iang" } /* D */,
-{"e"    , NULL   } /* E */,
-{"en"   , NULL   } /* F */,
-{"eng"  , "ng"   } /* G */,
-{"ang"  , NULL   } /* H */,
-{"i"    , NULL   } /* I */,
-{"an"   , NULL   } /* J */,
-{"ao"   , NULL   } /* K */,
-{"ai"   , NULL   } /* L */,
-{"ian"  , NULL   } /* M */,
-{"in"   , NULL   } /* N */,
-{"uo"   , "o"    } /* O */,
-{"un"   , NULL   } /* P */,
-{"iu"   , NULL   } /* Q */,
-{"uan"  , "er"   } /* R */,
-{"ong"  , "iong" } /* S */,
-{"ue"   , NULL   } /* T */,
-{"u"    , NULL   } /* U */,
-{"ui"   , "v"    } /* V */,
-{"ia"   , "ua"   } /* W */,
-{"ie"   , NULL   } /* X */,
-{"uai"  , "ing"  } /* Y */,
-{"ei"   , NULL   } /* Z */,
-{NULL   , NULL   } /* ; */
+{{"a"    , NULL   }} /* A */,
+{{"ou"   , NULL   }} /* B */,
+{{"iao"  , NULL   }} /* C */,
+{{"uang" , "iang" }} /* D */,
+{{"e"    , NULL   }} /* E */,
+{{"en"   , NULL   }} /* F */,
+{{"eng"  , "ng"   }} /* G */,
+{{"ang"  , NULL   }} /* H */,
+{{"i"    , NULL   }} /* I */,
+{{"an"   , NULL   }} /* J */,
+{{"ao"   , NULL   }} /* K */,
+{{"ai"   , NULL   }} /* L */,
+{{"ian"  , NULL   }} /* M */,
+{{"in"   , NULL   }} /* N */,
+{{"uo"   , "o"    }} /* O */,
+{{"un"   , NULL   }} /* P */,
+{{"iu"   , NULL   }} /* Q */,
+{{"uan"  , "er"   }} /* R */,
+{{"ong"  , "iong" }} /* S */,
+{{"ue"   , NULL   }} /* T */,
+{{"u"    , NULL   }} /* U */,
+{{"ui"   , "v"    }} /* V */,
+{{"ia"   , "ua"   }} /* W */,
+{{"ie"   , NULL   }} /* X */,
+{{"uai"  , "ing"  }} /* Y */,
+{{"ei"   , NULL   }} /* Z */,
+{{NULL   , NULL   }} /* ; */
 };
 
 const double_pinyin_scheme_shengmu_item_t double_pinyin_abc_sheng[] = {
-"zh"  /* A */,
-"b"   /* B */,
-"c"   /* C */,
-"d"   /* D */,
-"ch"  /* E */,
-"f"   /* F */,
-"g"   /* G */,
-"h"   /* H */,
-NULL  /* I */,
-"j"   /* J */,
-"k"   /* K */,
-"l"   /* L */,
-"m"   /* M */,
-"n"   /* N */,
-"'"   /* O */,
-"p"   /* P */,
-"q"   /* Q */,
-"r"   /* R */,
-"s"   /* S */,
-"t"   /* T */,
-NULL  /* U */,
-"sh"  /* V */,
-"w"   /* W */,
-"x"   /* X */,
-"y"   /* Y */,
-"z"   /* Z */,
-NULL  /* ; */
+{"zh" } /* A */,
+{"b"  } /* B */,
+{"c"  } /* C */,
+{"d"  } /* D */,
+{"ch" } /* E */,
+{"f"  } /* F */,
+{"g"  } /* G */,
+{"h"  } /* H */,
+{NULL } /* I */,
+{"j"  } /* J */,
+{"k"  } /* K */,
+{"l"  } /* L */,
+{"m"  } /* M */,
+{"n"  } /* N */,
+{"'"  } /* O */,
+{"p"  } /* P */,
+{"q"  } /* Q */,
+{"r"  } /* R */,
+{"s"  } /* S */,
+{"t"  } /* T */,
+{NULL } /* U */,
+{"sh" } /* V */,
+{"w"  } /* W */,
+{"x"  } /* X */,
+{"y"  } /* Y */,
+{"z"  } /* Z */,
+{NULL } /* ; */
 };
 
 const double_pinyin_scheme_yunmu_item_t double_pinyin_abc_yun[] = {
-{"a"    , NULL   } /* A */,
-{"ou"   , NULL   } /* B */,
-{"in"   , "uai"  } /* C */,
-{"ia"   , "ua"   } /* D */,
-{"e"    , NULL   } /* E */,
-{"en"   , NULL   } /* F */,
-{"eng"  , "ng"   } /* G */,
-{"ang"  , NULL   } /* H */,
-{"i"    , NULL   } /* I */,
-{"an"   , NULL   } /* J */,
-{"ao"   , NULL   } /* K */,
-{"ai"   , NULL   } /* L */,
-{"ue"   , "ui"   } /* M */,
-{"un"   , NULL   } /* N */,
-{"uo"   , "o"    } /* O */,
-{"uan"  , NULL   } /* P */,
-{"ei"   , NULL   } /* Q */,
-{"er"   , "iu"   } /* R */,
-{"ong"  , "iong" } /* S */,
-{"iang" , "uang" } /* T */,
-{"u"    , NULL   } /* U */,
-{"v"    , "ue"   } /* V */,
-{"ian"  , NULL   } /* W */,
-{"ie"   , NULL   } /* X */,
-{"ing"  , NULL   } /* Y */,
-{"iao"  , NULL   } /* Z */,
-{NULL   , NULL   } /* ; */
+{{"a"    , NULL   }} /* A */,
+{{"ou"   , NULL   }} /* B */,
+{{"in"   , "uai"  }} /* C */,
+{{"ia"   , "ua"   }} /* D */,
+{{"e"    , NULL   }} /* E */,
+{{"en"   , NULL   }} /* F */,
+{{"eng"  , "ng"   }} /* G */,
+{{"ang"  , NULL   }} /* H */,
+{{"i"    , NULL   }} /* I */,
+{{"an"   , NULL   }} /* J */,
+{{"ao"   , NULL   }} /* K */,
+{{"ai"   , NULL   }} /* L */,
+{{"ue"   , "ui"   }} /* M */,
+{{"un"   , NULL   }} /* N */,
+{{"uo"   , "o"    }} /* O */,
+{{"uan"  , NULL   }} /* P */,
+{{"ei"   , NULL   }} /* Q */,
+{{"er"   , "iu"   }} /* R */,
+{{"ong"  , "iong" }} /* S */,
+{{"iang" , "uang" }} /* T */,
+{{"u"    , NULL   }} /* U */,
+{{"v"    , "ue"   }} /* V */,
+{{"ian"  , NULL   }} /* W */,
+{{"ie"   , NULL   }} /* X */,
+{{"ing"  , NULL   }} /* Y */,
+{{"iao"  , NULL   }} /* Z */,
+{{NULL   , NULL   }} /* ; */
 };
 
 const double_pinyin_scheme_shengmu_item_t double_pinyin_zgpy_sheng[] = {
-"ch"  /* A */,
-"b"   /* B */,
-"c"   /* C */,
-"d"   /* D */,
-NULL  /* E */,
-"f"   /* F */,
-"g"   /* G */,
-"h"   /* H */,
-"sh"  /* I */,
-"j"   /* J */,
-"k"   /* K */,
-"l"   /* L */,
-"m"   /* M */,
-"n"   /* N */,
-"'"   /* O */,
-"p"   /* P */,
-"q"   /* Q */,
-"r"   /* R */,
-"s"   /* S */,
-"t"   /* T */,
-"zh"  /* U */,
-NULL  /* V */,
-"w"   /* W */,
-"x"   /* X */,
-"y"   /* Y */,
-"z"   /* Z */,
-NULL  /* ; */
+{"ch" } /* A */,
+{"b"  } /* B */,
+{"c"  } /* C */,
+{"d"  } /* D */,
+{NULL } /* E */,
+{"f"  } /* F */,
+{"g"  } /* G */,
+{"h"  } /* H */,
+{"sh" } /* I */,
+{"j"  } /* J */,
+{"k"  } /* K */,
+{"l"  } /* L */,
+{"m"  } /* M */,
+{"n"  } /* N */,
+{"'"  } /* O */,
+{"p"  } /* P */,
+{"q"  } /* Q */,
+{"r"  } /* R */,
+{"s"  } /* S */,
+{"t"  } /* T */,
+{"zh" } /* U */,
+{NULL } /* V */,
+{"w"  } /* W */,
+{"x"  } /* X */,
+{"y"  } /* Y */,
+{"z"  } /* Z */,
+{NULL } /* ; */
 };
 
 const double_pinyin_scheme_yunmu_item_t double_pinyin_zgpy_yun[] = {
-{"a"    , NULL   } /* A */,
-{"iao"  , NULL   } /* B */,
-{NULL   , NULL   } /* C */,
-{"ie"   , NULL   } /* D */,
-{"e"    , NULL   } /* E */,
-{"ian"  , NULL   } /* F */,
-{"iang" , "uang" } /* G */,
-{"ong"  , "iong" } /* H */,
-{"i"    , NULL   } /* I */,
-{"er"   , "iu"   } /* J */,
-{"ei"   , NULL   } /* K */,
-{"uan"  , NULL   } /* L */,
-{"un"   , NULL   } /* M */,
-{"ue"   , "ui"   } /* N */,
-{"uo"   , "o"    } /* O */,
-{"ai"   , NULL   } /* P */,
-{"ao"   , NULL   } /* Q */,
-{"an"   , NULL   } /* R */,
-{"ang"  , NULL   } /* S */,
-{"eng"  , "ng"   } /* T */,
-{"u"    , NULL   } /* U */,
-{"v"    , NULL   } /* V */,
-{"en"   , NULL   } /* W */,
-{"ia"   , "ua"   } /* X */,
-{"in"   , "uai"  } /* Y */,
-{"ou"   , NULL   } /* Z */,
-{"ing"  , NULL   } /* ; */
+{{"a"    , NULL   }} /* A */,
+{{"iao"  , NULL   }} /* B */,
+{{NULL   , NULL   }} /* C */,
+{{"ie"   , NULL   }} /* D */,
+{{"e"    , NULL   }} /* E */,
+{{"ian"  , NULL   }} /* F */,
+{{"iang" , "uang" }} /* G */,
+{{"ong"  , "iong" }} /* H */,
+{{"i"    , NULL   }} /* I */,
+{{"er"   , "iu"   }} /* J */,
+{{"ei"   , NULL   }} /* K */,
+{{"uan"  , NULL   }} /* L */,
+{{"un"   , NULL   }} /* M */,
+{{"ue"   , "ui"   }} /* N */,
+{{"uo"   , "o"    }} /* O */,
+{{"ai"   , NULL   }} /* P */,
+{{"ao"   , NULL   }} /* Q */,
+{{"an"   , NULL   }} /* R */,
+{{"ang"  , NULL   }} /* S */,
+{{"eng"  , "ng"   }} /* T */,
+{{"u"    , NULL   }} /* U */,
+{{"v"    , NULL   }} /* V */,
+{{"en"   , NULL   }} /* W */,
+{{"ia"   , "ua"   }} /* X */,
+{{"in"   , "uai"  }} /* Y */,
+{{"ou"   , NULL   }} /* Z */,
+{{"ing"  , NULL   }} /* ; */
 };
 
 const double_pinyin_scheme_shengmu_item_t double_pinyin_pyjj_sheng[] = {
-"'"   /* A */,
-"b"   /* B */,
-"c"   /* C */,
-"d"   /* D */,
-NULL  /* E */,
-"f"   /* F */,
-"g"   /* G */,
-"h"   /* H */,
-"sh"  /* I */,
-"j"   /* J */,
-"k"   /* K */,
-"l"   /* L */,
-"m"   /* M */,
-"n"   /* N */,
-"'"   /* O */,
-"p"   /* P */,
-"q"   /* Q */,
-"r"   /* R */,
-"s"   /* S */,
-"t"   /* T */,
-"ch"  /* U */,
-"zh"  /* V */,
-"w"   /* W */,
-"x"   /* X */,
-"y"   /* Y */,
-"z"   /* Z */,
-NULL  /* ; */
+{"'"  } /* A */,
+{"b"  } /* B */,
+{"c"  } /* C */,
+{"d"  } /* D */,
+{NULL } /* E */,
+{"f"  } /* F */,
+{"g"  } /* G */,
+{"h"  } /* H */,
+{"sh" } /* I */,
+{"j"  } /* J */,
+{"k"  } /* K */,
+{"l"  } /* L */,
+{"m"  } /* M */,
+{"n"  } /* N */,
+{"'"  } /* O */,
+{"p"  } /* P */,
+{"q"  } /* Q */,
+{"r"  } /* R */,
+{"s"  } /* S */,
+{"t"  } /* T */,
+{"ch" } /* U */,
+{"zh" } /* V */,
+{"w"  } /* W */,
+{"x"  } /* X */,
+{"y"  } /* Y */,
+{"z"  } /* Z */,
+{NULL } /* ; */
 };
 
 const double_pinyin_scheme_yunmu_item_t double_pinyin_pyjj_yun[] = {
-{"a"    , NULL   } /* A */,
-{"ia"   , "ua"   } /* B */,
-{"uan"  , NULL   } /* C */,
-{"ao"   , NULL   } /* D */,
-{"e"    , NULL   } /* E */,
-{"an"   , NULL   } /* F */,
-{"ang"  , NULL   } /* G */,
-{"iang" , "uang" } /* H */,
-{"i"    , NULL   } /* I */,
-{"ian"  , NULL   } /* J */,
-{"iao"  , NULL   } /* K */,
-{"in"   , NULL   } /* L */,
-{"ie"   , NULL   } /* M */,
-{"iu"   , NULL   } /* N */,
-{"uo"   , "o"    } /* O */,
-{"ou"   , NULL   } /* P */,
-{"er"   , "ing"  } /* Q */,
-{"en"   , NULL   } /* R */,
-{"ai"   , NULL   } /* S */,
-{"eng"  , "ng"   } /* T */,
-{"u"    , NULL   } /* U */,
-{"v"    , "ui"   } /* V */,
-{"ei"   , NULL   } /* W */,
-{"uai"  , "ue"   } /* X */,
-{"ong"  , "iong" } /* Y */,
-{"un"   , NULL   } /* Z */,
-{NULL   , NULL   } /* ; */
+{{"a"    , NULL   }} /* A */,
+{{"ia"   , "ua"   }} /* B */,
+{{"uan"  , NULL   }} /* C */,
+{{"ao"   , NULL   }} /* D */,
+{{"e"    , NULL   }} /* E */,
+{{"an"   , NULL   }} /* F */,
+{{"ang"  , NULL   }} /* G */,
+{{"iang" , "uang" }} /* H */,
+{{"i"    , NULL   }} /* I */,
+{{"ian"  , NULL   }} /* J */,
+{{"iao"  , NULL   }} /* K */,
+{{"in"   , NULL   }} /* L */,
+{{"ie"   , NULL   }} /* M */,
+{{"iu"   , NULL   }} /* N */,
+{{"uo"   , "o"    }} /* O */,
+{{"ou"   , NULL   }} /* P */,
+{{"er"   , "ing"  }} /* Q */,
+{{"en"   , NULL   }} /* R */,
+{{"ai"   , NULL   }} /* S */,
+{{"eng"  , "ng"   }} /* T */,
+{{"u"    , NULL   }} /* U */,
+{{"v"    , "ui"   }} /* V */,
+{{"ei"   , NULL   }} /* W */,
+{{"uai"  , "ue"   }} /* X */,
+{{"ong"  , "iong" }} /* Y */,
+{{"un"   , NULL   }} /* Z */,
+{{NULL   , NULL   }} /* ; */
 };
 
 const double_pinyin_scheme_shengmu_item_t double_pinyin_xhe_sheng[] = {
-NULL  /* A */,
-"b"   /* B */,
-"c"   /* C */,
-"d"   /* D */,
-NULL  /* E */,
-"f"   /* F */,
-"g"   /* G */,
-"h"   /* H */,
-"ch"  /* I */,
-"j"   /* J */,
-"k"   /* K */,
-"l"   /* L */,
-"m"   /* M */,
-"n"   /* N */,
-"'"   /* O */,
-"p"   /* P */,
-"q"   /* Q */,
-"r"   /* R */,
-"s"   /* S */,
-"t"   /* T */,
-"sh"  /* U */,
-"zh"  /* V */,
-"w"   /* W */,
-"x"   /* X */,
-"y"   /* Y */,
-"z"   /* Z */,
-NULL  /* ; */
+{NULL } /* A */,
+{"b"  } /* B */,
+{"c"  } /* C */,
+{"d"  } /* D */,
+{NULL } /* E */,
+{"f"  } /* F */,
+{"g"  } /* G */,
+{"h"  } /* H */,
+{"ch" } /* I */,
+{"j"  } /* J */,
+{"k"  } /* K */,
+{"l"  } /* L */,
+{"m"  } /* M */,
+{"n"  } /* N */,
+{"'"  } /* O */,
+{"p"  } /* P */,
+{"q"  } /* Q */,
+{"r"  } /* R */,
+{"s"  } /* S */,
+{"t"  } /* T */,
+{"sh" } /* U */,
+{"zh" } /* V */,
+{"w"  } /* W */,
+{"x"  } /* X */,
+{"y"  } /* Y */,
+{"z"  } /* Z */,
+{NULL } /* ; */
 };
 
 const double_pinyin_scheme_yunmu_item_t double_pinyin_xhe_yun[] = {
-{"a"    , NULL   } /* A */,
-{"in"   , NULL   } /* B */,
-{"ao"   , NULL   } /* C */,
-{"ai"   , NULL   } /* D */,
-{"e"    , NULL   } /* E */,
-{"en"   , NULL   } /* F */,
-{"eng"  , "ng"   } /* G */,
-{"ang"  , NULL   } /* H */,
-{"i"    , NULL   } /* I */,
-{"an"   , NULL   } /* J */,
-{"uai"  , "ing"  } /* K */,
-{"iang" , "uang" } /* L */,
-{"ian"  , NULL   } /* M */,
-{"iao"  , NULL   } /* N */,
-{"uo"   , "o"    } /* O */,
-{"ie"   , NULL   } /* P */,
-{"iu"   , NULL   } /* Q */,
-{"uan"  , "er"   } /* R */,
-{"ong"  , "iong" } /* S */,
-{"ue"   , NULL   } /* T */,
-{"u"    , NULL   } /* U */,
-{"v"    , "ui"   } /* V */,
-{"ei"   , NULL   } /* W */,
-{"ia"   , "ua"   } /* X */,
-{"un"   , NULL   } /* Y */,
-{"ou"   , NULL   } /* Z */,
-{NULL   , NULL   } /* ; */
+{{"a"    , NULL   }} /* A */,
+{{"in"   , NULL   }} /* B */,
+{{"ao"   , NULL   }} /* C */,
+{{"ai"   , NULL   }} /* D */,
+{{"e"    , NULL   }} /* E */,
+{{"en"   , NULL   }} /* F */,
+{{"eng"  , "ng"   }} /* G */,
+{{"ang"  , NULL   }} /* H */,
+{{"i"    , NULL   }} /* I */,
+{{"an"   , NULL   }} /* J */,
+{{"uai"  , "ing"  }} /* K */,
+{{"iang" , "uang" }} /* L */,
+{{"ian"  , NULL   }} /* M */,
+{{"iao"  , NULL   }} /* N */,
+{{"uo"   , "o"    }} /* O */,
+{{"ie"   , NULL   }} /* P */,
+{{"iu"   , NULL   }} /* Q */,
+{{"uan"  , "er"   }} /* R */,
+{{"ong"  , "iong" }} /* S */,
+{{"ue"   , NULL   }} /* T */,
+{{"u"    , NULL   }} /* U */,
+{{"v"    , "ui"   }} /* V */,
+{{"ei"   , NULL   }} /* W */,
+{{"ia"   , "ua"   }} /* X */,
+{{"un"   , NULL   }} /* Y */,
+{{"ou"   , NULL   }} /* Z */,
+{{NULL   , NULL   }} /* ; */
 };
 
 };