From 652a7e2ad11688e26d4545ae3f32b2e37f39a28a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Mar 2022 21:01:09 +0000 Subject: easybook (18mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62785 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 591500 -> 591566 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 6 +++--- .../texmf-dist/source/latex/easybook/easybook.dtx | 24 +++++++++++---------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 2 +- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 20 +++++++++-------- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 47bef555cfb..0df829c25aa 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index af3aed21626..b147f949834 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.648, - date = 2022/03/13, + version = v1.65, + date = 2022/03/18, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = q1jx@foxmail.com, @@ -1121,7 +1121,7 @@ \end{easybox} \end{ctexexam} \environment{ebparbox}[\sarg\oarg{颜色名}\darg{段落标题}\oarg{配置选项}] - 环境 \env{ebparbox} 用法与 \env{easybox} 类似,同样带有三个可选参数。盒子的左边带有一条粗竖线,\meta{颜色名} 选项可以自定义这条竖线颜色,使用星号参数则盒子带有竖线颜色的浅色背景。 + 环境 \env{ebparbox} 用法与 \env{easybox} 类似,同样带有三个可选参数。盒子的左边带有一条粗竖线,背景颜色为竖线颜色的浅色。\meta{颜色名} 选项可以设置竖线的颜色。使用星号参数则盒子无背景颜色。 \end{environments} \begin{commands} diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 023419294b7..bae091e2c18 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}{2022/03/13}{1.648} +\ProvidesExplClass{easybook}{2022/03/18}{1.65} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/03/13}{1.648} +\ProvidesExplPackage{easybase}{2022/03/18}{1.65} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2322,7 +2322,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/13}{1.648} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/18}{1.65} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 @@ -2377,22 +2377,24 @@ colback = #2,colbacktitle = #2, tc-easybox,#4 } -\DeclareTColorBox{ebparbox}{sO{RoyalBlue}d()O{}} +\DeclareTColorBox{ebparbox}{sO{RoyalBlue}D(){}O{}} { borderline~west = {3pt}{0pt}{#2}, IfBooleanTF = {#1} { + colback = white, + top = 0pt,bottom = 0pt,right = 0pt, + pad~at~break* = 0pt + }{ colback = #2,colbacktitle = #2, opacityback = 0.2,opacitybacktitle = 0.2, - IfValueTF = {#3}{title = #3,top = 0pt}{top = 0.5\baselineskip}, - bottom = 0.5\baselineskip,toptitle = 0.5\baselineskip, + top = \tl_if_blank:nTF {#3} { 0.5\baselineskip } { 0pt }, + bottom = 0.5\baselineskip, + toptitle = 0.5\baselineskip, right = 8pt - }{ - colback = white, - IfValueT = {#3}{title = #3}, - top = 0pt,bottom = 0pt,right = 0pt }, - coltitle = #2,tc-ebparbox,#4 + title = #3,coltitle = #2, + tc-ebparbox,#4 } \DeclareTotalTCBox{\ebfbox}{O{Green}mO{}} { diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 9046bcebb73..5f84f69ae0b 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/03/13}{1.648} +\ProvidesExplPackage{easybase}{2022/03/18}{1.65} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 06c9dbc4aec..34d9ba16550 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/03/13}{1.648} +\ProvidesExplClass{easybook}{2022/03/18}{1.65} {Easily typesetting 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 5123c166958..147d842236d 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/13}{1.648} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/18}{1.65} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 @@ -73,22 +73,24 @@ colback = #2,colbacktitle = #2, tc-easybox,#4 } -\DeclareTColorBox{ebparbox}{sO{RoyalBlue}d()O{}} +\DeclareTColorBox{ebparbox}{sO{RoyalBlue}D(){}O{}} { borderline~west = {3pt}{0pt}{#2}, IfBooleanTF = {#1} { + colback = white, + top = 0pt,bottom = 0pt,right = 0pt, + pad~at~break* = 0pt + }{ colback = #2,colbacktitle = #2, opacityback = 0.2,opacitybacktitle = 0.2, - IfValueTF = {#3}{title = #3,top = 0pt}{top = 0.5\baselineskip}, - bottom = 0.5\baselineskip,toptitle = 0.5\baselineskip, + top = \tl_if_blank:nTF {#3} { 0.5\baselineskip } { 0pt }, + bottom = 0.5\baselineskip, + toptitle = 0.5\baselineskip, right = 8pt - }{ - colback = white, - IfValueT = {#3}{title = #3}, - top = 0pt,bottom = 0pt,right = 0pt }, - coltitle = #2,tc-ebparbox,#4 + title = #3,coltitle = #2, + tc-ebparbox,#4 } \DeclareTotalTCBox{\ebfbox}{O{Green}mO{}} { -- cgit v1.2.3