summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-03 20:49:33 +0000
committerKarl Berry <karl@freefriends.org>2021-06-03 20:49:33 +0000
commit41b9db706f551dc06872663be27b26beaa43f58d (patch)
tree51662d0501ca01db156311a438f5434dfd5c4712 /Master/texmf-dist/tex/latex
parent1806b3e4ed3a196750b03e34d082c6ada7d71a2a (diff)
easybook (3jun21)
git-svn-id: svn://tug.org/texlive/trunk@59454 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty114
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
2 files changed, 55 insertions, 61 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index bbff3cd8e9e..344c5f52665 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/06/02}{1.25q}{beta}
+\ProvidesExplPackage{easybase}{2021/06/03}{1.25r}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
\cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -117,7 +117,7 @@
\ctex_define:n
{
link .meta:nn = { ctex/link } {#1},
- lstlistlistingname .tl_set:N = \lstlistlistingname,
+ lstlistlistingname .tl_set:N = \listlstlistingname,
lstlistingname .tl_set:N = \lstlistingname
}
\eb_ctex_define:nn { style }
@@ -199,7 +199,7 @@
{
vmargin = 2.54cm,
hmargin = 3.17cm,
- columnsep = \ccwd,
+ columnsep = 2\ccwd,
headheight = 2.04cm,
headsep = 0.5cm,
footskip = 0.79cm,
@@ -877,69 +877,60 @@
{ \bisection*{#1}{\l__eb_bib_bitoc_title} }
\eb@nonumber@markdouble{#1}
}
-\cs_new_protected:Npn \eb_multoc_pre_bool:
+\cs_new_protected:Npn \eb_toc_multicol_bool:n #1
{
- \bool_if:NT \l__eb_multoc_bool
- { \begin{multicols}{\int_use:N \l__eb_toc_columns_int} }
- }
-\cs_new_protected:Npn \eb_multoc_post_bool:
- { \bool_if:NT \l__eb_multoc_bool { \end{multicols} } }
-\RenewDocumentCommand{\tableofcontents}{t+oD(){}}
- {
- \group_begin:
- \tl_set_eq:NN \eb@toc@title \contentsname
- \tl_set:Nn \eb@bitoc@title { Contents }
- \IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
- \eb_title_mark_notoc:n { \eb@toc@title }
- \eb_multoc_pre_bool:
- \vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \@starttoc{toc}#3
- \IfBooleanT{#1}
+ \bool_if:NTF \l__eb_multoc_bool
{
- \eb_title_mark_notoc:n { \eb@bitoc@title }
- \vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \@starttoc{tec}
+ \begin{multicols}{\int_use:N \l__eb_toc_columns_int}
+ \@starttoc{#1}
+ \end{multicols}
}
- \eb_multoc_post_bool:
- \group_end:
+ { \@starttoc{#1} }
}
-\RenewDocumentCommand{\listoffigures}{st+o}
+\cs_new_protected:Npn \eb_toc_list_parse:nnnnn #1#2#3#4#5
{
\group_begin:
- \tl_set_eq:NN \eb@toc@title \listfigurename
+ \exp_args:NNc
+ \tl_set_eq:NN \eb@toc@title { list#4name }
\IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
\eb_title_number_intoc_bool:nn {#2} {#1}
- \eb_multoc_pre_bool:
- \dim_add:NV \l__eb_toc_offset_dim \l__eb_toc_figure_offset_dim
+ \exp_args:NNc \dim_add:NV
+ \l__eb_toc_offset_dim { l__eb_toc_#4_offset_dim }
\vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \@starttoc{lof}
- \eb_multoc_post_bool:
+ \eb_toc_multicol_bool:n {#5}
\group_end:
}
-\RenewDocumentCommand{\listoftables}{st+o}
+\clist_map_inline:nn
{
- \group_begin:
- \tl_set_eq:NN \eb@toc@title \listtablename
- \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
- \eb_title_number_intoc_bool:nn {#2} {#1}
- \eb_multoc_pre_bool:
- \dim_add:NV \l__eb_toc_offset_dim \l__eb_toc_table_offset_dim
- \vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \@starttoc{lot}
- \eb_multoc_post_bool:
- \group_end:
+ { figure,lof },
+ { table,lot },
+ { lstlisting,lol }
}
-\NewDocumentCommand{\listoflistings}{st+o}
+ {
+ \exp_args:Nc \DeclareDocumentCommand
+ { listof\clist_item:nn {#1} { 1 }s }{st+o}
+ {
+ \eb_toc_list_parse:nnnnn {##1} {##2} {##3}
+ { \clist_item:nn {#1} { 1 } }
+ { \clist_item:nn {#1} { 2 } }
+ }
+ }
+\cs_set_eq:NN \listoflistings \listoflstlistings
+\RenewDocumentCommand{\tableofcontents}{t+oD(){}}
{
\group_begin:
- \tl_set_eq:NN \eb@toc@title \lstlistlistingname
- \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
- \eb_title_number_intoc_bool:nn {#2} {#1}
- \eb_multoc_pre_bool:
- \dim_add:NV \l__eb_toc_offset_dim \l__eb_toc_lstlisting_offset_dim
+ \tl_set_eq:NN \eb@toc@title \contentsname
+ \tl_set:Nn \eb@bitoc@title { Contents }
+ \IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
+ \eb_title_mark_notoc:n { \eb@toc@title }
\vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \@starttoc{lol}
- \eb_multoc_post_bool:
+ \eb_toc_multicol_bool:n { toc }#3
+ \IfBooleanT{#1}
+ {
+ \eb_title_mark_notoc:n { \eb@bitoc@title }
+ \vspace*{\dim_use:N \l__eb_toc_offset_dim}
+ \eb_toc_multicol_bool:n { tec }
+ }
\group_end:
}
@@ -1179,6 +1170,7 @@
\skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt }
\skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt }
\skip_set:Nn \@fpsep { 8pt plus 2.0fil }
+\skip_set:Nn \multicolsep { 10pt plus 4pt minus 3pt }
\setcounter{topnumber}{4}
\setcounter{bottomnumber}{4}
\setcounter{totalnumber}{8}
@@ -1521,7 +1513,7 @@
{
standard~jigsaw,
nobeforeafter,tcbox~raise~base,
- top = 1.25qt,bottom = 1.25qt,left = 1.25qt,right = 1.25qt,
+ top = 1.25rt,bottom = 1.25rt,left = 1.25rt,right = 1.25rt,
boxrule = 0.75pt,arc = 1pt,
colback = #1,opacityback = 0.12,colframe = #1,#3
}{#2}
@@ -1581,6 +1573,8 @@
\tl_if_empty:NF \l__eb_bib_citestyle_tl
{ \exp_args:NV \setcitestyle \l__eb_bib_citestyle_tl }
\skip_zero:N \bibsep
+ \AtEndEnvironment{thebibliography}
+ {\bool_if:NT \l__eb_multoc_bool { \end{multicols} }}
\NewDocumentCommand{\printbibliography}{st+o}
{
\group_begin:
@@ -1589,10 +1583,10 @@
\tl_set:Nn \bibsection
{
\eb_title_number_intoc_bool:nn {##2} {##1}
- \eb_multoc_pre_bool:
+ \bool_if:NT \l__eb_multoc_bool
+ { \begin{multicols}{\int_use:N \l__eb_toc_columns_int} }
}
\exp_args:NV \bibliography \l__eb_bib_datafile_tl
- \eb_multoc_post_bool:
\group_end:
}
}
@@ -1710,12 +1704,12 @@
{ \definecolorset{HTML}{ctex@}{}{frame,#1;emph,#1;verb,#1} }
\cs_new:Npn \eb_linkcolor_set:n #1
{
- linkcolor/\clist_item:nn {#1} {1} .code:n =
+ linkcolor/\clist_item:nn {#1} { 1 } .code:n =
{
\eb_define_linkcolor:nnn
- { \clist_item:nn {#1} {2} }
- { \clist_item:nn {#1} {3} }
- { \clist_item:nn {#1} {4} }
+ { \clist_item:nn {#1} { 2 } }
+ { \clist_item:nn {#1} { 3 } }
+ { \clist_item:nn {#1} { 4 } }
\eb_put_hyperref:n
{
linkcolor = ctex@link,linkbordercolor = ctex@link,
@@ -1729,9 +1723,9 @@
color/\clist_item:nn {#1} {1} .code:n =
{
\eb_define_themecolor:nnn
- { \clist_item:nn {#1} {2} }
- { \clist_item:nn {#1} {3} }
- { \clist_item:nn {#1} {4} }
+ { \clist_item:nn {#1} { 2 } }
+ { \clist_item:nn {#1} { 3 } }
+ { \clist_item:nn {#1} { 4 } }
},
}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 1be9f3f00e8..ac15dd95853 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/06/02}{1.25q}{beta}
+\ProvidesExplClass{easybook}{2021/06/03}{1.25r}{beta}
\bool_set_false:N \l__eb_compile_draft_bool
\bool_set_false:N \l__eb_title_newline_bool