From 39cd97a626f568415a51c53b26882f8af955d482 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Nov 2019 22:20:30 +0000 Subject: pdfpages (22nov19) git-svn-id: svn://tug.org/texlive/trunk@52895 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | Bin 292655 -> 292653 bytes .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 21 +++++++++++++-------- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 8 ++++---- .../texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 16 +++++++++------- Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 16 +++++++++------- Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 8 ++++---- 10 files changed, 55 insertions(+), 46 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf index 3ef941395f1..c4193d39ec5 100644 Binary files a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf and b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf differ diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index d73bd1226f1..d1b10ffe56e 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx @@ -2,7 +2,7 @@ % \iffalse % %<*(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmxdef,ppnulldef)> -%% Copyright (C) 2001-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -27,12 +27,12 @@ %<*dtx> \makeatletter % -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ % % % @@ -84,7 +84,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{4964} +% \CheckSum{4965} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -3444,15 +3444,20 @@ \let\AM@fitpaper@special\relax % \end{macrocode} % Find file. +% +% Package grffile.sty is a dummy package nowadays, and |\grffile@IfFileExists| +% doesn't exists anymore. (21.11.2019) % \begin{macrocode} \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}% + \let\AM@IfFileExists\IfFileExists + \@ifpackageloaded{grffile}{% + \@ifundefined{grffile@IfFileExists}{}{% + \let\AM@IfFileExists\grffile@IfFileExists}% + }{}% } % \end{macrocode} % Rotate page. diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index b01853cb314..3d500e40880 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \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 6ac4cd13561..4ef486fc996 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \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 6c2496f723c..10b0c2b8681 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \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 deb9be1e91d..bd861ba8f43 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \ProvidesFile{ppluatex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for LuaTeX (AM)] @@ -82,9 +82,11 @@ \AM@findfile@ii{#1}% } \AtBeginDocument{% -\@ifpackageloaded{grffile}{% - \let\AM@IfFileExists\grffile@IfFileExists}{% - \let\AM@IfFileExists\IfFileExists}% + \let\AM@IfFileExists\IfFileExists + \@ifpackageloaded{grffile}{% + \@ifundefined{grffile@IfFileExists}{}{% + \let\AM@IfFileExists\grffile@IfFileExists}% + }{}% } \def\AM@setRotate{\PLS@Rotate{90}} \def\AM@resetRotate{\PLS@Rotate{0}} diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index b6d042b8460..9b9da4fe6bb 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \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 8580cca8f72..9d59ada62c7 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \ProvidesFile{pppdftex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] @@ -99,9 +99,11 @@ \AM@findfile@ii{#1}% } \AtBeginDocument{% -\@ifpackageloaded{grffile}{% - \let\AM@IfFileExists\grffile@IfFileExists}{% - \let\AM@IfFileExists\IfFileExists}% + \let\AM@IfFileExists\IfFileExists + \@ifpackageloaded{grffile}{% + \@ifundefined{grffile@IfFileExists}{}{% + \let\AM@IfFileExists\grffile@IfFileExists}% + }{}% } \def\AM@setRotate{\PLS@Rotate{90}} \def\AM@resetRotate{\PLS@Rotate{0}} diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index 1aadce93261..0fea33492b7 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \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 e55f2b58052..9b4be649542 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-2017 Andreas MATTHIAS +%% Copyright (C) 2001-2019 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 . %% -\def\AM@fileversion{v0.5n} +\def\AM@fileversion{v0.5o} \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: 2019-09-21 22:35:13 +0200 $ -\AM@Git@SHA@process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $ +\AM@Git@Date@process$Date: 2019-11-21 22:42:07 +0100 $ +\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] -- cgit v1.2.3