diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 123 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 24 |
2 files changed, 65 insertions, 82 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 2e6d5e01a87..7c9050f9480 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -13,7 +13,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2021/06/25}{1.26j}{beta} +\ProvidesExplPackage{easybase}{2021/06/26}{1.26l}{beta} \cs_generate_variant:Nn \eb_ctex_define:nn { nx } \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -168,7 +168,7 @@ withpart .bool_set:N = \l__eb_chap_counter_withpart_bool, withpart .default:n = true, withpart .initial:n = false, - rulewidth .dim_set:N = \eb@rule@width@dim, + rulewidth .dim_set:N = \l__eb_rule_width_dim, rulewidth .initial:n = 0.75pt, uppercase .bool_set:N = \l__eb_mark_uppercase_bool, uppercase .default:n = true, @@ -202,6 +202,7 @@ { xcolor[svgnames]+ footmisc[stable,bottom]+ + spbmark[ctex]+ ulem[normalem]+ enumitem[shortlabels,inline]+ amsmath+amsthm+thmtools+ @@ -302,6 +303,7 @@ } } +\tl_new:N \l__eb_fnmark_number_choice_tl \cs_gset_eq:NN \easyhead \fancyhead \cs_gset_eq:NN \easyfoot \fancyfoot \NewDocumentCommand{\markrule} @@ -349,12 +351,12 @@ subsec-label .initial:n = \hspace{0.5\ccwd}, headrule .tl_gset:N = \headrule, - headrule .initial:n = \markrule{\eb@rule@width@dim}, + headrule .initial:n = \markrule{\l__eb_rule_width_dim}, footrule .tl_gset:N = \footrule, footrule .initial:n = { }, footnoterule .tl_gset:N = \footnoterule, footnoterule .initial:n = - { \markrule[0.35\textwidth]{\eb@rule@width@dim}[+2.6pt] }, + { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[+2.6pt] }, fnmargin .dim_set:N = \footnotemargin, fnmargin .initial:n = 0.75\ccwd, @@ -382,13 +384,13 @@ fnmark-num .value_required:n = true } -\cs_set_eq:NN \eb@text@uppercase \text_uppercase:n -\cs_set_eq:NN \eb@text@nouppercase \text_titlecase_first:n +\cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n +\cs_set_eq:NN \eb_mark_nouppercase:n \text_titlecase_first:n \cs_new:Npn \eb_mark_uppercase_bool:nn #1#2 { \bool_if:NTF \l__eb_mark_uppercase_bool - { \eb@text@uppercase } - { \eb@text@nouppercase }{\use:c { eb_fancyhf_#1_mark:n } {#2}} + { \eb_mark_uppercase:n } + { \eb_mark_nouppercase:n }{\use:c { eb_fancyhf_#1_mark:n } {#2}} } \cs_new:Npn \eb@level@markdouble #1#2 { @@ -442,15 +444,18 @@ \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox } \bool_if:NT \l__eb_chap_counter_withpart_bool { \counterwithin*{chapter}{part} } - \tl_if_eq:NnT \l__eb_foot_counter_parent_choice_tl { part } - { - \counterwithout*{footnote}{chapter} - \counterwithin*{footnote}{part} - } - \tl_if_eq:NnT \l__eb_foot_counter_parent_choice_tl { page } - { - \counterwithout*{footnote}{chapter} - \counterwithin*{footnote}{page} + \str_case:Vn \l__eb_foot_counter_parent_choice_tl + { + { part } + { + \counterwithout*{footnote}{chapter} + \counterwithin*{footnote}{part} + } + { page } + { + \counterwithout*{footnote}{chapter} + \counterwithin*{footnote}{page} + } } \bool_if:NTF \l__eb_footnote_hang_bool { \booltrue{FN@hangfoot} } @@ -472,7 +477,7 @@ \group_begin: \tl_use:N \l__eb_subfont_footnote_tl \tl_use:N \l__eb_fnmark_format_tl - {\hbox:n { \textsuperscript{\@thefnmark} }} + {\hbox:n { \super{\@thefnmark}[0pt] }} \group_end: } \ExplSyntaxOff\char_set_catcode_other:N \@ @@ -485,7 +490,7 @@ \hbox:n { \tl_if_eq:NnT \l__eb_fnmark_position_tl { super } - { \textsuperscript }{\@thefnmark} + { \spb@textsuperscript@save }{\@thefnmark} \tl_use:N \l__eb_fnmark_after_tl } } @@ -515,18 +520,13 @@ { \ding{\int_eval:n { 201 + #1 }} } \cs_new:Npn \eb_footnote_counter:N #1 { - \tl_case:NnF \l__eb_fnmark_number_choice_tl - { - \c__eb_fnmark_number_plain_tl - { \int_use:N #1 } - \c__eb_fnmark_number_pifont_tl - { \eb_fnmark_counter_pifont:N #1 } - \c__eb_fnmark_number_pifont_neg_tl - { \eb_fnmark_counter_pifont_neg:N #1 } - \c__eb_fnmark_number_pifont_sans_tl - { \eb_fnmark_counter_pifont_sans:N #1 } - \c__eb_fnmark_number_pifont_sans_neg_tl - { \eb_fnmark_counter_pifont_sans_neg:N #1 } + \str_case:VnF \l__eb_fnmark_number_choice_tl + { + { plain } { \int_use:N #1 } + { pifont } { \eb_fnmark_counter_pifont:N #1 } + { pifont* } { \eb_fnmark_counter_pifont_neg:N #1 } + { pifont-sans } { \eb_fnmark_counter_pifont_sans:N #1 } + { pifont-sans* } { \eb_fnmark_counter_pifont_sans_neg:N #1 } } { \int_use:N #1 } } @@ -800,7 +800,6 @@ { chapter,section,subsection } \seq_map_inline:Nn \c__eb_bitoc_title_level_seq { - \tl_const:cn { c__eb_bitoc_mark_title_#1_tl } {#1} \exp_args:Nc \NewDocumentCommand { bi#1 }{sO{##3}mm} { \IfBooleanTF{##1} @@ -809,14 +808,11 @@ \CTEX@addtocline{#1}{##2} \tl_if_empty:oF {##4} { \CTEX@addbitocline{#1}{##4} } \tl_set:Nn \l__eb__bitoc_mark_title_level_tl {#1} - \tl_case:Nn \l__eb__bitoc_mark_title_level_tl + \str_case:nn {#1} { - \c__eb_bitoc_mark_title_chapter_tl - { \eb@level@markdouble{chapter}{##2} } - \c__eb_bitoc_mark_title_section_tl - { \eb@level@section@mark{##2} } - \c__eb_bitoc_mark_title_subsection_tl - { \eb@level@subsection@mark{##2} } + { chapter } { \eb@level@markdouble{chapter}{##2} } + { section } { \eb@level@section@mark{##2} } + { subsection } { \eb@level@subsection@mark{##2} } } }{ \stepcounter{bi#1} @@ -1050,14 +1046,6 @@ \tl_new:N \l__eb_subfont_listing_tl \tl_new:N \l__eb_subfont_footnote_tl -\seq_const_from_clist:Nn \c__eb_subfont_math_choice_seq - { - noto,notosans,times,scholax,stix, - charter,ebgaramond,libertine,none - } -\seq_map_inline:Nn \c__eb_subfont_math_choice_seq - { \tl_const:cn { c__eb_subfont_math_#1_tl } {#1} } - \eb_ctex_define:nn { subfont } { table-cap .tl_set:N = \l__eb_subfont_table_tl, @@ -1071,8 +1059,11 @@ marginpar .tl_set:N = \marginfont, marginpar .initial:n = \rmfamily\footnotesize, - math .choices:xn = - { \seq_use:Nn \c__eb_subfont_math_choice_seq { , } } + math .choices:nn = + { + noto,notosans,times,scholax,stix, + charter,ebgaramond,libertine,none + } { \tl_gset_eq:NN \l__eb_subfont_math_choice_tl \l_keys_choice_tl @@ -1085,24 +1076,16 @@ { \PassOptionsToPackage{#1}{newtxmath} } \eb_at_end_preamble:n { - \tl_case:NnT \l__eb_subfont_math_choice_tl - { - \c__eb_subfont_math_noto_tl - { \eb_put_newtxmath:n { noto } } - \c__eb_subfont_math_notosans_tl - { \eb_put_newtxmath:n { notosans } } - \c__eb_subfont_math_ebgaramond_tl - { \eb_put_newtxmath:n { ebgaramond } } - \c__eb_subfont_math_times_tl - { \eb_put_newtxmath:n { noOT1 } } - \c__eb_subfont_math_libertine_tl - { \eb_put_newtxmath:n { libertine,noOT1 } } - \c__eb_subfont_math_stix_tl - { \eb_put_newtxmath:n { stix2,noOT1 } } - \c__eb_subfont_math_scholax_tl - { \eb_put_newtxmath:n { nc,noOT1 } } - \c__eb_subfont_math_charter_tl - { \eb_put_newtxmath:n { charter,noOT1 } } + \str_case:VnT \l__eb_subfont_math_choice_tl + { + { noto } { \eb_put_newtxmath:n { noto } } + { notosans } { \eb_put_newtxmath:n { notosans } } + { ebgaramond } { \eb_put_newtxmath:n { ebgaramond } } + { times } { \eb_put_newtxmath:n { noOT1 } } + { libertine } { \eb_put_newtxmath:n { libertine,noOT1 } } + { stix } { \eb_put_newtxmath:n { stix2,noOT1 } } + { scholax } { \eb_put_newtxmath:n { nc,noOT1 } } + { charter } { \eb_put_newtxmath:n { charter,noOT1 } } } { \eb@package@load{newtxmath+bm} } } @@ -1210,7 +1193,7 @@ \setcounter{bottomnumber}{4} \setcounter{totalnumber}{8} \allowdisplaybreaks[4] -\tl_gset:Nn \ULthickness { \eb@rule@width@dim } +\tl_gset:Nn \ULthickness { \l__eb_rule_width_dim } \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif} \cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2 @@ -1430,7 +1413,7 @@ boxsep = 0pt, arc = 0pt, fonttitle = \sffamily, - boxrule = \eb@rule@width@dim + boxrule = \l__eb_rule_width_dim } \newtcbox[auto~counter]{\eb@tc@exercise@box}[1]{tc-exercise,#1} \tl_new:N \eb@tc@list@prologue @@ -1705,7 +1688,7 @@ aboveskip = 1.5ex plus .2ex minus .1ex, belowskip = 0.55ex plus .2ex minus .1ex, keepspaces = true, - framerule = \eb@rule@width@dim, + framerule = \l__eb_rule_width_dim, columns = flexible, abovecaptionskip = -1ex, belowcaptionskip = 1.5ex diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 33b2128b63b..3b773a76fb3 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/25}{1.26j}{beta} +\ProvidesExplClass{easybook}{2021/06/26}{1.26l}{beta} \bool_set_false:N \l__eb_compile_draft_bool \bool_set_false:N \l__eb_title_newline_bool @@ -189,21 +189,21 @@ \ctex_set:n { - secnumdepth = 3, - tocdepth = \bool_if:NTF \l__eb_class_book_bool { 1 } { 2 }, - part = + secnumdepth = 3, + tocdepth = \bool_if:NTF \l__eb_class_book_bool { 1 } { 2 }, + part = { - pagestyle = empty, - tocline = \EBNumberLine{#1}#2, - format = \color{ctex@frame}\sffamily\Huge, - aftername = + pagestyle = empty, + tocline = \EBNumberLine{#1}#2, + format = \color{ctex@frame}\sffamily\Huge, + aftername = { \bool_if:NTF \l__eb_title_newline_bool { \par\nobreak } { \hspace{\ccwd} } } }, - chapter = + chapter = { % pagestyle = fancy, format = @@ -222,7 +222,7 @@ lotskip = 0.8pc, lofskip = 0.8pc }, - section = + section = { hang = true, format = \color{ctex@frame}\sffamily\Large, @@ -230,7 +230,7 @@ beforeskip = 1.5ex plus .2ex minus .1ex, afterskip = 1.5ex plus .2ex minus .1ex }, - subsection = + subsection = { hang = true, format = \color{ctex@frame}\sffamily\large, @@ -238,7 +238,7 @@ beforeskip = 1.3ex plus .2ex minus .1ex, afterskip = 1.3ex plus .2ex minus .1ex }, - subsubsection = + subsubsection = { hang = true, format = \color{ctex@frame}\sffamily, |