From 7c46a832ab35fe8fc260808e288b9bb4cd917333 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 20 Aug 2020 21:10:23 +0000 Subject: adjustbox (20aug20) git-svn-id: svn://tug.org/texlive/trunk@56140 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/adjustbox/adjustbox.sty | 35 ++++++++++++++++++---- Master/texmf-dist/tex/latex/adjustbox/tc-dvips.def | 4 +-- .../texmf-dist/tex/latex/adjustbox/tc-pdftex.def | 4 +-- Master/texmf-dist/tex/latex/adjustbox/tc-pgf.def | 4 +-- Master/texmf-dist/tex/latex/adjustbox/tc-xetex.def | 4 +-- Master/texmf-dist/tex/latex/adjustbox/trimclip.sty | 9 +++--- 6 files changed, 43 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/adjustbox') diff --git a/Master/texmf-dist/tex/latex/adjustbox/adjustbox.sty b/Master/texmf-dist/tex/latex/adjustbox/adjustbox.sty index c12de75fadb..37377f0a6eb 100644 --- a/Master/texmf-dist/tex/latex/adjustbox/adjustbox.sty +++ b/Master/texmf-dist/tex/latex/adjustbox/adjustbox.sty @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2019 by Martin Scharrer +%% Copyright (C) 2011-2020 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -16,8 +16,8 @@ %% and the derived file adjustbox.sty. %% \ProvidesPackage{adjustbox}[% - 2019/01/04 - v1.2 + 2020/08/19 + v1.3 Adjusting TeX boxes (trim, clip, ...)] \RequirePackage{xkeyval} \RequirePackage{adjcalc} @@ -38,6 +38,12 @@ \DeclareOptionX{defaultunit}{\AtEndOfPackage{\adjcalcset{defaultunit={#1}}}} \DeclareOptionX{pgf}{\PassOptionsToPackage{pgf}{trimclip}} \DeclareOptionX{PGF}{\PassOptionsToPackage{pgf}{trimclip}\AtEndOfPackage{\RequirePackage{pgf}\adjcalcset{pgfmath}}} +\DeclareOptionX{draft}{\PassOptionsToPackage{draft}{graphicx}} +\DeclareOptionX{final}{\PassOptionsToPackage{final}{graphicx}} +\DeclareOptionX{hiderotate}{\PassOptionsToPackage{hiderotate}{graphicx}} +\DeclareOptionX{hidescale}{\PassOptionsToPackage{hidescale}{graphicx}} +\DeclareOptionX{hiresbb}{\PassOptionsToPackage{hiresbb}{graphicx}} +\DeclareOptionX{demo}{\PassOptionsToPackage{demo}{graphicx}} \DeclareOptionX*{% \IfFileExists{tc-\CurrentOption.def}{% \PassOptionsToPackage\CurrentOption{trimclip}% @@ -623,7 +629,11 @@ \adjbox@copy@key{bblly} \adjbox@copy@key{bburx} \adjbox@copy@key{bbury} +\adjbox@copy@key{bb} +\adjbox@copy@key{command} \adjbox@copy@key{decodearray} +\adjbox@copy@key{draft} +\adjbox@copy@key{ext} \adjbox@copy@key{intent} \adjbox@copy@key{interpolate} \adjbox@copy@key{maskarray} @@ -631,12 +641,14 @@ \adjbox@copy@key{natwidth} \adjbox@copy@key{ocobjnum} \adjbox@copy@key{ocobjref} -\adjbox@copy@key{page} +\adjbox@copy@key{origin} \adjbox@copy@key{pagebox} -\adjbox@copy@key{print} +\adjbox@copy@key{page} \adjbox@copy@key{quiet} +\adjbox@copy@key{read} \adjbox@copy@key{resetcolor} \adjbox@copy@key{resolution} +\adjbox@copy@key{type} \adjbox@copy@key{xmpfile} \newcommand\rndcornersbox{% \collectboxcheckenv{rndcornersbox}% @@ -926,6 +938,15 @@ \define@key\adjbox@fam{noindent}[]{% \noindent } +\define@key\adjbox@fam{leavevmode}[]{% + \leavevmode +} +\define@key\adjbox@fam{process}[]{% + \sbox\collectedbox{\adjbox@esetsize\the\toks@}% + \collectbox@setdims + \def\adjustbox@content{\usebox\collectedbox}% + \toks@{{\adjustbox@content}} +} \define@key\adjbox@fam{raise}{% \@ifnextchar\bgroup{% \adjbox@raise @@ -1163,6 +1184,7 @@ \fi } \def\adjbox@@frame#1#2#3#4{% + \leavevmode \ifx\@nnil#2\@nnil\else \adjsetlength\fboxrule{#2}% \fi @@ -1525,6 +1547,9 @@ \define@key\adjbox@fam{llap}[]{% \adjbox@Gin@Add{\lapbox{-\width}}% } +\define@key\adjbox@fam{clap}[]{% + \adjbox@Gin@Add{\lapbox[0pt]{-0.5\width}}% +} \newcommand*\lapbox[2][\width-\@tempdimb]{% \collectboxcheckenv{lapbox}% \@collectbox{\@lapbox{#1}{#2}}% diff --git a/Master/texmf-dist/tex/latex/adjustbox/tc-dvips.def b/Master/texmf-dist/tex/latex/adjustbox/tc-dvips.def index 7f7f11e715b..cc66f1770e4 100644 --- a/Master/texmf-dist/tex/latex/adjustbox/tc-dvips.def +++ b/Master/texmf-dist/tex/latex/adjustbox/tc-dvips.def @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2018 by Martin Scharrer +%% Copyright (C) 2011-2020 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -14,7 +14,7 @@ %% %% This work consists of the files trimclip.dtx, adjustbox.ins %% and the derived files trimclip.sty, -%% tc-dvips.def, tc-pdftex.def, tc-pgf.def and tc-xetex.def. +%% tc-dvips.def, tc-pdftex.def, tc-luatex.def, tc-pgf.def and tc-xetex.def. %% Further author information are located in the .def files. %% \ProvidesFile{tc-dvips.def}[2019/01/04 v2.2 Clipping driver for dvips] diff --git a/Master/texmf-dist/tex/latex/adjustbox/tc-pdftex.def b/Master/texmf-dist/tex/latex/adjustbox/tc-pdftex.def index 637f631bfc2..6a9f99c442e 100644 --- a/Master/texmf-dist/tex/latex/adjustbox/tc-pdftex.def +++ b/Master/texmf-dist/tex/latex/adjustbox/tc-pdftex.def @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2018 by Martin Scharrer +%% Copyright (C) 2011-2020 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -14,7 +14,7 @@ %% %% This work consists of the files trimclip.dtx, adjustbox.ins %% and the derived files trimclip.sty, -%% tc-dvips.def, tc-pdftex.def, tc-pgf.def and tc-xetex.def. +%% tc-dvips.def, tc-pdftex.def, tc-luatex.def, tc-pgf.def and tc-xetex.def. %% Further author information are located in the .def files. %% \ProvidesFile{tc-pdftex.def}[2019/01/04 v2.2 Clipping driver for pdftex] diff --git a/Master/texmf-dist/tex/latex/adjustbox/tc-pgf.def b/Master/texmf-dist/tex/latex/adjustbox/tc-pgf.def index 3f852728baa..496cb1dd98b 100644 --- a/Master/texmf-dist/tex/latex/adjustbox/tc-pgf.def +++ b/Master/texmf-dist/tex/latex/adjustbox/tc-pgf.def @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2018 by Martin Scharrer +%% Copyright (C) 2011-2020 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -14,7 +14,7 @@ %% %% This work consists of the files trimclip.dtx, adjustbox.ins %% and the derived files trimclip.sty, -%% tc-dvips.def, tc-pdftex.def, tc-pgf.def and tc-xetex.def. +%% tc-dvips.def, tc-pdftex.def, tc-luatex.def, tc-pgf.def and tc-xetex.def. %% Further author information are located in the .def files. %% \ProvidesFile{tc-pgf.def}[2019/01/04 v2.2 trimclip fall-back clipping driver using PGF] diff --git a/Master/texmf-dist/tex/latex/adjustbox/tc-xetex.def b/Master/texmf-dist/tex/latex/adjustbox/tc-xetex.def index 0f35b4d0340..81a31936e55 100644 --- a/Master/texmf-dist/tex/latex/adjustbox/tc-xetex.def +++ b/Master/texmf-dist/tex/latex/adjustbox/tc-xetex.def @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2018 by Martin Scharrer +%% Copyright (C) 2011-2020 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -14,7 +14,7 @@ %% %% This work consists of the files trimclip.dtx, adjustbox.ins %% and the derived files trimclip.sty, -%% tc-dvips.def, tc-pdftex.def, tc-pgf.def and tc-xetex.def. +%% tc-dvips.def, tc-pdftex.def, tc-luatex.def, tc-pgf.def and tc-xetex.def. %% Further author information are located in the .def files. %% \ProvidesFile{tc-xetex.def}[2019/01/04 v2.2 Clipping driver for xetex] diff --git a/Master/texmf-dist/tex/latex/adjustbox/trimclip.sty b/Master/texmf-dist/tex/latex/adjustbox/trimclip.sty index 6592bcd3f20..9ecff74851f 100644 --- a/Master/texmf-dist/tex/latex/adjustbox/trimclip.sty +++ b/Master/texmf-dist/tex/latex/adjustbox/trimclip.sty @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2018 by Martin Scharrer +%% Copyright (C) 2011-2020 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -14,16 +14,17 @@ %% %% This work consists of the files trimclip.dtx, adjustbox.ins %% and the derived files trimclip.sty, -%% tc-dvips.def, tc-pdftex.def, tc-pgf.def and tc-xetex.def. +%% tc-dvips.def, tc-pdftex.def, tc-luatex.def, tc-pgf.def and tc-xetex.def. %% Further author information are located in the .def files. %% \ProvidesPackage{trimclip}[% - 2018/04/08 - v1.1 + 2020/08/19 + v1.2 Trim and clip general TeX material] \def\tc@driver{tc-\Gin@driver} \DeclareOption{pgf}{\def\tc@driver{tc-pgf.def}\AtEndOfPackage{\RequirePackage{pgf}}} \DeclareOption{pdftex}{\def\tc@driver{tc-pdftex.def}\PassOptionsToPackage{pdftex}{graphicx}} +\DeclareOption{luatex}{\def\tc@driver{tc-luatex.def}\PassOptionsToPackage{luatex}{graphicx}} \DeclareOption{xetex}{\def\tc@driver{tc-xetex.def}\PassOptionsToPackage{xetex}{graphicx}} \DeclareOption{dvips}{\def\tc@driver{tc-dvips.def}\PassOptionsToPackage{dvips}{graphicx}} \DeclareOption{dvipdfm}{\def\tc@driver{tc-xetex.def}\PassOptionsToPackage{xetex}{graphicx}} -- cgit v1.2.3