summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-06-17 10:13:15 +0000
committerNorbert Preining <preining@logic.at>2016-06-17 10:13:15 +0000
commit7fd1196ec43f7049d87c1257991c3ee0e26102af (patch)
tree97e97cf5bba8b8ff0f4ca352e949f1ae2652eade /Master/texmf-dist/tex
parent8830ce15fe7587ab7c603da38e6940694763afd3 (diff)
pdftex-def (17Jun)
git-svn-id: svn://tug.org/texlive/trunk@41467 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/pdftex-def/pdftex.def17
1 files changed, 13 insertions, 4 deletions
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}}%