summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-30 00:03:51 +0000
committerKarl Berry <karl@freefriends.org>2018-01-30 00:03:51 +0000
commit0ed22e7aba69650a69bc6936a03aeff92bbd885b (patch)
tree1b45a68b2d36dd9f16654f9d87b8c7ea2e95f0b3 /Master/texmf-dist
parent999a277e66606bd3a0ec8b526f96bd899f960699 (diff)
zhnumber (29jan18)
git-svn-id: svn://tug.org/texlive/trunk@46478 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/zhnumber/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdfbin275344 -> 274525 bytes
-rw-r--r--Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx103
-rw-r--r--Master/texmf-dist/source/latex/zhnumber/zhnumber.ins4
-rw-r--r--Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/zhnumber/zhnumber-gbk.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty11
8 files changed, 70 insertions, 68 deletions
diff --git a/Master/texmf-dist/doc/latex/zhnumber/README.md b/Master/texmf-dist/doc/latex/zhnumber/README.md
index 412cc2beb54..72e58d113c7 100644
--- a/Master/texmf-dist/doc/latex/zhnumber/README.md
+++ b/Master/texmf-dist/doc/latex/zhnumber/README.md
@@ -38,7 +38,7 @@ Issues and pull requests are welcome.
Copyright and Licence
---------------------
- Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2012, 2014-2018 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf b/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf
index f123ff17510..fcb6c66a178 100644
--- a/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf
+++ b/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx b/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx
index 19774b691d6..937122cb81b 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-2017 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2012, 2014-2018 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-2017 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2012, 2014-2018 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: zhnumber.dtx 858feab 2017-08-07 17:05:19 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+package|config>\GetIdInfo$Id: zhnumber.dtx 7e641ff 2018-01-28 19:08:57 +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.5}{\ExplFileDescription}
+%<package|config> {\ExplFileDate}{2.6}{\ExplFileDescription}
%<*driver>
\documentclass{ctxdoc}
\begin{document}
@@ -161,7 +161,7 @@ Copyright and Licence
%</driver>
% \fi
%
-% \CheckSum{1216}
+% \CheckSum{1215}
% \GetFileId{zhnumber.sty}
%
% \title{\bfseries\pkg{zhnumber} 宏包}
@@ -176,7 +176,7 @@ Copyright and Licence
% 的四个格式转换命令 \tn{zhnumber},\tn{zhdigits}、\tn{zhnum} 和 \tn{zhdig}
% 都是可以适当展开的,可以正常使用于 |PDF| 书签和交叉引用。
%
-% \pkg{zhnumber} 支持 |GBK|,|Big5| 和 |UTF8| 编码,依赖 \hologo{LaTeX3} 项目的
+% \pkg{zhnumber} 支持 |GBK|,|Big5| 和 |UTF8| 编码,依赖 \LaTeXiii{} 项目的
% \pkg{expl3},\pkg{xparse} 和 \pkg{l3keys2e} 宏包。
%
% \section{使用方法}
@@ -499,7 +499,7 @@ Copyright and Licence
'l3kernel'~and~'l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2017/07/19 } { }
+\@ifpackagelater { expl3 } { 2017/12/16 } { }
{ \msg_error:nn { zhnumber } { l3-too-old } }
% \end{macrocode}
%
@@ -520,7 +520,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnumberwithoptions}
+% \begin{macro}[int]{\zhnumberwithoptions}
% 带选项的用户函数。
% \begin{macrocode}
\NewDocumentCommand \zhnumberwithoptions { +m +m }
@@ -533,8 +533,8 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_number:n}
-% \begin{macro}[aux]{\@@_number:www}
+% \begin{macro}[int]{\zhnum_number:n}
+% \begin{macro}{\@@_number:www}
% 先判断输入的是小数还是分数。
% \begin{macrocode}
\cs_new:Npn \zhnum_number:n #1
@@ -550,7 +550,7 @@ Copyright and Licence
% \end{macro}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_integer_or_fraction:www}
+% \begin{macro}{\@@_integer_or_fraction:www}
% 判断是否输入的是分数。
% \begin{macrocode}
\cs_new:Npn \@@_integer_or_fraction:www #1 / #2 / #3 \q_stop
@@ -562,7 +562,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_fraction:wwww}
+% \begin{macro}{\@@_fraction:wwww}
% 对分数进行预处理。
% \begin{macrocode}
\cs_new:Npn \@@_fraction:wwww #1 \q_mark #2 ; #3 ; #4 \q_stop
@@ -587,7 +587,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_decimal:nn}
+% \begin{macro}[int]{\zhnum_decimal:nn}
% 对小数进行预处理。
% \begin{macrocode}
\cs_new:Npn \zhnum_decimal:nn #1#2
@@ -600,7 +600,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_blank_to_zero:n}
+% \begin{macro}[int]{\zhnum_blank_to_zero:n}
% 输出小数的整数位。
% \begin{macrocode}
\cs_new:Npn \zhnum_blank_to_zero:n #1
@@ -632,13 +632,13 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_counter:n, \zhnum_int:n}
+% \begin{macro}[int]{\zhnum_counter:n, \zhnum_int:n}
% 可以直接通过比较 \LaTeX{} 计数器的值来得到符号和绝对值。
% \begin{macrocode}
\cs_new:Npn \zhnum_counter:n #1
{
\int_if_exist:cTF { c@#1 }
- { \zhnum_int:c { c@#1 } }
+ { \exp_args:Nc \zhnum_int:n { c@#1 } }
{ \@@_counter_error:n {#1} }
}
\cs_new:Npn \@@_counter_error:n #1
@@ -658,18 +658,17 @@ Copyright and Licence
{ \c_@@_zero_tl }
}
}
-\cs_generate_variant:Nn \zhnum_int:n { c }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@zhnum}
+% \begin{macro}[int]{\@zhnum}
% 用于支持 |\pagenumbering{zhnum}|。
% \begin{macrocode}
\cs_new_nopar:Npn \@zhnum { \zhnum_int:n }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_integer:n}
+% \begin{macro}[int]{\zhnum_integer:n}
% 对整数的处理。这个函数基本抄录自 \pkg{l3bigint} 的 \cs{__bingint_read_do:nn}。它可以
% 正确取得符号,去掉多余的零,还可以循环展开数字。但它在遇到非数字的时候就停止了
% 循环,我们可能需要非数字(例如逗号)来作为分隔符号。因此对它略作修改,跳过非数字。
@@ -708,7 +707,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_read_abs_loop:Nw}
+% \begin{macro}{\@@_read_abs_loop:Nw}
% 当数字很大时,\pkg{l3bigint} 的实现会造成 \TeX{} 内存溢出:
% \begin{verbatim}
% ! TeX capacity exceeded, sorry [expansion depth=10000].
@@ -730,7 +729,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_read_integer:www}
+% \begin{macro}{\@@_read_integer:www}
% |#1| 符号,|#3| 是绝对值,|#2| 是绝对值的长度。
% \begin{macrocode}
\cs_new:Npn \@@_read_integer:www #1 ; #2 ; #3 ;
@@ -746,7 +745,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_if_digit:NTF}
+% \begin{macro}[int]{\zhnum_if_digit:NTF}
% 判断 |#1| 是否为数字位。
% \begin{macrocode}
\cs_new:Npn \zhnum_if_digit:NTF #1
@@ -760,7 +759,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]
+% \begin{macro}[int]
% {
% \zhnum_parse_number:n,
% \zhnum_parse_number:nn
@@ -784,7 +783,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_split_number_aux:nnn}
+% \begin{macro}{\@@_split_number_aux:nnn}
% 为了处理的方便,在整数前面补上适当的 $0$,使其位数可以被 $4$ 整除。
% \begin{macrocode}
\cs_new:Npn \@@_split_number_aux:nnn #1#2
@@ -803,7 +802,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_split_number:nn}
+% \begin{macro}[int]{\zhnum_split_number:nn}
% 最后加入的 \cs{q_recursion_tail} 是停止递归的标志,而 \cs{q_nil} 用于占位。
% \begin{macrocode}
\cs_new:Npn \zhnum_split_number:nn #1#2
@@ -815,7 +814,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_split_number:NNnNNNNw}
+% \begin{macro}[int]{\zhnum_split_number:NNnNNNNw}
% 将输入的整数由高位到低位,以四位为一段进行处理。
% \begin{macrocode}
\cs_new:Npn \zhnum_split_number:NNnNNNNw #1#2#3#4#5#6#7
@@ -837,7 +836,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_process_number:NNNNNN}
+% \begin{macro}[int]{\zhnum_process_number:NNNNNN}
% 对四位数字按情况进行处理。
% \begin{macrocode}
\cs_new:Npn \zhnum_process_number:NNNNNN #1#2#3#4#5#6
@@ -904,7 +903,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@zhdig}
+% \begin{macro}[int]{\@zhdig}
% 用于支持 |\pagenumbering{zhdig}|。
% \begin{macrocode}
\cs_new_nopar:Npn \@zhdig #1 { \zhnum_digits_null:f { \int_eval:n {#1} } }
@@ -931,7 +930,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_digits_zero:n,\zhnum_digits_null:n}
+% \begin{macro}[int]{\zhnum_digits_zero:n,\zhnum_digits_null:n}
% 快捷方式。
% \begin{macrocode}
\cs_new_nopar:Npn \zhnum_digits_zero:n
@@ -942,7 +941,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_digits:Nn}
+% \begin{macro}[int]{\zhnum_digits:Nn}
% 与 \cs{zhnum_integer:n} 类似,但不用去掉多余的零。
% \begin{macrocode}
\cs_new:Npn \zhnum_digits:Nn #1#2
@@ -1046,7 +1045,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_week_day:www}
+% \begin{macro}{\@@_week_day:www}
% 用 Zeller 公式计算的结果 $h$ 与实际星期的关系是 $d=h+5\pmod7+1$。
% \begin{macrocode}
\cs_new:Npn \@@_week_day:www #1/#2/#3 \q_stop
@@ -1064,7 +1063,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_Zeller:nnn,\zhnum_Zeller_aux:Nnnn,\zhnum_two_digits:n}
+% \begin{macro}[int]{\zhnum_Zeller:nnn,\zhnum_Zeller_aux:Nnnn,\zhnum_two_digits:n}
% 用 Zeller 公式\footnote{\url{http://en.wikipedia.org/wiki/Zeller's_congruence}}
% 计算星期几。
% \begin{macrocode}
@@ -1090,7 +1089,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_Zeller_Gregorian:nnn}
+% \begin{macro}[int]{\zhnum_Zeller_Gregorian:nnn}
% 格里历(\zhdate{1582/10/15}及以后)的计算公式
% \[
% h = \biggl(q + \biggl\lfloor\frac{26(m+1)}{10}\biggr\rfloor + Y +
@@ -1115,7 +1114,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_Zeller_Julian:nnn}
+% \begin{macro}[int]{\zhnum_Zeller_Julian:nnn}
% 儒略历(\zhdate{1582/10/04}及以前)的计算公式
% \[
% h = \biggl(q + \biggl\lfloor\frac{26(m+1)}{10}\biggr\rfloor + Y +
@@ -1162,7 +1161,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_time_aux:nn,\@@_time_aux:Nnnn}
+% \begin{macro}{\@@_time_aux:nn,\@@_time_aux:Nnnn}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_time_aux:nn
{
@@ -1178,7 +1177,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_digit_map:n}
+% \begin{macro}[int]{\zhnum_digit_map:n}
% 阿拉伯数字与中文数字的映射。
% \begin{macrocode}
\cs_new:Npn \zhnum_digit_map:n #1
@@ -1186,7 +1185,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_scale_map:n,\zhnum_scale_map_loop:n}
+% \begin{macro}[int]{\zhnum_scale_map:n,\zhnum_scale_map_loop:n}
% 大数系统的映射。
% \begin{macrocode}
\cs_new:Npn \zhnum_scale_map:n #1
@@ -1217,7 +1216,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_set_scale:n}
+% \begin{macro}[int]{\zhnum_set_scale:n}
% \begin{macrocode}
\cs_new_protected:Npn \zhnum_set_scale:n #1
{
@@ -1231,7 +1230,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_ganzhi_normal:nnn}
+% \begin{macro}[int]{\zhnum_ganzhi_normal:nnn}
% 保证干支的参数为正数。
% \begin{macrocode}
\cs_new:Npn \zhnum_ganzhi_normal:nnn #1#2#3
@@ -1242,8 +1241,8 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_ganzhi_cyclic:nnn}
-% \begin{macro}[aux]{\@@_ganzhi_cyclic_mod:nnnn}
+% \begin{macro}[int]{\zhnum_ganzhi_cyclic:nnn}
+% \begin{macro}{\@@_ganzhi_cyclic_mod:nnnn}
% 对超出范围的数字取模,参数 |0| 的结果是空值。
% \begin{macrocode}
\cs_new:Npn \zhnum_ganzhi_cyclic:nnn #1#2#3
@@ -1272,7 +1271,7 @@ Copyright and Licence
% \end{macro}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_ganzhi:nnn}
+% \begin{macro}[int]{\zhnum_ganzhi:nnn}
% 默认不对超出范围的数字取模。
% \begin{macrocode}
\cs_new_eq:NN \zhnum_ganzhi:nnn \zhnum_ganzhi_normal:nnn
@@ -1312,7 +1311,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_ganzhi_nian:n}
+% \begin{macro}[int]{\zhnum_ganzhi_nian:n}
% 干支纪年。公元元年是 |\zhganzhi{58}|。
% \begin{macrocode}
\cs_new:Npn \zhnum_ganzhi_nian:n #1
@@ -1400,14 +1399,17 @@ Copyright and Licence
}
% \end{macrocode}
%
-% \begin{macro}[internal]
+% \begin{macro}[int]
% {
% \zhnum_set_digits_map:nn,
% \zhnum_set_digits_map:nnn,
% \zhnum_set_financial_map:nn,
% \zhnum_set_financial_map:nnn,
% \zhnum_set_tiangan_map:nn,
-% \zhnum_set_dizhi_map:nn,
+% \zhnum_set_dizhi_map:nn
+% }
+% \begin{variable}
+% {
% \l_@@_cfg_map_prop,
% \l_@@_cfg_map_var_prop,
% \l_@@_cfg_map_finan_prop,
@@ -1438,9 +1440,10 @@ Copyright and Licence
\prop_new:N \l_@@_cfg_map_finan_prop
\prop_new:N \l_@@_cfg_map_ganzhi_prop
% \end{macrocode}
+% \end{variable}
% \end{macro}
%
-% \begin{macro}[internal]
+% \begin{macro}[int]
% {
% \zhnum_parse_config:,
% \zhnum_check_simp:nn,
@@ -1558,7 +1561,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_set_alias:}
+% \begin{macro}[int]{\zhnum_set_alias:}
% 一些易于使用的别名。
% \begin{macrocode}
\cs_new_eq:NN \zhnum_set_alias:NN \cs_new_eq:NN
@@ -1578,7 +1581,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\zhnum_load_cfg:n}
+% \begin{macro}[int]{\zhnum_load_cfg:n}
% 根据选定编码载入配置文件。
% \begin{macrocode}
\cs_new_protected:Npn \zhnum_load_cfg:n #1
@@ -1636,7 +1639,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal,pTF]{\zhnum_if_unicode_engine:}
+% \begin{macro}[int,pTF]{\zhnum_if_unicode_engine:}
% 使用 \upTeX{} 的时候,也不必将汉字的首字符设置为活动字符。判断 |^^^^0021| 是否为
% 单个记号的办法对 \upTeX{} 不适用。
% \begin{macrocode}
@@ -1657,7 +1660,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]
+% \begin{macro}[int]
% {
% \zhnum_set_catcode:,
% \zhnum_set_cfg_name:Nn,
diff --git a/Master/texmf-dist/source/latex/zhnumber/zhnumber.ins b/Master/texmf-dist/source/latex/zhnumber/zhnumber.ins
index 7332dac6397..01aab77f689 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-2017 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2012, 2014-2018 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-2017 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2012, 2014-2018 by Qing Lee <sobenlee@gmail.com>
--------------------------------------------------------------------------
This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg
index 8b2303be69f..fe1519a4463 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg
+++ b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg
@@ -6,7 +6,7 @@
%%
%% zhnumber.dtx (with options: `config,big5')
%%
-%% Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2012, 2014-2018 by Qing Lee <sobenlee@gmail.com>
%% --------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -25,10 +25,10 @@
%%
%% --------------------------------------------------------------------------
%%
-\GetIdInfo$Id: zhnumber.dtx 858feab 2017-08-07 17:05:19 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx 7e641ff 2018-01-28 19:08:57 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese numerals with Big5 encoding}
\ProvidesExplFile{\ExplFileName-big5.cfg}
- {\ExplFileDate}{2.5}{\ExplFileDescription}
+ {\ExplFileDate}{2.6}{\ExplFileDescription}
\zhnum_set_digits_map:nn { minus } { t }
\zhnum_set_digits_map:nn { 0 } { s }
\zhnum_set_digits_map:nn { null } { }
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-gbk.cfg b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-gbk.cfg
index dd730781fbb..9a305d6b9c1 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-gbk.cfg
+++ b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-gbk.cfg
@@ -6,7 +6,7 @@
%%
%% zhnumber.dtx (with options: `config,gbk')
%%
-%% Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2012, 2014-2018 by Qing Lee <sobenlee@gmail.com>
%% --------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -25,10 +25,10 @@
%%
%% --------------------------------------------------------------------------
%%
-\GetIdInfo$Id: zhnumber.dtx 858feab 2017-08-07 17:05:19 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx 7e641ff 2018-01-28 19:08:57 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese numerals with GBK encoding}
\ProvidesExplFile{\ExplFileName-gbk.cfg}
- {\ExplFileDate}{2.5}{\ExplFileDescription}
+ {\ExplFileDate}{2.6}{\ExplFileDescription}
\zhnum_set_digits_map:nnn { minus } { simp } { }
\zhnum_set_digits_map:nnn { minus } { trad } { ؓ }
\zhnum_set_digits_map:nn { 0 } { }
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg
index 09c20e02986..5c61674579d 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg
+++ b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg
@@ -6,7 +6,7 @@
%%
%% zhnumber.dtx (with options: `config,utf8')
%%
-%% Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2012, 2014-2018 by Qing Lee <sobenlee@gmail.com>
%% --------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -25,10 +25,10 @@
%%
%% --------------------------------------------------------------------------
%%
-\GetIdInfo$Id: zhnumber.dtx 858feab 2017-08-07 17:05:19 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx 7e641ff 2018-01-28 19:08:57 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese numerals with UTF8 encoding}
\ProvidesExplFile{\ExplFileName-utf8.cfg}
- {\ExplFileDate}{2.5}{\ExplFileDescription}
+ {\ExplFileDate}{2.6}{\ExplFileDescription}
\zhnum_set_digits_map:nnn { minus } { simp } { 负 }
\zhnum_set_digits_map:nnn { minus } { trad } { 負 }
\zhnum_set_digits_map:nn { 0 } { 零 }
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty b/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
index 9d558cb4bab..79edc8a72ae 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
+++ b/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
@@ -6,7 +6,7 @@
%%
%% zhnumber.dtx (with options: `package')
%%
-%% Copyright (C) 2012, 2014-2017 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2012, 2014-2018 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: zhnumber.dtx 858feab 2017-08-07 17:05:19 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx 7e641ff 2018-01-28 19:08:57 +0800 Qing Lee <sobenlee@gmail.com> $
{Typesetting numbers with Chinese glyphs}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.5}{\ExplFileDescription}
+ {\ExplFileDate}{2.6}{\ExplFileDescription}
\msg_new:nnn { zhnumber } { 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/07/19 } { }
+\@ifpackagelater { expl3 } { 2017/12/16 } { }
{ \msg_error:nn { zhnumber } { l3-too-old } }
\RequirePackage { xparse , l3keys2e }
\DeclareExpandableDocumentCommand \zhnumber { +o +m }
@@ -119,7 +119,7 @@
\cs_new:Npn \zhnum_counter:n #1
{
\int_if_exist:cTF { c@#1 }
- { \zhnum_int:c { c@#1 } }
+ { \exp_args:Nc \zhnum_int:n { c@#1 } }
{ \__zhnum_counter_error:n {#1} }
}
\cs_new:Npn \__zhnum_counter_error:n #1
@@ -139,7 +139,6 @@
{ \c__zhnum_zero_tl }
}
}
-\cs_generate_variant:Nn \zhnum_int:n { c }
\cs_new_nopar:Npn \@zhnum { \zhnum_int:n }
\cs_new:Npn \zhnum_integer:n #1
{