summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/easybook/easybook.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx63
1 files changed, 33 insertions, 30 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index b5ca727b02..5ee1eadb0f 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/10}{1.40N}
+\ProvidesExplClass{easybook}{2021/11/10}{1.40O}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/10}{1.40N}
+\ProvidesExplPackage{easybase}{2021/11/10}{1.40O}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -453,19 +453,13 @@
class .initial:n = book,
book .meta:n = { class = book },
article .meta:n = { class = article },
-
unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption
}
-\eb_clist_map_inline:nn
- {
- { protrusion = false } { microtype },
- { list = off } { bicaption },
- { many } { tcolorbox },
- { upint } { newtxmath },
- { svgnames } { xcolor }
- }
- { \PassOptionsToPackage #1 }
+\PassOptionsToPackage{list = off}{bicaption}
+\PassOptionsToPackage{many}{tcolorbox}
+\PassOptionsToPackage{upint}{newtxmath}
+\PassOptionsToPackage{svgnames}{xcolor}
\ProcessKeysOptions{easybase}
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
\@ifclassloaded{ctexbook}{}
@@ -584,8 +578,10 @@
{
\color{ctex@emph}
\eb@tag@brackets@left
- \ignorespaces #1\unskip\@@italiccorr
+ \bgroup
+ \ignorespaces{#1}\unskip\@@italiccorr
\eb@tag@brackets@right
+ \egroup
}
}
\ctex_define:nn { style }
@@ -1091,7 +1087,7 @@
}
}
-\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
+\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}}
\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb@fnmate@super}{sm}
{
@@ -1140,7 +1136,9 @@
{ \eb@fnmate@super* }
{
\tl_use:N \l__eb_fntext_before_tl
- {\l__eb_fnmate_format_tl{\@thefnmark}}
+ \bgroup
+ \l__eb_fnmate_format_tl{\@thefnmark}
+ \egroup
}
\tl_use:N \l__eb_fntext_after_tl
}
@@ -1296,24 +1294,24 @@
{
\normalsize\normalfont
\titlerule*[#2]{\scalebox{#3}{#4}}#5
+ \bgroup
+ \IfBooleanTF{#1}
+ {\thecontentspage}
{
- \IfBooleanTF{#1}
- {\thecontentspage}
- {
- \bool_if:NTF \l__eb_toc_line_align_bool
- { \contentspage }
- { \thecontentspage }
- }
+ \bool_if:NTF \l__eb_toc_line_align_bool
+ { \contentspage }
+ { \thecontentspage }
}
+ \egroup
}
\cs_set_eq:NN \ctexnumberline \CTEXnumberline
-\cs_new:Npn \eb@numberline { \protect\numberline }
+\cs_new:Npn \p@numberline { \protect\numberline }
\cs_set:Npn \CTEXnumberline #1
{
\CTEXifname
{
\bool_if:NTF \eb@titletoc@hang@fix@bool
- { \eb@numberline{\use:c { CTEXthe#1 }} }
+ { \p@numberline{\use:c { CTEXthe#1 }} }
{
\use:c { CTEXthe#1 }
\tl_use:c { l__eb_toc_#1_after_tl }
@@ -1368,8 +1366,10 @@
{
\addcontentsline{#1}{#2}
{
- \bool_if:NT \eb@titletoc@hang@fix@bool { \eb@numberline }
- {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4
+ \bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline }
+ \bgroup
+ \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}
+ \egroup #4
}
}
\cs_set_eq:NN \eb@if@boolT \bool_if:NT
@@ -1381,8 +1381,11 @@
{
\addcontentsline{lol}{lstlisting}
{
- \eb@if@boolT\eb@titletoc@hang@fix@bool{\eb@numberline}
- {\eb@toc@label@lstlisting{}}\lst@@caption
+ \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline}
+ \bgroup
+ \eb@toc@label@lstlisting{}
+ \egroup
+ \lst@@caption
}
}
@@ -2069,7 +2072,7 @@
color .tl_set:N = \eb@tc@background@color,
color .initial:n = DeepSkyBlue,
number .tl_set:N = \eb@tc@list@number,
- number .initial:n = { 1. },
+ number .initial:n = 1.,
title .tl_set:N = \eb@tc@exercise@title,
title .initial:n = \c__eb_name_exercise_tl,
numsep .dim_set:N = \eb@toc@exercise@numsep,
@@ -2401,7 +2404,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40N}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }