From 9c497f55ee5d00a63c814b0dc5e8709230930315 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 8 Jan 2022 21:35:05 +0000 Subject: easybook (8jan22) git-svn-id: svn://tug.org/texlive/trunk@61537 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybase.sty | 21 +-- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 141 +-------------------- 3 files changed, 11 insertions(+), 153 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index a5496be8bf3..e2a7eb6b934 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/01/06}{1.43} +\ProvidesExplPackage{easybase}{2022/01/08}{1.44} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1573,14 +1573,9 @@ \setlist[enumerate,2]{label = alph,ref = enumii} \setlist[enumerate,3]{label = roman,ref = enumiii} \setlist[description]{font = sf,style = standard} -\newlist{eb@outline@list}{itemize}{1} -\newlist{eb@exercise@list}{enumerate}{2} \newlist{eb@eqcomp@list}{description}{1} -\setlist[eb@outline@list]{label = outline,itemsep = 0.5ex plus .1ex} -\setlist[eb@eqcomp@list]{labelsep = 0em} -\cs_new:Npn \setexerlist #1 { \setlist*[eb@exercise@list]{#1} } +\setlist[eb@eqcomp@list]{nosep,labelsep = 0em} \cs_new:Npn \seteqcomplist #1 { \setlist*[eb@eqcomp@list]{#1} } -\cs_new:Npn \setoutlinelist #1 { \setlist*[eb@outline@list]{#1} } \keys_define:nn { eb/eqcomp } { @@ -1640,7 +1635,7 @@ {\makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#2}} \hspace{\l__eb_eqsymb_space_dim} } -\cs_new_protected:Npn \eb@itembox { \item\makebox } +\cs_new_protected:Npn \eb@itembox { \item[]\makebox } \NewDocumentCommand{\symb}{smO{\l__eb_eqsymb_delim_tl}} { \IfBooleanTF{#1} @@ -2098,13 +2093,11 @@ \labelformat{chapter}{\CTEXthechapter} \labelformat{figure}{\figurename~#1} \labelformat{table}{\tablename~#1} -\labelformat{exercise}{\exercisename~#1} \providecommand{\bibname}{\refname} \ctex_define:n { lstlistlistingname .tl_set:N = \listlstlistingname, - lstlistingname .tl_set:N = \lstlistingname, - exercisename .tl_set:N = \exercisename + lstlistingname .tl_set:N = \lstlistingname } \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese } { @@ -2116,8 +2109,7 @@ listfigurename = 图片索引, listtablename = 表格索引, lstlistlistingname = 代码索引, - lstlistingname = 代码, - exercisename = 练习 + lstlistingname = 代码 } \labelformat{equation}{式(#1)} \labelformat{section}{节 #1} @@ -2128,8 +2120,7 @@ { abstractname = Abstract, lstlistlistingname = List~of~Codes, - lstlistingname = Code, - exercisename = Exercise + lstlistingname = Code } \labelformat{equation}{Equation~(#1)} \labelformat{section}{Section~#1} diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index d0baee9c87c..7df405dd13f 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/01/06}{1.43} +\ProvidesExplClass{easybook}{2022/01/08}{1.44} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 45fbe675859..c54e792660a 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,11 +18,9 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/06}{1.43} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/08}{1.44} {Customization of tcolorbox for easybook} -\cs_set_protected:Npn \setexercise #1 - { \keys_set:nn { eb/exercise } {#1} } \cs_set_protected:Npn \addtotcbstyle #1#2 { \tcbset{#1/.append~style = {#2}} } \cs_set_protected:Npn \deftcbstyle #1#2 @@ -30,22 +28,6 @@ \cs_new_protected:Npn \tcbappstyle { \@ifstar{\deftcbstyle}{\addtotcbstyle} } \cs_set_eq:NN \newtcbstyle \deftcbstyle -\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 = \exercisename, - 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 = \addtotcbstyle{exercise}{#1} - } \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } \deftcbstyle{tc-theorem} @@ -53,36 +35,15 @@ enhanced~jigsaw,pad~at~break* = 3pt, opacityback = 0, colframe = ctex@emph, - sharpish~corners, beforeafter~skip = 1.75ex plus .2ex minus .1ex, left = 8pt,right = 8pt, top = \eb@tc@line@skip,bottom = \eb@tc@line@skip, middle = \eb@tc@line@skip } -\deftcbstyle{tc-outline} - { - enhanced,nofloat, - tikznode~boxed~title, - interior~style = white,colframe = ctex@emph, - colbacktitle = white,coltitle = ctex@emph, - fonttitle = \large\sffamily,fontupper = \itshape, - boxed~title~style = {size = normal,opacityframe = 0,boxrule = 0pt}, - attach~boxed~title~to~top~center = {yshift = -\tcboxedtitleheight/2}, - after~skip = 3ex plus .2ex minus .1ex, - arc = 3pt, - left = 2pc,right = 2pc,top = 1.5pc,bottom = 1pc - } -\deftcbstyle{tc-exercise} - { - blank,center,sharpish~corners, - fontupper = \Large\sffamily, - beforeafter~skip = 5ex plus .2ex minus .1ex - } \deftcbstyle{tc-easybox} { enhanced~jigsaw,pad~at~break* = 3pt, center~title, - sharpish~corners, left = 8pt,right = 8pt, coltitle = black,colframe = black, top = \eb@tc@line@skip,bottom = \eb@tc@line@skip, @@ -96,115 +57,26 @@ frame~hidden, enhanced~jigsaw,pad~at~break* = 3pt, boxrule = 0pt, - sharpish~corners, left = 8pt, middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip, beforeafter~skip = 1.75ex plus .2ex minus .1ex } \deftcbstyle{tc-ebemph}{on~line,blank} -\deftcbstyle{tc-eblink} - { - standard~jigsaw,on~line, - top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, - arc = 1pt,opacityback = 0.2 - } \deftcbstyle{tc-ebfbox} { - standard~jigsaw,on~line,sharpish~corners, + standard~jigsaw,on~line, top = 3pt,bottom = 3pt,left = 3pt,right = 3pt, boxrule = 0.4pt,opacityback = 0.2 } \tcbset { breakable, - boxsep = 0pt, + sharpish~corners, fonttitle = \sffamily, + boxsep = 0pt, boxrule = 0.5pt } -\tl_new:N \p@eb@exercise -\tl_new:N \eb@tc@list@prologue -\bool_gset_true:N \g__eb_exer_clear_prologue_bool -\NewDocumentCommand{\exerprologue}{sm} - { - \IfBooleanTF{#1} - {\bool_gset_false:N \g__eb_exer_clear_prologue_bool} - {\bool_gset_true:N \g__eb_exer_clear_prologue_bool} - \tl_gset:Nn \eb@tc@list@prologue {#2} - } -\cs_new_protected:Npn \tcphantomifname #1#2 - { - \tl_gset:Nn \eb@tc@exercise@ifnametrue {#1} - \tl_gset:Nn \eb@tc@exercise@ifnamefalse {#2} - } -\tcphantomifname - { - \markright - { - \eb_tcb_toc_counter_numsep:n { exercise } - \eb@tc@exercise@title - } - \addcontentsline{toc}{section} - { - \eb_tcb_toc_counter_numsep:n { exertoc } - \eb@tc@exercise@title - } - }{} -\cs_new:Npn \eb_exercise_label_noempty_use: - { - \eb_current_label:n { exercise } - \tl_if_empty:NF \eb@tc@exercise@label - { \exp_args:NV \label \eb@tc@exercise@label } - } -\cs_new:Npn \eb_tcb_toc_counter_numsep:n #1 - { - \thetcbcounter - \hspace{\use:c { eb@toc@#1@numsep }} - } - -\newtcbox[auto~counter]{\eb@tc@exercise@box}[1]{tc-exercise,#1} -\newtcolorbox{eb@tc@outline@box}[2]{title = #1,tc-outline,#2} -\DeclareDocumentEnvironment{outline}{O{}D(){\abstractname}o+b} - { - \begin{eb@tc@outline@box}{#2}{IfValueT = {#3}{#3}} - \begin{eb@outline@list}[#1] - #4 - \end{eb@outline@list} - \end{eb@tc@outline@box} - }{} -\DeclareDocumentEnvironment{exercise}{st-od()O{}+b} - { - \IfValueT{#3}{ \keys_set:nn { eb/exercise } {#3} } - \IfBooleanF{#2} - { - \eb@tc@exercise@box - { - fuzzy~halo = 5pt~with~\eb@tc@background@color, - IfValueT = {#4}{#4}, - phantom = - { - \IfBooleanTF{#1} - {\eb@tc@exercise@ifnamefalse} - {\eb@tc@exercise@ifnametrue} - } - }{ - \IfBooleanF{#1} - { - \eb_tcb_toc_counter_numsep:n { exercise } - \cs_set_eq:NN \theexercise \thetcbcounter - \eb_exercise_label_noempty_use: - } - \eb@tc@exercise@title - } - } - \tl_if_empty:NF \eb@tc@list@prologue { \eb@tc@list@prologue } - \exp_last_unbraced:NnNo - \begin{eb@exercise@list}[\eb@tc@list@number,#5] - #6 - \end{eb@exercise@list} - \bool_if:NT \g__eb_exer_clear_prologue_bool - { \tl_gclear:N \eb@tc@list@prologue } - }{} \DeclareTColorBox{easybox}{sO{PaleGoldenrod}d()O{}} { IfBooleanF = {#1}{frame~hidden,boxrule = 0pt}, @@ -239,11 +111,6 @@ fuzzy~halo = 2pt~with~#1, tc-ebemph,#3 }{#2} -\DeclareTotalTCBox{\eblink}{O{Aqua}vO{}} - { - colback = #1,colframe = #1, - tc-eblink,#3 - }{#2} \endinput %% %% End of file `eb-tcolorbox.cfg'. -- cgit v1.2.3