summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/easybook
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-08 19:33:03 +0000
committerKarl Berry <karl@freefriends.org>2024-05-08 19:33:03 +0000
commitf807fe30230238ac7cdd93db5d56bc2186883877 (patch)
tree3340d2692c60d0adf7c1ef0b04e8a497ee2109c9 /Master/texmf-dist/tex/latex/easybook
parent8630d343eadd4ca0067a4dd56536d3ab0bb18cd9 (diff)
easybook (8may24)
git-svn-id: svn://tug.org/texlive/trunk@71207 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty71
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls4
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
3 files changed, 37 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index a2d0373e6c9..fac042dd9bb 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/05/06}{2024bj}
+\ProvidesExplPackage{easybase}{2024/05/08}{2024bl}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -617,7 +617,7 @@
fntext-code .initial:n = { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { ~ } },
fnmarktext-format .code:n = \eb_fnboth_format_set:nn {#1} { marktext },
fncustom-format .code:n = \eb_fnboth_format_set:nn {#1} { custom },
- fnboth-format .meta:n = { fnmarktext-format = #1,fncustom-format = #1 },
+ fnboth-format .meta:n = { fnmarktext-format = {#1},fncustom-format = {#1} },
footnotetype .multichoices:nn =
{ plain,hang,bottom,para,flush }
{ \eb_footnote_value_handle:n {#1} },
@@ -640,7 +640,7 @@
{ \eb_fnmarktext_normal_label_set:Nn \thefootnote {#1} },
fntext-num .value_required:n = true,
fntext-num/unknown .code:n = \eb_fnmarktext_short_label_set:Nn \thefootnote {#1},
- fnmarktext-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
+ fnmarktext-num .meta:n = { fntext-num = {#1},fnmark-num = {#1} },
fnmarktext-num .initial:n = plain,
unknown .code:n = \eb_msg_deprecated_option:n { hdr }
}
@@ -1088,18 +1088,18 @@
{
hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl,
hyphen-table .tl_set:N = \l__eb_hyphen_table_tl,
- hyphen-listing .tl_set:N = \l__eb_hyphen_lstlisting_tl,
+ hyphen-listing .tl_set:N = \l__eb_hyphen_listing_tl,
hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl,
hyphen-every .meta:n =
{
- hyphen-figure = #1,hyphen-table = #1,
- hyphen-listing = #1,hyphen-equation = #1
+ hyphen-figure = {#1},hyphen-table = {#1},
+ hyphen-listing = {#1},hyphen-equation = {#1}
},
hyphen-every .initial:n = .,
unknown .code:n = \eb_msg_deprecated_option:n { tools }
}
\eb_seq_map_inline:nn
- { figure,table,lstlisting,equation }
+ { figure,table,listing,equation }
{
\cs_set:cpn { the#1 }
{
@@ -1156,7 +1156,7 @@
\bool_set_true:N \l__eb_toc_plan_bi_bool
},
plan .initial:n = cn,
- columns .meta:n = { multoc = #1 },
+ columns .meta:n = { multoc = {#1} },
title .code:n = \eb_assign_toc_title:n {#1},
bilist .code:n =
{
@@ -1382,39 +1382,24 @@
\c__ctex_headings_seq \RegisterTocName
\eb_seq_map_inline:nn
{
- tocformat,tocformat+,tocformat~+,
- tocindent,tocrule,tocline,tocafter,between
+ tocformat,tocformat+,tocformat~+,tocformat*,
+ toclabel,tocindent,tocrule,tocline,tocafter,between,
+ tocbelow,tocbegin,tocsep,tocend
}
{
\ctex_define:n
{
float/#1 .meta:n =
{
- figure/#1 = ##1,table/#1 = ##1,
- lstlisting/#1 = ##1
- }
- }
- }
-\eb_seq_map_inline:nn
- { tocafter,tocindent,tocrule }
- {
- \ctex_define:nn { toc }
- {
- #1-every .code:n =
- {
- \ctex_set:n
- {
- part/#1 = ##1,chapter/#1 = ##1,
- section/#1 = ##1,subsection/#1 = ##1,
- float/#1 = ##1
- }
+ figure/#1 = {##1},table/#1 = {##1},
+ lstlisting/#1 = {##1}
}
}
}
\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}}
{
\normalsize\normalfont
- \titlerule*[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6
+ \ttl@row@i[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6
{
\IfBooleanF{#2}
{
@@ -1471,6 +1456,13 @@
\IfHookEmptyTF{starttoc/after}{}
{\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
}
+\cs_set_protected:Npn \AllotPartialExt #1#2
+ {
+ \tl_set:cn { ttl@partial#1 } {#2}
+ \AddToHookWithArguments{cmd/ttl@writepartial/before}
+ {\ttl@topartial{#1}{##1}{##2}}
+ }
+\AllotPartialExt{lol}{pll}
\cs_set_eq:NN \eb@ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
@@ -1583,8 +1575,8 @@
caption-listing .tl_set:N = \l__eb_font_caption_listing_tl,
caption-every .meta:n =
{
- caption-table = #1,caption-figure = #1,
- caption-listing = #1
+ caption-table = {#1},caption-figure = {#1},
+ caption-listing = {#1}
},
caption-every .initial:n = \sffamily\small,
footnote .tl_set:N = \eb@font@footnote,
@@ -1614,6 +1606,7 @@
{ \tl_put_right:Nn \marginfont {#2} }
}
}
+\cs_set_eq:NN \addtosubfont \ebaddtofont
\ctex_define:nn { spread }
{
line .code:n = \setspread{#1},
@@ -1642,14 +1635,14 @@
caption-listing .fp_set:N = \l__eb_spread_caption_listing_fp,
caption-every .meta:n =
{
- caption-table = #1,caption-figure = #1,
- caption-listing = #1
+ caption-table = {#1},caption-figure = {#1},
+ caption-listing = {#1}
},
caption-every .initial:n = 1.2,
every .meta:n =
{
- line = #1,table = #1,math = #1,
- caption-every = #1,footnote = #1
+ line = {#1},table = {#1},math = {#1},
+ caption-every = {#1},footnote = {#1}
},
abovedisplayskip .code:n =
{\AfterPreamble{\skip_set:Nn \abovedisplayskip {#1}}},
@@ -1849,9 +1842,12 @@
\bool_if:NT \l__eb_theorem_support_bool
{
\RequirePackage{amsthm,thmtools}
- \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
+ \cs_set_eq:NN \eb@declaretheoremstyle@save \declaretheoremstyle
+ \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
\RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
- {\eb@declaretheoremsyle@save[#1,#3]{#2}}
+ {\eb@declaretheoremstyle@save[#1,#3]{#2}}
+ \RenewDocumentCommand{\declaretheorem}{O{}mO{}}
+ {\eb@declaretheorem@save[style = default,#1,#3]{#2}}
\ctex_define:nn { thmt }
{
loeskip .skip_set:N = \eb@thmt@loe@skip,
@@ -1871,6 +1867,7 @@
\theoremstyle{default}
\cs_undefine:N \proof
\DeclareFloatList{theorem}{loe}
+ \AllotPartialExt{loe}{ple}
\eb_preto_cmd:nn { listoftheorems }
{
\group_begin:
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 964b8315af1..698aeb9737b 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -19,7 +19,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/05/06}{2024bj}
+\ProvidesExplClass{easybook}{2024/05/08}{2024bl}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -33,7 +33,7 @@
\keys_define:nn { easybook }
{
newline .code:n = \bool_set_true:N \l__eb_title_newline_bool,
- scheme .code:n = \eb_put_ctexbook:n { scheme = #1 },
+ scheme .code:n = \eb_put_ctexbook:n { scheme = {#1} },
enmode .meta:n = { newline,scheme = plain },
font .choices:nn =
{ noto,times,times*,ebgaramond,libertine,palatino,auto }
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 62c0b1a6794..8ff4b42fce8 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/06}{2024bj}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/08}{2024bl}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2