From fea8718c2af14b6b37cdf0f3cc39e52ecd941e39 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 9 Feb 2021 22:00:13 +0000 Subject: easybook (9feb21) git-svn-id: svn://tug.org/texlive/trunk@57689 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybook.cls | 74 ++++++++++++++++++----- 1 file changed, 59 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index d0d8ae2c1e7..7f1d5d12559 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/08}{1.23a}{} +\ProvidesExplClass{easybook}{2021/02/09}{1.23b}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -142,9 +142,9 @@ \RequirePackage { xcolor, - pdfpages,footmisc, - setspace,zhlineskip, - amsthm,thmtools,cases, + pdfpages, + footmisc,setspace, + amsmath,amsthm,thmtools,cases, chemformula,chemfig,siunitx,ulem, microtype, geometry,marginnote, @@ -688,22 +688,19 @@ \tl_new:N \l__math_spread_tl \tl_new:N \l__cap_spread_tl \tl_new:N \l__foot_spread_tl -\tl_new:N \l__foot_fnsep_tl \__ctex_define:nn {spread} { linespread .fp_set:N = \l__line_spread_fp, linespread .initial:n = 1.3, tabspread .fp_set:N = \l__tab_spread_fp, - tabspread .initial:n = 1, + tabspread .initial:n = 1.05, mathspread .tl_set:N = \l__math_spread_tl, - mathspread .initial:n = 1, + mathspread .initial:n = 1.05, capspread .tl_set:N = \l__cap_spread_tl, capspread .initial:n = 1, fnspread .tl_set:N = \l__foot_spread_tl, - fnspread .initial:n = 1, - fnsep .tl_set:N = \l__foot_fnsep_tl, - fnsep .initial:n = 0ex + fnspread .initial:n = 1 } \skip_set:Nn \parskip{0pt plus 2pt minus 1pt} @@ -877,8 +874,51 @@ } \allowdisplaybreaks[4] \cs_gset:Npn \ULthickness{.75pt} -\SetMathEnvironmentSinglespace{\l__math_spread_tl} \skip_set:Nn \jot{4pt plus 1pt minus 1pt} +\cs_new:Npn \l__math_restore:n #1 + { + \AtBeginEnvironment{#1} + {\linespread{\l__math_spread_tl}\selectfont\ignorespaces} + } +\l__math_restore:n {array} +\l__math_restore:n {matrix} +\l__math_restore:n {pmatrix} +\l__math_restore:n {bmatrix} +\l__math_restore:n {Bmatrix} +\l__math_restore:n {vmatrix} +\l__math_restore:n {Vmatrix} +\l__math_restore:n {cases} +\l__math_restore:n {aligned} +\l__math_restore:n {alignedat} +\l__math_restore:n {gathered} +\__patch_cmd:Nnn \start@gather + {\collect@body} + {\linespread{\l__math_spread_tl}\selectfont\collect@body} +\__patch_cmd:Nnn \start@align + {\collect@body} + {\linespread{\l__math_spread_tl}\selectfont\collect@body} +\__patch_cmd:Nnn \start@multline + {\collect@body} + {\linespread{\l__math_spread_tl}\selectfont\collect@body} +\__patch_cmd:Nnn \gather@split + {\spread@equation} + {\linespread{\l__math_spread_tl}\selectfont\spread@equation} +\l__math_restore:n {matrix*} +\l__math_restore:n {pmatrix*} +\l__math_restore:n {bmatrix*} +\l__math_restore:n {Bmatrix*} +\l__math_restore:n {vmatrix*} +\l__math_restore:n {Vmatrix*} +\l__math_restore:n {cases*} +\l__math_restore:n {dcases} +\l__math_restore:n {dcases*} +\l__math_restore:n {rcases} +\l__math_restore:n {rcases*} +\l__math_restore:n {drcases} +\l__math_restore:n {drcases*} +\l__math_restore:n {multlined} +\l__math_restore:n {lgathered} +\l__math_restore:n {rgathered} \ctex_after_end_preamble:n { \skip_set:Nn \abovedisplayskip{5pt plus 1pt minus 1pt} @@ -1097,7 +1137,11 @@ \ctex_at_end_preamble:n { \skip_set:Nn \footnotemargin{0.5\ccwd} - \skip_set:Nn \footnotesep{\l__foot_fnsep_tl} + \group_begin: + \footnotesize + \exp_args:Nx \linespread{\tl_use:N \l__foot_spread_tl}\selectfont + \skip_gset:Nn \footnotesep{\ht\strutbox} + \group_end: \cs_gset:Npn \hangfootparskip{0ex} \cs_gset:Npn \footnoterule { @@ -1120,10 +1164,10 @@ } } \__patch_cmd:Nnn \@footnotetext - {\def\baselinestretch{\ZhLS@footlinespread}\reset@font} + {\reset@font} {\def\baselinestretch{\l__foot_spread_tl}\l__foot_font_tl} \__patch_cmd:Nnn \@mpfootnotetext - {\def\baselinestretch{\ZhLS@footlinespread}\reset@font} + {\reset@font} {\def\baselinestretch{\l__foot_spread_tl}\l__foot_font_tl} \__patch_cmd:Nnn \@makefnmark {\normalfont}{\l__foot_font_tl} @@ -1249,7 +1293,7 @@ \clist_map_function:nN { {none, 000000,000000,000000}, - {seaside, 13abae,004986,a40000}, + {seaside, 1381b2,004986,a40000}, {energy, f39800,00a0e9,893895}, {cyberpunk, 005982,eb6877,a4005b} } -- cgit v1.2.3