diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx b/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx index 05472f8fd14..d5ed4bdd22b 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-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -57,7 +57,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -83,7 +83,7 @@ Copyright and Licence \preamble - Copyright (C) 2012, 2014-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -96,7 +96,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -120,18 +120,18 @@ Copyright and Licence %</install> %<*internal> \usedir{source/latex/zhnumber} - \file{zhnumber.ins} {\from{\jobname.dtx}{install}} + \file{zhnumber.ins} {\from{\jobname.dtx}{install}} %</internal> %<*install> \usedir{tex/latex/zhnumber} - \file{zhnumber.sty} {\from{\jobname.dtx}{package}} + \file{zhnumber.sty} {\from{\jobname.dtx}{package}} \usedir{tex/latex/zhnumber/config} - \file{zhnumber-utf8.cfg} {\from{\jobname.dtx}{config,utf8}} - \file{zhnumber-big5.cfg} {\from{\jobname.dtx}{config,big5}} - \file{zhnumber-gbk.cfg} {\from{\jobname.dtx}{config,gbk}} + \file{zhnumber-utf8.cfg} {\from{\jobname.dtx}{config,utf8}} + \ctxfile{Big5}{zhnumber-big5.cfg} {\from{\jobname.dtx}{config,big5}} + \ctxfile{GBK}{zhnumber-gbk.cfg} {\from{\jobname.dtx}{config,gbk}} \nopreamble\nopostamble \usedir{doc/latex/zhnumber} - \file{README.md} {\from{\jobname.dtx}{readme}} + \file{README.md} {\from{\jobname.dtx}{readme}} } \endbatchfile @@ -141,7 +141,7 @@ Copyright and Licence %</internal> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} -%<+package|config>\GetIdInfo$Id: zhnumber.dtx 311c61d 2019-04-07 23:29:51 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+package|config>\GetIdInfo$Id: zhnumber.dtx c4664c6 2020-05-01 21:10:24 +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.7}{\ExplFileDescription} +%<package|config> {\ExplFileDate}{2.8}{\ExplFileDescription} %<*driver> \documentclass{ctxdoc} \begin{document} @@ -161,7 +161,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{1186} +% \CheckSum{1189} % \GetFileId{zhnumber.sty} % % \title{\bfseries\pkg{zhnumber} 宏包} @@ -400,7 +400,7 @@ Copyright and Licence % \begin{syntax} % null = <\TFF> % \end{syntax} -% 缺省状态下,除了 \tn{zhdigits} 外,其它的格式转换命令,将 0 映射成零,如果需要将 0 映射 +% 缺省状态下,除了 \tn{zhdigits} 外,其他的格式转换命令,将 0 映射成零,如果需要将 0 映射 % 成〇,可以使用这个选项。 % \end{function} % @@ -437,7 +437,7 @@ Copyright and Licence % 其中 |-| 设置负,|-0| 设置〇,|dot| 设置小数的点,|and| 和 |parts| 分别设置分数 % 的“又”和“分之”,|E|$n$ 设置 $10^n$,|F|$n$ 设置数字 $n$ 的大写,|T|$n$ 设置 % 数字 $n$ 的天干,|D|$n$ 设置数字 $n$ 的地支,而 |GZ|$n$ 设置数字 $n$ 的干支。 -% 其它的选项同字面意思,不再赘述。例如 +% 其他的选项同字面意思,不再赘述。例如 % \begin{verbatim}[frame=single] % \zhnumsetup{2={两}} % \end{verbatim} @@ -664,7 +664,7 @@ Copyright and Licence % \begin{macro}[int]{\@zhnum} % 用于支持 |\pagenumbering{zhnum}|。 % \begin{macrocode} -\cs_new_nopar:Npn \@zhnum { \zhnum_int:n } +\cs_new:Npn \@zhnum { \zhnum_int:n } % \end{macrocode} % \end{macro} % @@ -906,7 +906,7 @@ Copyright and Licence % \begin{macro}[int]{\@zhdig} % 用于支持 |\pagenumbering{zhdig}|。 % \begin{macrocode} -\cs_new_nopar:Npn \@zhdig #1 { \zhnum_digits_null:f { \int_eval:n {#1} } } +\cs_new:Npn \@zhdig #1 { \zhnum_digits_null:f { \int_eval:n {#1} } } % \end{macrocode} % \end{macro} % @@ -933,9 +933,9 @@ Copyright and Licence % \begin{macro}[int]{\zhnum_digits_zero:n,\zhnum_digits_null:n} % 快捷方式。 % \begin{macrocode} -\cs_new_nopar:Npn \zhnum_digits_zero:n +\cs_new:Npn \zhnum_digits_zero:n { \zhnum_digits:Nn \BooleanTrue } -\cs_new_nopar:Npn \zhnum_digits_null:n +\cs_new:Npn \zhnum_digits_null:n { \zhnum_digits:Nn \BooleanFalse } \cs_generate_variant:Nn \zhnum_digits_null:n { V , v , f } % \end{macrocode} @@ -1012,14 +1012,14 @@ Copyright and Licence % \begin{macro}{\zhtoday} % 输出当天日期。 % \begin{macrocode} -\cs_new_nopar:Npn \zhtoday +\cs_new:Npn \zhtoday { \@@_date_aux:Vnn \tex_year:D \tex_month:D \tex_day:D } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_date_aux:nnn} % \begin{macrocode} -\cs_new_nopar:Npn \@@_date_aux:nnn +\cs_new:Npn \@@_date_aux:nnn { \bool_if:NTF \l_@@_time_bool { \@@_date_aux:NNnnnn \zhnum_digits_null:n \zhnum_int:n { } } @@ -1152,7 +1152,7 @@ Copyright and Licence % \begin{macro}{\zhcurrtime} % 输出当前时间。 % \begin{macrocode} -\cs_new_nopar:Npn \zhcurrtime +\cs_new:Npn \zhcurrtime { \@@_time_aux:nn { \int_div_truncate:nn \tex_time:D { 60 } } @@ -1163,7 +1163,7 @@ Copyright and Licence % % \begin{macro}{\@@_time_aux:nn,\@@_time_aux:Nnnn} % \begin{macrocode} -\cs_new_nopar:Npn \@@_time_aux:nn +\cs_new:Npn \@@_time_aux:nn { \bool_if:NTF \l_@@_time_bool { \@@_time_aux:Nnnn \zhnum_int:n { } } @@ -1453,7 +1453,7 @@ Copyright and Licence % } % 将 \texttt{prop} 表转化到单独的 \texttt{tl} 变量。 % \begin{macrocode} -\cs_new_protected_nopar:Npn \zhnum_parse_config: +\cs_new_protected:Npn \zhnum_parse_config: { \prop_map_function:NN \l_@@_cfg_map_prop \zhnum_check_simp:nn \prop_map_function:NN \l_@@_cfg_map_ganzhi_prop \zhnum_assgin_ganzhi:nn @@ -1485,7 +1485,7 @@ Copyright and Licence } { \tl_set:cn { l_@@_ #2 _tl } {#1} } } -\cs_new_protected_nopar:Npn \zhnum_assgin_const: +\cs_new_protected:Npn \zhnum_assgin_const: { \prop_map_function:NN \l_@@_cfg_map_prop \zhnum_check_financial:nn \zhnum_set_alias: @@ -1506,7 +1506,7 @@ Copyright and Licence { c_@@_ #1 _tl } { \exp_not:c { l_@@_ #1 _tl } } } } -\cs_new_protected_nopar:Npn \zhnum_set_zero: +\cs_new_protected:Npn \zhnum_set_zero: { \tl_set:cx { l_@@_0_tl } { @@ -1514,7 +1514,7 @@ Copyright and Licence { \exp_not:o \l_@@_null_tl } { \exp_not:v { l_@@_0_tl } } } } -\cs_new_protected_nopar:Npn \zhnum_set_week_day: +\cs_new_protected:Npn \zhnum_set_week_day: { \tl_set:Nx \l_@@_mon_tl { \exp_not:N \c_@@_weekday_tl \exp_not:v { l_@@_1_tl } } @@ -1565,7 +1565,7 @@ Copyright and Licence % 一些易于使用的别名。 % \begin{macrocode} \cs_new_eq:NN \zhnum_set_alias:NN \cs_new_eq:NN -\cs_new_protected_nopar:Npx \zhnum_set_alias: +\cs_new_protected:Npx \zhnum_set_alias: { \zhnum_set_alias:NN \exp_not:N \c_@@_zero_tl \exp_not:c { c_@@_ 0 _tl } @@ -1677,9 +1677,9 @@ Copyright and Licence } \cs_new_eq:NN \zhnum_reset_config: \zhnum_parse_config: \else: - \cs_new_protected_nopar:Npn \zhnum_set_catcode: + \cs_new_protected:Npn \zhnum_set_catcode: { \bool_if:NT \l_@@_active_char_bool { \zhnum_set_active: } } - \cs_new_protected_nopar:Npn \zhnum_set_active: + \cs_new_protected:Npn \zhnum_set_active: { \str_case:onTF { \l_@@_encoding_str } { @@ -1706,7 +1706,7 @@ Copyright and Licence \bool_if:NT \l_@@_active_char_bool { _active } } } - \cs_new_protected_nopar:Npn \zhnum_reset_config: + \cs_new_protected:Npn \zhnum_reset_config: { \zhnum_load_cfg:o { \l_@@_encoding_str } } \bool_new:N \l_@@_active_char_bool \bool_set_true:N \l_@@_active_char_bool @@ -1723,7 +1723,7 @@ Copyright and Licence { UTF8 , GBK , Big5 } { \str_set:Nx \l_@@_encoding_str - { \str_fold_case:V \l_keys_choice_tl } + { \exp_args:No \str_lowercase:n { \l_keys_choice_tl } } \zhnum_load_cfg:o { \l_@@_encoding_str } } , encoding .default:n = { GBK } , @@ -1897,12 +1897,14 @@ Copyright and Licence \zhnum_set_financial_map:nn { null } { 零 } \zhnum_set_financial_map:nn { 0 } { 零 } \zhnum_set_financial_map:nn { 1 } { 壹 } -\zhnum_set_financial_map:nn { 2 } { 貳 } %<*!big5> +\zhnum_set_financial_map:nnn { 2 } { simp } { 贰 } +\zhnum_set_financial_map:nnn { 2 } { trad } { 貳 } \zhnum_set_financial_map:nnn { 3 } { simp } { 叁 } \zhnum_set_financial_map:nnn { 3 } { trad } { 叄 } %</!big5> %<*big5> +\zhnum_set_financial_map:nn { 2 } { 貳 } \zhnum_set_financial_map:nn { 3 } { 參 } %</big5> \zhnum_set_financial_map:nn { 4 } { 肆 } |