diff options
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r-- | macros/latex/contrib/easybook/easybook.dtx | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 5bc284e694..826602cab4 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}{2024/01/10}{2024F} +\ProvidesExplClass{easybook}{2024/01/13}{2024G} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -302,7 +302,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/01/10}{2024F} +\ProvidesExplPackage{easybase}{2024/01/13}{2024G} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -904,7 +904,7 @@ fntext-num/unknown .code:n = \eb_fnmarktext_short_label_set:Nn \thefootnote {#1}, fnmarktext-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, fnmarktext-num .initial:n = plain, - unknown .code:n = \eb_msg_deprecated_option:n { hdrset } + unknown .code:n = \eb_msg_deprecated_option:n { hdrset } } \eb_at_end_preamble:n @@ -1304,7 +1304,7 @@ hyphen-listing = #1,hyphen-equation = #1 }, hyphen-every .initial:n = ., - unknown .code:n = \eb_msg_deprecated_option:n { style } + unknown .code:n = \eb_msg_deprecated_option:n { style } } \eb_seq_map_inline:nn { figure,table,lstlisting,equation } @@ -1418,7 +1418,7 @@ {\eb_toc_float_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}} \ctex_define:n { - #1/##1 .meta:nn = { ctex/##1 } {####1}, + #1 .meta:nn = { ctex/#1 } {##1}, #1/between .tl_set:c = l__eb_toc_#1_between_hook_tl, #1/tocline .cs_set:cp = { eb@tocline@#1 } ##1##2, #1/tocline .initial:n = \listnumberline{#1}##2 @@ -1431,6 +1431,7 @@ \DeclareFloatList{lstlisting}{lol} \cs_gset:Npn \caption@@@addcontentsline #1#2#3#4 { + \exp_args:Nnnx \addcontentsline{#1}{#2} { \prop_if_in:NnTF \l__eb_toc_float_label_prop {#2} @@ -1556,9 +1557,9 @@ lolskip .skip_set:N = \eb@toc@lol@skip, lolskip .initial:n = 10pt, between .tl_set:N = \l__eb_toc_main_between_hook_tl, - between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, + between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, bibetween .tl_set:N = \l__eb_toc_bimain_between_hook_tl, - bibetween .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, + bibetween .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, dotalign .bool_set:N = \l__eb_toc_dot_align_bool, dotalign .default:n = true, dotalign .initial:n = true, @@ -1567,7 +1568,7 @@ hang .initial:n = true, pagenumwd .code:n = \contentsmargin{#1}, pagenumwd .initial:n = 1.55em, - unknown .code:n = \eb_msg_deprecated_option:n { tocset } + unknown .code:n = \eb_msg_deprecated_option:n { tocset } } \NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}} { @@ -1704,7 +1705,7 @@ footnote .tl_set:N = \l__eb_subfont_footnote_tl, marginpar .tl_set:N = \marginfont, marginpar .initial:n = \footnotesize, - unknown .code:n = \eb_msg_deprecated_option:n { subfont } + unknown .code:n = \eb_msg_deprecated_option:n { subfont } } \cs_new_protected:Npn \addtosubfont #1#2 { @@ -1754,7 +1755,7 @@ line = #1,table = #1,math = #1, caption-every = #1,footnote = #1 }, - unknown .code:n = \eb_msg_deprecated_option:n { spread } + unknown .code:n = \eb_msg_deprecated_option:n { spread } } \eb_seq_map_inline:nn @@ -1927,23 +1928,17 @@ { \RequirePackage{amsthm,thmtools} \eb_package_date_check:nn { thmtools } { 2020/08/01 } - \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle - \RenewDocumentCommand{\declaretheorem}{O{}mO{}} - {\eb@declaretheorem@save[#1,#3]{#2}} \RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}} {\eb@declaretheoremsyle@save[#1,#3]{#2}} \ctex_define:nn { thmset } - { - tcbwrap .code:n = { }, - unknown .code:n = \eb_msg_deprecated_option:n { thmset } - } + { unknown .code:n = \eb_msg_deprecated_option:n { thmset } } \declaretheoremstyle{default}[ spaceabove = 0ex plus .1ex, spacebelow = 0ex plus .1ex, headindent = 0em, within = \bool_if:NT \l__eb_class_mode_book_bool { chapter }, - headpunct = :, + headpunct = { }, headfont = \color{ctex@emph}\sffamily, bodyfont = \normalfont, postheadspace = 1em @@ -2022,7 +2017,7 @@ datafile .clist_set:N = \l__eb_bib_datafile_clist, bititle .tl_set:N = \eb@bib@bitoc@title, bititle .initial:n = Bibliography, - unknown .code:n = \eb_msg_deprecated_option:n { bibset } + unknown .code:n = \eb_msg_deprecated_option:n { bibset } } \cs_new_protected:Npn \eb_bibtex_natbib_set: @@ -2290,6 +2285,7 @@ \labelformat{chapter}{\CTEXthechapter} \labelformat{figure}{\figurename~#1} \labelformat{table}{\tablename~#1} + \labelformat{lstlisting}{\lstlistingname~#1} \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese } { \labelformat{section}{节#1} @@ -2326,7 +2322,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/10}{2024F} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/13}{2024G} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 @@ -2407,7 +2403,7 @@ }{#2} \DeclareTotalTCBox{\eboxii}{O{Green}mO{}} { - colback = #1,colframe = #1, + colback = #1,colframe = black, tc-eboxii,#3 }{#2} %</tcolorbox>
\ No newline at end of file |