summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-20 21:10:23 +0000
committerKarl Berry <karl@freefriends.org>2020-08-20 21:10:23 +0000
commit7c46a832ab35fe8fc260808e288b9bb4cd917333 (patch)
tree30a2c08780882e78da968c1acb11a52481e26ffc
parentda01f156c51c5a5b7b85040fbfccd492c5036e8a (diff)
adjustbox (20aug20)
git-svn-id: svn://tug.org/texlive/trunk@56140 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/README4
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/adjcalc.pdfbin152773 -> 153058 bytes
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/adjustbox.pdfbin380505 -> 381806 bytes
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/box.tex38
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/compare.tex138
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/margin.tex33
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/margin2.tex35
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/trim.tex57
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/trim2.tex59
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/trim3.tex59
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/trimclip.pdfbin213356 -> 213705 bytes
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/viewport.tex61
-rw-r--r--Master/texmf-dist/doc/latex/adjustbox/viewport2.tex60
-rw-r--r--Master/texmf-dist/source/latex/adjustbox/adjustbox.dtx89
-rw-r--r--Master/texmf-dist/source/latex/adjustbox/trimclip.dtx32
-rw-r--r--Master/texmf-dist/tex/latex/adjustbox/adjustbox.sty35
-rw-r--r--Master/texmf-dist/tex/latex/adjustbox/tc-dvips.def4
-rw-r--r--Master/texmf-dist/tex/latex/adjustbox/tc-pdftex.def4
-rw-r--r--Master/texmf-dist/tex/latex/adjustbox/tc-pgf.def4
-rw-r--r--Master/texmf-dist/tex/latex/adjustbox/tc-xetex.def4
-rw-r--r--Master/texmf-dist/tex/latex/adjustbox/trimclip.sty9
21 files changed, 688 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/latex/adjustbox/README b/Master/texmf-dist/doc/latex/adjustbox/README
index fb560d38ef5..684613ca7b2 100644
--- a/Master/texmf-dist/doc/latex/adjustbox/README
+++ b/Master/texmf-dist/doc/latex/adjustbox/README
@@ -1,7 +1,7 @@
LaTeX bundle adjustbox
========================
-Copyright (c) 2011-2019 by Martin Scharrer <martin@scharrer-online.de>
-WWW: <https://bitbucket.org/martin_scharrer/adjustbox> (incl. bug tracker)
+Copyright (c) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
+WWW: <https://helixteamhub.cloud/scharrer/projects/adjustbox/> (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/Master/texmf-dist/doc/latex/adjustbox/adjcalc.pdf b/Master/texmf-dist/doc/latex/adjustbox/adjcalc.pdf
index f8bb78c4915..7e7103f4d3d 100644
--- a/Master/texmf-dist/doc/latex/adjustbox/adjcalc.pdf
+++ b/Master/texmf-dist/doc/latex/adjustbox/adjcalc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/adjustbox/adjustbox.pdf b/Master/texmf-dist/doc/latex/adjustbox/adjustbox.pdf
index f9ccff37643..676c6a9aad9 100644
--- a/Master/texmf-dist/doc/latex/adjustbox/adjustbox.pdf
+++ b/Master/texmf-dist/doc/latex/adjustbox/adjustbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/adjustbox/box.tex b/Master/texmf-dist/doc/latex/adjustbox/box.tex
new file mode 100644
index 00000000000..2f7d01ce1c7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/box.tex
@@ -0,0 +1,38 @@
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \newcommand\Cs[1]{\texttt{\scriptsize\textbackslash #1}}
+ \sbox\mybox{\pgfinterruptpicture\sffamily\color{black!25}\scalebox{10}{Xy}\endpgfinterruptpicture}
+ \def\HEIGHT{\ht\mybox}
+ \def\WIDTH{\wd\mybox}
+ \def\DEPTH{\dp\mybox}
+ \draw [gray,thin]
+ (0,0) -- +(-3.5ex,0)
+ (0,\HEIGHT) -- +(-3.5ex,0)
+ (0,-\DEPTH) -- +(-3.5ex,0)
+ (\WIDTH,\HEIGHT) -- +(3.5ex,0)
+ (\WIDTH,-\DEPTH) -- +(3.5ex,0)
+ (0,-\DEPTH) -- +(0,-3.5ex)
+ (\WIDTH,-\DEPTH) -- +(0,-3.5ex)
+ ;
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0) node [above,midway] {baseline};
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \draw [<-,shorten <=2pt] (0,0) -- (2ex,-2ex) -- +(.5ex,0) node [right=-0.5ex] {origin};
+ \tikzset{inner sep=5pt}
+ \draw [->] (-2.5ex,0) -- +(0,-\DEPTH) node [pos=1.1,left,align=left]
+ {depth\\\Cs{depth}\\\Cs{dp}\Cs{br}};
+ \draw [->] (-2.5ex,0) -- +(0, \HEIGHT) node [pos=.4,left,align=left]
+ {height\\\Cs{height}\\\Cs{ht}\Cs{br}};
+ \draw [<->] (\WIDTH,-\DEPTH) ++(2.5ex,0) -- +(0,\DEPTH+\HEIGHT) node [midway,right,align=left]
+ {totalheight\\\Cs{totalheight}};
+ \draw [<->] (0,-\DEPTH) ++(0,-2.5ex) -- +(\WIDTH,0) node [midway,below,align=left]
+ {width\\\Cs{width}\\\Cs{wd}\Cs{br}};
+ \fill (-2.5ex,0) circle (.5pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/compare.tex b/Master/texmf-dist/doc/latex/adjustbox/compare.tex
new file mode 100644
index 00000000000..a47dbf12329
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/compare.tex
@@ -0,0 +1,138 @@
+\documentclass{article}
+\usepackage[margin=1cm,paperwidth=20cm,paperheight=100cm]{geometry}
+\usepackage[]{xcolor}
+\usepackage[export]{adjustbox}
+\fboxsep=0pt
+\parskip=1cm
+
+\usepackage[tightpage]{preview}
+
+\usepackage{standalone}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{tikz}
+\newdimen\unit
+\tikzset{unit/.code={\unit=\dimexpr#1\relax}}
+\tikzset{xy/.style={x={#1},y={#1},unit={#1},font={\sffamily\fontsize{.2\unit}{.24\unit}\selectfont},line width=.01\unit}}
+
+\def\showdiff#1{%
+ {%
+ \diff=\dimexpr#10-#11\relax
+ \pgfmathsetlength\absdiff{abs(\diff)}%
+ \ifdim\diff=0pt%
+ \textcolor{green}{PASSED}%
+ \else
+ \ifdim\absdiff<\Epsilon
+ \pgfmathtruncatemacro\FCOLOR{100*(\Epsilon-abs(\absdiff))/\Epsilon}%
+ \textcolor{green!\FCOLOR!yellow}{OK: \the\diff}%
+ \else
+ \textcolor{red}{FAILED: \the\diff}%
+ \fi
+ \fi
+ \quad
+ \ifdim#11=0pt
+ \diff=#10
+ \else
+ \pgfmathsetlength\diff{(#10/#11) - 1pt}
+ \fi
+ \ifdim\diff<0pt
+ \absdiff=-\diff
+ \else
+ \absdiff=\diff
+ \fi
+ \ifdim\diff=0pt%
+ \textcolor{green}{PASSED}%
+ \else
+ \ifdim\absdiff<\dEpsilon
+ \pgfmathtruncatemacro\FCOLOR{100*(\dEpsilon-abs(\absdiff))/\dEpsilon}%
+ \textcolor{green!\FCOLOR!yellow}{OK: \the\diff}%
+ \else
+ \textcolor{red}{FAILED: \the\diff}%
+ \fi
+ \fi
+ }%
+}
+
+\newlength\diff
+\newlength\absdiff
+\newlength\Epsilon
+\newlength\dEpsilon
+\Epsilon=0.05pt
+\dEpsilon=0.001pt
+\def\test#1#2{%
+ \begin{preview}%
+ \sbox0{\includegraphics[#1]{#2}}%
+ \sbox1{\adjustbox{#1}{\input{#2}\unskip}}%
+ \begin{tabular}{ll@{}l}
+ \usebox0 & \usebox1 & .\\
+ \the\ht0 & \the\ht1 & \showdiff\ht \\
+ \the\dp0 & \the\dp1 & \showdiff\dp \\
+ \the\wd0 & \the\wd1 & \showdiff\wd \\
+ \end{tabular}%
+ \end{preview}%
+}
+
+\begin{document}
+\ttfamily
+
+\test{}{gridbp}
+
+\test{}{gridpt}
+
+\test{clip,trim=10bp 20bp 0 0,width=177bp,frame=1pt 1pt}{gridbp}
+
+\test{clip,trim=10pt 20pt 0 0,width=177pt,frame=1pt 1pt}{gridpt}
+
+\test{angle=45,clip,trim=10bp 0 0 0,width=177bp,totalheight=5cm,frame}{gridbp}
+
+\test{clip,trim=10pt 0 0 0,angle=90,trim=5pt 0 0 0}{gridbp}
+
+\test{angle=180,totalheight=5cm}{gridbp}
+
+\test{width=3cm,angle=0,totalheight=5cm}{gridbp}
+
+\test{width=3cm,totalheight=5cm,angle=180}{gridbp}
+
+\test{width=3cm,totalheight=5cm}{gridbp}
+
+\test{margin=.5cm .5cm .5cm .5cm,frame}{gridbp}
+\end{document}
+
+\test{width=2cm,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame,angle=5,
+margin=.1cm .1cm .1cm .1cm,frame
+}{gridbp}
+
+\test{width=2cm,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+margin=1pt 1pt 1pt 1pt,frame,angle=1,
+}{gridbp}
+
+\end{document}
+
+\adjustbox{width=2cm,trim={.5\WIDTH} 0 0 0,frame}{Ag}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/margin.tex b/Master/texmf-dist/doc/latex/adjustbox/margin.tex
new file mode 100644
index 00000000000..0e9893400f7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/margin.tex
@@ -0,0 +1,33 @@
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \def\text{\scalebox{10}{Xy}}
+ \sbox\mybox{\pgfinterruptpicture\sffamily\color{black!25}\scalebox{10}{Xy}\endpgfinterruptpicture}
+ \def\HEIGHT{\ht\mybox}
+ \def\WIDTH{\wd\mybox}
+ \def\DEPTH{\dp\mybox}
+ \def\LLX{.15\WIDTH}
+ \def\LLY{.5\DEPTH}
+ \def\URX{.15\WIDTH}
+ \def\URY{.25\HEIGHT}
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \begin{scope}[blue,every node/.append style={inner sep=2pt}]
+ \begin{scope}
+ \draw ([shift={(-\LLX,-\LLY)}]0,-\DEPTH) rectangle ([shift={(\URX,\URY)}]\WIDTH,\HEIGHT);
+ \end{scope}
+ \draw [->] (.5\WIDTH,-\DEPTH) -- ++(0,-\LLY) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,.5*\HEIGHT-.5*\DEPTH) -- ++(-\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw (-\LLX,0) -- ([shift={(+\URX,0)}]\WIDTH,0);
+ \draw [->] (.5\WIDTH,\HEIGHT) -- ++(0,\URY) node [right,midway] {\scriptsize ury};
+ \draw [->] (\WIDTH,.5*\HEIGHT-.5*\DEPTH) -- ++(\URX,0) node [above,midway] {\scriptsize urx};
+ \path [fill=white,draw] (-\LLX,0) circle (1pt);
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/margin2.tex b/Master/texmf-dist/doc/latex/adjustbox/margin2.tex
new file mode 100644
index 00000000000..5b26031da3b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/margin2.tex
@@ -0,0 +1,35 @@
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \def\text{\scalebox{10}{Xy}}
+ \sbox\mybox{\pgfinterruptpicture\sffamily\color{black!25}\scalebox{10}{Xy}\endpgfinterruptpicture}
+ \def\HEIGHT{\ht\mybox}
+ \def\WIDTH{\wd\mybox}
+ \def\DEPTH{\dp\mybox}
+ \def\LLX{.15\WIDTH}
+ \def\LLY{.5\DEPTH}
+ \def\URX{.15\WIDTH}
+ \def\URY{.25\HEIGHT}
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \begin{scope}[blue,every node/.append style={inner sep=2pt}]
+ \begin{scope}
+ \draw ([shift={(-\LLX,-\LLY)}]0,-\DEPTH) rectangle ([shift={(\URX,\URY)}]\WIDTH,\HEIGHT);
+ \end{scope}
+ \draw [->] (.5\WIDTH,-\DEPTH) -- ++(0,-\LLY) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,.5*\HEIGHT-.5*\DEPTH) -- ++(-\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw [->] (.5\WIDTH,\HEIGHT) -- ++(0,\URY) node [right,midway] {\scriptsize ury};
+ \draw [->] (\WIDTH,.5*\HEIGHT-.5*\DEPTH) -- ++(\URX,0) node [above,midway] {\scriptsize urx};
+ \draw [->] (.5\WIDTH,-\DEPTH) -- ++(0,-\LLY) node [right,midway] {\scriptsize lly};
+ \draw (-\LLX,-\LLY) -- ([shift={(+\URX,0)}]\WIDTH,-\LLY);
+ \path [fill=white,draw] (-\LLX,-\LLY) circle (1pt);
+ \draw [->] (.5\WIDTH,0pt) -- ++(0,-\LLY) node [right,midway] {\scriptsize lly};
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/trim.tex b/Master/texmf-dist/doc/latex/adjustbox/trim.tex
new file mode 100644
index 00000000000..c11faeef430
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/trim.tex
@@ -0,0 +1,57 @@
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \def\text{\scalebox{10}{Xy}}
+ \sbox\mybox{\pgfinterruptpicture\sffamily\color{black!25}\scalebox{10}{Xy}\endpgfinterruptpicture}
+ \def\HEIGHT{\ht\mybox}
+ \def\WIDTH{\wd\mybox}
+ \def\DEPTH{\dp\mybox}
+ \def\LLX{.15\WIDTH}
+ \def\LLY{.5\DEPTH}
+ \def\URX{.15\WIDTH}
+ \def\URY{.25\HEIGHT}
+ \draw [gray,thin]
+ (0,0) -- +(-3.5ex,0)
+ (0,\HEIGHT) -- +(-3.5ex,0)
+ (0,-\DEPTH) -- +(-3.5ex,0)
+ (\WIDTH,\HEIGHT) -- +(3.5ex,0)
+ (\WIDTH,-\DEPTH) -- +(3.5ex,0)
+ (0,-\DEPTH) -- +(0,-3.5ex)
+ (\WIDTH,-\DEPTH) -- +(0,-3.5ex)
+ ;
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \draw [->] (-2.5ex,0) -- +(0,-\DEPTH) node [midway,left] {depth};
+ \draw [->] (-2.5ex,0) -- +(0, \HEIGHT) node [midway,left] {height};
+ \draw [<->] (\WIDTH,-\DEPTH) ++(2.5ex,0) -- +(0,\DEPTH+\HEIGHT) node [midway,right] {totalheight};
+ \draw [<->] (0,-\DEPTH) ++(0,-2.5ex) -- +(\WIDTH,0) node [midway,below] {width};
+ \fill (-2.5ex,0) circle (.5pt);
+ \begin{scope}[blue,every node/.append style={inner sep=2pt}]
+ \begin{scope}
+ \clip ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \node [inner sep=0pt,anchor=base west,color=blue!50!white] {\text};
+ \end{scope}
+ \draw ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \draw [->] (\LLX,-\DEPTH) -- ++(0,\LLY) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,-\DEPTH+\LLY) -- ++(\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw (\LLX,0) -- ([shift={(-\URX,0)}]\WIDTH,0);
+ \draw [->]
+ ([shift={(-\URX,0)}]\WIDTH,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [left,midway] {\scriptsize ury}
+ ;
+ \draw [->]
+ ([shift={(0,-\URY)}]\WIDTH,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [below,midway] {\scriptsize urx}
+ ;
+ \path [fill=white,draw] (\LLX,0) circle (1pt);
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/trim2.tex b/Master/texmf-dist/doc/latex/adjustbox/trim2.tex
new file mode 100644
index 00000000000..76b06daf417
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/trim2.tex
@@ -0,0 +1,59 @@
+
+\def\text{\sffamily\scalebox{10}{Xy}}
+\sbox\mybox{\sffamily\color{black!25}\scalebox{10}{Xy}}
+\def\HEIGHT{\ht\mybox}
+\def\WIDTH{\wd\mybox}
+\def\DEPTH{\dp\mybox}
+\def\LLX{.15\WIDTH}
+\def\LLY{\DEPTH+.15\HEIGHT}
+\def\URX{.15\WIDTH}
+\def\URY{.25\HEIGHT}
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \draw [gray,thin]
+ (0,0) -- +(-3.5ex,0)
+ (0,\HEIGHT) -- +(-3.5ex,0)
+ (0,-\DEPTH) -- +(-3.5ex,0)
+ (\WIDTH,\HEIGHT) -- +(3.5ex,0)
+ (\WIDTH,-\DEPTH) -- +(3.5ex,0)
+ (0,-\DEPTH) -- +(0,-3.5ex)
+ (\WIDTH,-\DEPTH) -- +(0,-3.5ex)
+ ;
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \draw [->] (-2.5ex,0) -- +(0,-\DEPTH) node [midway,left] {depth};
+ \draw [->] (-2.5ex,0) -- +(0, \HEIGHT) node [midway,left] {height};
+ \draw [<->] (\WIDTH,-\DEPTH) ++(2.5ex,0) -- +(0,\DEPTH+\HEIGHT) node [midway,right] {totalheight};
+ \draw [<->] (0,-\DEPTH) ++(0,-2.5ex) -- +(\WIDTH,0) node [midway,below] {width};
+ \fill (-2.5ex,0) circle (.5pt);
+ \begin{scope}[blue] %,every node/.append style={inner sep=2pt}]
+ \begin{scope}
+ \clip ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \node [inner sep=0pt,anchor=base west,color=blue!50!white] {\text};
+ \end{scope}
+ \draw ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \draw [->] (\LLX,-\DEPTH) -- ++(0,\LLY) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,-\DEPTH+\LLY) -- ++(\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw (\LLX,-\DEPTH+\LLY) -- ([shift={(-\URX,0)}]\WIDTH,-\DEPTH+\LLY);
+ \draw [->] (\LLX+.2\WIDTH,-\DEPTH+\LLY) -- (\LLX+.2\WIDTH,0) node [right,midway] {\scriptsize moves down};
+ \path [fill=white,draw] (\LLX,-\DEPTH+\LLY) circle (1pt);
+ \draw [->]
+ ([shift={(-\URX,0)}]\WIDTH,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [left,midway] {\scriptsize ury}
+ ;
+ \draw [->]
+ ([shift={(0,-\URY)}]\WIDTH,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [below,midway] {\scriptsize urx}
+ ;
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/trim3.tex b/Master/texmf-dist/doc/latex/adjustbox/trim3.tex
new file mode 100644
index 00000000000..b8e310c5b23
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/trim3.tex
@@ -0,0 +1,59 @@
+
+\def\text{\sffamily\scalebox{10}{Xy}}
+\sbox\mybox{\sffamily\color{black!25}\scalebox{10}{Xy}}
+\def\HEIGHT{\ht\mybox}
+\def\WIDTH{\wd\mybox}
+\def\DEPTH{\dp\mybox}
+\def\LLX{.15\WIDTH}
+\def\LLY{.4\DEPTH}
+\def\URX{.15\WIDTH}
+\def\URY{(\HEIGHT+.25\DEPTH)}
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \draw [gray,thin]
+ (0,0) -- +(-3.5ex,0)
+ (0,\HEIGHT) -- +(-3.5ex,0)
+ (0,-\DEPTH) -- +(-3.5ex,0)
+ (\WIDTH,\HEIGHT) -- +(3.5ex,0)
+ (\WIDTH,-\DEPTH) -- +(3.5ex,0)
+ (0,-\DEPTH) -- +(0,-3.5ex)
+ (\WIDTH,-\DEPTH) -- +(0,-3.5ex)
+ ;
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \draw [->] (-2.5ex,0) -- +(0,-\DEPTH) node [midway,left] {depth};
+ \draw [->] (-2.5ex,0) -- +(0, \HEIGHT) node [midway,left] {height};
+ \draw [<->] (\WIDTH,-\DEPTH) ++(2.5ex,0) -- +(0,\DEPTH+\HEIGHT) node [midway,right] {totalheight};
+ \draw [<->] (0,-\DEPTH) ++(0,-2.5ex) -- +(\WIDTH,0) node [midway,below] {width};
+ \fill (-2.5ex,0) circle (.5pt);
+ \begin{scope}[blue] %,every node/.append style={inner sep=2pt}]
+ \begin{scope}
+ \clip ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \node [inner sep=0pt,anchor=base west,color=blue!50!white] {\text};
+ \end{scope}
+ \draw ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \draw [->] (\LLX,-\DEPTH) -- ++(0,\LLY) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,-\DEPTH+\LLY) -- ++(\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw (\LLX,-\DEPTH+\LLY) -- ([shift={(-\URX,0)}]\WIDTH,-\DEPTH+\LLY);
+ \draw [->] (\LLX+.2\WIDTH,{\HEIGHT-\URY}) -- (\LLX+.2\WIDTH,0) node [pos=0.4,below right] {\scriptsize moves up};
+ \path [fill=white,draw] (\LLX,{\HEIGHT-\URY}) circle (1pt);
+ \draw [->]
+ ([shift={(-\URX,0)}]\WIDTH,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [left,midway] {\scriptsize ury}
+ ;
+ \draw [->]
+ ([shift={(0,-\URY)}]\WIDTH,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [below,midway] {\scriptsize urx}
+ ;
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/trimclip.pdf b/Master/texmf-dist/doc/latex/adjustbox/trimclip.pdf
index 2ad59ec6b4e..01a7dd723c5 100644
--- a/Master/texmf-dist/doc/latex/adjustbox/trimclip.pdf
+++ b/Master/texmf-dist/doc/latex/adjustbox/trimclip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/adjustbox/viewport.tex b/Master/texmf-dist/doc/latex/adjustbox/viewport.tex
new file mode 100644
index 00000000000..632534e2fe4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/viewport.tex
@@ -0,0 +1,61 @@
+
+\def\text{\sffamily\scalebox{10}{Xy}}
+\sbox\mybox{\sffamily\color{black!25}\scalebox{10}{Xy}}
+\def\HEIGHT{\ht\mybox}
+\def\WIDTH{\wd\mybox}
+\def\DEPTH{\dp\mybox}
+\def\LLX{.15\WIDTH}
+\def\LLY{\DEPTH+.15\HEIGHT}
+\def\URX{.15\WIDTH}
+\def\URY{.25\HEIGHT}
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \draw [gray,thin]
+ (0,0) -- +(-3.5ex,0)
+ (0,\HEIGHT) -- +(-3.5ex,0)
+ (0,-\DEPTH) -- +(-3.5ex,0)
+ (\WIDTH,\HEIGHT) -- +(3.5ex,0)
+ (\WIDTH,-\DEPTH) -- +(3.5ex,0)
+ (0,-\DEPTH) -- +(0,-3.5ex)
+ (\WIDTH,-\DEPTH) -- +(0,-3.5ex)
+ ;
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \draw [->] (-2.5ex,0) -- +(0,-\DEPTH) node [midway,left] {depth};
+ \draw [->] (-2.5ex,0) -- +(0, \HEIGHT) node [midway,left] {height};
+ \draw [<->] (\WIDTH,-\DEPTH) ++(2.5ex,0) -- +(0,\DEPTH+\HEIGHT) node [midway,right] {totalheight};
+ \draw [<->] (0,-\DEPTH) ++(0,-2.5ex) -- +(\WIDTH,0) node [midway,below] {width};
+ \fill (-2.5ex,0) circle (.5pt);
+ \begin{scope}[blue]
+ \clip ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \node [inner sep=0pt,anchor=base west,color=blue!50!white] {\text};
+ \end{scope}
+ \begin{scope}[blue]
+ \draw ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \draw (\LLX,-\DEPTH+\LLY) -- ([shift={(-\URX,0)}]\WIDTH,-\DEPTH+\LLY);
+ \draw [->] (\LLX+.2\WIDTH,-\DEPTH+\LLY) -- (\LLX+.2\WIDTH,0) node [right,midway] {\scriptsize moves down};
+ \path [fill=white,draw] (\LLX,-\DEPTH+\LLY) circle (1pt);
+ \end{scope}
+ \begin{scope}[blue!50!black] %,every node/.append style={inner sep=2pt}]
+ \draw [->] (\LLX,0) -- (\LLX,\LLY-\DEPTH) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,-\DEPTH+\LLY) -- ++(\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw [->]
+ ([shift={(-\URX,0)}]\WIDTH,0) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [right,midway] {\scriptsize ury}
+ ;
+ \draw [->]
+ ([shift={(0,-\URY)}]0,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [above,midway] {\scriptsize urx}
+ ;
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/adjustbox/viewport2.tex b/Master/texmf-dist/doc/latex/adjustbox/viewport2.tex
new file mode 100644
index 00000000000..920011cf3f3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/adjustbox/viewport2.tex
@@ -0,0 +1,60 @@
+
+\def\text{\sffamily\scalebox{10}{Xy}}
+\sbox\mybox{\sffamily\color{black!25}\scalebox{10}{Xy}}
+\def\HEIGHT{\ht\mybox}
+\def\WIDTH{\wd\mybox}
+\def\DEPTH{\dp\mybox}
+\def\LLX{.15\WIDTH}
+\def\LLY{\DEPTH-.15\HEIGHT}
+\def\URX{.15\WIDTH}
+\def\URY{.25\HEIGHT}
+\begin{tikzpicture}[font=\sffamily,>=latex]
+ \draw [gray,thin]
+ (0,0) -- +(-3.5ex,0)
+ (0,\HEIGHT) -- +(-3.5ex,0)
+ (0,-\DEPTH) -- +(-3.5ex,0)
+ (\WIDTH,\HEIGHT) -- +(3.5ex,0)
+ (\WIDTH,-\DEPTH) -- +(3.5ex,0)
+ (0,-\DEPTH) -- +(0,-3.5ex)
+ (\WIDTH,-\DEPTH) -- +(0,-3.5ex)
+ ;
+ \node [inner sep=0pt,anchor=base west] {\usebox\mybox};
+ \draw (0,0) -- (\WIDTH,0);% node [above,midway] {baseline};
+ \draw [->] (-2.5ex,0) -- +(0,-\DEPTH) node [midway,left] {depth};
+ \draw [->] (-2.5ex,0) -- +(0, \HEIGHT) node [midway,left] {height};
+ \draw [<->] (\WIDTH,-\DEPTH) ++(2.5ex,0) -- +(0,\DEPTH+\HEIGHT) node [midway,right] {totalheight};
+ \draw [<->] (0,-\DEPTH) ++(0,-2.5ex) -- +(\WIDTH,0) node [midway,below] {width};
+ \fill (-2.5ex,0) circle (.5pt);
+ \begin{scope}[blue]
+ \clip ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \node [inner sep=0pt,anchor=base west,color=blue!50!white] {\text};
+ \end{scope}
+ \begin{scope}[blue]
+ \draw ([shift={(\LLX,\LLY)}]0,-\DEPTH) rectangle ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT);
+ \draw (\LLX,0) -- ([shift={(-\URX,0)}]\WIDTH,0);
+ \path [fill=white,draw] (\LLX,0) circle (1pt);
+ \end{scope}
+ \begin{scope}[blue!50!black] %,every node/.append style={inner sep=2pt}]
+ \draw [->] (\LLX,0) -- (\LLX,\LLY-\DEPTH) node [right,midway] {\scriptsize lly};
+ \draw [->] (0,-\DEPTH+\LLY) -- ++(\LLX,0) node [above,midway] {\scriptsize llx};
+ \draw [->]
+ ([shift={(-\URX,0)}]\WIDTH,0) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [right,midway] {\scriptsize ury}
+ ;
+ \draw [->]
+ ([shift={(0,-\URY)}]0,\HEIGHT) --
+ ([shift={(-\URX,-\URY)}]\WIDTH,\HEIGHT)
+ node [above,midway] {\scriptsize urx}
+ ;
+ \end{scope}
+ \draw [thick] (0,-\DEPTH) rectangle (\WIDTH,\HEIGHT);
+ \path [fill=white,draw=black] (0,0) circle (1pt);
+ \path let
+ \p1 = (current bounding box.south west),
+ \p2 = (current bounding box.north east),
+ \p3 = (0,-\DEPTH),
+ \p4 = (\WIDTH,\HEIGHT)
+ in
+ (\x3-\x2+\x4,\y3) rectangle (\x4+\x3-\x1,\y4);
+\end{tikzpicture}
diff --git a/Master/texmf-dist/source/latex/adjustbox/adjustbox.dtx b/Master/texmf-dist/source/latex/adjustbox/adjustbox.dtx
index ebcfeb71763..e6cdb33f377 100644
--- a/Master/texmf-dist/source/latex/adjustbox/adjustbox.dtx
+++ b/Master/texmf-dist/source/latex/adjustbox/adjustbox.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<=*COPYRIGHT>
-%% Copyright (C) 2011-2019 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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[<width>]{<content>}
% \vspace{-1.5\baselineskip}\nopagebreak
% \DescribeEnv[<content>]{centerbox}[<width>]
@@ -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}'='<page numbers>
% \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<Adjbox>{PGF}{\PassOptionsToPackage{pgf}{trimclip}\AtEndOfPackage{\RequirePackage{pgf}\adjcalcset{pgfmath}}}
% \end{macrocode}
%
+% Pass |pkg{graphicx}| options down.
+% \begin{macrocode}
+\DeclareOptionX<Adjbox>{draft}{\PassOptionsToPackage{draft}{graphicx}}
+\DeclareOptionX<Adjbox>{final}{\PassOptionsToPackage{final}{graphicx}}
+\DeclareOptionX<Adjbox>{hiderotate}{\PassOptionsToPackage{hiderotate}{graphicx}}
+\DeclareOptionX<Adjbox>{hidescale}{\PassOptionsToPackage{hidescale}{graphicx}}
+\DeclareOptionX<Adjbox>{hiresbb}{\PassOptionsToPackage{hiresbb}{graphicx}}
+\DeclareOptionX<Adjbox>{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/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx b/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx
index 0240ff55e25..ab371073257 100644
--- a/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx
+++ b/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<=*COPYRIGHT>
-%% Copyright (C) 2011-2018 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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 @@
%</driver>
% \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 @@
%</tc-pdftex.def>
% \fi
%
+% \subsubsection{luatex driver}
+% \iffalse
+%<*tc-luatex.def>
+% \fi
+% \begin{macrocode}
+%<!COPYRIGHT>
+\ProvidesFile{tc-luatex.def}[2020/08/16 v1.0 Clipping driver for luatex]
+\input{tc-pdftex.def}
+% \end{macrocode}
+% \iffalse
+%</tc-luatex.def>
+% \fi
+%
% \subsubsection{dvips driver}
% \iffalse
%<*tc-dvips.def>
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 <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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<Adjbox>{defaultunit}{\AtEndOfPackage{\adjcalcset{defaultunit={#1}}}}
\DeclareOptionX<Adjbox>{pgf}{\PassOptionsToPackage{pgf}{trimclip}}
\DeclareOptionX<Adjbox>{PGF}{\PassOptionsToPackage{pgf}{trimclip}\AtEndOfPackage{\RequirePackage{pgf}\adjcalcset{pgfmath}}}
+\DeclareOptionX<Adjbox>{draft}{\PassOptionsToPackage{draft}{graphicx}}
+\DeclareOptionX<Adjbox>{final}{\PassOptionsToPackage{final}{graphicx}}
+\DeclareOptionX<Adjbox>{hiderotate}{\PassOptionsToPackage{hiderotate}{graphicx}}
+\DeclareOptionX<Adjbox>{hidescale}{\PassOptionsToPackage{hidescale}{graphicx}}
+\DeclareOptionX<Adjbox>{hiresbb}{\PassOptionsToPackage{hiresbb}{graphicx}}
+\DeclareOptionX<Adjbox>{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 <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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 <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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 <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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 <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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 <martin@scharrer-online.de>
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
%% ----------------------------------------------------------------------
%% 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}}