pdfpages (30may13)

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

9 files changed, 48 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index be8a285b094..0e61698cd51 100644
--- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
+++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
index d675dfcfec9..09728fa108f 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -27,10 +27,10 @@
 %<*dtx>
 \makeatletter
 %</dtx>
-\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) $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -80,7 +80,7 @@
 %
 %    \GetFileInfo{pdfpages.dtx}
 %
-%    \CheckSum{4623}
+%    \CheckSum{4642}
 %
 % \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
@@ -3173,9 +3173,13 @@
          Please, update your `pdftex.def'}}
 %    \end{macrocode}
 %    Get last page number.
+%
+%    \noindent
+%    Note: Do not use |\pdfximage| directly. This clashes with packages which
+%    manipulate the input path of graphicx.sty.
 %    \begin{macrocode}
 \def\AM@getpagecount{%
-  \pdfximage{\AM@currentdocname}%
+  \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
   \edef\AM@pagecount{\the\pdflastximagepages}%
 }
 %    \end{macrocode}
@@ -3474,13 +3478,25 @@
 %    Get last page number. |\XeTeXpdfpagecount| is only defined
 %    for |pdf| files. For all other file types |\AM@pagecount|
 %    must be set to |1| explicitely.
+%
+%    \noindent
+%    Note: |import.sty| imports tex-files from sub-directories, allowing
+%    these tex-files to use e.g. |\includegraphics|. However, this does not
+%    work out of the box for pdfpages with XeTeX-driver (as it does with
+%    pdftex-driver). We have to use |\import@path| of |import.sty|.
 %    \begin{macrocode}
 \def\AM@getpagecount{%
   \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
@@ -4224,6 +4240,11 @@
 %    \begin{itemize}
 %    \item Add option |duplicatepages|. Requested by Allan Pickett.
 %    \end{itemize}
+%
+%    \subsection*{2013/05/30 v0.4u}
+%    \begin{itemize}
+%    \item Compatibility with |import.sty|.
+%    \end{itemize}
 %    \Finale
 %    
 %    \iffalse
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