From ce07680b939eecc96f42a3ee4e777c5c183503de Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Mon, 25 Oct 2021 03:03:38 +0000
Subject: CTAN sync 202110250303

---
 macros/latex/contrib/easybook/easybook.dtx | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'macros/latex/contrib/easybook/easybook.dtx')

diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 2872218cb2..325fce01e5 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/10/21}{1.40A}
+\ProvidesExplClass{easybook}{2021/10/21}{1.40B}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -34,7 +34,7 @@
     enmode .meta:n  = { newline,scheme = plain },
 
     font .choices:nn            =
-      { noto,garamond,times,libertine,palatino,auto }
+      { noto,garamond,times,times*,libertine,palatino,auto }
       { \tl_set:Nn \l__eb_font_choice_tl {#1} },
     font .value_required:n      = true,
     font .initial:n             = auto,
@@ -169,6 +169,12 @@
         Ligatures       = CommonOff
       }
   }
+\cs_new_protected:cpn { eb@font@load@times* }
+  {
+    \eb_setmainfont:nn { Times~New~Roman } { }
+    \eb_setsansfont:nn { Arial } { }
+    \eb_setmonofont:nn { Courier~New } { }
+  }
 \cs_new_protected:Npn \eb_font_load_libertinus_sans:
   {
     \eb_setsansfont:nn { LibertinusSans }
@@ -319,7 +325,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/21}{1.40A}
+\ProvidesExplPackage{easybase}{2021/10/21}{1.40B}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -887,7 +893,7 @@
 \clist_new:N \l__eb_footnote_mulchoice_clist
 \ctex_define:nn { hdrset }
   {
-    fnindent .dim_set:N             = \footnoteindent,
+    fnindent .dim_set:N             = \footindent,
     fnindent .initial:n             = 0.75em,
     fnparskip .skip_set:N           = \footparskip,
     fnparskip .initial:n            = 0ex,
@@ -995,8 +1001,8 @@
   {
     \hbox_set:Nn \l_tmpa_box
       {
-        \dim_compare:nNnTF { \footnoteindent } > { 0pt }
-          { \hbox_to_wd:nn { \footnoteindent } { \eb@makefnmark\hss } }
+        \dim_compare:nNnTF { \footindent } > { 0pt }
+          { \hbox_to_wd:nn { \footindent } { \eb@makefnmark\hss } }
           { \eb@makefnmark }
       }
     \dim_set:Nn \leftmargin { \box_wd:N \l_tmpa_box }
@@ -1012,19 +1018,19 @@
   {
     \noindent
     \clist_if_in:NnT \l__eb_footnote_mulchoice_clist { flush }
-      { \dim_zero:N \footnoteindent }
-    \int_case:nn { \dim_sign:V \footnoteindent }
+      { \dim_zero:N \footindent }
+    \int_case:nn { \dim_sign:V \footindent }
       {
         { 1 } { \use_i:nnn }
         { 0 } { \use_ii:nnn }
         { -1 } { \use_iii:nnn }
       }
-      { \hbox_to_wd:nn { \footnoteindent } { \hss\eb@makefnmark } }
+      { \hbox_to_wd:nn { \footindent } { \hss\eb@makefnmark } }
       { \hbox_overlap_left:n { \eb@makefnmark } }
       {
         \hbox_overlap_left:n
           {
-            \hbox_to_wd:nn { -\footnoteindent }
+            \hbox_to_wd:nn { -\footindent }
               { \eb@makefnmark\hss }
           }
       }
@@ -2459,7 +2465,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.40A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.40B}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
-- 
cgit v1.2.3

