diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/graphics-def/pdftex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/graphics-def/pdftex.def | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index 4b7a517ca10..3fca115295d 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -1,4 +1,4 @@ -\ProvidesFile{pdftex.def}[2016/07/01 v0.06i Graphics/color for pdfTeX] +\ProvidesFile{pdftex.def}[2016/07/10 v0.06j Graphics/color for pdfTeX] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% LaTeX Colour and Graphics support for PDFTeX @@ -268,7 +268,11 @@ % * typo % 2016/06/17 v0.6h (DPC) % * guards for contributed packages and plain TeX +% 2016/07/1o v0.6j (DPC) +% * don't set page size for non standard \mag % + + % Prefix of internal commands for this file `pdftex.def': % \GPT@ (Graphics bundle PdfTex driver) @@ -452,6 +456,9 @@ \ifGin@setpagesize \ifx\paperwidth\@undefined\else \AtBeginDocument{% +% If a package has changed \mag, assume it knows what it is doing +% and leave page size alone +\ifnum\mag=\@m \ltx@IfUndefined{stockwidth}{% \ltx@IfUndefined{paperwidth}{% }{% @@ -470,6 +477,7 @@ \fi \fi }% +\fi } \fi \fi @@ -1566,16 +1574,9 @@ E \else \else \ifnum\driver@release>9 % \ifnum\pdfminorversion>3 % - \@ifpackageloaded{pst-pdf}% hv 20160630 - {\def\Gin@extensions{% + \def\Gin@extensions{% .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}% - }% - {\def\Gin@extensions{% - .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% - .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,% - .eps}% - }% \fi \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% \@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}% @@ -1946,6 +1947,8 @@ E \else \else \@ifpackageloaded{graphics}{ \ifnum\pdf@shellescape>0 % + % only add .eps to file extension list if epstopdf is loaded + \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% \fi}{} \fi |