summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tcolorbox
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/tcolorbox')
-rw-r--r--macros/latex/contrib/tcolorbox/CHANGES19
-rw-r--r--macros/latex/contrib/tcolorbox/README2
-rw-r--r--macros/latex/contrib/tcolorbox/tcbbreakable.code.tex10
-rw-r--r--macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbexternal.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbfitting.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbhooks.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistings.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistingscore.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbmagazine.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbminted.code.tex13
-rw-r--r--macros/latex/contrib/tcolorbox/tcbposter.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbprocessing.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbraster.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbskins.code.tex8
-rw-r--r--macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbtheorems.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbvignette.code.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbxparse.code.tex8
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdfbin273842 -> 273842 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example.pdfbin457487 -> 457487 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdfbin442698 -> 442495 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex306
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex3
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex1
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty10
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex50
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex14
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.pdfbin7163608 -> 7184870 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.sty89
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.tex8
38 files changed, 399 insertions, 210 deletions
diff --git a/macros/latex/contrib/tcolorbox/CHANGES b/macros/latex/contrib/tcolorbox/CHANGES
index d48ba782dc..fd31f14db6 100644
--- a/macros/latex/contrib/tcolorbox/CHANGES
+++ b/macros/latex/contrib/tcolorbox/CHANGES
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -1164,3 +1164,20 @@ version 4.32 (2020/09/17)
- library 'xparse':
* new options (#111): 'IfNoValueT', 'IfNoValueF', 'IfValueT', 'IfValueF',
'IfBooleanT', 'IfBooleanF'
+
+version 4.40 (2020/09/25)
+- bug fix (#114): 'IfBooleanT', 'IfBooleanF'
+- bug fix (#117): 'widget' set 'toprule at break' and needed the breakable library
+- (bug) fix: style 'marker' set 'breakable' and needed the breakable library
+- (#113) 'capture=hbox' applies '\@parboxrestore' now to allow e.g. hbox style
+ listings inside indented environments like itemize
+- (#2) support 'hbox' for 'minted' listings
+- (#115) New default vertical space options
+ 'before skip balanced', 'after skip balanced', 'beforeafter skip balanced'
+ NOTE: These options replace the current default options
+ 'parskip', 'noparskip', 'autoparskip'
+ WARNING: Old documents may need adapted manual page breaks where used.
+ Otherwise: Use \tcbsetforeverylayer{autoparskip}
+ to restore the old behavior!
+- 'before skip' and 'before skip balanced' do not insert glue now, if
+ the tcolorbox is the first element in a minipage (or sourrounding tcolorbox)
diff --git a/macros/latex/contrib/tcolorbox/README b/macros/latex/contrib/tcolorbox/README
index f421faa8eb..67c4e5df05 100644
--- a/macros/latex/contrib/tcolorbox/README
+++ b/macros/latex/contrib/tcolorbox/README
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
index 2405db4b60..2779d615ef 100644
--- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
index 2c69a26a06..cdf255e7ab 100644
--- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
index b4dd73e40c..0f6d235e21 100644
--- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
index 2240147a9e..2e88a1e015 100644
--- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
index 63f1cd944b..09f13ac059 100644
--- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
index 8604e6896f..e51b1b775f 100644
--- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
index c0460a3c1e..d18c86c141 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
index 78eae82da9..47b54affba 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
index 297ecf5cb0..3fdd32a04f 100644
--- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
index 30a01ea7ad..5d8558f825 100644
--- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
index 64f96c0251..96e31805df 100644
--- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
index 88169a0b87..af49bd855c 100644
--- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
index e6abad21ec..8b1d3a36db 100644
--- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
index 28cadb737a..7deee187e9 100644
--- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
index b608e7c157..40e3b7dff8 100644
--- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
index 2ee69469f3..d86cf5aa7a 100644
--- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
index 71f6f5c32e..e7fdadcdf2 100644
--- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
index 7eaea506ee..ec86d3fab4 100644
--- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
index 2f8c59debe..6cdb9974d8 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
index 74eb419478..9db17546ef 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.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)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
index b623da1676..c5eb25044c 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
index 3a62669872..8a119c7448 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.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)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
index 837d8ba475..6cec00a3af 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
index a84d704590..ab9b50b369 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
index c714bfd445..b8d678d8d2 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
@@ -128,7 +128,7 @@ parameters. The differences are:
\refKey{/tcb/before} and \refKey{/tcb/after} settings, especially, if there
is an automatic page break before the box.
\item\tcbdocmarginnote{\tcbdocnew{2016-05-25}}
- Lua\TeX\ version 0.95 changes the behaviour of the basic |\vsplit| (a bug?!)
+ Lua\TeX\ version 0.95 changes the behavior of the basic |\vsplit| (a bug?!)
resulting in badly broken boxes. Thanks to Jeremy Engel,
the \mylib{breakable} library contains a patch for this which
also loads the the |ifluatex| package.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
index ba853c46e3..d885f48279 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -240,8 +240,6 @@ and an optional \emph{lower part}. These parts are separated by
This is a \textbf{tcolorbox} (but invisible).
\end{tcolorbox}
-\bigskip
-
\begin{tcolorbox}[upperbox=invisible,colback=white]
This is a \textbf{tcolorbox} (but invisible).
\tcblower
@@ -426,6 +424,8 @@ Now, the saved part is used:
\end{tcolorbox}
\end{exdispExample}
+\enlargethispage*{1cm}
+
The |savedelimiter| is used implicitely with \refCom{newtcolorbox} which
allows a more convenient usage:
\begin{exdispExample}{savedelimiter2}
@@ -2805,52 +2805,34 @@ are drawn by the codes given with
\subsection{Embedding into the Surroundings}\label{subsec:surroundings}
Typically, but not necessarily, a |tcolorbox| is put inside a separate paragraph
and has some vertical space before and after it.
-This behavior is controlled by the keys |before| and |after|.
+This behavior is controlled by the keys \refKey{/tcb/before} and \refKey{/tcb/after}.
+
+\begin{marker}
+Before version 4.40, the default setting for \refKey{/tcb/before}
+and \refKey{/tcb/after} was given by \refKey{/tcb/autoparskip}.
+Starting with version 4.40, the default setting is given by
+\refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}.\par
+Note that old documents may need adaptions of page breaks.\par
+Alternatively, the old default setting can be restored by using
+\begin{dispListing}
+\tcbsetforeverylayer{autoparskip}
+\end{dispListing}
+inside the document preamble.
+\end{marker}
-\begin{docTcbKey}{before}{=\meta{code}}{no default, initially see \refKey{/tcb/autoparskip}}
+
+\begin{docTcbKey}{before}{=\meta{code}}{no default, initially see \refKey{/tcb/before skip balanced}}
Sets the \meta{code} which is executed before the colored box.
It is not used for floating boxes.
Also, it is not used, if the box follows a heading immediately
and \refKey{/tcb/ignore nobreak} is set to \docValue{false}.
\end{docTcbKey}
-\begin{docTcbKey}{after}{=\meta{code}}{no default, initially see \refKey{/tcb/autoparskip}}
+\begin{docTcbKey}{after}{=\meta{code}}{no default, initially see \refKey{/tcb/after skip balanced}}
Sets the \meta{code} which is executed after the colored box.
It is not used for floating boxes.
\end{docTcbKey}
-\begin{docTcbKey}[][doc updated=2017-02-01]{parskip}{}{style, no value}
- Sets the keys |before| and |after| to values which are
- recommended, if the package |parskip| \emph{is} used and there is no better
- idea for |before| and |after|. This is similar to:
-\begin{dispListing}
-\tcbset{parskip/.style={before={\par\pagebreak[0]\parindent=0pt},
- after={\par}}}
-\end{dispListing}
-\end{docTcbKey}
-
-\begin{docTcbKey}[][doc updated=2017-02-01]{noparskip}{}{style, no value}
- Sets the keys |before| and |after| to values which are
- recommended, if the package |parskip| is \emph{not} used and there is no better
- idea for |before| and |after|. This is similar to:
-\begin{dispListing}
-\tcbset{noparskip/.style={before={\par\pagebreak[0]\smallskip\parindent=0pt},
- after={\par\smallskip}}}
-\end{dispListing}
-\end{docTcbKey}
-
-\begin{docTcbKey}{autoparskip}{}{style, no value, initially set}
- Tries to detect the usage of the package |parskip| and sets
- the keys |before| and |after| accordingly. Actually, the following is done:
- \begin{itemize}
- \item If the length of |\parskip| is greater than |0pt| at the beginning of the document,
- \refKey{/tcb/parskip} is executed. Here, the usage of package |parskip| is \emph{assumed}.
- \item Otherwise, if the length of |\parskip| is not greater than |0pt| at the beginning of the document,
- \refKey{/tcb/noparskip} is executed. Here, the absence of package |parskip| is \emph{assumed}.
- \end{itemize}
- |autoparskip| is the default for the package |tcolorbox|, if |before| or |after|
- are not changed otherwise.
-\end{docTcbKey}
\begin{docTcbKey}{nobeforeafter}{}{style, no value}
Abbreviation for clearing the keys |before| and |after|. The colored box
@@ -2865,7 +2847,6 @@ This behavior is controlled by the keys |before| and |after|.
\end{exdispExample}
\end{docTcbKey}
-\enlargethispage*{1cm}
\begin{docTcbKey}{force nobeforeafter}{}{style, no value}
Forces the setting of \refKey{/tcb/nobeforeafter} even if
\refKey{/tcb/before} and \refKey{/tcb/after} are set to other values
@@ -2876,78 +2857,80 @@ This behavior is controlled by the keys |before| and |after|.
\clearpage
-\begin{docTcbKey}{baseline}{=\meta{length}}{no default, initially |0pt|}
- Used to set the |\pgfsetbaseline| value of the resulting |tcolorbox|.
-\begin{exdispExample}{baseline}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[baseline=3mm]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[baseline=3mm]
-First line.\\Second line.
+\begin{docTcbKey}[][doc new={2020-09-25}]{before skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
+ Inserts some vertical space before the colored box. This style sets \refKey{/tcb/before}.\par
+ If the depth of the
+ preceeding \TeX\ box is between |0pt| and |0.3\baselineskip|,
+ the distance between the \emph{baseline} of the preceeding \TeX\ box and the tcolorbox
+ ist set to \meta{glue}$+$|0.3\baselineskip|.\par
+ If the depth is larger, the distance of the preceeding \TeX\ box and the tcolorbox
+ ist set to \meta{glue}.\par
+ Alternatively, see \refKey{/tcb/before skip} which ignores the \emph{baseline}.
+
+\begin{exdispExample*}{before_skip_balanced}{sbs,lefthand ratio=0.6}
+Some text.
+\begin{tcolorbox}[before skip balanced=1cm,
+ colframe=red!50!white]
+ This is a \textbf{tcolorbox}.
\end{tcolorbox}
-\end{exdispExample}
+\end{exdispExample*}
\end{docTcbKey}
+\begin{docTcbKey}[][doc new={2020-09-25}]{after skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
+ Inserts some vertical space of the given \meta{glue} after the colored box.
+ This style sets \refKey{/tcb/after}.
+ Additionally, |\prevdepth| is set to |0.3\baselineskip|. The following
+ \TeX\ box may enlarge the space by further glue to adjust its \emph{baseline}.
+ Alternatively, see \refKey{/tcb/after skip} which ignores the \emph{baseline}.
-\begin{docTcbKey}[][doc new=2014-10-10]{box align}{=\meta{alignment}}{style, no default, initially |bottom|}
- Used to set the \refKey{/tcb/baseline} value of the resulting |tcolorbox|.
- Feasible values for \meta{alignment} are:
- \begin{itemize}
- \item\docValue{bottom}: alignment with the box bottom,
- \item\docValue{top}: alignment with the box top,
- \item\docValue{center}: alignment with the box center,
- \item\docValue{base}: alignment with the box content base. This option
- is not applicable for a \refEnv{tcolorbox} but for a \refCom{tcbox} only.
- It is an alias for \refKey{/tcb/tcbox raise base}.
- \end{itemize}
-
-\begin{exdispExample}{box_align_1}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[box align=bottom]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[box align=bottom]
-First line.\\Second line.
-\end{tcolorbox}
-\end{exdispExample}
-
-\begin{exdispExample}{box_align_2}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[box align=top]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[box align=top]
-First line.\\Second line.
+\begin{exdispExample*}{after_skip_balanced}{sbs,lefthand ratio=0.6}
+\begin{tcolorbox}[after skip balanced=1cm,
+ colframe=red!50!white]
+ This is a \textbf{tcolorbox}.
\end{tcolorbox}
-\end{exdispExample}
+Some text.
+\end{exdispExample*}
+\end{docTcbKey}
-\begin{exdispExample}{box_align_3}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[box align=center]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[box align=center]
-First line.\\Second line.
-\end{tcolorbox}
-\end{exdispExample}
-\begin{exdispExample}{box_align_4}
-\tcbset{colframe=red!50!white,nobeforeafter}
-Some text\dotfill
-\tcbox[nobeforeafter,box align=base]{One line}
-\tcbox[nobeforeafter,box align=base,size=fbox]{Another line}
-\end{exdispExample}
+\begin{docTcbKey}[][doc new={2020-09-25}]{beforeafter skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
+ Inserts some vertical space of the given \meta{glue} before \emph{and} after the colored box.
+ This style sets \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}.
+\begin{exdispExample*}{beforeafter_skip_balanced}{sbs,lefthand ratio=0.6}
+\newtcolorbox{doubleline}[1][]{
+ beforeafter skip balanced=0pt,
+ height=1.8\baselineskip,
+ enlarge top by=.1\baselineskip,
+ enlarge bottom by=.1\baselineskip,
+ colframe=blue!20,colback=blue!5,
+ size=small,valign upper=center,#1 }
+
+\noindent\begin{tikzpicture}
+\path[use as bounding box] (0,0)
+ rectangle (0.1,0.1);
+\foreach \y in {0,1,...,9} {
+ \draw[very thin,red]
+ (-0.2,-\y*\baselineskip) --
+ (\linewidth+0.2cm,-\y*\baselineskip); }
+\end{tikzpicture}
+line 1\par
+\begin{doubleline} Abc \end{doubleline}
+\begin{doubleline} Def \end{doubleline}
+line 2g\par
+\begin{doubleline} Ghi \end{doubleline}
+line 3\par
+line 4 g
+\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}[][doc new and updated={2014-10-10}{2015-03-16}]{before skip}{=\meta{glue}}{style, no default}
+\clearpage
+
+\begin{docTcbKey}[][doc new and updated={2020-09-25}{2015-03-16}]{before skip}{=\meta{glue}}{style, no default}
Inserts some vertical space of the given \meta{glue} before the colored box.
This style sets \refKey{/tcb/before}.
+ In contrast to \refKey{/tcb/before skip balanced}, this \meta{glue} is
+ relative to the lower edge of the preceeding box and not to the baseline.
\begin{exdispExample*}{before_skip}{sbs,lefthand ratio=0.6}
Some text.
\begin{tcolorbox}[before skip=1cm,
@@ -2957,9 +2940,11 @@ Some text.
\end{exdispExample*}
\end{docTcbKey}
-\begin{docTcbKey}[][doc new and updated={2014-10-10}{2017-02-01}]{after skip}{=\meta{glue}}{style, no default}
+\begin{docTcbKey}[][doc new and updated={2020-09-25}{2017-02-01}]{after skip}{=\meta{glue}}{style, no default}
Inserts some vertical space of the given \meta{glue} after the colored box.
This style sets \refKey{/tcb/after}.
+ In contrast to \refKey{/tcb/after skip balanced}, this \meta{glue} is
+ relative to the upper edge of the following box and not to the baseline.
\begin{exdispExample*}{after_skip}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[after skip=1cm,
colframe=red!50!white]
@@ -2971,19 +2956,23 @@ Some text.
\begin{docTcbKey}[][doc new=2014-10-10]{beforeafter skip}{=\meta{glue}}{style, no default}
Inserts some vertical space of the given \meta{glue} before \emph{and} after the colored box.
- This style sets \refKey{/tcb/before} and \refKey{/tcb/after}.
+ This style sets \refKey{/tcb/before skip} and \refKey{/tcb/after skip}.
\begin{exdispExample*}{beforeafter_skip}{sbs,lefthand ratio=0.6}
\tcbset{beforeafter skip=0pt,
colframe=red!50!white}
+
+text before
\begin{tcolorbox}
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\begin{tcolorbox}
Second box.
\end{tcolorbox}
+text after
\end{exdispExample*}
\end{docTcbKey}
+
\clearpage
\begin{docTcbKey}[][doc new=2014-11-07]{left skip}{=\meta{length}}{style, no default, initially |0mm|}
@@ -3028,6 +3017,122 @@ Some text.
\end{docTcbKey}
+\clearpage
+
+\begin{docTcbKey}[][doc updated=2017-02-01]{parskip}{}{style, no value}
+ This options is considered to be superseded by
+ \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
+ (see note on page~\pageref{subsec:surroundings}).\par
+ Sets the keys |before| and |after| to values which are
+ recommended, if the package |parskip| \emph{is} used and there is no better
+ idea for |before| and |after|. This is similar to:
+\begin{dispListing}
+\tcbset{parskip/.style={before={\par\pagebreak[0]\parindent=0pt},
+ after={\par}}}
+\end{dispListing}
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc updated=2017-02-01]{noparskip}{}{style, no value}
+ This options is considered to be superseded by
+ \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
+ (see note on page~\pageref{subsec:surroundings}).\par
+ Sets the keys |before| and |after| to values which are
+ recommended, if the package |parskip| is \emph{not} used and there is no better
+ idea for |before| and |after|. This is similar to:
+\begin{dispListing}
+\tcbset{noparskip/.style={before={\par\pagebreak[0]\smallskip\parindent=0pt},
+ after={\par\smallskip}}}
+\end{dispListing}
+\end{docTcbKey}
+
+\begin{docTcbKey}{autoparskip}{}{style, no value}
+ This options is considered to be superseded by
+ \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
+ (see note on page~\pageref{subsec:surroundings}).\par
+ Tries to detect the usage of the package |parskip| and sets
+ the keys |before| and |after| accordingly. Actually, the following is done:
+ \begin{itemize}
+ \item If the length of |\parskip| is greater than |0pt| at the beginning of the document,
+ \refKey{/tcb/parskip} is executed. Here, the usage of package |parskip| is \emph{assumed}.
+ \item Otherwise, if the length of |\parskip| is not greater than |0pt| at the beginning of the document,
+ \refKey{/tcb/noparskip} is executed. Here, the absence of package |parskip| is \emph{assumed}.
+ \end{itemize}
+\end{docTcbKey}
+
+
+\clearpage
+
+\begin{docTcbKey}{baseline}{=\meta{length}}{no default, initially |0pt|}
+ Used to set the |\pgfsetbaseline| value of the resulting |tcolorbox|.
+\begin{exdispExample}{baseline}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[baseline=3mm]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[baseline=3mm]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc new=2014-10-10]{box align}{=\meta{alignment}}{style, no default, initially |bottom|}
+ Used to set the \refKey{/tcb/baseline} value of the resulting |tcolorbox|.
+ Feasible values for \meta{alignment} are:
+ \begin{itemize}
+ \item\docValue{bottom}: alignment with the box bottom,
+ \item\docValue{top}: alignment with the box top,
+ \item\docValue{center}: alignment with the box center,
+ \item\docValue{base}: alignment with the box content base. This option
+ is not applicable for a \refEnv{tcolorbox} but for a \refCom{tcbox} only.
+ It is an alias for \refKey{/tcb/tcbox raise base}.
+ \end{itemize}
+
+\begin{exdispExample}{box_align_1}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[box align=bottom]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[box align=bottom]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+
+\begin{exdispExample}{box_align_2}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[box align=top]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[box align=top]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+
+\begin{exdispExample}{box_align_3}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[box align=center]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[box align=center]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+
+\begin{exdispExample}{box_align_4}
+\tcbset{colframe=red!50!white,nobeforeafter}
+Some text\dotfill
+\tcbox[nobeforeafter,box align=base]{One line}
+\tcbox[nobeforeafter,box align=base,size=fbox]{Another line}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+
+
\begin{docTcbKey}[][doc new=2014-12-11]{ignore nobreak}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
After a heading, \LaTeX\ tries to avoid a break by setting a |nobreak| boolean value.
Starting from version |3.33|, the \refKey{/tcb/before} respectively \refKey{/tcb/before skip}
@@ -3048,7 +3153,6 @@ enforce the \refKey{/tcb/before} setting.
the box follows a heading.
\end{docTcbKey}
-\enlargethispage*{1cm}
\begin{docTcbKey}[][doc new=2017-02-23]{parfillskip restore}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If this option is set to be |true|, the minimum value of |\parfillskip| is
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
index 9c2cfe8f6d..3f301b0033 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
@@ -1279,6 +1279,8 @@ instead. Also see \refKey{/tcb/docexample}.
\end{deprecated}
\end{docTcbKey}
+\enlargethispage*{1cm}
+
\begin{docTcbKey}{after example}{=\meta{macros}}{no default, initially empty}
\smallskip\begin{deprecated}
Sets the \meta{macros} which are executed after \refEnv{dispExample} and \refEnv{dispListing}
@@ -1363,6 +1365,7 @@ instead. Also see \refKey{/tcb/docexample}.
\refKey{/tcb/index level}.
\end{docTcbKey}
+\enlargethispage*{1cm}
\begin{docTcbKey}{index german settings}{}{style, no value}
Sets the |makeindex| values recommended for German language texts.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
index c91bc1bb19..7b207b6255 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
@@ -45,6 +45,7 @@ See \Vref{sec:skins} for the documentation of all other options of the \mylib{sk
\end{dispExample*}
\end{docTikzKey}
+\enlargethispage*{1cm}
\begin{docTikzKey}{fill plain picture}{=\meta{graphical code}}{no default, initially unset}
Fills the current path with the given \meta{graphical code}.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
index 32e77fc9f0..e9379a6fdd 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
@@ -138,7 +138,7 @@
\newtcolorbox{marker}[1][]{enhanced,
- before skip=2mm,after skip=3mm,
+ before skip balanced=2mm,after skip balanced=3mm,
boxrule=0.4pt,left=5mm,right=2mm,top=1mm,bottom=1mm,
colback=yellow!50,
colframe=yellow!20!black,
@@ -244,8 +244,8 @@
docexample/.style={docexample original},%
},
beforeafter example/.style={
- before skip=4pt plus 2pt minus 1pt,
- after skip=8pt plus 4pt minus 2pt
+ before skip balanced=4pt plus 2pt minus 1pt,
+ after skip balanced=5pt plus 2pt minus 1pt
},
base example/.style={bicolor,
beforeafter example,arc is angular,fonttitle=\bfseries,
@@ -272,7 +272,9 @@
base example,coltitle=black,fonttitle=\itshape,titlerule=0pt,
colbacktitle=Navy!15!ExampleBack,
top=0mm,
- before=\par\smallskip,%
+ %before=\par\smallskip,%
+ before skip balanced=4pt plus 2pt minus 1pt,
+ after skip balanced=5pt plus 2pt minus 1pt,
listing style=mydocumentation,
listing only,listing file={\jobname_preamble_#1.tex}}%
}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
index 646d4229ae..32b395673d 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
@@ -472,6 +472,8 @@ the bottom left corner of the main box.
\end{exdispExample*}
\end{docTcbKey}
+\enlargethispage*{1cm}
+
\begin{docTcbKey}{attach boxed title to bottom center}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
The title is boxed with a \refCom{tcbox} and attached to
the bottom of the main box.
@@ -1168,7 +1170,8 @@ This example uses a public domain picture from\\
\end{dispExample}
\end{docTcbKey}
-\enlargethispage{5mm}
+\enlargethispage*{1cm}
+
\begin{docTcbKey}{watermark zoom}{=\meta{fraction}}{no default, initially |0.75|}
Sets the zoom value for a watermark. The zoom respects the aspect ratio.
The value $1.0$ means to fill the whole box until the watermark touches the frame.
@@ -3688,7 +3691,7 @@ Nevertheless, this skin can be applied independently.
as seen in the third line.}}
git commit
git commit -a
-git commit -am `changes to my example'
+git commit -am 'changes to my example'
\end{tcblisting}
\end{dispExample}
@@ -3847,9 +3850,10 @@ Nevertheless, this skin can be applied independently.
\end{tcolorbox}
\end{docSkin}
-\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, no value}
- This is an abbreviation for setting |skin=tile|.
- \begin{marker}It also changes the geometry and some style options.\end{marker}
+\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, initially\\
+ |skin=tile,boxrule=0pt,sharp corners,title filled,fonttitle=\textbackslash bfseries|
+}
+ This key applies |skin=tile| and in addition changes the geometry and some style options.
\end{docTcbKey}
@@ -4016,11 +4020,7 @@ Nevertheless, this skin can be applied independently.
\begin{docSkin}{beamer}
This skin resembles boxes known from the |beamer| class and therefore is
called \enquote{beamer}. It uses the normal colors from the core package but shades
- them a little bit. To use this skin, the |tikz| library |shadings|
- has to be included in the preamble by:
-\begin{dispListing}
-\usetikzlibrary{shadings}
-\end{dispListing}
+ them a little bit.
\begin{tcolorbox}[skintable=beamer]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
@@ -4036,9 +4036,11 @@ Nevertheless, this skin can be applied independently.
-\begin{docTcbKey}{beamer}{}{style, no value}
- This is an abbreviation for setting |skin=beamer|.
- \begin{marker}It also changes the geometry and some style options.\end{marker}
+\begin{docTcbKey}{beamer}{}{style, initially\\
+ |skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,|\\
+ |arc=2mm,fonttitle=\textbackslash bfseries,drop fuzzy shadow|
+}
+ This key applies |skin=beamer| and in addition changes the geometry and some style options.
\end{docTcbKey}
@@ -4230,14 +4232,10 @@ Nevertheless, this skin can be applied independently.
\subsection{Skin Family \enquote{widget}}
\begin{docSkin}{widget}
This skin uses the normal colors from the core package but shades
- them a little bit. To use this skin, the |tikz| library |shadings|
- has to be included in the preamble by:
-\begin{dispListing}
-\usetikzlibrary{shadings}
-\end{dispListing}
-The appearance of the skin can be controlled by \refKey{/tcb/frame style},
-\refKey{/tcb/interior style}, and \refKey{/tcb/segmentation style},
-if needed.
+ them a little bit.
+ The appearance of the skin can be controlled by \refKey{/tcb/frame style},
+ \refKey{/tcb/interior style}, and \refKey{/tcb/segmentation style},
+ if needed.
\begin{tcolorbox}[skintable=widget]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
@@ -4252,12 +4250,14 @@ if needed.
\end{docSkin}
-\begin{docTcbKey}{widget}{}{style, no value}
- This is an abbreviation for setting |skin=widget|.
- \begin{marker}It also changes the geometry and some style options.\end{marker}
+\begin{docTcbKey}[][doc updated={2020-09-23}]{widget}{}{style, initially\\
+ |skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm|
+}
+ This key applies |skin=widget| and in addition changes the geometry and some style options.
\end{docTcbKey}
+
\begin{dispExample}
\begin{tcbraster}[widget,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,
@@ -4289,7 +4289,7 @@ This is my content.
\end{tcolorbox}
\end{dispExample}
-
+\clearpage
\begin{docSkin}{widgetfirst}
This is a flavor of \refSkin{widget} which is used as a \emph{first} part
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
index 2d637f4678..21e8153de4 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
@@ -30,7 +30,7 @@ option from the core package has to be set.
\begin{tcolorbox}[adjusted title=My title]
This is my content.
\end{tcolorbox}
-\begin{tcolorbox}[skin=beamer,beamer,adjusted title=My title]
+\begin{tcolorbox}[beamer,adjusted title=My title]
This is my content.
\end{tcolorbox}
\end{dispExample}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
index 672ff20421..2d316a3379 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
@@ -593,7 +593,7 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor
of the lower part.
\end{docTcbKey}
-\enlargethispage*{1cm}
+\enlargethispage*{2cm}
\begin{docTcbKey}[][doc updated=2014-10-30]{ams equation*}{}{style, no value}
Adds an |amsmath| |equation*| environment to the start and end
of the upper \emph{and} lower part.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
index bad6fd6a60..752b5b35ad 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
@@ -124,7 +124,7 @@ This is a tcolorbox.
}
}
Wraps the |\IfBoolean(TF)| command(s) of |xparse| for option setting.
- If the \meta{argument} is |\BooleanTue|, the \meta{true options} are set.
+ If the \meta{argument} is |\BooleanTrue|, the \meta{true options} are set.
If the \meta{argument} is |\BooleanFalse|, the \meta{false options} are set.
\begin{dispExample}
@@ -163,7 +163,7 @@ This is a tcolorbox.
\DeclareTColorBox[use counter from=pabox]{mybox}{ O{red} m d"" !O{} }
{enhanced,colframe=#1!75!black,colback=#1!5!white,
fonttitle=\bfseries,title={\thetcbcounter~#2},
- IfValueTF={#3}{watermark text={#3}}{},#4}
+ IfValueT={#3}{watermark text={#3}},#4}
\begin{mybox}{My title}
This is a tcolorbox.
@@ -271,8 +271,8 @@ This is a tcolorbox.
\DeclareTCBox[use counter from=pabox]{\mybox}{ s m s }
{ nobeforeafter,colback=red!5!white,colframe=red!75!black,
title={#2 (Box \thetcbcounter)},fonttitle=\bfseries,
- IfBooleanTF={#1}{enhanced,drop shadow}{},
- IfBooleanTF={#3}{colbacktitle=red!50!white}{} }
+ IfBooleanT={#1}{enhanced,drop shadow},
+ IfBooleanT={#3}{colbacktitle=red!50!white} }
\mybox{Bird}{This is my first box.}
\hfill
@@ -339,7 +339,7 @@ typeset the verbatim content.
% \usepackage{listings} or \tcbuselibrary{listings}
\DeclareTotalTCBox{\commandbox}{ s v }
{verbatim,colupper=white,colback=black!75!white,colframe=black}
-{\IfBooleanTF{#1}{\textcolor{red}{\ttfamily\bfseries > }}{}%
+{\IfBooleanT{#1}{\textcolor{red}{\ttfamily\bfseries > }}%
\lstinline[language=command.com,keywordstyle=\color{blue!35!white}\bfseries]^#2^}
\commandbox*{cd "My Documents"} changes to directory \commandbox{My Documents}.
@@ -459,7 +459,7 @@ With date of 2018-05-12, the |xparse| \cite{latexproject:xparse} package
changed the argument collection process.
Now, spaces are ignored which leads to a serious change for listing environments
ending with an optional argument like \verb+O{}+.
-The former behaviour of respecting spaces can be preserved by adding a \flqq\verb+!+\frqq.
+The former behavior of respecting spaces can be preserved by adding a \flqq\verb+!+\frqq.
Note that the following code uses \verb+!O{}+ now.
\begin{itemize}
\item For older |xparse| versions, the following code is correct when using \verb+O{}+.
@@ -570,7 +570,7 @@ The following commands need the \mylib{fitting} library to be included.
{colback=red!5!white,
colframe=red!75!black,
width=#2,height=#2/3*2,
- IfValueTF={#3}{height=#3}{},
+ IfValueT={#3}{height=#3},
#1}
\mybox[colback=yellow]{5cm}%
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
index ef1068931f..015a9bd926 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty
index a934739908..4ca0de43f6 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.sty
+++ b/macros/latex/contrib/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,
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex
index 2b2a2d9102..0aebc2ca47 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -43,8 +43,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{4.32}%
-\def\datum{2020/09/17}%
+\def\version{4.40}%
+\def\datum{2020/09/25}%
\makeindex
\hypersetup{
@@ -62,7 +62,7 @@
%\geometry{showframe}
%\tcbset{draftmode}
\tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.breakable}
+%\includeonly{tcolorbox.doc.intro,tcolorbox.doc.quickref,tcolorbox.doc.coremacros}
%\hypersetup{colorlinks=false}