summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfpages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-29 15:41:28 +0000
committerKarl Berry <karl@freefriends.org>2013-06-29 15:41:28 +0000
commit562c7b8e21a29c9b6c9a638aa79e274fb495b6ab (patch)
tree5591da81fcad96a8ad2952dac1c1ce5e954203f6 /Master/texmf-dist/tex/latex/pdfpages
parenta6f05dc78424ea7f193a766c8a41b59bce5d5e9f (diff)
pdfpages (30may13)
git-svn-id: svn://tug.org/texlive/trunk@31043 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def12
7 files changed, 22 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 3a9ef11d5f8..b34e67f242d 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@filedate\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index d9ce65ca894..ed19418a47c 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\ProvidesFile{ppdvipdfm.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvipdfm (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index bcb08125b11..7b3e146ae11 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\ProvidesFile{ppdvips.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 4c98615e375..486a6f16e2b 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\ProvidesFile{ppnull.def}
[\AM@filedate\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 d99ff6a55e0..dd1ff819e62 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\ProvidesFile{pppdftex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
@@ -65,7 +65,7 @@
the `trim' and `clip' options.\MessageBreak
Please, update your `pdftex.def'}}
\def\AM@getpagecount{%
- \pdfximage{\AM@currentdocname}%
+ \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
\edef\AM@pagecount{\the\pdflastximagepages}%
}
\let\AM@pagewidth\pdfpagewidth
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index c2596569832..a7e924a8970 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\ProvidesFile{ppvtex.def}
[\AM@filedate\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 abd43cd1869..a0af5fba42b 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4t}
+\def\AM@fileversion{v0.4u}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2012-08-31 18:15:36 +0200 (Fri, 31 Aug 2012) $
+\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
\ProvidesFile{ppxetex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
@@ -47,8 +47,14 @@
\expandafter\filename@parse\expandafter{\AM@currentdocname}%
\lowercase{\edef\type@ext{.\filename@ext}}%
\ifx\type@ext\G@pdf@ext
+ \ifdefined\import@path
+ \let\AM@import@path\import@path
+ \else
+ \let\AM@import@path\@empty
+ \fi
+ \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
\edef\AM@pagecount{\the\XeTeXpdfpagecount\AM@XeTeXquote
- \AM@currentdocname\AM@XeTeXquote\relax}%
+ \AM@import@path\AM@currentdocname\AM@XeTeXquote\relax}%
\else
\def\AM@pagecount{1}%
\fi