pdfpages v0.4c (2008-04-01)

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

5 files changed, 376 insertions, 81 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index fdcd7dc8439..72ba894904c 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -10,25 +10,26 @@
 %% 
 %% 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
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3
+%% 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.3c or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Andreas Matthias <amat@kabsi.at>.
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
 %%
 %% Please send error reports and suggestions for improvements to
-%%   Andreas MATTHIAS <amat@kabsi.at>.
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4a}
+\def\AM@fileversion{v0.4c}
 \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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $
+\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
@@ -39,15 +40,25 @@
 \DeclareOption{final}{\AM@pkg@draftfalse}
 \DeclareOption{enable-survey}{\AM@pkg@surveytrue}
 \DeclareOption{disable-survey}{\AM@pkg@surveyfalse}
-\ProcessOptions
 \def\AM@ifdriverlater{\@ifl@ter{def}}
-\begingroup
-\@ifundefined{pdfoutput}{%
-  \@ifundefined{OpMode}{%
-    \def\AM@driver{null}
-  }{\gdef\AM@driver{vtex}}%
-}{\gdef\AM@driver{pdftex}}
-\endgroup
+\InputIfFileExists{pdfpages.cfg}{%
+  \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{}
+\DeclareOption{pdftex}{\def\AM@driver{pdftex}}
+\DeclareOption{vtex}{\def\AM@driver{vtex}}
+\DeclareOption{null}{\def\AM@driver{null}}
+\DeclareOption{xetex}{\def\AM@driver{xetex}}
+\ProcessOptions
+\@ifundefined{AM@driver}{
+  \begingroup
+  \@ifundefined{pdftexversion}{%
+    \@ifundefined{XeTeXversion}{%
+      \@ifundefined{OpMode}{%
+        \def\AM@driver{null}
+      }{\gdef\AM@driver{vtex}}%
+    }{\gdef\AM@driver{xetex}}%
+  }{\gdef\AM@driver{pdftex}}
+  \endgroup
+}{}
 \RequirePackage{ifthen, graphicx, calc, eso-pic}
 \newif\ifAM@DVIoutput\AM@DVIoutputfalse
 \input{pp\AM@driver.def}
@@ -98,13 +109,14 @@
 \newcommand*{\AM@lscape@rot}{0}
 \newcommand*{\AM@threadname}{}\newcommand*{\AM@linkname}{}
 \newcommand*{\AM@linkname@option}{}
-\newcommand*{\AM@linkfit}{fit}\newcommand*{\AM@linktodocfit}{/Fit}
+\newcommand*{\AM@linktodocfit}{/Fit}
 \newcommand*{\threadinfodict}{}
 \newcommand*{\AM@toclist}{}\newcommand*{\AM@loflist}{}
 \newcommand*{\AM@signature}{}
 \newcommand*{\AM@ARBug@hook}{}
 \newcommand*{\AM@xrprefix}{}
-\newcommand*{\AM@picturecommand}{}\newcommand*{\AM@picturecommandstar}{}
+\newcommand*{\AM@picturecommand}{}
+\newcommand*{\AM@picturecommandstar}{}
 \newsavebox{\AM@pagebox}
 \newif\ifAM@thumbpdf
 \newif\ifAM@pdflscape
@@ -134,17 +146,17 @@
 }
 \newcommand*{\AM@findfile@i}[2]{%
   \let\AM@currentdocname\relax
-  \IfFileExists{#1.#2}{\edef\AM@currentdocname{#1.#2}}{%
-     \IfFileExists{#1}{\edef\AM@currentdocname{#1}}{%
+  \AM@IfFileExists{#1.#2}{\edef\AM@currentdocname{#1.#2}}{%
+     \AM@IfFileExists{#1}{\edef\AM@currentdocname{#1}}{%
        \ifx\Ginput@path\@undefined\else
          \expandafter\@tfor\expandafter\AM@dir\expandafter
                    :\expandafter=\Ginput@path\do{%
-           \IfFileExists{\AM@dir#1.#2}{%
+           \AM@IfFileExists{\AM@dir#1.#2}{%
              \ifx\AM@currentdocname\relax
                \edef\AM@currentdocname{\AM@dir#1.#2}%
              \fi
            }{%
-             \IfFileExists{\AM@dir#1}{%
+             \AM@IfFileExists{\AM@dir#1}{%
                \ifx\AM@currentdocname\relax
                  \edef\AM@currentdocname{\AM@dir#1}%
                \fi
@@ -312,11 +324,16 @@
     \AM@split@options{Gin@noscale}{#1}%
     \let\AM@filelist@save\@filelist
     \ifAM@DVIoutput
-      \setbox\@tempboxa=\hbox{\rule{597pt}{845pt}}
+      \setbox\@tempboxa=\hbox{\rule{597pt}{845pt}}%
     \else
-      \setbox\@tempboxa=\hbox{%
-        \expandafter\includegraphics\expandafter[\the\@temptokena,
+      \ifAM@templatesize
+        \setbox\@tempboxa=\hbox{%
+          \rotatebox{\AM@lscape@rot}{\copy\AM@templatesizebox}}%
+      \else
+        \setbox\@tempboxa=\hbox{%
+          \expandafter\includegraphics\expandafter[\the\@temptokena,
             page=\AM@page, angle=\AM@lscape@rot]{\AM@docname}}%
+      \fi
     \fi
     \ifthenelse{\boolean{AM@fitpaper}}
       {\setlength{\AM@pagewidth}{\the\wd\@tempboxa}%
@@ -372,13 +389,20 @@
   \fi
   \let\AM@filelist@save\@filelist
   \AM@split@options{Gin}{#1}%
-  \setbox\@tempboxa=\hbox{%
-    \expandafter\includegraphics\expandafter[\the\@temptokena,
-                     page=\AM@page, scale=\AM@globalscale,
-                     angle=\AM@lscape@rot]{\AM@docname}}%
+  \ifAM@templatesize
+    \setbox\@tempboxa=\hbox{%
+      \scalebox{\AM@globalscale}{\copy\AM@templatesizebox}}%
+    \setbox\@tempboxa=\hbox{%
+      \rotatebox{\AM@lscape@rot}{\copy\@tempboxa}}%
+  \else
+    \setbox\@tempboxa=\hbox{%
+      \expandafter\includegraphics\expandafter[\the\@temptokena,
+                       page=\AM@page, scale=\AM@globalscale,
+                       angle=\AM@lscape@rot]{\AM@docname}}%
+  \fi
   \let\@filelist\AM@filelist@save
   \edef\AM@templatewidth{\the\wd\@tempboxa}%
-  \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}%
+  \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
   \edef\AM@templateheight{\the\@tempdima}%
   \setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}%
   \def\AM@xmargin{%
@@ -550,11 +574,7 @@
     \setlength{\@tempdima}{\AM@ypos}%
     \edef\AM@ypos{\strip@pt\@tempdima}%
     \setlength{\fboxsep}{\z@}%
-    \def\AM@region{region}%
-    \ifx\AM@linkfit\AM@region
-      \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}%
-      \let\AM@linkfit\AM@linkfit@special
-    \fi
+     \AM@region@calc
     \ifAM@phantompage
       \def\AM@shippage{}%
     \else
@@ -640,8 +660,8 @@
   \def\AM@doclist{}%
   \AM@readlisti#1,\END,
   \ifAM@defaultone\AM@append{1}\fi
-  \edef\AM@doclist{\expandafter\@gobble\AM@doclist}%
-  \edef\AM@pagelist{\expandafter\@gobble\AM@pagelist}%
+  \edef\AM@doclist{\expandafter\@gobble\AM@doclist\@empty}%
+  \edef\AM@pagelist{\expandafter\@gobble\AM@pagelist\@empty}%
 }
 \newcommand{\AM@readlisti}{}
 \def\AM@readlisti#1,{%
@@ -987,7 +1007,8 @@
 \newcommand{\AM@split@optionsii}{}
 \def\AM@split@optionsii#1=#2\END{%
   \edef\AM@temp{\AM@trim@space{#1}}%
-  \ifthenelse{\equal{pages}{\AM@temp}\or
+  \ifthenelse{\equal{page}{\AM@temp}\or
+              \equal{pages}{\AM@temp}\or
               \equal{nup}{\AM@temp}\or
               \equal{deltax}{\AM@temp}\or
               \equal{deltay}{\AM@temp}\or
@@ -1025,6 +1046,7 @@
               \equal{signature*}{\AM@temp}\or
               \equal{booklet}{\AM@temp}\or
               \equal{pagetemplate}{\AM@temp}\or
+              \equal{templatesize}{\AM@temp}\or
               \equal{rotateoversize}{\AM@temp}\or
               \equal{picturecommand}{\AM@temp}\or
               \equal{picturecommand*}{\AM@temp}\or
@@ -1053,7 +1075,6 @@
     \AM@phantompagefalse
   \fi
 }
-
 \newcommand{\AM@hyper@begin@i}{%
   \ifAM@link \AM@dest@special\fi
 }
@@ -1185,6 +1206,7 @@
   \AM@sort
   \edef\AM@pagelist{\expandafter\@gobble\AM@newpagelist}%
   \edef\AM@doclist{\expandafter\@gobble\AM@newdoclist}%
+  \AM@pagesize@boogie
   \ifdim\AM@pagewidth<\AM@pageheight
     \def\AM@xnup{\@ne}\def\AM@ynup{\tw@}%
   \else
@@ -1382,6 +1404,12 @@
              {Option `#1' must have a non-empty value}%
   \fi
 }
+\define@key{pdfpages}{page}{\PackageWarningNoLine{pdfpages}{%
+    Option `page' is unknow to \string\includepdf.\MessageBreak
+    Did you mean `pages'? (Note the `s'!)\MessageBreak
+    OK, I'll proceed as if it were `pages'}%
+  \AM@CheckValue{pages}{#1}%
+  \def\AM@pagestemp{#1}}
 \define@key{pdfpages}{pages}{\AM@CheckValue{pages}{#1}%
                              \def\AM@pagestemp{#1}}
 \define@key{pdfpages}{nup}{\AM@parse@nup#1x\END}
@@ -1402,7 +1430,7 @@
 \define@key{pdfpages}{thread}[true]{\setboolean{AM@thread}{#1}}
 \define@key{pdfpages}{threadname}{\def\AM@threadname{#1}}
 \define@key{pdfpages}{link}[true]{\setboolean{AM@link}{#1}}
-\define@key{pdfpages}{linkfit}{\def\AM@linkfit{#1}}
+\define@key{pdfpages}{linkfit}{\AM@convert@dest{#1}}
 \define@key{pdfpages}{linkname}{\def\AM@linkname@option{#1}}
 \define@key{pdfpages}{linktodoc}[true]{\setboolean{AM@linktodoc}{#1}}
 \define@key{pdfpages}{linktodocfit}{\def\AM@linktodocfit{#1}}
@@ -1446,6 +1474,7 @@
                                      \def\AM@signature{x}}
 \define@key{pdfpages}{pagetemplate}{\AM@CheckValue{pagetemplate}{#1}%
                                     \def\AM@pagetemplate{#1}}
+\define@key{pdfpages}{templatesize}{\AM@parse@templatesize#1\END}
 \define@key{pdfpages}{rotateoversize}[true]%
                      {\setboolean{AM@rotateoversize}{#1}}
 \define@key{pdfpages}{picturecommand}{\def\AM@picturecommand{#1}}
@@ -1474,6 +1503,13 @@
   \fi
 }
 \def\AM@parse@nupi#1x{\def\AM@ynup{#1}}
+\newcommand{\AM@parse@templatesize}{}
+\def\AM@parse@templatesize#1#2\END{%
+  \setbox\AM@templatesizebox=\hbox{\rule{#1}{#2}}
+  \AM@templatesizetrue
+}
+\newbox\AM@templatesizebox
+\newif\ifAM@templatesize\AM@templatesizefalse
 \def\AM@parse@deltax#1 #2\\{\AMGin@defaultbp\AM@deltax{#1}}
 \def\AM@parse@deltay#1 #2\\{\AMGin@defaultbp\AM@deltay{#1}}
 \def\AM@parse@delta#1 #2 #3\\{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index a538bc80221..4782b9f2258 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -10,28 +10,29 @@
 %% 
 %% 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
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3
+%% 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.3c or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Andreas Matthias <amat@kabsi.at>.
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
 %%
 %% Please send error reports and suggestions for improvements to
-%%   Andreas MATTHIAS <amat@kabsi.at>.
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4a}
+\def\AM@fileversion{v0.4c}
 \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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $
+\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
 \ProvidesFile{ppnull.def}
    [\AM@filedate\space\AM@fileversion\space
-    Pdfpages' dummy driver (AM)]
+    Pdfpages dummy driver (AM)]
 \AM@DVIoutputtrue
 \PackageWarningNoLine{pdfpages}{%
   I will use a dummy \string\includepdf\space command\MessageBreak
@@ -40,12 +41,13 @@
 \def\AM@findfile#1{%
   \def\AM@currentdocname{#1}%
 }
+\let\AM@IfFileExists\IfFileExists
 \def\AM@getpagecount{%
   \ifx\AM@pagecount\AM@undefined
     \PackageWarningNoLine{pdfpages}{%
       I cannot determine the number of pages of the\MessageBreak
-      included document, while in DVI mode. You can\MessageBreak
-      use the option `lastpage' to give me a hint}%
+      included document, while being in DVI mode. You\MessageBreak
+      can use the option `lastpage' to give me a hint}%
     \edef\AM@pagecount{1}%
   \fi
 }
@@ -55,6 +57,7 @@
   \setlength{\paperwidth}{\the\wd\@tempboxa}%
   \setlength{\paperheight}{\the\ht\@tempboxa}%
 }
+\let\AM@pagesize@boogie\relax
 \let\AM@fitpaper@special\relax
 \def\AM@findfile#1{%
   \def\AM@currentdocname{}%
@@ -68,11 +71,12 @@
 \let\AM@thread@special@end\relax
 \let\AM@dest@special\relax
 \let\AM@anchor@special\relax
-\let\AM@linkfit@special\relax
+\def\AM@convert@dest#1{}
 \def\AM@disable@includegraphics{%
   \renewcommand\includegraphics[2][]{}%
 }
 \newcommand*{\AM@checkpagenumber}[1]{}
+\def\AM@region@calc{}
 \endinput
 %%
 %% End of file `ppnull.def'.
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index 537326f7008..dc9c03569ce 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -10,25 +10,26 @@
 %% 
 %% 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
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3
+%% 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.3c or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Andreas Matthias <amat@kabsi.at>.
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
 %%
 %% Please send error reports and suggestions for improvements to
-%%   Andreas MATTHIAS <amat@kabsi.at>.
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4a}
+\def\AM@fileversion{v0.4c}
 \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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $
+\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
 \ProvidesFile{pppdftex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
@@ -75,11 +76,17 @@
   \setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
   \setlength{\pdfpageheight}{\the\ht\@tempboxa}%
 }
+\let\AM@pagesize@boogie\relax
 \let\AM@fitpaper@special\relax
 \def\AM@findfile#1{%
   \AM@findfile@i{#1}{pdf}%
   \AM@findfile@ii{#1}%
 }
+\AtBeginDocument{%
+\@ifpackageloaded{grffile}{%
+  \let\AM@IfFileExists\grffile@IfFileExists}{%
+  \let\AM@IfFileExists\IfFileExists}%
+}
 \def\AM@setlscape{\pdfpageattr{/Rotate 90}}
 \def\AM@linktodoc@special@begin{%
     \pdfannot width \wd\@tempboxa
@@ -109,10 +116,67 @@
                  name {\AM@threadname}%
 }
 \let\AM@thread@special@end\relax
-\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@linkfit}
+\def\AM@view{fit}
+\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view}
 \def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit}
-\edef\AM@linkfit@special{fitr width\the\wd\@tempboxa\space
-                              height0pt depth\the\@tempdima}
+\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}%
+  \else
+    \def\x{FitBH}%
+    \ifx\x\tag
+      \gdef\AM@view{fitbh}%
+    \else
+      \def\x{FitV}%
+      \ifx\x\tag
+        \gdef\AM@view{fitv}%
+      \else
+        \def\x{FitBV}%
+        \ifx\x\tag
+          \gdef\AM@view{fitbv}%
+        \else
+          \def\x{FitR}%
+          \ifx\x\tag
+            \gdef\AM@view{fitr}%
+            \PackageWarningNoLine{pdfpages}{%
+              `linkfit=FitR' is not supported,
+              I will try `linkfit=Region'.}%
+            \def\tag{region}%
+          \else
+            \def\x{FitB}%
+            \ifx\x\tag
+              \gdef\AM@view{fitb}%
+            \else
+              \def\x{XZY}%
+              \ifx\x\tag
+                \gdef\AM@view{xyz zoom #2}%
+              \else
+                \def\x{Region}%
+                \ifx\x\tag
+                  \gdef\AM@view{fitr
+                                width\the\wd\@tempboxa\space
+                                height0pt depth\AM@region@depth}%
+                \else
+                  \gdef\AM@view{fit}%
+                \fi
+              \fi
+            \fi
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+  \endgroup
+}
+\def\AM@region@calc{%
+  \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}
+  \edef\AM@region@depth{\the\@tempdima}
+}
 \let\AM@disable@includegraphics\relax
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index 484a1aa121d..0955985d642 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -10,28 +10,38 @@
 %% 
 %% 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
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3
+%% 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.3c or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Andreas Matthias <amat@kabsi.at>.
+%% The Current Maintainer of this work is
+%%   Andreas Matthias <andreas.matthias@gmail.com>.
 %%
 %% Please send error reports and suggestions for improvements to
-%%   Andreas MATTHIAS <amat@kabsi.at>.
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4a}
+\def\AM@fileversion{v0.4c}
 \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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $
+\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
 \ProvidesFile{ppvtex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for VTeX (AM)]
+\begingroup
+\@ifundefined{ver@vtex.def}{%
+  \PackageError{pdfpages}
+         {The graphics package was loaded with driver\MessageBreak
+          `\Gin@driver', which cannot be used with VTeX}
+         {Check the driver option of the graphics package.}
+  \global\let\AM@endinput\relax
+  \aftergroup\endinput}{}
+\endgroup
 \ifnum\VTeXversion<822
   \PackageError{pdfpages}
          {Package pdfpages requires at least\MessageBreak
@@ -56,6 +66,7 @@
   \setlength{\mediawidth}{\the\wd\@tempboxa}%
   \setlength{\mediaheight}{\the\ht\@tempboxa}%
 }
+\let\AM@pagesize@boogie\relax
 \def\AM@setlscape{\special{pS:
     [{ThisPage}\string<\string</Rotate 90\string>\string>%]
     /PUT pdfmark}%
@@ -69,6 +80,7 @@
   \fi
   \AM@findfile@ii{#1}%
 }
+\let\AM@IfFileExists\IfFileExists
 \def\AM@linktodoc@special@begin{%
   \special{!aref <\ifAM@newwindow n\fi
            f=\AM@linkfilename>!\AM@linktodoc@page;
@@ -89,8 +101,7 @@
 \def\AM@thread@special@end{\special{!endthread}}
 \def\AM@dest@special{\special{!aname \AM@linkname.\AM@page}}
 \def\AM@anchor@special{\special{!aname pdfpages.\the\count1}}
-\edef\AM@linkfit@special{fit}%r width\the\wd\@tempboxa\space
-                             % height0pt depth\the\@tempdima}
+\def\AM@convert@dest#1{}
 \let\AM@disable@includegraphics\relax
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
new file mode 100644
index 00000000000..ebde43c152b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -0,0 +1,180 @@
+%%
+%% This is file `ppxetex.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pdfpages.dtx  (with options: `ppxetexdef')
+%% 
+%% This file is part of the pdfpages package.
+%% 
+%%
+%% Please send error reports and suggestions for improvements to
+%%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
+%%
+\def\AM@fileversion{v0.4c}
+\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) $
+\ProvidesFile{ppxetex.def}
+   [\AM@filedate\space\AM@fileversion\space
+    Pdfpages driver for XeTeX (AM)]
+\begingroup
+\@ifundefined{ver@xetex.def}{%
+  \PackageError{pdfpages}
+         {The graphics package was loaded with driver\MessageBreak
+          `\Gin@driver', which cannot be used with XeTeX}
+         {Check the driver option of the graphics package.}
+  \global\let\AM@endinput\relax
+  \aftergroup\endinput}{}
+\endgroup
+{\catcode`\"=12
+ \gdef\AM@XeTeXquote{"}%
+}
+\def\AM@getpagecount{%
+  \edef\AM@pagecount{\the\XeTeXpdfpagecount\AM@XeTeXquote
+    \AM@currentdocname\AM@XeTeXquote\relax}%
+}
+\begingroup
+\ifnum\XeTeXversion=0
+  \edef\temp{\expandafter\@gobble\XeTeXrevision}
+  \ifnum\temp<997
+    \PackageError{pdfpages}
+    {Package pdfpages requires at least XeTeX-0.997}
+    {Update your TeX distribution!}
+    \global\let\AM@endinput\relax
+    \aftergroup\endinput
+  \fi
+\fi
+\endgroup
+\let\AM@pagewidth\pdfpagewidth
+\let\AM@pageheight\pdfpageheight
+\def\AM@setpagedimen{%
+  \setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
+  \setlength{\pdfpageheight}{\the\ht\@tempboxa}%
+}
+\def\AM@pagesize@boogie{%
+  \ifdim\AM@pagewidth=\z@
+    \ifdim\AM@pageheight=\z@
+      \let\AM@pagewidth\paperwidth
+      \let\AM@pageheight\paperheight
+    \fi
+  \fi
+}
+\let\AM@fitpaper@special\relax
+\def\AM@findfile#1{%
+  \AM@findfile@i{#1}{pdf}%
+  \AM@findfile@ii{#1}%
+}
+\long\def\AM@IfFileExists#1#2#3{%
+  \openin\@inputcheck=\AM@XeTeXquote#1\AM@XeTeXquote\relax
+  \ifeof\@inputcheck
+    \ifx\input@path\@undefined
+      \def\reserved@a{#3}%
+    \else
+      \def\reserved@a{\@iffileonpath{#1}{#2}{#3}}%
+    \fi
+  \else
+    \closein\@inputcheck
+    \edef\@filef@und{#1 }%
+    \def\reserved@a{#2}%
+  \fi
+  \reserved@a}
+\def\AM@setlscape{\special{pdf: put @thispage << /Rotate 90 >>}}
+\def\AM@linktodoc@special@begin{%
+  \special{pdf: annot
+                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
+\def\AM@survey@special@begin{%
+  \special{pdf: annot
+                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 /GoTo
+                         /D (pdfpages.\AM@linktodoc@page@m@ne) >>
+                >>}%
+}
+\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 XeTeX.}%
+                \else
+                  \gdef\AM@view{/Fit}%
+                \fi
+              \fi
+            \fi
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+  \endgroup
+}
+\def\AM@region@calc{}
+\let\AM@disable@includegraphics\relax
+\endinput
+%%
+%% End of file `ppxetex.def'.