diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/xpinyin/README.md | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf | bin | 207276 -> 207176 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx | 116 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/xpinyin/xpinyin.ins | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def | 232 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty | 104 |
6 files changed, 305 insertions, 159 deletions
diff --git a/Master/texmf-dist/doc/latex/xpinyin/README.md b/Master/texmf-dist/doc/latex/xpinyin/README.md index 7c11c0fb0a3..b9f5f5c6cc1 100644 --- a/Master/texmf-dist/doc/latex/xpinyin/README.md +++ b/Master/texmf-dist/doc/latex/xpinyin/README.md @@ -20,7 +20,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -33,7 +33,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. diff --git a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf Binary files differindex e3ab9f27a2e..125f64ac810 100644 --- a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf +++ b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx index 8d50b231f21..b23d96db64a 100644 --- a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx +++ b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx @@ -26,7 +26,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -39,7 +39,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -81,7 +81,7 @@ Copyright and Licence \preamble - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -94,7 +94,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -167,12 +167,12 @@ Copyright and Licence %</internal> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} -%<+package>\GetIdInfo$Id: xpinyin.dtx 81bb941 2019-04-07 23:27:58 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+package>\GetIdInfo$Id: xpinyin.dtx 789567a 2020-05-01 21:10:07 +0800 Qing Lee <sobenlee@gmail.com> $ %<package> {Automatically add pinyin to Chinese characters} %<package>\ProvidesExplPackage{\ExplFileName} -%<package> {\ExplFileDate}{2.7}{\ExplFileDescription} +%<package> {\ExplFileDate}{2.8}{\ExplFileDescription} %<database>\ProvidesFile{xpinyin-database.def}% -%<database> [2019/04/07 v2.7 xpinyin database] +%<database> [2020/05/01 v2.8 xpinyin database] %<*driver> \documentclass{ctxdoc} \usepackage{xpinyin} @@ -186,7 +186,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{696} +% \CheckSum{694} % \GetFileId{xpinyin.sty} % % \title{\bfseries\pkg{xpinyin} 宏包} @@ -359,14 +359,14 @@ Copyright and Licence % \begin{syntax} % format = \Arg{format} % \end{syntax} -% 设置拼音的其它格式，例如颜色等，缺省值为空。 +% 设置拼音的其他格式，例如颜色等，缺省值为空。 % \end{function} % % \begin{function}{multiple} % \begin{syntax} % multiple = \Arg{format} % \end{syntax} -% 设置多音字拼音的其它格式，缺省值为空。可以通过这个选项来提醒校正多音字的拼音。例如 +% 设置多音字拼音的其他格式，缺省值为空。可以通过这个选项来提醒校正多音字的拼音。例如 % 本文档设置多音字拼音的颜色是红色（需要载入 \pkg{color} 宏包）： % \begin{frameverb} % \xpinyinsetup{multiple={\color{red}}} @@ -467,7 +467,7 @@ Copyright and Licence % % \begin{macro}{\@@_UTF_char:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_UTF_char:nn #1#2 +\cs_new_protected:Npn \@@_UTF_char:nn #1#2 { \cs_if_exist:cF { u8:#1 } { \tl_const:cn { u8:#1 } {#2} } @@ -478,14 +478,14 @@ Copyright and Licence % % \begin{macro}{\@@_GBK_char:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_GBK_char:nn #1#2 +\cs_new_protected:Npn \@@_GBK_char:nn #1#2 { \@@_UTF_char:nn {#1} {#2} \exp_args:Nx \@@_GBK_char_aux:nn { \tl_head:n {#1} } {#1} } -\cs_new_protected_nopar:Npn \@@_GBK_char_aux:nn #1#2 +\cs_new_protected:Npn \@@_GBK_char_aux:nn #1#2 { \exp_args:Nf \@@_GBK_char_aux:nnn { \int_eval:n { `#1 } } {#1} {#2} } -\cs_new_protected_nopar:Npn \@@_GBK_char_aux:nnn #1#2#3 +\cs_new_protected:Npn \@@_GBK_char_aux:nnn #1#2#3 { \cs_if_exist:cF { @@_UTF_ #1 :w } { @@ -505,9 +505,9 @@ Copyright and Licence \char_set_catcode_active:n {#1} } } -\cs_new_protected_nopar:Npn \@@_GBK_char_def:nnn #1#2#3 +\cs_new_protected:Npn \@@_GBK_char_def:nnn #1#2#3 { - \cs_new_protected_nopar:cpn { @@_UTF_ #2 :w } #1 + \cs_new_protected:cpn { @@_UTF_ #2 :w } #1 { \use:c { u8: \tl_to_str:n { #3#1 } } } } \tl_new:N \c_@@_reset_UTF_catcode_tl @@ -518,7 +518,7 @@ Copyright and Licence % \begin{macrocode} \group_begin: \char_set_catcode_active:n { 126 } -\cs_new_protected_nopar:Npn \@@_save_UTF_cs:Nn #1#2 +\cs_new_protected:Npn \@@_save_UTF_cs:Nn #1#2 { \group_begin: \char_set_lccode:nn { 126 } {#2} @@ -592,7 +592,7 @@ Copyright and Licence % % \begin{macro}{\@@_make_pinyin_box:nnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_make_pinyin_box:nnn #1#2#3 +\cs_new_protected:Npn \@@_make_pinyin_box:nnn #1#2#3 { \@@_leavevmode: \hbox_overlap_right:n @@ -637,9 +637,9 @@ Copyright and Licence % % \begin{macro}{\@@_CJKsymbol:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_CJKsymbol:n #1 +\cs_new_protected:Npn \@@_CJKsymbol:n #1 { \@@_CJKsymbol:xn { \@@_to_unicode:n {#1} } {#1} } -\cs_new_protected_nopar:Npn \@@_CJKsymbol:nn #1#2 +\cs_new_protected:Npn \@@_CJKsymbol:nn #1#2 { \@@_make_pinyin_box:nnn {#1} {#2} { \use:c { c_@@_ #1 _tl } } \@@_save_CJKsymbol:n {#2} @@ -691,7 +691,7 @@ Copyright and Licence % % \begin{macro}{\@@_CJKglue:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_CJKglue: +\cs_new_protected:Npn \@@_CJKglue: { \skip_horizontal:n { \l_@@_hsep_tl } } % \end{macrocode} % \end{macro} @@ -733,7 +733,7 @@ Copyright and Licence % % \begin{macro}{\@@_restore_footnote:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_restore_footnote: +\cs_new_protected:Npn \@@_restore_footnote: { \bool_if:NF \l_@@_footnote_bool { \tl_put_left:Nn \@parboxrestore { \l_@@_restore_footnote_tl } } @@ -760,19 +760,19 @@ Copyright and Licence % % \begin{macro}{\@@_single_aux:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_single_aux:nn #1#2 +\cs_new_protected:Npn \@@_single_aux:nn #1#2 { \@@_replace_CJKsymbol_single:n {#2} #1 \group_end: } -\cs_new_protected_nopar:Npn \@@_replace_CJKsymbol_single_aux:n #1 +\cs_new_protected:Npn \@@_replace_CJKsymbol_single_aux:n #1 { \bool_if:NF \l_@@_enable_bool { \@@_replace_CJKsymbol: } - \cs_set_protected_nopar:Npn \CJKsymbol ##1 + \cs_set_protected:Npn \CJKsymbol ##1 { \@@_single_CJKsymbol:nn {##1} {#1} } } -\cs_new_protected_nopar:Npn \@@_single_CJKsymbol:nn #1#2 +\cs_new_protected:Npn \@@_single_CJKsymbol:nn #1#2 { \@@_make_pinyin_box:xnn { \@@_to_unicode:n {#1} } {#1} { \@@_pinyin:n {#2} } @@ -783,7 +783,7 @@ Copyright and Licence % % \begin{macro}{\@@_replace_CJKsymbol_aux:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_replace_CJKsymbol_aux: +\cs_new_protected:Npn \@@_replace_CJKsymbol_aux: { \cs_set_eq:NN \@@_save_CJKsymbol:n \CJKsymbol \cs_set_eq:NN \CJKsymbol \@@_CJKsymbol:n @@ -793,14 +793,14 @@ Copyright and Licence % % \begin{macro}{\@@_restore_CJKsymbol_aux:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_restore_CJKsymbol_aux: +\cs_new_protected:Npn \@@_restore_CJKsymbol_aux: { \cs_set_eq:NN \CJKsymbol \@@_save_CJKsymbol:n } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_select_font_xetex:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_select_font_xetex: +\cs_new_protected:Npn \@@_select_font_xetex: { \cs_if_exist_use:cF { \l_@@_coor_tl } { @@ -818,7 +818,7 @@ Copyright and Licence % % \begin{macro}{\@@_select_font_aux:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_select_font_aux: +\cs_new_protected:Npn \@@_select_font_aux: { \fontsize { \l_@@_ratio_tl \tex_dimexpr:D \f@size pt \scan_stop: } @@ -832,21 +832,21 @@ Copyright and Licence % % \begin{macro}{\@@_to_unicode_xetex:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_to_unicode_xetex:n #1 +\cs_new:Npn \@@_to_unicode_xetex:n #1 { \int_to_arabic:n { `#1 } } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_UTF_to_unicode:n,\@@_UTFchar_to_unicode:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_UTF_to_unicode:n #1 +\cs_new:Npn \@@_UTF_to_unicode:n #1 { \int_to_arabic:n { \exp_args:No \int_from_hex:n { \CJK@plane } * "100 + #1 } } -\cs_new_nopar:Npn \@@_UTFchar_to_unicode:n #1 +\cs_new:Npn \@@_UTFchar_to_unicode:n #1 { \int_to_arabic:n { \@@_UTF_viii_to_unicode:NNNw #1 \q_stop } } -\cs_new_nopar:Npn \@@_UTF_viii_to_unicode:NNNw #1#2#3#4 \q_stop +\cs_new:Npn \@@_UTF_viii_to_unicode:NNNw #1#2#3#4 \q_stop { \tl_if_empty:nTF {#4} { ( `#1 - "E0 ) * "1000 + ( `#2 - "80 ) * "40 + ( `#3 - "80 ) } @@ -857,16 +857,16 @@ Copyright and Licence % % \begin{macro}{\@@_GBK_to_unicode:n,\@@_GBKchar_to_unicode:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_GBK_to_unicode:n #1 - { \int_to_arabic:n { " \CJKtu_sfd_map:nn { \CJK@plane } {#1} } } -\cs_new_nopar:Npn \@@_GBKchar_to_unicode:n #1 - { \int_to_arabic:n { " \CJKchartouni {#1} } } +\cs_new:Npn \@@_GBK_to_unicode:n + { \CJKtu_sfd_map:nn { \CJK@plane } } +\cs_new:Npn \@@_GBKchar_to_unicode:n + { \CJKtu_char_to_unicode:n } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_adjust_xeCJK_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_adjust_xeCJK_hook: +\cs_new_protected:Npn \@@_adjust_xeCJK_hook: { \cs_new_eq:NN \@@_select_font: \@@_select_font_xetex: \cs_new_eq:NN \@@_to_unicode:n \@@_to_unicode_xetex:n @@ -891,7 +891,7 @@ Copyright and Licence } } \cs_new_eq:NN \@@_leavevmode: \prg_do_nothing: - \cs_new_protected_nopar:Npx \@@_CJKsymbol_hook: + \cs_new_protected:Npx \@@_CJKsymbol_hook: { \exp_not:N \makexeCJKinactive \cs_if_exist_use:NF \xeCJK_select_font: @@ -903,7 +903,7 @@ Copyright and Licence % % \begin{macro}{\@@_adjust_CJK_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_adjust_CJK_hook: +\cs_new_protected:Npn \@@_adjust_CJK_hook: { \bool_if:NTF \g_@@_GBK_bool { @@ -941,15 +941,15 @@ Copyright and Licence % % \begin{macro}{\@@_adjust_CJKpunct_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_adjust_CJKpunct_hook: +\cs_new_protected:Npn \@@_adjust_CJKpunct_hook: { - \cs_new_protected_nopar:Npn \@@_restore_CJKsymbol: + \cs_new_protected:Npn \@@_restore_CJKsymbol: { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \@@_restore_CJKsymbol_aux: } { \cs_set_eq:NN \CJKosymbol \@@_save_CJKsymbol:n } } - \cs_new_protected_nopar:Npn \@@_replace_CJKsymbol: + \cs_new_protected:Npn \@@_replace_CJKsymbol: { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \@@_replace_CJKsymbol_aux: } @@ -958,14 +958,14 @@ Copyright and Licence \cs_set_eq:NN \CJKosymbol \@@_CJKsymbol:n } } - \cs_new_protected_nopar:Npn \@@_replace_CJKsymbol_single:n ##1 + \cs_new_protected:Npn \@@_replace_CJKsymbol_single:n ##1 { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \@@_replace_CJKsymbol_single_aux:n { ##1 } } { \bool_if:NF \l_@@_enable_bool { \cs_set_eq:NN \@@_save_CJKsymbol:n \CJKosymbol } - \cs_set_protected_nopar:Npn \CJKosymbol ####1 + \cs_set_protected:Npn \CJKosymbol ####1 { \@@_single_CJKsymbol:nn { ####1 } { ##1 } } } } @@ -991,7 +991,7 @@ Copyright and Licence % % \begin{macro}{\@@_pinyin:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_pinyin:n #1 +\cs_new_protected:Npn \@@_pinyin:n #1 { \@@_pinyin_init: \bool_set_true:N \l_@@_first_bool @@ -1003,7 +1003,7 @@ Copyright and Licence % % \begin{macro}{\@@_pinyin_aux:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_pinyin_aux:n #1 +\cs_new_protected:Npn \@@_pinyin_aux:n #1 { \quark_if_recursion_tail_stop_do:nn {#1} { @@ -1039,7 +1039,7 @@ Copyright and Licence % % \begin{macro}{\@@_tone:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_tone:nn #1#2 +\cs_new_protected:Npn \@@_tone:nn #1#2 { \use:c { @@_num_to_tone_ #1 :Nn } {#1} {#2} } \cs_generate_variant:Nn \@@_tone:nn { V } % \end{macrocode} @@ -1047,7 +1047,7 @@ Copyright and Licence % % \begin{macro}{\@@_replace_v:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_replace_v:n #1 +\cs_new:Npn \@@_replace_v:n #1 { \str_if_eq:nnTF {#1} { v } { @@ -1062,7 +1062,7 @@ Copyright and Licence % % \begin{macro}{\@@_pinyin_init:} % \begin{macrocode} -\cs_new_nopar:Npn \@@_pinyin_init: +\cs_new:Npn \@@_pinyin_init: { \tl_clear:N \l_@@_pre_tl \tl_clear:N \l_@@_post_tl \tl_clear:N \l_@@_item_tl \tl_clear:N \l_@@_tone_tl @@ -1100,19 +1100,19 @@ Copyright and Licence % % \begin{macro}{\@@_num_to_tone:Nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_num_to_tone:Nn #1#2 +\cs_new_protected:Npn \@@_num_to_tone:Nn #1#2 { \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f: \= {#1} \or: \'{#1} \or: \v {#1} \or: \` {#1} \else: #1 \fi: } \tl_map_inline:nn { a o e u } { \cs_new_eq:cN { @@_num_to_tone_ #1 :Nn } \@@_num_to_tone:Nn } -\cs_new_nopar:Npn \@@_num_to_tone_i:Nn #1#2 +\cs_new:Npn \@@_num_to_tone_i:Nn #1#2 { \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f: ī \or: í \or: ǐ \or: ì \else: i \fi: } -\cs_new_protected_nopar:Npn \@@_num_to_tone_v:Nn #1#2 +\cs_new_protected:Npn \@@_num_to_tone_v:Nn #1#2 { \str_case:onTF { \l_@@_pre_tl } { { l } { } { n } { } { L } { } { N } { } } @@ -1150,10 +1150,10 @@ Copyright and Licence % % \begin{macro}[int]{\xpinyin_customary:nnn,\xpinyin_multiple:nnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \xpinyin_customary:nnn #1#2#3 - { \cs_gset_nopar:cpn { c_@@_ #2 _tl } {#3} } -\cs_new_protected_nopar:Npn \xpinyin_multiple:nnn #1#2#3 - { \cs_gset_nopar:cpn { c_@@_multiple_ #2 _clist } {#3} } +\cs_new_protected:Npn \xpinyin_customary:nnn #1#2 + { \cs_gset_nopar:cpn { c_@@_ #2 _tl } } +\cs_new_protected:Npn \xpinyin_multiple:nnn #1#2 + { \cs_gset_nopar:cpn { c_@@_multiple_ #2 _clist } } % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins b/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins index bc0657b87a2..bc25db75014 100644 --- a/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins +++ b/Master/texmf-dist/source/latex/xpinyin/xpinyin.ins @@ -6,7 +6,7 @@ %% %% xpinyin.dtx (with options: `install') %% -%% Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -19,7 +19,7 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status `maintained'. +%% This work has the LPPL maintenance status "maintained". %% %% The Current Maintainer of this work is Qing Lee. %% @@ -45,7 +45,7 @@ \preamble - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -58,7 +58,7 @@ and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def index 4b768954548..aa4230d1b64 100644 --- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def +++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def @@ -7,7 +7,7 @@ %% xpinyin.dtx (with options: `database') %% xpinyin.db %% -%% Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -20,23 +20,23 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status `maintained'. +%% This work has the LPPL maintenance status "maintained". %% %% The Current Maintainer of this work is Qing Lee. %% %% -------------------------------------------------------------------------- %% \ProvidesFile{xpinyin-database.def}% - [2019/04/07 v2.7 xpinyin database] + [2020/05/01 v2.8 xpinyin database] %% %% Do not edit this file! %% Created from Unihan database: %% %% Unihan_Readings.txt -%% Date: 2018-11-09 21:36:19 GMT [JHJ] -%% Unicode version: 12.0.0 +%% Date: 2020-02-18 18:27:33 GMT [JHJ] +%% Unicode version: 13.0.0 %% -%% by "texlua xpinyin.lua" on 2019-04-07 23:39:52 +0800 +%% by "texlua xpinyin.lua" on 2020-05-01 21:17:50 +0800 %% \XPYU{〇}{12295}{líng} \XPYU{㐀}{13312}{qiū} @@ -2154,6 +2154,7 @@ \XPYU{㸃}{15875}{diǎn} \XPYU{㸄}{15876}{jì} \XPYU{㸅}{15877}{jié} +\XPYU{㸆}{15878}{kào} \XPYU{㸇}{15879}{zuǎn} \XPYU{㸉}{15881}{xiè} \XPYU{㸊}{15882}{lài} @@ -3748,6 +3749,7 @@ \XPYU{䓧}{17639}{cì} \XPYU{䓨}{17640}{yīng} \XPYU{䓫}{17643}{qí} +\XPYU{䓬}{17644}{zhuó} \XPYU{䓭}{17645}{chà} \XPYU{䓮}{17646}{mào} \XPYU{䓯}{17647}{dú} @@ -5268,7 +5270,7 @@ \XPYU{䭵}{19317}{fán} \XPYU{䭶}{19318}{qí} \XPYU{䭷}{19319}{máo} -\XPYU{䭸}{19320}{bǎo} +\XPYU{䭸}{19320}{fù} \XPYU{䭹}{19321}{áng} \XPYU{䭺}{19322}{ǎng} \XPYU{䭻}{19323}{fù} @@ -8941,7 +8943,7 @@ \XPYU{婄}{23108}{pǒu} \XPYU{婅}{23109}{jú} \XPYU{婆}{23110}{pó} -\XPYU{婇}{23111}{cāi} +\XPYU{婇}{23111}{cǎi} \XPYU{婈}{23112}{líng} \XPYU{婉}{23113}{wǎn} \XPYU{婊}{23114}{biǎo} @@ -10261,7 +10263,7 @@ \XPYU{彬}{24428}{bīn} \XPYU{彭}{24429}{péng} \XPYU{彮}{24430}{yǒng} -\XPYU{彯}{24431}{piǎo} +\XPYU{彯}{24431}{piāo} \XPYU{彰}{24432}{zhāng} \XPYU{影}{24433}{yǐng} \XPYU{彲}{24434}{chī} @@ -10589,7 +10591,7 @@ \XPYU{悴}{24756}{cuì} \XPYU{悵}{24757}{chàng} \XPYU{悶}{24758}{mèn} -\XPYU{悷}{24759}{sàn} +\XPYU{悷}{24759}{lì} \XPYU{悸}{24760}{jì} \XPYU{悹}{24761}{guàn} \XPYU{悺}{24762}{guàn} @@ -11939,7 +11941,7 @@ \XPYU{旺}{26106}{wàng} \XPYU{旻}{26107}{mín} \XPYU{旼}{26108}{mín} -\XPYU{旽}{26109}{tùn} +\XPYU{旽}{26109}{tūn} \XPYU{旾}{26110}{chūn} \XPYU{旿}{26111}{wǔ} \XPYU{昀}{26112}{yún} @@ -12976,7 +12978,7 @@ \XPYU{樈}{27144}{qíng} \XPYU{樉}{27145}{shuǎng} \XPYU{樊}{27146}{fán} -\XPYU{樋}{27147}{tǒng} +\XPYU{樋}{27147}{tōng} \XPYU{樌}{27148}{guàn} \XPYU{樍}{27149}{zé} \XPYU{樎}{27150}{sù} @@ -13183,7 +13185,7 @@ \XPYU{櫗}{27351}{miè} \XPYU{櫘}{27352}{huì} \XPYU{櫙}{27353}{ōu} -\XPYU{櫚}{27354}{lú} +\XPYU{櫚}{27354}{lǘ} \XPYU{櫛}{27355}{zhì} \XPYU{櫜}{27356}{gāo} \XPYU{櫝}{27357}{dú} @@ -15482,7 +15484,7 @@ \XPYU{珓}{29651}{jiào} \XPYU{珔}{29652}{jiàn} \XPYU{珕}{29653}{lì} -\XPYU{珖}{29654}{guàng} +\XPYU{珖}{29654}{guāng} \XPYU{珗}{29655}{xiān} \XPYU{珘}{29656}{zhōu} \XPYU{珙}{29657}{gǒng} @@ -16448,7 +16450,7 @@ \XPYU{瞞}{30622}{mán} \XPYU{瞟}{30623}{piǎo} \XPYU{瞠}{30624}{chēng} -\XPYU{瞡}{30625}{guǐ} +\XPYU{瞡}{30625}{guī} \XPYU{瞢}{30626}{méng} \XPYU{瞣}{30627}{wàn} \XPYU{瞤}{30628}{rún} @@ -18939,7 +18941,7 @@ \XPYU{腙}{33113}{zōng} \XPYU{腚}{33114}{dìng} \XPYU{腛}{33115}{wò} -\XPYU{腜}{33116}{měi} +\XPYU{腜}{33116}{méi} \XPYU{腝}{33117}{ní} \XPYU{腞}{33118}{zhuàn} \XPYU{腟}{33119}{chì} @@ -18955,7 +18957,7 @@ \XPYU{腩}{33129}{nǎn} \XPYU{腪}{33130}{yùn} \XPYU{腫}{33131}{zhǒng} -\XPYU{腬}{33132}{ròu} +\XPYU{腬}{33132}{róu} \XPYU{腭}{33133}{è} \XPYU{腮}{33134}{sāi} \XPYU{腯}{33135}{tú} @@ -18993,7 +18995,7 @@ \XPYU{膏}{33167}{gāo} \XPYU{膐}{33168}{lǚ} \XPYU{膑}{33169}{bìn} -\XPYU{膒}{33170}{óu} +\XPYU{膒}{33170}{ōu} \XPYU{膓}{33171}{cháng} \XPYU{膔}{33172}{lù} \XPYU{膕}{33173}{guó} @@ -19760,7 +19762,7 @@ \XPYU{蒎}{33934}{pài} \XPYU{蒏}{33935}{you} \XPYU{蒐}{33936}{sōu} -\XPYU{蒑}{33937}{yìn} +\XPYU{蒑}{33937}{yīn} \XPYU{蒒}{33938}{shī} \XPYU{蒓}{33939}{chún} \XPYU{蒔}{33940}{shí} @@ -21160,7 +21162,7 @@ \XPYU{訆}{35334}{jiào} \XPYU{訇}{35335}{hōng} \XPYU{計}{35336}{jì} -\XPYU{訉}{35337}{fān} +\XPYU{訉}{35337}{fàn} \XPYU{訊}{35338}{xùn} \XPYU{訋}{35339}{diào} \XPYU{訌}{35340}{hòng} @@ -21564,7 +21566,7 @@ \XPYU{讚}{35738}{zàn} \XPYU{讛}{35739}{yì} \XPYU{讜}{35740}{dǎng} -\XPYU{讝}{35741}{zhán} +\XPYU{讝}{35741}{zhān} \XPYU{讞}{35742}{yàn} \XPYU{讟}{35743}{dú} \XPYU{讠}{35744}{yán} @@ -21596,7 +21598,7 @@ \XPYU{论}{35770}{lùn} \XPYU{讻}{35771}{xiōng} \XPYU{讼}{35772}{sòng} -\XPYU{讽}{35773}{fèng} +\XPYU{讽}{35773}{fěng} \XPYU{设}{35774}{shè} \XPYU{访}{35775}{fǎng} \XPYU{诀}{35776}{jué} @@ -21605,7 +21607,7 @@ \XPYU{诃}{35779}{hē} \XPYU{评}{35780}{píng} \XPYU{诅}{35781}{zǔ} -\XPYU{识}{35782}{shì} +\XPYU{识}{35782}{shí} \XPYU{诇}{35783}{xiòng} \XPYU{诈}{35784}{zhà} \XPYU{诉}{35785}{sù} @@ -22903,7 +22905,7 @@ \XPYU{郕}{37077}{chéng} \XPYU{郖}{37078}{dòu} \XPYU{郗}{37079}{xī} -\XPYU{郘}{37080}{lǘ} +\XPYU{郘}{37080}{lǚ} \XPYU{郙}{37081}{fǔ} \XPYU{郚}{37082}{wú} \XPYU{郛}{37083}{fú} @@ -26051,7 +26053,7 @@ \XPYU{鴡}{40225}{jū} \XPYU{鴢}{40226}{yǎo} \XPYU{鴣}{40227}{gū} -\XPYU{鴤}{40228}{dōng} +\XPYU{鴤}{40228}{zhōng} \XPYU{鴥}{40229}{yù} \XPYU{鴦}{40230}{yāng} \XPYU{鴧}{40231}{yù} @@ -26271,7 +26273,7 @@ \XPYU{鷽}{40445}{xué} \XPYU{鷾}{40446}{yì} \XPYU{鷿}{40447}{pì} -\XPYU{鸀}{40448}{chǔ} +\XPYU{鸀}{40448}{shǔ} \XPYU{鸁}{40449}{luó} \XPYU{鸂}{40450}{xī} \XPYU{鸃}{40451}{yí} @@ -26761,6 +26763,7 @@ \XPYU{𠅌}{131404}{yí} \XPYU{𠅗}{131415}{diè} \XPYU{𠅚}{131418}{qí} +\XPYU{𠅤}{131428}{xí} \XPYU{𠅬}{131436}{bāo} \XPYU{𠅱}{131441}{xiè} \XPYU{𠅹}{131449}{zhàng} @@ -27303,7 +27306,6 @@ \XPYU{𠣖}{133334}{xuán} \XPYU{𠣘}{133336}{zhōu} \XPYU{𠣠}{133344}{kuì} -\XPYU{𠣡}{133345}{fèng} \XPYU{𠣪}{133354}{qú} \XPYU{𠣫}{133355}{shào} \XPYU{𠣬}{133356}{sǔn} @@ -29761,6 +29763,7 @@ \XPYU{𢣞}{141534}{bó} \XPYU{𢣠}{141536}{liù} \XPYU{𢣳}{141555}{ruì} +\XPYU{𢣵}{141557}{chú} \XPYU{𢣻}{141563}{lǘ} \XPYU{𢣼}{141564}{chá} \XPYU{𢣿}{141567}{chù} @@ -33459,7 +33462,6 @@ \XPYU{𥢑}{153745}{gǎo} \XPYU{𥢒}{153746}{láo} \XPYU{𥢔}{153748}{zhuó} -\XPYU{𥢟}{153759}{hù} \XPYU{𥢢}{153762}{tuí} \XPYU{𥢦}{153766}{bì} \XPYU{𥢧}{153767}{jú} @@ -33490,7 +33492,6 @@ \XPYU{𥣯}{153839}{yōu} \XPYU{𥣰}{153840}{biǎn} \XPYU{𥣸}{153848}{mù} -\XPYU{𥣹}{153849}{ràn} \XPYU{𥣺}{153850}{ràn} \XPYU{𥤂}{153858}{niǎo} \XPYU{𥤊}{153866}{quán} @@ -33760,7 +33761,7 @@ \XPYU{𥰜}{154652}{táo} \XPYU{𥰝}{154653}{xī} \XPYU{𥰞}{154654}{chōu} -\XPYU{𥰟}{154655}{gǎn} +\XPYU{𥰟}{154655}{yuán} \XPYU{𥰠}{154656}{lǘ} \XPYU{𥰡}{154657}{cè} \XPYU{𥰢}{154658}{shàn} @@ -34703,6 +34704,7 @@ \XPYU{𦙱}{157297}{sān} \XPYU{𦙴}{157300}{zhù} \XPYU{𦙵}{157301}{wàn} +\XPYU{𦙶}{157302}{gǔ} \XPYU{𦙸}{157304}{sān} \XPYU{𦙹}{157305}{bàn} \XPYU{𦙺}{157306}{jià} @@ -35226,6 +35228,7 @@ \XPYU{𦰘}{158744}{zhǐ} \XPYU{𦰙}{158745}{bì} \XPYU{𦰛}{158747}{fén} +\XPYU{𦰡}{158753}{nà} \XPYU{𦰥}{158757}{bāng} \XPYU{𦰪}{158762}{qiú} \XPYU{𦰫}{158763}{nǐ} @@ -35807,7 +35810,7 @@ \XPYU{𧋒}{160466}{tóng} \XPYU{𧋓}{160467}{kào} \XPYU{𧋔}{160468}{hòng} -\XPYU{𧋕}{160469}{kǔn} +\XPYU{𧋕}{160469}{kùn} \XPYU{𧋖}{160470}{niè} \XPYU{𧋗}{160471}{chí} \XPYU{𧋘}{160472}{tí} @@ -36077,7 +36080,7 @@ \XPYU{𧕴}{161140}{nán} \XPYU{𧕵}{161141}{mì} \XPYU{𧕸}{161144}{huáng} -\XPYU{𧕺}{161146}{shuàng} +\XPYU{𧕺}{161146}{shuāng} \XPYU{𧕼}{161148}{xǔ} \XPYU{𧕿}{161151}{fěi} \XPYU{𧖁}{161153}{xiè} @@ -36432,7 +36435,7 @@ \XPYU{𧥑}{162129}{bì} \XPYU{𧥓}{162131}{chán} \XPYU{𧥕}{162133}{zī} -\XPYU{𧥖}{162134}{lì} +\XPYU{𧥖}{162134}{lí} \XPYU{𧥚}{162138}{fó} \XPYU{𧥛}{162139}{qiǎn} \XPYU{𧥜}{162140}{yǎn} @@ -37193,7 +37196,7 @@ \XPYU{𨂟}{163999}{kāng} \XPYU{𨂠}{164000}{xū} \XPYU{𨂡}{164001}{zòu} -\XPYU{𨂢}{164002}{jì} +\XPYU{𨂢}{164002}{jí} \XPYU{𨂣}{164003}{wù} \XPYU{𨂦}{164006}{chuàn} \XPYU{𨂩}{164009}{pò} @@ -37336,7 +37339,7 @@ \XPYU{𨉁}{164417}{huàng} \XPYU{𨉃}{164419}{rèn} \XPYU{𨉅}{164421}{yè} -\XPYU{𨉋}{164427}{tuó} +\XPYU{𨉋}{164427}{tuō} \XPYU{𨉖}{164438}{zuān} \XPYU{𨉗}{164439}{yù} \XPYU{𨉚}{164442}{ā} @@ -37590,7 +37593,7 @@ \XPYU{𨒤}{165028}{cǐ} \XPYU{𨒦}{165030}{yǐn} \XPYU{𨒧}{165031}{shì} -\XPYU{𨒨}{165032}{nài} +\XPYU{𨒨}{165032}{hài} \XPYU{𨒩}{165033}{ruǎn} \XPYU{𨒫}{165035}{yáng} \XPYU{𨒬}{165036}{chī} @@ -37848,7 +37851,6 @@ \XPYU{𨞪}{165802}{chóu} \XPYU{𨞫}{165803}{méng} \XPYU{𨞲}{165810}{shēn} -\XPYU{𨞳}{165811}{qú} \XPYU{𨞶}{165814}{qiāo} \XPYU{𨞷}{165815}{cán} \XPYU{𨞺}{165818}{lì} @@ -38382,7 +38384,7 @@ \XPYU{𨷦}{167398}{lì} \XPYU{𨷩}{167401}{tóu} \XPYU{𨷬}{167404}{mǐ} -\XPYU{𨷭}{167405}{chǎn} +\XPYU{𨷭}{167405}{chán} \XPYU{𨷮}{167406}{huō} \XPYU{𨷱}{167409}{zhuǎn} \XPYU{𨷲}{167410}{yuè} @@ -38420,7 +38422,7 @@ \XPYU{𨸭}{167469}{pō} \XPYU{𨸮}{167470}{yán} \XPYU{𨸯}{167471}{gū} -\XPYU{𨸰}{167472}{jù} +\XPYU{𨸰}{167472}{jú} \XPYU{𨸱}{167473}{tiàn} \XPYU{𨸷}{167479}{è} \XPYU{𨸺}{167482}{yā} @@ -39021,7 +39023,7 @@ \XPYU{𩏇}{168903}{duàn} \XPYU{𩏈}{168904}{ruǎn} \XPYU{𩏉}{168905}{wéi} -\XPYU{𩏏}{168911}{wěi} +\XPYU{𩏏}{168911}{wéi} \XPYU{𩏐}{168912}{guì} \XPYU{𩏒}{168914}{dá} \XPYU{𩏓}{168915}{xiá} @@ -39322,7 +39324,7 @@ \XPYU{𩗱}{169457}{xī} \XPYU{𩗲}{169458}{zhēng} \XPYU{𩗴}{169460}{bèng} -\XPYU{𩗵}{169461}{zhěng} +\XPYU{𩗵}{169461}{zhēng} \XPYU{𩗶}{169462}{suì} \XPYU{𩗷}{169463}{yǎn} \XPYU{𩗼}{169468}{qīng} @@ -39945,7 +39947,7 @@ \XPYU{𩭒}{170834}{máng} \XPYU{𩭓}{170835}{jiū} \XPYU{𩭘}{170840}{xiū} -\XPYU{𩭝}{170845}{wō} +\XPYU{𩭝}{170845}{wǒ} \XPYU{𩭟}{170847}{dào} \XPYU{𩭡}{170849}{xī} \XPYU{𩭢}{170850}{àn} @@ -40431,7 +40433,6 @@ \XPYU{𩿽}{172029}{tuó} \XPYU{𩿿}{172031}{chú} \XPYU{𪀁}{172033}{gē} -\XPYU{𪀈}{172040}{yuān} \XPYU{𪀉}{172041}{gē} \XPYU{𪀊}{172042}{qú} \XPYU{𪀏}{172047}{jù} @@ -41212,11 +41213,17 @@ \XPYU{𪛎}{173774}{pì} \XPYU{𪛒}{173778}{lián} \XPYU{𪞝}{173981}{duó} +\XPYU{𪟝}{174045}{jì} \XPYU{𪡈}{174152}{bái} \XPYU{𪡏}{174159}{zhān} \XPYU{𪢮}{174254}{luán} +\XPYU{𪣻}{174331}{lóu} +\XPYU{𪤗}{174359}{liào} \XPYU{𪨊}{174602}{sóng} \XPYU{𪨗}{174615}{juē} +\XPYU{𪨰}{174640}{qū} +\XPYU{𪨶}{174646}{shē} +\XPYU{𪩘}{174680}{yǎn} \XPYU{𪪝}{174749}{yōng} \XPYU{𪺹}{175801}{nǔ} \XPYU{𪻐}{175824}{cōng} @@ -41225,8 +41232,11 @@ \XPYU{𫂈}{176264}{fèi} \XPYU{𫂙}{176281}{sù} \XPYU{𫃜}{176348}{kòu} +\XPYU{𫄧}{176423}{yán} \XPYU{𫄨}{176424}{chī} +\XPYU{𫄷}{176439}{yì} \XPYU{𫄸}{176440}{xūn} +\XPYU{𫇭}{176621}{wěi} \XPYU{𫈰}{176688}{qià} \XPYU{𫋐}{176848}{gǒng} \XPYU{𫌀}{176896}{jī} @@ -41234,44 +41244,180 @@ \XPYU{𫍙}{176985}{yì} \XPYU{𫍟}{176991}{yí} \XPYU{𫍢}{176994}{náo} +\XPYU{𫍣}{176995}{tóng} +\XPYU{𫍯}{177007}{xián} \XPYU{𫍰}{177008}{xǐ} \XPYU{𫍲}{177010}{xiǎo} +\XPYU{𫍽}{177021}{xuān} \XPYU{𫏋}{177099}{juē} \XPYU{𫐄}{177156}{yuè} \XPYU{𫐆}{177158}{kuài} \XPYU{𫐉}{177161}{líng} \XPYU{𫐐}{177168}{ní} \XPYU{𫐓}{177171}{bù} +\XPYU{𫑡}{177249}{méng} \XPYU{𫒶}{177334}{hán} \XPYU{𫓧}{177383}{fū} \XPYU{𫓩}{177385}{cōng} +\XPYU{𫓯}{177391}{jī} +\XPYU{𫓶}{177398}{xuān} +\XPYU{𫓹}{177401}{jī} +\XPYU{𫔍}{177421}{fán} \XPYU{𫔎}{177422}{jué} +\XPYU{𫔶}{177462}{niè} +\XPYU{𫖮}{177582}{yǐ} +\XPYU{𫖯}{177583}{fǔ} +\XPYU{𫖳}{177587}{yūn} \XPYU{𫗠}{177632}{zhāng} \XPYU{𫗦}{177638}{bù} \XPYU{𫗧}{177639}{sù} \XPYU{𫗮}{177646}{huáng} \XPYU{𫗴}{177652}{zhān} +\XPYU{𫘜}{177692}{wén} \XPYU{𫘝}{177693}{jué} \XPYU{𫘣}{177699}{hàn} \XPYU{𫘤}{177700}{ái} +\XPYU{𫘦}{177702}{táo} +\XPYU{𫘧}{177703}{lù} \XPYU{𫘨}{177704}{tí} +\XPYU{𫘪}{177706}{yuán} +\XPYU{𫘬}{177708}{xí} \XPYU{𫚈}{177800}{xù} \XPYU{𫚉}{177801}{hóng} \XPYU{𫚒}{177810}{fú} \XPYU{𫚔}{177812}{huí} \XPYU{𫚕}{177813}{shī} +\XPYU{𫚖}{177814}{cǐ} \XPYU{𫚙}{177817}{pū} +\XPYU{𫚭}{177837}{liè} \XPYU{𫛛}{177883}{zhī} \XPYU{𫛞}{177886}{jué} \XPYU{𫛢}{177890}{níng} +\XPYU{𫛭}{177901}{kuáng} \XPYU{𫛶}{177910}{chì} \XPYU{𫛸}{177912}{tí} +\XPYU{𫞩}{178089}{mén} +\XPYU{𫟅}{178117}{liáng} +\XPYU{𫟦}{178150}{suì} +\XPYU{𫟷}{178167}{lì} +\XPYU{𫟹}{178169}{hóng} +\XPYU{𫟼}{178172}{dá} +\XPYU{𫠆}{178182}{kuǐ} +\XPYU{𫠊}{178186}{xuán} +\XPYU{𫠜}{178204}{ní} \XPYU{𫡑}{178257}{yīn} +\XPYU{𫢸}{178360}{dàn} +\XPYU{𫫇}{178887}{è} +\XPYU{𫭟}{179039}{ōu} +\XPYU{𫭢}{179042}{lǔn} +\XPYU{𫭼}{179068}{láo} +\XPYU{𫮃}{179075}{shàn} +\XPYU{𫰛}{179227}{xíng} +\XPYU{𫵷}{179575}{lì} +\XPYU{𫶇}{179591}{dié} +\XPYU{𫷷}{179703}{xīn} +\XPYU{𫸩}{179753}{kōu} +\XPYU{𬀩}{180265}{wěi} +\XPYU{𬀪}{180266}{xiàn} +\XPYU{𬂩}{180393}{jiā} +\XPYU{𬃊}{180426}{zhì} +\XPYU{𬇕}{180693}{wàn} +\XPYU{𬇙}{180697}{bèi} +\XPYU{𬇹}{180729}{guó} +\XPYU{𬉼}{180860}{ǒu} +\XPYU{𬊈}{180872}{xún} +\XPYU{𬊤}{180900}{chǎn} +\XPYU{𬌗}{181015}{hé} +\XPYU{𬍛}{181083}{lì} +\XPYU{𬍡}{181089}{dàng} +\XPYU{𬍤}{181092}{xún} +\XPYU{𬒈}{181384}{què} +\XPYU{𬒔}{181396}{gěng} +\XPYU{𬒗}{181399}{lán} \XPYU{𬓼}{181500}{tuí} +\XPYU{𬕂}{181570}{lǒng} +\XPYU{𬘓}{181779}{xún} +\XPYU{𬘘}{181784}{dǎn} +\XPYU{𬘡}{181793}{yīn} +\XPYU{𬘩}{181801}{tīng} +\XPYU{𬘫}{181803}{huán} +\XPYU{𬘬}{181804}{qiàn} \XPYU{𬘭}{181805}{chēn} +\XPYU{𬘯}{181807}{zhǔn} +\XPYU{𬙂}{181826}{yǎn} +\XPYU{𬙊}{181834}{mò} +\XPYU{𬙋}{181835}{xiāng} +\XPYU{𬜬}{182060}{màn} +\XPYU{𬜯}{182063}{liǎng} +\XPYU{𬞟}{182175}{pín} +\XPYU{𬟁}{182209}{yì} +\XPYU{𬟽}{182269}{dōng} +\XPYU{𬣙}{182489}{xū} +\XPYU{𬣞}{182494}{zhǔ} +\XPYU{𬣡}{182497}{jiàn} +\XPYU{𬣳}{182515}{hěn} +\XPYU{𬤇}{182535}{yīn} +\XPYU{𬤊}{182538}{shì} +\XPYU{𬤝}{182557}{huì} \XPYU{𬤥}{182565}{zhuàn} +\XPYU{𬨂}{182786}{qí} +\XPYU{𬨎}{182798}{yóu} +\XPYU{𬩽}{182909}{xún} +\XPYU{𬪩}{182953}{nóng} +\XPYU{𬬩}{183081}{yì} +\XPYU{𬬭}{183085}{lún} +\XPYU{𬬮}{183086}{chǎng} +\XPYU{𬬱}{183089}{jīn} +\XPYU{𬬸}{183096}{shù} +\XPYU{𬬹}{183097}{shén} +\XPYU{𬬻}{183099}{lú} +\XPYU{𬬿}{183103}{zhāo} +\XPYU{𬭁}{183105}{mǔ} +\XPYU{𬭊}{183114}{dù} +\XPYU{𬭎}{183118}{hóng} +\XPYU{𬭚}{183130}{chún} +\XPYU{𬭛}{183131}{bō} +\XPYU{𬭤}{183140}{hóu} +\XPYU{𬭩}{183145}{wēng} +\XPYU{𬭬}{183148}{huì} +\XPYU{𬭯}{183151}{piě} +\XPYU{𬭳}{183155}{xǐ} +\XPYU{𬭶}{183158}{hēi} +\XPYU{𬭸}{183160}{lín} +\XPYU{𬭼}{183164}{suì} +\XPYU{𬮱}{183217}{yīn} +\XPYU{𬮿}{183231}{gài} +\XPYU{𬯀}{183232}{jī} \XPYU{𬯎}{183246}{tuí} +\XPYU{𬱖}{183382}{dí} +\XPYU{𬱟}{183391}{wěi} +\XPYU{𬳵}{183541}{pī} +\XPYU{𬳶}{183542}{jiōng} +\XPYU{𬳽}{183549}{shēn} +\XPYU{𬳿}{183551}{tú} +\XPYU{𬴂}{183554}{fēi} +\XPYU{𬴃}{183555}{huō} +\XPYU{𬴊}{183562}{lín} +\XPYU{𬶋}{183691}{jū} +\XPYU{𬶍}{183693}{tuó} +\XPYU{𬶏}{183695}{wéi} +\XPYU{𬶐}{183696}{zhào} +\XPYU{𬶟}{183711}{là} +\XPYU{𬶠}{183712}{liàn} +\XPYU{𬶨}{183720}{jì} +\XPYU{𬶭}{183725}{jì} +\XPYU{𬶮}{183726}{xǐ} +\XPYU{𬷕}{183765}{bǔ} +\XPYU{𬸘}{183832}{yǎn} +\XPYU{𬸚}{183834}{yuè} \XPYU{𬸣}{183843}{xiān} +\XPYU{𬸦}{183846}{zhuó} +\XPYU{𬸪}{183850}{fán} +\XPYU{𬹼}{183932}{xiè} +\XPYU{𬺈}{183944}{yǐ} +\XPYU{𬺓}{183955}{chǔ} +\XPYU{𰻝}{200413}{biáng} +\XPYU{𰻞}{200414}{biáng} \XPYUM{㐤}{13348}{dān,qiú} \XPYUM{㐸}{13368}{qiàn,cì} \XPYUM{㐺}{13370}{yín,zhòng} diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty index f9de62c3e1e..fb2aa7d7d61 100644 --- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty +++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty @@ -6,7 +6,7 @@ %% %% xpinyin.dtx (with options: `package') %% -%% Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -19,7 +19,7 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status `maintained'. +%% This work has the LPPL maintenance status "maintained". %% %% The Current Maintainer of this work is Qing Lee. %% @@ -27,10 +27,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xpinyin.dtx 81bb941 2019-04-07 23:27:58 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xpinyin.dtx 789567a 2020-05-01 21:10:07 +0800 Qing Lee <sobenlee@gmail.com> $ {Automatically add pinyin to Chinese characters} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.7}{\ExplFileDescription} + {\ExplFileDate}{2.8}{\ExplFileDescription} \msg_new:nnn { xpinyin } { l3-too-old } { Support~package~'expl3'~too~old. \\\\ @@ -80,19 +80,19 @@ { ǚ } = { \v { \" u } } , { ǜ } = { \@tabacckludge` { \" u } } } -\cs_new_protected_nopar:Npn \__xpinyin_UTF_char:nn #1#2 +\cs_new_protected:Npn \__xpinyin_UTF_char:nn #1#2 { \cs_if_exist:cF { u8:#1 } { \tl_const:cn { u8:#1 } {#2} } } -\cs_new_protected_nopar:Npn \__xpinyin_GBK_char:nn #1#2 +\cs_new_protected:Npn \__xpinyin_GBK_char:nn #1#2 { \__xpinyin_UTF_char:nn {#1} {#2} \exp_args:Nx \__xpinyin_GBK_char_aux:nn { \tl_head:n {#1} } {#1} } -\cs_new_protected_nopar:Npn \__xpinyin_GBK_char_aux:nn #1#2 +\cs_new_protected:Npn \__xpinyin_GBK_char_aux:nn #1#2 { \exp_args:Nf \__xpinyin_GBK_char_aux:nnn { \int_eval:n { `#1 } } {#1} {#2} } -\cs_new_protected_nopar:Npn \__xpinyin_GBK_char_aux:nnn #1#2#3 +\cs_new_protected:Npn \__xpinyin_GBK_char_aux:nnn #1#2#3 { \cs_if_exist:cF { __xpinyin_UTF_ #1 :w } { @@ -112,15 +112,15 @@ \char_set_catcode_active:n {#1} } } -\cs_new_protected_nopar:Npn \__xpinyin_GBK_char_def:nnn #1#2#3 +\cs_new_protected:Npn \__xpinyin_GBK_char_def:nnn #1#2#3 { - \cs_new_protected_nopar:cpn { __xpinyin_UTF_ #2 :w } #1 + \cs_new_protected:cpn { __xpinyin_UTF_ #2 :w } #1 { \use:c { u8: \tl_to_str:n { #3#1 } } } } \tl_new:N \c__xpinyin_reset_UTF_catcode_tl \group_begin: \char_set_catcode_active:n { 126 } -\cs_new_protected_nopar:Npn \__xpinyin_save_UTF_cs:Nn #1#2 +\cs_new_protected:Npn \__xpinyin_save_UTF_cs:Nn #1#2 { \group_begin: \char_set_lccode:nn { 126 } {#2} @@ -176,7 +176,7 @@ \hbox_set:Nn \l__xpinyin_tmpa_box {#2} #1 = \box_wd:N \l__xpinyin_tmpa_box } -\cs_new_protected_nopar:Npn \__xpinyin_make_pinyin_box:nnn #1#2#3 +\cs_new_protected:Npn \__xpinyin_make_pinyin_box:nnn #1#2#3 { \__xpinyin_leavevmode: \hbox_overlap_right:n @@ -216,9 +216,9 @@ { \cs_set_eq:NN \CJK@plane \tex_undefined:D } } \cs_generate_variant:Nn \__xpinyin_make_pinyin_box:nnn { x } -\cs_new_protected_nopar:Npn \__xpinyin_CJKsymbol:n #1 +\cs_new_protected:Npn \__xpinyin_CJKsymbol:n #1 { \__xpinyin_CJKsymbol:xn { \__xpinyin_to_unicode:n {#1} } {#1} } -\cs_new_protected_nopar:Npn \__xpinyin_CJKsymbol:nn #1#2 +\cs_new_protected:Npn \__xpinyin_CJKsymbol:nn #1#2 { \__xpinyin_make_pinyin_box:nnn {#1} {#2} { \use:c { c__xpinyin_ #1 _tl } } \__xpinyin_save_CJKsymbol:n {#2} @@ -250,7 +250,7 @@ } } \bool_new:N \l__xpinyin_enable_bool -\cs_new_protected_nopar:Npn \__xpinyin_CJKglue: +\cs_new_protected:Npn \__xpinyin_CJKglue: { \skip_horizontal:n { \l__xpinyin_hsep_tl } } \NewDocumentCommand \enablepinyin { } { @@ -277,7 +277,7 @@ \bool_set_false:N \l__xpinyin_enable_bool } } -\cs_new_protected_nopar:Npn \__xpinyin_restore_footnote: +\cs_new_protected:Npn \__xpinyin_restore_footnote: { \bool_if:NF \l__xpinyin_footnote_bool { \tl_put_left:Nn \@parboxrestore { \l__xpinyin_restore_footnote_tl } } @@ -289,32 +289,32 @@ { \disablepinyin } } \dim_new:N \l__xpinyin_CJKglue_dim -\cs_new_protected_nopar:Npn \__xpinyin_single_aux:nn #1#2 +\cs_new_protected:Npn \__xpinyin_single_aux:nn #1#2 { \__xpinyin_replace_CJKsymbol_single:n {#2} #1 \group_end: } -\cs_new_protected_nopar:Npn \__xpinyin_replace_CJKsymbol_single_aux:n #1 +\cs_new_protected:Npn \__xpinyin_replace_CJKsymbol_single_aux:n #1 { \bool_if:NF \l__xpinyin_enable_bool { \__xpinyin_replace_CJKsymbol: } - \cs_set_protected_nopar:Npn \CJKsymbol ##1 + \cs_set_protected:Npn \CJKsymbol ##1 { \__xpinyin_single_CJKsymbol:nn {##1} {#1} } } -\cs_new_protected_nopar:Npn \__xpinyin_single_CJKsymbol:nn #1#2 +\cs_new_protected:Npn \__xpinyin_single_CJKsymbol:nn #1#2 { \__xpinyin_make_pinyin_box:xnn { \__xpinyin_to_unicode:n {#1} } {#1} { \__xpinyin_pinyin:n {#2} } \__xpinyin_save_CJKsymbol:n {#1} } -\cs_new_protected_nopar:Npn \__xpinyin_replace_CJKsymbol_aux: +\cs_new_protected:Npn \__xpinyin_replace_CJKsymbol_aux: { \cs_set_eq:NN \__xpinyin_save_CJKsymbol:n \CJKsymbol \cs_set_eq:NN \CJKsymbol \__xpinyin_CJKsymbol:n } -\cs_new_protected_nopar:Npn \__xpinyin_restore_CJKsymbol_aux: +\cs_new_protected:Npn \__xpinyin_restore_CJKsymbol_aux: { \cs_set_eq:NN \CJKsymbol \__xpinyin_save_CJKsymbol:n } -\cs_new_protected_nopar:Npn \__xpinyin_select_font_xetex: +\cs_new_protected:Npn \__xpinyin_select_font_xetex: { \cs_if_exist_use:cF { \l__xpinyin_coor_tl } { @@ -327,7 +327,7 @@ } } } -\cs_new_protected_nopar:Npn \__xpinyin_select_font_aux: +\cs_new_protected:Npn \__xpinyin_select_font_aux: { \fontsize { \l__xpinyin_ratio_tl \tex_dimexpr:D \f@size pt \scan_stop: } @@ -336,26 +336,26 @@ \l__xpinyin_font_tl \selectfont } -\cs_new_nopar:Npn \__xpinyin_to_unicode_xetex:n #1 +\cs_new:Npn \__xpinyin_to_unicode_xetex:n #1 { \int_to_arabic:n { `#1 } } -\cs_new_nopar:Npn \__xpinyin_UTF_to_unicode:n #1 +\cs_new:Npn \__xpinyin_UTF_to_unicode:n #1 { \int_to_arabic:n { \exp_args:No \int_from_hex:n { \CJK@plane } * "100 + #1 } } -\cs_new_nopar:Npn \__xpinyin_UTFchar_to_unicode:n #1 +\cs_new:Npn \__xpinyin_UTFchar_to_unicode:n #1 { \int_to_arabic:n { \__xpinyin_UTF_viii_to_unicode:NNNw #1 \q_stop } } -\cs_new_nopar:Npn \__xpinyin_UTF_viii_to_unicode:NNNw #1#2#3#4 \q_stop +\cs_new:Npn \__xpinyin_UTF_viii_to_unicode:NNNw #1#2#3#4 \q_stop { \tl_if_empty:nTF {#4} { ( `#1 - "E0 ) * "1000 + ( `#2 - "80 ) * "40 + ( `#3 - "80 ) } { ( `#1 - "F0 ) * "4000 + ( `#2 - "80 ) * "1000 + ( `#3 - "80 ) * "40 + ( `#4 - "80 ) } } -\cs_new_nopar:Npn \__xpinyin_GBK_to_unicode:n #1 - { \int_to_arabic:n { " \CJKtu_sfd_map:nn { \CJK@plane } {#1} } } -\cs_new_nopar:Npn \__xpinyin_GBKchar_to_unicode:n #1 - { \int_to_arabic:n { " \CJKchartouni {#1} } } -\cs_new_protected_nopar:Npn \__xpinyin_adjust_xeCJK_hook: +\cs_new:Npn \__xpinyin_GBK_to_unicode:n + { \CJKtu_sfd_map:nn { \CJK@plane } } +\cs_new:Npn \__xpinyin_GBKchar_to_unicode:n + { \CJKtu_char_to_unicode:n } +\cs_new_protected:Npn \__xpinyin_adjust_xeCJK_hook: { \cs_new_eq:NN \__xpinyin_select_font: \__xpinyin_select_font_xetex: \cs_new_eq:NN \__xpinyin_to_unicode:n \__xpinyin_to_unicode_xetex:n @@ -380,14 +380,14 @@ } } \cs_new_eq:NN \__xpinyin_leavevmode: \prg_do_nothing: - \cs_new_protected_nopar:Npx \__xpinyin_CJKsymbol_hook: + \cs_new_protected:Npx \__xpinyin_CJKsymbol_hook: { \exp_not:N \makexeCJKinactive \cs_if_exist_use:NF \xeCJK_select_font: { \exp_not:N \xeCJK@setfont } } } -\cs_new_protected_nopar:Npn \__xpinyin_adjust_CJK_hook: +\cs_new_protected:Npn \__xpinyin_adjust_CJK_hook: { \bool_if:NTF \g__xpinyin_GBK_bool { @@ -420,15 +420,15 @@ } } } -\cs_new_protected_nopar:Npn \__xpinyin_adjust_CJKpunct_hook: +\cs_new_protected:Npn \__xpinyin_adjust_CJKpunct_hook: { - \cs_new_protected_nopar:Npn \__xpinyin_restore_CJKsymbol: + \cs_new_protected:Npn \__xpinyin_restore_CJKsymbol: { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \__xpinyin_restore_CJKsymbol_aux: } { \cs_set_eq:NN \CJKosymbol \__xpinyin_save_CJKsymbol:n } } - \cs_new_protected_nopar:Npn \__xpinyin_replace_CJKsymbol: + \cs_new_protected:Npn \__xpinyin_replace_CJKsymbol: { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \__xpinyin_replace_CJKsymbol_aux: } @@ -437,14 +437,14 @@ \cs_set_eq:NN \CJKosymbol \__xpinyin_CJKsymbol:n } } - \cs_new_protected_nopar:Npn \__xpinyin_replace_CJKsymbol_single:n ##1 + \cs_new_protected:Npn \__xpinyin_replace_CJKsymbol_single:n ##1 { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \__xpinyin_replace_CJKsymbol_single_aux:n { ##1 } } { \bool_if:NF \l__xpinyin_enable_bool { \cs_set_eq:NN \__xpinyin_save_CJKsymbol:n \CJKosymbol } - \cs_set_protected_nopar:Npn \CJKosymbol ####1 + \cs_set_protected:Npn \CJKosymbol ####1 { \__xpinyin_single_CJKsymbol:nn { ####1 } { ##1 } } } } @@ -460,14 +460,14 @@ \__xpinyin_pinyin:n {#2} \group_end: } -\cs_new_protected_nopar:Npn \__xpinyin_pinyin:n #1 +\cs_new_protected:Npn \__xpinyin_pinyin:n #1 { \__xpinyin_pinyin_init: \bool_set_true:N \l__xpinyin_first_bool \tl_set:Nn \l__xpinyin_save_tl {#1} \__xpinyin_pinyin_aux:n #1 \q_recursion_tail \q_recursion_stop } -\cs_new_protected_nopar:Npn \__xpinyin_pinyin_aux:n #1 +\cs_new_protected:Npn \__xpinyin_pinyin_aux:n #1 { \quark_if_recursion_tail_stop_do:nn {#1} { @@ -498,10 +498,10 @@ } \__xpinyin_pinyin_aux:n } -\cs_new_protected_nopar:Npn \__xpinyin_tone:nn #1#2 +\cs_new_protected:Npn \__xpinyin_tone:nn #1#2 { \use:c { __xpinyin_num_to_tone_ #1 :Nn } {#1} {#2} } \cs_generate_variant:Nn \__xpinyin_tone:nn { V } -\cs_new_nopar:Npn \__xpinyin_replace_v:n #1 +\cs_new:Npn \__xpinyin_replace_v:n #1 { \str_if_eq:nnTF {#1} { v } { @@ -511,7 +511,7 @@ } { \exp_not:n {#1} } } -\cs_new_nopar:Npn \__xpinyin_pinyin_init: +\cs_new:Npn \__xpinyin_pinyin_init: { \tl_clear:N \l__xpinyin_pre_tl \tl_clear:N \l__xpinyin_post_tl \tl_clear:N \l__xpinyin_item_tl \tl_clear:N \l__xpinyin_tone_tl @@ -528,19 +528,19 @@ \tl_const:Nn \c__xpinyin_i_tl { 1 } \tl_const:Nn \c__xpinyin_u_tl { 1 } \tl_const:Nn \c__xpinyin_v_tl { 1 } -\cs_new_protected_nopar:Npn \__xpinyin_num_to_tone:Nn #1#2 +\cs_new_protected:Npn \__xpinyin_num_to_tone:Nn #1#2 { \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f: \= {#1} \or: \'{#1} \or: \v {#1} \or: \` {#1} \else: #1 \fi: } \tl_map_inline:nn { a o e u } { \cs_new_eq:cN { __xpinyin_num_to_tone_ #1 :Nn } \__xpinyin_num_to_tone:Nn } -\cs_new_nopar:Npn \__xpinyin_num_to_tone_i:Nn #1#2 +\cs_new:Npn \__xpinyin_num_to_tone_i:Nn #1#2 { \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f: ī \or: í \or: ǐ \or: ì \else: i \fi: } -\cs_new_protected_nopar:Npn \__xpinyin_num_to_tone_v:Nn #1#2 +\cs_new_protected:Npn \__xpinyin_num_to_tone_v:Nn #1#2 { \str_case:onTF { \l__xpinyin_pre_tl } { { l } { } { n } { } { L } { } { N } { } } @@ -563,10 +563,10 @@ pysep = \c_space_tl , font = \normalfont , } -\cs_new_protected_nopar:Npn \xpinyin_customary:nnn #1#2#3 - { \cs_gset_nopar:cpn { c__xpinyin_ #2 _tl } {#3} } -\cs_new_protected_nopar:Npn \xpinyin_multiple:nnn #1#2#3 - { \cs_gset_nopar:cpn { c__xpinyin_multiple_ #2 _clist } {#3} } +\cs_new_protected:Npn \xpinyin_customary:nnn #1#2 + { \cs_gset_nopar:cpn { c__xpinyin_ #2 _tl } } +\cs_new_protected:Npn \xpinyin_multiple:nnn #1#2 + { \cs_gset_nopar:cpn { c__xpinyin_multiple_ #2 _clist } } \group_begin: \cs_set_eq:NN \XPYU \xpinyin_customary:nnn \cs_set_eq:NN \XPYUM \xpinyin_multiple:nnn |