texlive[41467] Master/texmf-dist/tex/latex/pdftex-def/pdftex.def:

[commits+preining at tug.org]

Revision: 41467
          http://tug.org/svn/texlive?view=revision&revision=41467
Author:   preining
Date:     2016-06-17 12:13:15 +0200 (Fri, 17 Jun 2016)
Log Message:
-----------
pdftex-def (17Jun)

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def

Modified: trunk/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def	2016-06-17 10:13:04 UTC (rev 41466)
+++ trunk/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def	2016-06-17 10:13:15 UTC (rev 41467)
@@ -1,4 +1,4 @@
-\ProvidesFile{pdftex.def}[2016/06/04 v0.06f Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2016/06/17 v0.06h Graphics/color for pdfTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for PDFTeX
@@ -263,6 +263,10 @@
 %  * Move EPS handler here from graphics.cfg
 % 2016/06/04 v0.6f (DPC)
 %  * support graphcs/color option (no)setpagesize
+% 2016/06/15 v0.6g (DPC)
+%  * typo
+% 2016/06/17 v0.6h (DPC)
+%  * guards for contributed packages and plain TeX
 %
 % Prefix of internal commands for this file `pdftex.def':
 %   \GPT@ (Graphics bundle PdfTex driver)
@@ -440,9 +444,13 @@
   }\@ehc
   \pdfoutput=1 %
 \fi
-
+\@ifundefined{ifGin at setpagesize}
+  {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
+                    \csname iftrue\endcsname}
+  {}
 \ifGin at setpagesize
-  \AtBeginDocument{%
+\ifx\paperwidth\@undefined\else
+\AtBeginDocument{%
   \ltx at IfUndefined{stockwidth}{%
   \ltx at IfUndefined{paperwidth}{%
   }{%
@@ -463,6 +471,7 @@
 }%
 }
 \fi
+\fi
 
 % Colour Support. The following models may be used.
 %   * cmyk   supported directly.
@@ -1559,7 +1568,7 @@
           \def\Gin at extensions{%
             .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,%
             .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,%
-	    .eps
+	    .eps%
           }%
         \fi
         \@namedef{Gin at rule@.jb2}#1{{jbig2}{.jb2}{#1}}%