summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/pdfpages/pdfpages.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-23 03:00:33 +0000
committerNorbert Preining <norbert@preining.info>2019-11-23 03:00:33 +0000
commitce62a0079d7ae24531c203f5758502c163280ff7 (patch)
treec51a68421fef887f966f9148939460b1acdea834 /macros/latex/contrib/pdfpages/pdfpages.dtx
parent28453b76f5307a4e4f018d469cdd8eb18e7d048b (diff)
CTAN sync 201911230300
Diffstat (limited to 'macros/latex/contrib/pdfpages/pdfpages.dtx')
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.dtx21
1 files changed, 13 insertions, 8 deletions
diff --git a/macros/latex/contrib/pdfpages/pdfpages.dtx b/macros/latex/contrib/pdfpages/pdfpages.dtx
index d73bd1226f..d1b10ffe56 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.dtx
+++ b/macros/latex/contrib/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
%</dtx>
-\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 $
%</!(example1,example2,example3,installer)>
%
%
@@ -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.