From 685cec803afc9aea54127325a7dc839ba9e7a563 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Jan 2018 23:18:54 +0000 Subject: graphics-def (2jan18) git-svn-id: svn://tug.org/texlive/trunk@46192 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/graphics-def/luatex.def | 22 +++++++++++++++++++--- .../texmf-dist/tex/latex/graphics-def/pdftex.def | 22 +++++++++++++++++++--- 2 files changed, 38 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/graphics-def') 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 -- cgit v1.2.3