diff options
author | Norbert Preining <norbert@preining.info> | 2021-12-08 03:02:13 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-12-08 03:02:13 +0000 |
commit | 0bfca40c9f89076ad634464a530fcc3e55d1d4e1 (patch) | |
tree | 7114d7d6b3ef883e247cfa80d6d36d0938b7c4f0 /macros/latex/contrib/easybook/easybook.dtx | |
parent | 6336c19969656f3ee5f0b0fed00aaf64369a40e7 (diff) |
CTAN sync 202112080302
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r-- | macros/latex/contrib/easybook/easybook.dtx | 63 |
1 files changed, 39 insertions, 24 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index b14146b58f..e2a2605b37 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/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 @@ -99,7 +99,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{}} @@ -321,7 +321,7 @@ %<*package> \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 } @@ -336,7 +336,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} @@ -349,7 +349,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 } @@ -367,7 +367,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 @@ -401,7 +401,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} } @@ -469,7 +469,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, @@ -482,7 +482,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 } @@ -543,7 +543,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 }, @@ -647,7 +647,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 } @@ -773,6 +773,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} @@ -783,6 +795,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 @@ -809,8 +822,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} { @@ -1231,7 +1244,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 @@ -1240,7 +1253,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 @@ -1255,7 +1268,7 @@ } } } -\eb_clist_map_inline:nn +\eb_seq_map_inline:nn { tocafter,tocindent,tocrule } { \ctex_define:nn { tocset } @@ -1289,6 +1302,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{}} @@ -1448,7 +1463,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} @@ -1495,7 +1510,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 } @@ -1616,7 +1631,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 }, @@ -1671,7 +1686,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}}} { @@ -1820,7 +1835,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 }, @@ -2243,7 +2258,7 @@ }, } } -\eb_clist_map_inline:nn +\eb_seq_map_inline:nn { { linkcolor } { link }, { color } { theme } @@ -2299,7 +2314,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} { @@ -2402,7 +2417,7 @@ } %</package> %<*tcolorbox> -\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 |