summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/easybook
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty67
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
2 files changed, 29 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index f13de7d6ac4..b3de2700eb8 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -13,20 +13,25 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2021/06/09}{1.25x}{beta}
+\ProvidesExplPackage{easybase}{2021/06/11}{1.26}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
\cs_generate_variant:Nn \int_to_arabic:n { v }
+\cs_generate_variant:Nn \int_to_alph: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_generate_variant:Nn \int_compare:nNnT { oNnT }
\cs_new_protected:Npn \eb_ctex_define:nn #1
{ \keys_define:nn { ctex/#1 } }
-\cs_new_protected:Npn \eb_patch_cmd:Nnn #1#2#3
+\cs_new_protected:Npn \eb_patch_cmd:nnn #1#2#3
{
- \ctex_patch_cmd_once:NnnnTF #1 { } {#2} {#3}
- { } { \ctex_patch_failure:N #1 }
+ \seq_set_from_clist:Nn \l__eb_control_sequence_seq {#1}
+ \seq_map_inline:Nn \l__eb_control_sequence_seq
+ {
+ \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
+ { } { \ctex_patch_failure:N ##1 }
+ }
}
\cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
{
@@ -441,14 +446,7 @@
\bool_if:NTF \l__eb_footnote_hang_bool
{ \booltrue{FN@hangfoot} } { \boolfalse{FN@hangfoot} }
}
-\eb_patch_cmd:Nnn \@footnotetext
- { \reset@font }
- {
- \linespread{\fp_use:N \l__eb_spread_footnote_fp}
- \selectfont\ignorespaces
- \l__eb_subfont_footnote_tl
- }
-\eb_patch_cmd:Nnn \@mpfootnotetext
+\eb_patch_cmd:nnn { \@footnotetext,\@mpfootnotetext }
{ \reset@font }
{
\linespread{\fp_use:N \l__eb_spread_footnote_fp}
@@ -458,12 +456,14 @@
\ctex_after_end_preamble:n
{
\ExplSyntaxOn\char_set_catcode_letter:N \@
- \eb_patch_cmd:Nnn \@footnotemark
+ \eb_patch_cmd:nnn { \H@@footnotemark,\@footnotemark }
{ \@makefnmark }
{
+ \group_begin:
\tl_use:N \l__eb_subfont_footnote_tl
\tl_use:N \l__eb_fnmark_format_tl
{\hbox:n { \textsuperscript{\@thefnmark} }}
+ \group_end:
}
\ExplSyntaxOff\char_set_catcode_other:N \@
}
@@ -480,8 +480,9 @@
}
}
}
+\cs_new:Npn \eb_alph:n #1 { \int_to_alph:v { c@#1 } }
\cs_set:Npn \thefootnote { \eb_footnote_counter:N \c@footnote }
-\cs_set:Npn \thempfootnote { \int_to_alph:n { \c@mpfootnote } }
+\cs_set:Npn \thempfootnote { \eb_alph:n { mpfootnote } }
\cs_new_protected:Npn \eb_fnmark_number_set:nn #1#2
{ \tl_const:cn { c__eb_fnmark_number_#1_tl } {#2} }
@@ -681,11 +682,13 @@
{
\normalsize\normalfont
\titlerule*[#2]{\scalebox{#3}{#4}}#5
- \IfBooleanTF{#1}
- {\thecontentspage}
{
- \bool_if:NTF \l__eb_toc_line_align_bool
- { \contentspage } { \thecontentspage }
+ \IfBooleanTF{#1}
+ {\thecontentspage}
+ {
+ \bool_if:NTF \l__eb_toc_line_align_bool
+ { \contentspage } { \thecontentspage }
+ }
}
}
\ctex_set:nn { tocset }
@@ -1006,7 +1009,7 @@
\int_compare:nNnTF { \c@chapter } > { 0 }
{
\ExplSyntaxOn\char_set_catcode_letter:N \@
- \eb_patch_cmd:Nnn \CTEX@addbitocline
+ \eb_patch_cmd:nnn { \CTEX@addbitocline }
{
\def\CTEX@prechapter{\CTEX@prebichapter}
\def\CTEX@thechapter{\CTEX@bichapter@number}
@@ -1178,7 +1181,7 @@
}
\cs_new:Npn \eb_arabic:n #1 { \int_to_arabic:v { c@#1 } }
-\cs_gset:cpn { thesection }
+\cs_gset:Npn \thesection
{
\int_compare:nNnT { \c@chapter } > { 0 } { \thechapter. }
\eb_arabic:n { section }
@@ -1354,13 +1357,11 @@
{
mode = match,
table-parse-only,
- propagate-math-font,
text-family-to-math,
text-series-to-math,
reset-text-family = false,
reset-text-series = false,
reset-text-shape = false,
- reset-math-version = false,
range-phrase = \ensuremath{\sim},
range-units = single,
group-digits = none
@@ -1376,25 +1377,13 @@
\linespread{\fp_use:N \l__eb_spread_math_fp}
\selectfont\ignorespaces
}
-\eb_patch_cmd:Nnn \start@gather
+\eb_patch_cmd:nnn { \start@gather,\start@align,\start@multline }
{ \collect@body }
{
\linespread{\fp_use:N \l__eb_spread_math_fp}
\selectfont\collect@body
}
-\eb_patch_cmd:Nnn \start@align
- { \collect@body }
- {
- \linespread{\fp_use:N \l__eb_spread_math_fp}
- \selectfont\collect@body
- }
-\eb_patch_cmd:Nnn \start@multline
- { \collect@body }
- {
- \linespread{\fp_use:N \l__eb_spread_math_fp}
- \selectfont\collect@body
- }
-\eb_patch_cmd:Nnn \gather@split
+\eb_patch_cmd:nnn { \gather@split }
{ \spread@equation }
{
\linespread{\fp_use:N \l__eb_spread_math_fp}
@@ -1562,7 +1551,7 @@
{
standard~jigsaw,
nobeforeafter,tcbox~raise~base,
- top = 1.25xt,bottom = 1.25xt,left = 1.25xt,right = 1.25xt,
+ top = 1.25t,bottom = 1.25t,left = 1.25t,right = 1.25t,
boxrule = 0.75pt,arc = 1pt,
colback = #1,opacityback = 0.12,colframe = #1,#3
}{#2}
@@ -1762,7 +1751,7 @@
\eb_put_hyperref:n
{
linkcolor = ctex@link,linkbordercolor = ctex@link,
- urlcolor = ctex@url,urlbordercolor = ctex@url,
+ urlcolor = ctex@url,urlbordercolor = ctex@url,
citecolor = ctex@cite,citebordercolor = ctex@cite
}
},
@@ -1883,9 +1872,9 @@
{
contentsname = 目\hspace{\ccwd}录,
indexname = 索\hspace{\ccwd}引,
+ abstractname = 摘\hspace{\ccwd}要,
listfigurename = 图片索引,
listtablename = 表格索引,
- abstractname = 摘\hspace{\ccwd}要,
lstlistlistingname = 代码索引,
lstlistingname = 代码
}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 1860ceb7faf..0c6b3ddd2fa 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/09}{1.25x}{beta}
+\ProvidesExplClass{easybook}{2021/06/11}{1.26}{beta}
\bool_set_false:N \l__eb_compile_draft_bool
\bool_set_false:N \l__eb_title_newline_bool
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 16:38:16 +0000