zhnumber (1may20)

git-svn-id: svn://tug.org/texlive/trunk@54960 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 37 insertions, 35 deletions

diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-big5.cfg
index be0806e1b77..48fb05a250c 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-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
@@ -19,16 +19,16 @@
 %%     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.
 %% 
 %% --------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: zhnumber.dtx 311c61d 2019-04-07 23:29:51 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx c4664c6 2020-05-01 21:10:24 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese numerals with Big5 encoding}
 \ProvidesExplFile{\ExplFileName-big5.cfg}
-  {\ExplFileDate}{2.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.8}{\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 d54b53c8165..83e25a66ad8 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-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
@@ -19,16 +19,16 @@
 %%     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.
 %% 
 %% --------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: zhnumber.dtx 311c61d 2019-04-07 23:29:51 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx c4664c6 2020-05-01 21:10:24 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese numerals with GBK encoding}
 \ProvidesExplFile{\ExplFileName-gbk.cfg}
-  {\ExplFileDate}{2.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.8}{\ExplFileDescription}
 \zhnum_set_digits_map:nnn { minus } { simp } { �� }
 \zhnum_set_digits_map:nnn { minus } { trad } { ؓ }
 \zhnum_set_digits_map:nn { 0 }     { �� }
@@ -79,7 +79,8 @@
 \zhnum_set_financial_map:nn { null } { �� }
 \zhnum_set_financial_map:nn { 0 }    { �� }
 \zhnum_set_financial_map:nn { 1 }    { Ҽ }
-\zhnum_set_financial_map:nn { 2 }    { �E }
+\zhnum_set_financial_map:nnn { 2 }  { simp } { �� }
+\zhnum_set_financial_map:nnn { 2 }  { trad } { �E }
 \zhnum_set_financial_map:nnn { 3 }  { simp } { �� }
 \zhnum_set_financial_map:nnn { 3 }  { trad } { �� }
 \zhnum_set_financial_map:nn { 4 }    { �� }
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg b/Master/texmf-dist/tex/latex/zhnumber/zhnumber-utf8.cfg
index 0791c6df18f..8488177a156 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-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
@@ -19,16 +19,16 @@
 %%     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.
 %% 
 %% --------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: zhnumber.dtx 311c61d 2019-04-07 23:29:51 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx c4664c6 2020-05-01 21:10:24 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese numerals with UTF8 encoding}
 \ProvidesExplFile{\ExplFileName-utf8.cfg}
-  {\ExplFileDate}{2.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.8}{\ExplFileDescription}
 \zhnum_set_digits_map:nnn { minus } { simp } { 负 }
 \zhnum_set_digits_map:nnn { minus } { trad } { 負 }
 \zhnum_set_digits_map:nn { 0 }     { 零 }
@@ -79,7 +79,8 @@
 \zhnum_set_financial_map:nn { null } { 零 }
 \zhnum_set_financial_map:nn { 0 }    { 零 }
 \zhnum_set_financial_map:nn { 1 }    { 壹 }
-\zhnum_set_financial_map:nn { 2 }    { 貳 }
+\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 } { 叄 }
 \zhnum_set_financial_map:nn { 4 }    { 肆 }
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty b/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
index 474d5320eba..73175a72c2c 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-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
@@ -19,7 +19,7 @@
 %%     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.
 %% 
@@ -27,10 +27,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: zhnumber.dtx 311c61d 2019-04-07 23:29:51 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: zhnumber.dtx c4664c6 2020-05-01 21:10:24 +0800 Qing Lee <sobenlee@gmail.com> $
   {Typesetting numbers with Chinese glyphs}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{2.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.8}{\ExplFileDescription}
 \msg_new:nnn { zhnumber } { l3-too-old }
   {
     Support~package~'expl3'~too~old. \\\\
@@ -139,7 +139,7 @@
           { \c__zhnum_zero_tl }
       }
   }
-\cs_new_nopar:Npn \@zhnum { \zhnum_int:n }
+\cs_new:Npn \@zhnum { \zhnum_int:n }
 \cs_new:Npn \zhnum_integer:n #1
   {
     \exp_after:wN \__zhnum_read_integer:www
@@ -306,7 +306,7 @@
       { \zhnum_digits_null:v { c@#1 } }
       { \__zhnum_counter_error:n {#1} }
   }
-\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} } }
 \DeclareExpandableDocumentCommand \zhdigits { +s +o +m }
   {
     \IfNoValueTF {#2}
@@ -321,9 +321,9 @@
       \zhnum_digits:Nn #1 {#3}
     \group_end:
   }
-\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 }
 \cs_new:Npn \zhnum_digits:Nn #1#2
@@ -382,9 +382,9 @@
   }
 \cs_new:Npn \__zhnum_date:www #1/#2/#3 \q_stop
   { \__zhnum_date_aux:nnn {#1} {#2} {#3} }
-\cs_new_nopar:Npn \zhtoday
+\cs_new:Npn \zhtoday
   { \__zhnum_date_aux:Vnn \tex_year:D \tex_month:D \tex_day:D }
-\cs_new_nopar:Npn \__zhnum_date_aux:nnn
+\cs_new:Npn \__zhnum_date_aux:nnn
   {
     \bool_if:NTF \l__zhnum_time_bool
       { \__zhnum_date_aux:NNnnnn \zhnum_digits_null:n \zhnum_int:n { } }
@@ -464,13 +464,13 @@
     \cs_new:Npn \exp_not:N \__zhnum_time:ww ##1 \c_colon_str ##2 \exp_not:N \q_stop
   }
   { \__zhnum_time_aux:nn {#1} {#2} }
-\cs_new_nopar:Npn \zhcurrtime
+\cs_new:Npn \zhcurrtime
   {
     \__zhnum_time_aux:nn
       { \int_div_truncate:nn \tex_time:D { 60 } }
       { \int_mod:nn \tex_time:D { 60 } }
   }
-\cs_new_nopar:Npn \__zhnum_time_aux:nn
+\cs_new:Npn \__zhnum_time_aux:nn
   {
     \bool_if:NTF \l__zhnum_time_bool
       { \__zhnum_time_aux:Nnnn \zhnum_int:n { } }
@@ -648,7 +648,7 @@
 \prop_new:N \l__zhnum_cfg_map_var_prop
 \prop_new:N \l__zhnum_cfg_map_finan_prop
 \prop_new:N \l__zhnum_cfg_map_ganzhi_prop
-\cs_new_protected_nopar:Npn \zhnum_parse_config:
+\cs_new_protected:Npn \zhnum_parse_config:
   {
     \prop_map_function:NN \l__zhnum_cfg_map_prop \zhnum_check_simp:nn
     \prop_map_function:NN \l__zhnum_cfg_map_ganzhi_prop \zhnum_assgin_ganzhi:nn
@@ -680,7 +680,7 @@
       }
       { \tl_set:cn { l__zhnum_ #2 _tl } {#1} }
   }
-\cs_new_protected_nopar:Npn \zhnum_assgin_const:
+\cs_new_protected:Npn \zhnum_assgin_const:
   {
     \prop_map_function:NN \l__zhnum_cfg_map_prop \zhnum_check_financial:nn
     \zhnum_set_alias:
@@ -701,7 +701,7 @@
           { c__zhnum_ #1 _tl } { \exp_not:c { l__zhnum_ #1 _tl } }
       }
   }
-\cs_new_protected_nopar:Npn \zhnum_set_zero:
+\cs_new_protected:Npn \zhnum_set_zero:
   {
     \tl_set:cx { l__zhnum_0_tl }
       {
@@ -709,7 +709,7 @@
           { \exp_not:o \l__zhnum_null_tl } { \exp_not:v { l__zhnum_0_tl } }
       }
   }
-\cs_new_protected_nopar:Npn \zhnum_set_week_day:
+\cs_new_protected:Npn \zhnum_set_week_day:
   {
     \tl_set:Nx \l__zhnum_mon_tl
       { \exp_not:N \c__zhnum_weekday_tl \exp_not:v { l__zhnum_1_tl } }
@@ -754,7 +754,7 @@
     \cs_set_eq:NN \zhnum_assgin_const_tl:cx \tl_set:cx
   }
 \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__zhnum_zero_tl
                         \exp_not:c { c__zhnum_ 0 _tl }
@@ -842,9 +842,9 @@
     }
   \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__zhnum_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__zhnum_encoding_str }
         {
@@ -871,7 +871,7 @@
           \bool_if:NT \l__zhnum_active_char_bool { _active }
         }
     }
-  \cs_new_protected_nopar:Npn \zhnum_reset_config:
+  \cs_new_protected:Npn \zhnum_reset_config:
     { \zhnum_load_cfg:o { \l__zhnum_encoding_str } }
   \bool_new:N \l__zhnum_active_char_bool
   \bool_set_true:N \l__zhnum_active_char_bool
@@ -882,7 +882,7 @@
       { UTF8 , GBK , Big5 }
       {
         \str_set:Nx \l__zhnum_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__zhnum_encoding_str }
       } ,
     encoding          .default:n = { GBK } ,