summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-05 22:28:05 +0000
committerKarl Berry <karl@freefriends.org>2021-02-05 22:28:05 +0000
commitb4fad0854fdeec6592142cfdd820a9b9554af0ee (patch)
tree4322f1d51195b52f1ec50a28abb55c75fba3bc2a /Master/texmf-dist/tex/latex
parentddf3e72bf7cfe6507dbb97d768bfd515f2e70363 (diff)
pdfpages (5feb21)
git-svn-id: svn://tug.org/texlive/trunk@57626 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty39
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppluatex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def6
8 files changed, 41 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 74c55d42ab6..3d16c000edb 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@Git@Date\space\AM@fileversion\space
@@ -75,6 +75,7 @@
\newif\ifAM@DVIoutput\AM@DVIoutputfalse
\newdimen\AM@pagewidth
\newdimen\AM@pageheight
+\newdimen\AM@fboxrule
\input{pp\AM@driver.def}
\ifx\AM@endinput\relax\expandafter\endinput\fi
\ifAM@pkg@survey
@@ -313,7 +314,7 @@
{\def\AM@xnup{\@ne}\def\AM@ynup{\@ne}%
\def\AM@xnupminusi{\z@}\def\AM@ynupminusi{\z@}}{}%
\@ifundefined{AM@deltax}
- {\def\AM@deltax{-\fboxrule}\def\AM@deltay{-\fboxrule}}{}%
+ {\def\AM@deltax{-\AM@fboxrule}\def\AM@deltay{-\AM@fboxrule}}{}%
\@ifundefined{AM@xoffset}
{\def\AM@xoffset{\z@}\def\AM@yoffset{\z@}}{}%
\def\AM@xpos{\z@}\def\AM@ypos{\z@}%
@@ -351,12 +352,13 @@
\edef\AM@pagelist{\AM@pagelist,\AM@resortedpagelist}%
\edef\AM@doclist{\AM@doclist,\AM@resorteddoclist}%
\fi}{}%
- \ifthenelse{\boolean{AM@frame}}
- {\global\let\AM@fbox\fbox}
+ \ifthenelse{\boolean{AM@frame}}%
+ {\global\let\AM@fbox\fbox
+ \setlength\AM@fboxrule{\fboxrule}}%
{\global\let\AM@fbox\relax
- \setlength{\fboxrule}{\z@}}%
- \ifthenelse{\boolean{AM@reflect}}
- {\global\let\AM@reflectbox\reflectbox}
+ \setlength\AM@fboxrule{\z@}}%
+ \ifthenelse{\boolean{AM@reflect}}%
+ {\global\let\AM@reflectbox\reflectbox}%
{\global\let\AM@reflectbox\relax}%
\setbox\AM@pagebox\null
\ifthenelse{\boolean{AM@column}}
@@ -365,7 +367,6 @@
{\def\AM@xnupi{\z@}%
\def\AM@ynupi{\@ne}}%
\AM@firstpagetrue
- \setlength{\fboxsep}{\z@}%
\@ifundefined{AM@pagetemplate}
{\AM@readfirst{\AM@pagelist}%
\edef\AM@page{\the\toks@}}
@@ -396,7 +397,7 @@
\setlength{\AM@pageheight}{\ht\@tempboxa + \dp\@tempboxa}%
}{}%
\def\AM@xscale{%
- (\AM@pagewidth - \tw@\fboxrule*\AM@xnup
+ (\AM@pagewidth - \tw@\AM@fboxrule*\AM@xnup
- \AM@deltax * \AM@xnupminusi) /
(\AM@xnup * \real{\strip@pt\wd\@tempboxa})
}%
@@ -404,7 +405,7 @@
\edef\AM@xscale{\strip@pt\@tempdima}%
\setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}%
\def\AM@yscale{
- (\AM@pageheight - \tw@\fboxrule*\AM@ynup
+ (\AM@pageheight - \tw@\AM@fboxrule*\AM@ynup
- \AM@deltay *\AM@ynupminusi) /
(\AM@ynup * \real{\strip@pt\@tempdimb})
}%
@@ -440,11 +441,11 @@
\edef\AM@templateheight{\the\@tempdima}%
\setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}%
\def\AM@xmargin{%
- (\AM@pagewidth - (\wd\@tempboxa+\tw@\fboxrule)*\AM@xnup
+ (\AM@pagewidth - (\wd\@tempboxa+\tw@\AM@fboxrule)*\AM@xnup
- \AM@deltax * \AM@xnupminusi) * \real{.5}%
}%
\def\AM@ymargin{%
- (\AM@pageheight - (\@tempdimb+\tw@\fboxrule)*\AM@ynup
+ (\AM@pageheight - (\@tempdimb+\tw@\AM@fboxrule)*\AM@ynup
- \AM@deltay * \AM@ynupminusi) * \real{.5}%
}%
\setlength{\@tempdima}{\AM@xmargin}%
@@ -604,25 +605,25 @@
\ifthenelse{\boolean{AM@landscape}}
{\def\AM@xpos{%
\AM@xmargin \AM@add\AM@xoffset + \AM@localxoff +
- (\AM@templatewidth + \AM@deltax + \tw@\fboxrule) *
+ (\AM@templatewidth + \AM@deltax + \tw@\AM@fboxrule) *
(\AM@ynupi - 1)
}%
\def\AM@ypos{%
\AM@texcoord +
\AM@ymargin + \AM@yoffset + \AM@localyoff +
- (\AM@templateheight + \AM@deltay + \tw@\fboxrule) *
+ (\AM@templateheight + \AM@deltay + \tw@\AM@fboxrule) *
(\AM@xnupi - 1)
}%
}
{\def\AM@xpos{%
\AM@xmargin \AM@add\AM@xoffset + \AM@localxoff +
- (\AM@templatewidth + \AM@deltax + \tw@\fboxrule) *
+ (\AM@templatewidth + \AM@deltax + \tw@\AM@fboxrule) *
(\AM@xnupi - 1)
}%
\def\AM@ypos{%
\AM@texcoord +
\AM@ymargin + \AM@yoffset + \AM@localyoff +
- (\AM@templateheight + \AM@deltay + \tw@\fboxrule) *
+ (\AM@templateheight + \AM@deltay + \tw@\AM@fboxrule) *
(\AM@ynup-\AM@ynupi)
}%
}%
@@ -630,7 +631,6 @@
\edef\AM@xpos{\strip@pt\@tempdima}%
\setlength{\@tempdima}{\AM@ypos}%
\edef\AM@ypos{\strip@pt\@tempdima}%
- \setlength{\fboxsep}{\z@}%
\AM@region@calc
\ifnum\AM@xnupi=1
\ifnum\AM@ynupi=1
@@ -653,6 +653,7 @@
\noexpand\raisebox{\dp\@tempboxa}{%
\noexpand\raise \ht\@tempboxa \hbox{\AM@hyper@begin@i}%
\global\pdfpages@includegraphics@status\@ne
+ \fboxsep=\z@
\AM@hyper@begin@ii\noexpand\AM@fbox{%
\noexpand\AM@ARBug@hook
\noexpand\AM@reflectbox{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index e70d93f4793..db5170ba947 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{ppdvipdfmx.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfmx (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 07475f4684a..83f82279d8b 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{ppdvips.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
index 07e2e49eead..e38d26c6353 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{ppluatex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for LuaTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 23f49263a3a..d10fcb09fdc 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{ppnull.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index f4ab911b45e..5d055172655 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{pppdftex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index aba40d5e870..da1c416298a 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{ppvtex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index fdc69014aef..5dc78a905ed 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5r}
+\def\AM@fileversion{v0.5s}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2021-01-09 21:30:43 +0100 $
-\AM@Git@SHA@process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
+\AM@Git@Date@process$Date: 2021-02-05 15:10:20 +0100 $
+\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
\ProvidesFile{ppxetex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]