diff options
author | Karl Berry <karl@freefriends.org> | 2019-04-07 21:27:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-04-07 21:27:22 +0000 |
commit | 5dd4414e6769b73891da81fda61328e0357a9a91 (patch) | |
tree | 0e799ee0482f81598fb20122bd5b653441208d57 /Master/texmf-dist/source/latex/xcjk2uni | |
parent | 9f894d878ee6b02384487d4872ceefb7a6375613 (diff) |
xcjk2uni (7apr19)
git-svn-id: svn://tug.org/texlive/trunk@50848 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/xcjk2uni')
-rw-r--r-- | Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx | 47 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins | 4 |
2 files changed, 24 insertions, 27 deletions
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 |