diff options
author | Karl Berry <karl@freefriends.org> | 2017-08-07 21:09:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-08-07 21:09:08 +0000 |
commit | 53fbec492a3c2c5abfb4a1cb183e2df23f8a928a (patch) | |
tree | 4359ad038f1461300047655f2c80fd7decdec33e /Master/texmf-dist/source | |
parent | fa02c7417cb6920fb203f2a7e4fe0365cebb54b0 (diff) |
zhnumber (7aug17)
git-svn-id: svn://tug.org/texlive/trunk@44977 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx | 55 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/zhnumber/zhnumber.ins | 4 |
2 files changed, 28 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx b/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx index 8a9fa8d53bf..19774b691d6 100644 --- a/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx +++ b/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx @@ -44,7 +44,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012, 2014-2016 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -83,7 +83,7 @@ Copyright and Licence \preamble - Copyright (C) 2012, 2014-2016 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -141,7 +141,7 @@ Copyright and Licence %</internal> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} -%<+package|config>\GetIdInfo$Id$ +%<+package|config>\GetIdInfo$Id: zhnumber.dtx 858feab 2017-08-07 17:05:19 +0800 Qing Lee <sobenlee@gmail.com> $ %<package> {Typesetting numbers with Chinese glyphs} %<config&utf8> {Chinese numerals with UTF8 encoding} %<config&big5> {Chinese numerals with Big5 encoding} @@ -150,7 +150,7 @@ Copyright and Licence %<config&utf8>\ProvidesExplFile{\ExplFileName-utf8.cfg} %<config&big5>\ProvidesExplFile{\ExplFileName-big5.cfg} %<config&gbk>\ProvidesExplFile{\ExplFileName-gbk.cfg} -%<package|config> {\ExplFileDate}{2.4}{\ExplFileDescription} +%<package|config> {\ExplFileDate}{2.5}{\ExplFileDescription} %<*driver> \documentclass{ctxdoc} \begin{document} @@ -161,7 +161,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{1219} +% \CheckSum{1216} % \GetFileId{zhnumber.sty} % % \title{\bfseries\pkg{zhnumber} 宏包} @@ -499,7 +499,7 @@ Copyright and Licence 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2015/09/24 } { } +\@ifpackagelater { expl3 } { 2017/07/19 } { } { \msg_error:nn { zhnumber } { l3-too-old } } % \end{macrocode} % @@ -848,27 +848,26 @@ Copyright and Licence \int_compare:nNnTF {#2} = \c_zero { \int_compare:nNnF { #1 * (#3#4) } = \c_zero { \c_@@_zero_tl } } { - \bool_if:nTF - { \l_@@_ancient_bool && \int_compare_p:nNn {#2} = \c_two } + \bool_lazy_and:nnTF + { \l_@@_ancient_bool } + { \int_compare_p:nNn {#2} = \c_two } { \zhnum_digit_map:n { #2 00 } } { \zhnum_digit_map:n {#2} \c_@@_hundred_tl } } \int_compare:nNnTF {#3} = \c_zero { \int_compare:nNnF { #2 * #4 } = \c_zero { \c_@@_zero_tl } } { - \bool_if:nF + \bool_lazy_all:nF { - \int_compare_p:nNn {#3} = \c_one && - \int_compare_p:nNn {#1#2} = \c_zero && #6 && #5 + { \int_compare_p:nNn {#3} = \c_one } + { \int_compare_p:nNn {#1#2} = \c_zero } + {#6} + {#5} } { - \bool_if:nTF - { - \l_@@_ancient_bool && - ( \int_compare_p:nNn {#3} = \c_two || - \int_compare_p:nNn {#3} = \c_three || - \int_compare_p:nNn {#3} = \c_four ) - } + \bool_lazy_and:nnTF + { \l_@@_ancient_bool } + { \int_compare_p:n { \c_one < #3 < \c_five } } { \zhnum_digit_map:n { #3 0 } \use_none:n } { \zhnum_digit_map:n {#3} } } @@ -1599,19 +1598,17 @@ Copyright and Licence } \cs_new_protected:Npn \zhnum_input_cfg:n #1 { - \file_if_exist_input:nTF { zhnumber - #1 .cfg } + \file_if_exist:nTF { zhnumber - #1 .cfg } { \bool_set_false:N \l_@@_reset_bool \@@_update_cfg_prop:N \@@_prop_initial:Nn \group_begin: \zhnum_set_catcode: + \file_input:n { zhnumber - #1 .cfg } + \@@_update_cfg_prop:N \@@_prop_gset_eq:Nn + \group_end: } - { - \msg_error:nnx { zhnumber } { file-not-found } {#1} - \use_none:nnn - } - \@@_update_cfg_prop:N \@@_prop_gset_eq:Nn - \group_end: + { \msg_error:nnx { zhnumber } { file-not-found } {#1} } } \cs_new_protected:Npn \@@_update_cfg_prop:N #1 { @@ -1643,11 +1640,11 @@ Copyright and Licence % 使用 \upTeX{} 的时候,也不必将汉字的首字符设置为活动字符。判断 |^^^^0021| 是否为 % 单个记号的办法对 \upTeX{} 不适用。 % \begin{macrocode} -\bool_if:nTF +\bool_lazy_any:nTF { - \sys_if_engine_xetex_p: || - \sys_if_engine_luatex_p: || - \sys_if_engine_uptex_p: + { \sys_if_engine_xetex_p: } + { \sys_if_engine_luatex_p: } + { \sys_if_engine_uptex_p: } } { \cs_new_eq:NN \zhnum_if_unicode_engine_p: \c_true_bool diff --git a/Master/texmf-dist/source/latex/zhnumber/zhnumber.ins b/Master/texmf-dist/source/latex/zhnumber/zhnumber.ins index 42ac251c79f..7332dac6397 100644 --- a/Master/texmf-dist/source/latex/zhnumber/zhnumber.ins +++ b/Master/texmf-dist/source/latex/zhnumber/zhnumber.ins @@ -6,7 +6,7 @@ %% %% zhnumber.dtx (with options: `install') %% -%% Copyright (C) 2012, 2014-2016 by Qing Lee <sobenlee@gmail.com> +%% Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com> %% -------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -30,7 +30,7 @@ \preamble - Copyright (C) 2012, 2014-2016 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the |