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/tex/latex/pdfpages/pppdftex.def | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pdfpages/pppdftex.def') 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}} -- cgit v1.2.3