pdfpages (25aug13)

git-svn-id: svn://tug.org/texlive/trunk@31518 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 24 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index b34e67f242d..94f2d68a4c3 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 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 ed19418a47c..f01f17e753d 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 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 7b3e146ae11..c6332ea3f7e 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 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 486a6f16e2b..0292858a2ea 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 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 dd1ff819e62..cf487cd4f62 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
 \ProvidesFile{pppdftex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
@@ -64,8 +64,18 @@
          There might be problems with\MessageBreak
          the `trim' and `clip' options.\MessageBreak
          Please, update your `pdftex.def'}}
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
+\let\AM@Gread@@pdftex\Gread@@pdftex
+\renewcommand*{\Gread@@pdftex}[1]{%
+  \xdef\AM@currentdocname@fix{#1}%
+  \AM@Gread@@pdftex{#1}%
+}
 \def\AM@getpagecount{%
   \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+  \pdfximage{\AM@currentdocname@fix}%
   \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 a7e924a8970..6731736cb07 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 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 a0af5fba42b..4a092ede794 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.4u}
+\def\AM@fileversion{v0.4v}
 \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: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]