CTAN sync 202009020303

16 files changed, 135 insertions, 231 deletions

diff --git a/macros/latex-dev/required/graphics/README.md b/macros/latex-dev/required/graphics/README.md
index 08cd8cabde..2d9bf4c8eb 100644
--- a/macros/latex-dev/required/graphics/README.md
+++ b/macros/latex-dev/required/graphics/README.md
@@ -1,7 +1,7 @@
 The LaTeX `graphics` bundle
 ===========================
 
-Release 2020-10-01 pre-release 2
+Release 2020-10-01 pre-release 4
 
 Overview
 --------
diff --git a/macros/latex-dev/required/graphics/changes.txt b/macros/latex-dev/required/graphics/changes.txt
index bbe1893e63..afb7698a48 100644
--- a/macros/latex-dev/required/graphics/changes.txt
+++ b/macros/latex-dev/required/graphics/changes.txt
@@ -4,6 +4,24 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2020-08-21  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* graphics.dtx: add additional trial with known extensions if
+	the supplied filename+extension exist, but the extension is
+	not a known file extension (gh/355).
+
+2020-08-21  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* grfguide.tex: replace a.ps and a.pdf by a.eps gh/357
+
+2020-08-13  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* graphics.dtx: Normalise \endlinechar while reading files gh/286
+
+2020-08-09  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* graphics.dtx: Move viewport and trim code from graphicx to graphics.
+
 2020-05-28  David Carlisle  <David.Carlisle@latex-project.org>
 
 	* lscape.dtx: delay saving \cs{@makefcolumn} gh340
diff --git a/macros/latex-dev/required/graphics/color.pdf b/macros/latex-dev/required/graphics/color.pdf
index dca850b128..fd2a921e27 100644
--- a/macros/latex-dev/required/graphics/color.pdf
+++ b/macros/latex-dev/required/graphics/color.pdf
diff --git a/macros/latex-dev/required/graphics/drivers.pdf b/macros/latex-dev/required/graphics/drivers.pdf
index 3e6c1a9d76..ef747e3d6e 100644
--- a/macros/latex-dev/required/graphics/drivers.pdf
+++ b/macros/latex-dev/required/graphics/drivers.pdf
diff --git a/macros/latex-dev/required/graphics/epsfig.pdf b/macros/latex-dev/required/graphics/epsfig.pdf
index 816d353c51..c7d248eb2b 100644
--- a/macros/latex-dev/required/graphics/epsfig.pdf
+++ b/macros/latex-dev/required/graphics/epsfig.pdf
diff --git a/macros/latex-dev/required/graphics/graphics.dtx b/macros/latex-dev/required/graphics/graphics.dtx
index b88ef1e066..51ef9a4ee3 100644
--- a/macros/latex-dev/required/graphics/graphics.dtx
+++ b/macros/latex-dev/required/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/macros/latex-dev/required/graphics/graphics.pdf b/macros/latex-dev/required/graphics/graphics.pdf
index aeac04b4c0..bbd2ce829d 100644
--- a/macros/latex-dev/required/graphics/graphics.pdf
+++ b/macros/latex-dev/required/graphics/graphics.pdf
diff --git a/macros/latex-dev/required/graphics/graphicx.dtx b/macros/latex-dev/required/graphics/graphicx.dtx
index 3cf15925d3..b10c67c794 100644
--- a/macros/latex-dev/required/graphics/graphicx.dtx
+++ b/macros/latex-dev/required/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
diff --git a/macros/latex-dev/required/graphics/graphicx.pdf b/macros/latex-dev/required/graphics/graphicx.pdf
index 6bc77b28ee..b5fd17da22 100644
--- a/macros/latex-dev/required/graphics/graphicx.pdf
+++ b/macros/latex-dev/required/graphics/graphicx.pdf
diff --git a/macros/latex-dev/required/graphics/grfguide.pdf b/macros/latex-dev/required/graphics/grfguide.pdf
index b385e64957..f3ed223f3f 100644
--- a/macros/latex-dev/required/graphics/grfguide.pdf
+++ b/macros/latex-dev/required/graphics/grfguide.pdf
diff --git a/macros/latex-dev/required/graphics/grfguide.tex b/macros/latex-dev/required/graphics/grfguide.tex
index d25bcac27b..8df07c5a6a 100644
--- a/macros/latex-dev/required/graphics/grfguide.tex
+++ b/macros/latex-dev/required/graphics/grfguide.tex
@@ -8,151 +8,21 @@
 %%
 %% This file has the LPPL maintenance status "maintained".
 
-\begin{filecontents*}{a.ps}
-%!
-%%BoundingBox:0 0 72 72
+\begin{filecontents*}{a.eps}
+%!PS-Adobe-2.0 EPSF-2.0
+%%BoundingBox: 0 0 72 72
 0 0 moveto
 72 72 rlineto
 72 neg 0 rlineto
 72 72 neg rlineto
 stroke
+newpath
 0 0 moveto
-/Times-Roman findfont
-72 scalefont
-setfont
-(A) show
-showpage
-\end{filecontents*}
-\begin{filecontents*}{a.pdf}
-%PDF-1.4
-%%%%%
-1 0  obj
-<<
-/Pages 2 0 R
-/Type /Catalog
->>
- endobj
-2 0  obj
-<<
-/Kids [3 0 R]
-/Type /Pages
-/Count 1
->>
- endobj
-3 0  obj
-<<
-/Rotate 0
-/Parent 2 0 R
-/MediaBox [0 0 72 72]
- /Resources
-<<
-/ExtGState 4 0 R
-/Font 5 0 R
-/ProcSet [/PDF /Text]
->>
-/pdftk_PageNum 1
-/Type /Page
-/Contents 6 0 R
->>
- endobj
-4 0  obj
-<<
-/R7 7 0 R
->>
- endobj
-5 0  obj
-<<
-/R8 8 0 R
->>
- endobj
-6 0  obj
-<<
-/Length 135
->>
-stream
-q 0.1 0 0 0.1 0 0 cm
-/R7 gs
-10 w
-0 G
-0 0 m
-720 720 l
-0 720 l
-720 0 l
-S
-0 g
-q
-10 0 0 10 0 0 cm BT
-/R8 72 Tf
-1 0 0 1 0 0 Tm
-(A)Tj
-ET
-Q
-Q
-
- endstream
- endobj
-7 0  obj
-<<
-/Type /ExtGState
-/OPM 1
->>
- endobj
-8 0  obj
-<<
-/BaseFont /Times-Roman
-/LastChar 65
-/Subtype /Type1
-/FontDescriptor 9 0 R
-/Widths [722]
-/Type /Font
-/Encoding /WinAnsiEncoding
-/FirstChar 65
->>
- endobj
-9 0  obj
-<<
-/FontName /Times-Roman
-/StemV 105
-/CharSet (/A)
-/Ascent 674
-/Flags 65568
-/Descent 0
-/ItalicAngle 0
-/MissingWidth 250
-/FontBBox [0 0 706 674]
-/Type /FontDescriptor
-/CapHeight 674
->>
- endobj
-10 0  obj
-<<
-/Producer (GPL Ghostscript 9.06)
-/ModDate (D:20140426202438+01'00')
-/CreationDate (D:20140426202438+01'00')
->>
-endobj xref
-0 11
-0000000000 65535  f
-0000000015 00000  n
-0000000066 00000  n
-0000000125 00000  n
-0000000308 00000  n
-0000000341 00000  n
-0000000374 00000  n
-0000000563 00000  n
-0000000610 00000  n
-0000000774 00000  n
-0000000975 00000  n
-trailer
-
-<<
-/Info 10 0 R
-/Root 1 0 R
-/Size 11
-/ID [<4ca1370d594acd28b9d948a5e8b925c3> <4ca1370d594acd28b9d948a5e8b925c3>]
->>
-startxref
-1106
+20 40 lineto
+40 0 lineto
+10 20 moveto
+30 20 lineto
+stroke
 %%EOF
 \end{filecontents*}
 \documentclass{ltxguide}
@@ -190,7 +60,7 @@ startxref
 \begin{document}
 \title{Packages in the `graphics' bundle}
 \author{D. P. Carlisle \and The \LaTeX3 Project}
-\date{2017-06-01}
+\date{2020-08-21}
 
 \maketitle
 
@@ -789,24 +659,24 @@ left---\fbox{\includegraphics{a}}---right
 With different options supplied to |\includegraphics|.
 
 No optional argument.\\
-left---\fbox{\includegraphics{a}}---right
+left---\fbox{\includegraphics{a.eps}}---right
 
 \gs |\scalebox{0.5}{\includegraphics{a}}|\\
 \gx |\includegraphics[scale=.5]{a}|\\
-left---\fbox{\includegraphics[scale=.5]{a}}---right
+left---\fbox{\includegraphics[scale=.5]{a.eps}}---right
 
 \gs |\includegraphics[15,10][35,45]{a}}|\\
 \gx |\includegraphics[viewport= 15 10 35 45]{a}|\\
-left---\fbox{\includegraphics[viewport= 15 10 35 45]{a}}---right
+left---\fbox{\includegraphics[viewport= 15 10 35 45]{a.eps}}---right
 
 \gs |\includegraphics*[15,10][35,45]{a}}|\\
 \gx |\includegraphics[viewport= 15 10 35 45,clip]{a}|\\
-left---\fbox{\includegraphics[viewport= 15 10 35 45,clip]{a}}---right
+left---\fbox{\includegraphics[viewport= 15 10 35 45,clip]{a.eps}}---right
 
 \gs |\scalebox{0.5}{\includegraphics{a}}|
                    and |draft| option.\\
 \gx |\includegraphics[scale=.5, draft]{a}|\\
-left---\fbox{\includegraphics[scale=.5, draft]{a}}---right
+left---\fbox{\includegraphics[scale=.5, draft]{a.eps}}---right
 
 \subsection{Other commands in the \package{graphics} package}
 
@@ -843,7 +713,7 @@ Note that if the extension is not specified in the |\includegraphics|
 command, the graphics file must exist at the time \LaTeX\ is run, as
 the existence of the file is used to determine which extension from
 the list to choose. However if a file extension \emph{is} specified,
-e.g.\ |\includegraphics{a.ps}| instead of |\includegraphics{a}|, then
+e.g.\ |\includegraphics{a.eps}| instead of |\includegraphics{a}|, then
 the graphics file need not exist at the time \LaTeX\ is used. (In
 particular it may be created on the fly by  the \m{command}
 specified in the |\DeclareGraphicsRule| command described below.)
diff --git a/macros/latex-dev/required/graphics/keyval.pdf b/macros/latex-dev/required/graphics/keyval.pdf
index cbefa8b143..021d73b4be 100644
--- a/macros/latex-dev/required/graphics/keyval.pdf
+++ b/macros/latex-dev/required/graphics/keyval.pdf
diff --git a/macros/latex-dev/required/graphics/lscape.pdf b/macros/latex-dev/required/graphics/lscape.pdf
index 020b0f8af2..2b3c32d0bf 100644
--- a/macros/latex-dev/required/graphics/lscape.pdf
+++ b/macros/latex-dev/required/graphics/lscape.pdf
diff --git a/macros/latex-dev/required/graphics/rotating.pdf b/macros/latex-dev/required/graphics/rotating.pdf
index 822bc41879..210774b38f 100644
--- a/macros/latex-dev/required/graphics/rotating.pdf
+++ b/macros/latex-dev/required/graphics/rotating.pdf
diff --git a/macros/latex-dev/required/graphics/rotex.pdf b/macros/latex-dev/required/graphics/rotex.pdf
index 2481248e53..a1d8967674 100644
--- a/macros/latex-dev/required/graphics/rotex.pdf
+++ b/macros/latex-dev/required/graphics/rotex.pdf
diff --git a/macros/latex-dev/required/graphics/trig.pdf b/macros/latex-dev/required/graphics/trig.pdf
index 08570f5753..6ea9265a77 100644
--- a/macros/latex-dev/required/graphics/trig.pdf
+++ b/macros/latex-dev/required/graphics/trig.pdf