summaryrefslogtreecommitdiff
path: root/macros/latex/required/graphics/graphics.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/required/graphics/graphics.dtx')
-rw-r--r--macros/latex/required/graphics/graphics.dtx19
1 files changed, 15 insertions, 4 deletions
diff --git a/macros/latex/required/graphics/graphics.dtx b/macros/latex/required/graphics/graphics.dtx
index 51ef9a4ee3..0c5c9e88ec 100644
--- a/macros/latex/required/graphics/graphics.dtx
+++ b/macros/latex/required/graphics/graphics.dtx
@@ -2,7 +2,9 @@
% \iffalse
%
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2021
+%% The LaTeX Project and any individual authors listed elsewhere
+%% in this file.
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -25,7 +27,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2020/08/30 v1.4c Standard LaTeX Graphics (DPC,SPQR)]
+ [2021/03/04 v1.4d Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -1123,7 +1125,12 @@
\ifx\filename@ext\relax
\let\filename@ext\Gin@gzext
\else
- \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}%
+% \end{macrocode}
+% \changes{v1.4d}{2021/03/04}
+% {\cs{filename@ext} instead of \cs{Gin@ext} when
+% checking for \texttt{gzip}ped graphics file.}
+% \begin{macrocode}
+ \edef\filename@ext{\filename@ext\Gin@sepdefault\Gin@gzext}%
\fi
\fi
\ifx\filename@ext\relax
@@ -1146,14 +1153,17 @@
% {Try adding an extension even if the filename had a dot AND
% if the filename without the extension exists (but doesn't have
% a known extension).}
+% \changes{v1.4d}{2021/03/03}
+% {Avoid warning when loading a file using a generic rule.}
% \begin{macrocode}
\ifnum0%
\ifx\Gin@ext\relax 1%
\else \@ifundefined{Gin@rule@\Gin@ext}{1}{0}%
\fi >0
- \let\Gin@ext\relax
+ \let\Gin@extsaved\Gin@ext
\let\Gin@savedbase\filename@base
\let\Gin@savedext\filename@ext
+ \let\Gin@ext\relax
\edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}%
\let\filename@ext\relax
\@for\Gin@temp:=\Gin@extensions\do{%
@@ -1164,6 +1174,7 @@
% Restore if no file found using the known extensions.
% \begin{macrocode}
\ifx\Gin@ext\relax
+ \let\Gin@ext\Gin@extsaved
\let\filename@base\Gin@savedbase
\let\filename@ext\Gin@savedext
\fi