From 8c307687e0e09e8cbc6ed56f687cf3dc3fc76a57 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Mar 2022 21:59:24 +0000 Subject: easybook (11mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62629 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/easybook/easybook.dtx | 88 +++++++++++----------- 1 file changed, 43 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index cb9c5ee12e4..15185e97b73 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/03/10}{1.643} +\ProvidesExplClass{easybook}{2022/03/11}{1.645} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/03/10}{1.643} +\ProvidesExplPackage{easybase}{2022/03/11}{1.645} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -324,19 +324,16 @@ \seq_set_from_clist:Nn \l_tmpa_seq {#1} \seq_map_inline:Nn \l_tmpa_seq {#2} } -\cs_new_protected:Npn \eb_char_patch_cmd:wnn #1#2#3 +\cs_new_protected:Npn \eb_char_patch_cmd:Nnn #1#2#3 { \ExplSyntaxOn\makeatletter - \eb_patch_cmd:wnn {#1} {#2} {#3} + \eb_patch_cmd:Nnn {#1} {#2} {#3} \ExplSyntaxOff\makeatother } -\cs_new_protected:Npn \eb_patch_cmd:wnn #1#2#3 +\cs_new_protected:Npn \eb_patch_cmd:Nnn #1#2#3 { - \eb_seq_map_inline:nn {#1} - { - \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3} - { } { \ctex_patch_failure:N ##1 } - } + \ctex_patch_cmd_once:NnnnTF #1 { } {#2} {#3} + { } { \ctex_patch_failure:N #1 } } \cs_new_protected:Npn \eb_preto_cmd:nn #1#2 { \AddToHook{cmd/#1/before}{#2} } @@ -507,7 +504,6 @@ pdfpages+multicol+ fancyhdr+titletoc+caption+ tabularray+ - setspace+ listings } \cs_new_protected:Npn \eb_package_date_check:nn #1#2 @@ -876,10 +872,10 @@ { fnfirstindent .dim_set:N = \fnfirstindent, fnfirstindent .initial:n = 0.8em, - fnparskip .skip_set:N = \fnparskip, - fnparskip .initial:n = 0ex plus .1ex, fnafterindent .tl_set:N = \fnafterindent, fnafterindent .initial:n = 2em, + fnparskip .skip_set:N = \fnparskip, + fnparskip .initial:n = 0ex plus .1ex, fnpara-form .tl_set:N = \l__eb_fnpara_format_tl, fntext-pos .tl_set:N = \l__eb_fntext_position_tl, fntext-pos .initial:n = super, @@ -932,7 +928,7 @@ \eb_fnpara_if_pos_bottom: } \cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont } -\cs_new:Npn \eb@footmisc@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi } +\cs_new:Npn \eb@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi } \cs_new_protected:Npn \eb_fnpara_if_pos_bottom: { \bool_if:NT \l__eb_fnpara_bottom_bool @@ -943,24 +939,25 @@ \cs_set:Npn \@makecol { \setbox\@outputbox\box\@cclv + \let\@elt\relax \xdef\@freelist{\@freelist\@midlist} \global\let\@midlist\@empty \@combinefloats - \eb@footmisc@ifvoid\footins{} + \eb@ifvoid\footins{} { \setbox\@outputbox\vbox - \bgroup - \boxmaxdepth\@maxdepth - \unvbox\@outputbox - \vfill\relax - \vskip\skip\footins - \color@begingroup - \normalcolor\footnoterule - \unvbox\footins - \color@endgroup - \egroup + { + \boxmaxdepth\@maxdepth + \unvbox\@outputbox + \vfill\relax + \vskip\skip\footins + \color@begingroup + \normalcolor\footnoterule + \unvbox\footins + \color@endgroup + } } - \eb@footmisc@ifvoid\@kludgeins + \eb@ifvoid\@kludgeins {\@makespecialcolbox} { \setbox\@outputbox\vbox to\@colht @@ -1035,17 +1032,21 @@ \tl_if_eq:NnT \l__eb_footnote_value_tl { hang } { \par } \group_end: } -\eb_patch_cmd:wnn { \@footnotetext,\@mpfootnotetext } - { \reset@font } +\eb_seq_map_inline:nn { \@footnotetext,\@mpfootnotetext } { - \setspread{\fp_use:N \l__eb_spread_footnote_fp} - \tl_use:N \l__eb_subfont_footnote_tl + \eb_patch_cmd:Nnn #1 + { \reset@font } + { + \setspread{\fp_use:N \l__eb_spread_footnote_fp} + \tl_use:N \l__eb_subfont_footnote_tl + } } \cs_set_eq:NN \eb@@makefntext \@makefntext \cs_set_eq:NN \eb@@footnotetext \@footnotetext \ctex_at_end_package:nn { footmisc } { \eb_package_date_check:nn { footmisc } { 2022/02/10 } + \boolfalse{FN@setspace} \ifbool{FN@para}{} { \cs_set_eq:NN \@makefntext \eb@@makefntext @@ -1055,12 +1056,7 @@ { bool {FN@hangfoot} or bool {FN@perpage} or - bool {FN@robust} or - ( - notbool {FN@abovefloats} and - bool {FN@fixskip} and - test {\ifnumcomp{\FN@bottomcases}{=}{1}} - ) + bool {FN@robust} } {\msg_warning:nn { easybase } { footmisc }}{} } @@ -1626,7 +1622,6 @@ \ctex_at_end_package:nn { imakeidx } { - \makeindex \RenewDocumentCommand{\printindex}{st+od()} { \group_begin: @@ -1657,7 +1652,7 @@ \ctex_assign_heading_name:nn { biappendix } {#1} \int_compare:nNnTF { \c@chapter } > { 0 } { - \eb_char_patch_cmd:wnn \CTEX@addbitocline + \eb_char_patch_cmd:Nnn \CTEX@addbitocline { \def\CTEX@prechapter{\CTEX@prebichapter} \def\CTEX@thechapter{\CTEX@bichapter@number} @@ -1944,7 +1939,7 @@ spacebelow = 0ex plus .1ex, headindent = 0em, within = \bool_if:NT \l__eb_class_mode_book_bool { chapter }, - headpunct = {}, + headpunct = :, headfont = \color{ctex@emph}\sffamily, bodyfont = \normalfont, postheadspace = 1em @@ -1979,14 +1974,17 @@ aligned,alignedat,gathered,multlined,lgathered,rgathered } { \setspread{\fp_use:N \l__eb_spread_math_fp} } -\eb_patch_cmd:wnn +\eb_seq_map_inline:nn { \start@gather,\start@align,\start@multline } - { \collect@body } { - \setspread{\fp_use:N \l__eb_spread_math_fp} - \collect@body + \eb_patch_cmd:Nnn #1 + { \collect@body } + { + \setspread{\fp_use:N \l__eb_spread_math_fp} + \collect@body + } } -\eb_patch_cmd:wnn \gather@split +\eb_patch_cmd:Nnn \gather@split { \spread@equation } { \setspread{\fp_use:N \l__eb_spread_math_fp} @@ -2325,7 +2323,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/10}{1.643} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/11}{1.645} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3