From e2dfc4cc8dc03d323073de46903005e3a9d12255 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 20 Aug 2020 03:01:54 +0000 Subject: CTAN sync 202008200301 --- macros/latex/contrib/adjustbox/README | 4 +- macros/latex/contrib/adjustbox/adjcalc.pdf | Bin 152773 -> 153058 bytes macros/latex/contrib/adjustbox/adjustbox.dtx | 89 ++++++++++++++++++++++++--- macros/latex/contrib/adjustbox/adjustbox.pdf | Bin 380505 -> 381806 bytes macros/latex/contrib/adjustbox/trimclip.dtx | 32 +++++++--- macros/latex/contrib/adjustbox/trimclip.pdf | Bin 213356 -> 213705 bytes 6 files changed, 105 insertions(+), 20 deletions(-) (limited to 'macros/latex/contrib/adjustbox') diff --git a/macros/latex/contrib/adjustbox/README b/macros/latex/contrib/adjustbox/README index fb560d38ef..684613ca7b 100644 --- a/macros/latex/contrib/adjustbox/README +++ b/macros/latex/contrib/adjustbox/README @@ -1,7 +1,7 @@ LaTeX bundle adjustbox ======================== -Copyright (c) 2011-2019 by Martin Scharrer -WWW: (incl. bug tracker) +Copyright (c) 2011-2020 by Martin Scharrer +WWW: (incl. bug tracker) This bundle contains the the adjustbox package and its auxiliary packages trimclip and adjcalc. The initial purpose of adjustbox was to supplement the standard graphics/x package, diff --git a/macros/latex/contrib/adjustbox/adjcalc.pdf b/macros/latex/contrib/adjustbox/adjcalc.pdf index f8bb78c491..7e7103f4d3 100644 Binary files a/macros/latex/contrib/adjustbox/adjcalc.pdf and b/macros/latex/contrib/adjustbox/adjcalc.pdf differ diff --git a/macros/latex/contrib/adjustbox/adjustbox.dtx b/macros/latex/contrib/adjustbox/adjustbox.dtx index ebcfeb7176..e6cdb33f37 100644 --- a/macros/latex/contrib/adjustbox/adjustbox.dtx +++ b/macros/latex/contrib/adjustbox/adjustbox.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment %<=*COPYRIGHT> -%% 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 @@ -26,10 +26,10 @@ %<*driver> \ProvidesFile{adjustbox.dtx}[% %<=*DATE> - 2019/01/04 + 2020/08/19 %<=/DATE> %<=*VERSION> - v1.2 + v1.3 %<=/VERSION> DTX file for the adjustbox package] \documentclass[a4paper]{ydoc}[2011/08/11] @@ -148,7 +148,7 @@ % ^^A ))) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ^^A Title page ((( -% \CheckSum{3447} +% \CheckSum{3488} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -255,6 +255,15 @@ % * Added \provideadjustboxenv and \declareadjustboxenv. % * Added \provideadjustboxcmd and \declareadjustboxcmd. % } +% \changes{v1.3}{2020/08/19}{%^^A +% * Added support for (hopefully) all 'graphicx' keys. +% * Added missing \leavevmode for framing keys. +% * Added key "leavevmode" on request of Frank Mittelbach. +% * Added 'process' key. +% * Added 'clap' key on user request. +% * Removed old graphicx key 'print'. +% * trimclip: Added explicit luatex driver which uses the pdftex driver to avoid the fallback to PGF driver. +% } % % \GetFileInfo{adjustbox.dtx} % @@ -262,7 +271,7 @@ % % \author{Martin Scharrer} % \email{martin@scharrer-online.de} -% \repository{https://bitbucket.org/martin_scharrer/adjustbox} +% \repository{https://helixteamhub.cloud/scharrer/projects/adjustbox/} % \ydocpdfsettings % \maketitle % @@ -1287,6 +1296,11 @@ % It does not expect a value and will ignore it if provided. % % +% \DescribeKey{leavevmode} +% This key will issue an \Macro\leavevmode for the \Macro\adjustbox to enter paragraph mode, i.e.\ it starts a paragraph. +% This is usually done automatically by all Keys, but is provided as a failsafe in case of any bugs. +% +% % \DescribeMacro\centerbox[]{} % \vspace{-1.5\baselineskip}\nopagebreak % \DescribeEnv[]{centerbox}[] @@ -1442,8 +1456,10 @@ % % \DescribeKey{rlap} % \DescribeKey{llap} -% This makes the content to be officially 0pt wide and lap over to the right or left, respectively, like the \LaTeX\ macros \Macro\rlap and \Macro\llap do. -% These are shortcuts for \Key{lap}'='\AlsoMacro\width and \Key{lap}'=-'\AlsoMacro\width, respectively. The values for these keys are ignored and should not be used. +% \DescribeKey{clap} +% This makes the content to be officially 0pt wide and lap over to the right or left, respectively, like the \LaTeX\ macros \Macro\rlap, \Macro\llap and \Macro\clap do. +% These are shortcuts for \Key{lap}'='\AlsoMacro\width, \Key{lap}'=-'\AlsoMacro\width and \Key{lap}'={0pt}{-0.5'\AlsoMacro\width'}', respectively. +% The values for these keys are ignored and should not be used. % % \begin{examples} % \begin{examplecode} @@ -1452,6 +1468,9 @@ % \begin{examplecode} % \adjustbox{llap}{Some content} % \end{examplecode} +% \begin{examplecode} +% \adjustbox{clap}{Some content} +% \end{examplecode} % \end{examples} % % @@ -1528,7 +1547,6 @@ % \DescribeKey{ocobjref} % \DescribeKey{page}'=' % \DescribeKey{pagebox} -% \DescribeKey{print} % \DescribeKey{quiet} % \DescribeKey{resetcolor} % \DescribeKey{resolution} @@ -2072,6 +2090,13 @@ % % % ^^A )))2 +% \clearpage\subsection{Process content} ^^A (((2 +% +% \DescribeKey{process} +% This key processes the keys and content encountered so far (i.e.\ all keys to its left) and sets the dimension macros to the sizes of the result. +% It is only required for certain key combinations, mostly the ones taken from \pkg{graphicx}, which are otherwise processed together. +% +% ^^A )))2 % \clearpage\subsection{Experimental Keys} ^^A (((2 % The following features are experimental and may not work correctly yet. % At the moment the \pkg{storebox} package must be loaded manually for this keys. @@ -2207,6 +2232,16 @@ \DeclareOptionX{PGF}{\PassOptionsToPackage{pgf}{trimclip}\AtEndOfPackage{\RequirePackage{pgf}\adjcalcset{pgfmath}}} % \end{macrocode} % +% Pass |pkg{graphicx}| options down. +% \begin{macrocode} +\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}} +% \end{macrocode} +% % Pass all driver options to \pkg{trimclip} and all unknown options to \pkg{graphicx}. % \begin{macrocode} \DeclareOptionX*{% @@ -3331,7 +3366,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} @@ -3339,12 +3378,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} % \end{macrocode} % @@ -3931,6 +3972,25 @@ % \end{macrocode} % \end{key}% % +% \begin{key}{adjbox}{leavevmode} +% \begin{macrocode} +\define@key\adjbox@fam{leavevmode}[]{% + \leavevmode +} +% \end{macrocode} +% \end{key}% +% +% \begin{macro}{\adjbox@fam}{process} +% \begin{macrocode} +\define@key\adjbox@fam{process}[]{% + \sbox\collectedbox{\adjbox@esetsize\the\toks@}% + \collectbox@setdims + \def\adjustbox@content{\usebox\collectedbox}% + \toks@{{\adjustbox@content}} +} +% \end{macrocode} +% \end{macro} +% % ^^A ))) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \subsection{Vertical alignment keys} ^^A ((( @@ -4508,6 +4568,7 @@ % \begin{macro}{\adjbox@@frame}[4]{content}{rule width}{separation}{margin} % \begin{macrocode} \def\adjbox@@frame#1#2#3#4{% + \leavevmode \ifx\@nnil#2\@nnil\else \adjsetlength\fboxrule{#2}% \fi @@ -5251,6 +5312,14 @@ % \end{key} % % +% \begin{key}{adjbox}{clap} +% \begin{macrocode} +\define@key\adjbox@fam{clap}[]{% + \adjbox@Gin@Add{\lapbox[0pt]{-0.5\width}}% +} +% \end{macrocode} +% \end{key}% +% % \begin{macro}{\lapbox} % \begin{macrocode} \newcommand*\lapbox[2][\width-\@tempdimb]{% diff --git a/macros/latex/contrib/adjustbox/adjustbox.pdf b/macros/latex/contrib/adjustbox/adjustbox.pdf index f9ccff3764..676c6a9aad 100644 Binary files a/macros/latex/contrib/adjustbox/adjustbox.pdf and b/macros/latex/contrib/adjustbox/adjustbox.pdf differ diff --git a/macros/latex/contrib/adjustbox/trimclip.dtx b/macros/latex/contrib/adjustbox/trimclip.dtx index 0240ff55e2..ab37107325 100644 --- a/macros/latex/contrib/adjustbox/trimclip.dtx +++ b/macros/latex/contrib/adjustbox/trimclip.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment %<=*COPYRIGHT> -%% 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 @@ -16,7 +16,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. %% %<=/COPYRIGHT> @@ -26,10 +26,10 @@ %<*driver> \ProvidesFile{trimclip.dtx}[% %<=*DATE> - 2018/04/08 + 2020/08/19 %<=/DATE> %<=*VERSION> - v1.1 + v1.2 %<=/VERSION> DTX file for the trimclip package] \documentclass[a4paper]{ydoc}[2011/11/16] @@ -159,7 +159,7 @@ % % \fi % -% \CheckSum{1118} +% \CheckSum{1124} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -180,6 +180,7 @@ % % \changes{v1.0}{2012/05/16}{First version after extraction from \pkg{adjustbox} package.} % \changes{v1.1}{2018/04/08}{Driver support for round corner clipping.} +% \changes{v1.2}{2020/08/19}{Added explicit LuaTeX driver.} % % \GetFileInfo{trimclip.dtx} % @@ -187,7 +188,7 @@ % \bundle{adjustbox} % \author{Martin Scharrer} % \email{martin@scharrer-online.de} -% ^^A\repository{https://bitbucket.org/martin_scharrer/adjustbox} +% ^^A\repository{https://helixteamhub.cloud/scharrer/projects/adjustbox/} % \ydocpdfsettings % \maketitle % @@ -261,8 +262,9 @@ % % \begin{description} % \def\Option#1{\item[{{\normalfont\opt{#1}}}]}% -% \Option{pdftex} Use the |pdftex| driver. This driver is automatically selected for |pdflatex| and |lualatex| -% and should not be used for any other \LaTeX\ compilers. +% \Option{pdftex} Use the |pdftex| driver. This driver is automatically selected for |pdflatex|. +% \Option{luatex} Use the |luatex| driver, which uses the |pdftex| driver internally. +% This driver is automatically selected for |lualatex|. % \Option{dvips} Use the |dvips| driver. This driver is automatically selected for |latex|. % \Option{xetex} Use the |xetex| driver. This driver is automatically selected for |xelatex|. % \Option{dvipdfm} Use the |xetex| driver which is also compatible with |dvipdfm|. @@ -536,6 +538,7 @@ \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}} @@ -1194,6 +1197,19 @@ % % \fi % +% \subsubsection{luatex driver} +% \iffalse +%<*tc-luatex.def> +% \fi +% \begin{macrocode} +% +\ProvidesFile{tc-luatex.def}[2020/08/16 v1.0 Clipping driver for luatex] +\input{tc-pdftex.def} +% \end{macrocode} +% \iffalse +% +% \fi +% % \subsubsection{dvips driver} % \iffalse %<*tc-dvips.def> diff --git a/macros/latex/contrib/adjustbox/trimclip.pdf b/macros/latex/contrib/adjustbox/trimclip.pdf index 2ad59ec6b4..01a7dd723c 100644 Binary files a/macros/latex/contrib/adjustbox/trimclip.pdf and b/macros/latex/contrib/adjustbox/trimclip.pdf differ -- cgit v1.2.3