easybook (15jan21)

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

1 files changed, 35 insertions, 63 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 6e9111e6a99..8e5273e3ee6 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -9,12 +9,12 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/01/14}{1.21d}{}
+\ProvidesExplClass{easybook}{2021/01/15}{1.21e}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
 \cs_generate_variant:Nn \dim_add:Nn {NV}
-\cs_new_protected:Npn \__ctex_define:n #1
+\cs_new_protected:Npn \__ctex_define:nn #1
   {\keys_define:nn {ctex/#1}}
 \cs_new_protected:Npn \__put_ctexbook:n #1
   {\PassOptionsToClass{#1}{ctexbook}}
@@ -110,13 +110,12 @@
     bibset              .meta:nn = {ctex/bibset}{#1},
     thmset              .meta:nn = {ctex/thmset}{#1},
     geoset              .meta:nn = {ctex/geoset}{#1},
-    hdrset              .meta:nn = {ctex/hdrset}{#1},
     tocset              .meta:nn = {ctex/tocset}{#1},
     config              .tl_set:N = \g__config_tl,
     lstlistlistingname  .tl_set:N = \lstlistlistingname,
     lstlistingname      .tl_set:N = \lstlistingname
   }
-\__ctex_define:n {style}
+\__ctex_define:nn {style}
   {
     capdash   .bool_set:N = \l__capdash_bool,
     capdash   .default:n = true,
@@ -147,8 +146,6 @@
 \RequirePackage{siunitx,physics,bm}
 \RequirePackage[normalem]{ulem}
 \RequirePackage[protrusion = false]{microtype}
-\RequirePackage{hologo}
-\hologoSetup{discretionarybreak = true}
 \RequirePackage{rotfloat}
 \RequirePackage{geometry,marginnote,changepage}
 \RequirePackage{nccfoots,tablefootnote}
@@ -156,7 +153,7 @@
 \RequirePackage{caption,bicaption,subcaption}
 \RequirePackage{graphicx,wrapfig}
 \RequirePackage{zhlipsum,fontawesome,pifont}
-\RequirePackage{tabularx,multirow,makecell,tabu,booktabs}
+\RequirePackage{tabularx,multirow,makecell,booktabs}
 \RequirePackage{paralist,tasks}
 \RequirePackage[shortlabels,inline]{enumitem}
 \RequirePackage[most]{tcolorbox}
@@ -265,7 +262,7 @@
 \cs_if_exist:NF \kaishu{\cs_gset_eq:NN \kaishu\normalfont}
 
 \clist_new:N \g__geometry_clist
-\__ctex_define:n {geoset}
+\__ctex_define:nn {geoset}
   {
     unknown .code:n =
       {
@@ -305,34 +302,16 @@
     \pagenumbering{Roman}
   }
 
-\__ctex_define:n {hdrset}
-  {
-    elhead  .tl_set:N = \l__fancyhead_EL_tl,
-    elhead  .initial:n = \color{ctex@frame}\thepage,
-    echead  .tl_set:N = \l__fancyhead_EC_tl,
-    echead  .initial:n = \color{ctex@frame}\kaishu\leftmark,
-    erhead  .tl_set:N = \l__fancyhead_ER_tl,
-    erhead  .initial:n = {},
-    olhead  .tl_set:N = \l__fancyhead_OL_tl,
-    olhead  .initial:n = {},
-    ochead  .tl_set:N = \l__fancyhead_OC_tl,
-    ochead  .initial:n = \color{ctex@frame}\kaishu\rightmark,
-    orhead  .tl_set:N = \l__fancyhead_OR_tl,
-    orhead  .initial:n = \color{ctex@frame}\thepage,
-    elfoot  .tl_set:N = \l__fancyfoot_EL_tl,
-    elfoot  .initial:n = {},
-    ecfoot  .tl_set:N = \l__fancyfoot_EC_tl,
-    ecfoot  .initial:n = {},
-    erfoot  .tl_set:N = \l__fancyfoot_ER_tl,
-    erfoot  .initial:n = {},
-    olfoot  .tl_set:N = \l__fancyfoot_OL_tl,
-    olfoot  .initial:n = {},
-    ocfoot  .tl_set:N = \l__fancyfoot_OC_tl,
-    ocfoot  .initial:n = {},
-    orfoot  .tl_set:N = \l__fancyfoot_OR_tl,
-    orfoot  .initial:n = {}
+\ctex_define:n
+  {
+    hdrset  .tl_set:N = \l__fancyhf_content_tl,
+    hdrset  .initial:n =
+      {
+        \fancyhead[EC]{\color{ctex@frame}\kaishu\leftmark}
+        \fancyhead[OC]{\color{ctex@frame}\kaishu\rightmark}
+        \fancyhead[EL,OR]{\color{ctex@frame}\thepage}
+      }
   }
-
 \ctex_at_end_preamble:n
   {
     \exp_args:NV \geometry\g__geometry_clist
@@ -367,18 +346,7 @@
                   }
               }
           }
-        \fancyhead[EL]{\l__fancyhead_EL_tl}
-        \fancyhead[EC]{\l__fancyhead_EC_tl}
-        \fancyhead[ER]{\l__fancyhead_ER_tl}
-        \fancyhead[OL]{\l__fancyhead_OL_tl}
-        \fancyhead[OC]{\l__fancyhead_OC_tl}
-        \fancyhead[OR]{\l__fancyhead_OR_tl}
-        \fancyfoot[EL]{\l__fancyfoot_EL_tl}
-        \fancyfoot[EC]{\l__fancyfoot_EC_tl}
-        \fancyfoot[ER]{\l__fancyfoot_ER_tl}
-        \fancyfoot[OL]{\l__fancyfoot_OL_tl}
-        \fancyfoot[OC]{\l__fancyfoot_OC_tl}
-        \fancyfoot[OR]{\l__fancyfoot_OR_tl}
+        \l__fancyhf_content_tl
         \cs_gset_eq:NN \ps@plain\ps@empty
       }{
         \cs_gset:Npn \chaptermark#1
@@ -397,12 +365,7 @@
                   }
               }{}
           }
-        \fancyhead[L]{\l__fancyhead_OL_tl}
-        \fancyhead[C]{\l__fancyhead_OC_tl}
-        \fancyhead[R]{\l__fancyhead_OR_tl}
-        \fancyfoot[L]{\l__fancyfoot_OL_tl}
-        \fancyfoot[C]{\l__fancyfoot_OC_tl}
-        \fancyfoot[R]{\l__fancyfoot_OR_tl}
+        \l__fancyhf_content_tl
         \cs_gset_eq:NN \ps@plain\ps@empty
       }
     \cs_gset:Npn \sectionmark#1
@@ -438,7 +401,7 @@
     tocset/subsection .meta:nn = {ctex/tocset/subsection}{#1},
     tocset/list       .meta:nn = {ctex/tocset/list}{#1},
   }
-\__ctex_define:n {tocset}
+\__ctex_define:nn {tocset}
   {
     part/format       .tl_set:N = \l__toc_part_format_tl,
     part/format       .initial:n =
@@ -478,6 +441,8 @@
     lists/rule        .initial:n = \tocrule{$\cdot$},
     lists/lolskip     .dim_set:N = \l__toc_lolskip_dim,
     lists/lolskip     .initial:n = 0.8pc,
+    lists/belowoffset .dim_set:N = \l__toc_listsoffset_dim,
+    lists/belowoffset .initial:n = 0pc,
 
     belowoffset       .dim_set:N = \l__toc_offset_dim,
     belowoffset       .initial:n = -1pc
@@ -528,6 +493,11 @@
     \addcontentsline{lol}{lstlisting}
       {\thelstlisting\hspace{\ccwd}\lst@@caption}
   }
+\__appto_cmd:Nn \@chapter
+  {
+    \addtocontents{lol}
+      {\protect\addvspace{\dim_use:N \l__toc_lolskip_dim}}
+  }
 
 \cs_new_protected:Npn \__markboth:n #1
   {
@@ -556,7 +526,7 @@
       \bool_if:NT \l__multoc_bool{\twocolumn}
     \fi
     \__title_mark:n {\contentsname}
-    \vspace*{\l__toc_offset_dim}
+    \vspace*{\dim_use:N \l__toc_offset_dim}
     \@starttoc{toc}
     \if@restonecol
       \twocolumn
@@ -574,7 +544,8 @@
       \bool_if:NT \l__multoc_bool{\twocolumn}
     \fi
     \__title_mark_intoc:n {\listfigurename}
-    \vspace*{\l__toc_offset_dim}
+    \dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim
+    \vspace*{\dim_use:N \l__toc_offset_dim}
     \@starttoc{lof}
     \if@restonecol
       \twocolumn
@@ -592,7 +563,8 @@
       \bool_if:NT \l__multoc_bool{\twocolumn}
     \fi
     \__title_mark_intoc:n {\listtablename}
-    \vspace*{\l__toc_offset_dim}
+    \dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim
+    \vspace*{\dim_use:N \l__toc_offset_dim}
     \@starttoc{lot}
     \if@restonecol
       \twocolumn
@@ -614,8 +586,8 @@
         \fi
       }
     \__title_mark_intoc:n {\lstlistlistingname}
-    \dim_add:NV \l__toc_offset_dim\l__toc_lolskip_dim
-    \vspace*{\l__toc_offset_dim}
+    \dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim
+    \vspace*{\dim_use:N \l__toc_offset_dim}
     \@starttoc{lol}
     \@ifundefined{@restonecoltrue}{}
       {
@@ -651,7 +623,7 @@
 \tl_new:N \l__foot_font_tl
 \tl_new:N \l__margin_font_tl
 
-\__ctex_define:n {elfont}
+\__ctex_define:nn {elfont}
   {
     tabfont .tl_set:N = \l__tab_font_tl,
     tabfont .initial:n = \sffamily\small,
@@ -723,7 +695,7 @@
 \tl_new:N \l__foot_spread_tl
 \tl_new:N \l__foot_fnsep_tl
 
-\__ctex_define:n {spread}
+\__ctex_define:nn {spread}
   {
     linespread  .fp_set:N = \l__line_spread_fp,
     linespread  .initial:n = 1.3,
@@ -827,7 +799,7 @@
 \tl_new:N \l__thm_spaceabove_tl
 \tl_new:N \l__thm_spacebelow_tl
 
-\__ctex_define:n {thmset}
+\__ctex_define:nn {thmset}
   {
     thmbox      .bool_set:N = \l__thmbox_bool,
     thmbox      .default:n = true,
@@ -1037,7 +1009,7 @@
 \tl_new:N \l__bib_citesty_tl
 \tl_new:N \l__bib_file_tl
 
-\__ctex_define:n {bibset}
+\__ctex_define:nn {bibset}
   {
     backend             .choice:,
     backend/bibtex      .code:n = {},