diff options
author | Karl Berry <karl@freefriends.org> | 2014-12-16 23:10:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-12-16 23:10:42 +0000 |
commit | ad9e1b89835ba40880b3b5d0c153577ce2b5d1e3 (patch) | |
tree | 6cda0f4c755541a22fb2795297e9637e7f4951f8 /Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex | |
parent | a01f81cc1fa81b449afcf1c77def8688146582d5 (diff) |
tcolorbox (16dec14)
git-svn-id: svn://tug.org/texlive/trunk@35843 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex | 29 |
1 files changed, 23 insertions, 6 deletions
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 } |