easybook (5jun21)

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

2 files changed, 48 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 344c5f52665..080c7f9e569 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -13,7 +13,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2021/06/03}{1.25r}{beta}
+\ProvidesExplPackage{easybase}{2021/06/05}{1.25t}{beta}
 
 \cs_generate_variant:Nn \eb_ctex_define:nn { nx }
 \cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -46,12 +46,24 @@
   }
 \NewDocumentCommand{\eb@package@load}{O{}m}
   {
-    \seq_set_from_clist:No \l__eb_package_name_seq {#2}
+    \seq_set_split:Nnn \l__eb_package_name_seq { + } {#2}
     \int_compare:oNnT
       { \seq_count:N \l__eb_package_name_seq } = { 1 }
       { \PassOptionsToPackage{#1}{#2} }
     \seq_map_inline:Nn \l__eb_package_name_seq
-      { \@ifpackageloaded{##1}{}{\RequirePackage{##1}} }
+      {
+        \regex_match:nnTF { [^\w] } {##1}
+          {
+            \regex_split:nnNT { \[ } {##1} \l_tmpa_seq
+              { \seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl }
+            \@ifpackageloaded{\l_tmpa_tl}{}
+              {
+                \exp_last_unbraced:Nx \RequirePackage
+                  { [\seq_use:Nn \l_tmpa_seq { , } }{\l_tmpa_tl}
+              }
+          }
+          { \@ifpackageloaded{##1}{}{\RequirePackage{##1}} }
+      }
   }
 \cs_new_protected:Npn \eb_at_end_preamble:n
   { \ctex_gadd_ltxhook:nn { env/document/before } }
@@ -81,12 +93,8 @@
 
 \clist_map_inline:nn
   {
-    { svgnames } { xcolor },
-    { stable } { footmisc },
-    { normalem } { ulem },
     { protrusion = false } { microtype },
     { list = off } { bicaption },
-    { shortlabels,inline } { enumitem },
     { many } { tcolorbox },
     { xindy } { imakeidx },
     { CJKmath } { xeCJK },
@@ -159,15 +167,17 @@
 
 \eb@package@load
   {
-    xcolor,
-    footmisc,setspace,
-    amsmath,amsthm,thmtools,
-    chemformula,siunitx,ulem,pifont,
-    geometry,marginnote,nccfoots,
-    pdfpages,graphicx,multicol,
-    fancyhdr,titletoc,caption,
-    tabularray,
-    enumitem,
+    xcolor[svgnames]+
+    footmisc[stable,bottom]+
+    ulem[normalem]+
+    enumitem[shortlabels,inline]+
+    amsmath+amsthm+thmtools+
+    chemformula+siunitx+pifont+
+    geometry+marginnote+nccfoots+
+    pdfpages+multicol+
+    fancyhdr+titletoc+caption+
+    tabularray+
+    setspace+
     listings
   }
 \cs_new_protected:Npn \eb_package_later_bool:nn #1#2
@@ -517,14 +527,14 @@
     \ctex_define:n { tocset/#1 .meta:nn = { ctex/tocset/#1 } {##1} }
     \eb_ctex_define:nn { tocset }
       {
-        #1/format .tl_set:c = l__eb_toc_#1_format_tl,
-        #1/format+ .code:n  =
+        #1/format .tl_set:c   = l__eb_toc_#1_format_tl,
+        #1/format+ .code:n    =
           { \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1} },
-        #1/format~+ .code:n =
+        #1/format~+ .code:n   =
           { \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1} },
-        #1/indent .tl_set:c = l__eb_toc_#1_indent_tl,
-        #1/rule .tl_set:c   = l__eb_toc_#1_rule_tl,
-        #1/numsep .tl_set:c = eb@toc@#1@numsep
+        #1/indent .dim_set:c  = l__eb_toc_#1_indent_dim,
+        #1/rule .tl_set:c     = l__eb_toc_#1_rule_tl,
+        #1/numsep .tl_set:c   = eb@toc@#1@numsep
       }
     \seq_if_in:NnF \c__eb_toc_heading_level_seq { subsection }
       {
@@ -533,8 +543,8 @@
       }
     \seq_pop:NN \c__eb_toc_heading_level_seq \l_tmpa_tl
     \titlecontents{#1}
-      [\use:c { l__eb_toc_#1_indent_tl }]
-      {\use:c { l__eb_toc_#1_format_tl }}
+      [\dim_use:c { l__eb_toc_#1_indent_dim }]
+      {\tl_use:c { l__eb_toc_#1_format_tl }}
       {
         \ifbool{eb@titletoc@hang@fix}
           {
@@ -547,7 +557,7 @@
               }
           }{}
       }{}
-      {\use:c { l__eb_toc_#1_rule_tl }}
+      {\tl_use:c { l__eb_toc_#1_rule_tl }}
   }
 \seq_map_function:NN
 \c__eb_toc_heading_level_seq \eb_toc_assign_keys:n
@@ -866,8 +876,8 @@
           { \bisection{\eb@toc@title}{\eb@bitoc@title} }
       }{
         \IfBooleanTF{#2}
-          {\eb_title_mark_notoc:n {\eb@toc@title}}
-          {\eb_title_mark_intoc:n {\eb@toc@title}}
+          {\eb_title_mark_notoc:n { \eb@toc@title }}
+          {\eb_title_mark_intoc:n { \eb@toc@title }}
       }
   }
 \cs_new_protected:Npn \eb_biber_title_level_bool:n #1
@@ -1068,7 +1078,7 @@
         \c__eb_subfont_math_charter_tl
           { \eb_put_newtxmath:n { charter,noOT1 } }
       }
-      { \eb@package@load{newtxmath,bm} }
+      { \eb@package@load{newtxmath+bm} }
   }
 
 \fp_new:N \l__eb_spread_line_fp
@@ -1165,19 +1175,18 @@
   }
 
 \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
-\skip_set:Nn \floatsep { 12pt plus 2pt minus 2pt }
 \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
 \skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt }
-\skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt }
-\skip_set:Nn \@fpsep { 8pt plus 2.0fil }
 \skip_set:Nn \multicolsep { 10pt plus 4pt minus 3pt }
+\skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt }
 \setcounter{topnumber}{4}
 \setcounter{bottomnumber}{4}
 \setcounter{totalnumber}{8}
-\tl_gset:Nn \textfraction { 0.18 }
-\tl_gset:Nn \topfraction { 0.85 }
-\tl_gset:Nn \bottomfraction { 0.65 }
-\tl_gset:Nn \floatpagefraction { 0.60 }
+\tl_gset:Nn \textfraction { 0.15 }
+\tl_gset:Nn \topfraction { 0.8 }
+\tl_gset:Nn \bottomfraction { 0.8 }
+\tl_gset:Nn \floatpagefraction { 0.9 }
+\tl_gset:Nn \dblfloatpagefraction { 0.9 }
 \tl_gset:Nn \ULthickness { 0.75pt }
 \allowdisplaybreaks[4]
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
@@ -1294,7 +1303,7 @@
 \eb_at_end_preamble:n
   {
     \exp_last_unbraced:No
-    \declaretheoremstyle{\c__eb_thmtools_keyval_tl}{easy-theorem}
+    \declaretheoremstyle { \c__eb_thmtools_keyval_tl }{easy-theorem}
     \eb_thmname_set:nnn { exercise } { Exercise } { 练习 }
     \cs_undefine:N \proof
     \clist_map_inline:nn
@@ -1513,7 +1522,7 @@
       {
         standard~jigsaw,
         nobeforeafter,tcbox~raise~base,
-        top = 1.25rt,bottom = 1.25rt,left = 1.25rt,right = 1.25rt,
+        top = 1.25tt,bottom = 1.25tt,left = 1.25tt,right = 1.25tt,
         boxrule = 0.75pt,arc = 1pt,
         colback = #1,opacityback = 0.12,colframe = #1,#3
       }{#2}
@@ -1827,6 +1836,7 @@
 \labelformat{chapter}{\CTEXthechapter}
 \labelformat{figure}{\figurename~#1}
 \labelformat{table}{\tablename~#1}
+\cs_if_free:NT \bibname { \cs_set_eq:NN \bibname \refname }
 \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
   {
     \keys_set_known:nn { ctex }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index ac15dd95853..5a86c9f4054 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -13,7 +13,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/06/03}{1.25r}{beta}
+\ProvidesExplClass{easybook}{2021/06/05}{1.25t}{beta}
 
 \bool_set_false:N \l__eb_compile_draft_bool
 \bool_set_false:N \l__eb_title_newline_bool