pdfpages (10mar11)

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

9 files changed, 30 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index cc85f52f117..aa63345c7e5 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 cd62d9e33c0..e384465d867 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -815,7 +815,7 @@
 %    are quite useful, if only parts of a page should be inserted.
 %    (Maybe to cut off the header and footer of the inserted pages.)
 %    Just use the `trim' and `clip' options as if they were options
-%    of |\inlcudepdf|. They will be passed to |\includegraphics|
+%    of |\includepdf|. They will be passed to |\includegraphics|
 %    internally.
 %    
 %
@@ -1325,10 +1325,10 @@
 \newcommand*{\includepdfmerge}[2][]{%
   \begingroup
   \let\AM@currentdocname\relax
-  \AM@readlist{#2}%
   \AM@split@options{pdfpages}{#1}%
   \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
   \expandafter\setkeys\AM@temp
+  \AM@readlist{#2}%
   \AM@output{#1}%
   \AM@CheckAtEnd
   \endgroup
@@ -4206,6 +4206,17 @@
 %      change on every second page.
 %    \end{itemize}
 %
+%    \subsection*{2010/12/18 v0.4m}
+%    \begin{itemize}
+%    \item Bugfix: Wrong offset of signature.
+%    \end{itemize}
+%
+%    \subsection*{2011/03/10 v0.4n}
+%    \begin{itemize}
+%    \item Bugfix: In |\includepdfmerge|, |\AM@readlist| has to be
+%          after |\setkeys|.
+%    \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 41f19c22b07..73937a96136 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
@@ -233,10 +233,10 @@
 \newcommand*{\includepdfmerge}[2][]{%
   \begingroup
   \let\AM@currentdocname\relax
-  \AM@readlist{#2}%
   \AM@split@options{pdfpages}{#1}%
   \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
   \expandafter\setkeys\AM@temp
+  \AM@readlist{#2}%
   \AM@output{#1}%
   \AM@CheckAtEnd
   \endgroup
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index e640acd7947..dc3a4429951 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \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 b5361ecddb1..b98302b2196 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \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 d7fa38d70e5..339df40c645 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \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 957aa63a70c..507d36570a7 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \ProvidesFile{pppdftex.def}
    [\AM@filedate\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 09c529eb76a..d2b471993de 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \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 cc0cb85eb6b..e4450807c74 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.4m}
+\def\AM@fileversion{v0.4n}
 \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: 2010-12-18 00:29:01 +0100 (Sat, 18 Dec 2010) $
+\AM@SVN@Date$Date: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]