From 7fd1196ec43f7049d87c1257991c3ee0e26102af Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 17 Jun 2016 10:13:15 +0000 Subject: pdftex-def (17Jun) git-svn-id: svn://tug.org/texlive/trunk@41467 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pdftex-def/pdftex.def | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def index b321f53f923..7fa936fe704 100644 --- a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def @@ -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@setpagesize} + {\expandafter\let\csname ifGin@setpagesize\expandafter\endcsname + \csname iftrue\endcsname} + {} \ifGin@setpagesize - \AtBeginDocument{% +\ifx\paperwidth\@undefined\else +\AtBeginDocument{% \ltx@IfUndefined{stockwidth}{% \ltx@IfUndefined{paperwidth}{% }{% @@ -463,6 +471,7 @@ }% } \fi +\fi % Colour Support. The following models may be used. % * cmyk supported directly. @@ -1559,7 +1568,7 @@ E \else \def\Gin@extensions{% .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,% - .eps + .eps% }% \fi \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% -- cgit v1.2.3