easybook (12jul21)

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

3 files changed, 27 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 42632411312..5e03fb2e6af 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/07/10}{1.27}
+\ProvidesExplPackage{easybase}{2021/07/11}{1.27b}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \ctex_define:nn { nx }
@@ -126,7 +126,6 @@
     { protrusion = false } { microtype },
     { list = off } { bicaption },
     { many } { tcolorbox },
-    { xindy } { imakeidx },
     { upint } { newtxmath },
     { svgnames } { xcolor }
   }
@@ -194,7 +193,7 @@
     enumitem[shortlabels,inline]+
     chemformula+siunitx+pifont+
     amsthm+thmtools+
-    geometry+marginnote+nccfoots+
+    geometry+marginnote+
     pdfpages+multicol+
     fancyhdr+titletoc+caption+
     tabularray+
@@ -509,14 +508,29 @@
           }
       }
   }
+\tl_clear:N \@thefnmark
+\cs_new:Npn \eb@makefnmark #1
+  {
+    \tl_if_empty:oF {#1}
+      {
+        \group_begin:
+        \unrestored@protected@xdef\@thefnmark{#1}
+        \group_end:
+      }
+  }
+\cs_new:Npn \Footnote #1 { \Footnotemark{#1}\@footnotetext }
+\cs_new:Npn \Footnotemark #1 { \eb@makefnmark{#1}\@footnotemark }
+\cs_new:Npn \Footnotetext #1 { \eb@makefnmark{#1}\@footnotetext }
 \cs_new:Npn \eb_alph:n #1 { \int_to_alph:v { c@#1 } }
 \cs_set:Npn \thefootnote { \eb_footnote_counter:N \c@footnote }
 \cs_set:Npn \thempfootnote { \eb_alph:n { mpfootnote } }
 
 \contentsuse{lstlisting}{lol}
+\seq_put_left:Nn  \c__ctex_headings_seq { chapter }
 \seq_put_right:Nn \c__ctex_headings_seq { figure }
 \seq_put_right:Nn \c__ctex_headings_seq { table }
 \seq_put_right:Nn \c__ctex_headings_seq { lstlisting }
+\seq_remove_duplicates:N \c__ctex_headings_seq
 \cs_new_protected:Npn \eb_toc_assign_keys:n #1
   {
     \ctex_define:n { tocset/#1 .meta:nn = { ctex/tocset/#1 } {##1} }
@@ -977,12 +991,6 @@
 
 \ctex_at_end_package:nn { imakeidx }
   {
-    \makeindex[
-      options   = -M~texindy~-C~utf8,
-      program   = truexindy,
-      columns   = 2,
-      columnsep = 2\ccwd
-      ]
     \RenewDocumentCommand{\printindex}{st+oD(){\imki@jobname}}
       {
         \group_begin:
@@ -1000,7 +1008,6 @@
         \group_end:
       }
   }
-
 \ctex_define:nn { chapter }
   {
     biname .code:n      =
@@ -1209,6 +1216,13 @@
 \tl_gset:Nn \ULthickness { \l__eb_rule_width_dim }
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
 
+\cs_new_protected:Npn \hangpara #1#2
+  { \hangindent #1\hangafter #2\noindent\ignorespaces }
+\NewDocumentEnvironment{hangparas}{mm+b}
+  {
+    \dim_zero:N \parindent
+    \everypar{\hangpara{#1}{#2}}#3\par
+  }{}
 \cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2
   { \SetEnumitemValue{label}{#1}{\color{ctex@emph}#2} }
 \clist_map_inline:nn
@@ -1718,7 +1732,7 @@
     abcdefghijklmnopqrstuvwxyz
     0123456789
   }
-\ctex_at_end_preamble:n
+\AtBeginDocument[hyperref]
   {
     \LoadPackage{hyperref}
     \urlstyle{same}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 46748101409..71bdb194ccd 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/07/10}{1.27}
+\ProvidesExplClass{easybook}{2021/07/11}{1.27b}
   {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 684131c67ff..f4b55d529a4 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -11,7 +11,7 @@
 %% conditions of the CC-BY 4.0 License.
 %% The latest version of this license is in
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/10}{1.27}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/11}{1.27b}
   {Customization of tcolorbox for easybook}
 
 \cs_new_protected:Npn \eb_tcb_theorem_set:n #1