From 7c16c26a1bf8f0a8cf17672a295595204d7e821c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 27 Apr 2021 13:31:43 +0000 Subject: easybook (26apr21) git-svn-id: svn://tug.org/texlive/trunk@58996 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybook.cls | 156 +++++++++------------- 1 file changed, 64 insertions(+), 92 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index d1a9a4f2c68..519d1f72d66 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,etoolbox} -\ProvidesExplClass{easybook}{2021/04/23}{1.24s}{beta} +\ProvidesExplClass{easybook}{2021/04/25}{1.24t}{beta} \cs_generate_variant:Nn \__ctex_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -665,30 +665,27 @@ figure = \eb@labelname@lof, table = \eb@labelname@lot } -\ctex_at_end_preamble:n +\cs_gset:Npn \caption@@@addcontentsline#1#2#3#4 { - \cs_gset:Npn \caption@@@addcontentsline#1#2#3#4 + \addcontentsline{#1}{#2} { - \addcontentsline{#1}{#2} - { - \ifodd\eb@titletoc@hang@fix - \protect\numberline - \fi - {\prop_item:Nn \l__eb_label_name_prop{#2}{#3}}{#4} - } + \ifodd\eb@titletoc@hang@fix + \protect\numberline + \fi + {\prop_item:Nn \l__eb_label_name_prop{#2}{#3}}{#4} } - \ctex_patch_cmd:Nnn \lst@MakeCaption + } +\ctex_patch_cmd:Nnn \lst@MakeCaption + { + \addcontentsline{lol}{lstlisting} + {\protect\numberline{\thelstlisting}\lst@@caption} + }{ + \addcontentsline{lol}{lstlisting} { - \addcontentsline{lol}{lstlisting} - {\protect\numberline{\thelstlisting}\lst@@caption} - }{ - \addcontentsline{lol}{lstlisting} - { - \ifodd\eb@titletoc@hang@fix - \protect\numberline - \fi - {\eb@labelname@lol}\lst@@caption - } + \ifodd\eb@titletoc@hang@fix + \protect\numberline + \fi + {\eb@labelname@lol}\lst@@caption } } @@ -1073,17 +1070,25 @@ {\tl_const:cn {c__eb_name_#1_tl}{#3}} {\tl_const:cn {c__eb_name_#1_tl}{#2}} } -\clist_map_inline:nn +\NewDocumentCommand{\EbNewtheorem} + {mO{\text_titlecase_first:n {#1}}mD(){tc-theorem}O{}} { - {proposition}{Proposition}{性质}, - {definition}{Definition}{定义}, - {corollary}{Corollary}{推论}, - {exercise}{Exercise}{练习}, - {theorem}{Theorem}{定理}, - {example}{Example}{例}, - {remark}{Remark}{注}, - {lemma}{Lemma}{引理} - }{\__eb_thmname_set:nnn #1} + \ctex_at_end_preamble:n + { + \__eb_thmname_set:nnn {#1}{#2}{#3} + \exp_args:No \declaretheorem@i + { + name = \use:c {c__eb_name_#1_tl}, + style = easy-theorem,#5 + }{#1}[] + \bool_if:NT \l__eb_thmbox_bool + { + \@ifpackageloaded{tcolorbox} + {\tcolorboxenvironment{#1}{#4}}{} + } + \labelformat{#1}{\use:c {c__eb_name_#1_tl}~##1} + } + } \bool_new:N \l__eb_thmbox_bool \tl_new:N \l__eb_thm_numberwith_tl @@ -1136,32 +1141,23 @@ headformat = \NAME\space\NUMBER\NOTE ] } -\ctex_at_end_preamble:n +\__eb_at_end_preamble:n { - \exp_args:NNc \exp_after:wN - \declaretheoremstyle{c__eb_thmtools_keyval_tl}{easy-thm-sty} + \exp_last_unbraced:No + \declaretheoremstyle\c__eb_thmtools_keyval_tl{easy-theorem} + \__eb_thmname_set:nnn {exercise}{Exercise}{练习} + \cs_undefine:N \proof \clist_map_inline:nn { - example,definition,theorem, - proposition,lemma,corollary - }{ - \declaretheorem[ - style = easy-thm-sty, - name = \use:c {c__eb_name_#1_tl} - ]{#1} - } - \cs_undefine:N \proof - \declaretheorem[ - style = easy-thm-sty, - name = \c__eb_name_remark_tl, - numbered = no - ]{remark} - \declaretheorem[ - style = easy-thm-sty, - name = \proofname, - numbered = no, - qed = \qedsymbol - ]{proof} + {lemma}{引理}, + {example}{例}, + {theorem}{定理}, + {corollary}{推论}, + {definition}{定义}, + {proposition}{性质}, + {remark}{注}[numbered = no], + {{proof}{证明}[numbered = no,qed = \qedsymbol]} + }{\EbNewtheorem#1} } \ctex_at_end_package:nn {tasks} @@ -1200,7 +1196,10 @@ \cs_new_protected:Npn \l__eb_math_restore:n #1 { \AtBeginEnvironment{#1} - {\linespread{\fp_use:N \l__eb_spread_math_fp}\selectfont\ignorespaces} + { + \linespread{\fp_use:N \l__eb_spread_math_fp} + \selectfont\ignorespaces + } } \clist_map_inline:nn { @@ -1315,7 +1314,7 @@ {frame~hidden,boxrule = 0pt,toptitle = 8pt,top = 0pt}, IfValueT = {#3}{title = #3}, colback = #2,colbacktitle = #2, - opacityback = 0.1,opacitybacktitle = 0.1, + opacityback = 0.12,opacitybacktitle = 0.12, coltitle = black,colframe = black, left = 6pt,right = 6pt,bottom = 8pt,middle= 8pt, bottomtitle = 8pt, @@ -1336,7 +1335,7 @@ top = 0pt,bottom = 0pt,toptitle = 0pt }{ colback = #2,colbacktitle = #2, - opacityback = 0.1,opacitybacktitle = 0.1, + opacityback = 0.12,opacitybacktitle = 0.12, IfValueTF = {#3}{title = #3,top = 0pt}{top = 8pt}, bottom = 8pt,toptitle = 8pt }, @@ -1359,21 +1358,6 @@ colback = #1,opacityback = 0.12,colframe = #1,#3 }{#2} } -\ctex_at_end_preamble:n - { - \bool_if:NT \l__eb_thmbox_bool - { - \@ifpackageloaded{tcolorbox} - { - \tcolorboxenvironment{theorem}{tc-theorem} - \tcolorboxenvironment{definition}{tc-theorem} - \tcolorboxenvironment{lemma}{tc-theorem} - \tcolorboxenvironment{corollary}{tc-theorem} - \tcolorboxenvironment{proposition}{tc-theorem} - \tcolorboxenvironment{example}{tc-theorem} - }{} - } - } \bool_set_true:N \l__eb_backend_bibtex_bool \tl_new:N \l__eb_bib_style_tl @@ -1505,20 +1489,22 @@ \__eb_patch_cmd:Nnn \@footnotetext {\reset@font} { - \def\baselinestretch{\fp_use:N \l__eb_spread_footnote_fp} + \linespread{\fp_use:N \l__eb_spread_footnote_fp} + \selectfont\ignorespaces \l__eb_font_footnote_tl } \__eb_patch_cmd:Nnn \@mpfootnotetext {\reset@font} { - \def\baselinestretch{\fp_use:N \l__eb_spread_footnote_fp} + \linespread{\fp_use:N \l__eb_spread_footnote_fp} + \selectfont\ignorespaces \l__eb_font_footnote_tl } \__eb_patch_cmd:Nnn \@makefnmark {\normalfont}{\l__eb_font_footnote_tl} \cs_gset:Npn \thempfootnote{\int_to_alph:n {\c@mpfootnote}} -\lstdefinestyle{easy-lst-sty} +\lstdefinestyle{easy-listings} { language = [LaTeX]TeX, texcsstyle = @@ -1563,7 +1549,7 @@ } \lstset { - style = easy-lst-sty, + style = easy-listings, breaklines = true, resetmargins = true, % numbers = left, @@ -1692,6 +1678,8 @@ \exp_args:NV \hypersetup\l__eb_hyperref_clist \labelformat{part}{\CTEXthepart} \labelformat{chapter}{\CTEXthechapter} + \labelformat{figure}{\figurename~#1} + \labelformat{table}{\tablename~#1} \tl_if_eq:NnTF \l__ctex_scheme_tl{chinese} { \keys_set_known:nn {ctex} @@ -1708,16 +1696,8 @@ \labelformat{align}{式(#1)} \labelformat{multline}{式(#1)} \labelformat{gather}{式(#1)} - \labelformat{figure}{图#1} - \labelformat{table}{表#1} \labelformat{section}{节#1} \labelformat{subsection}{小节#1} - \labelformat{theorem}{定理#1} - \labelformat{definition}{定义#1} - \labelformat{lemma}{引理#1} - \labelformat{corollary}{推论#1} - \labelformat{proposition}{性质#1} - \labelformat{example}{例#1} }{ \keys_set_known:nn {ctex} { @@ -1729,16 +1709,8 @@ \labelformat{align}{Equation~(#1)} \labelformat{multline}{Equation~(#1)} \labelformat{gather}{Equation~(#1)} - \labelformat{figure}{Figure~#1} - \labelformat{table}{Table~#1} \labelformat{section}{Section~#1} \labelformat{subsection}{Subsection~#1} - \labelformat{theorem}{Theorem~#1} - \labelformat{definition}{Definition~#1} - \labelformat{lemma}{Lemma~#1} - \labelformat{corollary}{Corollary~#1} - \labelformat{proposition}{Proposition~#1} - \labelformat{example}{Example~#1} } } -- cgit v1.2.3