From 82821c522d080ea556e2794d7e87d17097dae1a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 7 Jan 2015 22:55:50 +0000 Subject: tcolorbox (7jan15) git-svn-id: svn://tug.org/texlive/trunk@35987 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tcolorbox/CHANGES | 12 ++- Master/texmf-dist/doc/latex/tcolorbox/README | 2 +- .../doc/latex/tcolorbox/tcolorbox-example.pdf | Bin 361345 -> 361340 bytes .../doc/latex/tcolorbox/tcolorbox-example.tex | 2 +- .../latex/tcolorbox/tcolorbox.doc.breakable.tex | 4 + .../latex/tcolorbox/tcolorbox.doc.coreoptions.tex | 108 ++++++++++++++++++--- .../texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf | Bin 5200862 -> 5222148 bytes .../texmf-dist/doc/latex/tcolorbox/tcolorbox.tex | 8 +- 8 files changed, 116 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/doc') 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 @@ -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 diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf index 7c5b9f3993d..7ff3efd5b55 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf differ 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} @@ -199,6 +199,53 @@ just like any other \refEnv{tcolorbox}. \end{dispExample*} \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}} @@ -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} @@ -2270,6 +2322,40 @@ This is the lower (\textit{right-handed}) part. \end{docTcbKey} +\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 diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf index 9dded7a78a4..4f3599d2ba6 100644 Binary files a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf and b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf differ 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, -- cgit v1.2.3