pdfpages (15jun17)

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

8 files changed, 34 insertions, 33 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 1089e0443ca..7639195961a 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-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@Git@Date\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index 28826a76e2a..bc039b67beb 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{ppdvipdfmx.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for dvipdfmx (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 7a90095c8c8..fe83d97a55d 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-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{ppdvips.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for dvips (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
index ff0735971ea..f5775052121 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -8,7 +8,7 @@
 %% 
 %% This file is part of the pdfpages package.
 %% 
-%% Copyright (C) 2001-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{ppluatex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for LuaTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index c542237cd5e..afb03e2d8b5 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-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{ppnull.def}
    [\AM@Git@Date\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 eb22d6592f3..9495e1adcd6 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-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{pppdftex.def}
    [\AM@Git@Date\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 d80ca3066d6..e3a1e931f0a 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-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{ppvtex.def}
    [\AM@Git@Date\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 bcffde77730..3b75f6b23a0 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-2016 Andreas MATTHIAS
+%% Copyright (C) 2001-2017 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5h}
+\def\AM@fileversion{v0.5i}
 \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
 \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
 \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $
-\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
+\AM@Git@Date@process$Date: 2017-06-14 22:06:21 +0200 $
+\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
 \ProvidesFile{ppxetex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
@@ -51,7 +51,7 @@
     \noexpand\lowercase{%
       \noexpand\def\noexpand\type@ext{.\filename@ext}}}%
   \type@ext
-  \ifx\type@ext\G@pdf@ext
+  \ifx\type@ext\AM@pdf@ext
     \ifdefined\import@path
       \let\AM@import@path\import@path
     \else
@@ -64,6 +64,7 @@
     \def\AM@pagecount{1}%
   \fi
 }
+\def\AM@pdf@ext{.pdf}
 \begingroup
 \def\gobble@nil#1\@nil{}
 \ifnum\XeTeXversion=0