easybook (22oct21)

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

3 files changed, 50 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 8feab5474ab..32dad49eba6 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -20,7 +20,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/21}{1.3X}
+\ProvidesExplPackage{easybase}{2021/10/21}{1.40}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -40,20 +40,19 @@
     \seq_set_from_clist:Nn \l_tmpa_seq {#1}
     \seq_map_inline:Nn \l_tmpa_seq {#2}
   }
-\cs_new_protected:Npn \eb_char_patch_cmd:nnn #1#2#3
+\cs_new_protected:Npn \eb_char_patch_cmd:wnn #1#2#3
   {
     \ExplSyntaxOn\makeatletter
+    \eb_patch_cmd:wnn {#1} {#2} {#3}
+    \ExplSyntaxOff\makeatother
+  }
+\cs_new_protected:Npn \eb_patch_cmd:wnn #1#2#3
+  {
     \eb_clist_map_inline:nn {#1}
       {
         \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
           { } { \ctex_patch_failure:N ##1 }
       }
-    \ExplSyntaxOff\makeatother
-  }
-\cs_new_protected:Npn \eb_at_end_patch_cmd:nnn #1#2#3
-  {
-    \eb_at_end_preamble:n
-      { \eb_char_patch_cmd:nnn {#1} {#2} {#3} }
   }
 \cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
   {
@@ -384,8 +383,8 @@
   }
 \ctex_define:nn { hdrset }
   {
-    head-foot .tl_set:N     = \l__eb_fancyhf_content_tl,
-    head-foot .initial:n    =
+    headfoot .tl_set:N      = \l__eb_fancyhf_content_tl,
+    headfoot .initial:n     =
       {
         \ifbool{@twoside}
           {
@@ -631,8 +630,8 @@
     fntext-num .value_required:n    = true,
     fntext-num/unknown .code:n      =
       { \eb_fnmate_short_label_set:nn {#1} { thefootnote } },
-    fnboth-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
-    fnboth-num .initial:n           = plain,
+    fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
+    fnmate-num .initial:n           = plain,
     unknown .code:n = \eb_msg_unknown_option:n { hdrset }
   }
 
@@ -783,7 +782,7 @@
         \@footnotemark
       }
   }
-\eb_at_end_patch_cmd:nnn { \@footnotetext,\@mpfootnotetext }
+\eb_patch_cmd:wnn { \@footnotetext,\@mpfootnotetext }
   { \reset@font }
   {
     \linespread{\fp_use:N \l__eb_spread_footnote_fp}
@@ -1005,8 +1004,8 @@
   {
     lolskip .skip_set:N     = \eb@toc@lolskip,
     lolskip .initial:n      = 10pt,
-    toc-voffset .skip_set:N = \l__eb_toc_voffset_skip,
-    toc-voffset .initial:n  =
+    tocvoffset .skip_set:N  = \l__eb_toc_voffset_skip,
+    tocvoffset .initial:n   =
       { \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.35pc } },
     line-align .bool_set:N  = \l__eb_toc_line_align_bool,
     line-align .default:n   = true,
@@ -1211,18 +1210,18 @@
 
 \ctex_define:nn { style }
   {
-    figure-con .tl_set:N    = \l__eb_figure_connector_tl,
-    table-con .tl_set:N     = \l__eb_table_connector_tl,
-    listing-con .tl_set:N   = \l__eb_lstlisting_connector_tl,
-    equation-con .tl_set:N  = \l__eb_equation_connector_tl,
-    number-con .meta:n      =
+    figure-connect .tl_set:N    = \l__eb_figure_connector_tl,
+    table-connect .tl_set:N     = \l__eb_table_connector_tl,
+    listing-connect .tl_set:N   = \l__eb_lstlisting_connector_tl,
+    equation-connect .tl_set:N  = \l__eb_equation_connector_tl,
+    connect-all .meta:n         =
       {
-        figure-con    = #1,
-        table-con     = #1,
-        listing-con   = #1,
-        equation-con  = #1
+        figure-connect          = #1,
+        table-connect           = #1,
+        listing-connect         = #1,
+        equation-connect        = #1
       },
-    number-con .initial:n   = { . },
+    connect-all .initial:n      = { . },
     unknown .code:n = \eb_msg_unknown_option:n { style }
   }
 \eb_clist_map_inline:nn
@@ -1400,7 +1399,7 @@
     \ctex_assign_heading_name:nn { biappendix } {#1}
     \int_compare:nNnTF { \c@chapter } > { 0 }
       {
-        \eb_char_patch_cmd:nnn \CTEX@addbitocline
+        \eb_char_patch_cmd:wnn \CTEX@addbitocline
           {
             \def\CTEX@prechapter{\CTEX@prebichapter}
             \def\CTEX@thechapter{\CTEX@bichapter@number}
@@ -1438,16 +1437,16 @@
 
 \ctex_define:nn { subfont }
   {
-    table-cap .tl_set:N     = \l__eb_subfont_table_tl,
-    table-cap .initial:n    = \sffamily\small,
-    figure-cap .tl_set:N    = \l__eb_subfont_figure_tl,
-    figure-cap .initial:n   = \sffamily\small,
-    listing-cap .tl_set:N   = \l__eb_subfont_listing_tl,
-    listing-cap .initial:n  = \sffamily\small,
-    footnote .tl_set:N      = \l__eb_subfont_footnote_tl,
-    footnote .initial:n     = \rmfamily,
-    marginpar .tl_set:N     = \marginfont,
-    marginpar .initial:n    = \rmfamily\footnotesize,
+    caption-table .tl_set:N     = \l__eb_subfont_table_tl,
+    caption-table .initial:n    = \sffamily\small,
+    caption-figure .tl_set:N    = \l__eb_subfont_figure_tl,
+    caption-figure .initial:n   = \sffamily\small,
+    caption-listing .tl_set:N   = \l__eb_subfont_listing_tl,
+    caption-listing .initial:n  = \sffamily\small,
+    footnote .tl_set:N          = \l__eb_subfont_footnote_tl,
+    footnote .initial:n         = \rmfamily,
+    marginpar .tl_set:N         = \marginfont,
+    marginpar .initial:n        = \rmfamily\footnotesize,
     unknown .code:n = \eb_msg_unknown_option:n { subfont }
   }
 
@@ -1471,11 +1470,11 @@
     footnote .initial:n = 1.2,
     spread-all .meta:n  =
       {
-        line      = #1,
-        table     = #1,
-        math      = #1,
-        caption   = #1,
-        footnote  = #1
+        line            = #1,
+        table           = #1,
+        math            = #1,
+        caption         = #1,
+        footnote        = #1
       },
     unknown .code:n = \eb_msg_unknown_option:n { spread }
   }
@@ -1735,7 +1734,7 @@
     notebraces .tl_set:N  = \l__eb_thm_notebraces_tl,
     unknown .code:n       = \eb_msg_unknown_option:n { thmset }
   }
-\eb_at_end_patch_cmd:nnn \thmt@setheadstyle
+\eb_patch_cmd:wnn \thmt@setheadstyle
   { \def\NAME{\the\thm@headfont ##1} }
   {
     \def\NAME
@@ -1806,14 +1805,14 @@
     \linespread{\fp_use:N \l__eb_spread_math_fp}
     \selectfont\ignorespaces
   }
-\eb_at_end_patch_cmd:nnn
+\eb_patch_cmd:wnn
   { \start@gather,\start@align,\start@multline }
   { \collect@body }
   {
     \linespread{\fp_use:N \l__eb_spread_math_fp}
     \selectfont\collect@body
   }
-\eb_at_end_patch_cmd:nnn \gather@split
+\eb_patch_cmd:wnn \gather@split
   { \spread@equation }
   {
     \linespread{\fp_use:N \l__eb_spread_math_fp}
@@ -1870,12 +1869,12 @@
     backend/biblatex .code:n    =
       { \bool_set_false:N \l__eb_backend_bibtex_bool },
 
-    bib-style .code:n           =
+    bibstyle .code:n            =
       { \tl_set:Nn \l__eb_bib_all_style_tl {#1} },
-    bib-style .value_required:n = true,
-    bib-style .initial:n        = numerical,
+    bibstyle .value_required:n  = true,
+    bibstyle .initial:n         = numerical,
 
-    cite-style .code:n          =
+    citestyle .code:n           =
       { \tl_set:Nn \l__eb_bib_cite_style_tl {#1} },
     datafile .clist_set:N       = \l__eb_bib_datafile_clist,
     bitoc-title .tl_set:N       = \l__eb_bib_en_bitoc_title_tl,
@@ -2083,7 +2082,7 @@
       \eb_link_color_set:n
     linkcolor .default:n  = navyblue,
     linkcolor .initial:n  = navyblue,
-    linkcol-all .code:n   =
+    linkcolor-all .code:n =
       { \eb_define_link_color:n { \exp_not:n {#1} } }
   }
 \ctex_define:nx { style }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index d36d0864bb9..f8a2810c8b6 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,7 +20,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/10/21}{1.3X}
+\ProvidesExplClass{easybook}{2021/10/21}{1.40}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index df58f4813dc..86f881e5143 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -18,7 +18,7 @@
 %% LaTeX version 2005/12/01 or later.
 %% 
 %% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.3X}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.40}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }