diff options
Diffstat (limited to 'Master')
23 files changed, 134 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES index 90cbe5be46e..ef960985516 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -691,3 +691,12 @@ version 3.33 (2014/12/11) unbreakable boxes. Use the new option 'ignore nobreak' to restore the old behavior. - vertical skip of two successive tcbraster environments fixed + +version 3.34 (2014/12/16) +- 'height fill' now fills gapless and can be overruled by other height options +- 'before skip' and 'after skip' accept glue values now +- library 'breakable': + * new option 'compress page': + 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 diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README b/Master/texmf-dist/doc/latex/tcolorbox/README index 04958c4bbfa..71f6f0d7eb8 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% %% ------------------------------------------------------------------------------------------- %% 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 657c6a12c8a..7c5b9f3993d 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 3826fc0b4f3..404a9c99125 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% 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 50ff63e5488..792e342bce4 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex @@ -254,6 +254,28 @@ The |break at| option can be used to insert better break points by hand. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-12-15]{compress page}{\colOpt{=\meta{option}}}{default |all|, initially |baselineskip|} + This option controls the space management on the page which contains the + unbroken box or the first part of a \emph{break sequence}. + Feasible \meta{option} values are: + \begin{itemize} + \item\docValue{all} (default value): + All shrinkable glue on the page is potentially used for the + unbroken box or the first part of a \emph{break sequence}. Thus, all + vertical spaces on the page will potentially be reduced to their + minimal values. + \item\docValue{baselineskip} (initial value): + Shrinkable glue up to one |\baselineskip| on the page is potentially used for the + unbroken box or the first part of a \emph{break sequence}. + \item\docValue{none}: + The break algorithm respects the target size of the given glue values + on the page. This was the inital value before version |3.34|. + \end{itemize} + \begin{marker} + Note that the box \emph{content} is not influenced by this option. + \end{marker} +\end{docTcbKey} + \begin{docTcbKey}{shrink break goal}{=\meta{length}}{no default, initially |0pt|} This is an emergency parameter if the break algorithm produces unpleasant @@ -322,23 +344,23 @@ The |break at| option can be used to insert better break points by hand. and \refKey{/tcb/pad after break}. \end{docTcbKey} +\begin{docTcbKey}{pad at break*}{=\meta{length}}{style, no default} + Sets \refKey{/tcb/pad at break} to \meta{length} and + \refKey{/tcb/enlargepage flexible} to an appropriate value such that + empty closing frames are avoided. +\end{docTcbKey} \begin{dispListing} % \usepackage{lipsum} % preamble \tcbset{colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries} -\begin{tcolorbox}[enhanced jigsaw,breakable,pad at break=0mm, +\begin{tcolorbox}[enhanced jigsaw,breakable,pad at break*=0mm, title={For this box, the pad space at the break point is set to 0mm}] \lipsum[1-2] \end{tcolorbox} \end{dispListing} {\tcbusetemp} -\begin{docTcbKey}{pad at break*}{=\meta{length}}{style, no default} - Sets \refKey{/tcb/pad at break} to \meta{length} and - \refKey{/tcb/enlargepage flexible} to an appropriate value such that - empty closing frames are avoided. -\end{docTcbKey} \begin{marker} \refKey{/tcb/pad at break} or \refKey{/tcb/pad at break*} 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 0600d0b753e..100731ddbd9 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -1280,11 +1280,13 @@ This is a \textbf{tcolorbox} where the text area has a height of 2cm. \end{docTcbKey} -\begin{docTcbKey}[][doc new=2014-09-22]{height fill}{\colOpt{=true\textbar false}}{default |true|, initially |false|} -If set to |true|, the height of the |tcolorbox| is set to the rest of the -available vertical space of the current page. Note that the |tcolorbox| +\begin{docTcbKey}[][doc new and updated={2014-09-22}{2014-12-15}]{height fill}{\colOpt{=true\textbar false\textbar maximum}}{default |true|, initially |false|} +If set to \docValue*{true}, the height of the |tcolorbox| is set to the rest of the +available vertical space of the current page. +If set to \docValue{maximum}, the page is compressed as much as possible. +Note that the |tcolorbox| is always set as its own paragraph using this option. -This option overrules \refKey{/tcb/natural height}, \refKey{/tcb/height}, etc. +%This option overrules \refKey{/tcb/natural height}, \refKey{/tcb/height}, etc. \begin{marker} Note that the library \mylib{breakable} has to be loaded to use this key! \end{marker} @@ -1988,7 +1990,7 @@ This is the lower part. \end{docTcbKey} -\begin{dispListing*}{breakable,before upper={This example demonstrates +\begin{dispListing*}{breakable,vfill before first,before upper={This example demonstrates the application of break sequence specific overlay options. Here, we define an environment |myexample| based on |tcolorbox| where the visible drawing is done totally by overlay keys.\par @@ -2012,7 +2014,7 @@ are drawn by the codes given with ([yshift=-1pt]frame.north west)--([yshift=-1pt]frame.north east);}}, coltitle=colexam,fonttitle=\Large\bfseries, before=\par\medskip\noindent,parbox=false,boxsep=0pt,left=0pt,right=3mm,top=4pt, - breakable,pad at break=0mm, + breakable,pad at break*=0mm,vfill before first, overlay unbroken={\draw[colexam,line width=1pt] ([yshift=-1pt]title.north east)--([xshift=-0.5pt,yshift=-1pt]title.north-|frame.east) --([xshift=-0.5pt]frame.south east)--(frame.south west); }, @@ -2403,8 +2405,8 @@ Some text\dotfill \end{docTcbKey} -\begin{docTcbKey}[][doc new and updated={2014-10-10}{2014-11-07}]{before skip}{=\meta{length}}{style, no default} - Inserts some vertical space of the given \meta{length} before the colored box. +\begin{docTcbKey}[][doc new and updated={2014-10-10}{2014-12-16}]{before skip}{=\meta{glue}}{style, no default} + Inserts some vertical space of the given \meta{glue} before the colored box. This style sets \refKey{/tcb/before}. \begin{dispExample*}{sbs,lefthand ratio=0.6} Some text. @@ -2415,8 +2417,8 @@ Some text. \end{dispExample*} \end{docTcbKey} -\begin{docTcbKey}[][doc new and updated={2014-10-10}{2014-11-07}]{after skip}{=\meta{length}}{style, no default} - Inserts some vertical space of the given \meta{length} after the colored box. +\begin{docTcbKey}[][doc new and updated={2014-10-10}{2014-12-16}]{after skip}{=\meta{glue}}{style, no default} + Inserts some vertical space of the given \meta{glue} after the colored box. This style sets \refKey{/tcb/after}. \begin{dispExample*}{sbs,lefthand ratio=0.6} \begin{tcolorbox}[after skip=1cm, @@ -2427,8 +2429,8 @@ Some text. \end{dispExample*} \end{docTcbKey} -\begin{docTcbKey}[][doc new=2014-10-10]{beforeafter skip}{=\meta{length}}{style, no default} - Inserts some vertical space of the given \meta{length} before \emph{and} after the colored box. +\begin{docTcbKey}[][doc new=2014-10-10]{beforeafter skip}{=\meta{glue}}{style, no default} + Inserts some vertical space of the given \meta{glue} before \emph{and} after the colored box. This style sets \refKey{/tcb/before} and \refKey{/tcb/after}. \begin{dispExample*}{sbs,lefthand ratio=0.6} \tcbset{beforeafter skip=0pt, @@ -2489,16 +2491,22 @@ Some text. \begin{docTcbKey}[][doc new=2014-12-11]{ignore nobreak}{\colOpt{=true\textbar false}}{default |true|, initially |false|} After a heading, \LaTeX\ tries to avoid a break by setting a |nobreak| boolean value. Starting from version |3.33|, the \refKey{/tcb/before} respectively \refKey{/tcb/before skip} -settings are not used after a heading, if \refKey{/tcb/ignore nobreak} is -set to \docValue{false}. Further, a \refKey{/tcb/breakable} box will also try to +settings are not used after a heading if \refKey{/tcb/ignore nobreak} is +set to \docValue{false}. For an unbreakable box, \refKey{/tcb/before nobreak} is used instead. +Further, a \refKey{/tcb/breakable} box will also try to avoid a break between a heading and a directly following first part of a break sequence. Set \refKey{/tcb/ignore nobreak} to \docValue{true}, if |nobreak| should be -ignored as prior to version |3.33|. Also, this setting may be used locally to +ignored as prior to version |3.33|. Also, such a setting may be used locally to enforce the \refKey{/tcb/before} setting. \end{docTcbKey} +\begin{docTcbKey}[][doc new=2014-12-16]{before nobreak}{=\meta{code}}{no default, initially \cs{noindent}} + Sets the \meta{code} which is executed before the colored box if it + is unbreakable, if \refKey{/tcb/ignore nobreak} is not set, and if + the box follows a heading. +\end{docTcbKey} \clearpage diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex index 49a2911da29..7a3264583c2 100644 --- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex +++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.raster.tex @@ -246,13 +246,13 @@ If \refKey{/tcb/fit} should be used, turn over to \refEnv{tcbraster}. \end{docTcbKey} -\begin{docTcbKey}[][doc new=2014-11-10]{raster before skip}{=\meta{length}}{no default, initially |2mm|} - Space of the given \meta{length} is inserted vertically before the \emph{raster}. +\begin{docTcbKey}[][doc new and updated={2014-11-10}{2014-12-16}]{raster before skip}{=\meta{glue}}{no default, initially |2mm|} + Space of the given \meta{glue} is inserted vertically before the \emph{raster}. This space is discardable. \end{docTcbKey} -\begin{docTcbKey}[][doc new=2014-11-10]{raster after skip}{=\meta{length}}{no default, initially |2mm|} - Space of the given \meta{length} is inserted vertically after the \emph{raster}. +\begin{docTcbKey}[][doc new and updated={2014-11-10}{2014-12-16}]{raster after skip}{=\meta{glue}}{no default, initially |2mm|} + Space of the given \meta{glue} is inserted vertically after the \emph{raster}. This space is discardable. \end{docTcbKey} diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf Binary files differindex c1a0def7ca9..9dded7a78a4 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 a0594ad9f26..a4a0f181bf4 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -34,7 +34,8 @@ \usepackage[a4paper,left=2.5cm,right=2.5cm,top=1.5cm,bottom=1.5cm, marginparsep=3mm,marginparwidth=18mm, headheight=0mm,headsep=0cm, - footskip=1.5cm,includeheadfoot]{geometry} + footskip=1.5cm,includeheadfoot%,showframe + ]{geometry} \usepackage{fancyhdr} \fancyhf{} \fancyfoot[C]{\thepage}% @@ -106,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.33}% -\def\datum{2014/12/11}% +\def\version{3.34}% +\def\datum{2014/12/16}% \makeindex \hypersetup{ @@ -376,7 +377,7 @@ %\tcbset{draftmode} -%\includeonly{tcolorbox.doc.quickref} +%\includeonly{tcolorbox.doc.coreoptions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index b63aeffa74f..6efce468c88 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \let\tcb@parboxrestore@true=\tcb@parboxrestore \def\tcb@parboxrestore@false{\vskip-\parskip\linewidth\hsize\noindent} @@ -111,7 +111,8 @@ \ifdim\pagegoal=16383.99998pt \tcbdimto\tcb@h@page{\vsize-\kvtcb@shrinkbreakgoal}% detects floating objects \else% - \tcbdimto\tcb@h@page{\pagegoal-\pagetotal-\kvtcb@shrinkbreakgoal}% + \tcb@comp@compress% + \tcbdimto\tcb@h@page{\pagegoal-\pagetotal+\tcb@compress@height-\kvtcb@shrinkbreakgoal}% \fi% \fi% \else% @@ -275,13 +276,17 @@ \fi% } -\def\tcb@height@fill@unbroken{% +\def\tcb@height@fill@unbroken#1{% \tcb@prepare@break@operation% \tcb@breakat@init% + \tcbset{compress page=#1}% \tcb@comp@h@page% - \tcbset{height=\tcb@h@page}% + \tcbset{height=\tcb@h@page,after=\eject}% } +\def\tcb@height@fill@unbroken@normal{\tcb@height@fill@unbroken{none}} +\def\tcb@height@fill@unbroken@compressed{\tcb@height@fill@unbroken{all}} + \def\tcb@use@after@lastbox{\bgroup\tcb@after@lastbox\egroup} \def\tcb@drawcolorbox@breakable{% @@ -815,8 +820,20 @@ \let\tcb@break@ch@middle=\tcb@break@ch@fixed% \let\tcb@break@ch@last=\tcb@break@ch@fixed},% vfill before first/.is if=tcb@vfillbeforefirst,% - height fill/true/.code={\let\tcb@height@adjust\tcb@height@fill@unbroken},% + height fill/true/.code={\let\tcb@height@adjust\tcb@height@fill@unbroken@normal},% + height fill/maximum/.code={\let\tcb@height@adjust\tcb@height@fill@unbroken@compressed},% height fill/.default=true,% + compress page/.is choice,% + compress page/all/.code={\def\tcb@comp@compress{\def\tcb@compress@height{\pageshrink-1sp}}},% + compress page/none/.code={\def\tcb@comp@compress{\let\tcb@compress@height\tcb@zpt}},% + compress page/baselineskip/.code={\def\tcb@comp@compress{% + \ifdim\pageshrink>\baselineskip% + \let\tcb@compress@height\baselineskip% + \else% + \def\tcb@compress@height{\pageshrink-1sp}% + \fi}},% + compress page/.default=all,% + compress page=baselineskip,% global setting } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 5804c94084d..29e2509a7a8 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \tcbuselibrary{listings,skins,xparse} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index cc842d49efd..1ad7d4d3ea4 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 3016200d9e5..71801d92756 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 b7cea0db61a..f356b79de1c 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 18996460531..f3f7915cd21 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 b3c86516b5a..0b0d01f3516 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 7e945c8dba0..4e634e07273 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 227f3338115..2fe3fd5191f 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% 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.33} +\tcb@set@library@version{3.34} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -157,11 +157,11 @@ \if@nobreak% \iftcb@ignorenobreak% {\par\nointerlineskip% - \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% + \addvspace{\glueexpr\kvtcb@raster@skip@before-\parskip}}% \fi% \else% {\par\nointerlineskip% - \addvspace{\the\dimexpr\kvtcb@raster@skip@before-\parskip\relax}}% + \addvspace{\glueexpr\kvtcb@raster@skip@before-\parskip}}% \fi% \kvtcb@raster@halign\noindent% }{% @@ -171,7 +171,7 @@ \fi% \begingroup% \par\nointerlineskip% - \addvspace{\the\dimexpr\kvtcb@raster@skip@after-\parskip\relax}% + \addvspace{\glueexpr\kvtcb@raster@skip@after-\parskip}% \endgroup% \tcb@end@raster% \setcounter{tcbrastercolumn}{\tcb@raster@save@column}% diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex index 9c114557808..52072c86f11 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 89c0fda8520..cda0ed40def 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% 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.33} +\tcb@set@library@version{3.34} \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 8ccfbd11fbf..10a09f9682d 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 83f94d5c7d0..94f11f117c7 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/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{3.33} +\tcb@set@library@version{3.34} \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 81e50e27a06..a2d9502d1cc 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.33 (2014/12/11) +%% The LaTeX package tcolorbox - version 3.34 (2014/12/16) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/12/11 version 3.33 text color boxes] -\def\tcb@version{3.33} +\ProvidesPackage{tcolorbox}[2014/12/16 version 3.34 text color boxes] +\def\tcb@version{3.34} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -227,21 +227,22 @@ nobeforeafter/.style={before=,after=}, before skip/.style={before={% \par\nointerlineskip\lineskip=0pt% - \addvspace{\the\dimexpr#1-\parskip\relax}% + \addvspace{\glueexpr#1-\parskip}% \noindent% }}, after skip/.style={after={% \par\nointerlineskip% - \addvspace{\the\dimexpr#1-\parskip\relax}% + \addvspace{\glueexpr#1-\parskip}% }}, beforeafter skip/.style={before skip={#1},after skip={#1}}, + before nobreak/.store in=\kvtcb@beforebox@nobreak, lowerbox/.is choice, lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue}, lowerbox/invisible/.code={\tcb@lowerignoredfalse\tcb@lowervisiblefalse}, lowerbox/ignored/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse}, - natural height/.code={\tcb@fixedheightfalse\let\tcb@ch=\tcb@ch@natural}, - height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@fixed}, - text height/.code={\tcb@fixedheighttrue\tcb@dim@to\kvtcb@height@fixed{#1}\let\tcb@ch=\tcb@ch@innerfixed}, + 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}, add to height/.code={\ifdefined\kvtcb@height@fixed\tcbdimto\kvtcb@height@fixed{\kvtcb@height@fixed+(#1)}\fi}, height plus/.dimstore in=\kvtcb@height@fixed@plus,% height from/.style args={#1 to #2}{height={#1},height plus={#2-#1}},% @@ -1163,7 +1164,7 @@ \let\tcb@before@unbroken=\kvtcb@beforebox% \if@nobreak% \iftcb@ignorenobreak\else% - \let\tcb@before@unbroken=\@empty% + \let\tcb@before@unbroken=\kvtcb@beforebox@nobreak% \fi% \fi% \let\tcb@after@unbroken=\kvtcb@afterbox% @@ -1579,7 +1580,7 @@ lefthand ratio=0.5,check odd page=false,nophantom, shield externalize=false,list entry=,no label type, opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0, - subtitle style=,title filled=false,every float=,height fill=false,ignore nobreak=false, + subtitle style=,title filled=false,every float=,ignore nobreak=false,before nobreak=\noindent, }, initialize@reset=reset@core, } |