diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-03 17:42:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-03 17:42:08 +0000 |
commit | b425e73e73597d25c058662c7dbf6ee559cbdda5 (patch) | |
tree | d0b7d531f6c467374927873ff108bd83ac542cdb /Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | |
parent | 74510109164a78fa88e5f0f095dc7bc92c833968 (diff) |
tcolorbox
git-svn-id: svn://tug.org/texlive/trunk@34818 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty index 937851d2499..7ec9b8061a3 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.11 (2014/07/25) +%% The LaTeX package tcolorbox - version 3.12 (2014/07/29) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2014/07/25 version 3.11 text color boxes] -\def\tcb@version{3.11} +\ProvidesPackage{tcolorbox}[2014/07/29 version 3.12 text color boxes] +\def\tcb@version{3.12} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -45,6 +45,9 @@ \newcounter{tcbbreakpart} \newcounter{tcblayer} +\def\tcb@warning#1{\PackageWarning{tcolorbox}{#1}} +\def\tcb@error#1#2{\PackageError{tcolorbox}{#1}{#2}} + % key management \pgfkeys{/tcb/.is family} @@ -53,7 +56,7 @@ \def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}} \def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}} -\def\tcb@defToTotalHeightStandard#1#2#3{\tcbdimto#1{\ht#2+\dp#2}} +\def\tcb@defToTotalHeightStandard#1#2{\tcbdimto#1{\ht#2+\dp#2}} \let\tcb@defToTotalHeight\tcb@defToTotalHeightStandard \def\tcb@zpt{0pt} @@ -202,8 +205,8 @@ before/.code={\def\kvtcb@beforebox{#1}\let\tcb@use@autoparskip=\relax}, after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax}, autoparskip/.code={\let\tcb@use@autoparskip=\tcb@use@auto@parskip}, - parskip/.style={before={\par\pagebreak[0]\noindent},after={\par}}, - noparskip/.style={before={\par\smallskip\pagebreak[0]\noindent},after={\par\smallskip}}, + parskip/.style={before={\par\pagebreak[0]\parindent=0pt},after={\par}}, + noparskip/.style={before={\par\smallskip\pagebreak[0]\parindent=0pt},after={\par\smallskip}}, nobeforeafter/.style={before=,after=}, lowerbox/.is choice, lowerbox/visible/.code={\tcb@lowerignoredfalse\tcb@lowervisibletrue}, @@ -483,19 +486,18 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a \@endpefalse - \color@setgroup% \csname tcb@parbox@use@\kvtcv@parbox\endcsname% \tcb@minipage#2\tcb@hyph@fix\ignorespaces} -\def\endtcb@lrbox{\unskip\endminipage\color@endgroup} +\def\endtcb@lrbox{\unskip\endminipage} \let\tcb@savebox=\tcb@lrbox \let\endtcb@savebox=\endtcb@lrbox \def\tcb@saveupperbox{% -\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{\kvtcb@colupper}\kvtcb@fontupper\kvtcb@before@upper\ignorespaces} +\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\penalty-\@m\kvtcb@fontupper\kvtcb@before@upper\ignorespaces} \def\tcb@savelowerbox{% -\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\color{\kvtcb@collower}\kvtcb@fontlower\kvtcb@before@lower\ignorespaces} +\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\penalty-\@m\kvtcb@fontlower\kvtcb@before@lower\ignorespaces} % counter for float @@ -738,11 +740,11 @@ \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi% } -\def\tcb@dbox@top#1#2#3#4{\pgftext[x=#1,y=#2+#3,left,top]{\box#4}}% +\def\tcb@dbox@top#1#2#3#4#5{\pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% -\def\tcb@dbox@bottom#1#2#3#4{\pgftext[x=#1,y=#2,left,bottom]{\box#4}}% +\def\tcb@dbox@bottom#1#2#3#4#5{\pgftext[x=#1,y=#2,left,bottom]{\color{#5}\box#4}}% -\def\tcb@dbox@center#1#2#3#4{\pgftext[x=#1,y=#2+#3/2,left]{\box#4}}% +\def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{\color{#5}\box#4}}% \def\tcb@arc@zpt{\pgfsetcornersarced{\pgfpointorigin}}% \def\tcb@arc@ins{\pgfsetcornersarced{\pgfqpoint{\kvtcb@arc}{\kvtcb@arc}}}% @@ -987,7 +989,7 @@ \pgfsetfillopacity{\kvtcb@opacitytitle}% \pgftext[x=\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@lefttitle\relax, y=\the\dimexpr\tcb@height-\kvtcb@top@rule-\kvtcb@boxsep-\kvtcb@toptitle\relax, - left,top]{\usebox{\tcb@titlebox}}% + left,top]{\color{\kvtcb@coltitle}\box\tcb@titlebox}% \end{pgfscope}% \fi% } @@ -998,7 +1000,7 @@ \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}% + {\tcb@height@upper}{\tcb@upperbox}{\kvtcb@colupper}% \end{pgfscope}% } \let\tcb@tdraw@upper=\tcb@tdraw@upper@core @@ -1009,7 +1011,7 @@ \pgfsetfillopacity{\kvtcb@opacitylower}% \csname tcb@dbox@\kvtcb@valignlower\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftlower\relax}% {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\tcb@break@bottomsep+\kvtcb@bottom\relax}% - {\tcb@height@lower}{\tcb@lowerbox}% + {\tcb@height@lower}{\tcb@lowerbox}{\kvtcb@collower}% \end{pgfscope}% \fi% } @@ -1020,7 +1022,7 @@ \tcbdimto{\tcb@temp@wd}{\tcb@w@upper-\wd\tcb@upperbox+\kvtcb@sbs@gap}% \noindent\unhbox\tcb@upperbox\kern\tcb@temp@wd% \iftcb@hasLower% - \iftcb@lowervisible\unhbox\tcb@lowerbox% + \iftcb@lowervisible\color{\kvtcb@collower}\unhbox\tcb@lowerbox% \else% \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{0pt}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi% \fi% @@ -1040,14 +1042,14 @@ \let\tcb@h@padtitle=\tcb@zpt% \fi% % - \tcb@defToTotalHeight\tcb@h@upper{\tcb@upperbox}{\kvtcb@fontupper}% + \tcb@defToTotalHeight\tcb@h@upper{\tcb@upperbox}% % \iftcb@hasLower% \iftcb@lowerignored\tcb@lowerspacefalse\else\tcb@lowerspacetrue\fi% \else\tcb@lowerspacefalse\fi% \iftcb@lowerspace% \tcbdimto\tcb@h@segment{\kvtcb@boxsep*2+\kvtcb@middle*2}% - \tcb@defToTotalHeight\tcb@h@lower{\tcb@lowerbox}{\kvtcb@fontlower}% + \tcb@defToTotalHeight\tcb@h@lower{\tcb@lowerbox}% \else \let\tcb@h@segment=\tcb@zpt% \let\tcb@h@lower=\tcb@zpt% |