graphics-def (16jun17)

git-svn-id: svn://tug.org/texlive/trunk@44619 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 24 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md
index 084754aaf31..9ab2545fcce 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-14
+Release 2017-06-15
 
 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/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
index 44601598cce..81ecec4a549 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
@@ -16,7 +16,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvipdfmx.def}
-  [2017/06/14 v5.0d Graphics/color driver for dvipdfmx]
+  [2017/06/14 v5.0e Graphics/color driver for dvipdfmx]
 \def\c@lor@arg#1{%
   \dimen@#1\p@
   \ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -293,13 +293,6 @@
 \@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
 %
 \@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}}
-
-
-% v4.10
-% Support new (no)setpagesize option of graphics and color.
-% v4.11
-% Use \special{pdf:pagesize ...} instead of \special{papersize=...}
-% to support \mag (dvipdfmx only)
 \@ifundefined{ifGin@setpagesize}
 {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname
 \csname iftrue\endcsname}
diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def
index 50841a16c22..f4f3839a956 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/12 v1.0b Graphics/color driver for luatex]
+  [2017/06/14 v1.0c Graphics/color driver for luatex]
 \def\c@lor@arg#1{%
   \dimen@#1\p@
   \ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -74,7 +74,7 @@
 \def\set@page@color{%
   \GPT@pagecolortrue
   \global\let\current@page@color\current@color
-  \ifundefined{GPT@outputbox}{%
+  \@ifundefined{GPT@outputbox}{%
     % \newbox is outer in plain
     \csname newbox\endcsname\GPT@outputbox
   }{}%
diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
index c5589bb53d2..79d51695ea1 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
@@ -18,7 +18,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{pdftex.def}
-  [2017/06/12 v1.0b Graphics/color driver for pdftex]
+  [2017/06/15 v1.0d Graphics/color driver for pdftex]
 \def\c@lor@arg#1{%
   \dimen@#1\p@
   \ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -81,7 +81,7 @@
 \def\set@page@color{%
   \GPT@pagecolortrue
   \global\let\current@page@color\current@color
-  \ifundefined{GPT@outputbox}{%
+  \@ifundefined{GPT@outputbox}{%
     % \newbox is outer in plain
     \csname newbox\endcsname\GPT@outputbox
   }{}%
@@ -485,7 +485,7 @@ E     \else
 \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}}
diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def
index 3db4fb07f67..33dded2ddac 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def
@@ -16,7 +16,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2017/06/14 v5.0c Graphics/color driver for xetex]
+  [2017/06/14 v5.0d Graphics/color driver for xetex]
 \def\c@lor@arg#1{%
   \dimen@#1\p@
   \ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -387,13 +387,6 @@
 \@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
 %
 \@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}}
-
-
-% v4.10
-% Support new (no)setpagesize option of graphics and color.
-% v4.11
-% Use \special{pdf:pagesize ...} instead of \special{papersize=...}
-% to support \mag (xetex only)
 \@ifundefined{ifGin@setpagesize}
 {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname
 \csname iftrue\endcsname}
@@ -404,19 +397,24 @@
 % If a package has changed \mag, assume it knows what it is doing
 % and leave page size alone
 \ifnum\mag=\@m
-\AtBeginDvi{%
-\begingroup
-  \@ifundefined{stockwidth}{}
-    {%
-      \paperwidth\stockwidth
-      \paperheight\stockheight
-    }%
-\ifdim\paperwidth>\z@
-\ifdim\paperheight>\z@
-\special{pdf:pagesize width \the\paperwidth\space height \the\paperheight}%
+\@ifundefined{stockwidth}{%
+\@ifundefined{paperwidth}{%
+}{%
+\ifdim\paperwidth>0pt\relax
+\ifdim\paperheight>0pt\relax
+\pdfpagewidth=\paperwidth
+\pdfpageheight=\paperheight
+\fi
+\fi
+}%
+}{%
+\ifdim\stockwidth>0pt\relax
+\ifdim\stockheight>0pt\relax
+\pdfpagewidth=\stockwidth
+\pdfpageheight=\stockheight
 \fi
 \fi
-\endgroup}%
+}%
 \fi
 }
 \fi