summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/easybook
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-07 21:25:29 +0000
committerKarl Berry <karl@freefriends.org>2021-12-07 21:25:29 +0000
commit4c6f85545572830482c67cf1717afa0a9cc99b43 (patch)
tree10dc3785e66b5127f9c4d9cd67cda35ac2600693 /Master/texmf-dist/tex/latex/easybook
parent71cecc093260b9eb586c5985c9286c36f2e339f5 (diff)
easybook (7dec21)
git-svn-id: svn://tug.org/texlive/trunk@61244 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty57
-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, 39 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 5dfcdcf0f7d..b86fbb20e6c 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}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/06}{1.41H}
+\ProvidesExplPackage{easybase}{2021/12/06}{1.41I}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -35,7 +35,7 @@
\cs_set_protected:Npn \ctex_define:nn #1
{ \keys_define:nn { ctex/#1 } }
-\cs_new_protected:Npn \eb_clist_map_inline:nn #1#2
+\cs_new_protected:Npn \eb_seq_map_inline:nn #1#2
{
\seq_set_from_clist:Nn \l_tmpa_seq {#1}
\seq_map_inline:Nn \l_tmpa_seq {#2}
@@ -48,7 +48,7 @@
}
\cs_new_protected:Npn \eb_patch_cmd:wnn #1#2#3
{
- \eb_clist_map_inline:nn {#1}
+ \eb_seq_map_inline:nn {#1}
{
\ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
{ } { \ctex_patch_failure:N ##1 }
@@ -66,7 +66,7 @@
}
\cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
{
- \eb_clist_map_inline:nn {#1}
+ \eb_seq_map_inline:nn {#1}
{ \AtBeginEnvironment{##1}{#2} }
}
\cs_new_protected:Npn \eb_match_load_package:n #1
@@ -100,7 +100,7 @@
\RenewDocumentCommand{\usepackage}{O{}m}
{
\PassOptionsToPackage{#1}{#2}
- \eb_clist_map_inline:nn {#2}
+ \eb_seq_map_inline:nn {#2}
{
\eb_if_package_loaded:nF {##1}
{ \eb@usepackage@save{##1} }
@@ -168,7 +168,7 @@
\bool_new:N \l__eb_chap_counter_withpart_bool
\tl_new:N \l__eb_foot_counter_parent_choice_tl
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{
style,subfont,spread,
refset,bibset,thmset,
@@ -181,7 +181,7 @@
\keys_define:nn { } { ctex/link .inherit:n = ctex/refset }
\ctex_define:n { link .meta:nn = { ctex/link } {#1} }
\cs_set_eq:NN \link \refset
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ style,subfont,spread,bibset,thmset,hdrset,tocset }
{
\msg_new:nnn { easybase } { abandon-#1 }
@@ -242,7 +242,7 @@
if~you~continue~compiling. \\\\
Please~update~your~macro~package~from~CTAN.
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{
{ expl3 } { 2020/10/27 },
{ xparse } { 2020/10/27 },
@@ -346,7 +346,7 @@
\booltrue{@mainmatter}
\pagenumbering{arabic}
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ chapter,section,subsection }
{
\exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout }
@@ -472,6 +472,18 @@
{ \ding{\int_eval:n { 191 + #1 }} }
\cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
{ \ding{\int_eval:n { 201 + #1 }} }
+\cs_new_protected:Npn \DefineFntSymbols #1#2#3
+ {
+ \cs_set_protected:cpn { eb@use@fnt@symbol@#1 }
+ {
+ \cs_set:Npn \eb_int_to_symbols:n ####1
+ { \int_to_symbols:nnn {####1} {#2} {#3} }
+ }
+ }
+\cs_new_protected:Npn \setfntsymbol #1
+ { \use:c { eb@use@fnt@symbol@#1 } }
+\DefineFntSymbols{empty}{1}{}
+\setfntsymbol{empty}
\cs_new:Npn \eb_int_format_trans:NN #1
{
\str_case:nn {#1}
@@ -482,6 +494,7 @@
{ I } { \int_to_Roman:n }
{ i } { \int_to_roman:n }
{ c } { \exp_args:NV \zhnumber }
+ { s } { \eb_int_to_symbols:n }
}
}
\cs_new_protected:Npn \eb_fnmate_normal_label_set:nn #1#2
@@ -508,8 +521,8 @@
\cs_new_protected:Npn \eb_fnmate_short_label_set:nn #1#2
{
\tl_set:Nn \l__eb_fnmate_short_tokens_tl {#1}
- \eb_clist_map_inline:nn
- { A,a,1,I,i,c }
+ \eb_seq_map_inline:nn
+ { A,a,1,I,i,c,s }
{
\tl_if_in:nnT {#1} {##1}
{
@@ -930,7 +943,7 @@
}
\seq_map_function:NN
\c__ctex_headings_seq \eb_toc_assign_keys:n
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ figure,table,lstlisting }
{
\ctex_define:n
@@ -939,7 +952,7 @@
#1/tocline .cs_set:cp = { eb@toc@label@#1 } ##1,
}
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{
tocformat,tocformat+,tocformat~+,
tocindent,tocrule,tocline,tocafter,between
@@ -954,7 +967,7 @@
}
}
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ tocafter,tocindent,tocrule }
{
\ctex_define:nn { tocset }
@@ -988,6 +1001,8 @@
hang .bool_set:N = \eb@titletoc@hang@fix@bool,
hang .default:n = true,
hang .initial:n = false,
+ pnumwd .code:n = \contentsmargin{#1},
+ pnumwd .initial:n = 1.55em,
unknown .code:n = \eb_msg_abandon_option:n { tocset }
}
\NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}}
@@ -1147,7 +1162,7 @@
\addcontentsline{tec}{#1}{\use:c { CTEX@#1@tocline }{#1}{#2}}
\group_end:
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ chapter,section,subsection }
{
\exp_args:Nc \NewDocumentCommand { bi#1 }{sO{##3}mm}
@@ -1194,7 +1209,7 @@
connect-all .initial:n = { . },
unknown .code:n = \eb_msg_abandon_option:n { style }
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ figure,table,lstlisting,equation }
{
\cs_set:cpn { the#1 }
@@ -1315,7 +1330,7 @@
\exp_args:Nc \DeclareDocumentCommand { listof#1s }{st+o}
{\eb_toc_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}}
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{
{ figure } { lof },
{ table } { lot },
@@ -1370,7 +1385,7 @@
binmuber .initial:n = \arabic{chapter}
}
\cs_new_protected:Npn \eb_counter_zero:n #1
- { \eb_clist_map_inline:nn {#1} { \setcounter{##1}{0} } }
+ { \eb_seq_map_inline:nn {#1} { \setcounter{##1}{0} } }
\RenewDocumentCommand{\appendix}
{O{Appendix\space}D(){\Alph{chapter}}}
{
@@ -1519,7 +1534,7 @@
}{}
\cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2
{ \SetEnumitemValue{label}{#1}{\color{ctex@emph}#2} }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{
{ bullet } { \textbullet },
{ endash } { \normalfont\bfseries\textendash },
@@ -1942,7 +1957,7 @@
},
}
}
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{
{ linkcolor } { link },
{ color } { theme }
@@ -1998,7 +2013,7 @@
\cs_new_protected:Npn \eb_link_toc_put:n #1
{
\eb_put_hyperref:n { linktoc = #1 }
- \eb_clist_map_inline:nn { page,none }
+ \eb_seq_map_inline:nn { page,none }
{
\tl_if_eq:NnT \l_keys_value_tl {##1}
{
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 850af524e84..1f9520bbf98 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/06}{1.41H}
+\ProvidesExplClass{easybook}{2021/12/06}{1.41I}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -104,7 +104,7 @@
{ \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
{ \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
{ main,sans,mono,CJKmain,CJKsans,CJKmono }
{
\exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index ff57c884d0f..38aac96f626 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}{2021/12/06}{1.41H}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/06}{1.41I}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1