summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-14 21:47:17 +0000
committerKarl Berry <karl@freefriends.org>2016-04-14 21:47:17 +0000
commitb59e690bdb8fc242c27d15ccb3aebcddf8e22ef7 (patch)
treea1da0d4d6f78d417471348b447b037e433395abd /Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
parentd18d22e7afa1ac3ec2f48cf38f88f1a12c11dc5d (diff)
pdfpages (14apr16)
git-svn-id: svn://tug.org/texlive/trunk@40524 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages/pppdftex.def')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def58
1 files changed, 33 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index 8f819643668..1a4a1802ea1 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5d}
+\def\AM@fileversion{v0.5e}
\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: 2015-09-18 22:10:48 +0200 $
-\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
+\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $
+\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
\ProvidesFile{pppdftex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
@@ -41,6 +41,14 @@
\let\AM@endinput\relax
\expandafter\endinput
\fi
+ \let\AM@outputmode\pdfoutput
+ \let\AM@saveimageresource\pdfximage
+ \let\AM@lastsavedimageresourcepages\pdflastximagepages
+ \let\AM@luatexpagewidth\pdfpagewidth
+ \let\AM@luatexpageheight\pdfpageheight
+ \let\AM@annotation\pdfannot
+ \let\AM@thread\pdfthread
+ \let\AM@destination\pdfdest
\ifcase\pdfoutput
\input{ppnull.def}
\expandafter\endinput
@@ -73,16 +81,16 @@
}
\def\AM@getpagecount{%
\setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
- \pdfximage{\AM@currentdocname@fix}%
- \edef\AM@pagecount{\the\pdflastximagepages}%
+ \AM@saveimageresource{\AM@currentdocname@fix}%
+ \edef\AM@pagecount{\the\AM@lastsavedimageresourcepages}%
}
\def\AM@getpagedimen{%
\AM@pagewidth=\paperwidth
\AM@pageheight=\paperheight
}
\def\AM@setpagedimen{%
- \pdfpagewidth\AM@pagewidth
- \pdfpageheight\AM@pageheight
+ \AM@luatexpagewidth\AM@pagewidth
+ \AM@luatexpageheight\AM@pageheight
}
\let\AM@pagesize@boogie\relax
\let\AM@fitpaper@special\relax
@@ -98,27 +106,27 @@
\def\AM@setRotate{\PLS@Rotate{90}}
\def\AM@resetRotate{\PLS@Rotate{0}}
\def\AM@linktodoc@special@begin{%
- \pdfannot width \wd\@tempboxa
- height \ht\@tempboxa
- depth \dp\@tempboxa
- {/Subtype /Link /Border [0 0 0]
- /A << /S /GoToR
- /F (\AM@linkfilename)
- /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
- \ifAM@newwindow/NewWindow true\fi >>}%
+ \AM@annotation width \wd\@tempboxa
+ height \ht\@tempboxa
+ depth \dp\@tempboxa
+ {/Subtype /Link /Border [0 0 0]
+ /A << /S /GoToR
+ /F (\AM@linkfilename)
+ /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
+ \ifAM@newwindow/NewWindow true\fi >>}%
}
\let\AM@linktodoc@special@end\relax
\def\AM@survey@special@begin{%
- \pdfannot width \wd\@tempboxa
- height \ht\@tempboxa
- depth \dp\@tempboxa
- {/Subtype /Link /Border [0 0 0]
- /A << /S /GoTo
- /D (pdfpages.\AM@linktodoc@page@m@ne) >>}%
+ \AM@annotation width \wd\@tempboxa
+ height \ht\@tempboxa
+ depth \dp\@tempboxa
+ {/Subtype /Link /Border [0 0 0]
+ /A << /S /GoTo
+ /D (pdfpages.\AM@linktodoc@page@m@ne) >>}%
}
\let\AM@survey@special@end\relax
\def\AM@thread@special@begin{%
- \pdfthread width \wd\@tempboxa
+ \AM@thread width \wd\@tempboxa
height \ht\@tempboxa
depth \dp\@tempboxa
attr {/I <<\threadinfodict>>}%
@@ -126,8 +134,8 @@
}
\let\AM@thread@special@end\relax
\def\AM@view{fit}
-\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view}
-\def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit}
+\def\AM@dest@special{\AM@destination name {\AM@linkname.\AM@page} \AM@view}
+\def\AM@anchor@special{\AM@destination name {pdfpages.\the\count1} fit}
\def\AM@convert@dest#1{%
\expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi}
\def\AM@convert@dest@i#1 #2\END{%