summaryrefslogtreecommitdiff
path: root/macros/latex/required/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/required/graphics')
-rw-r--r--macros/latex/required/graphics/README.md2
-rw-r--r--macros/latex/required/graphics/cat-eps-converted-to.pdf84
-rw-r--r--macros/latex/required/graphics/changes.txt10
-rw-r--r--macros/latex/required/graphics/color.pdfbin201382 -> 201496 bytes
-rw-r--r--macros/latex/required/graphics/drivers.pdfbin263544 -> 263534 bytes
-rw-r--r--macros/latex/required/graphics/epsfig.pdfbin154496 -> 154483 bytes
-rw-r--r--macros/latex/required/graphics/graphics.dtx55
-rw-r--r--macros/latex/required/graphics/graphics.pdfbin283250 -> 284134 bytes
-rw-r--r--macros/latex/required/graphics/graphicx.pdfbin232393 -> 232381 bytes
-rw-r--r--macros/latex/required/graphics/grfguide.pdfbin310551 -> 310537 bytes
-rw-r--r--macros/latex/required/graphics/keyval.pdfbin222527 -> 222662 bytes
-rw-r--r--macros/latex/required/graphics/lscape.pdfbin150118 -> 150107 bytes
-rw-r--r--macros/latex/required/graphics/rotating.pdfbin245753 -> 246267 bytes
-rw-r--r--macros/latex/required/graphics/rotex.pdfbin162260 -> 162245 bytes
-rw-r--r--macros/latex/required/graphics/trig.pdfbin191705 -> 191693 bytes
15 files changed, 145 insertions, 6 deletions
diff --git a/macros/latex/required/graphics/README.md b/macros/latex/required/graphics/README.md
index a3fbe5d733..6567a09f2f 100644
--- a/macros/latex/required/graphics/README.md
+++ b/macros/latex/required/graphics/README.md
@@ -1,7 +1,7 @@
The LaTeX `graphics` bundle
===========================
-Release 2019-10-01 patch level 1
+Release 2019-10-01 patch level 2
Overview
--------
diff --git a/macros/latex/required/graphics/cat-eps-converted-to.pdf b/macros/latex/required/graphics/cat-eps-converted-to.pdf
new file mode 100644
index 0000000000..7da1b3dcd5
--- /dev/null
+++ b/macros/latex/required/graphics/cat-eps-converted-to.pdf
@@ -0,0 +1,84 @@
+%PDF-1.5
+%쏢
+5 0 obj
+<</Length 6 0 R/Filter /FlateDecode>>
+stream
+xUUKU! U$,@'=}[ sIFGWmџsn_0khRn@{݈/`v6:+uhr1N{=tDOE,tڜitn,}b0ζ=PxBE|-rϚ9HI뵛l9fn^n/;{Ǯ˸:ȋAɍbƕJӈ,P۷BS`<)h(LHĔqN*Xq‽?;9_W(l#ܜCfj sBUCcWu~cyV$(1WH]7+/mA"znYRU1j1GKV{2, V!YB.R%]>Kج,)gxkT(iRښ(ٷwи'Qk{T
+*Bd5d[<h7N @YݚdξջiMg`i[d k B0I-3
+yVD'1۫_+(x5"<Y?AE5f'gρ tYic5R8t`>3b|!e}!Q I։φTceu9yy=?/ F\endstream
+endobj
+6 0 obj
+686
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 36 32]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1335>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.27'/>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2019-07-20T10:14:48+01:00</xmp:ModifyDate>
+<xmp:CreateDate>2019-07-20T10:14:48+01:00</xmp:CreateDate>
+<xmp:CreatorTool>COREL DRAW</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:5f138aac-e2eb-11f4-0000-b0069176419e'/>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>CAT.TMP</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.27)
+/CreationDate(D:20190720101448+01'00')
+/ModDate(D:20190720101448+01'00')
+/Creator(COREL DRAW)
+/Title(CAT.TMP)>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000978 00000 n
+0000002523 00000 n
+0000000919 00000 n
+0000000790 00000 n
+0000000015 00000 n
+0000000771 00000 n
+0000001042 00000 n
+0000001083 00000 n
+0000001112 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<A1B9BB71BF53A8513F7E1A14881A66CA><A1B9BB71BF53A8513F7E1A14881A66CA>]
+>>
+startxref
+2683
+%%EOF
diff --git a/macros/latex/required/graphics/changes.txt b/macros/latex/required/graphics/changes.txt
index 71e91fc85f..f4343bc2c3 100644
--- a/macros/latex/required/graphics/changes.txt
+++ b/macros/latex/required/graphics/changes.txt
@@ -4,6 +4,16 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+#########################
+# 2019-10-01 PL 2 Release
+#########################
+
+2019-11-03 David Carlisle <David.Carlisle@latex-project.org>
+
+ * graphics.dtx: add additional trial with known
+ extensions if supplied filename has a . but the file is not found
+ (gh/204)
+
2019-10-08 David Carlisle <David.Carlisle@latex-project.org>
* graphics.dtx: fallback definitions of \set@curr@file etc added
diff --git a/macros/latex/required/graphics/color.pdf b/macros/latex/required/graphics/color.pdf
index e92ca964da..c7360251f1 100644
--- a/macros/latex/required/graphics/color.pdf
+++ b/macros/latex/required/graphics/color.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/drivers.pdf b/macros/latex/required/graphics/drivers.pdf
index 85849cfb08..9d9ac44a91 100644
--- a/macros/latex/required/graphics/drivers.pdf
+++ b/macros/latex/required/graphics/drivers.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/epsfig.pdf b/macros/latex/required/graphics/epsfig.pdf
index 6f3b273256..953af25b5f 100644
--- a/macros/latex/required/graphics/epsfig.pdf
+++ b/macros/latex/required/graphics/epsfig.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphics.dtx b/macros/latex/required/graphics/graphics.dtx
index b6de6023d4..ac570c0227 100644
--- a/macros/latex/required/graphics/graphics.dtx
+++ b/macros/latex/required/graphics/graphics.dtx
@@ -25,7 +25,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2019/10/08 v1.3c Standard LaTeX Graphics (DPC,SPQR)]
+ [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -1036,11 +1036,18 @@
% \begin{macro}{\Gin@sepdefault}
% \changes{v0.6a}{1994/11/29}
% {remove \cs{Gin@sep}}
+% \begin{macro}{\Gin@gzext}
+% \changes{v1.3d}{2019/11/01}
+% {macro added}
% This must match the token used by |\filename@parse| to delimit the
% extension.
% \begin{macrocode}
\def\Gin@sepdefault{.}
% \end{macrocode}
+%
+% \begin{macrocode}
+\edef\Gin@gzext{\detokenize{gz}}
+% \edef{macrocode}
% \end{macro}
%
% \begin{macro}{\set@curr@file}
@@ -1102,12 +1109,22 @@
% \end{macrocode}
% A lot of quote juggling going on here (room for improvements).
%
+% \changes{v1.3d}{2019/11/01}
+% {\cs{curr@name} now unquoted}
% \begin{macrocode}
\set@curr@file{#1}%
- \edef\uq@curr@file{\expandafter\unquote@name\expandafter{\@curr@file}}%
- \expandafter\filename@parse\expandafter{\uq@curr@file}%
- \edef\filename@area{\expandafter\quote@name\expandafter{\filename@area}}%
- \edef\filename@base{\expandafter\quote@name\expandafter{\filename@base}}%
+ \expandafter\filename@parse\expandafter{\@curr@file}%
+% \end{macrocode}
+% If extension is |.gz| tack on to previous extension, eg |.eps.gz| if available.
+% \begin{macrocode}
+ \ifx\filename@ext\Gin@gzext
+ \expandafter\filename@parse\expandafter{\filename@base}%
+ \ifx\filename@ext\relax
+ \let\filename@ext\Gin@gzext
+ \else
+ \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}%
+ \fi
+ \fi
\ifx\filename@ext\relax
\@for\Gin@temp:=\Gin@extensions\do{%
\ifx\Gin@ext\relax
@@ -1116,6 +1133,34 @@
\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.
+%
+% \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.
+% \begin{macrocode}
+ \ifx\Gin@ext\relax
+ \let\filename@base\Gin@savedbase
+ \let\filename@ext\Gin@savedext
+ \fi
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
+% \end{macrocode}
% \changes{v0.4d}{1994/05/06}
% {Make file not found a warning not an error}
% \changes{v0.6a}{1994/11/29}
diff --git a/macros/latex/required/graphics/graphics.pdf b/macros/latex/required/graphics/graphics.pdf
index 59f74f7709..918a377b0c 100644
--- a/macros/latex/required/graphics/graphics.pdf
+++ b/macros/latex/required/graphics/graphics.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphicx.pdf b/macros/latex/required/graphics/graphicx.pdf
index 70a0feb1fb..8e2772f5b5 100644
--- a/macros/latex/required/graphics/graphicx.pdf
+++ b/macros/latex/required/graphics/graphicx.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/grfguide.pdf b/macros/latex/required/graphics/grfguide.pdf
index f73199435e..80aebf496f 100644
--- a/macros/latex/required/graphics/grfguide.pdf
+++ b/macros/latex/required/graphics/grfguide.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/keyval.pdf b/macros/latex/required/graphics/keyval.pdf
index 96954471f1..375ae88b39 100644
--- a/macros/latex/required/graphics/keyval.pdf
+++ b/macros/latex/required/graphics/keyval.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/lscape.pdf b/macros/latex/required/graphics/lscape.pdf
index b5b1b4bd11..69cab578f1 100644
--- a/macros/latex/required/graphics/lscape.pdf
+++ b/macros/latex/required/graphics/lscape.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotating.pdf b/macros/latex/required/graphics/rotating.pdf
index 523c139cb8..704c4e11e5 100644
--- a/macros/latex/required/graphics/rotating.pdf
+++ b/macros/latex/required/graphics/rotating.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotex.pdf b/macros/latex/required/graphics/rotex.pdf
index 0fd60e327a..12ff8587b1 100644
--- a/macros/latex/required/graphics/rotex.pdf
+++ b/macros/latex/required/graphics/rotex.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/trig.pdf b/macros/latex/required/graphics/trig.pdf
index 067a595954..f8af90699c 100644
--- a/macros/latex/required/graphics/trig.pdf
+++ b/macros/latex/required/graphics/trig.pdf
Binary files differ