texlive[56238] Master/texmf-dist: xindex (1sep20)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 1 23:35:44 CEST 2020
Revision: 56238
http://tug.org/svn/texlive?view=revision&revision=56238
Author: karl
Date: 2020-09-01 23:35:44 +0200 (Tue, 01 Sep 2020)
Log Message:
-----------
xindex (1sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex-dev/graphics/README.md
trunk/Master/texmf-dist/doc/latex-dev/graphics/changes.txt
trunk/Master/texmf-dist/doc/latex-dev/graphics/color.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/drivers.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/epsfig.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/graphics.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/graphicx.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/grfguide.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/grfguide.tex
trunk/Master/texmf-dist/doc/latex-dev/graphics/keyval.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/lscape.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/rotating.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/rotex.pdf
trunk/Master/texmf-dist/doc/latex-dev/graphics/trig.pdf
trunk/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
trunk/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
trunk/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
trunk/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex-dev/graphics/README.md 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/doc/latex-dev/graphics/README.md 2020-09-01 21:35:44 UTC (rev 56238)
@@ -1,7 +1,7 @@
The LaTeX `graphics` bundle
===========================
-Release 2020-10-01 pre-release 2
+Release 2020-10-01 pre-release 4
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/changes.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex-dev/graphics/changes.txt 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/doc/latex-dev/graphics/changes.txt 2020-09-01 21:35:44 UTC (rev 56238)
@@ -4,6 +4,24 @@
are not part of the distribution.
=======================================================================
+2020-08-21 Phelype Oleinik <phelype.oleinik at 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 at latex-project.org>
+
+ * grfguide.tex: replace a.ps and a.pdf by a.eps gh/357
+
+2020-08-13 David Carlisle <David.Carlisle at latex-project.org>
+
+ * graphics.dtx: Normalise \endlinechar while reading files gh/286
+
+2020-08-09 David Carlisle <David.Carlisle at latex-project.org>
+
+ * graphics.dtx: Move viewport and trim code from graphicx to graphics.
+
2020-05-28 David Carlisle <David.Carlisle at latex-project.org>
* lscape.dtx: delay saving \cs{@makefcolumn} gh340
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/drivers.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/epsfig.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/graphics.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/graphicx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/grfguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/grfguide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex-dev/graphics/grfguide.tex 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/doc/latex-dev/graphics/grfguide.tex 2020-09-01 21:35:44 UTC (rev 56238)
@@ -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 @@
\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 @@
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 @@
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.)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/keyval.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/lscape.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/rotating.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/rotex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex-dev/graphics/trig.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/source/latex-dev/graphics/graphics.dtx 2020-09-01 21:35:44 UTC (rev 56238)
@@ -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 at getbase{\Gin at sepdefault\filename at 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.}
+% {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}
-\ifx\Gin at ext\relax
-\let\Gin at savedbase\filename at base
-\let\Gin at savedext\filename at ext
- \edef\filename at base{\filename at base\Gin at sepdefault\filename at ext}%
- \let\filename at ext\relax
- \@for\Gin at temp:=\Gin at extensions\do{%
- \ifx\Gin at ext\relax
- \Gin at getbase\Gin at temp
- \fi}%
+ \ifnum0%
+ \ifx\Gin at ext\relax 1%
+ \else \@ifundefined{Gin at rule@\Gin at ext}{1}{0}%
+ \fi >0
+ \let\Gin at ext\relax
+ \let\Gin at savedbase\filename at base
+ \let\Gin at savedext\filename at ext
+ \edef\filename at base{\filename at base\Gin at sepdefault\filename at ext}%
+ \let\filename at ext\relax
+ \@for\Gin at temp:=\Gin at extensions\do{%
+ \ifx\Gin at ext\relax
+ \Gin at getbase\Gin at temp
+ \fi}%
% \end{macrocode}
-% Restore if no file found using theknown extensions.
+% Restore if no file found using the known extensions.
% \begin{macrocode}
- \ifx\Gin at ext\relax
- \let\filename at base\Gin at savedbase
- \let\filename at ext\Gin at savedext
- \fi
-\fi
+ \ifx\Gin at ext\relax
+ \let\filename at base\Gin at savedbase
+ \let\filename at ext\Gin at savedext
+ \fi
+ \fi
% \end{macrocode}
%
% \begin{macrocode}
@@ -1428,7 +1438,7 @@
% starting with |%%BoundingBox| and returns the result
% by setting four dimension registers
% |\Gin at llx|, |\Gin at lly|, |\Gin at urx| and |\Gin at 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 at 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,7 +1610,69 @@
% \end{macrocode}
% \end{macro}
%
+% Viewport and trim, originally in |graphicx|.
%
+% \begin{macro}{\Gin at 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 at llx|, |\Gin at lly| to the new
+% values specified as the viewport. The original Bounding box
+% coordinates are saved in |\Gin at ollx|\ldots\ some drivers
+% might need this information (currently just |tcidvi|).
+% \begin{macrocode}
+\def\Gin at viewport{%
+ \let\Gin at ollx\Gin at llx
+ \let\Gin at olly\Gin at lly
+ \let\Gin at ourx\Gin at urx
+ \let\Gin at oury\Gin at ury
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vurx\p@
+ \edef\Gin at urx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vury\p@
+ \edef\Gin at ury{\strip at pt\dimen@}%
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
+ \edef\Gin at llx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
+ \edef\Gin at lly{\strip at pt\dimen@}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Gin at 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 at trim{%
+ \let\Gin at ollx\Gin at llx
+ \let\Gin at olly\Gin at lly
+ \let\Gin at ourx\Gin at urx
+ \let\Gin at oury\Gin at ury
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
+ \edef\Gin at llx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
+ \edef\Gin at lly{\strip at pt\dimen@}%
+ \dimen@\Gin at urx\p@\advance\dimen@ -\Gin at vurx\p@
+ \edef\Gin at urx{\strip at pt\dimen@}%
+ \dimen@\Gin at ury\p@\advance\dimen@ -\Gin at vury\p@
+ \edef\Gin at ury{\strip at pt\dimen@}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Gin at vllx}
+% \begin{macro}{\Gin at vlly}
+% \begin{macro}{\Gin at vurx}
+% \begin{macro}{\Gin at vury}
+% Four macros to hold the modifiers for the bounding box for viewport
+% and trim specifications.
+% \begin{macrocode}
+\let\Gin at vllx\Gin at llx\let\Gin at vlly\Gin at llx
+\let\Gin at vurx\Gin at llx\let\Gin at vury\Gin at llx
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% \subsection{Rotation}
%
% As above, we will re-use some existing local registers.
Modified: trunk/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/source/latex-dev/graphics/graphicx.dtx 2020-09-01 21:35:44 UTC (rev 56238)
@@ -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,67 +342,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\Gin at 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 at llx|, |\Gin at lly| to the new
-% values specified as the viewport. The original Bounding box
-% coordinates are saved in |\Gin at ollx|\ldots\ some drivers
-% might need this information (currently just |tcidvi|).
-% \begin{macrocode}
-\def\Gin at viewport{%
- \let\Gin at ollx\Gin at llx
- \let\Gin at olly\Gin at lly
- \let\Gin at ourx\Gin at urx
- \let\Gin at oury\Gin at ury
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vurx\p@
- \edef\Gin at urx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vury\p@
- \edef\Gin at ury{\strip at pt\dimen@}%
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
- \edef\Gin at llx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
- \edef\Gin at lly{\strip at pt\dimen@}}
-% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\Gin at 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 at trim{%
- \let\Gin at ollx\Gin at llx
- \let\Gin at olly\Gin at lly
- \let\Gin at ourx\Gin at urx
- \let\Gin at oury\Gin at ury
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
- \edef\Gin at llx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
- \edef\Gin at lly{\strip at pt\dimen@}%
- \dimen@\Gin at urx\p@\advance\dimen@ -\Gin at vurx\p@
- \edef\Gin at urx{\strip at pt\dimen@}%
- \dimen@\Gin at ury\p@\advance\dimen@ -\Gin at vury\p@
- \edef\Gin at ury{\strip at pt\dimen@}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Gin at vllx}
-% \begin{macro}{\Gin at vlly}
-% \begin{macro}{\Gin at vurx}
-% \begin{macro}{\Gin at vury}
-% Four macros to hold the modifiers for the bounding box for viewport
-% and trim specifications.
-% \begin{macrocode}
-\let\Gin at vllx\Gin at llx\let\Gin at vlly\Gin at llx
-\let\Gin at vurx\Gin at llx\let\Gin at vury\Gin at 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
% |\includegraphics| command in a call to the internal version of
Modified: trunk/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty 2020-09-01 21:35:44 UTC (rev 56238)
@@ -29,7 +29,7 @@
\DeclareCurrentRelease{}{2019-10-01}
\ProvidesPackage{graphics}
- [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)]
+ [2020/08/30 v1.4c Standard LaTeX Graphics (DPC,SPQR)]
\edef\Gin at codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -212,20 +212,24 @@
\fi}%
\else
\Gin at getbase{\Gin at sepdefault\filename at ext}%
-\ifx\Gin at ext\relax
-\let\Gin at savedbase\filename at base
-\let\Gin at savedext\filename at ext
- \edef\filename at base{\filename at base\Gin at sepdefault\filename at ext}%
- \let\filename at ext\relax
- \@for\Gin at temp:=\Gin at extensions\do{%
+ \ifnum0%
+ \ifx\Gin at ext\relax 1%
+ \else \@ifundefined{Gin at rule@\Gin at ext}{1}{0}%
+ \fi >0
+ \let\Gin at ext\relax
+ \let\Gin at savedbase\filename at base
+ \let\Gin at savedext\filename at ext
+ \edef\filename at base{\filename at base\Gin at sepdefault\filename at ext}%
+ \let\filename at ext\relax
+ \@for\Gin at temp:=\Gin at extensions\do{%
+ \ifx\Gin at ext\relax
+ \Gin at getbase\Gin at temp
+ \fi}%
\ifx\Gin at ext\relax
- \Gin at getbase\Gin at temp
- \fi}%
- \ifx\Gin at ext\relax
- \let\filename at base\Gin at savedbase
- \let\filename at ext\Gin at savedext
- \fi
-\fi
+ \let\filename at base\Gin at savedbase
+ \let\filename at ext\Gin at savedext
+ \fi
+ \fi
\ifx\Gin at ext\relax
\@warning{File `#1' not found}%
\def\Gin at base{\filename at area\filename at base}%
@@ -343,6 +347,7 @@
\dospecials
\catcode`\ 10 %
\catcode`\^^I10 %
+ \endlinechar13 %
\catcode\endlinechar5 %
\@makeother\:%
\@makeother\-%
@@ -400,6 +405,34 @@
\Gin at defaultbp\Gin at urx{#3}%
\Gin at defaultbp\Gin at ury{#4}}%
\def\Gread at atend{atend}
+\def\Gin at viewport{%
+ \let\Gin at ollx\Gin at llx
+ \let\Gin at olly\Gin at lly
+ \let\Gin at ourx\Gin at urx
+ \let\Gin at oury\Gin at ury
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vurx\p@
+ \edef\Gin at urx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vury\p@
+ \edef\Gin at ury{\strip at pt\dimen@}%
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
+ \edef\Gin at llx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
+ \edef\Gin at lly{\strip at pt\dimen@}}
+\def\Gin at trim{%
+ \let\Gin at ollx\Gin at llx
+ \let\Gin at olly\Gin at lly
+ \let\Gin at ourx\Gin at urx
+ \let\Gin at oury\Gin at ury
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
+ \edef\Gin at llx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
+ \edef\Gin at lly{\strip at pt\dimen@}%
+ \dimen@\Gin at urx\p@\advance\dimen@ -\Gin at vurx\p@
+ \edef\Gin at urx{\strip at pt\dimen@}%
+ \dimen@\Gin at ury\p@\advance\dimen@ -\Gin at vury\p@
+ \edef\Gin at ury{\strip at pt\dimen@}}
+\let\Gin at vllx\Gin at llx\let\Gin at vlly\Gin at llx
+\let\Gin at vurx\Gin at llx\let\Gin at vury\Gin at llx
\let\Grot at height\@ovxx
\let\Grot at left\@ovyy
\let\Grot at right\@ovdx
Modified: trunk/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty 2020-09-01 21:35:17 UTC (rev 56237)
+++ trunk/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty 2020-09-01 21:35:44 UTC (rev 56238)
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{graphicx}
- [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2020/09/09 v1.2b Enhanced LaTeX Graphics (DPC,SPQR)]
\DeclareOption{unknownkeysallowed}
{\PassOptionsToPackage\CurrentOption{keyval}}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
@@ -53,34 +53,6 @@
\Gin at defaultbp\Gin at vlly{#2}%
\Gin at defaultbp\Gin at vurx{#3}%
\Gin at defaultbp\Gin at vury{#4}}%
-\def\Gin at viewport{%
- \let\Gin at ollx\Gin at llx
- \let\Gin at olly\Gin at lly
- \let\Gin at ourx\Gin at urx
- \let\Gin at oury\Gin at ury
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vurx\p@
- \edef\Gin at urx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vury\p@
- \edef\Gin at ury{\strip at pt\dimen@}%
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
- \edef\Gin at llx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
- \edef\Gin at lly{\strip at pt\dimen@}}
-\def\Gin at trim{%
- \let\Gin at ollx\Gin at llx
- \let\Gin at olly\Gin at lly
- \let\Gin at ourx\Gin at urx
- \let\Gin at oury\Gin at ury
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
- \edef\Gin at llx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
- \edef\Gin at lly{\strip at pt\dimen@}%
- \dimen@\Gin at urx\p@\advance\dimen@ -\Gin at vurx\p@
- \edef\Gin at urx{\strip at pt\dimen@}%
- \dimen@\Gin at ury\p@\advance\dimen@ -\Gin at vury\p@
- \edef\Gin at ury{\strip at pt\dimen@}}
-\let\Gin at vllx\Gin at llx\let\Gin at vlly\Gin at llx
-\let\Gin at vurx\Gin at llx\let\Gin at vury\Gin at llx
\define at key{Gin}{angle}
{\Gin at esetsize
\@tempswatrue
More information about the tex-live-commits
mailing list.