From 84b22db625f6573c289357aa78ba29ac2a2339fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Sep 2020 21:34:25 +0000 Subject: graphics-def (1sep20) git-svn-id: svn://tug.org/texlive/trunk@56235 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/graphics-def/dvipdfmx.def | 12 ++-- .../texmf-dist/tex/latex/graphics-def/dvisvgm.def | 5 +- .../texmf-dist/tex/latex/graphics-def/luatex.def | 73 +++++++++++++++++++--- .../texmf-dist/tex/latex/graphics-def/pdftex.def | 72 +++++++++++++++++++-- Master/texmf-dist/tex/latex/graphics-def/xetex.def | 10 +-- 5 files changed, 148 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def index 361d89aca75..0944ae0d884 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def @@ -1,5 +1,6 @@ -%% dvipdfmx.def Copyright (C) 2005-2017 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata -%% (with contributions from many others) +%% dvipdfmx.def +%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -16,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvipdfmx.def} - [2017/06/24 v5.0g Graphics/color driver for dvipdfmx] + [2020/08/26 v5.0h Graphics/color driver for dvipdfmx] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -83,7 +84,8 @@ background \current@color}} \def\define@color@named#1#2{% \expandafter\let\csname col@#1\endcsname\@nnil} - \def\no@page@color{\special{background \string"newpath clip}} +% white is special cased as "no background color" by dvipdfmx +\def\no@page@color{\special{background gray 1}} \@ifundefined{Gin@decode} {\let\Gin@decode\@empty} {} @@ -333,4 +335,4 @@ \fi } \fi -\fi +\fi diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def b/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def index 46a3c3859c7..052981bbe02 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def @@ -1,5 +1,6 @@ -% Copyright 2015 by Till Tantau -% Copyright 2016 2018 by Till Tantau and LaTeX3 Project +%% dvisvgm.def +%% Copyright 2015 by Till Tantau +%% Copyright 2016-2020 by Till Tantau and LaTeX3 Project % %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c 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. diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index 0c9d2da5489..ac6ca6fe487 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -1,7 +1,9 @@ -%% pdftex.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 +%% pdftex.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{pdftex.def} - [2018/01/08 v1.0l Graphics/color driver for pdftex] + [2020/08/26 v1.2 Graphics/color driver for pdftex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -139,6 +141,33 @@ E \else \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,-\pdfpageheight+\voffset)% + {% + \pdfcolorstack\@pdfcolorstack push{\current@page@color}% + \aftergroup\reset@color + \rule{\pdfpagewidth}{\pdfpageheight}% + }% + \fi + }% + }% + } \AtBeginDocument{% \def\KV@Gin@bbllx{% \PackageError{pdftex.def}{% @@ -155,10 +184,41 @@ E \else \let\KV@Gin@natheight\KV@Gin@bbllx \def\KV@Gin@bb{% \PackageInfo{pdftex.def}% - {Option `bb' equivalent to `viewport' with pdftex driver}% + {Option `bb' equivalent to `viewport' with the pdftex 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{% \expandafter\ifx\expandafter\relax\pdffilesize{#1}\relax \expandafter\@secondoftwo diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def index bb2cba80d49..5364b6ccc98 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def @@ -1,5 +1,6 @@ -%% xetex.def Copyright (C) 2005-2017 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata -%% (with contributions from many others) +%% xetex.def +%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -16,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{xetex.def} - [2017/06/24 v5.0h Graphics/color driver for xetex] + [2020/08/26 v5.0i Graphics/color driver for xetex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -83,7 +84,8 @@ background \current@color}} \def\define@color@named#1#2{% \expandafter\let\csname col@#1\endcsname\@nnil} - \def\no@page@color{\special{background \string"newpath clip}} +% white is special cased as "no bacground color" by dvipdfmx +\def\no@page@color{\special{background gray 1}} \@ifundefined{Gin@decode} {\let\Gin@decode\@empty} {} -- cgit v1.2.3