pdfpages (17apr15)

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

8 files changed, 217 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 94f2d68a4c3..8a2dc0521e6 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
@@ -42,6 +42,7 @@
 \InputIfFileExists{pdfpages.cfg}{%
   \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{}
 \DeclareOption{pdftex}{\def\AM@driver{pdftex}}
+\DeclareOption{luatex}{\def\AM@driver{luatex}}
 \DeclareOption{vtex}{\def\AM@driver{vtex}}
 \DeclareOption{xetex}{\def\AM@driver{xetex}}
 \DeclareOption{dvips}{\def\AM@driver{dvips}}
@@ -50,13 +51,15 @@
 \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}}
+  \@ifundefined{luatexversion}{%
+    \@ifundefined{pdftexversion}{%
+      \@ifundefined{XeTeXversion}{%
+        \@ifundefined{OpMode}{%
+          \def\AM@driver{null}
+        }{\gdef\AM@driver{vtex}}%
+      }{\gdef\AM@driver{xetex}}%
+    }{\gdef\AM@driver{pdftex}}%
+  }{\gdef\AM@driver{luatex}}%
   \endgroup
 }{}
 \RequirePackage{ifthen, calc, eso-pic}
@@ -1546,6 +1549,10 @@
 }
 \InputIfFileExists{pdfpages.fix}{%
   \PackageInfo{pdfpages}{Loading patch file `pdfpages.fix'}}{}
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
 \endinput
 %%
 %% End of file `pdfpages.sty'.
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index f01f17e753d..4c1ae3b89ca 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,13 +24,17 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \ProvidesFile{ppdvipdfm.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for dvipdfm (AM)]
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
 \def\AM@tmp{dvipdfm.def}
 \ifx\Gin@driver\AM@tmp\else
   \PackageWarningNoLine{pdfpages}{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index c6332ea3f7e..ae0bc06455d 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,13 +24,17 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \ProvidesFile{ppdvips.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for dvips (AM)]
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
 \def\AM@notsupported#1{%
   \PackageWarning{pdfpages}{#1 not supported by driver dvips}}
 \def\AM@getpagecount{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
new file mode 100644
index 00000000000..7f68c81f325
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -0,0 +1,162 @@
+%%
+%% This is file `ppluatex.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pdfpages.dtx  (with options: `ppluatexdef')
+%% 
+%% This file is part of the pdfpages package.
+%% 
+%% Copyright (C) 2001-2015 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.4w}
+\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: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
+\ProvidesFile{ppluatex.def}
+   [\AM@filedate\space\AM@fileversion\space
+    Pdfpages driver for luaTeX (AM)]
+\ifcase\pdfoutput
+  \input{ppnull.def}
+  \expandafter\endinput
+\fi
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
+\let\AM@Gread@@pdftex\Gread@@pdftex
+\renewcommand*{\Gread@@pdftex}[1]{%
+  \xdef\AM@currentdocname@fix{#1}%
+  \AM@Gread@@pdftex{#1}%
+}
+\def\AM@getpagecount{%
+  \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+  \pdfximage{\AM@currentdocname@fix}%
+  \edef\AM@pagecount{\the\pdflastximagepages}%
+}
+\let\AM@pagewidth\pdfpagewidth
+\let\AM@pageheight\pdfpageheight
+\def\AM@setpagedimen{%
+  \setlength{\pdfpagewidth}{\wd\@tempboxa}%
+  \setlength{\pdfpageheight}{\ht\@tempboxa + \dp\@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
+              height \ht\@tempboxa
+              depth \dp\@tempboxa
+              {/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{%
+    \pdfannot width \wd\@tempboxa
+              height \ht\@tempboxa
+              depth \dp\@tempboxa
+              {/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{%
+      \pdfthread width \wd\@tempboxa
+                 height \ht\@tempboxa
+                 depth \dp\@tempboxa
+                 attr {/I <<\threadinfodict>>}%
+                 name {\AM@threadname}%
+}
+\let\AM@thread@special@end\relax
+\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}
+\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}{\ht\@tempboxa + \dp\@tempboxa}
+  \edef\AM@region@depth{\the\@tempdima}
+}
+\let\AM@disable@includegraphics\relax
+\endinput
+%%
+%% End of file `ppluatex.def'.
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 0292858a2ea..b5fae37f777 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,13 +24,17 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \ProvidesFile{ppnull.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages dummy driver (AM)]
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
 \AM@DVIoutputtrue
 \PackageWarningNoLine{pdfpages}{%
   I will use a dummy \string\includepdf\space command\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index cf487cd4f62..4c909340139 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \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 6731736cb07..5981ce0cc30 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,13 +24,17 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \ProvidesFile{ppvtex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for VTeX (AM)]
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
 \begingroup
 \@ifundefined{ver@vtex.def}{%
   \PackageError{pdfpages}
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index 4a092ede794..7f034f417ec 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2012 Andreas MATTHIAS
+%% Copyright (C) 2001-2015 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,13 +24,17 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4v}
+\def\AM@fileversion{v0.4w}
 \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
+\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
+%%    \def\AM@getpagecount{%
+%%      \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%%      \edef\AM@pagecount{\the\pdflastximagepages}%
+%%    }
 \begingroup
 \@ifundefined{ver@xetex.def}{%
   \PackageError{pdfpages}