xindex (1sep20)

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

2 files changed, 100 insertions, 84 deletions

diff --git a/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx b/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
index b88ef1e0666..51ef9a4ee39 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
@@ -25,7 +25,7 @@
 %<driver> \ProvidesFile{graphics.drv}
 % \fi
 %         \ProvidesFile{graphics.dtx}
-          [2019/11/30 v1.4a  Standard LaTeX Graphics (DPC,SPQR)]
+          [2020/08/30 v1.4c  Standard LaTeX Graphics (DPC,SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -1134,30 +1134,40 @@
   \else
     \Gin@getbase{\Gin@sepdefault\filename@ext}%
 %    \end{macrocode}
-% At this point try adding an extension, even if the filename has one so
-% that \verb|a.b| may find \verb|a.b.png| if no file is found then revert
-% to the extension as given to get better error reporting.
+% At this point try adding an extension, either if the given file name
+% has none, or if the extension matches no existing graphics inclusion
+% rule, so that \verb|a.b| may find \verb|a.b.png|, if only the latter
+% or if both files exist. If no file is found then revert to the
+% extension as given to get better error reporting.
 %
 % \changes{v1.3d}{2019/11/01}
-%     {Try adding an extension even if the filenam had a dot.}
-%    \begin{macrocode}
-\ifx\Gin@ext\relax
-\let\Gin@savedbase\filename@base
-\let\Gin@savedext\filename@ext
-  \edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}%
-  \let\filename@ext\relax
-   \@for\Gin@temp:=\Gin@extensions\do{%
-      \ifx\Gin@ext\relax
-        \Gin@getbase\Gin@temp
-      \fi}%
-%    \end{macrocode}
-% Restore if no file found using theknown extensions.
+%     {Try adding an extension even if the filename had a dot.}
+% \changes{v1.4c}{2020/08/30}
+%     {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).}
+%    \begin{macrocode}
+    \ifnum0%
+        \ifx\Gin@ext\relax 1%
+        \else \@ifundefined{Gin@rule@\Gin@ext}{1}{0}%
+        \fi >0
+      \let\Gin@ext\relax
+      \let\Gin@savedbase\filename@base
+      \let\Gin@savedext\filename@ext
+      \edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}%
+      \let\filename@ext\relax
+      \@for\Gin@temp:=\Gin@extensions\do{%
+          \ifx\Gin@ext\relax
+            \Gin@getbase\Gin@temp
+          \fi}%
+%    \end{macrocode}
+% Restore if no file found using the known extensions.
 %    \begin{macrocode}
-  \ifx\Gin@ext\relax
-    \let\filename@base\Gin@savedbase
-    \let\filename@ext\Gin@savedext
-  \fi
-\fi
+      \ifx\Gin@ext\relax
+        \let\filename@base\Gin@savedbase
+        \let\filename@ext\Gin@savedext
+      \fi
+    \fi
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1428,7 +1438,7 @@
 % starting with |%%BoundingBox| and returns the result
 % by setting four dimension registers
 % |\Gin@llx|, |\Gin@lly|, |\Gin@urx| and |\Gin@ury|.
-% \changes{v0.5e}{1994/1l/02}
+% \changes{v0.5e}{1994/11/02}
 %     {Fix the catcodes of \cs{endlinechar} and ctrl-D}
 % \changes{v0.7a}{1995/04/11}
 %     {Fix more catcodes, for binary headers of eps files}
@@ -1474,9 +1484,12 @@
 %     {Allow TAB in DSC comments graphics/2587}
 % \changes{v1.0i}{1999/01/07}
 %     {Fix catcode of hyphen. graphics/2846}
+% \changes{v1.4b}{2020/08/09}
+%     {Normalise \cs{endlinechar} gh/286}
 %    \begin{macrocode}
   \catcode`\ 10 %
   \catcode`\^^I10 %
+  \endlinechar13 %
   \catcode\endlinechar5 %
   \@makeother\:%
   \@makeother\-%
@@ -1574,6 +1587,7 @@
   \fi}
 %    \end{macrocode}
 % \end{macro}
+%
 % \begin{macro}{\Gread@parse@bb}
 % We have |%%BoundingBox| and what follows is not `(atend)' so we
 % will parse the rest of the line as a BB with four elements.
@@ -1596,6 +1610,68 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% Viewport and trim, originally in |graphicx|.
+%
+% \begin{macro}{\Gin@viewport}
+% \changes{v1.0c}{1996/10/31}{Original bb saved}
+% If a viewport is specified, reset the bounding box coordinates
+% by adding the original origin, |\Gin@llx|, |\Gin@lly| to the new
+% values specified as the viewport. The original Bounding box
+% coordinates are saved in |\Gin@ollx|\ldots\ some drivers
+% might need this information (currently just |tcidvi|).
+%    \begin{macrocode}
+\def\Gin@viewport{%
+  \let\Gin@ollx\Gin@llx
+  \let\Gin@olly\Gin@lly
+  \let\Gin@ourx\Gin@urx
+  \let\Gin@oury\Gin@ury
+  \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@
+                      \edef\Gin@urx{\strip@pt\dimen@}%
+  \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@
+                      \edef\Gin@ury{\strip@pt\dimen@}%
+  \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@
+                      \edef\Gin@llx{\strip@pt\dimen@}%
+  \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
+                      \edef\Gin@lly{\strip@pt\dimen@}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Gin@trim}
+% \changes{v1.0c}{1996/10/31}{Original bb saved}
+% If a trim is specified, reset the bounding box coordinates
+% by trimming the four specified values off each side of the
+% graphic.
+%    \begin{macrocode}
+\def\Gin@trim{%
+  \let\Gin@ollx\Gin@llx
+  \let\Gin@olly\Gin@lly
+  \let\Gin@ourx\Gin@urx
+  \let\Gin@oury\Gin@ury
+  \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@
+                      \edef\Gin@llx{\strip@pt\dimen@}%
+  \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
+                      \edef\Gin@lly{\strip@pt\dimen@}%
+  \dimen@\Gin@urx\p@\advance\dimen@ -\Gin@vurx\p@
+                      \edef\Gin@urx{\strip@pt\dimen@}%
+  \dimen@\Gin@ury\p@\advance\dimen@ -\Gin@vury\p@
+                      \edef\Gin@ury{\strip@pt\dimen@}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Gin@vllx}
+% \begin{macro}{\Gin@vlly}
+% \begin{macro}{\Gin@vurx}
+% \begin{macro}{\Gin@vury}
+% Four macros to hold the modifiers for the bounding box for viewport
+% and trim specifications.
+%    \begin{macrocode}
+\let\Gin@vllx\Gin@llx\let\Gin@vlly\Gin@llx
+\let\Gin@vurx\Gin@llx\let\Gin@vury\Gin@llx
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \subsection{Rotation}
 %
diff --git a/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx b/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
index 3cf15925d3f..b10c67c7946 100644
--- a/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
+++ b/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
@@ -17,7 +17,7 @@
 %<driver> \ProvidesFile{graphicx.drv}
 % \fi
 %         \ProvidesFile{graphicx.dtx}
-          [2019/11/30 v1.2a  Enhanced LaTeX Graphics (DPC,SPQR)]
+          [2020/09/09 v1.2b  Enhanced LaTeX Graphics (DPC,SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -342,66 +342,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\Gin@viewport}
-% \changes{v1.0c}{1996/10/31}{Original bb saved}
-% If a viewport is specified, reset the bounding box coordinates
-% by adding the original origin, |\Gin@llx|, |\Gin@lly| to the new
-% values specified as the viewport. The original Bounding box
-% coordinates are saved in |\Gin@ollx|\ldots\ some drivers
-% might need this information (currently just |tcidvi|).
-%    \begin{macrocode}
-\def\Gin@viewport{%
-  \let\Gin@ollx\Gin@llx
-  \let\Gin@olly\Gin@lly
-  \let\Gin@ourx\Gin@urx
-  \let\Gin@oury\Gin@ury
-  \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@
-                      \edef\Gin@urx{\strip@pt\dimen@}%
-  \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@
-                      \edef\Gin@ury{\strip@pt\dimen@}%
-  \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@
-                      \edef\Gin@llx{\strip@pt\dimen@}%
-  \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
-                      \edef\Gin@lly{\strip@pt\dimen@}}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Gin@trim}
-% \changes{v1.0c}{1996/10/31}{Original bb saved}
-% If a trim is specified, reset the bounding box coordinates
-% by trimming the four specified values off each side of the
-% graphic.
-%    \begin{macrocode}
-\def\Gin@trim{%
-  \let\Gin@ollx\Gin@llx
-  \let\Gin@olly\Gin@lly
-  \let\Gin@ourx\Gin@urx
-  \let\Gin@oury\Gin@ury
-  \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@
-                      \edef\Gin@llx{\strip@pt\dimen@}%
-  \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@
-                      \edef\Gin@lly{\strip@pt\dimen@}%
-  \dimen@\Gin@urx\p@\advance\dimen@ -\Gin@vurx\p@
-                      \edef\Gin@urx{\strip@pt\dimen@}%
-  \dimen@\Gin@ury\p@\advance\dimen@ -\Gin@vury\p@
-                      \edef\Gin@ury{\strip@pt\dimen@}}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Gin@vllx}
-% \begin{macro}{\Gin@vlly}
-% \begin{macro}{\Gin@vurx}
-% \begin{macro}{\Gin@vury}
-% Four macros to hold the modifiers for the bounding box for viewport
-% and trim specifications.
-%    \begin{macrocode}
-\let\Gin@vllx\Gin@llx\let\Gin@vlly\Gin@llx
-\let\Gin@vurx\Gin@llx\let\Gin@vury\Gin@llx
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
 %
 % \begin{key}{Gin}{angle}
 % Specify a rotation. This is just handled by wrapping the