easybook (2feb21)

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

1 files changed, 48 insertions, 40 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index c89eaa7325e..34602785126 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -9,7 +9,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/01}{1.22}{}
+\ProvidesExplClass{easybook}{2021/02/02}{1.23}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -137,26 +137,36 @@
     notomath  .initial:n = true
   }
 
-\RequirePackage[svgnames]{xcolor}
-\RequirePackage{pdfpages,subfiles}
-\includepdfset{fitpaper = true}
-\RequirePackage[hang,stable]{footmisc}
-\RequirePackage{setspace,zhlineskip}
-\RequirePackage{amsthm,thmtools,cases}
-\RequirePackage{chemformula,chemfig,siunitx}
-\RequirePackage[normalem]{ulem}
-\RequirePackage[protrusion = false]{microtype}
-\RequirePackage{geometry,marginnote}
-\RequirePackage{rotfloat,graphicx}
-\RequirePackage{nccfoots,tablefootnote}
-\RequirePackage{fancyhdr,titletoc}
-\RequirePackage{caption,bicaption,subcaption}
-\RequirePackage{zhlipsum,fontawesome,pifont}
-\RequirePackage{tabularx,multirow,makecell,booktabs}
-\RequirePackage{paralist,tasks}
-\RequirePackage[shortlabels,inline]{enumitem}
-\RequirePackage[most]{tcolorbox}
-\RequirePackage[xindy]{imakeidx}
+\clist_map_inline:nn
+  {
+    {svgnames}{xcolor},
+    {hang,stable}{footmisc},
+    {normalem}{ulem},
+    {protrusion = false}{microtype},
+    {shortlabels,inline}{enumitem},
+    {most}{tcolorbox},
+    {xindy}{imakeidx}
+  }{\PassOptionsToPackage#1}
+\RequirePackage
+  {
+    xcolor,
+    pdfpages,subfiles,
+    footmisc,
+    setspace,zhlineskip,
+    amsthm,thmtools,cases,
+    chemformula,chemfig,siunitx,ulem,
+    microtype,
+    geometry,marginnote,
+    rotfloat,graphicx,
+    nccfoots,tablefootnote,
+    fancyhdr,titletoc,
+    caption,bicaption,subcaption,
+    zhlipsum,fontawesome,pifont,
+    tabularx,multirow,makecell,booktabs,
+    paralist,tasks,enumitem,
+    tcolorbox,
+    imakeidx
+  }
 \RequirePackage[
   lang = {chinese-utf8},
   type = {CC},
@@ -265,18 +275,7 @@
   }
 \cs_if_exist:NF \kaishu{\cs_gset_eq:NN \kaishu\normalfont}
 
-\clist_new:N \g__geometry_clist
-\__ctex_define:nn {geoset}
-  {
-    unknown .code:n =
-      {
-        \clist_gput_right:Nx \g__geometry_clist
-          {
-            \l_keys_key_str
-            \tl_if_empty:NF \l_keys_value_tl{ = {#1}}
-          }
-      }
-  }
+\includepdfset{fitpaper = true}
 \geometry
   {
     vmargin = 2.54cm,
@@ -289,6 +288,18 @@
     marginparsep = 8pt,
     marginparwidth = 2.54cm
   }
+\clist_new:N \g__geometry_clist
+\__ctex_define:nn {geoset}
+  {
+    unknown .code:n =
+      {
+        \clist_gput_right:Nx \g__geometry_clist
+          {
+            \l_keys_key_str
+            \tl_if_empty:NF \l_keys_value_tl{ = {#1}}
+          }
+      }
+  }
 
 \cs_gset:Npn \cleardoublepage
   {
@@ -1148,10 +1159,7 @@
     rulecolor = \color{ctex@frame},
     commentstyle = \color{gray},
     emphstyle = \color{ctex@emph},
-    emph =
-      {
-        bibset,bibtex,biber,caption,config,easybook,elfont,linktopage,subcaption,tabularx,thmtools
-      },
+    emph = {caption,subcaption,tabularx},
     keywordstyle = \lst@ifdisplaystyle\bfseries\color{ctex@emph}\else\color{ctex@verb}\fi,
     morekeywords =
       {
@@ -1232,14 +1240,14 @@
     linkcolor         .choice:,
     \clist_map_function:nN
       {
-        {graphite,  626262,0000B2,005752},
+        {fresh,     62d71f,0000B2,005752},
         {cutepink,  ff69b4,9d5196,57b5e5},
         {skyblue,   0000ff,004986,eb6877},
         {crimson,   dc143c,00c1c9,afcd20}
       }
       \__linkcolor_set:n,
-    linkcolor         .default:n = graphite,
-    linkcolor         .initial:n = graphite,
+    linkcolor         .default:n = fresh,
+    linkcolor         .initial:n = fresh,
 
     linktopage        .choice:,
     linktopage/true   .code:n = {\__put_hyperref:n {linktocpage}},