summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-02 20:41:17 +0000
committerKarl Berry <karl@freefriends.org>2021-05-02 20:41:17 +0000
commitfa95ee22e0b804d72ae1da50d8c34383455a991d (patch)
tree3ba609a8a09f1e852abac3cb8041d6ffe009c48d /Master/texmf-dist/tex
parent5ee880348ac29865bd6a0910fc572f95acd4f347 (diff)
easybook (2may21)
git-svn-id: svn://tug.org/texlive/trunk@59052 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls42
1 files changed, 27 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 3427b9a7aff..fa2594325ab 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,etoolbox}
-\ProvidesExplClass{easybook}{2021/04/30}{1.24x}{beta}
+\ProvidesExplClass{easybook}{2021/05/01}{1.24x}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -476,10 +476,14 @@
\ctex_define:n {tocset/#1 .meta:nn = {ctex/tocset/#1}{##1}}
\eb_ctex_define:nn {tocset}
{
- #1/format .tl_set:c = l__eb_toc_#1_format_tl,
- #1/indent .tl_set:c = l__eb_toc_#1_indent_tl,
- #1/rule .tl_set:c = l__eb_toc_#1_rule_tl,
- #1/numsep .tl_set:c = eb@toc@#1@numsep
+ #1/format .tl_set:c = l__eb_toc_#1_format_tl,
+ #1/format+ .code:n =
+ {\tl_put_right:cn {l__eb_toc_#1_format_tl}{##1}},
+ #1/format~+ .code:n =
+ {\tl_put_right:cn {l__eb_toc_#1_format_tl}{##1}},
+ #1/indent .tl_set:c = l__eb_toc_#1_indent_tl,
+ #1/rule .tl_set:c = l__eb_toc_#1_rule_tl,
+ #1/numsep .tl_set:c = eb@toc@#1@numsep
}
}
@@ -565,6 +569,14 @@
section/indent = {#1},
subsection/indent = {#1},
list/indent = {#1}
+ },
+ rule-all .meta:n =
+ {
+ part/rule = {#1},
+ chapter/rule = {#1},
+ section/rule = {#1},
+ subsection/rule = {#1},
+ list/rule = {#1}
}
}
\ctex_set:nn {tocset}
@@ -851,17 +863,17 @@
{
\group_begin:
\tl_set_eq:NN \eb@toc@title\indexname
- \tl_set_eq:NN \imki@indexlevel\use_none:n
+ \cs_set_eq:NN \imki@indexlevel\use_none:n
\setkeys{imki}{intoc = false}
\IfValueT{#4}{\keys_set:nn {eb/listoc}{#4}}
- \bool_if:NTF \l__eb_class_book_bool
- {\tl_gset:Nn \imki@firstpagestyle{plain}}
+ \bool_if:NF \l__eb_class_book_bool
+ {\tl_set:Nn \l__eb_toc_type_tl{article}}
+ \tl_set:Nn \imki@indexheaders
{
- \tl_gset:Nn \imki@firstpagestyle{fancy}
- \tl_set:Nn \l__eb_toc_type_tl{article}
+ \eb_title_number_intoc_bool:nn {#2}{#1}
+ \cs_set_eq:NN \thispagestyle\use_none:n
+ \cs_undefine:N \imki@firstpagestyle
}
- \tl_set:Nn \imki@indexheaders
- {\eb_title_number_intoc_bool:nn {#2}{#1}}
\imki@putindex{#3}
\group_end:
}
@@ -1177,7 +1189,7 @@
group-digits = false
}
\allowdisplaybreaks[4]
-\cs_gset:Npn \ULthickness{.75pt}
+\tl_gset:Nn \ULthickness{.75pt}
\skip_set:Nn \jot{4pt plus 1pt minus 1pt}
\cs_new_protected:Npn \l__eb_math_restore:n #1
{
@@ -1406,7 +1418,7 @@
\tl_set_eq:NN \eb@toc@title\bibname
\IfValueT{##3}{\keys_set:nn {eb/listoc}{##3}}
\eb_multoc_pre_bool:
- \cs_set:Npn \bibsection
+ \tl_set:Nn \bibsection
{\eb_title_number_intoc_bool:nn {##2}{##1}}
\exp_args:NV \bibliography\l__eb_bib_file_tl
\eb_multoc_post_bool:
@@ -1431,7 +1443,7 @@
\cs_new_protected:Npn \EbBiblatexPostset
{
\exp_args:NV \addbibresource\l__eb_bib_file_tl
- \cs_gset:Npn \blx@default@theheading{bibintoc}
+ \tl_gset:Nn \blx@default@theheading{bibintoc}
\defbibheading{bibintoc}[\bibname]
{\eb_class_title_level_bool:n {##1}}
\skip_set:Nn \bibitemsep{0ex}