summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-17 20:44:18 +0000
committerKarl Berry <karl@freefriends.org>2021-05-17 20:44:18 +0000
commitddff96ba716922034323f696c53dfb5f779c8371 (patch)
tree2fb171105a628c8f178138d0563b4508340d21aa /Master/texmf-dist/tex
parent25bf3c385956f2a5ba9856bc6f695e35b3985ae3 (diff)
easybook (17may21)
git-svn-id: svn://tug.org/texlive/trunk@59245 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls127
1 files changed, 62 insertions, 65 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 319cbc2336a..9e412b3a31b 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -13,12 +13,13 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/05/15}{1.25j}{beta}
+\ProvidesExplClass{easybook}{2021/05/17}{1.25k}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
\cs_generate_variant:Nn \int_to_arabic:n { v }
\cs_generate_variant:Nn \dim_add:Nn { NV }
\cs_generate_variant:Nn \eb_put_hyperref:n { x }
+\cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
\cs_new_protected:Npn \eb_ctex_define:nn #1
{ \keys_define:nn { ctex/#1 } }
\cs_new_protected:Npn \eb_put_ctexbook:n #1
@@ -28,15 +29,21 @@
\ctex_patch_cmd_once:NnnnTF #1 { } {#2} {#3}
{ } { \ctex_patch_failure:N #1 }
}
+\cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
+ {
+ \ctex_preto_cmd:NnnTF #1 { } {#2}
+ { } { \ctex_patch_failure:N #1 }
+ }
\cs_new_protected:Npn \eb_appto_cmd:Nn #1#2
{
\ctex_appto_cmd:NnnTF #1 { } {#2}
{ } { \ctex_patch_failure:N #1 }
}
-\cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
+\cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
{
- \ctex_preto_cmd:NnnTF #1 { } {#2}
- { } { \ctex_patch_failure:N #1 }
+ \seq_set_from_clist:No \l__eb_env_hook_name_seq {#1}
+ \seq_map_inline:Nn \l__eb_env_hook_name_seq
+ { \AtBeginEnvironment{##1}{#2} }
}
\cs_new_protected:Npn \eb_at_end_preamble:n
{ \ctex_gadd_ltxhook:nn { env/document/before } }
@@ -163,6 +170,7 @@
uppercase .bool_set:N = \l__eb_uppercase_bool,
uppercase .default:n = true,
uppercase .initial:n = true,
+ figpath .tl_set:N = \l_eb_graphics_path_tl,
footwith .choices:nn =
{ part,page,chapter }
@@ -188,12 +196,12 @@
{
xcolor,
footmisc,setspace,
- amsmath,amsthm,thmtools,cases,
+ amsmath,amsthm,thmtools,
chemformula,siunitx,ulem,pifont,
geometry,marginnote,nccfoots,
pdfpages,graphicx,
fancyhdr,titletoc,caption,
- tabularx,multirow,booktabs,
+ tabularray,
enumitem,
listings
}
@@ -511,6 +519,8 @@
\easyfoot[C]{\color{SlateGray}\sffamily\today}
\geometry{showframe}
}
+ \tl_if_empty:NF \l_eb_graphics_path_tl
+ { \exp_args:No \graphicspath { \l_eb_graphics_path_tl } }
}
\eb_at_end_preamble:n
@@ -1146,6 +1156,34 @@
marginpar .initial:n = \rmfamily\footnotesize
}
+\fp_new:N \l__eb_spread_line_fp
+\fp_new:N \l__eb_spread_table_fp
+\fp_new:N \l__eb_spread_math_fp
+\fp_new:N \l__eb_spread_caption_fp
+\fp_new:N \l__eb_spread_footnote_fp
+
+\eb_ctex_define:nn { spread }
+ {
+ line .fp_set:N = \l__eb_spread_line_fp,
+ line .initial:n = 1.3,
+ table .fp_set:N = \l__eb_spread_table_fp,
+ table .initial:n = 1.05,
+ math .fp_set:N = \l__eb_spread_math_fp,
+ math .initial:n = 1.05,
+ caption .fp_set:N = \l__eb_spread_caption_fp,
+ caption .initial:n = 1,
+ footnote .fp_set:N = \l__eb_spread_footnote_fp,
+ footnote .initial:n = 1,
+ spread-all .meta:n =
+ {
+ line = #1,
+ table = #1,
+ math = #1,
+ caption = #1,
+ footnote = #1
+ }
+ }
+
\DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}}
\DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
\DeclareCaptionFont{eb@table@font}{\l__eb_font_table_tl}
@@ -1176,6 +1214,19 @@
\captionsetup[figure][bi-second]{name = Figure}
\captionsetup[table][bi-second]{name = Table}
}
+\prop_gset_from_keyval:Nn \g__tblr_default_tblr_table_prop
+ { stretch = \fp_use:N \l__eb_spread_table_fp }
+\SetTblrDefault{rows = {abovesep = 4pt,belowsep = 2pt}}
+\eb_at_begin_environment:nn { tabular,tabularx }
+ {
+ \exp_args:Nx \linespread { \fp_use:N \l__eb_spread_table_fp }
+ \selectfont\ignorespaces
+ }
+\ctex_after_end_preamble:n
+ {
+ \exp_args:Nx \linespread { \fp_use:N \l__eb_spread_line_fp }
+ \selectfont\ignorespaces
+ }
\cs_new:Npn \eb_arabic:n #1 { \int_to_arabic:v { c@#1 } }
\cs_gset:cpn { thesection }
@@ -1198,50 +1249,6 @@
}
}
-\AtBeginEnvironment{tabularx}
- {
- \exp_args:Nx \linespread { \fp_use:N \l__eb_spread_table_fp }
- \selectfont\ignorespaces
- }
-\AtBeginEnvironment{tabular}
- {
- \exp_args:Nx \linespread { \fp_use:N \l__eb_spread_table_fp }
- \selectfont\ignorespaces
- }
-\ctex_after_end_preamble:n
- {
- \exp_args:Nx \linespread { \fp_use:N \l__eb_spread_line_fp }
- \selectfont\ignorespaces
- }
-
-\fp_new:N \l__eb_spread_line_fp
-\fp_new:N \l__eb_spread_table_fp
-\fp_new:N \l__eb_spread_math_fp
-\fp_new:N \l__eb_spread_caption_fp
-\fp_new:N \l__eb_spread_footnote_fp
-
-\eb_ctex_define:nn { spread }
- {
- line .fp_set:N = \l__eb_spread_line_fp,
- line .initial:n = 1.3,
- table .fp_set:N = \l__eb_spread_table_fp,
- table .initial:n = 1.05,
- math .fp_set:N = \l__eb_spread_math_fp,
- math .initial:n = 1.05,
- caption .fp_set:N = \l__eb_spread_caption_fp,
- caption .initial:n = 1,
- footnote .fp_set:N = \l__eb_spread_footnote_fp,
- footnote .initial:n = 1,
- spread-all .meta:n =
- {
- line = #1,
- table = #1,
- math = #1,
- caption = #1,
- footnote = #1
- }
- }
-
\skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
\skip_set:Nn \floatsep { 12pt plus 2pt minus 2pt }
\skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
@@ -1255,11 +1262,8 @@
\tl_gset:Nn \topfraction { 0.85 }
\tl_gset:Nn \bottomfraction { 0.65 }
\tl_gset:Nn \floatpagefraction { 0.60 }
-
-\newcolumntype{L}{X}
-\newcolumntype{C}{>{\centering\arraybackslash}X}
-\newcolumntype{R}{>{\raggedleft\arraybackslash}X}
-\graphicspath{{figures/}}
+\tl_gset:Nn \ULthickness { 0.75pt }
+\allowdisplaybreaks[4]
\DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
\cs_new_protected:Npn \eb_enumitem_labelval_set:nn #1#2
@@ -1421,23 +1425,16 @@
range-units = single,
group-digits = false
}
-\allowdisplaybreaks[4]
-\tl_gset:Nn \ULthickness { 0.75pt }
-\skip_set:Nn \jot { 4pt plus 1pt minus 1pt }
-\seq_const_from_clist:Nn \c__eb_math_spread_env_seq
+\eb_at_begin_environment:nn
{
array,matrix,pmatrix,bmatrix,Bmatrix,vmatrix,Vmatrix,
matrix*,pmatrix*,bmatrix*,Bmatrix*,vmatrix*,Vmatrix*,
cases,cases*,dcases,dcases*,rcases,rcases*,drcases,drcases*,
aligned,alignedat,gathered,multlined,lgathered,rgathered
}
-\seq_map_inline:Nn \c__eb_math_spread_env_seq
{
- \AtBeginEnvironment{#1}
- {
- \linespread{\fp_use:N \l__eb_spread_math_fp}
- \selectfont\ignorespaces
- }
+ \linespread{\fp_use:N \l__eb_spread_math_fp}
+ \selectfont\ignorespaces
}
\eb_patch_cmd:Nnn \start@gather
{ \collect@body }