diff options
author | Karl Berry <karl@freefriends.org> | 2020-09-26 21:49:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-09-26 21:49:45 +0000 |
commit | 77dc9953ed21615c811db9885a44b9c357461fe3 (patch) | |
tree | a225ddede2b1b7de4a9ce30201fd662b321951f1 /Master/texmf-dist/tex/latex | |
parent | 7d1d163297dfe93c40e0391d5460e929a531c1c5 (diff) |
tcolorbox (26sep20)
git-svn-id: svn://tug.org/texlive/trunk@56446 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
19 files changed, 123 insertions, 61 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 2405db4b60b..2779d615ef4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{pdfcol} \pdfcolInitStack{tcb@breakable} @@ -274,14 +274,16 @@ \tcb@multicolfalse% \fi}% \ifx\kvtcb@float\@empty\relax% - \iftcb@nobreak{% + \iftcb@nobreak \let\tcb@nobreak@warning\tcb@do@nobreak@warning% \iftcb@ignorenobreak% \kvtcb@beforebox% \else% \tcb@handle@nobreak% \fi% - }{\kvtcb@beforebox}% + \else% + \kvtcb@beforebox% + \fi% \def\kvtcb@beforebox{\parskip\z@\nointerlineskip\noindent}% \noindent% applies parskip \vskip\lineskip{\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 2c69a26a060..cdf255e7ab8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{listings,skins,xparse,external,raster} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index b4dd73e40cc..0f6d235e217 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 2240147a9e0..2e88a1e0153 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 63f1cd944b3..09f13ac059d 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex index 8604e6896f9..e51b1b775f6 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{listings}[2007/02/22] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index c0460a3c1e6..d18c86c141f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 78eae82da93..47b54affbab 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex index 297ecf5cb06..3fdd32a04ff 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 30a01ea7add..5d8558f8255 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,10 +18,13 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{minted}[2011/09/17] +% to be removed, if integrated into the minted package (#281) +\minted@def@optcl{envname}{-P envname}{#1} + \tcbuselibrary{listings@core} \def\tcb@minted@input@listing#1#2#3#4{% @@ -32,7 +35,11 @@ \edef\tcb@temp{\noexpand\usemintedstyle{\the\toks@}}% \tcb@temp% \fi% - \toks@=\expandafter{#1}% + \ifdefstring{\tcb@listing@capture}{hbox}{% + \toks@=\expandafter{#1,envname=BVerbatim}% + }{% + \toks@=\expandafter{#1}% + }% \edef\tcb@temp{\noexpand\inputminted[\the\toks@]}% \IfFileExists{\minted@outputdir#3}% {\tcb@temp{#2}{\minted@outputdir#3}}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex index 64f96c02511..96e31805dff 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{breakable,magazine,skins,fitting} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex index 88169a0b870..af49bd855c4 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{pdftexcmds} \RequirePackage{shellesc} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index e6abad21ec1..8b1d3a36dba 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 28cadb737af..7deee187e97 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{tikz}[2010/10/13] @@ -771,7 +771,7 @@ segmentation code={\tcb@drawspec@widgetsegment},% skin first=widgetfirst,skin middle=widgetmiddle,skin last=widgetlast} -\tcbset{widget/.style={skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm,toprule at break=0mm}} +\tcbset{widget/.style={skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm}} \tcb@new@skin{widgetfirst}{base@first,% frame engine=pathfirst,interior titled engine=pathfirst,interior engine=pathfirst,segmentation engine=empty,title engine=empty,% @@ -1336,7 +1336,7 @@ \tcbset{marker/.style={% skin=enhancedmiddle jigsaw, - breakable,parbox=false, + parbox=false, boxrule=0mm,leftrule=5mm,rightrule=5mm,boxsep=0mm, left=3mm,right=3mm,top=1mm,bottom=1mm, toptitle=1mm,bottomtitle=1mm,fonttitle=\bfseries, diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index b608e7c157c..40e3b7dff8f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index 2ee69469f31..d86cf5aa7ab 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index 71f6f5c32ea..e7fdadcdf22 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 7eaea506eef..ec86d3fab47 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.32} +\tcb@set@library@version{4.40} \RequirePackage{xparse}[2013/12/31] @@ -30,8 +30,8 @@ IfValueT/.code n args={2}{\IfValueT{#1}{\pgfkeysalso{#2}}}, IfValueF/.code n args={2}{\IfValueF{#1}{\pgfkeysalso{#2}}}, IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, - IfBooleanT/.code n args={3}{\IfBooleanT{#1}{\pgfkeysalso{#2}}}, - IfBooleanF/.code n args={3}{\IfBooleanF{#1}{\pgfkeysalso{#2}}}, + IfBooleanT/.code n args={2}{\IfBooleanT{#1}{\pgfkeysalso{#2}}}, + IfBooleanF/.code n args={2}{\IfBooleanF{#1}{\pgfkeysalso{#2}}}, verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm} } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index a9347399084..4ca0de43f6f 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) +%% The LaTeX package tcolorbox - version 4.40 (2020/09/25) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2020/09/17 version 4.32 text color boxes] -\def\tcb@version{4.32} +\ProvidesPackage{tcolorbox}[2020/09/25 version 4.40 text color boxes] +\def\tcb@version{4.40} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -286,6 +286,46 @@ parfillskip restore/false/.code={\let\tcb@parfillskip@check=\@empty},% before/.code={\def\kvtcb@beforebox{#1}\let\tcb@undo@before=\@empty\let\tcb@use@autoparskip=\relax}, after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax}, + before skip balanced/.style={before={% + \ifnum\lastnodetype=-1\relax% + \else% + \par% + \ifvmode% + \iftcb@minipage% + \ifdim\parskip>\z@\relax% + \addvspace{-\parskip}% + \fi% + \else% + \ifdim\prevdepth<\z@\relax% + \tcbdimto\tcb@prevdepth{\prevdepth}% + \addvspace{\glueexpr#1-\parskip}% + \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}% + \else% + \ifdim\prevdepth>.3\baselineskip\relax% + \tcbdimto\tcb@prevdepth{\prevdepth}% + \addvspace{\glueexpr#1-\parskip}% + \else% + \tcbdimto\tcb@prevdepth{.3\baselineskip}% + \addvspace{\glueexpr#1+.3\baselineskip-\prevdepth-\parskip}% + \fi% + \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}% + \fi% + \fi% + \nointerlineskip% + \fi% + \fi% + \lineskip\z@skip% + \noindent% + }}, + after skip balanced/.style={after={% + \tcb@parfillskip@check% + \par% + \ifvmode% + \prevdepth=.3\baselineskip% + \addvspace{\glueexpr#1-\parskip}% + \fi% + }}, + beforeafter skip balanced/.style={before skip balanced={#1},after skip balanced={#1}}, autoparskip/.code={\let\tcb@use@autoparskip=\tcb@use@auto@parskip}, parskip/.style={before={\ifnum\lastnodetype=-1\relax\else\par% \ifvmode\edef\tcb@prevdepth{\the\glueexpr\prevdepth+\lineskip+\parskip}% @@ -303,16 +343,29 @@ \ifnum\lastnodetype=-1\relax% \else% \par% - \ifvmode\tcbdimto\tcb@prevdepth{\prevdepth}\nointerlineskip% - \addvspace{\glueexpr#1-\parskip}% - \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}% + \ifvmode% + \iftcb@minipage% + \ifdim\parskip>\z@\relax% + \addvspace{-\parskip}% + \fi% + \else% + \tcbdimto\tcb@prevdepth{\prevdepth}% + \addvspace{\glueexpr#1-\parskip}% + \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}% + \fi% + \nointerlineskip% \fi% \fi% - \lineskip\z@skip\noindent% + \lineskip\z@skip% + \noindent% }}, after skip/.style={after={% - \tcb@parfillskip@check\par\ifvmode\nointerlineskip% - \addvspace{\glueexpr#1-\parskip}\fi% + \tcb@parfillskip@check% + \par% + \ifvmode% + \nointerlineskip% + \addvspace{\glueexpr#1-\parskip}% + \fi% }}, beforeafter skip/.style={before skip={#1},after skip={#1}}, before nobreak/.store in=\kvtcb@beforebox@nobreak, @@ -1098,11 +1151,8 @@ \let\tcbtextheight\tcb@zpt% \let\tcbtextwidth\tcb@zpt% \tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook% - \if@nobreak% - \let\iftcb@nobreak\@firstoftwo% - \else% - \let\iftcb@nobreak\@secondoftwo% - \fi% + \let\iftcb@minipage\if@minipage% + \let\iftcb@nobreak\if@nobreak% } \long\def\tcb@@icolorbox[#1]{% @@ -1684,11 +1734,11 @@ \def\tcb@set@normal@unbroken@beforeafter{% \let\tcb@before@unbroken=\kvtcb@beforebox% - \iftcb@nobreak{% + \iftcb@nobreak% \iftcb@ignorenobreak\else% \let\tcb@before@unbroken=\kvtcb@beforebox@nobreak% \fi% - }{}% + \fi% \let\tcb@after@unbroken=\kvtcb@afterbox% } @@ -1752,7 +1802,10 @@ \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% \tcb@set@@phantom% - \sbox\tcb@upperbox{\tcb@embed@tcbox{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}% + \sbox\tcb@upperbox{\tcb@embed@tcbox{% + \csname tcb@parbox@use@\kvtcb@parbox\endcsname% + \@parboxrestore% + \color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}% \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}% \tcb@hasLowerfalse% @@ -2154,7 +2207,7 @@ \let\tcb@lowerdraw@begin@hook\@empty% \let\tcb@lowerdraw@end@hook\@empty% }, - width=\linewidth,autoparskip,arc is curved, + width=\linewidth,beforeafter skip balanced=0.5\baselineskip plus 2pt,arc is curved, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners,parfillskip restore, enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, |