pdfpages update (28apr08)

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

5 files changed, 22 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 72ba894904c..5630b73ac98 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \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: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 4782b9f2258..9b437ff0139 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \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: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \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 dc9c03569ce..41ba99490e1 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \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: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \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 0955985d642..b1faf628c5c 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \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: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \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 ebde43c152b..38d50fe2424 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -12,10 +12,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \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: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
@@ -36,9 +36,11 @@
     \AM@currentdocname\AM@XeTeXquote\relax}%
 }
 \begingroup
+\def\gobble@nil#1\@nil{}
 \ifnum\XeTeXversion=0
-  \edef\temp{\expandafter\@gobble\XeTeXrevision}
-  \ifnum\temp<997
+  \afterassignment\gobble@nil
+  \count@\expandafter\@gobble\XeTeXrevision.\@nil
+  \ifnum\count@<997
     \PackageError{pdfpages}
     {Package pdfpages requires at least XeTeX-0.997}
     {Update your TeX distribution!}