pdfpages update: v0.4i

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

7 files changed, 302 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index b24c940f261..8614429e949 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.4g}
+\def\AM@fileversion{v0.4i}
 \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: 2009-02-07 21:46:53 +0100 (Sat, 07 Feb 2009) $
+\AM@SVN@Date$Date: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
@@ -41,10 +41,18 @@
 \def\AM@ifdriverlater{\@ifl@ter{def}}
 \InputIfFileExists{pdfpages.cfg}{%
   \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{}
-\DeclareOption{pdftex}{\def\AM@driver{pdftex}}
-\DeclareOption{vtex}{\def\AM@driver{vtex}}
+\def\AM@graphics@driver{}
+\DeclareOption{pdftex}{%
+  \def\AM@driver{pdftex}\let\AM@graphics@driver\AM@driver}
+\DeclareOption{vtex}{%
+  \def\AM@driver{vtex}\let\AM@graphics@driver\AM@driver}
+\DeclareOption{xetex}{%
+  \def\AM@driver{xetex}\let\AM@graphics@driver\AM@driver}
+\DeclareOption{dvips}{%
+  \def\AM@driver{dvips}\let\AM@graphics@driver\AM@driver}
+\DeclareOption{dvipdfm}{%
+  \def\AM@driver{dvipdfm}\let\AM@graphics@driver\AM@driver}
 \DeclareOption{null}{\def\AM@driver{null}}
-\DeclareOption{xetex}{\def\AM@driver{xetex}}
 \ProcessOptions
 \@ifundefined{AM@driver}{
   \begingroup
@@ -57,7 +65,8 @@
   }{\gdef\AM@driver{pdftex}}
   \endgroup
 }{}
-\RequirePackage{ifthen, graphicx, calc, eso-pic}
+\RequirePackage{ifthen, calc, eso-pic}
+\RequirePackage[\AM@graphics@driver]{graphicx}
 \newif\ifAM@DVIoutput\AM@DVIoutputfalse
 \input{pp\AM@driver.def}
 \ifx\AM@endinput\relax\expandafter\endinput\fi
@@ -334,10 +343,10 @@
       \fi
     \fi
     \ifthenelse{\boolean{AM@fitpaper}}
-      {\setlength{\AM@pagewidth}{\the\wd\@tempboxa}%
-       \setlength{\AM@pageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
-       \setlength{\paperwidth}{\the\wd\@tempboxa}%
-       \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
+      {\setlength{\AM@pagewidth}{\wd\@tempboxa}%
+       \setlength{\AM@pageheight}{\ht\@tempboxa + \dp\@tempboxa}%
+       \setlength{\paperwidth}{\wd\@tempboxa}%
+       \setlength{\paperheight}{\ht\@tempboxa + \dp\@tempboxa}%
        \AM@fitpaper@special
        \AM@setpagedimen
        \@ifundefined{stockwidth}{}{%
@@ -478,7 +487,7 @@
                        page=\AM@page, scale=\AM@globalscale,
                        angle=\AM@lscape@rot]{\AM@docname}}%
     \edef\AM@localwd{\the\wd\@tempboxa}%
-    \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}%
+    \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
     \edef\AM@localht{\the\@tempdima}%
     \AM@rescalefalse
     \ifdim\AM@localwd=\AM@templatewidth \else \AM@rescaletrue \fi
@@ -507,7 +516,7 @@
                  angle=\AM@lscape@rot, angle=90]{\AM@docname}}%
           \let\@filelist\AM@filelist@save
           \edef\AM@localwd{\the\wd\@tempboxa}%
-          \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}%
+          \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
           \edef\AM@localht{\the\@tempdima}%
         \fi
         \setlength{\@tempdima}
@@ -625,7 +634,8 @@
           {\ifthenelse{\boolean{AM@landscape}}
              {\AM@setlscape}{}}
           {}%
-        \AM@AddToShipoutPicture{\begingroup\AM@picturecommand\endgroup}%
+        \AM@AddToShipoutPicture{%
+          \begingroup\AM@picturecommand\endgroup}%
         \ifAM@firstpage
           \AM@AddToShipoutPicture{%
             \begingroup\AM@picturecommandstar\endgroup}%
@@ -749,7 +759,7 @@
     \ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
     }{%
       \PackageError{pdfpages}
-        {page number #1 of `\AM@currentdocname' does not exist}
+        {page #1 of `\AM@currentdocname' does not exist}
         {You have set a wrong page number in the `pages' option.
          Document \MessageBreak `\AM@currentdocname' does not
          have #1 pages.}%
@@ -1278,7 +1288,7 @@
   \def\AM@toc@page{\AM@trim@space{#1}}%
   \def\AM@toc@section{\AM@trim@space{#2}}%
   \def\AM@toc@level{\AM@trim@space{#3}}%
-  \AM@toc@title\expandafter{\ifdim\z@=0pt#4}\fi
+  \AM@toc@title{\ignorespaces #4}%
   \def\AM@toc@label{\AM@trim@space{#5}}%
   \AM@checkinteger{\AM@toc@page}%
   \ifAM@integer\else
@@ -1321,7 +1331,7 @@
 \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{%
   \def\AM@lof@page{\AM@trim@space{#1}}%
   \def\AM@lof@list{\AM@trim@space{#2}}%
-  \def\AM@lof@heading{\AM@trim@leadingspace{#3}}%
+  \def\AM@lof@heading{#3}%
   \def\AM@lof@label{\AM@trim@space{#4}}%
   \AM@checkinteger{\AM@lof@page}%
   \ifAM@integer\else
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
new file mode 100644
index 00000000000..4932101cdb3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -0,0 +1,153 @@
+%%
+%% This is file `ppdvipdfm.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pdfpages.dtx  (with options: `ppdvipdfmdef')
+%% 
+%% This file is part of the pdfpages package.
+%% 
+%% 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.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>.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
+%%
+%% Please send error reports and suggestions for improvements to
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
+%%
+\def\AM@fileversion{v0.4i}
+\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\ProvidesFile{ppdvipdfm.def}
+   [\AM@filedate\space\AM@fileversion\space
+    Pdfpages driver for dvipdfm (AM)]
+\def\AM@notsupported#1{%
+  \PackageWarning{pdfpages}{#1 not supported by driver dvipdfm}}
+\def\AM@getpagecount{%
+  \ifx\AM@pagecount\AM@undefined
+    \AM@notsupported{Page selection}
+    \def\AM@pagecount{1}%
+    \gdef\AM@getpagecount{%
+      \def\AM@pagecount{1}%
+    }%
+  \fi
+}
+\let\AM@pagewidth\paperwidth
+\let\AM@pageheight\paperheight
+\def\AM@setpagedimen{%
+  \setlength{\paperwidth}{\wd\@tempboxa}%
+  \setlength{\paperheight}{\ht\@tempboxa + \dp\@tempboxa}%
+}
+\let\AM@pagesize@boogie\relax
+\def\AM@setlscape{\AM@notsupported{Page rotation}}
+\def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}}
+\def\AM@findfile#1{%
+  \AM@findfile@i{#1}{pdf}%
+  \AM@findfile@ii{#1}%
+}
+\let\AM@IfFileExists\IfFileExists
+\def\AM@linktodoc@special@begin{%
+  \special{pdf: ann
+                width \the\wd\@tempboxa\space
+                height \the\ht\@tempboxa\space
+                depth \the\dp\@tempboxa\space
+                << /Type /Annot
+                   /Subtype /Link /Border [0 0 0]
+                   /A << /S /GoToR
+                         /F (\AM@linkfilename)
+                         /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
+                         \ifAM@newwindow/NewWindow true\fi >>
+                >>}%
+}
+\let\AM@linktodoc@special@end\relax
+\let\AM@survey@special@begin\relax
+\let\AM@survey@special@end\relax
+\def\AM@thread@special@begin{%
+  \special{pdf: thread @\AM@threadname\space
+                width \the\wd\@tempboxa\space
+                height \the\ht\@tempboxa\space
+                depth \the\dp\@tempboxa\space
+                <<\threadinfodict>>}%
+}
+\let\AM@thread@special@end\relax
+\def\AM@view{/Fit}
+\def\AM@dest@special{%
+  \special{pdf: dest (\AM@linkname.\AM@page) [ @thispage \AM@view ]}}
+\def\AM@anchor@special{%
+  \special{pdf: dest (pdfpages.\the\count1) [ @thispage /Fit ]}}
+\def\AM@convert@dest#1{%
+  \expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi}
+\def\AM@convert@dest@i#1 #2\END{%
+  \begingroup
+  \def\tag{#1}%
+  \def\x{FitH}%
+  \ifx\x\tag
+    \gdef\AM@view{/FitH @ypos}%
+  \else
+    \def\x{FitBH}%
+    \ifx\x\tag
+      \gdef\AM@view{/FitBH @ypos}%
+    \else
+      \def\x{FitV}%
+      \ifx\x\tag
+        \gdef\AM@view{/FitV @xpos}%
+      \else
+        \def\x{FitBV}%
+        \ifx\x\tag
+          \gdef\AM@view{/FitBV @xpos}%
+        \else
+          \def\x{fitr}%
+          \ifx\x\tag
+            \gdef\AM@view{/XYZ @xpos @ypos null}%
+            \PackageWarningNoLine{pdfpages}{%
+              `linkfit=FitR' is not supported.}%
+          \else
+            \def\x{FitB}%
+            \ifx\x\tag
+              \gdef\AM@view{/FitB}%
+            \else
+              \def\x{XYZ}%
+              \ifx\x\tag
+                \gdef\AM@view{/XYZ @xpos @ypos null}%
+              \else
+                \def\x{Region}%
+                \ifx\x\tag
+                  \gdef\AM@view{/XYZ @xpos @ypos null}%
+                  \PackageWarningNoLine{pdfpages}{%
+                    `linkfit=Region' is not supported by dvipdfm.}%
+                \else
+                  \gdef\AM@view{/Fit}%
+                \fi
+              \fi
+            \fi
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+  \endgroup
+}
+\def\AM@region@calc{}
+\let\AM@disable@includegraphics\relax
+\@ifundefined{KV@Gin@page}{%
+  \define@key{Gin}{page}{%
+    \ifnum#1=1 %
+    \else
+      \PackageError{pdfpages}{%
+        Multipage images are not supported by driver dvipdfm%
+      }\@ehc
+    \fi
+  }}{}
+\endinput
+%%
+%% End of file `ppdvipdfm.def'.
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
new file mode 100644
index 00000000000..1d37b379630
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -0,0 +1,84 @@
+%%
+%% This is file `ppdvips.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pdfpages.dtx  (with options: `ppdvipsdef')
+%% 
+%% This file is part of the pdfpages package.
+%% 
+%% 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.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>.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
+%%
+%% Please send error reports and suggestions for improvements to
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
+%%
+\def\AM@fileversion{v0.4i}
+\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\ProvidesFile{ppdvips.def}
+   [\AM@filedate\space\AM@fileversion\space
+    Pdfpages driver for dvips (AM)]
+\def\AM@notsupported#1{%
+  \PackageWarning{pdfpages}{#1 not supported by driver dvips}}
+\def\AM@getpagecount{%
+  \ifx\AM@pagecount\AM@undefined
+    \AM@notsupported{Page selections}
+    \def\AM@pagecount{1}%
+    \gdef\AM@getpagecount{%
+      \def\AM@pagecount{1}%
+    }%
+  \fi
+}
+\let\AM@pagewidth\paperwidth
+\let\AM@pageheight\paperheight
+\def\AM@setpagedimen{%
+  \setlength{\paperwidth}{\wd\@tempboxa}%
+  \setlength{\paperheight}{\ht\@tempboxa + \dp\@tempboxa}%
+}
+\let\AM@pagesize@boogie\relax
+\def\AM@setlscape{\AM@notsupported{Page rotations}}
+\def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}}
+\def\AM@findfile#1{%
+  \AM@findfile@i{#1}{eps}%
+  \ifx\AM@currentdocname\relax
+    \AM@findfile@i{#1}{ps}%
+  \fi
+  \AM@findfile@ii{#1}%
+}
+\let\AM@IfFileExists\IfFileExists
+\def\AM@linktodoc@special@begin{Links}
+\let\AM@linktodoc@special@end\relax
+\def\AM@survey@special@begin{\AM@notsupported{Option survey}}
+\let\AM@survey@special@end\relax
+\def\AM@thread@special@begin{\AM@notsupported{Option thread}}
+\let\AM@thread@special@end\relax
+\def\AM@dest@special{\AM@notsupported{Links}}
+\def\AM@anchor@special{\AM@notsupported{Links}}
+\def\AM@convert@dest#1{}
+\def\AM@region@calc{}
+\let\AM@disable@includegraphics\relax
+\@ifundefined{KV@Gin@page}{%
+  \define@key{Gin}{page}{%
+    \ifnum#1=1 %
+    \else
+      \PackageError{pdfpages}{%
+        Multipage images are not supported by driver dvips%
+      }\@ehc
+    \fi
+  }}{}
+\endinput
+%%
+%% End of file `ppdvips.def'.
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 0f9e42694e1..edcc1be7a41 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.4g}
+\def\AM@fileversion{v0.4i}
 \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: 2009-02-07 21:46:53 +0100 (Sat, 07 Feb 2009) $
+\AM@SVN@Date$Date: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
 \ProvidesFile{ppnull.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages dummy driver (AM)]
@@ -52,8 +52,8 @@
 \let\AM@pagewidth\paperwidth
 \let\AM@pageheight\paperheight
 \def\AM@setpagedimen{%
-  \setlength{\paperwidth}{\the\wd\@tempboxa}%
-  \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
+  \setlength{\paperwidth}{\wd\@tempboxa}%
+  \setlength{\paperheight}{\ht\@tempboxa + \dp\@tempboxa}%
 }
 \let\AM@pagesize@boogie\relax
 \let\AM@fitpaper@special\relax
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index 5a94b854a0e..1cae2726dd6 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.4g}
+\def\AM@fileversion{v0.4i}
 \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: 2009-02-07 21:46:53 +0100 (Sat, 07 Feb 2009) $
+\AM@SVN@Date$Date: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
 \ProvidesFile{pppdftex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
@@ -71,8 +71,8 @@
 \let\AM@pagewidth\pdfpagewidth
 \let\AM@pageheight\pdfpageheight
 \def\AM@setpagedimen{%
-  \setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
-  \setlength{\pdfpageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
+  \setlength{\pdfpagewidth}{\wd\@tempboxa}%
+  \setlength{\pdfpageheight}{\ht\@tempboxa + \dp\@tempboxa}%
 }
 \let\AM@pagesize@boogie\relax
 \let\AM@fitpaper@special\relax
@@ -172,7 +172,7 @@
   \endgroup
 }
 \def\AM@region@calc{%
-  \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}
+  \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}
   \edef\AM@region@depth{\the\@tempdima}
 }
 \let\AM@disable@includegraphics\relax
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index d5757555a66..7d6042aa036 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.4g}
+\def\AM@fileversion{v0.4i}
 \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: 2009-02-07 21:46:53 +0100 (Sat, 07 Feb 2009) $
+\AM@SVN@Date$Date: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
 \ProvidesFile{ppvtex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for VTeX (AM)]
@@ -61,8 +61,8 @@
 \let\AM@pagewidth\mediawidth
 \let\AM@pageheight\mediaheight
 \def\AM@setpagedimen{%
-  \setlength{\mediawidth}{\the\wd\@tempboxa}%
-  \setlength{\mediaheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
+  \setlength{\mediawidth}{\wd\@tempboxa}%
+  \setlength{\mediaheight}{\ht\@tempboxa+\dp\@tempboxa}%
 }
 \let\AM@pagesize@boogie\relax
 \def\AM@setlscape{\special{pS:
@@ -88,7 +88,8 @@
   \special{!endaref}%
 }
 \def\AM@survey@special@begin{%
-  \special{!aref pdfpages.\AM@linktodoc@page@m@ne; a=</Border [0 0 0]>}%
+  \special{!aref pdfpages.\AM@linktodoc@page@m@ne;
+    a=</Border [0 0 0]>}%
 }
 \def\AM@survey@special@end{%
   \special{!endaref}%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index fdbd6d7e96d..7a7c4e6e487 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -8,14 +8,26 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
+%% 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.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>.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
 %%
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4g}
+\def\AM@fileversion{v0.4i}
 \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: 2009-02-07 21:46:53 +0100 (Sat, 07 Feb 2009) $
+\AM@SVN@Date$Date: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
@@ -32,8 +44,14 @@
  \gdef\AM@XeTeXquote{"}%
 }
 \def\AM@getpagecount{%
-  \edef\AM@pagecount{\the\XeTeXpdfpagecount\AM@XeTeXquote
-    \AM@currentdocname\AM@XeTeXquote\relax}%
+  \expandafter\filename@parse\expandafter{\AM@currentdocname}%
+  \lowercase{\edef\type@ext{.\filename@ext}}%
+  \ifx\type@ext\G@pdf@ext
+    \edef\AM@pagecount{\the\XeTeXpdfpagecount\AM@XeTeXquote
+      \AM@currentdocname\AM@XeTeXquote\relax}%
+  \else
+    \def\AM@pagecount{1}%
+  \fi
 }
 \begingroup
 \def\gobble@nil#1\@nil{}
@@ -52,8 +70,8 @@
 \let\AM@pagewidth\pdfpagewidth
 \let\AM@pageheight\pdfpageheight
 \def\AM@setpagedimen{%
-  \setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
-  \setlength{\pdfpageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
+  \setlength{\pdfpagewidth}{\wd\@tempboxa}%
+  \setlength{\pdfpageheight}{\ht\@tempboxa+\dp\@tempboxa}%
 }
 \def\AM@pagesize@boogie{%
   \ifdim\AM@pagewidth=\z@