summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/easybook
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-15 21:30:48 +0000
committerKarl Berry <karl@freefriends.org>2021-12-15 21:30:48 +0000
commit59dd3641e1cf5191546700a204a1945455042229 (patch)
tree8ee82fa1c61f8212018de5c0b3c198bc2b79c4fa /Master/texmf-dist/source/latex/easybook
parent250a386a7265d7fffdeacac28254ec952b35b3e7 (diff)
easybook (15dec21)
git-svn-id: svn://tug.org/texlive/trunk@61311 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/easybook')
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx57
1 files changed, 28 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 169e50a8a7b..0765fb3ecc8 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -15,14 +15,14 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/12}{1.41S}
+\ProvidesExplClass{easybook}{2021/12/15}{1.41U}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
\bool_set_false:N \l__eb_title_newline_bool
\bool_set_true:N \l__eb_class_mode_book_bool
-\tl_new:N \g__eb_config_tl
\tl_new:N \l__eb_font_value_tl
+\clist_new:N \g__eb_config_file_clist
\clist_new:N \g__eb_options_clist
\cs_new_protected:Npn \eb_put_ctexbook:n #1
{ \PassOptionsToClass{#1}{ctexbook} }
@@ -52,7 +52,7 @@
},
book .meta:n = { class = book },
article .meta:n = { class = article },
- config .tl_set:N = \g__eb_config_tl,
+ config .clist_gset:N = \g__eb_config_file_clist,
floatpage .bool_set:N = \l__eb_float_page_bool,
floatpage .default:n = true,
unknown .code:n = \clist_gput_right:NV \g__eb_options_clist \CurrentOption
@@ -67,8 +67,8 @@
\ctex_at_end:n
{
\use:c { eb@font@load@\l__eb_font_value_tl }
- \tl_if_empty:NF \g__eb_config_tl
- { \file_input:n { \g__eb_config_tl } }
+ \clist_if_empty:NF \g__eb_config_file_clist
+ { \clist_map_function:NN \g__eb_config_file_clist \file_input:n }
}
\sys_if_engine_xetex:TF
@@ -100,10 +100,8 @@
}
\RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
{
- \tl_set:Nx \l_tmpa_tl
- { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
- \cs_new_protected:Npx #2
- { \eb_switch_family:V \l_tmpa_tl }
+ \tl_set:Nx \l_tmpa_tl { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
+ \cs_new_protected:Npx #2 { \eb_switch_family:V \l_tmpa_tl }
\eb_set_family:nnn { \l_tmpa_tl } {#3,#5} {#4}
}
@@ -310,12 +308,13 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/12}{1.41S}
+\ProvidesExplPackage{easybase}{2021/12/15}{1.41U}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
\cs_generate_variant:Nn \dim_sign:n { V }
\cs_generate_variant:Nn \int_to_arabic:n { v }
+\cs_generate_variant:Nn \msg_warning:nnn { nnV }
\cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV }
\cs_generate_variant:Nn \skip_set:Nn { NV }
\cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
@@ -408,10 +407,8 @@
{ \BeforeBeginEnvironment{document} }
\cs_gset_eq:NN \PackageWarning \PackageInfo
-\bool_if_exist:NF \l__eb_class_mode_book_bool
- { \bool_set_true:N \l__eb_class_mode_book_bool }
-\bool_if_exist:NF \l__eb_compile_draft_bool
- { \bool_set_false:N \l__eb_compile_draft_bool }
+\bool_set_true:N \l__eb_class_mode_book_bool
+\bool_set_false:N \l__eb_compile_draft_bool
\clist_new:N \g__eb_ctex_options_clist
\keys_define:nn { easybase }
@@ -454,7 +451,7 @@
\bool_new:N \l__eb_mark_uppercase_bool
\bool_new:N \l__eb_chap_counter_withpart_bool
-\tl_new:N \l__eb_foot_counter_parent_value_tl
+\tl_new:N \l__eb_fnt_counter_parent_value_tl
\eb_seq_map_inline:nn
{
@@ -476,7 +473,7 @@
}
}
\cs_new:Npn \eb_msg_abandon_option:n #1
- { \msg_warning:nnx { easybase } { abandon-#1 } { \l_keys_key_str } }
+ { \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str }
\cs_if_exist:NF \chapter
{
\newcounter{chapter}
@@ -735,11 +732,11 @@
\ctex_define:nn { style }
{
- footwith .choices:nn =
+ fntnumwith .choices:nn =
{ part,page,chapter }
- { \tl_set:Nn \l__eb_foot_counter_parent_value_tl {#1} },
- footwith .value_required:n = true,
- footwith .initial:n = chapter
+ { \tl_set:Nn \l__eb_fnt_counter_parent_value_tl {#1} },
+ fntnumwith .value_required:n = true,
+ fntnumwith .initial:n = chapter
}
\NewDocumentCommand{\eb_assign_fntext_code:n}
{>{\SplitArgument{1}{,}}m}
@@ -844,7 +841,7 @@
\str_if_eq:nnTF {#1} { match }
{
\tl_set:cv { l__eb_fn#2_#3shift_tl }
- { l__spb_super_script_#3shift_dim }
+ { l__spb_super_#3shift_dim }
}
{ \tl_set:cn { l__eb_fn#2_#3shift_tl } {#1} }
}
@@ -917,7 +914,7 @@
\dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
\bool_if:NT \l__eb_chap_counter_withpart_bool
{ \counterwithin*{chapter}{part} }
- \str_case:VnT \l__eb_foot_counter_parent_value_tl
+ \str_case:VnT \l__eb_fnt_counter_parent_value_tl
{
{ part } { \counterwithin*{footnote}{part} }
{ page } { \counterwithin*{footnote}{page} }
@@ -1083,16 +1080,18 @@
}
}
-\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}}
+\ProvideDocumentCommand{\super}{mo}{\textsuperscript{#1}}
\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb@fnmate@super}{sm}
{
\IfBooleanTF{#1}
- {\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
+ {\super{#2}[vshift = \l__eb_fntext_vshift_tl,nohshift]}
{
- \super[\l__eb_fnmark_vshift_tl]
- {\l__eb_fnmate_format_tl{#2}}
- [\l__eb_fnmark_hshift_tl]
+ \super{#2}[
+ cmd = \l__eb_fnmate_format_tl,
+ vshift = \l__eb_fnmark_vshift_tl,
+ hshift = \l__eb_fnmark_hshift_tl
+ ]
}
}
\cs_new_protected:Npn \eb_fnmate_format_initial:
@@ -2075,7 +2074,7 @@
{
\sisetup
{
- mode = match,
+ number-mode = match,
table-parse-only,
text-family-to-math,
text-series-to-math,
@@ -2433,7 +2432,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/12}{1.41S}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/15}{1.41U}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1