diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tcolorbox')
15 files changed, 305 insertions, 98 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index f87080b974c..2ff4905fc0d 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.50} +\tcb@set@library@version{3.60} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 15cf264ffc5..38f30e33d86 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,11 +17,10 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.50} +\tcb@set@library@version{3.60} \tcbuselibrary{listings,skins,xparse,external} -\RequirePackage{doc}[2010/02/04] \RequirePackage{pifont}[2005/04/12] \RequirePackage{marvosym}[2011/07/20] \ifdefined\printindex\else\RequirePackage{makeidx}[2000/03/29]\fi @@ -54,8 +53,30 @@ % The following macros are taken from ltxdoc \DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\let\tcb@doc@org@meta\meta% -\def\meta#1{{\rmfamily\tcb@doc@org@meta{#1}}} +\def\meta@font@select{\rmfamily\itshape} + +\AtEndPreamble{% + \@ifpackageloaded{doc}{% + }{% code taken from doc.sty + \ifx\l@nohyphenation\undefined + \newlanguage\l@nohyphenation + \fi + \DeclareRobustCommand\meta[1]{% + \ensuremath\langle + \ifmmode \expandafter \nfss@text \fi + {% + \meta@font@select + \edef\meta@hyphen@restore + {\hyphenchar\the\font\the\hyphenchar\font}% + \hyphenchar\font\m@ne + \language\l@nohyphenation + #1\/% + \meta@hyphen@restore + }\ensuremath\rangle + }% + }% +}% + \def\marg#1{% {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}} \def\oarg#1{% @@ -395,7 +416,9 @@ %--- index macros taken from pgfmanual-en-macros \def\tcb@doc@index@pgf@{% - \c@IndexColumns=2% + \ifdefined\c@IndexColumns% + \c@IndexColumns=2% + \fi% \def\theindex{\@restonecoltrue \columnseprule \z@ \columnsep 29\p@ \twocolumn[\index@prologue]% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index c5c38983786..d62bec68285 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.50} +\tcb@set@library@version{3.60} { \catcode`\"=12 @@ -73,6 +73,7 @@ \immediate\write\tcb@out{\string\gdef\string\TCBEXTERNALINPUT{"\tcbexternal@job@source"}}% \immediate\write\tcb@out{\string\gdef\string\TCBEXTERNALSAFETY{\tcbexternal@safety}}% \immediate\write\tcb@out{\string\gdef\string\TCBEXTERNALPREAMBLE{\expandonce{\tcbexternal@preamble}}}% + \ifdefempty{\tcbexternal@preclass}{}{\immediate\write\tcb@out{\expandonce{\tcbexternal@preclass}}}% \immediate\write\tcb@out{\string\input{"\jobname.tex"}}% \immediate\closeout\tcb@out% \foreach \n in {1,...,\tcbexternal@runs} @@ -227,6 +228,10 @@ preamble/.code={\appto\tcbexternal@preamble{#1}}, preamble tcbset/.code={\appto\tcbexternal@preamble{\tcbset{#1}}}, clear preamble/.code={\def\tcbexternal@preamble{}}, + preclass/.code={\appto\tcbexternal@preclass{#1}}, + clear preclass/.code={\def\tcbexternal@preclass{}}, + PassOptionsToPackage/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToPackage{#1}{#2}}}, + PassOptionsToClass/.code 2 args={\appto\tcbexternal@preclass{\PassOptionsToClass{#1}{#2}}}, externalize/.code={}, % force remake/.is choice, @@ -250,10 +255,21 @@ }, minipage/.default=\linewidth, % - environment/.code={% - \appto\tcbexternal@out@begin{\immediate\write\tcb@out{\string\begin{#1}\@percentchar}}% - \preto\tcbexternal@out@end{\immediate\write\tcb@out{\string\end{#1}\@percentchar}}% - },% + environment with percent/.is choice, + environment with percent/true/.style={% + /tcb/external/environment/.code={% + \appto\tcbexternal@out@begin{\immediate\write\tcb@out{\string\begin{##1}\@percentchar}}% + \preto\tcbexternal@out@end{\immediate\write\tcb@out{\string\end{##1}\@percentchar}}% + } + }, + environment with percent/false/.style={% + /tcb/external/environment/.code={% + \appto\tcbexternal@out@begin{\immediate\write\tcb@out{\string\begin{##1}}}% + \preto\tcbexternal@out@end{\immediate\write\tcb@out{\string\end{##1}}}% + } + }, + environment with percent/.default=true, + % runner=\jobname_run.tex, prefix={external/}, compiler=pdflatex, @@ -261,8 +277,10 @@ name=unnamed, safety=2mm, clear preamble, + clear preclass, force remake=false, input source on error, + environment with percent, plain } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 29926d0ccdc..e2d3a0ef20d 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -226,7 +226,7 @@ \def\tcb@fit@@box{% \iftcb@hasTitle% \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)}% - \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% \tcbdimto\tcb@h@titletotal{\ht\tcb@titlebox+\dp\tcb@titlebox+\kvtcb@title@rule+(\kvtcb@boxsep)*2+\kvtcb@toptitle+\kvtcb@bottomtitle}% \else% \let\tcb@h@titletotal=\tcb@zpt% @@ -256,7 +256,7 @@ \tcb@set@color{tcbcol@upper}% \begin{tcb@savebox}{\tcb@upperbox}{##1}% \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% - \kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper% + \kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper% \end{tcb@savebox}% \tcb@reset@color% \advance\count@ 1\relax% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 512bf4c75c8..e3bd47ba849 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \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 6cabae81769..a7c4eeecbd6 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \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 04d1f07266f..b1a5f9288bd 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \RequirePackage{pdftexcmds} @@ -41,7 +41,7 @@ \newenvironment{tcb@lower@outside}[1]{% \tcbset{savedelimiter=tcb@lower@outside}\tcb@minipage{#1}% - \color{tcbcol@lower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces}% + \color{tcbcol@lower}\kvtcb@fontlower\kvtcb@halignlower\kvtcb@before@lower\ignorespaces}% {\unskip\kvtcb@after@lower\endminipage} \def\tcb@use@listing@other@reset{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 984f34d83d9..b4d2e0e54a1 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 87dd742387b..d54ba8a8f54 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% tcbminted.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{3.50} +\tcb@set@library@version{3.60} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 18b8b6328ac..ef527cd803e 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \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 578437722bd..c060ed92e05 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tcolorbox - version 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2006-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.50} +\tcb@set@library@version{3.60} \RequirePackage{tikz}[2010/10/13] @@ -389,16 +389,15 @@ at begin tikz={% \tcbdimto\kvtcb@arc{#1\dimexpr\kvtcb@arc}% \tcbdimto\tcb@outer@arc{#1\dimexpr\tcb@outer@arc}% - \def\tcb@shadow@prepare##1##2{% - \ifdim##2>0pt\relax\tcbdimto\tcb@shadow@ts{##1-##2/2}%% - \else\tcbdimto\tcb@shadow@ts{##1+##2/2}\fi% + \def\tcb@shadow@comp@arc{% \tcbdimto\tcb@shadow@ts{#1\dimexpr\tcb@shadow@ts}% - \ifdim\dimexpr\tcb@outer@arc>\tcb@shadow@ts\relax% - \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-\tcb@shadow@ts}% + \ifdim\dimexpr\tcb@outer@arc>\tcb@arc@scale\dimexpr\tcb@shadow@ts\relax% + \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-\tcb@arc@scale\dimexpr\tcb@shadow@ts\relax}% \else% \let\tcb@shadow@arc=\tcb@zpt% \fi% - }}},% + }% + }},% remember/.style={tikz={remember picture}},% remember as/.style={tikz={remember picture},at end tikz={\pgfnodealias{#1}{frame}}},% } @@ -546,7 +545,7 @@ \or% \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathfirst}% + {\tcbset{interior style=}\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathfirst}% \fi% \else% {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathfirst}% @@ -558,7 +557,7 @@ \or% \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UR% \else% - {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathfirst}% + {\tcbset{interior style=}\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathfirst}% \fi% \else% {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathfirst}% @@ -577,7 +576,7 @@ \or% \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathmiddle}% + {\tcbset{interior style=}\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathmiddle}% \fi% \else% {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathmiddle}% @@ -589,7 +588,7 @@ \or% \tcb@spec{fill=tcbcol@back}\tcb@drawspec@US% \else% - {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathmiddle}% + {\tcbset{interior style=}\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathmiddle}% \fi% \else% {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathmiddle}% @@ -608,7 +607,7 @@ \or% \tcb@spec{fill=tcbcol@back}\tcb@drawspec@UT% \else% - {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathlast}% + {\tcbset{interior style=}\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithtitle@pathlast}% \fi% \else% {\tcb@spec{fill=tcbcol@back}\tcb@drawwithtitle@pathlast}% @@ -620,7 +619,7 @@ \or% \tcb@spec{fill=tcbcol@back}\tcb@drawspec@US% \else - {\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathlast}% + {\tcbset{interior style=}\tcb@spec{fill=tcbcol@backlower}\tcb@drawwithouttitle@pathlast}% \fi% \else% {\tcb@spec{fill=tcbcol@back}\tcb@drawwithouttitle@pathlast}% @@ -1002,7 +1001,7 @@ \colorlet{tcbtranscol@frame}{tcbcol@frame}% \colorlet{tcbtranscol@back}{tcbcol@backtitle}% \let\tcb@trans@boxedstyle\kvtcb@style@boxedtitle% - \setbox\tcb@titlebox\color@hbox\bgroup\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox% + \setbox\tcb@titlebox\color@hbox\bgroup\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@boxedtitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title\kvtcb@after@boxedtitle\egroup\color@endbox% \setbox\tcb@titlebox\color@hbox\tcbox[colframe=tcbtranscol@frame,colback=tcbtranscol@back,size=title,code={\pgfkeysalsofrom\tcb@trans@boxedstyle}]{\box\tcb@titlebox}\color@endbox% % \tcbdimto\tcboxedtitleheight{\ht\tcb@titlebox+\dp\tcb@titlebox}% @@ -1301,8 +1300,8 @@ \def\tcb@border@prepare#1#2{% \tcbdimto\tcb@border@ts{#2+(#1)/2}% - \ifdim\dimexpr\tcb@outer@arc>\tcb@border@ts\relax% - \tcbdimto\tcb@border@arc{\tcb@outer@arc-\tcb@border@ts}% + \ifdim\dimexpr\tcb@outer@arc>\tcb@arc@scale\dimexpr\tcb@border@ts\relax% + \tcbdimto\tcb@border@arc{\tcb@outer@arc-\tcb@arc@scale\dimexpr\tcb@border@ts\relax}% \else% \let\tcb@border@arc=\tcb@zpt% \fi% @@ -1409,11 +1408,19 @@ borderline vertical/.style args={#1#2#3}{borderline west={#1}{#2}{#3},borderline east={#1}{#2}{#3}},% } -\def\tcb@shadow@prepare#1#2{% + +\def\tcb@shadow@comp@ts@smart#1#2{% \ifdim#2>0pt\relax\tcbdimto\tcb@shadow@ts{#1-#2/2}%% \else\tcbdimto\tcb@shadow@ts{#1+#2/2}\fi% - \ifdim\dimexpr\tcb@outer@arc>\tcb@shadow@ts\relax% - \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-\tcb@shadow@ts}% +} + +\def\tcb@shadow@comp@ts@copy#1#2{% + \tcbdimto\tcb@shadow@ts{#1}% +} + +\def\tcb@shadow@comp@arc{% + \ifdim\dimexpr\tcb@outer@arc>\tcb@arc@scale\dimexpr\tcb@shadow@ts\relax% + \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-\tcb@arc@scale\dimexpr\tcb@shadow@ts\relax}% \else% \let\tcb@shadow@arc=\tcb@zpt% \fi% @@ -1437,25 +1444,29 @@ \let\tcb@arc@sha@SE@rounded\tcb@arc@sha \def\tcb@shadow@unbroken#1#2#3#4{% - \tcb@shadow@prepare{#3}{#1}% + \tcb@shadow@comp@ts{#3}{#1}% + \tcb@shadow@comp@arc% \tcb@pathbase{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% {\tcb@arc@sha@SW}{\tcb@arc@sha@NW}{\tcb@arc@sha@NE}{\tcb@arc@sha@SE}% } \def\tcb@shadow@first#1#2#3#4{% - \tcb@shadow@prepare{#3}{#1}% + \tcb@shadow@comp@ts{#3}{#1}% + \tcb@shadow@comp@arc% \tcb@pathbase{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% {\tcb@arc@zpt}{\tcb@arc@sha@NW}{\tcb@arc@sha@NE}{\tcb@arc@zpt}% } \def\tcb@shadow@middle#1#2#3#4{% - \tcb@shadow@prepare{#3}{#1}% + \tcb@shadow@comp@ts{#3}{#1}% + \tcb@shadow@comp@arc% \tcb@pathbase{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}% } \def\tcb@shadow@last#1#2#3#4{% - \tcb@shadow@prepare{#3}{#1}% + \tcb@shadow@comp@ts{#3}{#1}% + \tcb@shadow@comp@arc% \tcb@pathbase{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% {\tcb@arc@sha@SW}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@sha@SE}% } @@ -1525,6 +1536,11 @@ drop fuzzy shadow northeast/.default={black!50!white},% drop fuzzy shadow east/.style={fuzzy shadow={1.0mm}{0mm}{-0.5mm}{0.12mm}{#1}}, drop fuzzy shadow east/.default={black!50!white},% + % + smart shadow arc/.is choice, + smart shadow arc/true/.code={\let\tcb@shadow@comp@ts=\tcb@shadow@comp@ts@smart}, + smart shadow arc/false/.code={\let\tcb@shadow@comp@ts=\tcb@shadow@comp@ts@copy}, + smart shadow arc/.default=true, } \def\tcb@boundary@tikzbendedbase#1#2#3#4#5#6#7#8{% @@ -1540,7 +1556,7 @@ \def\tcb@pathbendedbase#1#2#3#4#5#6#7#8#9{\tcb@pathboundary{#1}{\tcb@boundary@tikzbendedbase{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}} \def\tcb@shadowbended@prepare#1{% - \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-#1}% + \tcbdimto\tcb@shadow@arc{\tcb@outer@arc-\tcb@arc@scale\dimexpr#1\relax}% \ifdim\dimexpr\tcb@shadow@arc<0pt\relax% \let\tcb@shadow@arc=\tcb@zpt% \fi% @@ -1735,7 +1751,7 @@ watermark opacity=1.00,watermark color=tcbcol@back!85!tcbcol@frame,% watermark zoom=0.75,clip watermark,% clip title=false,clip upper=false,clip lower=false,% - no borderline,no shadow,no underlay,no finish,tikz reset,at begin tikz reset,at end tikz reset,% + no borderline,smart shadow arc,no shadow,no underlay,no finish,tikz reset,at begin tikz reset,at end tikz reset,% boxed title style=,hbox boxed title,code={\let\tcb@specialgeonodes@hook\relax},% graphics options=,graphics pages={1,...,\pdfpages},graphics directory=,% }, @@ -1743,4 +1759,3 @@ } \tcbuselibrary{skins@jigsaw} - diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index f1da9d6971b..5503e8bc889 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \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 5be3e04e054..64db47670b8 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index 628bce6e0f7..52fddb93403 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% 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{3.50} +\tcb@set@library@version{3.60} \RequirePackage{xparse}[2013/12/31] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 599509c476d..da7be0e6c4f 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 3.50 (2015/03/16) +%% The LaTeX package tcolorbox - version 3.60 (2015/05/07) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2015/03/16 version 3.50 text color boxes] -\def\tcb@version{3.50} +\ProvidesPackage{tcolorbox}[2015/05/07 version 3.60 text color boxes] +\def\tcb@version{3.60} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -73,7 +73,7 @@ \let\tcb@outer@arc=\kvtcb@left@rule\fi% \ifdim\kvtcb@right@rule<\tcb@outer@arc\relax% \let\tcb@outer@arc=\kvtcb@right@rule\fi% - \tcbdimto\tcb@outer@arc{\tcb@outer@arc+\kvtcb@arc}% + \tcbdimto\tcb@outer@arc{\tcb@arc@scale\dimexpr\tcb@outer@arc\relax+\kvtcb@arc}% } \def\tcb@comp@arc@fix{% @@ -114,6 +114,12 @@ \fi% \fi} +\def\tcb@set@embed@tcbox#1{% + \long\def\tcb@embed@tcbox##1{% + \tcbdimto\tcb@w@upper{\kvtcb@width-\kvtcb@left@rule-\kvtcb@leftupper-\kvtcb@boxsep*2-\kvtcb@rightupper-\kvtcb@right@rule}% + #1}% +} + \def\tcb@new@skin#1#2{\tcbset{skin@#1/.style={#2}}} \newcommand{\tcbsubskin}[3]{\tcb@new@skin{#1}{skin@#2,#3}} @@ -121,7 +127,7 @@ \pgfkeys{/handlers/.colorlet/.code=\pgfkeysalso{\pgfkeyscurrentpath/.code=\colorlet{#1}{##1}}} \newcommand\tcbtitle{\ifx\tcbtitletext\@empty\else% - {\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} + {\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\tcbtitletext\kvtcb@after@title}\fi} \def\tcb@detach@title@code@{% \let\tcbtitletext\kvtcb@title% @@ -141,6 +147,11 @@ \let\tcb@specialtitle@hook\@empty% } +% analog to plain.tex +\def\tcb@raggedright@plain{\raggedright\rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax} +\def\tcb@raggedleft@plain{\raggedleft\leftskip0pt plus2em \spaceskip.3333em \xspaceskip.5em \hbadness=10000\relax} +\def\tcb@raggedcenter@plain{\centering\leftskip0pt plus2em\rightskip0pt plus2em\spaceskip.3333em \xspaceskip.5em \hbadness=10000\relax} + \tcbset{% title/.store in=\kvtcb@title, notitle/.style={title=}, @@ -187,6 +198,27 @@ arc/.store in=\kvtcb@arc, outer arc/.code={\def\kvtcb@outerarc{#1}\let\tcb@comp@arc=\tcb@comp@arc@fix}, auto outer arc/.code={\let\tcb@comp@arc=\tcb@comp@arc@auto}, + circular arc/.style={arc=\tcb@innerwidth/2}, + bean arc/.code={% + \iftcb@fixedheight% + \ifdim\dimexpr\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule>\dimexpr\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand\relax% + \def\kvtcb@arc{(\kvtcb@height@fixed-\kvtcb@top@rule@stand-\kvtcb@bottom@rule@stand)/2}% + \else% + \def\kvtcb@arc{(\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule)/2}% + \fi% + \else% + \def\kvtcb@arc{\tcb@innerwidth/2}% + \fi% + }, + octogon arc/.style={arc=0.292893218\dimexpr\tcb@innerwidth\relax}, + arc is curved/.code={% + \def\tcb@arc@scale{1}% + \let\tcb@apply@graph@patches=\tcbpatcharcround% + }, + arc is angular/.code={% + \def\tcb@arc@scale{0.58578644}% + \let\tcb@apply@graph@patches=\tcbpatcharcangular% + }, sharpish corners/.style={arc=0pt,outer arc=0pt}, lefttitle/.store in=\kvtcb@lefttitle, leftupper/.store in=\kvtcb@leftupper, @@ -212,6 +244,7 @@ fontlower/.store in=\kvtcb@fontlower, tempfile/.store in=\kvtcb@tempfile, savelowerto/.store in=\kvtcb@savelowerto, + saveto/.store in=\kvtcb@saveupperto, savedelimiter/.estore in=\kvtcb@savedelimiter, floatplacement/.store in=\kvtcb@floatplacement, float/.code={\def\kvtcb@float{#1}\def\tcb@float@env@begin{\@float}\def\tcb@float@env@end{\end@float}}, @@ -259,6 +292,7 @@ height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},% height fill/.is choice,% height fill/false/.code={\let\tcb@height@adjust\@empty},% + square/.style={height=\kvtcb@width}, equal height group/.code={\edef\tcb@ehgid{#1}\let\tcb@ch=\tcb@ch@equalheight}, minimum for equal height group/.code args={#1:#2}{\edef\tcb@ehgid{#1}\tcb@ehgadd{#2}}, space/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@space}, @@ -266,8 +300,44 @@ space to lower/.style={space=0}, space to both/.style={space=0.5}, split/.code={\def\tcb@height@fraction{#1}\let\tcb@ch@fixed@both=\tcb@ch@fixed@split}, - valign/.store in=\kvtcb@valign, - valign lower/.store in=\kvtcb@valignlower, + % + halign/.is choice, + halign/flush left/.code={\let\kvtcb@halignupper=\raggedright}, + halign/flush right/.code={\let\kvtcb@halignupper=\raggedleft}, + halign/flush center/.code={\let\kvtcb@halignupper=\centering}, + halign/left/.code={\let\kvtcb@halignupper=\tcb@raggedright@plain}, + halign/right/.code={\let\kvtcb@halignupper=\tcb@raggedleft@plain}, + halign/center/.code={\let\kvtcb@halignupper=\tcb@raggedcenter@plain}, + halign/justify/.code={\let\kvtcb@halignupper=\@empty}, + halign upper/.style={halign=#1}, + % + halign lower/.is choice, + halign lower/flush left/.code={\let\kvtcb@halignlower=\raggedright}, + halign lower/flush right/.code={\let\kvtcb@halignlower=\raggedleft}, + halign lower/flush center/.code={\let\kvtcb@halignlower=\centering}, + halign lower/left/.code={\let\kvtcb@halignlower=\tcb@raggedright@plain}, + halign lower/right/.code={\let\kvtcb@halignlower=\tcb@raggedleft@plain}, + halign lower/center/.code={\let\kvtcb@halignlower=\tcb@raggedcenter@plain}, + halign lower/justify/.code={\let\kvtcb@halignlower=\@empty}, + % + halign title/.is choice, + halign title/flush left/.code={\let\kvtcb@haligntitle=\raggedright}, + halign title/flush right/.code={\let\kvtcb@haligntitle=\raggedleft}, + halign title/flush center/.code={\let\kvtcb@haligntitle=\centering}, + halign title/left/.code={\let\kvtcb@haligntitle=\tcb@raggedright@plain}, + halign title/right/.code={\let\kvtcb@haligntitle=\tcb@raggedleft@plain}, + halign title/center/.code={\let\kvtcb@haligntitle=\tcb@raggedcenter@plain}, + halign title/justify/.code={\let\kvtcb@haligntitle=\@empty}, + % + valign/.is choice, + valign/top/.code={\def\kvtcb@valignupper{top}}, + valign/center/.code={\def\kvtcb@valignupper{center}}, + valign/bottom/.code={\def\kvtcb@valignupper{bottom}}, + valign upper/.style={valign=#1}, + valign lower/.is choice, + valign lower/top/.code={\def\kvtcb@valignlower{top}}, + valign lower/center/.code={\def\kvtcb@valignlower{center}}, + valign lower/bottom/.code={\def\kvtcb@valignlower{bottom}}, enlarge top initially by/.store in=\kvtcb@bbtop@stand,% enlarge top at break by/.store in=\kvtcb@bbtop@break,% enlarge top by/.style={enlarge top initially by={#1},enlarge top at break by={#1}},% @@ -384,15 +454,15 @@ after upper/.store in=\kvtcb@after@upper,% before lower/.store in=\kvtcb@before@lower,% after lower/.store in=\kvtcb@after@lower,% - center title/.style={before title=\centering},% - center upper/.style={before upper=\centering},% - center lower/.style={before lower=\centering},% - flushleft title/.style={before title=\raggedright},% - flushleft upper/.style={before upper=\raggedright},% - flushleft lower/.style={before lower=\raggedright},% - flushright title/.style={before title=\raggedleft},% - flushright upper/.style={before upper=\raggedleft},% - flushright lower/.style={before lower=\raggedleft},% + center title/.style={halign title=flush center},% + center upper/.style={halign upper=flush center},% + center lower/.style={halign lower=flush center},% + flushleft title/.style={halign title=flush left},% + flushleft upper/.style={halign upper=flush left},% + flushleft lower/.style={halign lower=flush left},% + flushright title/.style={halign title=flush right},% + flushright upper/.style={halign upper=flush right},% + flushright lower/.style={halign lower=flush right},% tabularx*/.style 2 args={% boxsep=0pt,top=0pt,bottom=0pt,leftupper=0pt,rightupper=0pt, toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm, @@ -508,6 +578,21 @@ shape@of@skin/.store in=\tcb@shapeofskin, ignore nobreak/.is if=tcb@ignorenobreak,% only/.code args={<#1>#2}{\only<#1>{\tcbset{#2}}},% + % + tcbox width/.is choice, + tcbox width/auto/.code={\def\tcb@embed@tcbox{}}, + tcbox width/auto limited/.code={\tcb@set@embed@tcbox{% + \setbox\z@=\color@hbox##1\color@endbox\ifdim\wd\z@<\tcb@w@upper\relax\box\z@\else% + \begin{minipage}{\tcb@w@upper}##1\end{minipage}\fi}}, + tcbox width/forced center/.code={\tcb@set@embed@tcbox{\makebox[\tcb@w@upper]{##1}}}, + tcbox width/forced left/.code={\tcb@set@embed@tcbox{\makebox[\tcb@w@upper][l]{##1}}}, + tcbox width/forced right/.code={\tcb@set@embed@tcbox{\makebox[\tcb@w@upper][r]{##1}}}, + tcbox width/minimum center/.code={\tcb@set@embed@tcbox{% + \setbox\z@=\color@hbox##1\color@endbox\ifdim\wd\z@<\tcb@w@upper\relax\makebox[\tcb@w@upper]{\box\z@}\else\box\z@\fi}}, + tcbox width/minimum left/.code={\tcb@set@embed@tcbox{% + \setbox\z@=\color@hbox##1\color@endbox\ifdim\wd\z@<\tcb@w@upper\relax\makebox[\tcb@w@upper][l]{\box\z@}\else\box\z@\fi}}, + tcbox width/minimum right/.code={\tcb@set@embed@tcbox{% + \setbox\z@=\color@hbox##1\color@endbox\ifdim\wd\z@<\tcb@w@upper\relax\makebox[\tcb@w@upper][r]{\box\z@}\else\box\z@\fi}}, } \def\kvtcb@beforebox{} @@ -558,10 +643,10 @@ \let\endtcb@savebox=\endtcb@lrbox \def\tcb@saveupperbox{% -\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces} +\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces} \def\tcb@savelowerbox{% -\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces} +\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\kvtcb@fontlower\kvtcb@halignlower\kvtcb@before@lower\ignorespaces} % counter for float @@ -594,13 +679,12 @@ \ifx\kvtcb@title\@empty\tcb@hasTitlefalse\tcb@specialtitle@hook\else% \tcb@hasTitletrue% \tcbdimto\tcb@w@title{\kvtcb@width-(\kvtcb@left@rule)-(\kvtcb@right@rule)-(\kvtcb@boxsep)*2-(\kvtcb@lefttitle)-(\kvtcb@righttitle)}% - \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@titlebox}{\tcb@w@title}\color{tcbcol@title}\kvtcb@fonttitle\kvtcb@haligntitle\kvtcb@before@title\kvtcb@title\kvtcb@after@title\end{tcb@savebox}% \fi% } \def\tcb@set@@dimensions{% % sanitize - \tcbdimto\kvtcb@arc{\kvtcb@arc}% \tcbdimto\kvtcb@left@rule{\kvtcb@left@rule}% \tcbdimto\kvtcb@right@rule{\kvtcb@right@rule}% \tcbdimto\kvtcb@title@rule{\kvtcb@title@rule}% @@ -620,10 +704,17 @@ \tcbdimto\kvtcb@bottom{\kvtcb@bottom}% \tcbdimto\kvtcb@bottomtitle{\kvtcb@bottomtitle}% \tcbdimto\kvtcb@middle{\kvtcb@middle}% + \tcbdimto\kvtcb@bbtop@stand{\kvtcb@bbtop@stand}% + \tcbdimto\kvtcb@bbtop@break{\kvtcb@bbtop@break}% + \tcbdimto\kvtcb@bbbottom@stand{\kvtcb@bbbottom@stand}% + \tcbdimto\kvtcb@bbbottom@break{\kvtcb@bbbottom@break}% + \tcbdimto\kvtcb@bbleft{\kvtcb@bbleft}% + \tcbdimto\kvtcb@bbright{\kvtcb@bbright}% % computation of text width \tcbdimto\tcb@width{\kvtcb@width}% \tcbdimto\tcb@innerwidth{\tcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% \tcbdimto\tcb@w@upper{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftupper-\kvtcb@rightupper}% + \tcbdimto\kvtcb@arc{\kvtcb@arc}% } \def\tcb@set@@sidebyside{% @@ -669,9 +760,20 @@ \fi% \tcb@startbox}% % start of upper box - \let\endtcolorbox\tcb@endboxanddraw% \tcb@set@color{tcbcol@upper}% - \tcb@saveupperbox% + \ifx\kvtcb@saveupperto\@empty% + \let\tcb@startbox\tcb@saveupperbox% + \let\endtcolorbox\tcb@endboxanddraw% + \else% + \let\tcb@startbox\tcb@upperverbatim% + \expandafter\let\csname end\kvtcb@savedelimiter\expandafter\endcsname\csname tcb@endupperverbatimanddraw\endcsname% + \ifx\kvtcb@savelowerto\@empty% + \else% + \tcb@warning{'saveto' and 'savelowerto' cannot be combined. I deactivate 'savelowerto'}% + \tcbset{savelowerto=}% + \fi% + \fi% + \tcb@startbox% } @@ -870,6 +972,43 @@ \def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{\color{#5}\box#4}}% +\let\tcb@pgfprocess@@specialround@orig=\pgfprocess@@specialround + +% patch for \pgfprocess@@specialround +\def\tcb@pgfprocess@@specialround@angular#1#2#3{% + \pgfutil@g@addto@macro\pgfprocess@segment{#1}% + % start point + \pgf@xb=#2% + \pgf@yb=#3% + % + \edef\pgf@marshal% + {\noexpand\pgfpointlineatdistance{\pgfprocess@savex}% + {\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}% + {\noexpand\pgfqpoint{\the\pgf@xa}{\the\pgf@ya}}}% + \pgf@process{\pgf@marshal}% + \pgf@xa=\pgf@x% save start point + \pgf@ya=\pgf@y% + \edef\pgfprocess@addition{{\the\pgf@x}{\the\pgf@y}}% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}% + % + \edef\pgf@marshal% + {\noexpand\pgfpointlineatdistance{\pgfprocess@savey}% + {\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}% + {\noexpand\pgfqpoint{\the\pgf@xc}{\the\pgf@yc}}}% + \pgf@process{\pgf@marshal}% + \pgf@xc=\pgf@x% save end point + \pgf@yc=\pgf@y% + \edef\pgfprocess@addition{\noexpand\pgfsyssoftpath@linetotoken{\the\pgf@xc}{\the\pgf@yc}}% + \expandafter\pgfutil@g@addto@macro\expandafter\pgfprocess@segment\expandafter{\pgfprocess@addition}% + % + \pgf@xa=#2% + \pgf@ya=#3% + \pgfprocess@continueafterrounding% +} + +\def\tcbpatcharcround{\let\pgfprocess@@specialround=\tcb@pgfprocess@@specialround@orig} +\def\tcbpatcharcangular{\let\pgfprocess@@specialround=\tcb@pgfprocess@@specialround@angular} + \def\tcb@arc@zpt{\pgfsetcornersarced{\pgfpointorigin}}% \def\tcb@arc@ins{\pgfsetcornersarced{\pgfqpoint{\kvtcb@arc}{\kvtcb@arc}}}% \def\tcb@arc@out{\pgfsetcornersarced{\pgfqpoint{\tcb@outer@arc}{\tcb@outer@arc}}}% @@ -1123,7 +1262,7 @@ \iftcb@uppervisible% \begin{pgfscope}% \pgfsetfillopacity{\kvtcb@opacityupper}% - \csname tcb@dbox@\kvtcb@valign\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}% + \csname tcb@dbox@\kvtcb@valignupper\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}% {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\tcb@break@topsep-\kvtcb@top-\tcb@height@upper\relax}% {\tcb@height@upper}{\tcb@upperbox}{tcbcol@upper}% \end{pgfscope}% @@ -1232,6 +1371,7 @@ \csname tcb@before@\tcb@split@state\endcsname% \begin{\kvtcb@graphenv}% \tcb@bbdraw% + \tcb@apply@graph@patches% } \def\tcb@drawing@env@end{% @@ -1307,7 +1447,7 @@ \tcb@set@@phantom% \colorlet{tcbcol@origin}{.}% \tcb@set@color{tcbcol@upper}% - \sbox\tcb@upperbox{\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}% + \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper}}% \tcb@reset@color% \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}% @@ -1325,7 +1465,7 @@ \tcb@set@@dimensions% \colorlet{tcbcol@origin}{.}% \tcb@set@color{tcbcol@upper}% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\kvtcb@before@upper\ignorespaces#1\unskip\kvtcb@after@upper\end{tcb@savebox}% \tcb@reset@color% \tcb@hasLowerfalse% \tcb@draw@color@box% @@ -1607,25 +1747,34 @@ % saving of the lower box +\def\tcb@lowerverbatim{% + \begingroup% + \tcbverbatimwrite\kvtcb@savelowerto} + \def\tcb@endlowerverbatimanddraw{% - \tcb@endlowerverbatim% + \endtcbverbatimwrite% + \endgroup% \IfFileExists{\kvtcb@savelowerto}{% \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% \tcb@draw@color@box% \tcb@finalize@environment% } -\def\tcb@lowerverbatim{% +% saving of the upper box + +\def\tcb@upperverbatim{% \begingroup% - \tcbverbatimwrite\kvtcb@savelowerto} + \tcbverbatimwrite\kvtcb@saveupperto} -\def\tcb@endlowerverbatim{% +\def\tcb@endupperverbatimanddraw{% \endtcbverbatimwrite% \endgroup% + \IfFileExists{\kvtcb@saveupperto}{% + \tcb@saveupperbox\input{\kvtcb@saveupperto}\end{tcb@savebox}}{}% + \tcb@draw@color@box% + \tcb@finalize@environment% } -% saving of the upper box - \def\tcbwritetemp{% \begingroup% \tcbverbatimwrite\kvtcb@tempfile} @@ -1683,22 +1832,24 @@ reset/.code={\tcb@reset},% reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% \let\tcb@lateoptions@hook\@empty}, - width=\linewidth,autoparskip, + width=\linewidth,autoparskip,arc is curved, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners, enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm, toggle enlargement=none,toggle left and right=none, baseline=0pt,adjust text={\"Apgjy},upperbox=visible,lowerbox=visible,lower separated, colback=black!5!white,colframe=black!75!white,@colbacktitle=black!50!white,coltext=black,coltitle=white, - fonttitle=,fontupper=,fontlower=,floatplacement=htb,nofloat,savelowerto=, + fonttitle=,fontupper=,fontlower=,floatplacement=htb,nofloat,saveto=,savelowerto=, tempfile={\jobname.tcbtemp}, standard,parbox,hyphenationfix=false,overlay=, + halign=justify,halign lower=justify,halign title=justify, before title=,after title=,before upper=,after upper=,before lower=,after lower=, sidebyside=false,sidebyside align=center,sidebyside gap=10mm, lefthand ratio=0.5,check odd page=false,nophantom, shield externalize=false,list entry=,no label type, opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0, subtitle style=,title filled=false,every float=,ignore nobreak=false,before nobreak=\noindent, + tcbox width=auto, }, initialize@reset=reset@core, } |