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 | |
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')
22 files changed, 174 insertions, 59 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index ef960985516..2e04c726bc6 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES +++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/07) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -429,7 +429,7 @@ version 2.71 (2014/02/21) 'color command', 'color environment', 'color key', 'color value', 'color color' version 2.72 (2014/03/18) -- bug fix: mixing \newtcblisting with 'ams align' and similar options was not possíble +- bug fix: mixing \newtcblisting with 'ams align' and similar options was not possible - bug fix: footnotes lost for 'listing outside text' and similar options - sidebyside and outside implementation slightly changed for beamer usage - bicolor skin respects 'opacityback' for the upper part now @@ -673,7 +673,7 @@ version 3.30 (2014/11/17) version 3.31 (2014/11/28) - new macros: '\tcbstartrecording', '\tcbrecord', '\tcbstoprecording', '\tcbinputrecords' -- new option: 'squeezed title', 'squeezed title*', 'phantomlabel', +- new options: 'squeezed title', 'squeezed title*', 'phantomlabel', 'record', 'no recording' - 'savelowerto' changed to need only one run instead of two - library 'skins': @@ -700,3 +700,9 @@ version 3.34 (2014/12/16) Use the new option 'compress page=none' to restore the old behavior. - library 'raster': * 'raster before skip' and 'raster after skip' accept glue values now + +version 3.35 (2015/01/07) +- fix: 'tcbdocumentation.code.tex' changed to US-ASCII +- text color implementation changed to fix some color problems +- new options: 'upperbox', 'visible', 'invisible' +- documentation complemented diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 71f6f0d7eb8..59d783cd45c 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/README +++ b/Master/texmf-dist/doc/latex/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/07) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf Binary files differindex 7c5b9f3993d..7ff3efd5b55 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex index 404a9c99125..bb3b185249d 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.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) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex index 792e342bce4..3dc4bd223d3 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -109,6 +109,10 @@ parameters. The differences are: \textbf{But, a breakable box inside a breakable box will usually give a mess.} \item If your text content contains some text color changing commands, your color will not survive the break to the next box. + But, with the |fontspec| package and |xelatex| or |lualatex|, + you can use + |\addfontfeatures{Color=mycolor}| + to add a font color which survives the break. \item\tcbdocmarginnote{\tcbdocnew{2014-10-30}} The |perpage| option of the |footmisc| package is deliberately deactivated inside a breakable box since all footnotes are placed at the end diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex index 100731ddbd9..a4fe72836cf 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -6,7 +6,7 @@ For the \meta{options} in \refEnv{tcolorbox} respectively \refCom{tcbset} the following |pgf| keys can be applied. The key tree path |/tcb/| is not to be used inside these macros. It is easy to add your own style keys using the syntax for |pgf| keys, see \cite{tantau:2013a,sturm:2014g} or the examples -starting from page \pageref{sec:latextutorial}. +starting from page~\pageref{sec:latextutorial}. \subsection{Title} @@ -200,6 +200,53 @@ just like any other \refEnv{tcolorbox}. \end{docTcbKey} \clearpage +\subsection{Upper Part} +The text content of a \refEnv{tcolorbox} may be parted into a mandatory \emph{upper part} +and an optional \emph{lower part}. These parts are separated by +\refCom{tcblower}. If there is no \refCom{tcblower} present, there is no +\emph{lower part} and the \emph{upper part} forms the complete text content. + +\begin{docTcbKey}[][doc new=2015-01-06]{upperbox}{=\meta{mode}}{no default, initially \texttt{visible}} + Controls the treatment of the upper part of the box. If there is no lower part, + this is the complete text content. + Feasible values for \meta{mode} are: + \begin{itemize} + \item\docValue{visible}: usual type setting of the upper part, + \item\docValue{invisible}: empty space instead of the uooer part contents. + \end{itemize} +\begin{dispExample} +\begin{tcolorbox}[upperbox=invisible,colback=white] +This is a \textbf{tcolorbox} (but invisible). +\end{tcolorbox} + +\bigskip + +\begin{tcolorbox}[upperbox=invisible,colback=white] +This is a \textbf{tcolorbox} (but invisible). +\tcblower +This is the lower part. +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + + +\begin{docTcbKey}[][doc new=2015-01-06]{visible}{}{style, no value} + Shortcut for setting \refKey{/tcb/upperbox} and \refKey{/tcb/lowerbox} + to be \docValue{visible}. +\end{docTcbKey} + +\begin{docTcbKey}[][doc new=2015-01-06]{invisible}{}{style, no value} + Shortcut for setting \refKey{/tcb/upperbox} and \refKey{/tcb/lowerbox} + to be \docValue{invisible}. +\begin{dispExample} +\begin{tcolorbox}[invisible] +This is a \textbf{tcolorbox} (but invisible). +\end{tcolorbox} +\end{dispExample} +\end{docTcbKey} + + +\clearpage \subsection{Lower Part} \begin{docTcbKey}{lowerbox}{=\meta{mode}}{no default, initially \texttt{visible}} Controls the treatment of the lower part of the box. @@ -245,44 +292,49 @@ Now, we load the saved text:\\ \begin{docTcbKey}{lower separated}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the lower part is visually separated from the upper part. It depends on the chosen skin how the visualization of the separation is done. - +\enlargethispage*{1cm} \begin{dispExample} -% \tcbuselibrary{skins} -\tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,nobeforeafter, - width=(\linewidth-4mm)/2,fontlower=\itshape} - +% \tcbuselibrary{skins,raster} +\begin{tcbraster}[colback=red!5!white,colframe=red!75!black, + fonttitle=\bfseries,fontlower=\itshape] +% \begin{tcolorbox}[title=Lower separated] This is the upper part. \tcblower This is the lower part. -\end{tcolorbox}\hfill +\end{tcolorbox} +% \begin{tcolorbox}[title=Lower not separated,lower separated=false] This is the upper part. \tcblower This is the lower part. \end{tcolorbox} -\par\bigskip\par +% \begin{tcolorbox}[sidebyside,title=Lower separated] This is the upper part. \tcblower This is the lower part. -\end{tcolorbox}\hfill +\end{tcolorbox} +% \begin{tcolorbox}[sidebyside,title=Lower not separated,lower separated=false] This is the upper part. \tcblower This is the lower part. \end{tcolorbox} -\par\bigskip\par +% \begin{tcolorbox}[beamer,title=Lower separated] This is the upper part. \tcblower This is the lower part. -\end{tcolorbox}\hfill +\end{tcolorbox} +% \begin{tcolorbox}[beamer,title=Lower not separated,lower separated=false] This is the upper part. \tcblower This is the lower part. \end{tcolorbox} +% +\end{tcbraster} \end{dispExample} \end{docTcbKey} @@ -2271,6 +2323,40 @@ This is the lower (\textit{right-handed}) part. \clearpage +If one side of a side-by-side box should be adapted to the width of +its content, this width has to be computed beforehand. +The following example uses a savebox |\mysavebox| to store the picture to determine +its width. + +\begin{dispExample} +% \tcbuselibrary{skins,xparse} +% \usepackage{lipsum} +% \newsavebox\mysavebox % preamble +\DeclareTotalTColorBox{\mysidebox}{ O{} +m +m }{ + bicolor,colback=white,colbacklower=yellow!10, + fonttitle=\bfseries,center title, + sidebyside, + code={\sbox{\mysavebox}{#2}}, + lefthand width=\wd\mysavebox, + drop lifted shadow, + #1 +} +{\usebox{\mysavebox}\tcblower#3} + +\mysidebox[title=The Triangle]{% + \begin{tikzpicture} + \path[fill=red!20,draw=red!50!black] + (0,0) node[below]{A} -- (3,1) node[right]{B} + -- (1,4) node[above]{C} -- cycle; + \end{tikzpicture}% +}{% + \lipsum[1] +} +\end{dispExample} + + + +\clearpage \subsection{Embedding into the Surroundings}\label{subsec:surroundings} Typically, but not necessarily, a |tcolorbox| is put inside a separate paragraph and has some vertical space before and after it. diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex 9dded7a78a4..4f3599d2ba6 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex index a4a0f181bf4..0387dcb2cb0 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) +%% The LaTeX package tcolorbox - version 3.35 (2015/01/07) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -107,8 +107,8 @@ \renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} \renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} -\def\version{3.34}% -\def\datum{2014/12/16}% +\def\version{3.35}% +\def\datum{2015/01/07}% \makeindex \hypersetup{ @@ -126,7 +126,7 @@ \newcounter{example} \newlength{\examlen} - +\newsavebox\mysavebox \lstdefinestyle{mydocumentation}{style=tcbdocumentation, classoffset=0, 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}, |