diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf | bin | 131206 -> 129732 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx | 47 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def | 194 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def | 122 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def | 76 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def | 194 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def | 76 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def | 76 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty | 26 |
10 files changed, 406 insertions, 409 deletions
diff --git a/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf b/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf Binary files differindex 711bca4f612..d2ba50e0423 100644 --- a/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf +++ b/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf diff --git a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx index a0ebd966da7..860d37f9154 100644 --- a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx +++ b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx @@ -44,7 +44,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -89,7 +89,7 @@ Copyright and Licence \preamble - Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -192,7 +192,7 @@ Copyright and Licence %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} %<make>\input expl3-generic % -%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ %<package|make|def> {Convert CJK character to Unicode.} %<*driver> \def\ctxaux#1#2#3{\def\ctxversion{v#2}}\ctxaux @@ -214,7 +214,7 @@ Copyright and Licence %<JIS>\ProvidesExplFile{xCJK2uni-UJIS.def} %<KS>\ProvidesExplFile{xCJK2uni-UKS.def} %<*driver|package|make|def> - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} %</driver|package|make|def> %<*driver> \documentclass{ctxdoc} @@ -226,7 +226,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{600} +% \CheckSum{585} % \GetFileId{xCJK2uni.sty} % % \title{\bfseries\pkg{xCJK2uni} 宏包} @@ -300,7 +300,7 @@ Copyright and Licence 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2017/12/16 } { } +\@ifpackagelater { expl3 } { 2019/03/05 } { } { \msg_error:nn { xCJK2uni } { l3-too-old } } % \end{macrocode} % @@ -339,17 +339,17 @@ Copyright and Licence \tl_if_empty:nTF {#5} { \int_const:cn { c_@@_ #1 _gap_begin_int } - { \l_@@_ii_max_int + \c_one } + { \l_@@_ii_max_int + 1 } \int_const:cn { c_@@_ #1 _gap_end_int } { \use:c { c_@@_ #1 _gap_begin_int } } \int_const:cn { c_@@_ #1 _plane_int } - { \l_@@_ii_max_int - (#4) + \c_one } + { \l_@@_ii_max_int - (#4) + 1 } } { - \int_const:cn { c_@@_ #1 _gap_begin_int } { #5 + \c_one } + \int_const:cn { c_@@_ #1 _gap_begin_int } { #5 + 1 } \int_const:cn { c_@@_ #1 _gap_end_int } {#6} \int_const:cn { c_@@_ #1 _plane_int } - { (#5) - (#4) + \l_@@_ii_max_int - (#6) + \c_two } + { (#5) - (#4) + \l_@@_ii_max_int - (#6) + 2 } } \cs_if_exist_use:NTF \CJKaddEncHook { {#1} { \@@_enc_map:nn {#1} {#2} } } @@ -437,7 +437,7 @@ Copyright and Licence \cs_new_nopar:Npn \@@_char_to_unicode:n #1 { \exp:w - \int_compare:nNnTF { \tl_count:n {#1} } = \c_two + \int_compare:nNnTF { \tl_count:n {#1} } = 2 { \CJKtu_byte:NN #1 } { \tl_if_head_eq_meaning:nNTF {#1} ^^7f @@ -536,8 +536,8 @@ Copyright and Licence \@@_get_unicode:n { \CJKtu_sfd_map:nn - { \int_div_truncate:nn {#1} { \c_two_hundred_fifty_six } + \c_one } - { \int_mod:nn {#1} { \c_two_hundred_fifty_six } } + { \int_div_truncate:nn {#1} { 256 } + 1 } + { \int_mod:nn {#1} { 256 } } } } % \end{macrocode} @@ -557,9 +557,9 @@ Copyright and Licence \cs_new_nopar:Npn \@@_UTF_xvi_aux:n #1 { \HyPsd@DecimalToOctalFirst - { \int_div_truncate:nn {#1} { \c_two_hundred_fifty_six } } + { \int_div_truncate:nn {#1} { 256 } } \HyPsd@DecimalToOctalSecond - { \int_mod:nn {#1} { \c_two_hundred_fifty_six } } + { \int_mod:nn {#1} { 256 } } } % \end{macrocode} % \end{macro} @@ -639,7 +639,7 @@ Copyright and Licence { \str_gset:Nx \g_@@_path_str { - \lua_now_x:n + \lua_now:e { kpse.set_program_name("kpsewhich") ~ local ~ sfd = kpse.find_file("UGBK.sfd", "subfont~definition~files") ~ @@ -650,11 +650,8 @@ Copyright and Licence } } { - \ior_open:NnTF \g_@@_sfd_ior { |kpsewhich ~ UGBK.sfd } - { - \ior_str_get:NN \g_@@_sfd_ior \g_@@_path_str - \ior_close:N \g_@@_sfd_ior - } + \sys_shell_get:nnNTF { kpsewhich ~ UGBK.sfd } { } \l_tmpa_str + { \str_gset_eq:NN \g_@@_path_str \l_tmpa_str } { \msg_fatal:nnnn { xCJK2uni } { file-not-found } { GBK } { UGBK.sfd } } } % \end{macrocode} @@ -795,7 +792,7 @@ Copyright and Licence \c_hash_str 1 \iow_newline: \c_@@_indent_str \c_left_brace_str \iow_newline: \c_@@_indent_str \c_@@_indent_str - \exp_not:N \if_case:w \etex_numexpr:D + \exp_not:N \if_case:w \tex_numexpr:D \c_hash_str 1 ~ \token_to_str:N \scan_stop: } } @@ -817,7 +814,7 @@ Copyright and Licence \c_@@_indent_str < 00 > ~ < \int_to_Hex:n - { \seq_count:N \l_@@_sfd_plane_seq - \c_one } + { \seq_count:N \l_@@_sfd_plane_seq - 1 } > \iow_newline: endcodespacerange } @@ -827,7 +824,7 @@ Copyright and Licence \iow_now:Nx \g_@@_sfd_cmap_iow { \iow_newline: - \int_mod:nn { \l_@@_sfd_index_int } { \c_one_hundred } ~ + \int_mod:nn { \l_@@_sfd_index_int } { 100 } ~ beginbfchar \iow_newline: \l_@@_cmap_block_tl endbfchar @@ -861,7 +858,7 @@ Copyright and Licence \tl_put_right:Nx \l_@@_cmap_block_tl { < - \int_compare:nNnF \l_@@_sfd_index_int > \c_fifteen { 0 } + \int_compare:nNnF \l_@@_sfd_index_int > { 15 } { 0 } \int_to_Hex:n { \l_@@_sfd_index_int } > ~ <#1> \iow_newline: } diff --git a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins index 172a5d9cfbf..31967db2ee2 100644 --- a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins +++ b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins @@ -6,7 +6,7 @@ %% %% xCJK2uni.dtx (with options: `install') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -30,7 +30,7 @@ \preamble - Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def index cbbd25adec4..261fbd71c2c 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def @@ -7,7 +7,7 @@ %% xCJK2uni.dtx (with options: `def,Bg5+') %% xCJK2uni-sfd.def (with options: `Bg5+') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -26,10 +26,10 @@ %% %% -------------------------------------------------------------------------- %% -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplFile{xCJK2uni-UBg5plus.def} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \cs_new_nopar:cpn { CJKtu_Bg5+_sfd_map:nn } #1 { \cs_if_exist_use:cF @@ -38,7 +38,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_1:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8488 \or: 8710 \or: 871F \or: 870F \or: 88D3 \or: 8C87 \or: 8CC6 \or: 90CC \or: 916D \or: 9258 \or: 9242 \or: 9268 \or: 9269 \or: 9243 \or: 9247 \or: 959D \or: 96CF \or: 97F4 \or: 9809 \or: 98AB \or: 98FB \or: 9AAC \or: 9AAE \or: 9AAA \or: @@ -75,7 +75,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_2:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 535D \or: 5386 \or: 53B7 \or: 53CC \or: 53CE \or: 5721 \or: 5E00 \or: 5F0C \or: 6237 \or: 6238 \or: 6535 \or: 738D \or: 4E97 \or: 4EE0 \or: 4EE7 \or: 4EE6 \or: 56D8 \or: 518B \or: 518C \or: 5199 \or: 51E5 \or: 520B \or: 5304 \or: 5303 \or: @@ -112,7 +112,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_3:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8A2F \or: 52DC \or: 5921 \or: 5E3F \or: 7B3F \or: 83D0 \or: 86E7 \or: 6117 \or: 8714 \or: 88D1 \or: 8CCB \or: 8EED \or: 52EC \or: 52E8 \or: 7527 \or: 798C \or: 7991 \or: 8660 \or: 9904 \or: 999B \or: 729F \or: 8770 \or: 8E37 \or: 9703 \or: @@ -149,7 +149,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_4:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -186,7 +186,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_5:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6B22 \or: 6BCE \or: 6C58 \or: 6C51 \or: 6C77 \or: 6C3C \or: 6C5A \or: 6C53 \or: 706F \or: 7072 \or: 706E \or: 7073 \or: 72B1 \or: 72B2 \or: 738F \or: 793C \or: 808D \or: 808E \or: 827B \or: 8D71 \or: 8FB9 \or: 9096 \or: FFFE \or: FFFE \or: @@ -223,7 +223,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_6:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -260,7 +260,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_7:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -297,7 +297,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_8:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 623C \or: 6282 \or: 6278 \or: 628B \or: 629E \or: 62A5 \or: 629B \or: 629C \or: 6299 \or: 628D \or: 6285 \or: 629D \or: 6275 \or: 65F6 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -334,7 +334,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_9:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -371,7 +371,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_10:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -408,7 +408,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_11:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 59BF \or: 59C9 \or: 59B8 \or: 59AC \or: 59B7 \or: 59D7 \or: 8FC8 \or: 4FAB \or: 5C2D \or: 549C \or: 5788 \or: 62C3 \or: 6619 \or: 67A1 \or: 67A6 \or: 77FE \or: 7F57 \or: 82C5 \or: 8FDF \or: 8FDC \or: 4FE4 \or: 551B \or: 57AA \or: 57AB \or: @@ -445,7 +445,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_12:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6F9D \or: 6F99 \or: 6FF8 \or: 702E \or: 702D \or: 705C \or: 79CC \or: 70BF \or: 70EA \or: 70E5 \or: 7111 \or: 7112 \or: 713F \or: 7139 \or: 713B \or: 713D \or: 7177 \or: 7175 \or: 7176 \or: 7171 \or: 7196 \or: 7193 \or: 71B4 \or: 71DD \or: @@ -482,7 +482,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_13:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 517B \or: 517D \or: 5181 \or: 519A \or: 519B \or: 519C \or: 51A7 \or: 51AE \or: 51AF \or: 51BB \or: 51EB \or: 51EF \or: 51FB \or: 51FC \or: 51FF \or: 520D \or: 5219 \or: 521A \or: 521B \or: 522C \or: 522D \or: 523F \or: 5240 \or: 5242 \or: @@ -519,7 +519,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_14:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5CC4 \or: 5CE3 \or: 5CE4 \or: 5CE7 \or: 5D02 \or: 5D03 \or: 5D04 \or: 5D05 \or: 5D2D \or: 5D58 \or: 5D5A \or: 5D5D \or: 5DC5 \or: 5DEF \or: 5E05 \or: 5E0F \or: 5E10 \or: 5E1C \or: 5E26 \or: 5E27 \or: 5E31 \or: 5E3B \or: 5E3C \or: 5E86 \or: @@ -556,7 +556,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_15:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6D4F \or: 6D50 \or: 6D51 \or: 6D52 \or: 6D53 \or: 6D54 \or: 6D55 \or: 6D9D \or: 6D9F \or: 6DA0 \or: 6DA1 \or: 6DA2 \or: 6DA3 \or: 6DA4 \or: 6DA6 \or: 6DA7 \or: 6DA8 \or: 6DA9 \or: 6E0D \or: 6E0E \or: 6E10 \or: 6E11 \or: 6E14 \or: 6E16 \or: @@ -593,7 +593,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_16:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7EA2 \or: 7EA3 \or: 7EA4 \or: 7EA5 \or: 7EA6 \or: 7EA7 \or: 7EA8 \or: 7EA9 \or: 7EAA \or: 7EAB \or: 7EAC \or: 7EAD \or: 7EAE \or: 7EAF \or: 7EB0 \or: 7EB1 \or: 7EB2 \or: 7EB3 \or: 7EB4 \or: 7EB5 \or: 7EB6 \or: 7EB7 \or: 7EB8 \or: 54DA \or: @@ -630,7 +630,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_17:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8136 \or: 8137 \or: 8138 \or: 8156 \or: 8159 \or: 815A \or: 817B \or: 817C \or: 817E \or: 8191 \or: 81A5 \or: 81B6 \or: 81DC \or: 8206 \or: 8223 \or: 8230 \or: 8231 \or: 823B \or: 823E \or: 8254 \or: 8270 \or: 8282 \or: 8288 \or: 8297 \or: @@ -667,7 +667,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_18:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8BEB \or: 8BEC \or: 8BED \or: 8BEE \or: 8BEF \or: 8BF0 \or: 8BF1 \or: 8BF2 \or: 8BF3 \or: 8BF4 \or: 8BF5 \or: 8BF6 \or: 8BF7 \or: 8BF8 \or: 8BF9 \or: 8BFA \or: 8BFB \or: 8BFC \or: 8BFD \or: 8BFE \or: 8BFF \or: 8C00 \or: 8C01 \or: 8C02 \or: @@ -704,7 +704,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_19:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8F9A \or: 8FA9 \or: 8FAB \or: 8FBD \or: 8FDB \or: 8FDD \or: 8FDE \or: 8FF3 \or: 900A \or: 9026 \or: 9057 \or: 909D \or: 90AC \or: 90BA \or: 90BB \or: 70B2 \or: 70A7 \or: 70B9 \or: 722E \or: 723C \or: 726D \or: 72E7 \or: 72ED \or: 72EC \or: @@ -741,7 +741,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_20:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 951C \or: 951D \or: 951E \or: 951F \or: 9520 \or: 9521 \or: 9522 \or: 9523 \or: 9524 \or: 9525 \or: 9526 \or: 9527 \or: 9528 \or: 9529 \or: 952A \or: 952B \or: 952C \or: 952D \or: 952E \or: 952F \or: 9530 \or: 9531 \or: 9532 \or: 9533 \or: @@ -778,7 +778,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_21:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 98A6 \or: 98A7 \or: 98CE \or: 98CF \or: 98D0 \or: 98D1 \or: 98D2 \or: 98D3 \or: 98D4 \or: 98D5 \or: 98D6 \or: 98D7 \or: 98D8 \or: 98D9 \or: 98DA \or: 98DE \or: 98E0 \or: 98E8 \or: 990D \or: 990F \or: 9962 \or: 9963 \or: 9964 \or: 9965 \or: @@ -815,7 +815,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_22:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9CD3 \or: 9CD4 \or: 9CD5 \or: 9CD6 \or: 9CD7 \or: 9CD8 \or: 9CD9 \or: 5263 \or: 5253 \or: 52CF \or: 52CE \or: 52D0 \or: 52D1 \or: 52CC \or: 550D \or: 54F4 \or: 5513 \or: 54EF \or: 54F5 \or: 54F9 \or: 5502 \or: 5500 \or: 5518 \or: 54F0 \or: @@ -852,7 +852,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_23:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 57B0 \or: 57B3 \or: 57D6 \or: 5815 \or: 5841 \or: 586E \or: 5870 \or: 58B8 \or: 58B9 \or: 58CC \or: 58D7 \or: 58E5 \or: 58ED \or: 591E \or: 593B \or: 5B36 \or: 5B5E \or: 5B91 \or: 5BC9 \or: 5C02 \or: 5C26 \or: 5C2E \or: 5C32 \or: 5C76 \or: @@ -889,7 +889,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_24:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 81A4 \or: 81D3 \or: 8217 \or: 822E \or: 824D \or: 825D \or: 8260 \or: 827A \or: 82C6 \or: 83B1 \or: 83B5 \or: 83BB \or: 8419 \or: 8420 \or: 8422 \or: 8485 \or: 848A \or: 848B \or: 84D9 \or: 84DC \or: 8536 \or: 85AD \or: 85AE \or: 8612 \or: @@ -926,7 +926,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_25:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6BE9 \or: 6BEA \or: 6BE5 \or: 6D6B \or: 6D73 \or: 6D57 \or: 6D5D \or: 6D56 \or: 6D8F \or: 6D5B \or: 6D1C \or: 6D9A \or: 6D9B \or: 6D99 \or: 6D81 \or: 6D71 \or: 6D72 \or: 6D5C \or: 6D96 \or: 70C4 \or: 70DB \or: 70CC \or: 70D0 \or: 70E3 \or: @@ -963,7 +963,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_26:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3021 \or: 3022 \or: 3023 \or: 3024 \or: 3025 \or: 3026 \or: 3027 \or: 3028 \or: 3029 \or: 5341 \or: 5344 \or: 5345 \or: FF21 \or: FF22 \or: FF23 \or: FF24 \or: FF25 \or: FF26 \or: FF27 \or: FF28 \or: FF29 \or: FF2A \or: FF2B \or: FF2C \or: @@ -1000,7 +1000,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_27:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4E86 \or: 4E8C \or: 4EBA \or: 513F \or: 5165 \or: 516B \or: 51E0 \or: 5200 \or: 5201 \or: 529B \or: 5315 \or: 5341 \or: 535C \or: 53C8 \or: 4E09 \or: 4E0B \or: 4E08 \or: 4E0A \or: 4E2B \or: 4E38 \or: 51E1 \or: 4E45 \or: 4E48 \or: 4E5F \or: @@ -1037,7 +1037,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_28:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 91E0 \or: 9585 \or: 9660 \or: 9659 \or: 9656 \or: 96BD \or: 5042 \or: 5059 \or: 5044 \or: 5066 \or: 5052 \or: 5054 \or: 5071 \or: 5050 \or: 507B \or: 507C \or: 5058 \or: 5079 \or: 506C \or: 5078 \or: 51A8 \or: 51D1 \or: 51CF \or: 5268 \or: @@ -1074,7 +1074,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_29:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7AF9 \or: 7C73 \or: 7CF8 \or: 7F36 \or: 7F8A \or: 7FBD \or: 8001 \or: 8003 \or: 800C \or: 8012 \or: 8033 \or: 807F \or: 8089 \or: 808B \or: 808C \or: 81E3 \or: 81EA \or: 81F3 \or: 81FC \or: 820C \or: 821B \or: 821F \or: 826E \or: 8272 \or: @@ -1111,7 +1111,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_30:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6C90 \or: 6C70 \or: 6C8C \or: 6C68 \or: 6C96 \or: 6C92 \or: 6C7D \or: 6C83 \or: 6C72 \or: 6C7E \or: 6C74 \or: 6C86 \or: 6C76 \or: 6C8D \or: 6C94 \or: 6C98 \or: 6C82 \or: 7076 \or: 707C \or: 707D \or: 7078 \or: 7262 \or: 7261 \or: 7260 \or: @@ -1148,7 +1148,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_31:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 68B6 \or: 6898 \or: 6873 \or: 689A \or: 688E \or: 68B7 \or: 68DB \or: 68A5 \or: 686C \or: 68C1 \or: 6884 \or: 6895 \or: 687A \or: 6899 \or: 68B8 \or: 68B9 \or: 5C46 \or: 5CB7 \or: 5CA1 \or: 5CB8 \or: 5CA9 \or: 5CAB \or: 5CB1 \or: 5CB3 \or: @@ -1185,7 +1185,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_32:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 80A9 \or: 80B4 \or: 80AA \or: 80AF \or: 81E5 \or: 81FE \or: 820D \or: 82B3 \or: 829D \or: 8299 \or: 82AD \or: 82BD \or: 829F \or: 82B9 \or: 82B1 \or: 82AC \or: 82A5 \or: 82AF \or: 82B8 \or: 82A3 \or: 82B0 \or: 82BE \or: 82B7 \or: 864E \or: @@ -1222,7 +1222,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_33:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 67D3 \or: 67F1 \or: 67D4 \or: 67D0 \or: 67EC \or: 67B6 \or: 67AF \or: 67F5 \or: 67E9 \or: 67EF \or: 67C4 \or: 67D1 \or: 67B4 \or: 67DA \or: 67E5 \or: 67B8 \or: 67CF \or: 67DE \or: 67F3 \or: 67B0 \or: 67D9 \or: 67E2 \or: 67DD \or: 67D2 \or: @@ -1259,7 +1259,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_34:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 88A3 \or: 888F \or: 88A5 \or: 88A9 \or: 88A6 \or: 888A \or: 88A0 \or: 8890 \or: 8FED \or: 8FEB \or: 8FE4 \or: 8FE8 \or: 90CA \or: 90CE \or: 90C1 \or: 90C3 \or: 914B \or: 914A \or: 91CD \or: 9582 \or: 9650 \or: 964B \or: 964C \or: 964D \or: @@ -1296,7 +1296,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_35:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6842 \or: 6854 \or: 6829 \or: 68B3 \or: 6817 \or: 684C \or: 6851 \or: 683D \or: 67F4 \or: 6850 \or: 6840 \or: 683C \or: 6843 \or: 682A \or: 6845 \or: 6813 \or: 6818 \or: 6841 \or: 6B8A \or: 6B89 \or: 6BB7 \or: 6C23 \or: 6C27 \or: 6C28 \or: @@ -1333,7 +1333,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_36:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8CA2 \or: 8D77 \or: 8EAC \or: 8ED2 \or: 8ED4 \or: 8ECF \or: 8FB1 \or: 9001 \or: 9006 \or: 8FF7 \or: 9000 \or: 8FFA \or: 8FF4 \or: 9003 \or: 8FFD \or: 9005 \or: 8FF8 \or: 9095 \or: 90E1 \or: 90DD \or: 90E2 \or: 9152 \or: 914D \or: 914C \or: @@ -1370,7 +1370,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_37:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 60C5 \or: 60BB \or: 60B5 \or: 60DC \or: 60BC \or: 60D8 \or: 60D5 \or: 60C6 \or: 60DF \or: 60B8 \or: 60DA \or: 60C7 \or: 621A \or: 621B \or: 6248 \or: 63A0 \or: 63A7 \or: 6372 \or: 6396 \or: 63A2 \or: 63A5 \or: 6377 \or: 6367 \or: 6398 \or: @@ -1407,7 +1407,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_38:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 812F \or: 8116 \or: 8123 \or: 812B \or: 8129 \or: 8130 \or: 8124 \or: 8202 \or: 8235 \or: 8237 \or: 8236 \or: 8239 \or: 838E \or: 839E \or: 8398 \or: 8378 \or: 83A2 \or: 8396 \or: 83BD \or: 83AB \or: 8392 \or: 838A \or: 8393 \or: 8389 \or: @@ -1444,7 +1444,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_39:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 60E0 \or: 611C \or: 6123 \or: 60FA \or: 6115 \or: 60F0 \or: 60FB \or: 60F4 \or: 6168 \or: 60F1 \or: 610E \or: 60F6 \or: 6109 \or: 6100 \or: 6112 \or: 621F \or: 6249 \or: 63A3 \or: 638C \or: 63CF \or: 63C0 \or: 63E9 \or: 63C9 \or: 63C6 \or: @@ -1481,7 +1481,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_40:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7B52 \or: 7B54 \or: 7B4D \or: 7B4B \or: 7B4F \or: 7B51 \or: 7C9F \or: 7CA5 \or: 7D5E \or: 7D50 \or: 7D68 \or: 7D55 \or: 7D2B \or: 7D6E \or: 7D72 \or: 7D61 \or: 7D66 \or: 7D62 \or: 7D70 \or: 7D73 \or: 5584 \or: 7FD4 \or: 7FD5 \or: 800B \or: @@ -1518,7 +1518,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_41:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 585E \or: 5851 \or: 5858 \or: 5857 \or: 585A \or: 5854 \or: 586B \or: 584C \or: 586D \or: 584A \or: 5862 \or: 5852 \or: 584B \or: 5967 \or: 5AC1 \or: 5AC9 \or: 5ACC \or: 5ABE \or: 5ABD \or: 5ABC \or: 5AB3 \or: 5AC2 \or: 5AB2 \or: 5D69 \or: @@ -1555,7 +1555,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_42:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7F69 \or: 7F6A \or: 7F72 \or: 7FA9 \or: 7FA8 \or: 7FA4 \or: 8056 \or: 8058 \or: 8086 \or: 8084 \or: 8171 \or: 8170 \or: 8178 \or: 8165 \or: 816E \or: 8173 \or: 816B \or: 8408 \or: 8400 \or: 8417 \or: 8346 \or: 8414 \or: 83D3 \or: 8405 \or: @@ -1592,7 +1592,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_43:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 50DA \or: 50D5 \or: 50CF \or: 50D1 \or: 50F1 \or: 50CE \or: 50E9 \or: 5162 \or: 51F3 \or: 5283 \or: 5282 \or: 5331 \or: 53AD \or: 55FE \or: 5600 \or: 561B \or: 5617 \or: 55FD \or: 5614 \or: 5606 \or: 5609 \or: 560D \or: 560E \or: 55F7 \or: @@ -1629,7 +1629,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_44:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7DB4 \or: 7DB2 \or: 7DB1 \or: 7DBA \or: 7DA2 \or: 7DBF \or: 7DB5 \or: 7DB8 \or: 7DAD \or: 7DD2 \or: 7DC7 \or: 7DAC \or: 7F70 \or: 7FE0 \or: 7FE1 \or: 7FDF \or: 805E \or: 805A \or: 8087 \or: 8150 \or: 8180 \or: 818F \or: 8188 \or: 818A \or: @@ -1666,7 +1666,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_45:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5F71 \or: 5FB7 \or: 5FB5 \or: 6176 \or: 6167 \or: 616E \or: 615D \or: 6155 \or: 6182 \or: 5BD7 \or: 5BDA \or: 5BDB \or: 5C20 \or: 5D6D \or: 5D66 \or: 5D64 \or: 5D6E \or: 5D60 \or: 5F42 \or: 5F5A \or: 5F6E \or: 6130 \or: 613A \or: 612A \or: @@ -1703,7 +1703,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_46:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8774 \or: 8776 \or: 8760 \or: 8766 \or: 8778 \or: 8768 \or: 8759 \or: 8757 \or: 874C \or: 8753 \or: 885B \or: 885D \or: 8910 \or: 8907 \or: 8912 \or: 8913 \or: 8915 \or: 890A \or: 8ABC \or: 8AD2 \or: 8AC7 \or: 8AC4 \or: 8A95 \or: 8ACB \or: @@ -1740,7 +1740,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_47:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6C05 \or: 6FC2 \or: 6FB1 \or: 6FA1 \or: 6FC3 \or: 6FA4 \or: 6FC1 \or: 6FA7 \or: 6FB3 \or: 6FC0 \or: 6FB9 \or: 6FB6 \or: 6FA6 \or: 6FA0 \or: 6FB4 \or: 71BE \or: 71C9 \or: 71D0 \or: 71D2 \or: 71C8 \or: 71D5 \or: 71B9 \or: 71CE \or: 71D9 \or: @@ -1777,7 +1777,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_48:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5687 \or: 7892 \or: 797E \or: 7983 \or: 7980 \or: 7A0F \or: 7A1D \or: 7AA1 \or: 7AA4 \or: 7AE9 \or: 7AEA \or: 7B62 \or: 7B6B \or: 7B5E \or: 7B79 \or: 7B6F \or: 7B68 \or: 7CAE \or: 7CB0 \or: 7D90 \or: 7D8A \or: 7D8B \or: 7D99 \or: 7D95 \or: @@ -1814,7 +1814,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_49:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8B20 \or: 8B1D \or: 8B04 \or: 8B10 \or: 8C41 \or: 8C3F \or: 8C73 \or: 8CFA \or: 8CFD \or: 8CFC \or: 8CF8 \or: 8CFB \or: 8DA8 \or: 8E49 \or: 8E4B \or: 8E48 \or: 8E4A \or: 8F44 \or: 8F3E \or: 8F42 \or: 8F45 \or: 8F3F \or: 907F \or: 907D \or: @@ -1851,7 +1851,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_50:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 984C \or: 984E \or: 9853 \or: 98BA \or: 993E \or: 993F \or: 993D \or: 992E \or: 99A5 \or: 9A0E \or: 9AC1 \or: 9B03 \or: 9B06 \or: 9B4F \or: 9B4E \or: 9B4D \or: 9BCA \or: 9BC9 \or: 9BFD \or: 9BC8 \or: 9BC0 \or: 9D51 \or: 9D5D \or: 9D60 \or: @@ -1888,7 +1888,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_51:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9CEE \or: 9E81 \or: 9F14 \or: 50D0 \or: 50D9 \or: 50DC \or: 50D8 \or: 50E1 \or: 50EB \or: 50F4 \or: 50E2 \or: 50DE \or: 51F4 \or: 52ED \or: 52EA \or: 5332 \or: 53AE \or: 53B0 \or: 55FB \or: 5603 \or: 560B \or: 5607 \or: 55F8 \or: 5628 \or: @@ -1925,7 +1925,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_52:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5DD6 \or: 6200 \or: 6523 \or: 652B \or: 652A \or: 66EC \or: 6B10 \or: 74DA \or: 7ACA \or: 7C64 \or: 7C63 \or: 7C65 \or: 7E93 \or: 7E96 \or: 7E94 \or: 81E2 \or: 8638 \or: 863F \or: 8831 \or: 8B8A \or: 9090 \or: 908F \or: 9463 \or: 9460 \or: @@ -1962,7 +1962,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_53:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3065 \or: 3066 \or: 3067 \or: 3068 \or: 3069 \or: 306A \or: 306B \or: 306C \or: 306D \or: 306E \or: 306F \or: 3070 \or: 3071 \or: 3072 \or: 3073 \or: 3074 \or: 3075 \or: 3076 \or: 3077 \or: 3078 \or: 3079 \or: 307A \or: 307B \or: 307C \or: @@ -1999,7 +1999,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_54:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7466 \or: 7461 \or: 746B \or: 7468 \or: 7476 \or: 7460 \or: 7474 \or: 7506 \or: 760E \or: 7607 \or: 76B9 \or: 76B7 \or: 76E2 \or: 7774 \or: 7777 \or: 7776 \or: 7775 \or: 7778 \or: 7D65 \or: 7F64 \or: 8020 \or: 8120 \or: 813C \or: 813F \or: @@ -2036,7 +2036,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_55:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5977 \or: 597F \or: 5B56 \or: 5C15 \or: 5C25 \or: 5C7C \or: 5C7A \or: 5C7B \or: 5C7E \or: 5DDF \or: 5E75 \or: 5E84 \or: 5F02 \or: 5F1A \or: 5F74 \or: 5FD5 \or: 5FD4 \or: 5FCF \or: 625C \or: 625E \or: 6264 \or: 6261 \or: 6266 \or: 6262 \or: @@ -2073,7 +2073,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_56:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6C9A \or: 6C6D \or: 6C87 \or: 6C95 \or: 6C9C \or: 6C66 \or: 6C73 \or: 6C65 \or: 6C7B \or: 6C8E \or: 7074 \or: 707A \or: 7263 \or: 72BF \or: 72BD \or: 72C3 \or: 72C6 \or: 72C1 \or: 72BA \or: 72C5 \or: 7395 \or: 7397 \or: 7393 \or: 7394 \or: @@ -2110,7 +2110,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_57:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 95A7 \or: 96A0 \or: 969D \or: 969F \or: 96D0 \or: 96D1 \or: 9759 \or: 9764 \or: 9819 \or: 9814 \or: 6034 \or: 600A \or: 6017 \or: 6033 \or: 601A \or: 601E \or: 602C \or: 6022 \or: 600D \or: 6010 \or: 602E \or: 6013 \or: 6011 \or: 600C \or: @@ -2147,7 +2147,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_58:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 963D \or: 963C \or: 963A \or: 9643 \or: 4FCD \or: 4FC5 \or: 4FD3 \or: 4FB2 \or: 4FC9 \or: 4FCB \or: 4FC1 \or: 4FD4 \or: 4FDC \or: 4FD9 \or: 4FBB \or: 4FB3 \or: 4FDB \or: 4FC7 \or: 4FD6 \or: 4FBA \or: 4FC0 \or: 4FB9 \or: 4FEC \or: 5244 \or: @@ -2184,7 +2184,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_59:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 67E6 \or: 67DB \or: 67FA \or: 67C9 \or: 67CA \or: 67C3 \or: 67EA \or: 67CB \or: 6B28 \or: 6B82 \or: 6B84 \or: 6BB6 \or: 6BD6 \or: 6BD8 \or: 6BE0 \or: 6C20 \or: 6C21 \or: 6D28 \or: 6D34 \or: 6D2D \or: 6D1F \or: 6D3C \or: 6D3F \or: 6D12 \or: @@ -2221,7 +2221,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_60:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 69EA \or: 6A2C \or: 82E4 \or: 82E0 \or: 82FA \or: 82F3 \or: 82ED \or: 8677 \or: 8674 \or: 867C \or: 8673 \or: 8841 \or: 884E \or: 8867 \or: 886A \or: 8869 \or: 89D3 \or: 8A04 \or: 8A07 \or: 8D72 \or: 8FE3 \or: 8FE1 \or: 8FEE \or: 8FE0 \or: @@ -2258,7 +2258,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_61:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6816 \or: 6831 \or: 681C \or: 6835 \or: 682B \or: 682D \or: 682F \or: 684E \or: 6844 \or: 6834 \or: 681D \or: 6812 \or: 6814 \or: 6826 \or: 6828 \or: 682E \or: 684D \or: 683A \or: 6825 \or: 6820 \or: 6B2C \or: 6B2F \or: 6B2D \or: 6B31 \or: @@ -2295,7 +2295,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_62:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7FC2 \or: 7FC0 \or: 8016 \or: 803E \or: 8039 \or: 80FA \or: 80F2 \or: 80F9 \or: 80F5 \or: 8101 \or: 80FB \or: 8100 \or: 8201 \or: 822F \or: 8225 \or: 8333 \or: 832D \or: 8344 \or: 8319 \or: 8351 \or: 8325 \or: 8356 \or: 833F \or: 8341 \or: @@ -2332,7 +2332,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_63:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 552D \or: 553B \or: 5540 \or: 554B \or: 570A \or: 5707 \or: 57FB \or: 5814 \or: 57E2 \or: 57F6 \or: 57DC \or: 57F4 \or: 5800 \or: 57ED \or: 57FD \or: 5808 \or: 57F8 \or: 580B \or: 57F3 \or: 57CF \or: 5807 \or: 57EE \or: 57E3 \or: 57F2 \or: @@ -2369,7 +2369,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_64:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6DF6 \or: 6DD4 \or: 6E00 \or: 6DC8 \or: 6DE0 \or: 6DDF \or: 6DD6 \or: 6DBE \or: 6DE5 \or: 6DDC \or: 6DDD \or: 6DDB \or: 6DF4 \or: 6DCA \or: 6DBD \or: 6DED \or: 6DF0 \or: 6DBA \or: 6DD5 \or: 6DC2 \or: 6DCF \or: 6DC9 \or: 6DD0 \or: 6DF2 \or: @@ -2406,7 +2406,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_65:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 839B \or: 83AA \or: 838B \or: 837E \or: 83A5 \or: 83AF \or: 8388 \or: 8397 \or: 83B0 \or: 837F \or: 83A6 \or: 8387 \or: 83AE \or: 8376 \or: 839A \or: 8659 \or: 8656 \or: 86BF \or: 86B7 \or: 511D \or: 5116 \or: 512B \or: 511E \or: 511B \or: @@ -2443,7 +2443,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_66:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5839 \or: 5838 \or: 582D \or: 582C \or: 583B \or: 5961 \or: 5AAF \or: 5A94 \or: 5A9F \or: 5A7A \or: 5AA2 \or: 5A9E \or: 5A78 \or: 5AA6 \or: 5A7C \or: 5AA5 \or: 5AAC \or: 5A95 \or: 5AAE \or: 5A37 \or: 5A84 \or: 5A8A \or: 5A97 \or: 5A83 \or: @@ -2480,7 +2480,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_67:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6E2B \or: 6E3F \or: 6E41 \or: 6E5D \or: 6E73 \or: 6E1C \or: 6E33 \or: 6E4B \or: 6E40 \or: 6E51 \or: 6E3B \or: 6E03 \or: 6E2E \or: 6E5E \or: 6E68 \or: 6E5C \or: 6E61 \or: 6E31 \or: 6E28 \or: 6E60 \or: 6E71 \or: 6E6B \or: 6E39 \or: 6E22 \or: @@ -2517,7 +2517,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_68:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 83CE \or: 83D6 \or: 83F5 \or: 83C9 \or: 8409 \or: 840F \or: 83DE \or: 8411 \or: 8406 \or: 83C2 \or: 83F3 \or: 855A \or: 854B \or: 853F \or: 878A \or: 878B \or: 87A1 \or: 878E \or: 8799 \or: 885E \or: 885F \or: 8924 \or: 89A7 \or: 8AEA \or: @@ -2554,7 +2554,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_69:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 50AE \or: 50C4 \or: 50CA \or: 50B4 \or: 50C8 \or: 50C2 \or: 50B0 \or: 50C1 \or: 50BA \or: 50B1 \or: 50CB \or: 50C9 \or: 50B6 \or: 50B8 \or: 51D7 \or: 527A \or: 5278 \or: 527B \or: 527C \or: 55C3 \or: 55DB \or: 55CC \or: 55D0 \or: 55CB \or: @@ -2591,7 +2591,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_70:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6B48 \or: 6B41 \or: 6B9B \or: 55C0 \or: 6BFB \or: 6BFC \or: 6BF9 \or: 6BF7 \or: 6BF8 \or: 6E9B \or: 6ED6 \or: 6EC8 \or: 6E8F \or: 6EC0 \or: 6E9F \or: 6E93 \or: 6E94 \or: 6EA0 \or: 6EB1 \or: 6EB9 \or: 6EC6 \or: 6ED2 \or: 6EBD \or: 6EC1 \or: @@ -2628,7 +2628,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_71:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8176 \or: 8167 \or: 816F \or: 66D5 \or: 66D0 \or: 66D1 \or: 66CE \or: 66D7 \or: 6A7D \or: 6A8A \or: 6AA7 \or: 6A99 \or: 6A82 \or: 6A88 \or: 6A86 \or: 6A98 \or: 6A9D \or: 6A8F \or: 6AAA \or: 6B5D \or: 6C0A \or: 6FD7 \or: 6FD6 \or: 6FE5 \or: @@ -2665,7 +2665,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_72:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 926F \or: 9236 \or: 9261 \or: 9270 \or: 9231 \or: 9254 \or: 9263 \or: 9250 \or: 9272 \or: 924E \or: 9253 \or: 924C \or: 9256 \or: 9232 \or: 959F \or: 959C \or: 959E \or: 959B \or: 9692 \or: 9693 \or: 9691 \or: 9697 \or: 96CE \or: 96FA \or: @@ -2702,7 +2702,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_73:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6996 \or: 69B0 \or: 69AC \or: 69BC \or: 6991 \or: 6999 \or: 698E \or: 69A7 \or: 698D \or: 69A9 \or: 69BE \or: 69AF \or: 69BF \or: 69C4 \or: 69BD \or: 69A4 \or: 69D4 \or: 69B9 \or: 69CA \or: 699A \or: 69CF \or: 69B3 \or: 6993 \or: 69AA \or: @@ -2739,7 +2739,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_74:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9D44 \or: 9D35 \or: 9EAF \or: 512F \or: 9F8E \or: 569F \or: 569B \or: 569E \or: 5696 \or: 5694 \or: 56A0 \or: 5B3B \or: 5B3A \or: 5DC1 \or: 5F4D \or: 5F5D \or: 61F3 \or: 64F6 \or: 64E5 \or: 64EA \or: 64E7 \or: 6505 \or: 64F9 \or: 6AAB \or: @@ -2776,7 +2776,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_75:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9781 \or: 977F \or: 97CE \or: 97CD \or: 9816 \or: 98AD \or: 98AE \or: 9902 \or: 9900 \or: 9907 \or: 999D \or: 999C \or: 99C3 \or: 99B9 \or: 99BB \or: 99BA \or: 99C2 \or: 99BD \or: 99C7 \or: 9AB1 \or: 9AE3 \or: 9AE7 \or: 9B3E \or: 9B3F \or: @@ -2813,7 +2813,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_76:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6F82 \or: 6F55 \or: 6F72 \or: 6F52 \or: 6F50 \or: 6F57 \or: 6F94 \or: 6F93 \or: 6F5D \or: 6F00 \or: 6F61 \or: 6F6B \or: 6F7D \or: 6F67 \or: 6F90 \or: 6F53 \or: 6F8B \or: 6F69 \or: 6F7F \or: 6F95 \or: 6F63 \or: 6F77 \or: 6F6A \or: 6F7B \or: @@ -2850,7 +2850,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_77:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9A10 \or: 9B07 \or: 9BD2 \or: 9BC2 \or: 9BBB \or: 9BCC \or: 9BCB \or: 9D4D \or: 9D63 \or: 9D4E \or: 9D50 \or: 9D55 \or: 9D5E \or: 9E90 \or: 9EB2 \or: 9EB1 \or: 9ECA \or: 9F02 \or: 9F27 \or: 9F26 \or: 8756 \or: 8763 \or: 8764 \or: 8777 \or: @@ -2887,7 +2887,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_78:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 99CB \or: 99D7 \or: 99CC \or: 9AB3 \or: 9AEC \or: 9AEB \or: 9AF3 \or: 9AF2 \or: 9AF1 \or: 9B46 \or: 9B43 \or: 9B67 \or: 9B74 \or: 9B71 \or: 9B66 \or: 9B76 \or: 9B75 \or: 9B70 \or: 9B68 \or: 9B64 \or: 9B6C \or: 9CFC \or: 9CFA \or: 9CFD \or: @@ -2924,7 +2924,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_79:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 71CF \or: 71BD \or: 71D8 \or: 71BC \or: 71C6 \or: 71DA \or: 71DB \or: 729D \or: 729E \or: 7369 \or: 7366 \or: 7367 \or: 736C \or: 7365 \or: 736B \or: 736A \or: 747F \or: 749A \or: 74A0 \or: 7494 \or: 7492 \or: 7495 \or: 74A1 \or: 750B \or: @@ -2961,7 +2961,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_80:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5336 \or: 5B42 \or: 5B44 \or: 5B46 \or: 5B7E \or: 5DCA \or: 5DC8 \or: 5DCC \or: 5EF0 \or: 6585 \or: 66E5 \or: 66E7 \or: 8AE2 \or: 8AF2 \or: 8AF4 \or: 8AF5 \or: 8ADD \or: 8B14 \or: 8AE4 \or: 8ADF \or: 8AF0 \or: 8AC8 \or: 8ADE \or: 8AE1 \or: @@ -2998,7 +2998,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_81:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5B7B \or: 5BF1 \or: 5BF2 \or: 5DB7 \or: 5E6C \or: 5E6A \or: 5FBE \or: 5FBB \or: 61C3 \or: 61B5 \or: 61BC \or: 61E7 \or: 61E0 \or: 61E5 \or: 61E4 \or: 61E8 \or: 61DE \or: 64EF \or: 64E9 \or: 64E3 \or: 64EB \or: 64E4 \or: 64E8 \or: 6581 \or: @@ -3035,7 +3035,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_82:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 87AD \or: 87C5 \or: 87B0 \or: 87AC \or: 87B9 \or: 87B5 \or: 87BC \or: 87AE \or: 87C9 \or: 87C3 \or: 87C2 \or: 87CC \or: 87B7 \or: 87AF \or: 87C4 \or: 87CA \or: 87B4 \or: 87B6 \or: 87BF \or: 87B8 \or: 87BD \or: 87DE \or: 87B2 \or: 8935 \or: @@ -3072,7 +3072,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_83:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 862B \or: 862F \or: 8628 \or: 8616 \or: 9D45 \or: 9D42 \or: 9D43 \or: 9D3E \or: 9D37 \or: 9D40 \or: 9D3D \or: 7FF5 \or: 9D2D \or: 9E8A \or: 9E89 \or: 9E8D \or: 9EB0 \or: 9EC8 \or: 9EDA \or: 9EFB \or: 9EFF \or: 9F24 \or: 9F23 \or: 9F22 \or: @@ -3109,7 +3109,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_84:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8B35 \or: 8B47 \or: 8B2F \or: 8B3C \or: 8B3E \or: 8B31 \or: 8B25 \or: 8B37 \or: 8B26 \or: 8B36 \or: 8B2E \or: 8B24 \or: 8B3B \or: 8B3D \or: 8B3A \or: 8C42 \or: 8C75 \or: 8C99 \or: 8C98 \or: 8C97 \or: 8CFE \or: 8D04 \or: 8D02 \or: 8D00 \or: @@ -3146,7 +3146,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_85:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7022 \or: 7023 \or: 7029 \or: 7017 \or: 7024 \or: 701C \or: 702A \or: 720C \or: 720A \or: 7207 \or: 7202 \or: 7205 \or: 72A5 \or: 72A6 \or: 72A4 \or: 72A3 \or: 72A1 \or: 74CB \or: 74C5 \or: 74B7 \or: 74C3 \or: 7516 \or: 7660 \or: 77C9 \or: @@ -3183,7 +3183,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_86:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 97DE \or: 97DF \or: 985C \or: 9859 \or: 985D \or: 9857 \or: 98BF \or: 98BD \or: 98BB \or: 98BE \or: 9948 \or: 9947 \or: 9943 \or: 99A6 \or: 99A7 \or: 9A1A \or: 9A15 \or: 9A25 \or: 9A1D \or: 9A24 \or: 9A1B \or: 9A22 \or: 9A20 \or: 9A27 \or: @@ -3220,7 +3220,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_87:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 940B \or: 9413 \or: 93FB \or: 9420 \or: 940F \or: 9414 \or: 93FE \or: 9415 \or: 9410 \or: 9428 \or: 9419 \or: 940D \or: 93F5 \or: 9400 \or: 93F7 \or: 9407 \or: 940E \or: 9416 \or: 9412 \or: 93FA \or: 9409 \or: 93F8 \or: 940A \or: 93FF \or: @@ -3257,7 +3257,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_88:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9431 \or: 95E5 \or: 95E4 \or: 95E3 \or: 9735 \or: 973A \or: 97BF \or: 97E1 \or: 9864 \or: 98C9 \or: 98C6 \or: 98C0 \or: 9958 \or: 9956 \or: 9A39 \or: 9A3D \or: 9A46 \or: 9A44 \or: 9A42 \or: 9A41 \or: 9A3A \or: 9E1C \or: 7C71 \or: 97CA \or: @@ -3294,7 +3294,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_89:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9C44 \or: 9C39 \or: 9C33 \or: 9C41 \or: 9C3C \or: 9C37 \or: 9C34 \or: 9C32 \or: 9C3D \or: 9C36 \or: 9DDB \or: 9DD2 \or: 9DDE \or: 9DDA \or: 9DCB \or: 9DD0 \or: 9DDC \or: 9DD1 \or: 9DDF \or: 9DE9 \or: 9DD9 \or: 9DD8 \or: 9DD6 \or: 9DF5 \or: @@ -3331,7 +3331,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_90:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 652E \or: 65B8 \or: 6B18 \or: 6B19 \or: 6B17 \or: 6B1A \or: 7062 \or: 7226 \or: 72AA \or: 77D8 \or: 77D9 \or: 7939 \or: 7C69 \or: 7C6B \or: 7CF6 \or: 7E9A \or: 7E98 \or: 7E9B \or: 7E99 \or: 81E0 \or: 81E1 \or: 8646 \or: 8647 \or: 8648 \or: @@ -3368,7 +3368,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_91:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 7F37 \or: 53C0 \or: 546E \or: 5483 \or: 545E \or: 545D \or: 577E \or: 5779 \or: 577A \or: 576C \or: 5787 \or: @@ -3405,7 +3405,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_92:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -3442,7 +3442,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_93:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -3479,7 +3479,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5+_sfd_map_94:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 70C9 \or: 73BA \or: 75C6 \or: 75B7 \or: 768C \or: 768D \or: 7717 \or: 771C \or: 7714 \or: 7B0C \or: 7D23 \or: 7F98 \or: 7F90 \or: 803A \or: 8226 \or: 832E \or: 8355 \or: 831A \or: 833D \or: diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def index e3f1e53a982..0de7603fae4 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def @@ -7,7 +7,7 @@ %% xCJK2uni.dtx (with options: `def,Bg5') %% xCJK2uni-sfd.def (with options: `Bg5') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -26,10 +26,10 @@ %% %% -------------------------------------------------------------------------- %% -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplFile{xCJK2uni-UBig5.def} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \cs_new_nopar:cpn { CJKtu_Bg5_sfd_map:nn } #1 { \cs_if_exist_use:cF @@ -38,7 +38,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_1:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3000 \or: FF0C \or: 3001 \or: 3002 \or: FF0E \or: 2027 \or: FF1B \or: FF1A \or: FF1F \or: FF01 \or: FE30 \or: 2026 \or: 2025 \or: FE50 \or: FE51 \or: FE52 \or: 00B7 \or: FE54 \or: FE55 \or: FE56 \or: FE57 \or: FF5C \or: 2013 \or: FE31 \or: @@ -75,7 +75,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_2:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3023 \or: 3024 \or: 3025 \or: 3026 \or: 3027 \or: 3028 \or: 3029 \or: 5341 \or: 5344 \or: 5345 \or: FF21 \or: FF22 \or: FF23 \or: FF24 \or: FF25 \or: FF26 \or: FF27 \or: FF28 \or: FF29 \or: FF2A \or: FF2B \or: FF2C \or: FF2D \or: FF2E \or: @@ -112,7 +112,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_3:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5915 \or: 5927 \or: 5973 \or: 5B50 \or: 5B51 \or: 5B53 \or: 5BF8 \or: 5C0F \or: 5C22 \or: 5C38 \or: 5C71 \or: 5DDD \or: 5DE5 \or: 5DF1 \or: 5DF2 \or: 5DF3 \or: 5DFE \or: 5E72 \or: 5EFE \or: 5F0B \or: 5F13 \or: 624D \or: 4E11 \or: 4E10 \or: @@ -149,7 +149,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_4:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4F0D \or: 4F10 \or: 4F11 \or: 4F0F \or: 4EF2 \or: 4EF6 \or: 4EFB \or: 4EF0 \or: 4EF3 \or: 4EFD \or: 4F01 \or: 4F0B \or: 5149 \or: 5147 \or: 5146 \or: 5148 \or: 5168 \or: 5171 \or: 518D \or: 51B0 \or: 5217 \or: 5211 \or: 5212 \or: 520E \or: @@ -186,7 +186,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_5:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 59A5 \or: 5B5D \or: 5B5C \or: 5B5A \or: 5B5B \or: 5B8C \or: 5B8B \or: 5B8F \or: 5C2C \or: 5C40 \or: 5C41 \or: 5C3F \or: 5C3E \or: 5C90 \or: 5C91 \or: 5C94 \or: 5C8C \or: 5DEB \or: 5E0C \or: 5E8F \or: 5E87 \or: 5E8A \or: 5EF7 \or: 5F04 \or: @@ -223,7 +223,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_6:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5769 \or: 5761 \or: 5766 \or: 5764 \or: 577C \or: 591C \or: 5949 \or: 5947 \or: 5948 \or: 5944 \or: 5954 \or: 59BE \or: 59BB \or: 59D4 \or: 59B9 \or: 59AE \or: 59D1 \or: 59C6 \or: 59D0 \or: 59CD \or: 59CB \or: 59D3 \or: 59CA \or: 59AF \or: @@ -260,7 +260,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_7:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 82AD \or: 82BD \or: 829F \or: 82B9 \or: 82B1 \or: 82AC \or: 82A5 \or: 82AF \or: 82B8 \or: 82A3 \or: 82B0 \or: 82BE \or: 82B7 \or: 864E \or: 8671 \or: 521D \or: 8868 \or: 8ECB \or: 8FCE \or: 8FD4 \or: 8FD1 \or: 90B5 \or: 90B8 \or: 90B1 \or: @@ -297,7 +297,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_8:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6D3E \or: 6D36 \or: 6D1B \or: 6CF5 \or: 6D39 \or: 6D27 \or: 6D38 \or: 6D29 \or: 6D2E \or: 6D35 \or: 6D0E \or: 6D2B \or: 70AB \or: 70BA \or: 70B3 \or: 70AC \or: 70AF \or: 70AD \or: 70B8 \or: 70AE \or: 70A4 \or: 7230 \or: 7272 \or: 726F \or: @@ -334,7 +334,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_9:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 57C2 \or: 57D4 \or: 57CB \or: 57C3 \or: 5809 \or: 590F \or: 5957 \or: 5958 \or: 595A \or: 5A11 \or: 5A18 \or: 5A1C \or: 5A1F \or: 5A1B \or: 5A13 \or: 59EC \or: 5A20 \or: 5A23 \or: 5A29 \or: 5A25 \or: 5A0C \or: 5A09 \or: 5B6B \or: 5C58 \or: @@ -371,7 +371,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_10:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7F94 \or: 7FC5 \or: 7FC1 \or: 8006 \or: 8018 \or: 8015 \or: 8019 \or: 8017 \or: 803D \or: 803F \or: 80F1 \or: 8102 \or: 80F0 \or: 8105 \or: 80ED \or: 80F4 \or: 8106 \or: 80F8 \or: 80F3 \or: 8108 \or: 80FD \or: 810A \or: 80FC \or: 80EF \or: @@ -408,7 +408,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_11:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5F99 \or: 5F9E \or: 5F98 \or: 5FA1 \or: 5FA0 \or: 5F9C \or: 607F \or: 60A3 \or: 6089 \or: 60A0 \or: 60A8 \or: 60CB \or: 60B4 \or: 60E6 \or: 60BD \or: 60C5 \or: 60BB \or: 60B5 \or: 60DC \or: 60BC \or: 60D8 \or: 60D5 \or: 60C6 \or: 60DF \or: @@ -445,7 +445,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_12:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 83BD \or: 83AB \or: 8392 \or: 838A \or: 8393 \or: 8389 \or: 83A0 \or: 8377 \or: 837B \or: 837C \or: 8386 \or: 83A7 \or: 8655 \or: 5F6A \or: 86C7 \or: 86C0 \or: 86B6 \or: 86C4 \or: 86B5 \or: 86C6 \or: 86CB \or: 86B1 \or: 86AF \or: 86C9 \or: @@ -482,7 +482,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_13:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6691 \or: 667A \or: 667E \or: 6677 \or: 66FE \or: 66FF \or: 671F \or: 671D \or: 68FA \or: 68D5 \or: 68E0 \or: 68D8 \or: 68D7 \or: 6905 \or: 68DF \or: 68F5 \or: 68EE \or: 68E7 \or: 68F9 \or: 68D2 \or: 68F2 \or: 68E3 \or: 68CB \or: 68CD \or: @@ -519,7 +519,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_14:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8DDB \or: 8DC6 \or: 8EFB \or: 8EF8 \or: 8EFC \or: 8F9C \or: 902E \or: 9035 \or: 9031 \or: 9038 \or: 9032 \or: 9036 \or: 9102 \or: 90F5 \or: 9109 \or: 90FE \or: 9163 \or: 9165 \or: 91CF \or: 9214 \or: 9215 \or: 9223 \or: 9209 \or: 921E \or: @@ -556,7 +556,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_15:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 745A \or: 7455 \or: 745F \or: 745E \or: 7441 \or: 743F \or: 7459 \or: 745B \or: 745C \or: 7576 \or: 7578 \or: 7600 \or: 75F0 \or: 7601 \or: 75F2 \or: 75F1 \or: 75FA \or: 75FF \or: 75F4 \or: 75F3 \or: 76DE \or: 76DF \or: 775B \or: 776B \or: @@ -593,7 +593,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_16:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9F13 \or: 9F20 \or: 50E7 \or: 50EE \or: 50E5 \or: 50D6 \or: 50ED \or: 50DA \or: 50D5 \or: 50CF \or: 50D1 \or: 50F1 \or: 50CE \or: 50E9 \or: 5162 \or: 51F3 \or: 5283 \or: 5282 \or: 5331 \or: 53AD \or: 55FE \or: 5600 \or: 561B \or: 5617 \or: @@ -630,7 +630,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_17:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 81E7 \or: 81FA \or: 8207 \or: 8214 \or: 821E \or: 824B \or: 84C9 \or: 84BF \or: 84C6 \or: 84C4 \or: 8499 \or: 849E \or: 84B2 \or: 849C \or: 84CB \or: 84B8 \or: 84C0 \or: 84D3 \or: 8490 \or: 84BC \or: 84D1 \or: 84CA \or: 873F \or: 871C \or: @@ -667,7 +667,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_18:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6A13 \or: 6A0A \or: 69F3 \or: 6A02 \or: 6A05 \or: 69ED \or: 6A11 \or: 6B50 \or: 6B4E \or: 6BA4 \or: 6BC5 \or: 6BC6 \or: 6F3F \or: 6F7C \or: 6F84 \or: 6F51 \or: 6F66 \or: 6F54 \or: 6F86 \or: 6F6D \or: 6F5B \or: 6F78 \or: 6F6E \or: 6F8E \or: @@ -704,7 +704,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_19:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9AEF \or: 9B27 \or: 9B45 \or: 9B44 \or: 9B77 \or: 9B6F \or: 9D06 \or: 9D09 \or: 9D03 \or: 9EA9 \or: 9EBE \or: 9ECE \or: 58A8 \or: 9F52 \or: 5112 \or: 5118 \or: 5114 \or: 5110 \or: 5115 \or: 5180 \or: 51AA \or: 51DD \or: 5291 \or: 5293 \or: @@ -741,7 +741,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_20:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 932B \or: 9304 \or: 931A \or: 9310 \or: 9326 \or: 9321 \or: 9315 \or: 932E \or: 9319 \or: 95BB \or: 96A7 \or: 96A8 \or: 96AA \or: 96D5 \or: 970E \or: 9711 \or: 9716 \or: 970D \or: 9713 \or: 970F \or: 975B \or: 975C \or: 9766 \or: 9798 \or: @@ -778,7 +778,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_21:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8B1D \or: 8B04 \or: 8B10 \or: 8C41 \or: 8C3F \or: 8C73 \or: 8CFA \or: 8CFD \or: 8CFC \or: 8CF8 \or: 8CFB \or: 8DA8 \or: 8E49 \or: 8E4B \or: 8E48 \or: 8E4A \or: 8F44 \or: 8F3E \or: 8F42 \or: 8F45 \or: 8F3F \or: 907F \or: 907D \or: 9084 \or: @@ -815,7 +815,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_22:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5EEC \or: 61F2 \or: 61F7 \or: 61F6 \or: 61F5 \or: 6500 \or: 650F \or: 66E0 \or: 66DD \or: 6AE5 \or: 6ADD \or: 6ADA \or: 6AD3 \or: 701B \or: 701F \or: 7028 \or: 701A \or: 701D \or: 7015 \or: 7018 \or: 7206 \or: 720D \or: 7258 \or: 72A2 \or: @@ -852,7 +852,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_23:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 72A7 \or: 74D6 \or: 74D4 \or: 7669 \or: 77D3 \or: 7C50 \or: 7E8F \or: 7E8C \or: 7FBC \or: 8617 \or: 862D \or: 861A \or: 8823 \or: 8822 \or: 8821 \or: 881F \or: 896A \or: 896C \or: 89BD \or: 8B74 \or: 8B77 \or: 8B7D \or: 8D13 \or: 8E8A \or: @@ -889,7 +889,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_24:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 304D \or: 304E \or: 304F \or: 3050 \or: 3051 \or: 3052 \or: 3053 \or: 3054 \or: 3055 \or: 3056 \or: 3057 \or: 3058 \or: 3059 \or: 305A \or: 305B \or: 305C \or: 305D \or: 305E \or: 305F \or: 3060 \or: 3061 \or: 3062 \or: 3063 \or: 3064 \or: @@ -926,7 +926,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_25:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -963,7 +963,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_26:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5DDF \or: 5E75 \or: 5E84 \or: 5F02 \or: 5F1A \or: 5F74 \or: 5FD5 \or: 5FD4 \or: 5FCF \or: 625C \or: 625E \or: 6264 \or: 6261 \or: 6266 \or: 6262 \or: 6259 \or: 6260 \or: 625A \or: 6265 \or: 65EF \or: 65EE \or: 673E \or: 6739 \or: 6738 \or: @@ -1000,7 +1000,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_27:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8293 \or: 828A \or: 8283 \or: 8284 \or: 8C78 \or: 8FC9 \or: 8FBF \or: 909F \or: 90A1 \or: 90A5 \or: 909E \or: 90A7 \or: 90A0 \or: 9630 \or: 9628 \or: 962F \or: 962D \or: 4E33 \or: 4F98 \or: 4F7C \or: 4F85 \or: 4F7D \or: 4F80 \or: 4F87 \or: @@ -1037,7 +1037,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_28:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6C9D \or: 6C80 \or: 6CDE \or: 6CC0 \or: 6D30 \or: 6CCD \or: 6CC7 \or: 6CB0 \or: 6CF9 \or: 6CCF \or: 6CE9 \or: 6CD1 \or: 7094 \or: 7098 \or: 7085 \or: 7093 \or: 7086 \or: 7084 \or: 7091 \or: 7096 \or: 7082 \or: 709A \or: 7083 \or: 726A \or: @@ -1074,7 +1074,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_29:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 604C \or: 6040 \or: 6042 \or: 605F \or: 6024 \or: 6044 \or: 6058 \or: 6066 \or: 606E \or: 6242 \or: 6243 \or: 62CF \or: 630D \or: 630B \or: 62F5 \or: 630E \or: 6303 \or: 62EB \or: 62F9 \or: 630F \or: 630C \or: 62F8 \or: 62F6 \or: 6300 \or: @@ -1111,7 +1111,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_30:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 82F9 \or: 8307 \or: 82E8 \or: 8300 \or: 82D5 \or: 833A \or: 82EB \or: 82D6 \or: 82F4 \or: 82EC \or: 82E1 \or: 82F2 \or: 82F5 \or: 830C \or: 82FB \or: 82F6 \or: 82F0 \or: 82EA \or: 82E4 \or: 82E0 \or: 82FA \or: 82F3 \or: 82ED \or: 8677 \or: @@ -1148,7 +1148,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_31:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 683A \or: 6825 \or: 6820 \or: 6B2C \or: 6B2F \or: 6B2D \or: 6B31 \or: 6B34 \or: 6B6D \or: 8082 \or: 6B88 \or: 6BE6 \or: 6BE4 \or: 6BE8 \or: 6BE3 \or: 6BE2 \or: 6BE7 \or: 6C25 \or: 6D7A \or: 6D63 \or: 6D64 \or: 6D76 \or: 6D0D \or: 6D61 \or: @@ -1185,7 +1185,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_32:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8652 \or: 86A2 \or: 86A8 \or: 8696 \or: 868D \or: 8691 \or: 869E \or: 8687 \or: 8697 \or: 8686 \or: 868B \or: 869A \or: 8685 \or: 86A5 \or: 8699 \or: 86A1 \or: 86A7 \or: 8695 \or: 8698 \or: 868E \or: 869D \or: 8690 \or: 8694 \or: 8843 \or: @@ -1222,7 +1222,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_33:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 60DD \or: 60C8 \or: 60B1 \or: 60DB \or: 60B7 \or: 60CA \or: 60BF \or: 60C3 \or: 60CD \or: 60C0 \or: 6332 \or: 6365 \or: 638A \or: 6382 \or: 637D \or: 63BD \or: 639E \or: 63AD \or: 639D \or: 6397 \or: 63AB \or: 638E \or: 636F \or: 6387 \or: @@ -1259,7 +1259,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_34:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7CA3 \or: 7D35 \or: 7D3D \or: 7D38 \or: 7D36 \or: 7D3A \or: 7D45 \or: 7D2C \or: 7D29 \or: 7D41 \or: 7D47 \or: 7D3E \or: 7D3F \or: 7D4A \or: 7D3B \or: 7D28 \or: 7F63 \or: 7F95 \or: 7F9C \or: 7F9D \or: 7F9B \or: 7FCA \or: 7FCB \or: 7FCD \or: @@ -1296,7 +1296,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_35:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5848 \or: 5825 \or: 581C \or: 581B \or: 5833 \or: 583F \or: 5836 \or: 582E \or: 5839 \or: 5838 \or: 582D \or: 582C \or: 583B \or: 5961 \or: 5AAF \or: 5A94 \or: 5A9F \or: 5A7A \or: 5AA2 \or: 5A9E \or: 5A78 \or: 5AA6 \or: 5A7C \or: 5AA5 \or: @@ -1333,7 +1333,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_36:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6E53 \or: 6E65 \or: 6E27 \or: 6E78 \or: 6E64 \or: 6E77 \or: 6E55 \or: 6E79 \or: 6E52 \or: 6E66 \or: 6E35 \or: 6E36 \or: 6E5A \or: 7120 \or: 711E \or: 712F \or: 70FB \or: 712E \or: 7131 \or: 7123 \or: 7125 \or: 7122 \or: 7132 \or: 711F \or: @@ -1370,7 +1370,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_37:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8995 \or: 8998 \or: 8997 \or: 89DD \or: 89DA \or: 89DB \or: 8A4E \or: 8A4D \or: 8A39 \or: 8A59 \or: 8A40 \or: 8A57 \or: 8A58 \or: 8A44 \or: 8A45 \or: 8A52 \or: 8A48 \or: 8A51 \or: 8A4A \or: 8A4C \or: 8A4F \or: 8C5F \or: 8C81 \or: 8C80 \or: @@ -1407,7 +1407,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_38:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6223 \or: 6225 \or: 6224 \or: 63C5 \or: 63F1 \or: 63EB \or: 6410 \or: 6412 \or: 6409 \or: 6420 \or: 6424 \or: 6433 \or: 6443 \or: 641F \or: 6415 \or: 6418 \or: 6439 \or: 6437 \or: 6422 \or: 6423 \or: 640C \or: 6426 \or: 6430 \or: 6428 \or: @@ -1444,7 +1444,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_39:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7A19 \or: 7A12 \or: 7A17 \or: 7A15 \or: 7A22 \or: 7A13 \or: 7A1B \or: 7A10 \or: 7AA3 \or: 7AA2 \or: 7A9E \or: 7AEB \or: 7B66 \or: 7B64 \or: 7B6D \or: 7B74 \or: 7B69 \or: 7B72 \or: 7B65 \or: 7B73 \or: 7B71 \or: 7B70 \or: 7B61 \or: 7B78 \or: @@ -1481,7 +1481,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_40:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 926F \or: 9236 \or: 9261 \or: 9270 \or: 9231 \or: 9254 \or: 9263 \or: 9250 \or: 9272 \or: 924E \or: 9253 \or: 924C \or: 9256 \or: 9232 \or: 959F \or: 959C \or: 959E \or: 959B \or: 9692 \or: 9693 \or: 9691 \or: 9697 \or: 96CE \or: 96FA \or: @@ -1518,7 +1518,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_41:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6B4A \or: 6B4D \or: 6B4B \or: 6B9E \or: 6B9F \or: 6BA0 \or: 6BC3 \or: 6BC4 \or: 6BFE \or: 6ECE \or: 6EF5 \or: 6EF1 \or: 6F03 \or: 6F25 \or: 6EF8 \or: 6F37 \or: 6EFB \or: 6F2E \or: 6F09 \or: 6F4E \or: 6F19 \or: 6F1A \or: 6F27 \or: 6F18 \or: @@ -1555,7 +1555,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_42:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 873C \or: 8712 \or: 873A \or: 8731 \or: 8735 \or: 8742 \or: 8726 \or: 8727 \or: 8738 \or: 8724 \or: 871A \or: 8730 \or: 8711 \or: 88F7 \or: 88E7 \or: 88F1 \or: 88F2 \or: 88FA \or: 88FE \or: 88EE \or: 88FC \or: 88F6 \or: 88FB \or: 88F0 \or: @@ -1592,7 +1592,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_43:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6470 \or: 6496 \or: 64A0 \or: 6485 \or: 6497 \or: 649C \or: 648F \or: 648B \or: 648A \or: 648C \or: 64A3 \or: 649F \or: 6468 \or: 64B1 \or: 6498 \or: 6576 \or: 657A \or: 6579 \or: 657B \or: 65B2 \or: 65B3 \or: 66B5 \or: 66B0 \or: 66A9 \or: @@ -1629,7 +1629,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_44:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8509 \or: 850D \or: 851F \or: 850A \or: 8527 \or: 851C \or: 84FB \or: 852B \or: 84FA \or: 8508 \or: 850C \or: 84F4 \or: 852A \or: 84F2 \or: 8515 \or: 84F7 \or: 84EB \or: 84F3 \or: 84FC \or: 8512 \or: 84EA \or: 84E9 \or: 8516 \or: 84FE \or: @@ -1666,7 +1666,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_45:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9AF1 \or: 9B46 \or: 9B43 \or: 9B67 \or: 9B74 \or: 9B71 \or: 9B66 \or: 9B76 \or: 9B75 \or: 9B70 \or: 9B68 \or: 9B64 \or: 9B6C \or: 9CFC \or: 9CFA \or: 9CFD \or: 9CFF \or: 9CF7 \or: 9D07 \or: 9D00 \or: 9CF9 \or: 9CFB \or: 9D08 \or: 9D05 \or: @@ -1703,7 +1703,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_46:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 77A2 \or: 77A3 \or: 7795 \or: 7799 \or: 7797 \or: 78DD \or: 78E9 \or: 78E5 \or: 78EA \or: 78DE \or: 78E3 \or: 78DB \or: 78E1 \or: 78E2 \or: 78ED \or: 78DF \or: 78E0 \or: 79A4 \or: 7A44 \or: 7A48 \or: 7A47 \or: 7AB6 \or: 7AB8 \or: 7AB5 \or: @@ -1740,7 +1740,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_47:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 92FE \or: 9309 \or: 9300 \or: 92FB \or: 9316 \or: 95BC \or: 95CD \or: 95BE \or: 95B9 \or: 95BA \or: 95B6 \or: 95BF \or: 95B5 \or: 95BD \or: 96A9 \or: 96D4 \or: 970B \or: 9712 \or: 9710 \or: 9799 \or: 9797 \or: 9794 \or: 97F0 \or: 97F8 \or: @@ -1777,7 +1777,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_48:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7C03 \or: 7C01 \or: 7BF8 \or: 7BFD \or: 7C06 \or: 7BF0 \or: 7BF1 \or: 7C10 \or: 7C0A \or: 7CE8 \or: 7E2D \or: 7E3C \or: 7E42 \or: 7E33 \or: 9848 \or: 7E38 \or: 7E2A \or: 7E49 \or: 7E40 \or: 7E47 \or: 7E29 \or: 7E4C \or: 7E30 \or: 7E3B \or: @@ -1814,7 +1814,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_49:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9B9A \or: 9BA8 \or: 9B9E \or: 9B9B \or: 9BA6 \or: 9BA1 \or: 9BA5 \or: 9BA4 \or: 9B86 \or: 9BA2 \or: 9BA0 \or: 9BAF \or: 9D33 \or: 9D41 \or: 9D67 \or: 9D36 \or: 9D2E \or: 9D2F \or: 9D31 \or: 9D38 \or: 9D30 \or: 9D45 \or: 9D42 \or: 9D43 \or: @@ -1851,7 +1851,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_50:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8C75 \or: 8C99 \or: 8C98 \or: 8C97 \or: 8CFE \or: 8D04 \or: 8D02 \or: 8D00 \or: 8E5C \or: 8E62 \or: 8E60 \or: 8E57 \or: 8E56 \or: 8E5E \or: 8E65 \or: 8E67 \or: 8E5B \or: 8E5A \or: 8E61 \or: 8E5D \or: 8E69 \or: 8E54 \or: 8F46 \or: 8F47 \or: @@ -1888,7 +1888,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_51:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7E7A \or: 7E72 \or: 7E74 \or: 7E68 \or: 7F4B \or: 7F4A \or: 7F83 \or: 7F86 \or: 7FB7 \or: 7FFD \or: 7FFE \or: 8078 \or: 81D7 \or: 81D5 \or: 8264 \or: 8261 \or: 8263 \or: 85EB \or: 85F1 \or: 85ED \or: 85D9 \or: 85E1 \or: 85E8 \or: 85DA \or: @@ -1925,7 +1925,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_52:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6AEE \or: 6AEF \or: 703C \or: 7035 \or: 702F \or: 7037 \or: 7034 \or: 7031 \or: 7042 \or: 7038 \or: 703F \or: 703A \or: 7039 \or: 7040 \or: 703B \or: 7033 \or: 7041 \or: 7213 \or: 7214 \or: 72A8 \or: 737D \or: 737C \or: 74BA \or: 76AB \or: @@ -1962,7 +1962,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_53:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7517 \or: 766A \or: 77D0 \or: 792D \or: 7931 \or: 792F \or: 7C54 \or: 7C53 \or: 7CF2 \or: 7E8A \or: 7E87 \or: 7E88 \or: 7E8B \or: 7E86 \or: 7E8D \or: 7F4D \or: 7FBB \or: 8030 \or: 81DD \or: 8618 \or: 862A \or: 8626 \or: 861F \or: 8623 \or: @@ -1999,7 +1999,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_54:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9AD0 \or: 9B19 \or: 9B2B \or: 9B3B \or: 9B56 \or: 9B55 \or: 9C46 \or: 9C48 \or: 9C3F \or: 9C44 \or: 9C39 \or: 9C33 \or: 9C41 \or: 9C3C \or: 9C37 \or: 9C34 \or: 9C32 \or: 9C3D \or: 9C36 \or: 9DDB \or: 9DD2 \or: 9DDE \or: 9DDA \or: 9DCB \or: @@ -2036,7 +2036,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_55:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8979 \or: 897A \or: 897C \or: 897B \or: 89FF \or: 8B98 \or: 8B99 \or: 8EA5 \or: 8EA4 \or: 8EA3 \or: 946E \or: 946D \or: 946F \or: 9471 \or: 9473 \or: 9749 \or: 9872 \or: 995F \or: 9C68 \or: 9C6E \or: 9C6D \or: 9E0B \or: 9E0D \or: 9E10 \or: @@ -2073,7 +2073,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_56:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -2110,7 +2110,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_57:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -2147,7 +2147,7 @@ } \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_58:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def index bc4e25f58a2..aa39bcec2ef 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def @@ -7,7 +7,7 @@ %% xCJK2uni.dtx (with options: `def,GB') %% xCJK2uni-sfd.def (with options: `GB') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -26,10 +26,10 @@ %% %% -------------------------------------------------------------------------- %% -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplFile{xCJK2uni-UGB.def} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \cs_new_nopar:cpn { CJKtu_GB_sfd_map:nn } #1 { \cs_if_exist_use:cF @@ -38,7 +38,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_1:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3000 \or: 3001 \or: 3002 \or: 00B7 \or: 02C9 \or: 02C7 \or: 00A8 \or: 3003 \or: 3005 \or: 2014 \or: FF5E \or: 2016 \or: 2026 \or: 2018 \or: 2019 \or: 201C \or: 201D \or: 3014 \or: 3015 \or: 3008 \or: 3009 \or: 300A \or: 300B \or: 300C \or: @@ -75,7 +75,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_2:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FF45 \or: FF46 \or: FF47 \or: FF48 \or: FF49 \or: FF4A \or: FF4B \or: FF4C \or: FF4D \or: FF4E \or: FF4F \or: FF50 \or: FF51 \or: FF52 \or: FF53 \or: FF54 \or: FF55 \or: FF56 \or: FF57 \or: FF58 \or: FF59 \or: FF5A \or: FF5B \or: FF5C \or: @@ -112,7 +112,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_3:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 03BB \or: 03BC \or: 03BD \or: 03BE \or: 03BF \or: 03C0 \or: 03C1 \or: 03C3 \or: 03C4 \or: 03C5 \or: 03C6 \or: 03C7 \or: 03C8 \or: 03C9 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -149,7 +149,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_4:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 250D \or: 250E \or: 250F \or: 2510 \or: 2511 \or: 2512 \or: 2513 \or: 2514 \or: 2515 \or: 2516 \or: 2517 \or: 2518 \or: 2519 \or: 251A \or: 251B \or: 251C \or: 251D \or: 251E \or: 251F \or: 2520 \or: 2521 \or: 2522 \or: 2523 \or: 2524 \or: @@ -186,7 +186,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_5:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -223,7 +223,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_6:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -260,7 +260,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_7:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7EF7 \or: 752D \or: 6CF5 \or: 8E66 \or: 8FF8 \or: 903C \or: 9F3B \or: 6BD4 \or: 9119 \or: 7B14 \or: 5F7C \or: 78A7 \or: 84D6 \or: 853D \or: 6BD5 \or: 6BD9 \or: 6BD6 \or: 5E01 \or: 5E87 \or: 75F9 \or: 95ED \or: 655D \or: 5F0A \or: 5FC5 \or: @@ -297,7 +297,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_8:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 63E3 \or: 5DDD \or: 7A7F \or: 693D \or: 4F20 \or: 8239 \or: 5598 \or: 4E32 \or: 75AE \or: 7A97 \or: 5E62 \or: 5E8A \or: 95EF \or: 521B \or: 5439 \or: 708A \or: 6376 \or: 9524 \or: 5782 \or: 6625 \or: 693F \or: 9187 \or: 5507 \or: 6DF3 \or: @@ -334,7 +334,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_9:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5CE8 \or: 9E45 \or: 4FC4 \or: 989D \or: 8BB9 \or: 5A25 \or: 6076 \or: 5384 \or: 627C \or: 904F \or: 9102 \or: 997F \or: 6069 \or: 800C \or: 513F \or: 8033 \or: 5C14 \or: 9975 \or: 6D31 \or: 4E8C \or: 8D30 \or: 53D1 \or: 7F5A \or: 7B4F \or: @@ -371,7 +371,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_10:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5BE1 \or: 6302 \or: 8902 \or: 4E56 \or: 62D0 \or: 602A \or: 68FA \or: 5173 \or: 5B98 \or: 51A0 \or: 89C2 \or: 7BA1 \or: 9986 \or: 7F50 \or: 60EF \or: 704C \or: 8D2F \or: 5149 \or: 5E7F \or: 901B \or: 7470 \or: 89C4 \or: 572D \or: 7845 \or: @@ -408,7 +408,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_11:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6324 \or: 51E0 \or: 810A \or: 5DF1 \or: 84DF \or: 6280 \or: 5180 \or: 5B63 \or: 4F0E \or: 796D \or: 5242 \or: 60B8 \or: 6D4E \or: 5BC4 \or: 5BC2 \or: 8BA1 \or: 8BB0 \or: 65E2 \or: 5FCC \or: 9645 \or: 5993 \or: 7EE7 \or: 7EAA \or: 5609 \or: @@ -445,7 +445,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_12:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 94A7 \or: 519B \or: 541B \or: 5CFB \or: 4FCA \or: 7AE3 \or: 6D5A \or: 90E1 \or: 9A8F \or: 5580 \or: 5496 \or: 5361 \or: 54AF \or: 5F00 \or: 63E9 \or: 6977 \or: 51EF \or: 6168 \or: 520A \or: 582A \or: 52D8 \or: 574E \or: 780D \or: 770B \or: @@ -482,7 +482,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_13:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 73B2 \or: 83F1 \or: 96F6 \or: 9F84 \or: 94C3 \or: 4F36 \or: 7F9A \or: 51CC \or: 7075 \or: 9675 \or: 5CAD \or: 9886 \or: 53E6 \or: 4EE4 \or: 6E9C \or: 7409 \or: 69B4 \or: 786B \or: 998F \or: 7559 \or: 5218 \or: 7624 \or: 6D41 \or: 67F3 \or: @@ -519,7 +519,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_14:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 90A3 \or: 5A1C \or: 7EB3 \or: 6C16 \or: 4E43 \or: 5976 \or: 8010 \or: 5948 \or: 5357 \or: 7537 \or: 96BE \or: 56CA \or: 6320 \or: 8111 \or: 607C \or: 95F9 \or: 6DD6 \or: 5462 \or: 9981 \or: 5185 \or: 5AE9 \or: 80FD \or: 59AE \or: 9713 \or: @@ -556,7 +556,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_15:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9ED4 \or: 94B1 \or: 94B3 \or: 524D \or: 6F5C \or: 9063 \or: 6D45 \or: 8C34 \or: 5811 \or: 5D4C \or: 6B20 \or: 6B49 \or: 67AA \or: 545B \or: 8154 \or: 7F8C \or: 5899 \or: 8537 \or: 5F3A \or: 62A2 \or: 6A47 \or: 9539 \or: 6572 \or: 6084 \or: @@ -593,7 +593,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_16:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 795E \or: 6C88 \or: 5BA1 \or: 5A76 \or: 751A \or: 80BE \or: 614E \or: 6E17 \or: 58F0 \or: 751F \or: 7525 \or: 7272 \or: 5347 \or: 7EF3 \or: 7701 \or: 76DB \or: 5269 \or: 80DC \or: 5723 \or: 5E08 \or: 5931 \or: 72EE \or: 65BD \or: 6E7F \or: @@ -630,7 +630,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_17:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5957 \or: 7279 \or: 85E4 \or: 817E \or: 75BC \or: 8A8A \or: 68AF \or: 5254 \or: 8E22 \or: 9511 \or: 63D0 \or: 9898 \or: 8E44 \or: 557C \or: 4F53 \or: 66FF \or: 568F \or: 60D5 \or: 6D95 \or: 5243 \or: 5C49 \or: 5929 \or: 6DFB \or: 586B \or: @@ -667,7 +667,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_18:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8F96 \or: 6687 \or: 5CE1 \or: 4FA0 \or: 72ED \or: 4E0B \or: 53A6 \or: 590F \or: 5413 \or: 6380 \or: 9528 \or: 5148 \or: 4ED9 \or: 9C9C \or: 7EA4 \or: 54B8 \or: 8D24 \or: 8854 \or: 8237 \or: 95F2 \or: 6D8E \or: 5F26 \or: 5ACC \or: 663E \or: @@ -704,7 +704,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_19:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9065 \or: 7A91 \or: 8C23 \or: 59DA \or: 54AC \or: 8200 \or: 836F \or: 8981 \or: 8000 \or: 6930 \or: 564E \or: 8036 \or: 7237 \or: 91CE \or: 51B6 \or: 4E5F \or: 9875 \or: 6396 \or: 4E1A \or: 53F6 \or: 66F3 \or: 814B \or: 591C \or: 6DB2 \or: @@ -741,7 +741,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_20:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 65E9 \or: 6FA1 \or: 86A4 \or: 8E81 \or: 566A \or: 9020 \or: 7682 \or: 7076 \or: 71E5 \or: 8D23 \or: 62E9 \or: 5219 \or: 6CFD \or: 8D3C \or: 600E \or: 589E \or: 618E \or: 66FE \or: 8D60 \or: 624E \or: 55B3 \or: 6E23 \or: 672D \or: 8F67 \or: @@ -778,7 +778,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_21:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6DC4 \or: 5B5C \or: 7D2B \or: 4ED4 \or: 7C7D \or: 6ED3 \or: 5B50 \or: 81EA \or: 6E0D \or: 5B57 \or: 9B03 \or: 68D5 \or: 8E2A \or: 5B97 \or: 7EFC \or: 603B \or: 7EB5 \or: 90B9 \or: 8D70 \or: 594F \or: 63CD \or: 79DF \or: 8DB3 \or: 5352 \or: @@ -815,7 +815,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_22:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8BD4 \or: 8BD6 \or: 8BD8 \or: 8BD9 \or: 8BDC \or: 8BDF \or: 8BE0 \or: 8BE4 \or: 8BE8 \or: 8BE9 \or: 8BEE \or: 8BF0 \or: 8BF3 \or: 8BF6 \or: 8BF9 \or: 8BFC \or: 8BFF \or: 8C00 \or: 8C02 \or: 8C04 \or: 8C07 \or: 8C0C \or: 8C0F \or: 8C11 \or: @@ -852,7 +852,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_23:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8340 \or: 8317 \or: 8360 \or: 832D \or: 833A \or: 8333 \or: 8366 \or: 8365 \or: 8368 \or: 831B \or: 8369 \or: 836C \or: 836A \or: 836D \or: 836E \or: 83B0 \or: 8378 \or: 83B3 \or: 83B4 \or: 83A0 \or: 83AA \or: 8393 \or: 839C \or: 8385 \or: @@ -889,7 +889,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_24:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 54BB \or: 54BF \or: 54CC \or: 54D9 \or: 54DA \or: 54DC \or: 54A9 \or: 54AA \or: 54A4 \or: 54DD \or: 54CF \or: 54DE \or: 551B \or: 54E7 \or: 5520 \or: 54FD \or: 5514 \or: 54F3 \or: 5522 \or: 5523 \or: 550F \or: 5511 \or: 5527 \or: 552A \or: @@ -926,7 +926,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_25:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9977 \or: 997D \or: 9980 \or: 9984 \or: 9987 \or: 998A \or: 998D \or: 9990 \or: 9991 \or: 9993 \or: 9994 \or: 9995 \or: 5E80 \or: 5E91 \or: 5E8B \or: 5E96 \or: 5EA5 \or: 5EA0 \or: 5EB9 \or: 5EB5 \or: 5EBE \or: 5EB3 \or: 8D53 \or: 5ED2 \or: @@ -963,7 +963,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_26:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6FE0 \or: 6FEF \or: 701A \or: 7023 \or: 701B \or: 7039 \or: 7035 \or: 704F \or: 705E \or: 5B80 \or: 5B84 \or: 5B95 \or: 5B93 \or: 5BA5 \or: 5BB8 \or: 752F \or: 9A9E \or: 6434 \or: 5BE4 \or: 5BEE \or: 8930 \or: 5BF0 \or: 8E47 \or: 8B07 \or: @@ -1000,7 +1000,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_27:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 73E5 \or: 73D9 \or: 987C \or: 740A \or: 73E9 \or: 73E7 \or: 73DE \or: 73BA \or: 73F2 \or: 740F \or: 742A \or: 745B \or: 7426 \or: 7425 \or: 7428 \or: 7430 \or: 742E \or: 742C \or: 741B \or: 741A \or: 7441 \or: 745C \or: 7457 \or: 7455 \or: @@ -1037,7 +1037,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_28:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 66A7 \or: 669D \or: 66BE \or: 66DB \or: 66DC \or: 66E6 \or: 66E9 \or: 8D32 \or: 8D33 \or: 8D36 \or: 8D3B \or: 8D3D \or: 8D40 \or: 8D45 \or: 8D46 \or: 8D48 \or: 8D49 \or: 8D47 \or: 8D4D \or: 8D55 \or: 8D59 \or: 89C7 \or: 89CA \or: 89CB \or: @@ -1074,7 +1074,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_29:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7809 \or: 7817 \or: 7818 \or: 7811 \or: 65AB \or: 782D \or: 781C \or: 781D \or: 7839 \or: 783A \or: 783B \or: 781F \or: 783C \or: 7825 \or: 782C \or: 7823 \or: 7829 \or: 784E \or: 786D \or: 7856 \or: 7857 \or: 7826 \or: 7850 \or: 7847 \or: @@ -1111,7 +1111,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_30:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7A1E \or: 7A14 \or: 7A39 \or: 7A37 \or: 7A51 \or: 9ECF \or: 99A5 \or: 7A70 \or: 7688 \or: 768E \or: 7693 \or: 7699 \or: 76A4 \or: 74DE \or: 74E0 \or: 752C \or: 9E20 \or: 9E22 \or: 9E28 \or: 9E29 \or: 9E2A \or: 9E2B \or: 9E2C \or: 9E32 \or: @@ -1148,7 +1148,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_31:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 871A \or: 873E \or: 8748 \or: 8734 \or: 8731 \or: 8729 \or: 8737 \or: 873F \or: 8782 \or: 8722 \or: 877D \or: 877E \or: 877B \or: 8760 \or: 8770 \or: 874C \or: 876E \or: 878B \or: 8753 \or: 8763 \or: 877C \or: 8764 \or: 8759 \or: 8765 \or: @@ -1185,7 +1185,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_32:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8DCE \or: 8DCF \or: 8DDB \or: 8DC6 \or: 8DEC \or: 8DF7 \or: 8DF8 \or: 8DE3 \or: 8DF9 \or: 8DFB \or: 8DE4 \or: 8E09 \or: 8DFD \or: 8E14 \or: 8E1D \or: 8E1F \or: 8E2C \or: 8E2E \or: 8E23 \or: 8E2F \or: 8E3A \or: 8E40 \or: 8E39 \or: 8E35 \or: @@ -1222,7 +1222,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_33:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1259,7 +1259,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_34:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1296,7 +1296,7 @@ } \cs_new_nopar:cpn { __CJKtu_GB_sfd_map_35:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def index 6a1fc0a9f03..800f7266aee 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def @@ -7,7 +7,7 @@ %% xCJK2uni.dtx (with options: `def,GBK') %% xCJK2uni-sfd.def (with options: `GBK') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -26,10 +26,10 @@ %% %% -------------------------------------------------------------------------- %% -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplFile{xCJK2uni-UGBK.def} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \cs_new_nopar:cpn { CJKtu_GBK_sfd_map:nn } #1 { \cs_if_exist_use:cF @@ -38,7 +38,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_1:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4E02 \or: 4E04 \or: 4E05 \or: 4E06 \or: 4E0F \or: 4E12 \or: 4E17 \or: 4E1F \or: 4E20 \or: 4E21 \or: 4E23 \or: 4E26 \or: 4E29 \or: 4E2E \or: 4E2F \or: 4E31 \or: 4E33 \or: 4E35 \or: 4E37 \or: 4E3C \or: 4E40 \or: 4E41 \or: 4E42 \or: 4E44 \or: @@ -75,7 +75,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_2:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5011 \or: 5013 \or: 5015 \or: 5016 \or: 5017 \or: 501B \or: 501D \or: 501E \or: 5020 \or: 5022 \or: 5023 \or: 5024 \or: 5027 \or: 502B \or: 502F \or: 5030 \or: 5031 \or: 5032 \or: 5033 \or: 5034 \or: 5035 \or: 5036 \or: 5037 \or: 5038 \or: @@ -112,7 +112,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_3:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5163 \or: 5164 \or: 5166 \or: 5167 \or: 5169 \or: 516A \or: 516F \or: 5172 \or: 517A \or: 517E \or: 517F \or: 5183 \or: 5184 \or: 5186 \or: 5187 \or: 518A \or: 518B \or: 518E \or: 518F \or: 5190 \or: 5191 \or: 5193 \or: 5194 \or: 5198 \or: @@ -149,7 +149,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_4:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 531F \or: 5322 \or: 5324 \or: 5325 \or: 5327 \or: 5328 \or: 5329 \or: 532B \or: 532C \or: 532D \or: 532F \or: 5330 \or: 5331 \or: 5332 \or: 5333 \or: 5334 \or: 5335 \or: 5336 \or: 5337 \or: 5338 \or: 533C \or: 533D \or: 5340 \or: 5342 \or: @@ -186,7 +186,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_5:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 553B \or: 553D \or: 5540 \or: 5542 \or: 5545 \or: 5547 \or: 5548 \or: 554B \or: 554C \or: 554D \or: 554E \or: 554F \or: 5551 \or: 5552 \or: 5553 \or: 5554 \or: 5557 \or: 5558 \or: 5559 \or: 555A \or: 555B \or: 555D \or: 555E \or: 555F \or: @@ -223,7 +223,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_6:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 56C3 \or: 56C4 \or: 56C5 \or: 56C6 \or: 56C7 \or: 56C8 \or: 56C9 \or: 56CB \or: 56CC \or: 56CD \or: 56CE \or: 56CF \or: 56D0 \or: 56D1 \or: 56D2 \or: 56D3 \or: 56D5 \or: 56D6 \or: 56D8 \or: 56D9 \or: 56DC \or: 56E3 \or: 56E5 \or: 56E6 \or: @@ -260,7 +260,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_7:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5852 \or: 5853 \or: 5855 \or: 5856 \or: 5857 \or: 5859 \or: 585A \or: 585B \or: 585C \or: 585D \or: 585F \or: 5860 \or: 5861 \or: 5862 \or: 5863 \or: 5864 \or: 5866 \or: 5867 \or: 5868 \or: 5869 \or: 586A \or: 586D \or: 586E \or: 586F \or: @@ -297,7 +297,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_8:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 59C4 \or: 59C5 \or: 59C7 \or: 59C8 \or: 59C9 \or: 59CC \or: 59CD \or: 59CE \or: 59CF \or: 59D5 \or: 59D6 \or: 59D9 \or: 59DB \or: 59DE \or: 59DF \or: 59E0 \or: 59E1 \or: 59E2 \or: 59E4 \or: 59E6 \or: 59E7 \or: 59E9 \or: 59EA \or: 59EB \or: @@ -334,7 +334,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_9:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5B1A \or: 5B1B \or: 5B1C \or: 5B1D \or: 5B1E \or: 5B1F \or: 5B20 \or: 5B21 \or: 5B22 \or: 5B23 \or: 5B24 \or: 5B25 \or: 5B26 \or: 5B27 \or: 5B28 \or: 5B29 \or: 5B2A \or: 5B2B \or: 5B2C \or: 5B2D \or: 5B2E \or: 5B2F \or: 5B30 \or: 5B31 \or: @@ -371,7 +371,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_10:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5CCF \or: 5CD0 \or: 5CD1 \or: 5CD3 \or: 5CD4 \or: 5CD5 \or: 5CD6 \or: 5CD7 \or: 5CD8 \or: 5CDA \or: 5CDB \or: 5CDC \or: 5CDD \or: 5CDE \or: 5CDF \or: 5CE0 \or: 5CE2 \or: 5CE3 \or: 5CE7 \or: 5CE9 \or: 5CEB \or: 5CEC \or: 5CEE \or: 5CEF \or: @@ -408,7 +408,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_11:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5E25 \or: 5E28 \or: 5E29 \or: 5E2A \or: 5E2B \or: 5E2C \or: 5E2F \or: 5E30 \or: 5E32 \or: 5E33 \or: 5E34 \or: 5E35 \or: 5E36 \or: 5E39 \or: 5E3A \or: 5E3E \or: 5E3F \or: 5E40 \or: 5E41 \or: 5E43 \or: 5E46 \or: 5E47 \or: 5E48 \or: 5E49 \or: @@ -445,7 +445,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_12:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5FC0 \or: 5FC1 \or: 5FC2 \or: 5FC7 \or: 5FC8 \or: 5FCA \or: 5FCB \or: 5FCE \or: 5FD3 \or: 5FD4 \or: 5FD5 \or: 5FDA \or: 5FDB \or: 5FDC \or: 5FDE \or: 5FDF \or: 5FE2 \or: 5FE3 \or: 5FE5 \or: 5FE6 \or: 5FE8 \or: 5FE9 \or: 5FEC \or: 5FEF \or: @@ -482,7 +482,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_13:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6172 \or: 6173 \or: 6174 \or: 6176 \or: 6178 \or: 6179 \or: 617A \or: 617B \or: 617C \or: 617D \or: 617E \or: 617F \or: 6180 \or: 6181 \or: 6182 \or: 6183 \or: 6184 \or: 6185 \or: 6186 \or: 6187 \or: 6188 \or: 6189 \or: 618A \or: 618C \or: @@ -519,7 +519,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_14:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6318 \or: 6319 \or: 631C \or: 6326 \or: 6327 \or: 6329 \or: 632C \or: 632D \or: 632E \or: 6330 \or: 6331 \or: 6333 \or: 6334 \or: 6335 \or: 6336 \or: 6337 \or: 6338 \or: 633B \or: 633C \or: 633E \or: 633F \or: 6340 \or: 6341 \or: 6344 \or: @@ -556,7 +556,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_15:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 64B3 \or: 64B4 \or: 64B6 \or: 64B9 \or: 64BB \or: 64BD \or: 64BE \or: 64BF \or: 64C1 \or: 64C3 \or: 64C4 \or: 64C6 \or: 64C7 \or: 64C8 \or: 64C9 \or: 64CA \or: 64CB \or: 64CC \or: 64CF \or: 64D1 \or: 64D3 \or: 64D4 \or: 64D5 \or: 64D6 \or: @@ -593,7 +593,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_16:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6632 \or: 6633 \or: 6637 \or: 6638 \or: 6639 \or: 663A \or: 663B \or: 663D \or: 663F \or: 6640 \or: 6642 \or: 6644 \or: 6645 \or: 6646 \or: 6647 \or: 6648 \or: 6649 \or: 664A \or: 664D \or: 664E \or: 6650 \or: 6651 \or: 6658 \or: 6659 \or: @@ -630,7 +630,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_17:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 67C5 \or: 67C6 \or: 67C7 \or: 67C8 \or: 67C9 \or: 67CA \or: 67CB \or: 67CC \or: 67CD \or: 67CE \or: 67D5 \or: 67D6 \or: 67D7 \or: 67DB \or: 67DF \or: 67E1 \or: 67E3 \or: 67E4 \or: 67E6 \or: 67E7 \or: 67E8 \or: 67EA \or: 67EB \or: 67ED \or: @@ -667,7 +667,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_18:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6949 \or: 694A \or: 694B \or: 694C \or: 694D \or: 694E \or: 694F \or: 6950 \or: 6951 \or: 6952 \or: 6953 \or: 6955 \or: 6956 \or: 6958 \or: 6959 \or: 695B \or: 695C \or: 695F \or: 6961 \or: 6962 \or: 6964 \or: 6965 \or: 6967 \or: 6968 \or: @@ -704,7 +704,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_19:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6A96 \or: 6A98 \or: 6A99 \or: 6A9A \or: 6A9B \or: 6A9C \or: 6A9D \or: 6A9E \or: 6A9F \or: 6AA1 \or: 6AA2 \or: 6AA3 \or: 6AA4 \or: 6AA5 \or: 6AA6 \or: 6AA7 \or: 6AA8 \or: 6AAA \or: 6AAD \or: 6AAE \or: 6AAF \or: 6AB0 \or: 6AB1 \or: 6AB2 \or: @@ -741,7 +741,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_20:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6BD8 \or: 6BDA \or: 6BDC \or: 6BDD \or: 6BDE \or: 6BDF \or: 6BE0 \or: 6BE2 \or: 6BE3 \or: 6BE4 \or: 6BE5 \or: 6BE6 \or: 6BE7 \or: 6BE8 \or: 6BE9 \or: 6BEC \or: 6BED \or: 6BEE \or: 6BF0 \or: 6BF1 \or: 6BF2 \or: 6BF4 \or: 6BF6 \or: 6BF7 \or: @@ -778,7 +778,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_21:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6DBB \or: 6DBC \or: 6DBD \or: 6DBE \or: 6DC1 \or: 6DC2 \or: 6DC3 \or: 6DC8 \or: 6DC9 \or: 6DCA \or: 6DCD \or: 6DCE \or: 6DCF \or: 6DD0 \or: 6DD2 \or: 6DD3 \or: 6DD4 \or: 6DD5 \or: 6DD7 \or: 6DDA \or: 6DDB \or: 6DDC \or: 6DDF \or: 6DE2 \or: @@ -815,7 +815,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_22:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6F3B \or: 6F3C \or: 6F3D \or: 6F3F \or: 6F40 \or: 6F41 \or: 6F42 \or: 6F43 \or: 6F44 \or: 6F45 \or: 6F48 \or: 6F49 \or: 6F4A \or: 6F4C \or: 6F4E \or: 6F4F \or: 6F50 \or: 6F51 \or: 6F52 \or: 6F53 \or: 6F54 \or: 6F55 \or: 6F56 \or: 6F57 \or: @@ -852,7 +852,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_23:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 706E \or: 7071 \or: 7072 \or: 7073 \or: 7074 \or: 7077 \or: 7079 \or: 707A \or: 707B \or: 707D \or: 7081 \or: 7082 \or: 7083 \or: 7084 \or: 7086 \or: 7087 \or: 7088 \or: 708B \or: 708C \or: 708D \or: 708F \or: 7090 \or: 7091 \or: 7093 \or: @@ -889,7 +889,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_24:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 71D2 \or: 71D3 \or: 71D6 \or: 71D7 \or: 71D8 \or: 71D9 \or: 71DA \or: 71DB \or: 71DC \or: 71DD \or: 71DE \or: 71DF \or: 71E1 \or: 71E2 \or: 71E3 \or: 71E4 \or: 71E6 \or: 71E8 \or: 71E9 \or: 71EA \or: 71EB \or: 71EC \or: 71ED \or: 71EF \or: @@ -926,7 +926,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_25:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -963,7 +963,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_26:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 249A \or: 249B \or: 2474 \or: 2475 \or: 2476 \or: 2477 \or: 2478 \or: 2479 \or: 247A \or: 247B \or: 247C \or: 247D \or: 247E \or: 247F \or: 2480 \or: 2481 \or: 2482 \or: 2483 \or: 2484 \or: 2485 \or: 2486 \or: 2487 \or: 2460 \or: 2461 \or: @@ -1000,7 +1000,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_27:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1037,7 +1037,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_28:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1074,7 +1074,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_29:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 03BB \or: 03BC \or: 03BD \or: 03BE \or: 03BF \or: 03C0 \or: 03C1 \or: 03C3 \or: 03C4 \or: 03C5 \or: 03C6 \or: 03C7 \or: 03C8 \or: 03C9 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FE35 \or: FE36 \or: FE39 \or: @@ -1111,7 +1111,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_30:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 221F \or: 2223 \or: 2252 \or: 2266 \or: 2267 \or: 22BF \or: 2550 \or: 2551 \or: 2552 \or: 2553 \or: 2554 \or: 2555 \or: 2556 \or: 2557 \or: 2558 \or: 2559 \or: 255A \or: 255B \or: 255C \or: 255D \or: 255E \or: 255F \or: 2560 \or: 2561 \or: @@ -1148,7 +1148,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_31:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: E7EF \or: E7F0 \or: E7F1 \or: E7F2 \or: E7F3 \or: 3007 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 2500 \or: 2501 \or: 2502 \or: 2503 \or: 2504 \or: @@ -1185,7 +1185,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_32:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1222,7 +1222,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_33:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7415 \or: 7416 \or: 7417 \or: 7418 \or: 7419 \or: 741C \or: 741D \or: 741E \or: 741F \or: 7420 \or: 7421 \or: 7423 \or: 7424 \or: 7427 \or: 7429 \or: 742B \or: 742D \or: 742F \or: 7431 \or: 7432 \or: 7437 \or: 7438 \or: 7439 \or: 743A \or: @@ -1259,7 +1259,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_34:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 74E9 \or: 74EA \or: 74EB \or: 74EC \or: 74ED \or: 74F0 \or: 74F1 \or: 74F2 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1296,7 +1296,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_35:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1333,7 +1333,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_36:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 766A \or: 766C \or: 766D \or: 766E \or: 7670 \or: 7671 \or: 7672 \or: 7673 \or: 7674 \or: 7675 \or: 7676 \or: 7677 \or: 7679 \or: 767A \or: 767C \or: 767F \or: 7680 \or: 7681 \or: 7683 \or: 7685 \or: 7689 \or: 768A \or: 768C \or: 768D \or: @@ -1370,7 +1370,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_37:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8584 \or: 96F9 \or: 4FDD \or: 5821 \or: 9971 \or: 5B9D \or: 62B1 \or: 62A5 \or: 66B4 \or: 8C79 \or: 9C8D \or: 7206 \or: 676F \or: 7891 \or: 60B2 \or: 5351 \or: 5317 \or: 8F88 \or: 80CC \or: 8D1D \or: 94A1 \or: 500D \or: 72C8 \or: 5907 \or: @@ -1407,7 +1407,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_38:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5C42 \or: 8E6D \or: 63D2 \or: 53C9 \or: 832C \or: 8336 \or: 67E5 \or: 78B4 \or: 643D \or: 5BDF \or: 5C94 \or: 5DEE \or: 8BE7 \or: 62C6 \or: 67F4 \or: 8C7A \or: 6400 \or: 63BA \or: 8749 \or: 998B \or: 8C17 \or: 7F20 \or: 94F2 \or: 4EA7 \or: @@ -1444,7 +1444,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_39:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 78C3 \or: 78C4 \or: 78C6 \or: 78C7 \or: 78C8 \or: 78CC \or: 78CD \or: 78CE \or: 78CF \or: 78D1 \or: 78D2 \or: 78D3 \or: 78D6 \or: 78D7 \or: 78D8 \or: 78DA \or: 78DB \or: 78DC \or: 78DD \or: 78DE \or: 78DF \or: 78E0 \or: 78E1 \or: 78E2 \or: @@ -1481,7 +1481,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_40:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 65E6 \or: 6C2E \or: 4F46 \or: 60EE \or: 6DE1 \or: 8BDE \or: 5F39 \or: 86CB \or: 5F53 \or: 6321 \or: 515A \or: 8361 \or: 6863 \or: 5200 \or: 6363 \or: 8E48 \or: 5012 \or: 5C9B \or: 7977 \or: 5BFC \or: 5230 \or: 7A3B \or: 60BC \or: 9053 \or: @@ -1518,7 +1518,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_41:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5CE8 \or: 9E45 \or: 4FC4 \or: 989D \or: 8BB9 \or: 5A25 \or: 6076 \or: 5384 \or: 627C \or: 904F \or: 9102 \or: 997F \or: 6069 \or: 800C \or: 513F \or: 8033 \or: 5C14 \or: 9975 \or: 6D31 \or: 4E8C \or: 7A1D \or: 7A1F \or: 7A21 \or: 7A22 \or: @@ -1555,7 +1555,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_42:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7ADB \or: 7ADC \or: 7ADD \or: 7AE1 \or: 7AE2 \or: 7AE4 \or: 7AE7 \or: 7AE8 \or: 7AE9 \or: 7AEA \or: 7AEB \or: 7AEC \or: 7AEE \or: 7AF0 \or: 7AF1 \or: 7AF2 \or: 7AF3 \or: 7AF4 \or: 7AF5 \or: 7AF6 \or: 7AF7 \or: 7AF8 \or: 7AFB \or: 7AFC \or: @@ -1592,7 +1592,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_43:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8D21 \or: 5171 \or: 94A9 \or: 52FE \or: 6C9F \or: 82DF \or: 72D7 \or: 57A2 \or: 6784 \or: 8D2D \or: 591F \or: 8F9C \or: 83C7 \or: 5495 \or: 7B8D \or: 4F30 \or: 6CBD \or: 5B64 \or: 59D1 \or: 9F13 \or: 53E4 \or: 86CA \or: 9AA8 \or: 8C37 \or: @@ -1629,7 +1629,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_44:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 540E \or: 547C \or: 4E4E \or: 5FFD \or: 745A \or: 58F6 \or: 846B \or: 80E1 \or: 8774 \or: 72D0 \or: 7CCA \or: 6E56 \or: 7C43 \or: 7C44 \or: 7C45 \or: 7C46 \or: 7C47 \or: 7C48 \or: 7C49 \or: 7C4A \or: 7C4B \or: 7C4C \or: 7C4E \or: 7C4F \or: @@ -1666,7 +1666,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_45:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7D07 \or: 7D08 \or: 7D09 \or: 7D0B \or: 7D0C \or: 7D0D \or: 7D0E \or: 7D0F \or: 7D10 \or: 7D11 \or: 7D12 \or: 7D13 \or: 7D14 \or: 7D15 \or: 7D16 \or: 7D17 \or: 7D18 \or: 7D19 \or: 7D1A \or: 7D1B \or: 7D1C \or: 7D1D \or: 7D1E \or: 7D1F \or: @@ -1703,7 +1703,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_46:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7126 \or: 80F6 \or: 4EA4 \or: 90CA \or: 6D47 \or: 9A84 \or: 5A07 \or: 56BC \or: 6405 \or: 94F0 \or: 77EB \or: 4FA5 \or: 811A \or: 72E1 \or: 89D2 \or: 997A \or: 7F34 \or: 7EDE \or: 527F \or: 6559 \or: 9175 \or: 8F7F \or: 8F83 \or: 53EB \or: @@ -1740,7 +1740,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_47:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 94A7 \or: 519B \or: 541B \or: 5CFB \or: 7DFB \or: 7DFC \or: 7DFD \or: 7DFE \or: 7DFF \or: 7E00 \or: 7E01 \or: 7E02 \or: 7E03 \or: 7E04 \or: 7E05 \or: 7E06 \or: 7E07 \or: 7E08 \or: 7E09 \or: 7E0A \or: 7E0B \or: 7E0C \or: 7E0D \or: 7E0E \or: @@ -1777,7 +1777,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_48:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7E9E \or: 7EAE \or: 7EB4 \or: 7EBB \or: 7EBC \or: 7ED6 \or: 7EE4 \or: 7EEC \or: 7EF9 \or: 7F0A \or: 7F10 \or: 7F1E \or: 7F37 \or: 7F39 \or: 7F3B \or: 7F3C \or: 7F3D \or: 7F3E \or: 7F3F \or: 7F40 \or: 7F41 \or: 7F43 \or: 7F46 \or: 7F47 \or: @@ -1814,7 +1814,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_49:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4EAE \or: 8C05 \or: 64A9 \or: 804A \or: 50DA \or: 7597 \or: 71CE \or: 5BE5 \or: 8FBD \or: 6F66 \or: 4E86 \or: 6482 \or: 9563 \or: 5ED6 \or: 6599 \or: 5217 \or: 88C2 \or: 70C8 \or: 52A3 \or: 730E \or: 7433 \or: 6797 \or: 78F7 \or: 9716 \or: @@ -1851,7 +1851,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_50:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8088 \or: 808A \or: 808D \or: 808E \or: 808F \or: 8090 \or: 8091 \or: 8092 \or: 8094 \or: 8095 \or: 8097 \or: 8099 \or: 809E \or: 80A3 \or: 80A6 \or: 80A7 \or: 80A8 \or: 80AC \or: 80B0 \or: 80B3 \or: 80B5 \or: 80B6 \or: 80B8 \or: 80B9 \or: @@ -1888,7 +1888,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_51:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 81B0 \or: 81B1 \or: 81B2 \or: 81B4 \or: 81B5 \or: 81B6 \or: 81B7 \or: 81B8 \or: 81B9 \or: 81BC \or: 81BD \or: 81BE \or: 81BF \or: 81C4 \or: 81C5 \or: 81C7 \or: 81C8 \or: 81C9 \or: 81CB \or: 81CD \or: 81CE \or: 81CF \or: 81D0 \or: 81D1 \or: @@ -1925,7 +1925,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_52:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6D3E \or: 6500 \or: 6F58 \or: 76D8 \or: 78D0 \or: 76FC \or: 7554 \or: 5224 \or: 53DB \or: 4E53 \or: 5E9E \or: 65C1 \or: 802A \or: 80D6 \or: 629B \or: 5486 \or: 5228 \or: 70AE \or: 888D \or: 8DD1 \or: 6CE1 \or: 5478 \or: 80DA \or: 57F9 \or: @@ -1962,7 +1962,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_53:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8353 \or: 8355 \or: 8356 \or: 8357 \or: 8358 \or: 8359 \or: 835D \or: 8362 \or: 8370 \or: 8371 \or: 8372 \or: 8373 \or: 8374 \or: 8375 \or: 8376 \or: 8379 \or: 837A \or: 837E \or: 837F \or: 8380 \or: 8381 \or: 8382 \or: 8383 \or: 8384 \or: @@ -1999,7 +1999,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_54:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 845F \or: 8460 \or: 8462 \or: 8464 \or: 8465 \or: 8466 \or: 8467 \or: 8468 \or: 846A \or: 846E \or: 846F \or: 8470 \or: 8472 \or: 8474 \or: 8477 \or: 8479 \or: 847B \or: 847C \or: 53D6 \or: 5A36 \or: 9F8B \or: 8DA3 \or: 53BB \or: 5708 \or: @@ -2036,7 +2036,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_55:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 88F3 \or: 68A2 \or: 634E \or: 7A0D \or: 70E7 \or: 828D \or: 52FA \or: 97F6 \or: 5C11 \or: 54E8 \or: 90B5 \or: 7ECD \or: 5962 \or: 8D4A \or: 86C7 \or: 820C \or: 820D \or: 8D66 \or: 6444 \or: 5C04 \or: 6151 \or: 6D89 \or: 793E \or: 8BBE \or: @@ -2073,7 +2073,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_56:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 859A \or: 859D \or: 859E \or: 859F \or: 85A0 \or: 85A1 \or: 85A2 \or: 85A3 \or: 85A5 \or: 85A6 \or: 85A7 \or: 85A9 \or: 85AB \or: 85AC \or: 85AD \or: 85B1 \or: 85B2 \or: 85B3 \or: 85B4 \or: 85B5 \or: 85B6 \or: 85B8 \or: 85BA \or: 85BB \or: @@ -2110,7 +2110,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_57:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8660 \or: 8661 \or: 8663 \or: 8664 \or: 8665 \or: 8666 \or: 8667 \or: 8668 \or: 8669 \or: 866A \or: 736D \or: 631E \or: 8E4B \or: 8E0F \or: 80CE \or: 82D4 \or: 62AC \or: 53F0 \or: 6CF0 \or: 915E \or: 592A \or: 6001 \or: 6C70 \or: 574D \or: @@ -2147,7 +2147,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_58:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 553E \or: 6316 \or: 54C7 \or: 86D9 \or: 6D3C \or: 5A03 \or: 74E6 \or: 889C \or: 6B6A \or: 5916 \or: 8C4C \or: 5F2F \or: 6E7E \or: 73A9 \or: 987D \or: 4E38 \or: 70F7 \or: 5B8C \or: 7897 \or: 633D \or: 665A \or: 7696 \or: 60CB \or: 5B9B \or: @@ -2184,7 +2184,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_59:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 87CE \or: 87CF \or: 87D0 \or: 87D4 \or: 87D5 \or: 87D6 \or: 87D7 \or: 87D8 \or: 87D9 \or: 87DA \or: 87DC \or: 87DD \or: 87DE \or: 87DF \or: 87E1 \or: 87E2 \or: 87E3 \or: 87E4 \or: 87E6 \or: 87E7 \or: 87E8 \or: 87E9 \or: 87EB \or: 87EC \or: @@ -2221,7 +2221,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_60:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 88A9 \or: 88AA \or: 5C0F \or: 5B5D \or: 6821 \or: 8096 \or: 5578 \or: 7B11 \or: 6548 \or: 6954 \or: 4E9B \or: 6B47 \or: 874E \or: 978B \or: 534F \or: 631F \or: 643A \or: 90AA \or: 659C \or: 80C1 \or: 8C10 \or: 5199 \or: 68B0 \or: 5378 \or: @@ -2258,7 +2258,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_61:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 538C \or: 781A \or: 96C1 \or: 5501 \or: 5F66 \or: 7130 \or: 5BB4 \or: 8C1A \or: 9A8C \or: 6B83 \or: 592E \or: 9E2F \or: 79E7 \or: 6768 \or: 626C \or: 4F6F \or: 75A1 \or: 7F8A \or: 6D0B \or: 9633 \or: 6C27 \or: 4EF0 \or: 75D2 \or: 517B \or: @@ -2295,7 +2295,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_62:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 89D7 \or: 89D8 \or: 89D9 \or: 89DB \or: 89DD \or: 89DF \or: 89E0 \or: 89E1 \or: 89E2 \or: 89E4 \or: 89E7 \or: 89E8 \or: 89E9 \or: 89EA \or: 89EC \or: 89ED \or: 89EE \or: 89F0 \or: 89F1 \or: 89F2 \or: 89F4 \or: 89F5 \or: 89F6 \or: 89F7 \or: @@ -2332,7 +2332,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_63:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9E33 \or: 6E0A \or: 51A4 \or: 5143 \or: 57A3 \or: 8881 \or: 539F \or: 63F4 \or: 8F95 \or: 56ED \or: 5458 \or: 5706 \or: 733F \or: 6E90 \or: 7F18 \or: 8FDC \or: 82D1 \or: 613F \or: 6028 \or: 9662 \or: 66F0 \or: 7EA6 \or: 8D8A \or: 8DC3 \or: @@ -2369,7 +2369,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_64:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 81FB \or: 8D1E \or: 9488 \or: 4FA6 \or: 6795 \or: 75B9 \or: 8BCA \or: 9707 \or: 632F \or: 9547 \or: 9635 \or: 84B8 \or: 6323 \or: 7741 \or: 5F81 \or: 72F0 \or: 4E89 \or: 6014 \or: 6574 \or: 62EF \or: 6B63 \or: 653F \or: 8AE4 \or: 8AE5 \or: @@ -2406,7 +2406,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_65:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8B74 \or: 8B75 \or: 8B76 \or: 8B77 \or: 8B78 \or: 8B79 \or: 8B7A \or: 8B7B \or: 8B7C \or: 8B7D \or: 8B7E \or: 8B7F \or: 8B80 \or: 8B81 \or: 8B82 \or: 8B83 \or: 8B84 \or: 8B85 \or: 8B86 \or: 8B87 \or: 8B88 \or: 8B89 \or: 8B8A \or: 8B8B \or: @@ -2443,7 +2443,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_66:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4E3F \or: 5315 \or: 4E47 \or: 592D \or: 723B \or: 536E \or: 6C10 \or: 56DF \or: 80E4 \or: 9997 \or: 6BD3 \or: 777E \or: 9F17 \or: 4E36 \or: 4E9F \or: 9F10 \or: 4E5C \or: 4E69 \or: 4E93 \or: 8288 \or: 5B5B \or: 556C \or: 560F \or: 4EC4 \or: @@ -2480,7 +2480,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_67:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4EB3 \or: 886E \or: 88A4 \or: 4EB5 \or: 8114 \or: 88D2 \or: 7980 \or: 5B34 \or: 8803 \or: 7FB8 \or: 51AB \or: 51B1 \or: 51BD \or: 51BC \or: 8D0E \or: 8D0F \or: 8D10 \or: 8D11 \or: 8D12 \or: 8D13 \or: 8D14 \or: 8D15 \or: 8D16 \or: 8D17 \or: @@ -2517,7 +2517,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_68:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8E2D \or: 8E30 \or: 8E32 \or: 8E33 \or: 8E34 \or: 8E36 \or: 8E37 \or: 8E38 \or: 8E3B \or: 8E3C \or: 8E3E \or: 8E3F \or: 8E43 \or: 8E45 \or: 8E46 \or: 8E4C \or: 8E4D \or: 8E4E \or: 8E4F \or: 8E50 \or: 8E53 \or: 8E54 \or: 8E55 \or: 8E56 \or: @@ -2554,7 +2554,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_69:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 828A \or: 82A8 \or: 8284 \or: 828E \or: 8291 \or: 8297 \or: 8299 \or: 82AB \or: 82B8 \or: 82BE \or: 82B0 \or: 82C8 \or: 82CA \or: 82E3 \or: 8298 \or: 82B7 \or: 82AE \or: 82CB \or: 82CC \or: 82C1 \or: 82A9 \or: 82B4 \or: 82A1 \or: 82AA \or: @@ -2591,7 +2591,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_70:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 750D \or: 8538 \or: 84F0 \or: 8539 \or: 851F \or: 853A \or: 8F45 \or: 8F46 \or: 8F47 \or: 8F48 \or: 8F49 \or: 8F4A \or: 8F4B \or: 8F4C \or: 8F4D \or: 8F4E \or: 8F4F \or: 8F50 \or: 8F51 \or: 8F52 \or: 8F53 \or: 8F54 \or: 8F55 \or: 8F56 \or: @@ -2628,7 +2628,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_71:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 907C \or: 907E \or: 9081 \or: 9084 \or: 9085 \or: 9086 \or: 9087 \or: 9089 \or: 908A \or: 908C \or: 908D \or: 908E \or: 908F \or: 9090 \or: 9092 \or: 9094 \or: 9096 \or: 9098 \or: 909A \or: 909C \or: 909E \or: 909F \or: 90A0 \or: 90A4 \or: @@ -2665,7 +2665,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_72:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 55EB \or: 55EC \or: 55D4 \or: 55E6 \or: 55DD \or: 55C4 \or: 55EF \or: 55E5 \or: 55F2 \or: 55F3 \or: 55CC \or: 55CD \or: 55E8 \or: 55F5 \or: 55E4 \or: 8F94 \or: 561E \or: 5608 \or: 560C \or: 5601 \or: 5624 \or: 5623 \or: 55FE \or: 5600 \or: @@ -2702,7 +2702,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_73:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 91E8 \or: 91E9 \or: 91EA \or: 91EB \or: 91EC \or: 91ED \or: 91EE \or: 91EF \or: 91F0 \or: 91F1 \or: 91F2 \or: 91F3 \or: 91F4 \or: 91F5 \or: 91F6 \or: 91F7 \or: 91F8 \or: 91F9 \or: 91FA \or: 91FB \or: 91FC \or: 91FD \or: 91FE \or: 91FF \or: @@ -2739,7 +2739,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_74:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 928B \or: 928C \or: 928D \or: 928F \or: 9290 \or: 9291 \or: 9292 \or: 9293 \or: 9294 \or: 9295 \or: 9296 \or: 9297 \or: 9298 \or: 9299 \or: 929A \or: 929B \or: 929C \or: 929D \or: 929E \or: 929F \or: 92A0 \or: 92A1 \or: 92A2 \or: 92A3 \or: @@ -2776,7 +2776,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_75:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6DDD \or: 6DD9 \or: 6E16 \or: 6DAB \or: 6E0C \or: 6DAE \or: 6E2B \or: 6E6E \or: 6E4E \or: 6E6B \or: 6EB2 \or: 6E5F \or: 6E86 \or: 6E53 \or: 6E54 \or: 6E32 \or: 6E25 \or: 6E44 \or: 6EDF \or: 6EB1 \or: 6E98 \or: 6EE0 \or: 6F2D \or: 6EE2 \or: @@ -2813,7 +2813,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_76:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9376 \or: 9377 \or: 9378 \or: 9379 \or: 937A \or: 937B \or: 937C \or: 937D \or: 937E \or: 937F \or: 9380 \or: 9381 \or: 9382 \or: 9383 \or: 9384 \or: 9385 \or: 9386 \or: 9387 \or: 9388 \or: 9389 \or: 938A \or: 938B \or: 938C \or: 938D \or: @@ -2850,7 +2850,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_77:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 941B \or: 941C \or: 941D \or: 941E \or: 941F \or: 9420 \or: 9421 \or: 9422 \or: 9423 \or: 9424 \or: 9425 \or: 9426 \or: 9427 \or: 9428 \or: 9429 \or: 942A \or: 942B \or: 942C \or: 942D \or: 942E \or: 7EAD \or: 7EB0 \or: 7EBE \or: 7EC0 \or: @@ -2887,7 +2887,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_78:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 67D8 \or: 680A \or: 67E9 \or: 67B0 \or: 680C \or: 67D9 \or: 67B5 \or: 67DA \or: 67B3 \or: 67DD \or: 6800 \or: 67C3 \or: 67B8 \or: 67E2 \or: 680E \or: 67C1 \or: 67FD \or: 6832 \or: 6833 \or: 6860 \or: 6861 \or: 684E \or: 6862 \or: 6844 \or: @@ -2924,7 +2924,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_79:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 95DE \or: 95DF \or: 95E0 \or: 95E1 \or: 95E2 \or: 95E3 \or: 95E4 \or: 95E5 \or: 95E6 \or: 95E7 \or: 95EC \or: 95FF \or: 9607 \or: 9613 \or: 9618 \or: 961B \or: 961E \or: 9620 \or: 9623 \or: 9624 \or: 9625 \or: 9626 \or: 9627 \or: 9628 \or: @@ -2961,7 +2961,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_80:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9711 \or: 9712 \or: 9714 \or: 9715 \or: 9717 \or: 9718 \or: 9719 \or: 971A \or: 971B \or: 971D \or: 971F \or: 9720 \or: 643F \or: 64D8 \or: 8004 \or: 6BEA \or: 6BF3 \or: 6BFD \or: 6BF5 \or: 6BF9 \or: 6C05 \or: 6C07 \or: 6C06 \or: 6C0D \or: @@ -2998,7 +2998,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_81:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 71B3 \or: 71B5 \or: 71A8 \or: 71A0 \or: 71E0 \or: 71D4 \or: 71E7 \or: 71F9 \or: 721D \or: 7228 \or: 706C \or: 7118 \or: 7166 \or: 71B9 \or: 623E \or: 623D \or: 6243 \or: 6248 \or: 6249 \or: 793B \or: 7940 \or: 7946 \or: 7949 \or: 795B \or: @@ -3035,7 +3035,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_82:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9829 \or: 982A \or: 982B \or: 982C \or: 982D \or: 982E \or: 982F \or: 9830 \or: 9831 \or: 9832 \or: 9833 \or: 9834 \or: 9835 \or: 9836 \or: 9837 \or: 9838 \or: 9839 \or: 983A \or: 983B \or: 983C \or: 983D \or: 983E \or: 983F \or: 9840 \or: @@ -3072,7 +3072,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_83:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9904 \or: 9905 \or: 9906 \or: 9907 \or: 94E9 \or: 94EB \or: 94EE \or: 94EF \or: 94F3 \or: 94F4 \or: 94F5 \or: 94F7 \or: 94F9 \or: 94FC \or: 94FD \or: 94FF \or: 9503 \or: 9502 \or: 9506 \or: 9507 \or: 9509 \or: 950A \or: 950D \or: 950E \or: @@ -3109,7 +3109,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_84:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 75AC \or: 75A3 \or: 75B3 \or: 75B4 \or: 75B8 \or: 75C4 \or: 75B1 \or: 75B0 \or: 75C3 \or: 75C2 \or: 75D6 \or: 75CD \or: 75E3 \or: 75E8 \or: 75E6 \or: 75E4 \or: 75EB \or: 75E7 \or: 7603 \or: 75F1 \or: 75FC \or: 75FF \or: 7610 \or: 7600 \or: @@ -3146,7 +3146,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_85:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9A1C \or: 9A1D \or: 9A1E \or: 9A1F \or: 9A20 \or: 9A21 \or: 9A22 \or: 9A23 \or: 9A24 \or: 9A25 \or: 9A26 \or: 9A27 \or: 9A28 \or: 9A29 \or: 9A2A \or: 9A2B \or: 9A2C \or: 9A2D \or: 9A2E \or: 9A2F \or: 9A30 \or: 9A31 \or: 9A32 \or: 9A33 \or: @@ -3183,7 +3183,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_86:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8797 \or: 8783 \or: 87AB \or: 87E5 \or: 87AC \or: 87B5 \or: 87B3 \or: 87CB \or: 87D3 \or: 87BD \or: 87D1 \or: 87C0 \or: 87CA \or: 87DB \or: 87EA \or: 87E0 \or: 87EE \or: 8816 \or: 8813 \or: 87FE \or: 880A \or: 881B \or: 8821 \or: 8839 \or: @@ -3220,7 +3220,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_87:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7FEE \or: 7FF3 \or: 7CF8 \or: 7D77 \or: 7DA6 \or: 7DAE \or: 7E47 \or: 7E9B \or: 9EB8 \or: 9EB4 \or: 8D73 \or: 8D84 \or: 8D94 \or: 8D91 \or: 8DB1 \or: 8D67 \or: 8D6D \or: 8C47 \or: 8C49 \or: 914A \or: 9150 \or: 914E \or: 914F \or: 9164 \or: @@ -3257,7 +3257,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_88:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9C06 \or: 9C07 \or: 9C08 \or: 9C09 \or: 9C0A \or: 9C0B \or: 9C0C \or: 9C0D \or: 9C0E \or: 9C0F \or: 9C10 \or: 9C11 \or: 9C12 \or: 9C13 \or: 9C14 \or: 9C15 \or: 9C16 \or: 9C17 \or: 9C18 \or: 9C19 \or: 9C1A \or: 9C1B \or: 9C1C \or: 9C1D \or: @@ -3294,7 +3294,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_89:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9CDD \or: 9CDF \or: 9CE2 \or: 977C \or: 9785 \or: 9791 \or: 9792 \or: 9794 \or: 97AF \or: 97AB \or: 97A3 \or: 97B2 \or: 97B4 \or: 9AB1 \or: 9AB0 \or: 9AB7 \or: 9E58 \or: 9AB6 \or: 9ABA \or: 9ABC \or: 9AC1 \or: 9AC0 \or: 9AC5 \or: 9AC2 \or: @@ -3331,7 +3331,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_90:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 9D43 \or: 9D44 \or: 9D45 \or: 9D46 \or: 9D47 \or: 9D48 \or: 9D49 \or: 9D4A \or: @@ -3368,7 +3368,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_91:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9DD5 \or: 9DD6 \or: 9DD7 \or: 9DD8 \or: 9DD9 \or: 9DDA \or: 9DDB \or: 9DDC \or: 9DDD \or: 9DDE \or: 9DDF \or: 9DE0 \or: 9DE1 \or: 9DE2 \or: 9DE3 \or: 9DE4 \or: 9DE5 \or: 9DE6 \or: 9DE7 \or: 9DE8 \or: 9DE9 \or: 9DEA \or: 9DEB \or: 9DEC \or: @@ -3405,7 +3405,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_92:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -3442,7 +3442,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_93:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 9F32 \or: 9F33 \or: 9F34 \or: 9F35 \or: 9F36 \or: 9F38 \or: 9F3A \or: 9F3C \or: 9F3F \or: 9F40 \or: 9F41 \or: 9F42 \or: 9F43 \or: 9F45 \or: 9F46 \or: 9F47 \or: @@ -3479,7 +3479,7 @@ } \cs_new_nopar:cpn { __CJKtu_GBK_sfd_map_94:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: E83F \or: E840 \or: E841 \or: E842 \or: E843 \or: E844 \or: E845 \or: E846 \or: E847 \or: E848 \or: E849 \or: E84A \or: E84B \or: E84C \or: E84D \or: E84E \or: E84F \or: E850 \or: E851 \or: E852 \or: E853 \or: E854 \or: E855 \or: E856 \or: diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def index 9d7ee3585c1..f58bd1ad133 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def @@ -7,7 +7,7 @@ %% xCJK2uni.dtx (with options: `def,JIS') %% xCJK2uni-sfd.def (with options: `JIS') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -26,10 +26,10 @@ %% %% -------------------------------------------------------------------------- %% -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplFile{xCJK2uni-UJIS.def} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \cs_new_nopar:cpn { CJKtu_JIS_sfd_map:nn } #1 { \cs_if_exist_use:cF @@ -38,7 +38,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_1:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3000 \or: 3001 \or: 3002 \or: FF0C \or: FF0E \or: 30FB \or: FF1A \or: FF1B \or: FF1F \or: FF01 \or: 309B \or: 309C \or: 00B4 \or: FF40 \or: 00A8 \or: FF3E \or: FFE3 \or: FF3F \or: 30FD \or: 30FE \or: 309D \or: 309E \or: 3003 \or: 4EDD \or: @@ -75,7 +75,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_2:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FF45 \or: FF46 \or: FF47 \or: FF48 \or: FF49 \or: FF4A \or: FF4B \or: FF4C \or: FF4D \or: FF4E \or: FF4F \or: FF50 \or: FF51 \or: FF52 \or: FF53 \or: FF54 \or: FF55 \or: FF56 \or: FF57 \or: FF58 \or: FF59 \or: FF5A \or: FFFE \or: FFFE \or: @@ -112,7 +112,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_3:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 03BB \or: 03BC \or: 03BD \or: 03BE \or: 03BF \or: 03C0 \or: 03C1 \or: 03C3 \or: 03C4 \or: 03C5 \or: 03C6 \or: 03C7 \or: 03C8 \or: 03C9 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -149,7 +149,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_4:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -186,7 +186,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_5:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -223,7 +223,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_6:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -260,7 +260,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_7:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 834F \or: 990C \or: 53E1 \or: 55B6 \or: 5B30 \or: 5F71 \or: 6620 \or: 66F3 \or: 6804 \or: 6C38 \or: 6CF3 \or: 6D29 \or: 745B \or: 76C8 \or: 7A4E \or: 9834 \or: 82F1 \or: 885B \or: 8A60 \or: 92ED \or: 6DB2 \or: 75AB \or: 76CA \or: 99C5 \or: @@ -297,7 +297,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_8:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 51A0 \or: 5BD2 \or: 520A \or: 52D8 \or: 52E7 \or: 5DFB \or: 559A \or: 582A \or: 59E6 \or: 5B8C \or: 5B98 \or: 5BDB \or: 5E72 \or: 5E79 \or: 60A3 \or: 611F \or: 6163 \or: 61BE \or: 63DB \or: 6562 \or: 67D1 \or: 6853 \or: 68FA \or: 6B3E \or: @@ -334,7 +334,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_9:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 77E9 \or: 82E6 \or: 8EAF \or: 99C6 \or: 99C8 \or: 99D2 \or: 5177 \or: 611A \or: 865E \or: 55B0 \or: 7A7A \or: 5076 \or: 5BD3 \or: 9047 \or: 9685 \or: 4E32 \or: 6ADB \or: 91E7 \or: 5C51 \or: 5C48 \or: 6398 \or: 7A9F \or: 6C93 \or: 9774 \or: @@ -371,7 +371,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_10:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 818F \or: 822A \or: 8352 \or: 884C \or: 8861 \or: 8B1B \or: 8CA2 \or: 8CFC \or: 90CA \or: 9175 \or: 9271 \or: 783F \or: 92FC \or: 95A4 \or: 964D \or: 9805 \or: 9999 \or: 9AD8 \or: 9D3B \or: 525B \or: 52AB \or: 53F7 \or: 5408 \or: 58D5 \or: @@ -408,7 +408,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_11:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 4E03 \or: 53F1 \or: 57F7 \or: 5931 \or: 5AC9 \or: 5BA4 \or: 6089 \or: 6E7F \or: 6F06 \or: 75BE \or: 8CEA \or: 5B9F \or: 8500 \or: 7BE0 \or: 5072 \or: 67F4 \or: 829D \or: 5C61 \or: 854A \or: 7E1E \or: 820E \or: 5199 \or: 5C04 \or: 6368 \or: @@ -445,7 +445,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_12:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9320 \or: 5631 \or: 57F4 \or: 98FE \or: 62ED \or: 690D \or: 6B96 \or: 71ED \or: 7E54 \or: 8077 \or: 8272 \or: 89E6 \or: 98DF \or: 8755 \or: 8FB1 \or: 5C3B \or: 4F38 \or: 4FE1 \or: 4FB5 \or: 5507 \or: 5A20 \or: 5BDD \or: 5BE9 \or: 5FC3 \or: @@ -482,7 +482,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_13:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 65E9 \or: 66F9 \or: 5DE3 \or: 69CD \or: 69FD \or: 6F15 \or: 71E5 \or: 4E89 \or: 75E9 \or: 76F8 \or: 7A93 \or: 7CDF \or: 7DCF \or: 7D9C \or: 8061 \or: 8349 \or: 8358 \or: 846C \or: 84BC \or: 85FB \or: 88C5 \or: 8D70 \or: 9001 \or: 906D \or: @@ -519,7 +519,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_14:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 690E \or: 69CC \or: 8FFD \or: 939A \or: 75DB \or: 901A \or: 585A \or: 6802 \or: 63B4 \or: 69FB \or: 4F43 \or: 6F2C \or: 67D8 \or: 8FBB \or: 8526 \or: 7DB4 \or: 9354 \or: 693F \or: 6F70 \or: 576A \or: 58F7 \or: 5B2C \or: 7D2C \or: 722A \or: @@ -556,7 +556,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_15:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 732B \or: 71B1 \or: 5E74 \or: 5FF5 \or: 637B \or: 649A \or: 71C3 \or: 7C98 \or: 4E43 \or: 5EFC \or: 4E4B \or: 57DC \or: 56A2 \or: 60A9 \or: 6FC3 \or: 7D0D \or: 80FD \or: 8133 \or: 81BF \or: 8FB2 \or: 8997 \or: 86A4 \or: 5DF4 \or: 628A \or: @@ -593,7 +593,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_16:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 821E \or: 8461 \or: 856A \or: 90E8 \or: 5C01 \or: 6953 \or: 98A8 \or: 847A \or: 8557 \or: 4F0F \or: 526F \or: 5FA9 \or: 5E45 \or: 670D \or: 798F \or: 8179 \or: 8907 \or: 8986 \or: 6DF5 \or: 5F17 \or: 6255 \or: 6CB8 \or: 4ECF \or: 7269 \or: @@ -630,7 +630,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_17:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8017 \or: 8499 \or: 5132 \or: 6728 \or: 9ED9 \or: 76EE \or: 6762 \or: 52FF \or: 9905 \or: 5C24 \or: 623B \or: 7C7E \or: 8CB0 \or: 554F \or: 60B6 \or: 7D0B \or: 9580 \or: 5301 \or: 4E5F \or: 51B6 \or: 591C \or: 723A \or: 8036 \or: 91CE \or: @@ -667,7 +667,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_18:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7984 \or: 808B \or: 9332 \or: 8AD6 \or: 502D \or: 548C \or: 8A71 \or: 6B6A \or: 8CC4 \or: 8107 \or: 60D1 \or: 67A0 \or: 9DF2 \or: 4E99 \or: 4E98 \or: 9C10 \or: 8A6B \or: 85C1 \or: 8568 \or: 6900 \or: 6E7E \or: 7897 \or: 8155 \or: FFFE \or: @@ -704,7 +704,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_19:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 52AD \or: 52BC \or: 52B5 \or: 52C1 \or: 52CD \or: 52D7 \or: 52DE \or: 52E3 \or: 52E6 \or: 98ED \or: 52E0 \or: 52F3 \or: 52F5 \or: 52F8 \or: 52F9 \or: 5306 \or: 5308 \or: 7538 \or: 530D \or: 5310 \or: 530F \or: 5315 \or: 531A \or: 5323 \or: @@ -741,7 +741,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_20:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 58FC \or: 58FD \or: 5902 \or: 590A \or: 5910 \or: 591B \or: 68A6 \or: 5925 \or: 592C \or: 592D \or: 5932 \or: 5938 \or: 593E \or: 7AD2 \or: 5955 \or: 5950 \or: 594E \or: 595A \or: 5958 \or: 5962 \or: 5960 \or: 5967 \or: 596C \or: 5969 \or: @@ -778,7 +778,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_21:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5F91 \or: 5F87 \or: 5F9E \or: 5F99 \or: 5F98 \or: 5FA0 \or: 5FA8 \or: 5FAD \or: 5FBC \or: 5FD6 \or: 5FFB \or: 5FE4 \or: 5FF8 \or: 5FF1 \or: 5FDD \or: 60B3 \or: 5FFF \or: 6021 \or: 6060 \or: 6019 \or: 6010 \or: 6029 \or: 600E \or: 6031 \or: @@ -815,7 +815,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_22:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 64F2 \or: 64FA \or: 6500 \or: 64FD \or: 6518 \or: 651C \or: 6505 \or: 6524 \or: 6523 \or: 652B \or: 6534 \or: 6535 \or: 6537 \or: 6536 \or: 6538 \or: 754B \or: 6548 \or: 6556 \or: 6555 \or: 654D \or: 6558 \or: 655E \or: 655D \or: 6572 \or: @@ -852,7 +852,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_23:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6A38 \or: 6A22 \or: 6A90 \or: 6A8D \or: 6AA0 \or: 6A84 \or: 6AA2 \or: 6AA3 \or: 6A97 \or: 8617 \or: 6ABB \or: 6AC3 \or: 6AC2 \or: 6AB8 \or: 6AB3 \or: 6AAC \or: 6ADE \or: 6AD1 \or: 6ADF \or: 6AAA \or: 6ADA \or: 6AEA \or: 6AFB \or: 6B05 \or: @@ -889,7 +889,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_24:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 70DF \or: 70CB \or: 70DD \or: 70D9 \or: 7109 \or: 70FD \or: 711C \or: 7119 \or: 7165 \or: 7155 \or: 7188 \or: 7166 \or: 7162 \or: 714C \or: 7156 \or: 716C \or: 718F \or: 71FB \or: 7184 \or: 7195 \or: 71A8 \or: 71AC \or: 71D7 \or: 71B9 \or: @@ -926,7 +926,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_25:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 771E \or: 7725 \or: 7726 \or: 771B \or: 7737 \or: 7738 \or: 7747 \or: 775A \or: 7768 \or: 776B \or: 775B \or: 7765 \or: 777F \or: 777E \or: 7779 \or: 778E \or: 778B \or: 7791 \or: 77A0 \or: 779E \or: 77B0 \or: 77B6 \or: 77B9 \or: 77BF \or: @@ -963,7 +963,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_26:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7D3F \or: 7D35 \or: 7D46 \or: 7D73 \or: 7D56 \or: 7D4E \or: 7D72 \or: 7D68 \or: 7D6E \or: 7D4F \or: 7D63 \or: 7D93 \or: 7D89 \or: 7D5B \or: 7D8F \or: 7D7D \or: 7D9B \or: 7DBA \or: 7DAE \or: 7DA3 \or: 7DB5 \or: 7DC7 \or: 7DBD \or: 7DAB \or: @@ -1000,7 +1000,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_27:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 82BB \or: 82AC \or: 82E1 \or: 82E3 \or: 82DF \or: 82D2 \or: 82F4 \or: 82F3 \or: 82FA \or: 8393 \or: 8303 \or: 82FB \or: 82F9 \or: 82DE \or: 8306 \or: 82DC \or: 8309 \or: 82D9 \or: 8335 \or: 8334 \or: 8316 \or: 8332 \or: 8331 \or: 8340 \or: @@ -1037,7 +1037,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_28:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 887D \or: 88B5 \or: 8872 \or: 8882 \or: 8897 \or: 8892 \or: 88AE \or: 8899 \or: 88A2 \or: 888D \or: 88A4 \or: 88B0 \or: 88BF \or: 88B1 \or: 88C3 \or: 88C4 \or: 88D4 \or: 88D8 \or: 88D9 \or: 88DD \or: 88F9 \or: 8902 \or: 88FC \or: 88F4 \or: @@ -1074,7 +1074,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_29:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8EAA \or: 8EA1 \or: 8EAC \or: 8EB0 \or: 8EC6 \or: 8EB1 \or: 8EBE \or: 8EC5 \or: 8EC8 \or: 8ECB \or: 8EDB \or: 8EE3 \or: 8EFC \or: 8EFB \or: 8EEB \or: 8EFE \or: 8F0A \or: 8F05 \or: 8F15 \or: 8F12 \or: 8F19 \or: 8F13 \or: 8F1C \or: 8F1F \or: @@ -1111,7 +1111,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_30:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 965C \or: 965E \or: 965D \or: 965F \or: 9666 \or: 9672 \or: 966C \or: 968D \or: 9698 \or: 9695 \or: 9697 \or: 96AA \or: 96A7 \or: 96B1 \or: 96B2 \or: 96B0 \or: 96B4 \or: 96B6 \or: 96B8 \or: 96B9 \or: 96CE \or: 96CB \or: 96C9 \or: 96CD \or: @@ -1148,7 +1148,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_31:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9C46 \or: 9C3E \or: 9C5A \or: 9C60 \or: 9C67 \or: 9C76 \or: 9C78 \or: 9CE7 \or: 9CEC \or: 9CF0 \or: 9D09 \or: 9D08 \or: 9CEB \or: 9D03 \or: 9D06 \or: 9D2A \or: 9D26 \or: 9DAF \or: 9D23 \or: 9D1F \or: 9D44 \or: 9D15 \or: 9D12 \or: 9D41 \or: @@ -1185,7 +1185,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_32:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1222,7 +1222,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_33:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1259,7 +1259,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_34:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -1296,7 +1296,7 @@ } \cs_new_nopar:cpn { __CJKtu_JIS_sfd_map_35:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def index 839c7d39bbf..754efb6f533 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def @@ -7,7 +7,7 @@ %% xCJK2uni.dtx (with options: `def,KS') %% xCJK2uni-sfd.def (with options: `KS') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -26,10 +26,10 @@ %% %% -------------------------------------------------------------------------- %% -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplFile{xCJK2uni-UKS.def} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \cs_new_nopar:cpn { CJKtu_KS_sfd_map:nn } #1 { \cs_if_exist_use:cF @@ -38,7 +38,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_1:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3000 \or: 3001 \or: 3002 \or: 00B7 \or: 2025 \or: 2026 \or: 00A8 \or: 3003 \or: 00AD \or: 2015 \or: 2225 \or: FF3C \or: 223C \or: 2018 \or: 2019 \or: 201C \or: 201D \or: 3014 \or: 3015 \or: 3008 \or: 3009 \or: 300A \or: 300B \or: 300C \or: @@ -75,7 +75,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_2:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FF45 \or: FF46 \or: FF47 \or: FF48 \or: FF49 \or: FF4A \or: FF4B \or: FF4C \or: FF4D \or: FF4E \or: FF4F \or: FF50 \or: FF51 \or: FF52 \or: FF53 \or: FF54 \or: FF55 \or: FF56 \or: FF57 \or: FF58 \or: FF59 \or: FF5A \or: FF5B \or: FF5C \or: @@ -112,7 +112,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_3:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 2521 \or: 2522 \or: 2526 \or: 2527 \or: 2529 \or: 252A \or: 252D \or: 252E \or: 2531 \or: 2532 \or: 2535 \or: 2536 \or: 2539 \or: 253A \or: 253D \or: 253E \or: 2540 \or: 2541 \or: 2543 \or: 2544 \or: 2545 \or: 2546 \or: 2547 \or: 2548 \or: @@ -149,7 +149,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_4:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 3200 \or: 3201 \or: 3202 \or: 3203 \or: 3204 \or: 3205 \or: 3206 \or: 3207 \or: 3208 \or: 3209 \or: 320A \or: 320B \or: 320C \or: 320D \or: 320E \or: 320F \or: 3210 \or: 3211 \or: 3212 \or: 3213 \or: 3214 \or: 3215 \or: 3216 \or: 3217 \or: @@ -186,7 +186,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_5:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 30F5 \or: 30F6 \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 0410 \or: 0411 \or: 0412 \or: 0413 \or: 0414 \or: 0415 \or: 0401 \or: 0416 \or: 0417 \or: 0418 \or: 0419 \or: 041A \or: 041B \or: 041C \or: @@ -223,7 +223,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_6:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: @@ -260,7 +260,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_7:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: AD7D \or: AD7F \or: AD81 \or: AD82 \or: AD88 \or: AD89 \or: AD8C \or: AD90 \or: AD9C \or: AD9D \or: ADA4 \or: ADB7 \or: ADC0 \or: ADC1 \or: ADC4 \or: ADC8 \or: ADD0 \or: ADD1 \or: ADD3 \or: ADDC \or: ADE0 \or: ADE4 \or: ADF8 \or: ADF9 \or: @@ -297,7 +297,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_8:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: B1FB \or: B1FD \or: B204 \or: B205 \or: B208 \or: B20B \or: B20C \or: B214 \or: B215 \or: B217 \or: B219 \or: B220 \or: B234 \or: B23C \or: B258 \or: B25C \or: B260 \or: B268 \or: B269 \or: B274 \or: B275 \or: B27C \or: B284 \or: B285 \or: @@ -334,7 +334,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_9:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: B755 \or: B760 \or: B764 \or: B768 \or: B770 \or: B771 \or: B773 \or: B775 \or: B77C \or: B77D \or: B780 \or: B784 \or: B78C \or: B78D \or: B78F \or: B790 \or: B791 \or: B792 \or: B796 \or: B797 \or: B798 \or: B799 \or: B79C \or: B7A0 \or: @@ -371,7 +371,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_10:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: BC02 \or: BC08 \or: BC09 \or: BC0B \or: BC0C \or: BC0D \or: BC0F \or: BC11 \or: BC14 \or: BC15 \or: BC16 \or: BC17 \or: BC18 \or: BC1B \or: BC1C \or: BC1D \or: BC1E \or: BC1F \or: BC24 \or: BC25 \or: BC27 \or: BC29 \or: BC2D \or: BC30 \or: @@ -408,7 +408,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_11:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: C12D \or: C12F \or: C130 \or: C131 \or: C136 \or: C138 \or: C139 \or: C13C \or: C140 \or: C148 \or: C149 \or: C14B \or: C14C \or: C14D \or: C154 \or: C155 \or: C158 \or: C15C \or: C164 \or: C165 \or: C167 \or: C168 \or: C169 \or: C170 \or: @@ -445,7 +445,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_12:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: C5C9 \or: C5CA \or: C5CC \or: C5CE \or: C5D0 \or: C5D1 \or: C5D4 \or: C5D8 \or: C5E0 \or: C5E1 \or: C5E3 \or: C5E5 \or: C5EC \or: C5ED \or: C5EE \or: C5F0 \or: C5F4 \or: C5F6 \or: C5F7 \or: C5FC \or: C5FD \or: C5FE \or: C5FF \or: C600 \or: @@ -482,7 +482,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_13:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: C92C \or: C934 \or: C950 \or: C951 \or: C954 \or: C958 \or: C960 \or: C961 \or: C963 \or: C96C \or: C970 \or: C974 \or: C97C \or: C988 \or: C989 \or: C98C \or: C990 \or: C998 \or: C999 \or: C99B \or: C99D \or: C9C0 \or: C9C1 \or: C9C4 \or: @@ -519,7 +519,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_14:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: CEF8 \or: CEF9 \or: CF00 \or: CF01 \or: CF04 \or: CF08 \or: CF10 \or: CF11 \or: CF13 \or: CF15 \or: CF1C \or: CF20 \or: CF24 \or: CF2C \or: CF2D \or: CF2F \or: CF30 \or: CF31 \or: CF38 \or: CF54 \or: CF55 \or: CF58 \or: CF5C \or: CF64 \or: @@ -556,7 +556,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_15:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: D47F \or: D480 \or: D482 \or: D488 \or: D489 \or: D48B \or: D48D \or: D494 \or: D4A9 \or: D4CC \or: D4D0 \or: D4D4 \or: D4DC \or: D4DF \or: D4E8 \or: D4EC \or: D4F0 \or: D4F8 \or: D4FB \or: D4FD \or: D504 \or: D508 \or: D50C \or: D514 \or: @@ -593,7 +593,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_16:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: 4F3D \or: 4F73 \or: 5047 \or: 50F9 \or: 52A0 \or: 53EF \or: 5475 \or: 54E5 \or: 5609 \or: 5AC1 \or: @@ -630,7 +630,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_17:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 656C \or: 666F \or: 66BB \or: 66F4 \or: 6897 \or: 6D87 \or: 7085 \or: 70F1 \or: 749F \or: 74A5 \or: 74CA \or: 75D9 \or: 786C \or: 78EC \or: 7ADF \or: 7AF6 \or: 7D45 \or: 7D93 \or: 8015 \or: 803F \or: 811B \or: 8396 \or: 8B66 \or: 8F15 \or: @@ -667,7 +667,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_18:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7D7F \or: 8009 \or: 81FC \or: 8205 \or: 820A \or: 82DF \or: 8862 \or: 8B33 \or: 8CFC \or: 8EC0 \or: 9011 \or: 90B1 \or: 9264 \or: 92B6 \or: 99D2 \or: 9A45 \or: 9CE9 \or: 9DD7 \or: 9F9C \or: 570B \or: 5C40 \or: 83CA \or: 97A0 \or: 97AB \or: @@ -704,7 +704,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_19:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: F927 \or: 8872 \or: 56CA \or: 5A18 \or: F928 \or: F929 \or: F92A \or: F92B \or: F92C \or: 4E43 \or: F92D \or: 5167 \or: 5948 \or: 67F0 \or: 8010 \or: F92E \or: 5973 \or: 5E74 \or: 649A \or: 79CA \or: 5FF5 \or: 606C \or: 62C8 \or: 637B \or: @@ -741,7 +741,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_20:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8C46 \or: 9017 \or: 982D \or: 5C6F \or: 81C0 \or: 829A \or: 9041 \or: 906F \or: 920D \or: 5F97 \or: 5D9D \or: 6A59 \or: 71C8 \or: 767B \or: 7B49 \or: 85E4 \or: 8B04 \or: 9127 \or: 9A30 \or: 5587 \or: 61F6 \or: F95B \or: 7669 \or: 7F85 \or: @@ -778,7 +778,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_21:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 52D2 \or: 808B \or: 51DC \or: 51CC \or: 695E \or: 7A1C \or: 7DBE \or: 83F1 \or: 9675 \or: 4FDA \or: 5229 \or: 5398 \or: 540F \or: 550E \or: 5C65 \or: 60A7 \or: 674E \or: 68A8 \or: 6D6C \or: 7281 \or: 72F8 \or: 7406 \or: 7483 \or: F962 \or: @@ -815,7 +815,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_22:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 6963 \or: 6E3C \or: 6E44 \or: 7709 \or: 7C73 \or: 7F8E \or: 8587 \or: 8B0E \or: 8FF7 \or: 9761 \or: 9EF4 \or: 5CB7 \or: 60B6 \or: 610D \or: 61AB \or: 654F \or: 65FB \or: 65FC \or: 6C11 \or: 6CEF \or: 739F \or: 73C9 \or: 7DE1 \or: 9594 \or: @@ -852,7 +852,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_23:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5085 \or: 5256 \or: 526F \or: 5426 \or: 5490 \or: 57E0 \or: 592B \or: 5A66 \or: 5B5A \or: 5B75 \or: 5BCC \or: 5E9C \or: F966 \or: 6276 \or: 6577 \or: 65A7 \or: 6D6E \or: 6EA5 \or: 7236 \or: 7B26 \or: 7C3F \or: 7F36 \or: 8150 \or: 8151 \or: @@ -889,7 +889,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_24:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 585E \or: 74BD \or: 8CFD \or: 55C7 \or: F96C \or: 7A61 \or: 7D22 \or: 8272 \or: 7272 \or: 751F \or: 7525 \or: F96D \or: 7B19 \or: 5885 \or: 58FB \or: 5DBC \or: 5E8F \or: 5EB6 \or: 5F90 \or: 6055 \or: 6292 \or: 637F \or: 654D \or: 6691 \or: @@ -926,7 +926,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_25:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8F38 \or: 9042 \or: 9083 \or: 916C \or: 9296 \or: 92B9 \or: 968B \or: 96A7 \or: 96A8 \or: 96D6 \or: 9700 \or: 9808 \or: 9996 \or: 9AD3 \or: 9B1A \or: 53D4 \or: 587E \or: 5919 \or: 5B70 \or: 5BBF \or: 6DD1 \or: 6F5A \or: 719F \or: 7421 \or: @@ -963,7 +963,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_26:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 60F9 \or: 63F6 \or: 6930 \or: 723A \or: 8036 \or: F974 \or: 91CE \or: 5F31 \or: F975 \or: F976 \or: 7D04 \or: 82E5 \or: 846F \or: 84BB \or: 85E5 \or: 8E8D \or: F977 \or: 4F6F \or: F978 \or: F979 \or: 58E4 \or: 5B43 \or: 6059 \or: 63DA \or: @@ -1000,7 +1000,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_27:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 5348 \or: 543E \or: 5433 \or: 55DA \or: 5862 \or: 58BA \or: 5967 \or: 5A1B \or: 5BE4 \or: 609F \or: F9B9 \or: 61CA \or: 6556 \or: 65FF \or: 6664 \or: 68A7 \or: 6C5A \or: 6FB3 \or: 70CF \or: 71AC \or: 7352 \or: 7B7D \or: 8708 \or: 8AA4 \or: @@ -1037,7 +1037,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_28:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7232 \or: 744B \or: 7DEF \or: 80C3 \or: 840E \or: 8466 \or: 853F \or: 875F \or: 885B \or: 8918 \or: 8B02 \or: 9055 \or: 97CB \or: 9B4F \or: 4E73 \or: 4F91 \or: 5112 \or: 516A \or: F9C7 \or: 552F \or: 55A9 \or: 5B7A \or: 5BA5 \or: 5E7C \or: @@ -1074,7 +1074,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_29:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 7D2B \or: 8005 \or: 81EA \or: 8328 \or: 8517 \or: 85C9 \or: 8AEE \or: 8CC7 \or: 96CC \or: 4F5C \or: 52FA \or: 56BC \or: 65AB \or: 6628 \or: 707C \or: 70B8 \or: 7235 \or: 7DBD \or: 828D \or: 914C \or: 96C0 \or: 9D72 \or: 5B71 \or: 68E7 \or: @@ -1111,7 +1111,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_30:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9706 \or: 9756 \or: 975C \or: 9802 \or: 9F0E \or: 5236 \or: 5291 \or: 557C \or: 5824 \or: 5E1D \or: 5F1F \or: 608C \or: 63D0 \or: 68AF \or: 6FDF \or: 796D \or: 7B2C \or: 81CD \or: 85BA \or: 88FD \or: 8AF8 \or: 8E44 \or: 918D \or: 9664 \or: @@ -1148,7 +1148,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_31:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8FB0 \or: 9032 \or: 93AD \or: 9663 \or: 9673 \or: 9707 \or: 4F84 \or: 53F1 \or: 59EA \or: 5AC9 \or: 5E19 \or: 684E \or: 74C6 \or: 75BE \or: 79E9 \or: 7A92 \or: 81A3 \or: 86ED \or: 8CEA \or: 8DCC \or: 8FED \or: 659F \or: 6715 \or: F9FD \or: @@ -1185,7 +1185,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_32:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 64AE \or: 50AC \or: 5D14 \or: 6700 \or: 589C \or: 62BD \or: 63A8 \or: 690E \or: 6978 \or: 6A1E \or: 6E6B \or: 76BA \or: 79CB \or: 82BB \or: 8429 \or: 8ACF \or: 8DA8 \or: 8FFD \or: 9112 \or: 914B \or: 919C \or: 9310 \or: 9318 \or: 939A \or: @@ -1222,7 +1222,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_33:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 8C9D \or: 5F6D \or: 6F8E \or: 70F9 \or: 81A8 \or: 610E \or: 4FBF \or: 504F \or: 6241 \or: 7247 \or: 7BC7 \or: 7DE8 \or: 7FE9 \or: 904D \or: 97AD \or: 9A19 \or: 8CB6 \or: 576A \or: 5E73 \or: 67B0 \or: 840D \or: 8A55 \or: 5420 \or: 5B16 \or: @@ -1259,7 +1259,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_34:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 633E \or: 6D79 \or: 72F9 \or: 8105 \or: 8107 \or: 83A2 \or: 92CF \or: 9830 \or: 4EA8 \or: 5144 \or: 5211 \or: 578B \or: 5F62 \or: 6CC2 \or: 6ECE \or: 7005 \or: 7050 \or: 70AF \or: 7192 \or: 73E9 \or: 7469 \or: 834A \or: 87A2 \or: 8861 \or: @@ -1296,7 +1296,7 @@ } \cs_new_nopar:cpn { __CJKtu_KS_sfd_map_35:n } #1 { - \if_case:w \etex_numexpr:D #1 \scan_stop: + \if_case:w \tex_numexpr:D #1 \scan_stop: 9ED1 \or: 6615 \or: 6B23 \or: 7098 \or: 75D5 \or: 5403 \or: 5C79 \or: 7D07 \or: 8A16 \or: 6B20 \or: 6B3D \or: 6B46 \or: 5438 \or: 6070 \or: 6D3D \or: 7FD5 \or: 8208 \or: 50D6 \or: 51DE \or: 559C \or: 566B \or: 56CD \or: 59EC \or: 5B09 \or: diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty index ea68a29d495..eb737eb2997 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty @@ -6,7 +6,7 @@ %% %% xCJK2uni.dtx (with options: `package') %% -%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -27,10 +27,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ {Convert CJK character to Unicode.} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{0.7}{\ExplFileDescription} + {\ExplFileDate}{0.8}{\ExplFileDescription} \msg_new:nnn { xCJK2uni } { l3-too-old } { Support~package~'expl3'~too~old. \\\\ @@ -38,7 +38,7 @@ 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2017/12/16 } { } +\@ifpackagelater { expl3 } { 2019/03/05 } { } { \msg_error:nn { xCJK2uni } { l3-too-old } } \sys_if_engine_pdftex:F { @@ -67,17 +67,17 @@ \tl_if_empty:nTF {#5} { \int_const:cn { c__CJKtu_ #1 _gap_begin_int } - { \l__CJKtu_ii_max_int + \c_one } + { \l__CJKtu_ii_max_int + 1 } \int_const:cn { c__CJKtu_ #1 _gap_end_int } { \use:c { c__CJKtu_ #1 _gap_begin_int } } \int_const:cn { c__CJKtu_ #1 _plane_int } - { \l__CJKtu_ii_max_int - (#4) + \c_one } + { \l__CJKtu_ii_max_int - (#4) + 1 } } { - \int_const:cn { c__CJKtu_ #1 _gap_begin_int } { #5 + \c_one } + \int_const:cn { c__CJKtu_ #1 _gap_begin_int } { #5 + 1 } \int_const:cn { c__CJKtu_ #1 _gap_end_int } {#6} \int_const:cn { c__CJKtu_ #1 _plane_int } - { (#5) - (#4) + \l__CJKtu_ii_max_int - (#6) + \c_two } + { (#5) - (#4) + \l__CJKtu_ii_max_int - (#6) + 2 } } \cs_if_exist_use:NTF \CJKaddEncHook { {#1} { \__CJKtu_enc_map:nn {#1} {#2} } } @@ -137,7 +137,7 @@ \cs_new_nopar:Npn \__CJKtu_char_to_unicode:n #1 { \exp:w - \int_compare:nNnTF { \tl_count:n {#1} } = \c_two + \int_compare:nNnTF { \tl_count:n {#1} } = 2 { \CJKtu_byte:NN #1 } { \tl_if_head_eq_meaning:nNTF {#1} ^^7f @@ -204,8 +204,8 @@ \__CJKtu_get_unicode:n { \CJKtu_sfd_map:nn - { \int_div_truncate:nn {#1} { \c_two_hundred_fifty_six } + \c_one } - { \int_mod:nn {#1} { \c_two_hundred_fifty_six } } + { \int_div_truncate:nn {#1} { 256 } + 1 } + { \int_mod:nn {#1} { 256 } } } } \cs_new_nopar:Npn \__CJKtu_get_unicode:n #1 @@ -215,9 +215,9 @@ \cs_new_nopar:Npn \__CJKtu_UTF_xvi_aux:n #1 { \HyPsd@DecimalToOctalFirst - { \int_div_truncate:nn {#1} { \c_two_hundred_fifty_six } } + { \int_div_truncate:nn {#1} { 256 } } \HyPsd@DecimalToOctalSecond - { \int_mod:nn {#1} { \c_two_hundred_fifty_six } } + { \int_mod:nn {#1} { 256 } } } \cs_if_exist_use:NTF \hypersetup { { unicode , CJKbookmarks = false } } { \PassOptionsToPackage { unicode , CJKbookmarks = false } { hyperref } } |