texlive[46019] Master/texmf-dist: graphics-def (8dec17)

[commits+karl at tug.org]

Revision: 46019
          http://tug.org/svn/texlive?view=revision&revision=46019
Author:   karl
Date:     2017-12-09 00:15:52 +0100 (Sat, 09 Dec 2017)
Log Message:
-----------
graphics-def (8dec17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/graphics-def/README.md
    trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def
    trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def

Modified: trunk/Master/texmf-dist/doc/latex/graphics-def/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/graphics-def/README.md	2017-12-08 23:15:37 UTC (rev 46018)
+++ trunk/Master/texmf-dist/doc/latex/graphics-def/README.md	2017-12-08 23:15:52 UTC (rev 46019)
@@ -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

Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def	2017-12-08 23:15:37 UTC (rev 46018)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/luatex.def	2017-12-08 23:15:52 UTC (rev 46019)
@@ -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 at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -95,7 +95,7 @@
     }%
     \gdef\GPT@@shipout{%
       \ifvoid\GPT at outputbox\relax
-        \PackageInfo{pdftex.def}{Ignoring void output box}%
+        \PackageInfo{luatex.def}{Ignoring void output box}%
       \else
         \setbox\GPT at outputbox=\vbox{%
           \GPT at pageliteral
@@ -164,6 +164,7 @@
 \@ifundefined{Gin at pagebox}
   {\def\Gin at pagebox{cropbox}}
   {}
+\def\GPT at cropbox{cropbox}
 \@ifundefined{Gin at interpolate}
   {\csname newif\endcsname\ifGin at interpolate}
   {}
@@ -213,7 +214,8 @@
         <#1, %
         id=\the\lastsavedimageresourceindex, %
         \ifx\Gin at page\@empty\else page=\Gin at page , \fi
-        \ifx\Gin at pagebox\@empty\else pagebox=\Gin at pagebox , \fi
+        \ifx\Gin at pagebox\@empty\else\ifx\Gin at pagebox\GPT at cropbox\else
+          pagebox=\Gin at pagebox , \fi\fi
         \ifx\Gin at decode\@empty\else decode=[\Gin at decode], \fi
         \ifGin at interpolate interpolate=true, \fi
         \the\wd\@tempboxa\GPT at space x \the\ht\@tempboxa
@@ -254,10 +256,10 @@
   }%
   \PackageInfo{luatex.def}{%
     #1 \ifx\Gin at page\@empty\else, page\Gin at page\fi
-    \GPT at space used\ifx\on at line\@undefined\else\on at line\fi.}%
-  \PackageInfo{luatex.def}{%
+    \GPT at space used\on at line.\MessageBreak
     Requested size: %
     \the\Gin at req@width\GPT at space x \the\Gin at req@height
+    \ifx\documentclass\@undefined\else\expandafter\@gobble\fi
   }%
   \Ginclude@@pdftex{\@nameuse{#1 image\Gin at attr@hash}}%
 }
@@ -517,7 +519,7 @@
     % supp-pdf.mkii tests against \undefined:
     % just in case someone has defined it ...
     \let\GPT at orig@undefined\undefined
-    \let\undefinded\@undefined
+    \let\undefined\@undefined
     \InputIfFileExists{supp-pdf.mkii}{}{}%
     \let\undefined\GPT at orig@undefined
     \@tempa

Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def	2017-12-08 23:15:37 UTC (rev 46018)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def	2017-12-08 23:15:52 UTC (rev 46019)
@@ -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 at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -173,6 +173,7 @@
 \@ifundefined{Gin at pagebox}
   {\def\Gin at pagebox{cropbox}}
   {}
+\def\GPT at cropbox{cropbox}
 \@ifundefined{Gin at interpolate}
   {\csname newif\endcsname\ifGin at interpolate}
   {}
@@ -222,7 +223,8 @@
         <#1, %
         id=\the\pdflastximage, %
         \ifx\Gin at page\@empty\else page=\Gin at page , \fi
-        \ifx\Gin at pagebox\@empty\else pagebox=\Gin at pagebox , \fi
+        \ifx\Gin at pagebox\@empty\else\ifx\Gin at pagebox\GPT at cropbox\else
+          pagebox=\Gin at pagebox , \fi\fi
         \ifx\Gin at decode\@empty\else decode=[\Gin at decode], \fi
         \ifGin at interpolate interpolate=true, \fi
         \the\wd\@tempboxa\GPT at space x \the\ht\@tempboxa
@@ -264,10 +266,10 @@
   }%
   \PackageInfo{pdftex.def}{%
     #1 \ifx\Gin at page\@empty\else, page\Gin at page\fi
-    \GPT at space used\ifx\on at line\@undefined\else\on at line\fi.}%
-  \PackageInfo{pdftex.def}{%
+    \GPT at space used\on at line.\MessageBreak
     Requested size: %
     \the\Gin at req@width\GPT at space x \the\Gin at req@height
+    \ifx\documentclass\@undefined\else\expandafter\@gobble\fi
   }%
   \Ginclude@@pdftex{\@nameuse{#1 image\Gin at attr@hash}}%
 }
@@ -527,7 +529,7 @@
     % supp-pdf.mkii tests against \undefined:
     % just in case someone has defined it ...
     \let\GPT at orig@undefined\undefined
-    \let\undefinded\@undefined
+    \let\undefined\@undefined
     \InputIfFileExists{supp-pdf.mkii}{}{}%
     \let\undefined\GPT at orig@undefined
     \@tempa