summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-25 20:58:34 +0000
committerKarl Berry <karl@freefriends.org>2017-11-25 20:58:34 +0000
commit68725e4c00f7540a73778ba91bdbe68dd135f01c (patch)
tree2992d8a6687237519aa555aafac87c6f2d097315
parent9c796670fcc040b490f449d7dbf7b68a37e335f7 (diff)
graphics-def (25nov17)
git-svn-id: svn://tug.org/texlive/trunk@45904 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/graphics-def/README.md2
-rw-r--r--Master/texmf-dist/tex/latex/graphics-def/luatex.def21
-rw-r--r--Master/texmf-dist/tex/latex/graphics-def/pdftex.def5
3 files changed, 24 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md
index 00e9568065b..f8109920f03 100644
--- a/Master/texmf-dist/doc/latex/graphics-def/README.md
+++ b/Master/texmf-dist/doc/latex/graphics-def/README.md
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2017-06-25
+Release 2017-11-22
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def
index e063fefd082..f0072d0a18b 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def
@@ -18,7 +18,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{luatex.def}
- [2017/06/24 v1.0f Graphics/color driver for luatex]
+ [2017/11/22 v1.0g Graphics/color driver for luatex]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -126,7 +126,17 @@
\global\GPT@pagecolorfalse
}
\def\Gread@pdftex#1{%
- \IfFileExists{#1}
+% Use low level test here not \IfFileExists to match \Gread@pdftex in
+% pdftex.def and \Gread@eps test in graphics.
+% (IfFileExists might be modified by packages and
+% #1 has already been "processed" by \input@path.)
+ \openin\@inputcheck"#1" %
+ \ifeof\@inputcheck
+ \closein\@inputcheck
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
{\Gread@@pdftex{#1}}%
{%
\def\Gin@llx{0}%
@@ -482,7 +492,7 @@
\fi
\def\Gin@extensions{%
.pdf,.png,.jpg,.mps,.jpeg,.jbig2,.jb2,%
- .PDF,.PNG,.JPG,.JPEG,.JBIG2,.JB2
+ .PDF,.PNG,.JPG,.JPEG,.JBIG2,.JB2%
}
\@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}}
\@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}}
@@ -504,7 +514,12 @@
\catcode`\noexpand\>\the\catcode`\>\relax
}%
\@makeother\<\@makeother\<%
+ % supp-pdf.mkii tests against \undefined:
+ % just in case someone has defined it ...
+ \let\GPT@orig@undefined\undefined
+ \let\undefinded\@undefined
\InputIfFileExists{supp-pdf.mkii}{}{}%
+ \let\undefined\GPT@orig@undefined
\@tempa
}{%
% supp-pdf is probably already loaded.
diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
index 8e4430b261e..26f94e733ca 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
@@ -524,7 +524,12 @@ E \else
\catcode`\noexpand\>\the\catcode`\>\relax
}%
\@makeother\<\@makeother\<%
+ % supp-pdf.mkii tests against \undefined:
+ % just in case someone has defined it ...
+ \let\GPT@orig@undefined\undefined
+ \let\undefinded\@undefined
\InputIfFileExists{supp-pdf.mkii}{}{}%
+ \let\undefined\GPT@orig@undefined
\@tempa
}{%
% supp-pdf is probably already loaded.