diff options
author | Karl Berry <karl@freefriends.org> | 2016-11-18 23:20:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-11-18 23:20:46 +0000 |
commit | 56b28b78401bc0acc968306eeed9a28b3fbd657d (patch) | |
tree | 47c67e62e9581a315e5280e0508fec30b2afa09d /Master/texmf-dist/tex/latex | |
parent | b1738761511777180f24fe861550ef9b06de3af8 (diff) |
tcolorbox (18nov16)
git-svn-id: svn://tug.org/texlive/trunk@42532 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
18 files changed, 82 insertions, 63 deletions
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex index 4f49995650a..67211033136 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings @@ -985,6 +985,7 @@ no extras last/.code={\let\tcb@extras@last\@empty},% no extras/.code={\let\tcb@extras@unbroken\@empty\let\tcb@extras@first\@empty\let\tcb@extras@middle\@empty\let\tcb@extras@last\@empty},% if odd page*/.style 2 args={check odd page,extras={if odd page={#1}{#2}}},% + if odd page or oneside*/.style 2 args={check odd page,extras={if odd page or oneside={#1}{#2}}},% } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex index 2a22308c2bf..7cf0cf0bdf9 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \tcbuselibrary{listings,skins,xparse,external} @@ -416,7 +416,8 @@ \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, arc=0pt,outer arc=1pt,boxsep=1pt,top=1pt,bottom=1pt, nobeforeafter,width=\marginparwidth, - colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize,before upper=\flushright, + colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize, + if odd page or oneside={flushright upper}{flushleft upper}, doc@marginnote,#1]#2\end{tcolorbox}}} \newcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1} @@ -468,27 +469,27 @@ \tcbset{% reset@documentation/.style={% - index command=\index,% - documentation listing style=tcbdocumentation, - index default settings, - color option=Option, - color definition=Definition, - color hyperlink=Hyperlink, - doc left=2em, - doc right=0pt, - doc left indent=-2em, - doc right indent=0pt, - doc head=, - before doc body=, - after doc body=, - doc description=, - doc into index=true, - index colorize=false, - index annotate=true, - doc marginnote=, }, + documentation listing style=tcbdocumentation, + doc left=2em, + doc right=0pt, + doc left indent=-2em, + doc right indent=0pt, + doc head=, + before doc body=, + after doc body=, + doc description=, + doc into index=true, + doc marginnote=, initialize@reset=reset@documentation, + color option=Option, + color definition=Definition, + color hyperlink=Hyperlink, + index command=\index,% index format=pgf, + index default settings, + index colorize=false, + index annotate=true, english language, } diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex index 1b8007ef0cb..6aa36f6dd11 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex index 4e079ccef35..851f6efc721 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \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 09eebf59d18..d1927dd0840 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \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 4e688db6918..6ea490dd3d2 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \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 f35d49cc7e8..af797f4a2c2 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \tcbuselibrary{pro@cessing} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex index 7d113e55432..99ebc70caa2 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \RequirePackage{listingsutf8}[2011/11/10] \tcbuselibrary{listings} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex index 4fb8094aeaf..b474795b4d8 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{breakable} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex index 49d84486484..4f4afa02d21 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \RequirePackage{minted}[2011/09/17] diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex index 581d1f243e1..f40501273d5 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \RequirePackage{pdftexcmds} \RequirePackage{shellesc} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex index 517ffdd74d7..bbd980ce483 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \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 db327334ec8..cdf2ed93b90 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \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 5a606e2c145..2053c636601 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \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 cc03011904f..a5ef128dd8a 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% 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.95} +\tcb@set@library@version{3.96} \RequirePackage{amsmath} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex index 1f812319862..416d735cd5e 100644 --- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex +++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 3.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \tcbuselibrary{skins} diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex index be73677cf7c..12ff862f7ef 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{3.95} +\tcb@set@library@version{3.96} \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 aa7a56d80fb..daf0c19a377 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.95 (2016/10/21) +%% The LaTeX package tcolorbox - version 3.96 (2016/11/18) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2016/10/21 version 3.95 text color boxes] -\def\tcb@version{3.95} +\ProvidesPackage{tcolorbox}[2016/11/18 version 3.96 text color boxes] +\def\tcb@version{3.96} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -149,12 +149,12 @@ \let\tcb@specialtitle@hook\@empty% } -\def\tcb@gettitle#1{\edef\@currentlabelname{#1}} +\def\tcb@gettitle#1{\protected@edef\@currentlabelname{#1}} -\AtBeginDocument{% - \@ifpackageloaded{nameref}{% +\AfterEndPreamble{% + \ifdefined\NR@gettitle% \let\tcb@gettitle\NR@gettitle% - }{}% + \fi% } % analog to plain.tex @@ -582,7 +582,11 @@ check odd page/.is if=tcb@checkpage, if odd page/.code 2 args={% \tcbset{check odd page}% - \ifodd\thetcolorboxpage\tcbset{#1}\else\tcbset{#2}\fi% + \tcbifoddpage{\tcbset{#1}}{\tcbset{#2}}% + }, + if odd page or oneside/.code 2 args={% + \tcbset{check odd page}% + \tcbifoddpageoroneside{\tcbset{#1}}{\tcbset{#2}}% }, phantom/.code={\appto\kvtcb@phantom{#1}}, step and label/.style 2 args={phantom={\refstepcounter{#1}\tcb@set@label{#2}}},% @@ -917,6 +921,19 @@ \fi% } +\def\tcbifoddpageoroneside{% + \if@twoside% + \ifodd\thetcolorboxpage\relax% + \let\reserved@a\@firstoftwo% + \else% + \let\reserved@a\@secondoftwo% + \fi% + \else% + \let\reserved@a\@firstoftwo% + \fi% + \expandafter\reserved@a% +} + \def\tcb@managed@layers@max{0} \def\tcbsetmanagedlayers#1{% \setcounter{tcblayer}{\tcb@managed@layers@max}% @@ -1394,7 +1411,7 @@ } \def\tcb@setbb@toggle@evenpage{% - \ifodd\thetcolorboxpage\tcb@setbb@toggle@none\else\tcb@setbb@toggle@forced\fi% + \tcbifoddpage{\tcb@setbb@toggle@none}{\tcb@setbb@toggle@forced}% } \def\tcb@creategeonodes@false{} @@ -1415,7 +1432,7 @@ } \def\tcb@lrtoggle@evenpage{% - \unless\ifodd\thetcolorboxpage\tcb@lrtoggle@forced\fi% + \tcbifoddpage{}{\tcb@lrtoggle@forced}% } \def\tcb@bbdraw{% |