diff options
author | Karl Berry <karl@freefriends.org> | 2013-09-16 22:32:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-09-16 22:32:13 +0000 |
commit | ec0d3ed0e1b4133f5fbbfc1e0f47e82fe60289ac (patch) | |
tree | 200ff6c8652fe2c34a81241e16201307fc7cb861 /Master/texmf-dist/tex | |
parent | 45fe59ba93c6b8db26a653b2823cf332a9c36e63 (diff) |
tcolorbox (16sep13)
git-svn-id: svn://tug.org/texlive/trunk@31674 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
11 files changed, 290 insertions, 270 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 9ab88ed24d5..cd430f9688c 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.50} +\tcb@set@library@version{2.51} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 8e7bbc74dd4..2f9f794959a 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{2.50} +\tcb@set@library@version{2.51} \tcbuselibrary{listings} @@ -73,7 +73,8 @@ % documentation options \tcbset{ - documentation listing style/.store in=\kvtcb@doclststyle, + documentation listing options/.store in=\kvtcb@doclistingoptions,% + documentation listing style/.style={documentation listing options={style=#1}},% documentation minted style/.store in=\kvtcb@docmintstyle, documentation minted options/.store in=\kvtcb@docmintoptions, color option/.store in=\kvtcb@colopt, @@ -117,8 +118,6 @@ menucolor=\kvtcb@colhyper }} -% tcolorbox specific macros -%\def\tcb@doc@usetemplisting{\lstinputlisting[style=\kvtcb@doclststyle]{\kvtcb@tempfile}} \def\dispExample{\tcbset{docexample}\tcbwritetemp} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index ba335414e47..e10522afe79 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -44,7 +44,6 @@ \renewcommand\Huge{\tcb@setfontsize\Huge{2.48832}}},% fit height plus/.style={fit,height plus=#1},% fit width plus/.dimstore in=\kvtcb@fit@plus@width,% - %fit height from/.style args={#1 to #2}{fit,height={#1},fit height plus={#2-#1}}, fit height from/.style args={#1 to #2}{fit,height from={#1} to {#2}}, fit width from/.style args={#1 to #2}{fit,width={#1},fit width plus={#2-#1}}, fit maxstep/.store in=\kvtcb@fit@maxstep,% @@ -100,7 +99,7 @@ \let\tcb@h@titletotal=\tcb@zpt% \fi% \tcb@fit@@box% - } + }% % \tcb@fit@@box@titled% % @@ -253,11 +252,11 @@ } -\long\def\tcb@newtcboxfit#1#2{\expandafter\newcommand\csname#1\endcsname{\tcboxfit[#2,options@for=#1]}} +\long\def\tcb@newtcboxfit#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcboxfit[#2,options@for=#1]}} -\long\def\tcb@newtcboxfit@#1[#2]#3{\expandafter\newcommand\csname#1\endcsname[#2]{\tcboxfit[#3,options@for=#1]}} +\long\def\tcb@newtcboxfit@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcboxfit[#3,options@for=#1]}} -\long\def\tcb@newtcboxfit@@#1[#2][#3]#4{\expandafter\newcommand\csname#1\endcsname[#2][#3]{\tcboxfit[#4,options@for=#1]}} +\long\def\tcb@newtcboxfit@@#1[#2][#3]#4{\expandafter\tcb@newcommand\csname#1\endcsname[#2][#3]{\tcboxfit[#4,options@for=#1]}} \long\def\tcb@new@tcboxfit@#1[#2]{% \@ifnextchar[{\tcb@newtcboxfit@@{#1}[#2]}{\tcb@newtcboxfit@{#1}[#2]}} @@ -267,25 +266,32 @@ \cslet{tcb@opt@#1}{\tcb@new@colopt}% \@ifnextchar[{\tcb@new@tcboxfit@{#1}}{\tcb@newtcboxfit{#1}}} -\long\def\tcb@new@tcboxfit@opt[#1]#2{% - \tcb@proc@options@init{#1}{#2}% - \tcb@new@tcboxfit{#2}% +\long\def\tcb@new@tcboxfit@bs#1{% + \edef\tcb@temp{\noexpand\tcb@new@tcboxfit{\tcb@remove@bs{#1}}}% + \tcb@temp% } -\long\def\tcb@new@tcboxfit@bs#1{% - \edef\temp{\tcb@remove@bs{#1}}% - \tcb@new@tcboxfit{\temp}% +\long\def\tcb@new@tcboxfit@opt#1#2{% + \tcb@proc@options@init{#2}{#1}% + \tcb@new@tcboxfit{#1}% } \long\def\tcb@new@tcboxfit@opt@bs[#1]#2{% - \edef\temp{\tcb@remove@bs{#2}}% - \tcb@new@tcboxfit@opt[#1]{\temp}% + \edef\tcb@temp{\noexpand\tcb@new@tcboxfit@opt{\tcb@remove@bs{#2}}}% + \tcb@temp{#1}% } -\long\def\newtcboxfit{% +\long\def\new@tcboxfit{% \def\tcb@new@colopt{}% \@ifnextchar[{\tcb@new@tcboxfit@opt@bs}{\tcb@new@tcboxfit@bs}} +\long\def\newtcboxfit{% + \let\tcb@newcommand\newcommand% + \new@tcboxfit} + +\long\def\renewtcboxfit{% + \let\tcb@newcommand\renewcommand% + \new@tcboxfit} \tcbset{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index a6608702f8f..539c43ba681 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \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 55375f697c5..2d4bb4d9431 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \RequirePackage{listings}[2007/02/22] @@ -58,7 +58,7 @@ }% \def\tcb@listing@doc@usetemplisting{% - \tcb@listing@input@listing{style=\kvtcb@doclststyle}{\kvtcb@tempfile}% + \tcb@listing@input@listing{\kvtcb@doclistingoptions}{\kvtcb@tempfile}% } \tcbset{% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex index 2f1abb21116..35e07392328 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \def\tcbuselistingtext{\input{\kvtcb@listingfile}}% @@ -142,11 +142,11 @@ }{\endtcbverbatimwrite\endgroup} -\long\def\tcb@newtcblisting#1#2{\newenvironment{#1}{\tcblisting{#2,options@for=#1}}{\endtcblisting}} +\long\def\tcb@newtcblisting#1#2{\tcb@newenvironment{#1}{\tcblisting{#2,options@for=#1}}{\endtcblisting}} -\long\def\tcb@newtcblisting@#1[#2]#3{\newenvironment{#1}[#2]{\tcblisting{#3,options@for=#1}}{\endtcblisting}} +\long\def\tcb@newtcblisting@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcblisting{#3,options@for=#1}}{\endtcblisting}} -\long\def\tcb@newtcblisting@@#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcblisting{#4,options@for=#1}}{\endtcblisting}} +\long\def\tcb@newtcblisting@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcblisting{#4,options@for=#1}}{\endtcblisting}} \long\def\tcb@new@tcblisting@#1[#2]{% \@ifnextchar[{\tcb@newtcblisting@@{#1}[#2]}{\tcb@newtcblisting@{#1}[#2]}} @@ -161,16 +161,23 @@ \tcb@new@tcblisting{#2}% } -\long\def\newtcblisting{% +\long\def\new@tcblisting{% \def\tcb@new@colopt{}% \@ifnextchar[{\tcb@new@tcblisting@opt}{\tcb@new@tcblisting}} +\long\def\newtcblisting{% + \let\tcb@newenvironment\newenvironment% + \new@tcblisting} + +\long\def\renewtcblisting{% + \let\tcb@newenvironment\renewenvironment% + \new@tcblisting} -\long\def\tcb@newtcbinputlisting#1#2{\expandafter\newcommand\csname#1\endcsname{\tcbinputlisting{#2,options@for=#1}}} +\long\def\tcb@newtcbinputlisting#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcbinputlisting{#2,options@for=#1}}} -\long\def\tcb@newtcbinputlisting@#1[#2]#3{\expandafter\newcommand\csname#1\endcsname[#2]{\tcbinputlisting{#3,options@for=#1}}} +\long\def\tcb@newtcbinputlisting@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcbinputlisting{#3,options@for=#1}}} -\long\def\tcb@newtcbinputlisting@@#1[#2][#3]#4{\expandafter\newcommand\csname#1\endcsname[#2][#3]{\tcbinputlisting{#4,options@for=#1}}} +\long\def\tcb@newtcbinputlisting@@#1[#2][#3]#4{\expandafter\tcb@newcommand\csname#1\endcsname[#2][#3]{\tcbinputlisting{#4,options@for=#1}}} \long\def\tcb@new@tcbinputlisting@#1[#2]{% \@ifnextchar[{\tcb@newtcbinputlisting@@{#1}[#2]}{\tcb@newtcbinputlisting@{#1}[#2]}} @@ -180,25 +187,34 @@ \cslet{tcb@opt@#1}{\tcb@new@colopt}% \@ifnextchar[{\tcb@new@tcbinputlisting@{#1}}{\tcb@newtcbinputlisting{#1}}} -\long\def\tcb@new@tcbinputlisting@opt[#1]#2{% - \tcb@proc@options@init{#1}{#2}% - \tcb@new@tcbinputlisting{#2}% -} \long\def\tcb@new@tcbinputlisting@bs#1{% - \edef\temp{\tcb@remove@bs{#1}}% - \tcb@new@tcbinputlisting{\temp}% + \edef\tcb@temp{\noexpand\tcb@new@tcbinputlisting{\tcb@remove@bs{#1}}}% + \tcb@temp% +} + +\long\def\tcb@new@tcbinputlisting@opt#1#2{% + \tcb@proc@options@init{#2}{#1}% + \tcb@new@tcbinputlisting{#1}% } \long\def\tcb@new@tcbinputlisting@opt@bs[#1]#2{% - \edef\temp{\tcb@remove@bs{#2}}% - \tcb@new@tcbinputlisting@opt[#1]{\temp}% + \edef\tcb@temp{\noexpand\tcb@new@tcbinputlisting@opt{\tcb@remove@bs{#2}}}% + \tcb@temp{#1}% } -\long\def\newtcbinputlisting{% +\long\def\new@tcbinputlisting{% \def\tcb@new@colopt{}% \@ifnextchar[{\tcb@new@tcbinputlisting@opt@bs}{\tcb@new@tcbinputlisting@bs}} +\long\def\newtcbinputlisting{% + \let\tcb@newcommand\newcommand% + \new@tcbinputlisting} + +\long\def\renewtcbinputlisting{% + \let\tcb@newcommand\renewcommand% + \new@tcbinputlisting} + \tcbset{% reset@listingscore/.style={% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index b2348a3467d..1d4d4628974 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \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 d231bd6a680..1489fca0e0a 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index f63ef5b26d8..8452146eef8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \RequirePackage{tikz}[2010/10/13] @@ -41,40 +41,55 @@ \def\tcb@spec#1{\tikzset{tcb@spec/.style={#1}}} +\def\tcb@gettikzxy#1#2#3{% + \tikz@scan@one@point\pgfutil@firstofone#1\relax% + \edef#2{\the\pgf@x}% + \edef#3{\the\pgf@y}% +} + +% absolute coordinates +\def\tcb@pathrect#1#2#3#4#5#6#7{% + \path[#1]% + \pgfextra{% + \tcb@gettikzxy{(#2)}{\tcb@xa}{\tcb@ya}% + \tcb@gettikzxy{(#3)}{\tcb@xb}{\tcb@yb}% + \pgfpathmoveto{\pgfqpoint{\tcb@xa}{\tcb@ya}}% + \pgfsetcornersarced{\pgfpoint{#5}{#5}}\pgfpathlineto{\pgfqpoint{\tcb@xa}{\tcb@yb}}% + \pgfsetcornersarced{\pgfpoint{#6}{#6}}\pgfpathlineto{\pgfqpoint{\tcb@xb}{\tcb@yb}}% + \pgfsetcornersarced{\pgfpoint{#7}{#7}}\pgfpathlineto{\pgfqpoint{\tcb@xb}{\tcb@ya}}% + \pgfsetcornersarced{\pgfpoint{#4}{#4}}\pgfpathclose};% +} + % fill frame \def\tcb@drawframe@path{% - \path[fill=\kvtcb@colframe,rounded corners=\tcb@outer@arc,tcb@spec,frame@style] - (frame.south west) rectangle (frame.north east);% + \tcb@pathrect{fill=\kvtcb@colframe,tcb@spec,frame@style}{frame.south west}{frame.north east}% + {\tcb@outer@arc}{\tcb@outer@arc}{\tcb@outer@arc}{\tcb@outer@arc}% } \def\tcb@drawframe@pathfirst{% - \path[fill=\kvtcb@colframe,rounded corners=\tcb@outer@arc,tcb@spec,frame@style] - (frame.south west) -- (frame.north west) -- - (frame.north east)[sharp corners] -- (frame.south east) -- cycle;% + \tcb@pathrect{fill=\kvtcb@colframe,tcb@spec,frame@style}{frame.south west}{frame.north east}% + {0pt}{\tcb@outer@arc}{\tcb@outer@arc}{0pt}% } \def\tcb@drawframe@pathmiddle{% - \path[fill=\kvtcb@colframe,tcb@spec,frame@style] - (frame.south west) rectangle (frame.north east);% + \tcb@pathrect{fill=\kvtcb@colframe,tcb@spec,frame@style}{frame.south west}{frame.north east}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawframe@pathlast{% - \path[fill=\kvtcb@colframe,rounded corners=\tcb@outer@arc,tcb@spec,frame@style] - (frame.north east) -- (frame.south east) -- - (frame.south west)[sharp corners] -- (frame.north west) -- cycle; + \tcb@pathrect{fill=\kvtcb@colframe,tcb@spec,frame@style}{frame.south west}{frame.north east}% + {\tcb@outer@arc}{0pt}{0pt}{\tcb@outer@arc}% } % fill inner box with title \def\tcb@drawwithtitle@path{% - \path[fill=\kvtcb@colback,tcb@spec,interior@style] (interior.north west) - --(interior.north east)[rounded corners=\kvtcb@arc] - --(interior.south east)--(interior.south west)[sharp corners] - -- cycle;% + \tcb@pathrect{fill=\kvtcb@colback,tcb@spec,interior@style}{interior.south west}{interior.north east}% + {\kvtcb@arc}{0pt}{0pt}{\kvtcb@arc}% } \def\tcb@drawwithtitle@pathfirst{% - \path[fill=\kvtcb@colback,tcb@spec,interior@style] - (interior.south west|-frame.south west) rectangle (interior.north east);% + \tcb@pathrect{fill=\kvtcb@colback,tcb@spec,interior@style}{interior.west|-frame.south}{interior.north east}% + {0pt}{0pt}{0pt}{0pt}% } \let\tcb@drawwithtitle@pathmiddle=\tcb@drawwithtitle@pathfirst @@ -83,28 +98,25 @@ % fill inner box without title \def\tcb@drawwithouttitle@path{% - \path[fill=\kvtcb@colback,rounded corners=\kvtcb@arc,tcb@spec,interior@style] - (interior.south west) rectangle (interior.north east);% + \tcb@pathrect{fill=\kvtcb@colback,tcb@spec,interior@style}{interior.south west}{interior.north east}% + {\kvtcb@arc}{\kvtcb@arc}{\kvtcb@arc}{\kvtcb@arc}% } \def\tcb@drawwithouttitle@pathfirst{% - \path[fill=\kvtcb@colback,rounded corners=\kvtcb@arc,tcb@spec,interior@style] - (interior.south west|-frame.south west) -- (interior.north west) -- - (interior.north east)[sharp corners] -- (interior.south east|-frame.south east) -- cycle;% + \tcb@pathrect{fill=\kvtcb@colback,tcb@spec,interior@style}{interior.west|-frame.south}{interior.north east}% + {0pt}{\kvtcb@arc}{\kvtcb@arc}{0pt}% } \def\tcb@drawwithouttitle@pathmiddle{% - \path[fill=\kvtcb@colback,tcb@spec,interior@style] - (interior.south west|-frame.south west) rectangle (interior.north east|-frame.north east);% + \tcb@pathrect{fill=\kvtcb@colback,tcb@spec,interior@style}{interior.west|-frame.south}{interior.east|-frame.north}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawwithouttitle@pathlast{% - \path[fill=\kvtcb@colback,rounded corners=\kvtcb@arc,tcb@spec,interior@style] - (interior.north east|-frame.north east) -- (interior.south east) -- - (interior.south west)[sharp corners] -- (interior.north west|-frame.north west) -- cycle;% + \tcb@pathrect{fill=\kvtcb@colback,tcb@spec,interior@style}{interior.south west}{interior.east|-frame.north}% + {\kvtcb@arc}{0pt}{0pt}{\kvtcb@arc}% } - % draw segmentation line \def\tcb@drawlower@path{% \iftcb@sidebyside% @@ -134,93 +146,78 @@ % draw title box \def\tcb@drawtitle@path{% - \path[tcb@spec,title@style] - (title.south east)--(title.south west)[rounded corners=\kvtcb@arc] - -- (title.north west)--(title.north east)[sharp corners] - -- cycle;% + \tcb@pathrect{tcb@spec,title@style}{title.south west}{title.north east}% + {0pt}{\kvtcb@arc}{\kvtcb@arc}{0pt}% } \let\tcb@drawtitle@pathfirst=\tcb@drawtitle@path \def\tcb@drawtitle@pathmiddle{% - \path[tcb@spec,title@style] (title.south west) rectangle (title.north east);% + \tcb@pathrect{tcb@spec,title@style}{title.south west}{title.north east}% + {0pt}{0pt}{0pt}{0pt}% } \let\tcb@drawtitle@pathlast=\tcb@drawtitle@pathmiddle % draw special versions \def\tcb@drawspec@UT#1{% - \path[#1,interior@style] - (segmentation.west) rectangle (interior.north east);% + \tcb@pathrect{#1,interior@style}{segmentation.west}{interior.north east}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawspec@UR#1{% - \path[#1,interior@style] - (segmentation.east)--(segmentation.west)[rounded corners=\kvtcb@arc] - -- (interior.north west)--(interior.north east)[sharp corners] - -- cycle;% + \tcb@pathrect{#1,interior@style}{segmentation.west}{interior.north east}% + {0pt}{\kvtcb@arc}{\kvtcb@arc}{0pt}% } \def\tcb@drawspec@US#1{% - \path[#1,interior@style] - (segmentation.west) rectangle (interior.north east|-frame.north east); + \tcb@pathrect{#1,interior@style}{segmentation.west}{interior.east|-frame.north}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawspec@LR#1{% - \path[#1,segmentation@style] - ([yshift=0.1mm]segmentation.west)--([yshift=0.1mm]segmentation.east)[rounded corners=\kvtcb@arc] - --(interior.south east)--(interior.south west)[sharp corners] - -- cycle;% + \tcb@pathrect{#1,segmentation@style}{interior.south west}{[yshift=0.1mm]segmentation.east}% + {\kvtcb@arc}{0pt}{0pt}{\kvtcb@arc}% } \def\tcb@drawspec@LS#1{% - \path[#1,segmentation@style] - (interior.south west|-frame.south west) rectangle - ([yshift=0.1mm]segmentation.east);% + \tcb@pathrect{#1,segmentation@style}{interior.west|-frame.south}{[yshift=0.1mm]segmentation.east}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawspec@sbs@A#1{% - \path[#1,segmentation@style] - (segmentation.south)--(segmentation.north)[rounded corners=\kvtcb@arc] - --(interior.north east)--(interior.south east)[sharp corners] - -- cycle;% + \tcb@pathrect{#1,segmentation@style}{segmentation.south}{interior.north east}% + {0pt}{0pt}{\kvtcb@arc}{\kvtcb@arc}% } \def\tcb@drawspec@sbs@B#1{% - \path[#1,segmentation@style] - (segmentation.south)--(segmentation.north) - --(interior.north east)[rounded corners=\kvtcb@arc] - --(interior.south east)[sharp corners] -- cycle;% + \tcb@pathrect{#1,segmentation@style}{segmentation.south}{interior.north east}% + {0pt}{0pt}{0pt}{\kvtcb@arc}% } \def\tcb@drawspec@sbs@C#1{% - \path[#1,segmentation@style] - (segmentation.south|-frame.south)--(segmentation.north)[rounded corners=\kvtcb@arc] - --(interior.north east)[sharp corners]--(interior.south east|-frame.south) - -- cycle;% + \tcb@pathrect{#1,segmentation@style}{segmentation.south|-frame.south}{interior.north east}% + {0pt}{0pt}{\kvtcb@arc}{0pt}% } \def\tcb@drawspec@sbs@D#1{% - \path[#1,segmentation@style] - (segmentation.south|-frame.south) rectangle (interior.north east);% + \tcb@pathrect{#1,segmentation@style}{segmentation.south|-frame.south}{interior.north east}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawspec@sbs@E#1{% - \path[#1,segmentation@style] - (segmentation.south|-frame.south) rectangle (interior.north east|-frame.north);% + \tcb@pathrect{#1,segmentation@style}{segmentation.south|-frame.south}{interior.east|-frame.north}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawspec@sbs@F#1{% - \path[#1,segmentation@style] - (segmentation.south)--(segmentation.north|-frame.north) - --(interior.north east|-frame.north)[rounded corners=\kvtcb@arc] - --(interior.south east)[sharp corners] -- cycle;% + \tcb@pathrect{#1,segmentation@style}{segmentation.south}{interior.east|-frame.north}% + {0pt}{0pt}{0pt}{\kvtcb@arc}% } \def\tcb@drawspec@T{% - \path[top color=\kvtcb@colframe,bottom color=\kvtcb@colback] - ([yshift=-0.01pt]interior.north west) rectangle - ([yshift=0.01pt]title.south east);% + \tcb@pathrect{top color=\kvtcb@colframe,bottom color=\kvtcb@colback}{[yshift=-0.01pt]interior.north west}{[yshift=0.01pt]title.south east}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@drawframe@freelance{\tcb@frame@code} @@ -276,45 +273,55 @@ },% } -\tcbset{skin@enhanced/.style={base@unbroken,% - frame engine=path,interior titled engine=path, - interior engine=path,segmentation engine=path,title engine=path, - skin first=enhancedfirst,skin middle=enhancedmiddle,skin last=enhancedlast}, - enhanced/.style={skin=enhanced},% +\def\tcb@new@skin#1#2{\tcbset{skin@#1/.style={#2}}} + +\tcb@new@skin{enhanced}{base@unbroken,% + frame engine=path,interior titled engine=path,interior engine=path,segmentation engine=path,title engine=path,% + skin first=enhancedfirst,skin middle=enhancedmiddle,skin last=enhancedlast} + +\tcb@new@skin{enhancedfirst}{base@first,% + frame engine=pathfirst,interior titled engine=pathfirst,interior engine=pathfirst,segmentation engine=path,title engine=pathfirst,% + skin first=enhancedfirst,skin middle=enhancedmiddle,skin last=enhancedmiddle} + +\tcb@new@skin{enhancedmiddle}{base@middle,% + frame engine=pathmiddle,interior titled engine=pathmiddle,interior engine=pathmiddle,segmentation engine=path,title engine=pathmiddle,% + skin first=enhancedmiddle,skin middle=enhancedmiddle,skin last=enhancedmiddle} + +\tcb@new@skin{enhancedlast}{base@last,% + frame engine=pathlast,interior titled engine=pathlast,interior engine=pathlast,segmentation engine=path,title engine=pathlast,% + skin first=enhancedmiddle,skin middle=enhancedmiddle,skin last=enhancedlast} + +\tcbset{enhanced/.style={skin=enhanced},% enhanced standard/.style={skin=enhanced, skin first=enhanced,skin middle=enhanced,skin last=enhanced},% blank/.style={enhanced,frame hidden,interior hidden,segmentation hidden,% arc=0pt,boxsep=0pt,top=0pt,bottom=0pt,left=0pt,right=0pt,boxrule=0pt,% - bottomtitle=6pt,middle=3pt},% -} + bottomtitle=6pt,middle=3pt}} -\tcbset{skin@enhancedfirst/.style={base@first,% - frame engine=pathfirst,interior titled engine=pathfirst, - interior engine=pathfirst,segmentation engine=path,title engine=pathfirst, - skin first=enhancedfirst,skin middle=enhancedmiddle,skin last=enhancedmiddle -}} +\tcb@new@skin{freelance}{base@unbroken,% + frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=freelance,% + skin first=freelancefirst,skin middle=freelancemiddle,skin last=freelancelast,freelance@extension} -\tcbset{skin@enhancedmiddle/.style={base@middle,% - frame engine=pathmiddle,interior titled engine=pathmiddle, - interior engine=pathmiddle,segmentation engine=path,title engine=pathmiddle, - skin first=enhancedmiddle,skin middle=enhancedmiddle,skin last=enhancedmiddle -}} +\tcb@new@skin{freelancefirst}{base@first,% + frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=freelance,% + skin first=freelancefirst,skin middle=freelancemiddle,skin last=freelancemiddle,freelancefirst@extension} -\tcbset{skin@enhancedlast/.style={base@last,% - frame engine=pathlast,interior titled engine=pathlast, - interior engine=pathlast,segmentation engine=path,title engine=pathlast, - skin first=enhancedmiddle,skin middle=enhancedmiddle,skin last=enhancedlast -}} +\tcb@new@skin{freelancemiddle}{base@middle,% + frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=freelance,% + skin first=freelancemiddle,skin middle=freelancemiddle,skin last=freelancemiddle,freelancemiddle@extension} + +\tcb@new@skin{freelancelast}{base@last,% + frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=freelance,% + skin first=freelancemiddle,skin middle=freelancemiddle,skin last=freelancelast,freelancelast@extension} -\tcbset{skin@freelance/.style={base@unbroken,% - frame engine=freelance,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=freelance, - skin first=freelance,skin middle=freelance,skin last=freelance}, - freelance/.style={skin=freelance}} +\tcbset{freelance/.style={skin=freelance},% + extend freelance/.code={\tcbset{freelance@extension/.style={#1}}},% + extend freelancefirst/.code={\tcbset{freelancefirst@extension/.style={#1}}},% + extend freelancemiddle/.code={\tcbset{freelancemiddle@extension/.style={#1}}},% + extend freelancelast/.code={\tcbset{freelancelast@extension/.style={#1}}}} -\tcbset{skin@bicolor/.style={base@unbroken,% - frame engine=path,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=path, +\tcb@new@skin{bicolor}{base@unbroken,% + frame engine=path,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=path,% interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% @@ -342,12 +349,12 @@ segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else% \tcb@drawspec@sbs@A{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi},% - skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast}, - bicolor/.style={skin=bicolor}} + skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast} -\tcbset{skin@bicolorfirst/.style={base@first,% - frame engine=pathfirst,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=pathfirst, +\tcbset{bicolor/.style={skin=bicolor}} + +\tcb@new@skin{bicolorfirst}{base@first,% + frame engine=pathfirst,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=pathfirst,% interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% @@ -375,12 +382,10 @@ segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else% \tcb@drawspec@sbs@C{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi},% - skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle -}} + skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle} -\tcbset{skin@bicolormiddle/.style={base@middle,% - frame engine=pathmiddle,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle, +\tcb@new@skin{bicolormiddle}{base@middle,% + frame engine=pathmiddle,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle,% interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% @@ -392,7 +397,7 @@ \fi% \else% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithtitle@pathmiddle}% - \fi}, + \fi},% interior code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state% @@ -408,12 +413,10 @@ segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=\kvtcb@colbacklower}\else% \tcb@drawspec@sbs@E{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LS{fill=\kvtcb@colbacklower}\fi},% - skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle -}} + skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle} -\tcbset{skin@bicolorlast/.style={base@last,% - frame engine=pathlast,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=pathlast, +\tcb@new@skin{bicolorlast}{base@last,% + frame engine=pathlast,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=pathlast,% interior titled code={% \iftcb@lowerseparated% \ifcase\tcb@segment@state @@ -437,20 +440,17 @@ \fi% \else% {\tcb@spec{fill=\kvtcb@colback}\tcb@drawwithouttitle@pathlast}% - \fi}, + \fi},% segmentation code={\iftcb@sidebyside% \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=\kvtcb@colbacklower}\else% \tcb@drawspec@sbs@F{fill=\kvtcb@colbacklower}\fi\else\tcb@drawspec@LR{fill=\kvtcb@colbacklower}\fi},% - skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast -}} + skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast} \tikzset{beamer@color/.style={top color=\kvtcb@colback,bottom color=\kvtcb@colback!85!black}} -\tcbset{% - skin@beamer/.style={base@unbroken,% - frame engine=path,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=path, +\tcb@new@skin{beamer}{base@unbroken,% + frame engine=path,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=path,% interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% @@ -473,16 +473,12 @@ {\tcb@spec{beamer@color}\tcb@drawwithouttitle@path}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},% - skin first=beamerfirst,skin middle=beamermiddle,skin last=beamerlast}, - beamer/.style={skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,arc=2mm,fonttitle=\bfseries, - drop fuzzy shadow, - }, -} + skin first=beamerfirst,skin middle=beamermiddle,skin last=beamerlast} -\tcbset{% - skin@beamerfirst/.style={base@first,% - frame engine=pathfirst,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=pathfirst, +\tcbset{beamer/.style={skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,arc=2mm,fonttitle=\bfseries,drop fuzzy shadow}} + +\tcb@new@skin{beamerfirst}{base@first,% + frame engine=pathfirst,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=pathfirst,% interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% @@ -493,7 +489,7 @@ \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathfirst}% \fi% - \tcb@drawspec@T}, + \tcb@drawspec@T},% interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 @@ -504,12 +500,10 @@ {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathfirst}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},% - skin first=beamerfirst,skin middle=beamermiddle,skin last=beamermiddle}} + skin first=beamerfirst,skin middle=beamermiddle,skin last=beamermiddle} -\tcbset{% - skin@beamermiddle/.style={base@middle,% - frame engine=pathmiddle,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle, +\tcb@new@skin{beamermiddle}{base@middle,% + frame engine=pathmiddle,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=pathmiddle,% interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% @@ -520,7 +514,7 @@ \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathmiddle}% \fi% - \tcb@drawspec@T}, + \tcb@drawspec@T},% interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 @@ -532,12 +526,10 @@ {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathmiddle}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LS{beamer@color}\fi},% - skin first=beamermiddle,skin middle=beamermiddle,skin last=beamermiddle}} + skin first=beamermiddle,skin middle=beamermiddle,skin last=beamermiddle} -\tcbset{% - skin@beamerlast/.style={base@last,% - frame engine=pathlast,interior titled engine=freelance, - interior engine=freelance,segmentation engine=freelance,title engine=pathlast, +\tcb@new@skin{beamerlast}{base@last,% + frame engine=pathlast,interior titled engine=freelance,interior engine=freelance,segmentation engine=freelance,title engine=pathlast,% interior titled code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1% @@ -548,7 +540,7 @@ \else% {\tcb@spec{beamer@color}\tcb@drawwithtitle@pathlast}% \fi% - \tcb@drawspec@T}, + \tcb@drawspec@T},% interior code={% \iftcb@lowerseparated% \ifnum\tcb@segment@state=1 @@ -560,8 +552,7 @@ {\tcb@spec{beamer@color}\tcb@drawwithouttitle@pathlast}% \fi}, segmentation code={\iftcb@sidebyside\tcb@drawlower@path\else\tcb@drawspec@LR{beamer@color}\fi},% - skin first=beamermiddle,skin middle=beamermiddle,skin last=beamerlast}} - + skin first=beamermiddle,skin middle=beamermiddle,skin last=beamerlast} \def\tcb@drawspec@widgetsegment{% \iftcb@sidebyside% @@ -574,44 +565,34 @@ \tikzset{widget@color/.style={left color=\kvtcb@colframe!75!white,right color=\kvtcb@colframe!75!white!25!\kvtcb@colback}} -\tcbset{skin@widget/.style={base@unbroken,% - frame engine=path,interior titled engine=path, - interior engine=path,segmentation engine=freelance,title engine=freelance, +\tcb@new@skin{widget}{base@unbroken,% + frame engine=path,interior titled engine=path,interior engine=path,segmentation engine=freelance,title engine=freelance,% title code={{\tcb@spec{widget@color}\tcb@drawtitle@path}}, segmentation code={\tcb@drawspec@widgetsegment},% - skin first=widgetfirst,skin middle=widgetmiddle,skin last=widgetlast}, - widget/.style={skin=widget,arc=0.5mm,fonttitle=\bfseries, - titlerule=0mm,toprule at break=0mm}, -} + skin first=widgetfirst,skin middle=widgetmiddle,skin last=widgetlast} -\tcbset{skin@widgetfirst/.style={base@first,% - frame engine=pathfirst,interior titled engine=pathfirst, - interior engine=pathfirst,segmentation engine=freelance,title engine=freelance, - title code={{\tcb@spec{widget@color}\tcb@drawtitle@pathfirst}}, - segmentation code={\tcb@drawspec@widgetsegment},% - skin first=widgetfirst,skin middle=widgetmiddle,skin last=widgetmiddle}} +\tcbset{widget/.style={skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm,toprule at break=0mm}} -\tcbset{skin@widgetmiddle/.style={base@middle,% - frame engine=pathmiddle,interior titled engine=pathmiddle, - interior engine=pathmiddle,segmentation engine=freelance,title engine=freelance, - title code={{\tcb@spec{widget@color}\tcb@drawtitle@pathmiddle}}, +\tcb@new@skin{widgetfirst}{base@first,% + frame engine=pathfirst,interior titled engine=pathfirst,interior engine=pathfirst,segmentation engine=freelance,title engine=freelance,% + title code={{\tcb@spec{widget@color}\tcb@drawtitle@pathfirst}},% segmentation code={\tcb@drawspec@widgetsegment},% - skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetmiddle}} + skin first=widgetfirst,skin middle=widgetmiddle,skin last=widgetmiddle} +\tcb@new@skin{widgetmiddle}{base@middle,% + frame engine=pathmiddle,interior titled engine=pathmiddle,interior engine=pathmiddle,segmentation engine=freelance,title engine=freelance,% + title code={{\tcb@spec{widget@color}\tcb@drawtitle@pathmiddle}},% + segmentation code={\tcb@drawspec@widgetsegment},% + skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetmiddle} -\tcbset{skin@widgetlast/.style={base@last,% - frame engine=pathlast,interior titled engine=pathlast, - interior engine=pathlast,segmentation engine=freelance,title engine=freelance, +\tcb@new@skin{widgetlast}{base@last,% + frame engine=pathlast,interior titled engine=pathlast,interior engine=pathlast,segmentation engine=freelance,title engine=freelance,% title code={{\tcb@spec{widget@color}\tcb@drawtitle@pathlast}}, segmentation code={\tcb@drawspec@widgetsegment},% - skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetlast}} + skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetlast} - -\tcbset{skin@draft/.style={clear@spec,% - graphical environment=tikzpicture,geometry nodes, - frame engine=freelance,interior titled engine=freelance, - interior engine=freelance,segmentation engine=path,title engine=path, - skin first=draft,skin middle=draft,skin last=draft, +\tcb@new@skin{draft}{clear@spec,graphical environment=tikzpicture,geometry nodes,% + frame engine=freelance,interior titled engine=freelance,interior engine=freelance,segmentation engine=path,title engine=path,% interior style=,frame style=,segmentation style={draw=black,dashed}, colupper=black!50!white,collower=black!50!white,coltitle=black!50!white, frame code={% @@ -690,8 +671,10 @@ \pgfsetfillopacity{0.3} }, set@extensions@postframe={},% - interior titled code=,interior code=,}, - draft/.style={skin=draft}} + interior titled code=,interior code=, + skin first=draft,skin middle=draft,skin last=draft} + +\tcbset{draft/.style={skin=draft}} \def\tcb@clip@interior{% \begingroup% @@ -936,35 +919,26 @@ \def\tcb@shadow@unbroken#1#2#3#4{% \tcb@shadow@prepare{#3}{#1}% - \fill[line width=0pt,rounded corners=\tcb@shadow@arc,#4]% - ([xshift=#1+#3,yshift=#2+#3]frame.south west)% - rectangle ([xshift=#1-#3,yshift=#2-#3]frame.north east);% + \tcb@pathrect{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% + {\tcb@shadow@arc}{\tcb@shadow@arc}{\tcb@shadow@arc}{\tcb@shadow@arc}% } - \def\tcb@shadow@first#1#2#3#4{% \tcb@shadow@prepare{#3}{#1}% - \fill[line width=0pt,rounded corners=\tcb@shadow@arc,#4] - ([xshift=#1+#3,yshift=#2+#3]frame.south west) -- - ([xshift=#1+#3,yshift=#2-#3]frame.north west) -- - ([xshift=#1-#3,yshift=#2-#3]frame.north east)[sharp corners] -- - ([xshift=#1-#3,yshift=#2+#3]frame.south east) -- cycle;% + \tcb@pathrect{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% + {0pt}{\tcb@shadow@arc}{\tcb@shadow@arc}{0pt}% } \def\tcb@shadow@middle#1#2#3#4{% \tcb@shadow@prepare{#3}{#1}% - \fill[line width=0pt,sharp corners,#4]% - ([xshift=#1+#3,yshift=#2+#3]frame.south west)% - rectangle ([xshift=#1-#3,yshift=#2-#3]frame.north east);% + \tcb@pathrect{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% + {0pt}{0pt}{0pt}{0pt}% } \def\tcb@shadow@last#1#2#3#4{% \tcb@shadow@prepare{#3}{#1}% - \fill[line width=0pt,rounded corners=\tcb@shadow@arc,#4] - ([xshift=#1-#3,yshift=#2-#3]frame.north east) -- - ([xshift=#1-#3,yshift=#2+#3]frame.south east) -- - ([xshift=#1+#3,yshift=#2+#3]frame.south west)[sharp corners] -- - ([xshift=#1+#3,yshift=#2-#3]frame.north west) -- cycle;% + \tcb@pathrect{fill,#4}{[xshift=#1+#3,yshift=#2+#3]frame.south west}{[xshift=#1-#3,yshift=#2-#3]frame.north east}% + {\tcb@shadow@arc}{0pt}{0pt}{\tcb@shadow@arc}% } \def\tcb@draw@shadow@unbroken{% @@ -987,7 +961,6 @@ \kvtcb@shadow% } - \tcbset{% shad@w app/.code={\appto\kvtcb@shadow{#1}},% shadow/.style args={#1#2#3#4}{shad@w app={\tcb@shadow{#1}{#2}{#3}{#4}}},% @@ -1008,10 +981,14 @@ % drop shadow/.style={shadow={0.9mm}{-0.9mm}{0mm}{opacity=0.5,#1}}, drop shadow/.default={black!50!white},% + drop midday shadow/.style={shadow={0mm}{-0.8mm}{-0.4mm}{opacity=0.5,#1}}, + drop midday shadow/.default={black!50!white},% halo/.style args={#1 with #2}{shadow={0mm}{0mm}{-#1}{opacity=0.5,#2}}, halo/.default={0.9mm with yellow},% drop fuzzy shadow/.style={fuzzy shadow={1.0mm}{-1.0mm}{0mm}{0.12mm}{#1}}, drop fuzzy shadow/.default={black!50!white},% + drop fuzzy midday shadow/.style={fuzzy shadow={0mm}{-1.0mm}{-0.5mm}{0.12mm}{#1}}, + drop fuzzy midday shadow/.default={black!50!white},% fuzzy halo/.style args={#1 with #2}{fuzzy shadow={0mm}{0mm}{-#1}{0.12mm}{#2}}, fuzzy halo/.default={1.0mm with yellow},% } @@ -1023,6 +1000,7 @@ frame style=,interior style=,segmentation style=,% frame code,interior titled code,interior code,segmentation code,% title style=,title code,colbacklower=black!15!white,% + extend freelance=,extend freelancefirst=,extend freelancemiddle=,extend freelancelast=,% clear@spec,% watermark opacity=1.00,watermark color=\kvtcb@colback!85!\kvtcb@colframe,% watermark zoom=0.75,clip watermark,% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex index d4f202a0cdb..1b080759d7b 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% 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{2.50} +\tcb@set@library@version{2.51} \RequirePackage{amsmath} @@ -83,14 +83,19 @@ separator sign dash/.style={separator sign={\ --}},% } -\newcommand{\newtcbtheorem}[5][]{% - \newtcolorbox[auto counter,#1]{#2}[3][]{#4,% +\newcommand{\new@tcbtheorem}[5][]{% + \@@newtcolorbox[auto counter,#1]{#2}[3][]{#4,% title={\tcb@theo@title{#3}{\thetcbcounter}{##2}}, list entry={\numberline{\thetcbcounter}##2},% code={\tcb@theo@label{#5}{##3}},% ##1}% } +\def\newtcbtheorem{\let\@@newtcolorbox\newtcolorbox% + \new@tcbtheorem} + +\def\renewtcbtheorem{\let\@@newtcolorbox\renewtcolorbox% + \new@tcbtheorem} \newcommand{\tcbmaketheorem}[5]{% \newtcolorbox{#1}[3][]{#3,theorem={#2}{#4}{##2}{#5:##3},##1}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index ca73c3fe193..5c1de5282af 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 2.50 (2013/07/29) +%% The LaTeX package tcolorbox - version 2.51 (2013/09/16) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2013/07/29 version 2.50 text color boxes] -\def\tcb@version{2.50} +\ProvidesPackage{tcolorbox}[2013/09/16 version 2.51 text color boxes] +\def\tcb@version{2.51} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -977,11 +977,11 @@ \kvtcb@init@hook% }% -\long\def\tcb@newtcolorbox#1#2{\newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}} +\long\def\tcb@newtcolorbox#1#2{\tcb@newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}} -\long\def\tcb@newtcolorbox@#1[#2]#3{\newenvironment{#1}[#2]{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}} +\long\def\tcb@newtcolorbox@#1[#2]#3{\tcb@newenvironment{#1}[#2]{\tcolorbox[#3,options@for=#1]}{\endtcolorbox}} -\long\def\tcb@newtcolorbox@@#1[#2][#3]#4{\newenvironment{#1}[#2][#3]{\tcolorbox[#4,options@for=#1]}{\endtcolorbox}} +\long\def\tcb@newtcolorbox@@#1[#2][#3]#4{\tcb@newenvironment{#1}[#2][#3]{\tcolorbox[#4,options@for=#1]}{\endtcolorbox}} \long\def\tcb@new@tcolorbox@#1[#2]{% \@ifnextchar[{\tcb@newtcolorbox@@{#1}[#2]}{\tcb@newtcolorbox@{#1}[#2]}} @@ -996,10 +996,18 @@ \tcb@new@tcolorbox{#2}% } -\long\def\newtcolorbox{% +\long\def\new@tcolorbox{% \def\tcb@new@colopt{}% \@ifnextchar[{\tcb@new@tcolorbox@opt}{\tcb@new@tcolorbox}} +\long\def\newtcolorbox{% + \let\tcb@newenvironment\newenvironment% + \new@tcolorbox} + +\long\def\renewtcolorbox{% + \let\tcb@newenvironment\renewenvironment% + \new@tcolorbox} + % auxiliary code to remove a leading backspace \newcommand{\tcb@remove@bs}[1]{% \ifcat\relax\noexpand#1% @@ -1016,11 +1024,11 @@ \newcommand{\tcb@remove@bs@aux@iii}[1]{\z@} -\long\def\tcb@newtcbox#1#2{\expandafter\newcommand\csname#1\endcsname{\tcbox[#2,options@for=#1]}} +\long\def\tcb@newtcbox#1#2{\expandafter\tcb@newcommand\csname#1\endcsname{\tcbox[#2,options@for=#1]}} -\long\def\tcb@newtcbox@#1[#2]#3{\expandafter\newcommand\csname#1\endcsname[#2]{\tcbox[#3,options@for=#1]}} +\long\def\tcb@newtcbox@#1[#2]#3{\expandafter\tcb@newcommand\csname#1\endcsname[#2]{\tcbox[#3,options@for=#1]}} -\long\def\tcb@newtcbox@@#1[#2][#3]#4{\expandafter\newcommand\csname#1\endcsname[#2][#3]{\tcbox[#4,options@for=#1]}} +\long\def\tcb@newtcbox@@#1[#2][#3]#4{\expandafter\tcb@newcommand\csname#1\endcsname[#2][#3]{\tcbox[#4,options@for=#1]}} \long\def\tcb@new@tcbox@#1[#2]{% \@ifnextchar[{\tcb@newtcbox@@{#1}[#2]}{\tcb@newtcbox@{#1}[#2]}} @@ -1030,25 +1038,33 @@ \cslet{tcb@opt@#1}{\tcb@new@colopt}% \@ifnextchar[{\tcb@new@tcbox@{#1}}{\tcb@newtcbox{#1}}} -\long\def\tcb@new@tcbox@opt[#1]#2{% - \tcb@proc@options@init{#1}{#2}% - \tcb@new@tcbox{#2}% -} \long\def\tcb@new@tcbox@bs#1{% - \edef\temp{\tcb@remove@bs{#1}}% - \tcb@new@tcbox{\temp}% + \edef\tcb@temp{\noexpand\tcb@new@tcbox{\tcb@remove@bs{#1}}}% + \tcb@temp% +} + +\long\def\tcb@new@tcbox@opt#1#2{% + \tcb@proc@options@init{#2}{#1}% + \tcb@new@tcbox{#1}% } \long\def\tcb@new@tcbox@opt@bs[#1]#2{% - \edef\temp{\tcb@remove@bs{#2}}% - \tcb@new@tcbox@opt[#1]{\temp}% + \edef\tcb@temp{\noexpand\tcb@new@tcbox@opt{\tcb@remove@bs{#2}}}% + \tcb@temp{#1}% } -\long\def\newtcbox{% +\long\def\new@tcbox{% \def\tcb@new@colopt{}% \@ifnextchar[{\tcb@new@tcbox@opt@bs}{\tcb@new@tcbox@bs}} +\long\def\newtcbox{% + \let\tcb@newcommand\newcommand% + \new@tcbox} + +\long\def\renewtcbox{% + \let\tcb@newcommand\renewcommand% + \new@tcbox} \def\tcb@addcontentsline#1#2{% \ifx\kvtcb@listentry\@empty% |