summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tcolorbox
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-23 22:29:26 +0000
committerKarl Berry <karl@freefriends.org>2013-07-23 22:29:26 +0000
commit393d6ac7f30401efc47612d4f4322910f32fcee5 (patch)
tree2d181466a6ff19d1c4518e7d1e2853c453baf887 /Master/texmf-dist/tex/latex/tcolorbox
parentf59ca1d9cbe7adbdacee09b1da37ca357965c0c9 (diff)
tcolorbox (23jul13)
git-svn-id: svn://tug.org/texlive/trunk@31275 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tcolorbox')
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex36
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex18
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty43
9 files changed, 81 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index b4edf570e2c..84ee098f379 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\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 9c8de529ae5..3b29a2bf9a7 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\tcbuselibrary{listings}
@@ -131,7 +131,7 @@
\tcbset{docexample,#1}\tcbwritetemp%
}{\enddispExample}
-\def\dispListing{\tcbset{docexample}\tcbwritetemp}
+\def\dispListing{\tcb@layer@pushup\tcbset{docexample}\tcbwritetemp}
\def\enddispListing{%
\endtcbwritetemp%
@@ -141,7 +141,7 @@
}
\newenvironment{dispListing*}[1]{%
- \tcbset{docexample,#1}\tcbwritetemp%
+ \tcb@layer@pushup\tcbset{docexample,#1}\tcbwritetemp%
}{\enddispListing}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 6305645aa4a..da86046b55a 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\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 c0cdd6ad05a..4eb0c6bad32 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\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 9e3d2a12d1d..07d9207c93d 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,10 +18,18 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{2.40}
+\tcb@set@library@version{2.41}
\RequirePackage{listings}[2007/02/22]
+\let\tcb@listing@MakeCaption@org=\lst@MakeCaption
+
+\def\tcb@listing@set@MakeCaption@org{%
+ \let\lst@MakeCaption\tcb@listing@MakeCaption@org}
+\def\tcb@listing@set@MakeCaption@empty{%
+ \lst@HRefStepCounter{lstlisting}%
+ \let\lst@MakeCaption\@gobble}
+
\lstdefinestyle{tcblatex}{language={[LaTeX]TeX},
aboveskip={0\p@ \@plus 6\p@}, belowskip={0\p@ \@plus 6\p@},
columns=fullflexible, keepspaces=true,
@@ -32,9 +40,12 @@
\def\tcbuselistingtext{\input{\kvtcb@listingfile}}%
\def\tcbuselistinglisting{%
+ \begingroup%
\toks@=\expandafter{\kvtcb@listingoptions}%
- \edef\tcb@temp{\noexpand\lstinputlisting[\the\toks@]}%
+ \edef\tcb@temp{\noexpand\lstinputlisting[nolol,\the\toks@]}%
+ \tcb@listing@set@MakeCaption%
\tcb@temp{\kvtcb@listingfile}%
+ \endgroup%
}%
\def\tcb@listing@listingAndText{%
@@ -106,7 +117,7 @@
}
\def\tcb@inputlisting@inside{%
- \begin{tcolorbox}[]\tcb@listing@process\end{tcolorbox}%
+ \begin{tcolorbox}[capture=\tcb@listing@capture]\tcb@listing@process\end{tcolorbox}%
}
\let\tcb@inputlisting\tcb@inputlisting@inside
@@ -133,6 +144,10 @@
listing side text/.style={sidebyside,listing and text},%
text outside listing/.code={\let\tcb@inputlisting\tcb@inputlisting@out@textAndListing},%
listing outside text/.code={\let\tcb@inputlisting\tcb@inputlisting@out@listingAndText},%
+ listing remove caption/.is choice,
+ listing remove caption/true/.code={\let\tcb@listing@set@MakeCaption\tcb@listing@set@MakeCaption@empty},
+ listing remove caption/false/.code={\let\tcb@listing@set@MakeCaption\tcb@listing@set@MakeCaption@org},
+ listing remove caption/.default=true,
}
\newenvironment{tcblisting}[1]{%
@@ -144,14 +159,9 @@
\long\def\tcbinputlisting#1{%
\begingroup%
- \stepcounter{tcblayer}%
- \ifnum\c@tcblayer>\tcb@managed@layers@max%
- \else%
- \tcbset{every box on layer \number\c@tcblayer}%
- \tcbset{every box on layer \number\c@tcblayer/.style={}}%
- \fi%
- \addtocounter{tcblayer}{-1}%´
- \tcbset{#1}%
+ \tcb@layer@pushup%´
+ \tcbset{capture=minipage,#1}%
+ \let\tcb@listing@capture=\kvtcb@capture%
\tcb@inputlisting\endgroup%
}
@@ -230,7 +240,7 @@
comment=,
listing and text,
listing inputencoding=\inputencodingname,
- },
+ listing remove caption, },
initialize@reset=reset@listings,
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index e97c59f903b..fda425379a2 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\RequirePackage{listingsutf8}[2011/11/10]
\tcbuselibrary{listings}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 04be331c9ff..ece95e163d9 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\RequirePackage{tikz}[2010/10/13]
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
index 358fa624bf3..b8a2b188399 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% 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.40}
+\tcb@set@library@version{2.41}
\RequirePackage{amsmath}
@@ -30,7 +30,7 @@
\ifx\temp@a\@empty\relax%
\unhbox\z@%
\else%
- \setbox\z@=\hbox{\unhbox\z@:\ }%
+ \setbox\z@=\hbox{\unhbox\z@\kvtcb@separatorsign\ }%
\hangindent\wd\z@%
\hangafter=1%
\mbox{\unhbox\z@}#3%
@@ -78,6 +78,9 @@
ams nodisplayskip lower/.style={before lower=\vskip-\abovedisplayskip},%
ams nodisplayskip/.style={ams nodisplayskip upper,ams nodisplayskip lower},%
highlight math style/.style={highlight math/.style={notitle,nophantom,#1}},%
+ separator sign/.store in=\kvtcb@separatorsign,%
+ separator sign colon/.style={separator sign={:}},%
+ separator sign dash/.style={separator sign={\ --}},%
}
\newcommand{\newtcbtheorem}[5][]{%
@@ -89,12 +92,8 @@
}
-\newcommand{\tcbmaketheorem}[6][]{%
- \def\temp@a{#5}\ifx\temp@a\@empty%
- \newtcbtheorem[#1]{#2}{#3}{#4}{#6}%
- \else%
- \newtcbtheorem[use counter=#5,#1]{#2}{#3}{#4}{#6}%
- \fi%
+\newcommand{\tcbmaketheorem}[5]{%
+ \newtcolorbox{#1}[3][]{#3,theorem={#2}{#4}{##2}{#5:##3},##1}%
}
\newtcbox{\tcboxmath}[1][]{nobeforeafter,math upper,tcbox raise base,#1}
@@ -103,6 +102,7 @@
\tcbset{%
reset@theorems/.style={%
highlight math style={colframe=red,colback=yellow!25!white},%
+ separator sign colon,%
},
initialize@reset=reset@theorems,
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index 59daeeb479a..645054c5673 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.40 (2013/07/15)
+%% The LaTeX package tcolorbox - version 2.41 (2013/07/23)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2013/07/15 version 2.40 text color boxes]
-\def\tcb@version{2.40}
+\ProvidesPackage{tcolorbox}[2013/07/23 version 2.41 text color boxes]
+\def\tcb@version{2.41}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -311,9 +311,11 @@
},
check odd page/.default=true,
phantom/.code={\appto\kvtcb@phantom{#1}},
- step and label/.style 2 args={phantom={\refstepcounter{#1}\label{#2}}},%
+ step and label/.style 2 args={phantom={\refstepcounter{#1}\tcb@set@label{#2}}},%
step/.style={phantom={\refstepcounter{#1}}},%
- label/.style={phantom={\label{#1}}},%
+ label/.style={phantom={\tcb@set@label{#1}}},%
+ label type/.store in=\kvtcvb@label@type,%
+ no label type/.style={label type=},%
add to list/.style 2 args={phantom={\tcb@addcontentsline{#1}{#2}}},
nophantom/.code={\def\kvtcb@phantom{}},%
shield externalize/.is choice,
@@ -330,6 +332,14 @@
set@extensions@preframe=,set@extensions@postframe=,%
}%
+\def\tcb@set@label#1{%
+ \ifx\kvtcvb@label@type\@empty%
+ \label{#1}%
+ \else%
+ \label[\kvtcvb@label@type]{#1}%
+ \fi%
+}
+
\let\tcb@parboxrestore=\@parboxrestore
\def\tcb@parbox@use@false{%
@@ -493,12 +503,24 @@
\fi%
}
+\def\tcb@layer@pushup{%
+ \stepcounter{tcblayer}%
+ \ifnum\c@tcblayer>\tcb@managed@layers@max%
+ \tcbset{every box on higher layers}%
+ \tcbset{every box on higher layers/.style={}}% not ideal
+ \else%
+ \tcbset{every box on layer \number\c@tcblayer}%
+ \tcbset{every box on layer \number\c@tcblayer/.style={}}%
+ \fi%
+ \addtocounter{tcblayer}{-1}%´
+}
+
\def\tcb@layer@dec{%
\ifnum\c@tcblayer>\tcb@managed@layers@max%
\else%
\expandafter\global\setbox\@mpfootins\box\csname tcb@footnote@\romannumeral\c@tcblayer\endcsname%
\setcounter{mpfootnote}{\csname tcb@footnote@cnt@\romannumeral\c@tcblayer\endcsname}%
- \fi
+ \fi%
\addtocounter{tcblayer}{-1}%
}
@@ -888,7 +910,11 @@
list inside/.store in=\kvtcb@new@listof,
list type/.store in=\kvtcb@new@listtype,
%
- reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox},
+ init@hook@clear/.code={\def\kvtcb@init@hook{}},
+ crefname/.code 2 args={\appto\kvtcb@init@hook{\crefname{\tcbcounter}{#1}{#2}}},
+ Crefname/.code 2 args={\appto\kvtcb@init@hook{\Crefname{\tcbcounter}{#1}{#2}}},
+ %
+ reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear},
}
\def\tcb@proc@counter@autoanduse#1{%
@@ -937,6 +963,7 @@
\csedef{tcb@lsttp@#2}{\kvtcb@new@listtype}%
\appto\tcb@new@colopt{,add to list={\csname tcb@lstof@\kvtcb@savedelimiter\endcsname}{\csname tcb@lsttp@\kvtcb@savedelimiter\endcsname}}%
\fi%
+ \kvtcb@init@hook%
}%
\long\def\tcb@newtcolorbox#1#2{\newenvironment{#1}{\tcolorbox[#2,options@for=#1]}{\endtcolorbox}}
@@ -1099,7 +1126,7 @@
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=,
+ shield externalize=false,list entry=,no label type,
},
initialize@reset=reset@core,
}