diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-04 21:48:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-04 21:48:42 +0000 |
commit | 0034d54351819457808cf0c8c3d6811269ad264f (patch) | |
tree | a2075cf380417a8f21031e571a834b448a3c3c92 /Master/texmf-dist/source/latex/adjustbox/trimclip.dtx | |
parent | 0152ebfa557ae875b2135565bbc16ad01a55ab77 (diff) |
adjustbox (4jan19)
git-svn-id: svn://tug.org/texlive/trunk@49596 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/adjustbox/trimclip.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/adjustbox/trimclip.dtx | 126 |
1 files changed, 71 insertions, 55 deletions
diff --git a/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx b/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx index 31dd9eb99b8..0240ff55e25 100644 --- a/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx +++ b/Master/texmf-dist/source/latex/adjustbox/trimclip.dtx @@ -159,7 +159,7 @@ %</driver> % \fi % -% \CheckSum{490} +% \CheckSum{1118} % % \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 @@ -962,7 +962,7 @@ % \fi % \begin{macrocode} %<!COPYRIGHT> -\ProvidesFile{tc-pgf.def}[2018/04/08 v2.1 trimclip fall-back clipping driver using PGF] +\ProvidesFile{tc-pgf.def}[2019/01/04 v2.2 trimclip fall-back clipping driver using PGF] % \end{macrocode} % % \begin{macrocode} @@ -989,7 +989,7 @@ % \end{macro} % % -% \begin{macro}{\@clipcornersofbox} +% \begin{macro}{\@clipcornersofbox}[5]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>} % Clips round corners off. % \begin{macrocode} \def\@clipcornersofbox#1#2#3#4#5{% @@ -998,10 +998,10 @@ \pgfpatharc{180}{90}{#2}% \pgfpathlineto{\pgfpoint{\wd#1-#3}{\ht#1}}% \pgfpatharc{90}{0}{#3}% - \pgfpathlineto{\pgfpoint{\wd#1}{#4-\dp#1}}% - \pgfpatharc{0}{-90}{#4}% - \pgfpathlineto{\pgfpoint{#5}{-\dp#1}}% - \pgfpatharc{270}{180}{#5}% + \pgfpathlineto{\pgfpoint{\wd#1}{#5-\dp#1}}% + \pgfpatharc{0}{-90}{#5}% + \pgfpathlineto{\pgfpoint{#4}{-\dp#1}}% + \pgfpatharc{270}{180}{#4}% \pgfpathlineto{\pgfpoint{\z@}{\ht#1-#2}}% \pgfpathclose \pgfusepathqclip @@ -1014,13 +1014,17 @@ % \end{macro} % % -% \begin{macro}{\@rndframearoundbox} +% \begin{macro}{\@rndframearoundbox}[6]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>}{<clip>} % Round frame around a box. % \begin{macrocode} -\def\@rndframearoundbox#1#2#3#4#5{% +\def\@rndframearoundbox#1#2#3#4#5#6{% \setbox#1\hbox{\begin{pgfpicture}% \adjsetlength\@tempdima{\fboxsep+.5\fboxrule}% \@marginbox#1\@tempdima\@tempdima\@tempdima\@tempdima% + \edef\@tempa{#6}% + \ifx\@empty\@tempa\else + \@clipcornersofbox{#1}{#2}{#3}{#4}{#5}% + \fi \pgfset{inner sep=\z@,outer sep=\z@,minimum size=\z@}% \pgfnode{rectangle}{base west}{\usebox#1}{}{}% \pgfusepath{}% @@ -1029,10 +1033,10 @@ \pgfpatharc{180}{90}{#2}% \pgfpathlineto{\pgfpoint{\wd#1-#3}{\ht#1}}% \pgfpatharc{90}{0}{#3}% - \pgfpathlineto{\pgfpoint{\wd#1}{#4-\dp#1}}% - \pgfpatharc{0}{-90}{#4}% - \pgfpathlineto{\pgfpoint{#5}{-\dp#1}}% - \pgfpatharc{270}{180}{#5}% + \pgfpathlineto{\pgfpoint{\wd#1}{#5-\dp#1}}% + \pgfpatharc{0}{-90}{#5}% + \pgfpathlineto{\pgfpoint{#4}{-\dp#1}}% + \pgfpatharc{270}{180}{#4}% \pgfpathlineto{\pgfpoint{\z@}{\ht#1-#2}}% \pgfpathclose \pgfusepath{stroke}% @@ -1053,7 +1057,7 @@ % \fi % \begin{macrocode} %<!COPYRIGHT> -\ProvidesFile{tc-pdftex.def}[2018/04/08 v2.1 Clipping driver for pdftex] +\ProvidesFile{tc-pdftex.def}[2019/01/04 v2.2 Clipping driver for pdftex] % \end{macrocode} % % \begin{macro}{\@cliptoboxdim} @@ -1080,7 +1084,7 @@ % \end{macro} % % -% \begin{macro}{\@clip@bpdimens} +% \begin{macro}{\@clip@bpdimens}[5]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>} % \begin{macrocode} \def\@clip@bpdimens#1#2#3#4#5{% \adjcalc@settobp\TOTALHEIGHT{\ht#1+\dp#1}% @@ -1089,8 +1093,8 @@ \adjcalc@settobp\WIDTH{\wd#1}% \adjcalc@settobp\RADIUSTL{#2}% \adjcalc@settobp\RADIUSTR{#3}% - \adjcalc@settobp\RADIUSBR{#4}% - \adjcalc@settobp\RADIUSBL{#5}% + \adjcalc@settobp\RADIUSBR{#5}% + \adjcalc@settobp\RADIUSBL{#4}% \adjcalc@settobp\RADIUSTLb{\tc@bezfacn#2}% \adjcalc@settobp\HEIGHTmRADIUSTL{\ht#1-#2}% \adjcalc@settobp\HEIGHTmRADIUSTLb{\ht#1-\tc@bezfacn#2}% @@ -1098,13 +1102,13 @@ \adjcalc@settobp\HEIGHTmRADIUSTRb{\ht#1-\tc@bezfacn#3}% \adjcalc@settobp\WIDTHmRADIUSTR{\wd#1-#3}% \adjcalc@settobp\WIDTHmRADIUSTRb{\wd#1-\tc@bezfacn#3}% - \adjcalc@settobp\RADIUSBRmDEPTH{#4-\dp#1}% - \adjcalc@settobp\RADIUSBRmDEPTHb{\tc@bezfacn#4-\dp#1}% - \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#4}% - \adjcalc@settobp\WIDTHmRADIUSBRb{\wd#1-\tc@bezfacn#4}% - \adjcalc@settobp\RADIUSBLmDEPTH{#5-\dp#1}% - \adjcalc@settobp\RADIUSBLmDEPTHb{\tc@bezfacn#5-\dp#1}% - \adjcalc@settobp\RADIUSBLb{\tc@bezfacn#5}% + \adjcalc@settobp\RADIUSBRmDEPTH{#5-\dp#1}% + \adjcalc@settobp\RADIUSBRmDEPTHb{\tc@bezfacn#5-\dp#1}% + \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#5}% + \adjcalc@settobp\WIDTHmRADIUSBRb{\wd#1-\tc@bezfacn#5}% + \adjcalc@settobp\RADIUSBLmDEPTH{#4-\dp#1}% + \adjcalc@settobp\RADIUSBLmDEPTHb{\tc@bezfacn#4-\dp#1}% + \adjcalc@settobp\RADIUSBLb{\tc@bezfacn#4}% \adjcalc@settobp\LINEWIDTH{\fboxrule}% } % \end{macrocode} @@ -1129,7 +1133,7 @@ % % % -% \begin{macro}{\@clipcornersofbox} +% \begin{macro}{\@clipcornersofbox}[5]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>} % Clips round corners off. % \begin{macrocode} \def\@clipcornersofbox#1#2#3#4#5{% @@ -1150,14 +1154,18 @@ % % % -% \begin{macro}{\@rndframearoundbox} +% \begin{macro}{\@rndframearoundbox}[6]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>}{<clip>} % Round frame around a box. % \begin{macrocode} -\def\@rndframearoundbox#1#2#3#4#5{% +\def\@rndframearoundbox#1#2#3#4#5#6{% \setbox#1=\hbox{% \adjsetlength\@tempdima{\fboxsep+.5\fboxrule}% \@marginbox#1\@tempdima\@tempdima\@tempdima\@tempdima% \@clip@bpdimens{#1}{#2}{#3}{#4}{#5}% + \edef\@tempa{#6}% + \ifx\@empty\@tempa\else + \@clipcornersofbox{#1}{#2}{#3}{#4}{#5}% + \fi % \hbox to 0pt{\copy#1\hss}% \pdfsave @@ -1192,7 +1200,7 @@ % \fi % \begin{macrocode} %<!COPYRIGHT> -\ProvidesFile{tc-dvips.def}[2018/04/08 v2.1 Clipping driver for dvips] +\ProvidesFile{tc-dvips.def}[2019/01/04 v2.2 Clipping driver for dvips] % \end{macrocode} % % \begin{macro}{\@cliptoboxdim}[1]{box register to clip} @@ -1229,7 +1237,7 @@ % \end{macro} % % -% \begin{macro}{\@clipcornersofbox} +% \begin{macro}{\@clipcornersofbox}[5]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>} % Clips round corners off. % \begin{macrocode} \def\@clipcornersofbox#1#2#3#4#5{% @@ -1241,14 +1249,14 @@ \adjcalc@settobp\WIDTH{\wd#1}% \adjcalc@settobp\RADIUSTL{#2}% \adjcalc@settobp\RADIUSTR{#3}% - \adjcalc@settobp\RADIUSBR{#4}% - \adjcalc@settobp\RADIUSBL{#5}% + \adjcalc@settobp\RADIUSBL{#4}% + \adjcalc@settobp\RADIUSBR{#5}% \adjcalc@settobp\RADIUSTLmHEIGHT{#2-\ht#1}% \adjcalc@settobp\RADIUSTRmHEIGHT{#3-\ht#1}% \adjcalc@settobp\WIDTHmRADIUSTR{\wd#1-#3}% - \adjcalc@settobp\DEPTHmRADIUSBR{\dp#1-#4}% - \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#4}% - \adjcalc@settobp\DEPTHmRADIUSBL{\dp#1-#5}% + \adjcalc@settobp\DEPTHmRADIUSBR{\dp#1-#5}% + \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#5}% + \adjcalc@settobp\DEPTHmRADIUSBL{\dp#1-#4}% \special{% ps: /mtrxc matrix currentmatrix def @@ -1283,10 +1291,10 @@ % % % -% \begin{macro}{\@rndframearoundbox} +% \begin{macro}{\@rndframearoundbox}[6]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>}{<clip>} % Clips round corners off. % \begin{macrocode} -\def\@rndframearoundbox#1#2#3#4#5{% +\def\@rndframearoundbox#1#2#3#4#5#6{% \setbox#1=\hbox{% \adjsetlength\@tempdima{\fboxsep+.5\fboxrule}% \@marginbox#1\@tempdima\@tempdima\@tempdima\@tempdima% @@ -1296,15 +1304,19 @@ \adjcalc@settobp\WIDTH{\wd#1}% \adjcalc@settobp\RADIUSTL{#2}% \adjcalc@settobp\RADIUSTR{#3}% - \adjcalc@settobp\RADIUSBR{#4}% - \adjcalc@settobp\RADIUSBL{#5}% + \adjcalc@settobp\RADIUSBR{#5}% + \adjcalc@settobp\RADIUSBL{#4}% \adjcalc@settobp\RADIUSTLmHEIGHT{#2-\ht#1}% \adjcalc@settobp\RADIUSTRmHEIGHT{#3-\ht#1}% \adjcalc@settobp\WIDTHmRADIUSTR{\wd#1-#3}% - \adjcalc@settobp\DEPTHmRADIUSBR{\dp#1-#4}% - \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#4}% - \adjcalc@settobp\DEPTHmRADIUSBL{\dp#1-#5}% + \adjcalc@settobp\DEPTHmRADIUSBR{\dp#1-#5}% + \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#5}% + \adjcalc@settobp\DEPTHmRADIUSBL{\dp#1-#4}% \adjcalc@settobp\LINEWIDTH{\fboxrule}% + \edef\@tempa{#6}% + \ifx\@empty\@tempa\else + \@clipcornersofbox{#1}{#2}{#3}{#4}{#5}% + \fi % \hbox to 0pt{\copy#1\hss}% \hbox to 0pt{% @@ -1356,7 +1368,7 @@ % \fi % \begin{macrocode} %<!COPYRIGHT> -\ProvidesFile{tc-xetex.def}[2018/04/08 v2.1 Clipping driver for xetex] +\ProvidesFile{tc-xetex.def}[2019/01/04 v2.2 Clipping driver for xetex] % \end{macrocode} % % \begin{macro}{\@cliptoboxdim} @@ -1386,7 +1398,7 @@ % \end{macro} % % -% \begin{macro}{\@clip@bpdimens} +% \begin{macro}{\@clip@bpdimens}[5]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>} % \begin{macrocode} \def\@clip@bpdimens#1#2#3#4#5{% \adjcalc@settobp\TOTALHEIGHT{\ht#1+\dp#1}% @@ -1395,8 +1407,8 @@ \adjcalc@settobp\WIDTH{\wd#1}% \adjcalc@settobp\RADIUSTL{#2}% \adjcalc@settobp\RADIUSTR{#3}% - \adjcalc@settobp\RADIUSBR{#4}% - \adjcalc@settobp\RADIUSBL{#5}% + \adjcalc@settobp\RADIUSBL{#4}% + \adjcalc@settobp\RADIUSBR{#5}% \adjcalc@settobp\RADIUSTLb{\tc@bezfacn#2}% \adjcalc@settobp\HEIGHTmRADIUSTL{\ht#1-#2}% \adjcalc@settobp\HEIGHTmRADIUSTLb{\ht#1-\tc@bezfacn#2}% @@ -1404,13 +1416,13 @@ \adjcalc@settobp\HEIGHTmRADIUSTRb{\ht#1-\tc@bezfacn#3}% \adjcalc@settobp\WIDTHmRADIUSTR{\wd#1-#3}% \adjcalc@settobp\WIDTHmRADIUSTRb{\wd#1-\tc@bezfacn#3}% - \adjcalc@settobp\RADIUSBRmDEPTH{#4-\dp#1}% - \adjcalc@settobp\RADIUSBRmDEPTHb{\tc@bezfacn#4-\dp#1}% - \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#4}% - \adjcalc@settobp\WIDTHmRADIUSBRb{\wd#1-\tc@bezfacn#4}% - \adjcalc@settobp\RADIUSBLmDEPTH{#5-\dp#1}% - \adjcalc@settobp\RADIUSBLmDEPTHb{\tc@bezfacn#5-\dp#1}% - \adjcalc@settobp\RADIUSBLb{\tc@bezfacn#5}% + \adjcalc@settobp\RADIUSBRmDEPTH{#5-\dp#1}% + \adjcalc@settobp\RADIUSBRmDEPTHb{\tc@bezfacn#5-\dp#1}% + \adjcalc@settobp\WIDTHmRADIUSBR{\wd#1-#5}% + \adjcalc@settobp\WIDTHmRADIUSBRb{\wd#1-\tc@bezfacn#5}% + \adjcalc@settobp\RADIUSBLmDEPTH{#4-\dp#1}% + \adjcalc@settobp\RADIUSBLmDEPTHb{\tc@bezfacn#4-\dp#1}% + \adjcalc@settobp\RADIUSBLb{\tc@bezfacn#4}% \adjcalc@settobp\LINEWIDTH{\fboxrule}% } % \end{macrocode} @@ -1435,7 +1447,7 @@ % % % -% \begin{macro}{\@clipcornersofbox} +% \begin{macro}{\@clipcornersofbox}[5]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>} % Clips round corners off. % \begin{macrocode} \def\@clipcornersofbox#1#2#3#4#5{% @@ -1460,14 +1472,18 @@ % % % -% \begin{macro}{\@rndframearoundbox} +% \begin{macro}{\@rndframearoundbox}[6]{<box register}{<upper left>}{<upper right>}{<lower left>}{<lower right>}{<clip>} % Round frame around a box. % \begin{macrocode} -\def\@rndframearoundbox#1#2#3#4#5{% +\def\@rndframearoundbox#1#2#3#4#5#6{% \setbox#1=\hbox{% \adjsetlength\@tempdima{\fboxsep+.5\fboxrule}% \@marginbox#1\@tempdima\@tempdima\@tempdima\@tempdima% \@clip@bpdimens{#1}{#2}{#3}{#4}{#5}% + \edef\@tempa{#6}% + \ifx\@empty\@tempa\else + \@clipcornersofbox{#1}{#2}{#3}{#4}{#5}% + \fi % \hbox to 0pt{\copy#1\hss}% \hbox to 0pt{% |