diff options
author | Karl Berry <karl@freefriends.org> | 2020-09-01 21:34:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-09-01 21:34:25 +0000 |
commit | 84b22db625f6573c289357aa78ba29ac2a2339fa (patch) | |
tree | d77b6fe3621c8310107d2ee28d2038d6c2cbedef /Master/texmf-dist/tex/latex/graphics-def/luatex.def | |
parent | 2b5a52bde31bedbb69ab710e37e6daee52647b59 (diff) |
graphics-def (1sep20)
git-svn-id: svn://tug.org/texlive/trunk@56235 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/graphics-def/luatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/luatex.def | 73 |
1 files changed, 66 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def index 84ed1109be6..04d36213612 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def @@ -1,7 +1,9 @@ -%% luatex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, -%% Hans Hagen, Heiko Oberdiek and -%% Martin Schr\"oder -%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek +%% luatex.def +%% Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, +%% Hans Hagen, Heiko Oberdiek and +%% Martin Schr\"oder +%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek +%% Copyright (C) 2018-2020 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -18,7 +20,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{luatex.def} - [2018/01/08 v1.0l Graphics/color driver for luatex] + [2020/08/26 v1.2 Graphics/color driver for luatex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -71,7 +73,7 @@ \aftergroup\reset@color} \def\reset@color{\pdfextension colorstack\@pdfcolorstack pop\relax} \newif\ifGPT@pagecolor -\begingroup\expandafter\expandafter\expandafter\endgroup + \def\set@page@color{% \global\GPT@pagecolortrue \global\let\current@page@color\current@color @@ -125,6 +127,32 @@ \def\no@page@color{% \global\GPT@pagecolorfalse } +\def\@tempa{LaTeX2e}% +\ifx\fmtname\@tempa + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi + {% + \@ifl@t@r\fmtversion{2020/10/01} + {% + \def\set@page@color{% + \global\GPT@pagecolortrue + \global\let\current@page@color\current@color + }% + \g@addto@macro\@kernel@before@shipout@background + {% + \ifGPT@pagecolor + \put(-\hoffset,-\pageheight+\voffset)% + {% + \pdfextension colorstack\@pdfcolorstack push{\current@page@color}% + \aftergroup\reset@color + \rule{\pagewidth}{\pageheight}% + }% + \fi + }% + }% + } \AtBeginDocument{% \def\KV@Gin@bbllx{% \PackageError{luatex.def}{% @@ -141,10 +169,41 @@ \let\KV@Gin@natheight\KV@Gin@bbllx \def\KV@Gin@bb{% \PackageInfo{luatex.def}% - {Option `bb' equivalent to `viewport' for luatex driver}% + {Option `bb' equivalent to `viewport' with the luatex driver}% \KV@Gin@viewport }% + \let\Gin@iii\Gin@iii@vp } + +%%% this definition will be added to graphics.sty +\def\Gin@iii@vp[#1,#2][#3,#4]#5{% + \begingroup + \let\Gin@viewport@code\Gin@viewport + \Gin@defaultbp\Gin@vllx{#1}% + \Gin@defaultbp\Gin@vlly{#2}% + \Gin@defaultbp\Gin@vurx{#3}% + \Gin@defaultbp\Gin@vury{#4}% + \Ginclude@graphics{#5}% + \endgroup} + + +%%% this definition needs moving from graphicx.sty to graphics.sty +\def\Gin@viewport{% + \let\Gin@ollx\Gin@llx + \let\Gin@olly\Gin@lly + \let\Gin@ourx\Gin@urx + \let\Gin@oury\Gin@ury + \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@ + \edef\Gin@urx{\strip@pt\dimen@}% + \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@ + \edef\Gin@ury{\strip@pt\dimen@}% + \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@ + \edef\Gin@llx{\strip@pt\dimen@}% + \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@ + \edef\Gin@lly{\strip@pt\dimen@}} +%%% end of temp addition + + \def\Gread@pdftex#1{% % Use low level test here not \IfFileExists to match \Gread@pdftex in % pdftex.def and \Gread@eps test in graphics. |