graphics-def (8dec17)

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

3 files changed, 16 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md
index f8109920f03..a3b1c85e89f 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-11-22
+Release 2017-12-07
 
 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 f0072d0a18b..4ef9c6b4ab6 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/11/22 v1.0g Graphics/color driver for luatex]
+  [2017/12/07 v1.0i Graphics/color driver for luatex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -95,7 +95,7 @@
     }%
     \gdef\GPT@@shipout{%
       \ifvoid\GPT@outputbox\relax
-        \PackageInfo{pdftex.def}{Ignoring void output box}%
+        \PackageInfo{luatex.def}{Ignoring void output box}%
       \else
         \setbox\GPT@outputbox=\vbox{%
           \GPT@pageliteral
@@ -164,6 +164,7 @@
 \@ifundefined{Gin@pagebox}
   {\def\Gin@pagebox{cropbox}}
   {}
+\def\GPT@cropbox{cropbox}
 \@ifundefined{Gin@interpolate}
   {\csname newif\endcsname\ifGin@interpolate}
   {}
@@ -213,7 +214,8 @@
         <#1, %
         id=\the\lastsavedimageresourceindex, %
         \ifx\Gin@page\@empty\else page=\Gin@page , \fi
-        \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi
+        \ifx\Gin@pagebox\@empty\else\ifx\Gin@pagebox\GPT@cropbox\else
+          pagebox=\Gin@pagebox , \fi\fi
         \ifx\Gin@decode\@empty\else decode=[\Gin@decode], \fi
         \ifGin@interpolate interpolate=true, \fi
         \the\wd\@tempboxa\GPT@space x \the\ht\@tempboxa
@@ -254,10 +256,10 @@
   }%
   \PackageInfo{luatex.def}{%
     #1 \ifx\Gin@page\@empty\else, page\Gin@page\fi
-    \GPT@space used\ifx\on@line\@undefined\else\on@line\fi.}%
-  \PackageInfo{luatex.def}{%
+    \GPT@space used\on@line.\MessageBreak
     Requested size: %
     \the\Gin@req@width\GPT@space x \the\Gin@req@height
+    \ifx\documentclass\@undefined\else\expandafter\@gobble\fi
   }%
   \Ginclude@@pdftex{\@nameuse{#1 image\Gin@attr@hash}}%
 }
@@ -517,7 +519,7 @@
     % supp-pdf.mkii tests against \undefined:
     % just in case someone has defined it ...
     \let\GPT@orig@undefined\undefined
-    \let\undefinded\@undefined
+    \let\undefined\@undefined
     \InputIfFileExists{supp-pdf.mkii}{}{}%
     \let\undefined\GPT@orig@undefined
     \@tempa
diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
index 26f94e733ca..d229c8b669e 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/24 v1.0g Graphics/color driver for pdftex]
+  [2017/12/07 v1.0i Graphics/color driver for pdftex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -173,6 +173,7 @@ E     \else
 \@ifundefined{Gin@pagebox}
   {\def\Gin@pagebox{cropbox}}
   {}
+\def\GPT@cropbox{cropbox}
 \@ifundefined{Gin@interpolate}
   {\csname newif\endcsname\ifGin@interpolate}
   {}
@@ -222,7 +223,8 @@ E     \else
         <#1, %
         id=\the\pdflastximage, %
         \ifx\Gin@page\@empty\else page=\Gin@page , \fi
-        \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi
+        \ifx\Gin@pagebox\@empty\else\ifx\Gin@pagebox\GPT@cropbox\else
+          pagebox=\Gin@pagebox , \fi\fi
         \ifx\Gin@decode\@empty\else decode=[\Gin@decode], \fi
         \ifGin@interpolate interpolate=true, \fi
         \the\wd\@tempboxa\GPT@space x \the\ht\@tempboxa
@@ -264,10 +266,10 @@ E     \else
   }%
   \PackageInfo{pdftex.def}{%
     #1 \ifx\Gin@page\@empty\else, page\Gin@page\fi
-    \GPT@space used\ifx\on@line\@undefined\else\on@line\fi.}%
-  \PackageInfo{pdftex.def}{%
+    \GPT@space used\on@line.\MessageBreak
     Requested size: %
     \the\Gin@req@width\GPT@space x \the\Gin@req@height
+    \ifx\documentclass\@undefined\else\expandafter\@gobble\fi
   }%
   \Ginclude@@pdftex{\@nameuse{#1 image\Gin@attr@hash}}%
 }
@@ -527,7 +529,7 @@ E     \else
     % supp-pdf.mkii tests against \undefined:
     % just in case someone has defined it ...
     \let\GPT@orig@undefined\undefined
-    \let\undefinded\@undefined
+    \let\undefined\@undefined
     \InputIfFileExists{supp-pdf.mkii}{}{}%
     \let\undefined\GPT@orig@undefined
     \@tempa