diff options
author | Karl Berry <karl@freefriends.org> | 2021-11-20 20:53:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-11-20 20:53:31 +0000 |
commit | e46f68801d28bebdbc42a47eb4411b330a7fe2ff (patch) | |
tree | 0cab5b4ca9cb35c9a1afee3343abbe82a46b7190 /Master/texmf-dist/source/latex | |
parent | 4ede05846cf39da0bbfd0484928394f414addc6a (diff) |
easybook (20nov21)
git-svn-id: svn://tug.org/texlive/trunk@61098 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 78 |
1 files changed, 43 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 4d5a6904436..302df73e057 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/11/16}{1.40R} +\ProvidesExplClass{easybook}{2021/11/20}{1.40T} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -325,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/11/16}{1.40R} +\ProvidesExplPackage{easybase}{2021/11/20}{1.40T} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1032,8 +1032,17 @@ \cs_set_eq:NN \eb@makefntext \@makefntext \ctex_at_end_package:nn { footmisc } { - \@ifpackagewith{footmisc}{hang} - {\cs_set_eq:NN \@makefntext \eb@makefntext}{} + \notbool{FN@para} + { + \cs_set_eq:NN \@makefntext \eb@makefntext + \msg_warning:nn { easybase } { footmisc } + }{} + } +\msg_new:nnn { easybase } { footmisc } + { + It~is~not~recommended~that~you~use~the \\ + hang,~symbol,~marginal,~flushmargin~or~bottom \\ + options~of~the~footmisc~package. } \cs_set_protected:Npn \footref #1 @@ -1907,6 +1916,7 @@ { \tl_const:cn { c__eb_name_#1_tl } {#3} } { \tl_const:cn { c__eb_name_#1_tl } {#2} } } +\cs_undefine:N \proof \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle \RenewDocumentCommand{\declaretheorem}{O{}mO{}} @@ -1935,7 +1945,6 @@ Now~that~the~thmframe~option~is~true. \\ Please~load~the~tcolorbox~macro~package. } -\cs_set_eq:NN \DeclareTheorem \deftheorem \prop_new:N \l__eb_thmtools_entry_prop \clist_const:Nn \c__eb_thmtools_entry_clist @@ -1991,8 +2000,6 @@ \c__eb_thmtools_entry_clist { notebraces = \l__eb_thm_notebraces_tl } \exp_last_unbraced:NNV \declaretheoremstyle[\c__eb_thmtools_entry_clist]{easy-theorem} - \eb_thm_name_set:nnn { exercise } { Exercise } { 练习 } - \cs_undefine:N \proof \deftheorem{lemma}{引理} \deftheorem{example}{例} \deftheorem{theorem}{定理} @@ -2055,31 +2062,6 @@ } \ctex_at_end_package:nn { unicode-math } { \msg_redirect_module:nnn { unicode-math } { warning } { info } } - -\keys_define:nn { eb/exercise } - { - color .tl_set:N = \eb@tc@background@color, - color .initial:n = DeepSkyBlue, - number .tl_set:N = \eb@tc@list@number, - number .initial:n = 1., - title .tl_set:N = \eb@tc@exercise@title, - title .initial:n = \c__eb_name_exercise_tl, - numsep .dim_set:N = \eb@toc@exercise@numsep, - numsep .initial:n = 0.5em, - tocnumsep .dim_set:N = \eb@toc@exertoc@numsep, - tocnumsep .initial:n = 1em, - label .tl_set:N = \eb@tc@exercise@label, - enumitem .code:n = \setexerlist{#1}, - tcolorbox .code:n = \addtcbstyle{exercise}{#1} - } -\cs_set_protected:Npn \setexercise #1 - { \keys_set:nn { eb/exercise } {#1} } -\cs_set_protected:Npn \addtcbstyle #1#2 - { \tcbset{#1/.append~style = {#2}} } -\cs_set_protected:Npn \newtcbstyle #1#2 - { \tcbset{#1/.style = {#2}} } -\cs_new_protected:Npn \tcbappstyle - { \@ifstar{\newtcbstyle}{\addtcbstyle} } \ctex_at_end_package:nn { tcolorbox } { \eb_package_date_check:nn { tcolorbox } { 2020/10/09 } @@ -2393,9 +2375,34 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40R} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/20}{1.40T} {Customization of tcolorbox for easybook} +\cs_set_protected:Npn \setexercise #1 + { \keys_set:nn { eb/exercise } {#1} } +\cs_set_protected:Npn \addtcbstyle #1#2 + { \tcbset{#1/.append~style = {#2}} } +\cs_set_protected:Npn \newtcbstyle #1#2 + { \tcbset{#1/.style = {#2}} } +\cs_new_protected:Npn \tcbappstyle + { \@ifstar{\newtcbstyle}{\addtcbstyle} } +\keys_define:nn { eb/exercise } + { + color .tl_set:N = \eb@tc@background@color, + color .initial:n = DeepSkyBlue, + number .tl_set:N = \eb@tc@list@number, + number .initial:n = 1., + title .tl_set:N = \eb@tc@exercise@title, + title .initial:n = \c__eb_name_exercise_tl, + numsep .dim_set:N = \eb@toc@exercise@numsep, + numsep .initial:n = 0.5em, + tocnumsep .dim_set:N = \eb@toc@exertoc@numsep, + tocnumsep .initial:n = 1em, + label .tl_set:N = \eb@tc@exercise@label, + enumitem .code:n = \setexerlist{#1}, + tcolorbox .code:n = \addtcbstyle{exercise}{#1} + } + \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } \newtcbstyle{tc-theorem} { @@ -2457,14 +2464,14 @@ { standard~jigsaw,on~line, top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, - boxrule = 0.75pt,arc = 1pt, + boxrule = 0.5pt,arc = 1pt, opacityback = 0.2 } \newtcbstyle{tc-ebfbox} { on~line,sharpish~corners, top = 2pt,bottom = 2pt,left = 1pt,right = 1pt, - leftrule = 0pt,rightrule = 0pt + boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt } \tcbset { @@ -2482,6 +2489,7 @@ \tl_gset:Nn \eb@tc@exercise@ifnametrue {#1} \tl_gset:Nn \eb@tc@exercise@ifnamefalse {#2} } +\eb_thm_name_set:nnn { exercise } { Exercise } { 练习 } \tcphantomifname { \markright |