summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-02 23:18:54 +0000
committerKarl Berry <karl@freefriends.org>2018-01-02 23:18:54 +0000
commit685cec803afc9aea54127325a7dc839ba9e7a563 (patch)
tree99350e74ddb7e89a36e9041ea46ba3ca2354b393
parenta81f9d277e3c0d9f7f4720f250c9824478808a46 (diff)
graphics-def (2jan18)
git-svn-id: svn://tug.org/texlive/trunk@46192 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.def22
-rw-r--r--Master/texmf-dist/tex/latex/graphics-def/pdftex.def22
3 files changed, 39 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md
index a3b1c85e89f..1ab9ff3c729 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-12-07
+Release 2018-01-01
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 4ef9c6b4ab6..173e9bcafb9 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def
@@ -1,7 +1,7 @@
%% luatex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz,
%% Hans Hagen, Heiko Oberdiek and
%% Martin Schr\"oder
-%% Copyright (C) 2016-2017 LaTeX3 project and Heiko Oberdiek
+%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -18,7 +18,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{luatex.def}
- [2017/12/07 v1.0i Graphics/color driver for luatex]
+ [2018/01/01 v1.0k Graphics/color driver for luatex]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -125,6 +125,21 @@
\def\no@page@color{%
\global\GPT@pagecolorfalse
}
+\def\KV@Gin@bbllx{%
+ \PackageError{pdftex.def}{%
+ Options `bblly', `bblly', `bburx' and `bbury'\MessageBreak
+ are not supported by luatex driver:\MessageBreak
+ use `viewport' instead%
+ }\@ehc
+}
+\let\KV@Gin@bblly\KV@Gin@bbllx
+\let\KV@Gin@bburx\KV@Gin@bbllx
+\let\KV@Gin@bbury\KV@Gin@bbllx
+\def\KV@Gin@bb{%
+ \PackageInfo{luatex.def}
+ {Option `bb' equivalent to `viewport` for pdftex driver}%
+ \KV@Gin@viewport
+}
\def\Gread@pdftex#1{%
% Use low level test here not \IfFileExists to match \Gread@pdftex in
% pdftex.def and \Gread@eps test in graphics.
@@ -514,8 +529,9 @@
\edef\@tempa{%
\catcode`\noexpand\<\the\catcode`\<\relax
\catcode`\noexpand\>\the\catcode`\>\relax
+ \catcode`\noexpand\=\the\catcode`\=\relax
}%
- \@makeother\<\@makeother\<%
+ \@makeother\<\@makeother\>\@makeother\=%
% supp-pdf.mkii tests against \undefined:
% just in case someone has defined it ...
\let\GPT@orig@undefined\undefined
diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
index d229c8b669e..1d4d96f7e8e 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
@@ -1,7 +1,7 @@
%% pdftex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz,
%% Hans Hagen, Heiko Oberdiek and
%% Martin Schr\"oder
-%% Copyright (C) 2016-2017 LaTeX3 project and Heiko Oberdiek
+%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -18,7 +18,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{pdftex.def}
- [2017/12/07 v1.0i Graphics/color driver for pdftex]
+ [2018/01/01 v1.0k Graphics/color driver for pdftex]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -139,6 +139,21 @@ E \else
\def\no@page@color{%
\global\GPT@pagecolorfalse
}
+\def\KV@Gin@bbllx{%
+ \PackageError{pdftex.def}{%
+ Options `bblly', `bblly', `bburx' and `bbury'\MessageBreak
+ are not supported by pdftex driver:\MessageBreak
+ use `viewport' instead%
+ }\@ehc
+}
+\let\KV@Gin@bblly\KV@Gin@bbllx
+\let\KV@Gin@bburx\KV@Gin@bbllx
+\let\KV@Gin@bbury\KV@Gin@bbllx
+\def\KV@Gin@bb{%
+ \PackageInfo{pdftex.def}
+ {Option `bb' equivalent to `viewport` with pdftex driver}%
+ \KV@Gin@viewport
+}
\def\Gread@pdftex#1{%
\expandafter\ifx\expandafter\relax\pdffilesize{#1}\relax
\expandafter\@secondoftwo
@@ -524,8 +539,9 @@ E \else
\edef\@tempa{%
\catcode`\noexpand\<\the\catcode`\<\relax
\catcode`\noexpand\>\the\catcode`\>\relax
+ \catcode`\noexpand\=\the\catcode`\=\relax
}%
- \@makeother\<\@makeother\<%
+ \@makeother\<\@makeother\>\@makeother\=%
% supp-pdf.mkii tests against \undefined:
% just in case someone has defined it ...
\let\GPT@orig@undefined\undefined