diff options
author | Karl Berry <karl@freefriends.org> | 2015-01-07 22:55:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-01-07 22:55:50 +0000 |
commit | 82821c522d080ea556e2794d7e87d17097dae1a4 (patch) | |
tree | 1019d889b6b6594d694d9ad74e9c9b09955a5bef /Master/texmf-dist/tex | |
parent | bea41f5e2c2a13912cb3e946f8939964e5dd5857 (diff) |
tcolorbox (7jan15)
git-svn-id: svn://tug.org/texlive/trunk@35987 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
14 files changed, 58 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 6efce468c88..01971c883f5 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 29e2509a7a8..413eab39e2b 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/07) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.34} +\tcb@set@library@version{3.35} \tcbuselibrary{listings,skins,xparse} @@ -49,7 +49,7 @@ breakatwhitespace=true, basicstyle=\ttfamily\footnotesize, extendedchars=true, - moredelim={[is][\itshape\rmfamily]{§}{§}}, + moredelim={[is][\itshape\rmfamily]{^^a7}{^^a7}}, nolol,inputencoding=\kvtcb@listingencoding} % The following macros are taken from ltxdoc diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 1ad7d4d3ea4..538600dbd0a 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex index 71801d92756..1bf90b5b9cc 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 f356b79de1c..0e18b6bf493 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 f3f7915cd21..101e5a29fb3 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \RequirePackage{pdftexcmds} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 0b0d01f3516..1bec4c8e5c1 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 4e634e07273..cb14df6edab 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 2fe3fd5191f..b49a87afb6b 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 52072c86f11..ff9cff075e8 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 3.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/07) %% 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{3.34} +\tcb@set@library@version{3.35} \RequirePackage{tikz}[2010/10/13] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex index cda0ed40def..40c7e0e9ff7 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 10a09f9682d..0ff43c63443 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 94f11f117c7..6aa5d0a7f52 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/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.34} +\tcb@set@library@version{3.35} \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 a2d9502d1cc..47d4d14f8ed 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.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/07) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/12/16 version 3.34 text color boxes] -\def\tcb@version{3.34} +\ProvidesPackage{tcolorbox}[2015/01/07 version 3.35 text color boxes] +\def\tcb@version{3.35} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -29,6 +29,7 @@ % register \newif\iftcb@lowerignored \newif\iftcb@lowervisible +\newif\iftcb@uppervisible \newif\iftcb@hasTitle \newif\iftcb@hasLower \newif\iftcb@lowerspace @@ -240,6 +241,11 @@ lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue}, lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse}, lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse}, + upperbox/.is choice, + upperbox/visible/.code={\tcb@uppervisibletrue}, + upperbox/invisible/.code={\tcb@uppervisiblefalse}, + visible/.style={upperbox=visible,lowerbox=visible}, + invisible/.style={upperbox=invisible,lowerbox=invisible}, natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural\let\tcb@height@adjust\@empty}, height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed\let\tcb@height@adjust\@empty}, text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed\let\tcb@height@adjust\@empty}, @@ -592,11 +598,13 @@ } \def\tcb@set@@upper@and@lower{% + \colorlet{tcbcol@origin}{.}% \let\tcb@after@box=\kvtcb@after@upper% % switch for lower box \def\tcblower{% \unskip\tcb@after@box% \end{tcb@savebox}% + \letcs{\current@color}{\string\color@tcbcol@lower}% \unless\iftcb@sidebyside% \tcbdimto\tcb@w@lower{\tcb@temp-\kvtcb@leftlower-\kvtcb@rightlower}% \fi% @@ -612,6 +620,7 @@ \tcb@startbox}% % start of upper box \let\endtcolorbox\tcb@endboxanddraw% + \letcs{\current@color}{\string\color@tcbcol@upper}% \tcb@saveupperbox% } @@ -712,6 +721,7 @@ \def\tcb@endboxanddraw{% \unskip\tcb@after@box% \end{tcb@savebox}% + \letcs{\current@color}{\string\color@tcbcol@origin}% \tcb@draw@color@box% \tcb@finalize@environment% } @@ -1054,12 +1064,14 @@ \let\tcb@tdraw@title=\tcb@tdraw@title@core \def\tcb@tdraw@upper@core{% - \begin{pgfscope}% - \pgfsetfillopacity{\kvtcb@opacityupper}% - \csname tcb@dbox@\kvtcb@valign\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}% + \iftcb@uppervisible% + \begin{pgfscope}% + \pgfsetfillopacity{\kvtcb@opacityupper}% + \csname tcb@dbox@\kvtcb@valign\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}% + \fi% } \let\tcb@tdraw@upper=\tcb@tdraw@upper@core @@ -1077,8 +1089,14 @@ \def\tcb@sbs@mix{% \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper@real}% - \tcbdimto{\tcb@temp@wd}{\tcb@w@upper-\wd\tcb@upperbox+\kvtcb@sbs@gap}% - \noindent\unhbox\tcb@upperbox\kern\tcb@temp@wd% + \iftcb@uppervisible% + \tcbdimto{\tcb@temp@wd}{\tcb@w@upper-\wd\tcb@upperbox+\kvtcb@sbs@gap}% + \noindent\unhbox\tcb@upperbox\kern\tcb@temp@wd% + \else% + \tcbdimto{\tcb@temp@wd}{\tcb@w@upper+\kvtcb@sbs@gap}% + \noindent\kern\tcb@temp@wd% + \rule[-\dp\tcb@upperbox]{0pt}{\the\dimexpr\ht\tcb@upperbox+\dp\tcb@upperbox\relax}% + \fi% \iftcb@hasLower% \iftcb@lowervisible\color{tcbcol@lower}\unhbox\tcb@lowerbox% \else% @@ -1087,6 +1105,7 @@ \fi% \end{tcb@savebox}% \tcb@hasLowerfalse% + \tcb@uppervisibletrue% } \def\tcb@draw@color@box{% @@ -1570,7 +1589,7 @@ 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},lowerbox=visible,lower separated, + 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=, tempfile={\jobname.tcbtemp}, |