From f8d688cceb9bee2119c4cf3422a85bd60c0e846c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 8 Sep 2021 03:03:50 +0000 Subject: CTAN sync 202109080303 --- macros/latex/contrib/easybook/easybook.dtx | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'macros/latex/contrib/easybook/easybook.dtx') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index c21f742ba7..2150fef75c 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/09/06}{1.29p} +\ProvidesExplClass{easybook}{2021/09/06}{1.30} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,14 +297,14 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/09/06}{1.29p} +\ProvidesExplPackage{easybase}{2021/09/06}{1.30} {Typeset Chinese theses or books} -\cs_generate_variant:Nn \dim_add:Nn { NV,Nv } \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 \prop_set_from_keyval:Nn { NV } +\cs_generate_variant:Nn \skip_add:Nn { NV,Nv } \cs_generate_variant:Nn \skip_set:Nn { NV } \cs_generate_variant:Nn \seq_set_from_clist:Nn { No } \cs_generate_variant:Nn \ctex_define:nn { nx } @@ -1131,7 +1131,7 @@ \seq_if_in:NnF \c__ctex_headings_seq { subparagraph } { \ctex_define:nn { tocset } - { #1/belowoffset .dim_set:c = l__eb_toc_#1_offset_dim } + { #1/belowskip .skip_set:c = l__eb_toc_#1_below_skip } } \seq_pop:NN \c__ctex_headings_seq \l_tmpa_tl \titlecontents{#1} @@ -1155,7 +1155,7 @@ \c__ctex_headings_seq \eb_toc_assign_keys:n \ctex_define:n { tocset/list .meta:nn = { ctex/tocset/list } {#1} } \eb_clist_map_inline:nn - { format,format+,format~+,indent,rule,numsep,belowoffset } + { format,format+,format~+,indent,rule,numsep,belowskip } { \ctex_define:nn { tocset } { @@ -1186,9 +1186,9 @@ \newbool{eb@titletoc@hang@fix} \ctex_define:nn { tocset } { - lolskip .skip_set:N = \l__eb_toc_lolskip_skip, + lolskip .skip_set:N = \eb@toc@lolskip, lolskip .initial:n = 0.8pc, - belowoffset .dim_set:N = \l__eb_toc_offset_dim, + belowoffset .skip_set:N = \l__eb_toc_offset_skip, belowoffset .initial:n = { \bool_if:NTF \l__eb_class_book_bool { -1pc } { -0.35pc } }, line-align .bool_set:N = \l__eb_toc_line_align_bool, @@ -1303,7 +1303,7 @@ list/format = \addvspace{0.2pc}, list/indent = 0em, list/rule = \tocrule{$\cdot$}, - list/belowoffset = + list/belowskip = { \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } } } @@ -1414,10 +1414,10 @@ { \eb_appto_cmd:Nn \@chapter { - \skip_if_eq:nnF { \l__eb_toc_lolskip_skip } { \c_zero_skip } + \skip_if_eq:nnF { \eb@toc@lolskip } { \c_zero_skip } { \addtocontents{lol} - {\protect\addvspace{\skip_use:N \l__eb_toc_lolskip_skip}} + {\protect\addvspace{\skip_use:N \eb@toc@lolskip}} } } } @@ -1542,9 +1542,9 @@ \tl_set_eq:Nc \eb@toc@title { list#4name } \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} \eb_title_number_intoc_spec:nn {#2} {#1} - \dim_add:Nv - \l__eb_toc_offset_dim { l__eb_toc_#4_offset_dim } - \vspace*{\dim_use:N \l__eb_toc_offset_dim} + \skip_add:Nv + \l__eb_toc_offset_skip { l__eb_toc_#4_below_skip } + \vspace*{\dim_use:N \l__eb_toc_offset_skip} \eb_toc_start_multi_column_ext:n {#5} \group_end: } @@ -1568,12 +1568,12 @@ \tl_set:Nn \eb@bitoc@title { Contents } \IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}} \eb_title_mark_notoc:n { \eb@toc@title } - \vspace*{\dim_use:N \l__eb_toc_offset_dim} + \vspace*{\dim_use:N \l__eb_toc_offset_skip} \eb_toc_start_multi_column_ext:n { toc }#3 \IfBooleanT{#1} { \eb_title_mark_notoc:n { \eb@bitoc@title } - \vspace*{\dim_use:N \l__eb_toc_offset_dim} + \vspace*{\dim_use:N \l__eb_toc_offset_skip} \eb_toc_start_multi_column_ext:n { tec } } \group_end: @@ -2075,9 +2075,9 @@ \cs_new_protected:Npn \setexercise #1 { \keys_set:nn { eb/exercise } {#1} } \cs_new_protected:Npn \addtcbstyle #1#2 - { \tcbset{tc-#1/.append~style = {#2}} } + { \tcbset{#1/.append~style = {#2}} } \cs_new_protected:Npn \newtcbstyle #1#2 - { \tcbset{tc-#1/.style = {#2}} } + { \tcbset{#1/.style = {#2}} } \cs_new_protected:Npn \tcbappstyle { \@ifstar{\newtcbstyle}{\addtcbstyle} } \ctex_at_end_package:nn { tcolorbox } @@ -2129,7 +2129,6 @@ { \exp_args:NV \bibliographystyle \l__eb_bib_otherstyle_tl } \tl_if_empty:NF \l__eb_bib_cite_style_tl { \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl } - \skip_zero:N \bibsep \AtEndEnvironment{thebibliography} {\bool_if:NT \l__eb_toc_multi_column_bool { \end{multicols} }} \NewDocumentCommand{\printbibliography}{st+o} @@ -2146,6 +2145,7 @@ \exp_args:NV \bibliography \l__eb_bib_datafile_clist \group_end: } + \skip_zero:N \bibsep } \cs_new_protected:Npn \eb_put_biblatex:n #1 { \PassOptionsToPackage{#1}{biblatex} } @@ -2400,11 +2400,11 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/06}{1.29p} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/06}{1.30} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } -\newtcbstyle{theorem} +\newtcbstyle{tc-theorem} { enhanced~jigsaw,pad~at~break* = 3pt, opacityback = 0, @@ -2415,7 +2415,7 @@ top = \eb@tc@line@skip,bottom = \eb@tc@line@skip, middle = \eb@tc@line@skip } -\newtcbstyle{outline} +\newtcbstyle{tc-outline} { enhanced,nofloat, tikznode~boxed~title, @@ -2428,14 +2428,14 @@ arc = 3pt, left = 2pc,right = 2pc,top = 1.5pc,bottom = 1pc } -\newtcbstyle{exercise} +\newtcbstyle{tc-exercise} { blank,on~line,center, sharpish~corners, fontupper = \Large\sffamily, beforeafter~skip = 3.75ex plus .2ex minus .1ex } -\newtcbstyle{easybox} +\newtcbstyle{tc-easybox} { enhanced~jigsaw,pad~at~break* = 3pt, center~title, @@ -2449,7 +2449,7 @@ titlerule = 0pt, beforeafter~skip = 1.75ex plus .2ex minus .1ex } -\newtcbstyle{ebparbox} +\newtcbstyle{tc-ebparbox} { frame~hidden, enhanced~jigsaw,pad~at~break* = 3pt, @@ -2459,15 +2459,15 @@ middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip, beforeafter~skip = 1.75ex plus .2ex minus .1ex } -\newtcbstyle{ebemph}{on~line,blank} -\newtcbstyle{eblink} +\newtcbstyle{tc-ebemph}{on~line,blank} +\newtcbstyle{tc-eblink} { standard~jigsaw,on~line, top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, boxrule = 0.75pt,arc = 1pt, opacityback = 0.2 } -\newtcbstyle{ebfbox} +\newtcbstyle{tc-ebfbox} { on~line,sharpish~corners, top = 2pt,bottom = 2pt,left = 1pt,right = 1pt, -- cgit v1.2.3