diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-14 22:41:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-14 22:41:20 +0000 |
commit | 4be869c44f8a963a0105c87bf45033b01d952db2 (patch) | |
tree | 38320f8210bdf396a5912bcdbacd4420b99eba81 /Master/texmf-dist | |
parent | d2c7b41935ad636a2c5c951667a065e092b1273f (diff) |
pdftex-def (14jun16)
git-svn-id: svn://tug.org/texlive/trunk@41449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/pdftex-def/README.md | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdftex-def/pdftex.def | 83 |
2 files changed, 77 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/pdftex-def/README.md b/Master/texmf-dist/doc/latex/pdftex-def/README.md new file mode 100644 index 00000000000..3c560e98f80 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pdftex-def/README.md @@ -0,0 +1,12 @@ +# pdftex.def + +pdftex option file for LaTeX2e color and graphics + +The file pdftex.def provides device-specific definitions +for colour and graphics support when running pdf(La)TeX. + +Licence: LPPL +Maintained by Oberdiek package Support Group + +https://github.com/ho-tex/pdftex-def + diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def index 1f95438966e..b321f53f923 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}[2011/05/27 v0.06d Graphics/color for pdfTeX] +\ProvidesFile{pdftex.def}[2016/06/04 v0.06f Graphics/color for pdfTeX] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% LaTeX Colour and Graphics support for PDFTeX @@ -6,8 +6,11 @@ %% License %% ======= %% -%% Copyright (C) 2000-2011 David Carlisle, Sebastian Rahtz, Hans Hagen, +%% Copyright (C) 2000-2015 +%% David Carlisle, Sebastian Rahtz, Hans Hagen, %% Heiko Oberdiek and Martin Schr\"oder +%% 2016 Oberdiek Package Suport Group +%% https://github.com/ho-tex/pdftex-def/issues %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,8 +22,8 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is -%% Heiko Oberdiek and Martin Schr\"oder. +%% The Current Maintainers of this work are +%% LaTeX3 project and Heiko Oberdiek %% %% This work consists of the file pdftex.def. %% @@ -256,6 +259,10 @@ % available. This fixes a compatibilty issue with class `combine'. % 2011/05/27 v0.06d (HO) % * Fix for v0.06a, package `ltxcmds' was not loaded in plain TeX. +% 2016/01/23 v0.6e (DPC) +% * Move EPS handler here from graphics.cfg +% 2016/06/04 v0.6f (DPC) +% * support graphcs/color option (no)setpagesize % % Prefix of internal commands for this file `pdftex.def': % \GPT@ (Graphics bundle PdfTex driver) @@ -434,7 +441,9 @@ \pdfoutput=1 % \fi -\ltx@IfUndefined{stockwidth}{% +\ifGin@setpagesize + \AtBeginDocument{% + \ltx@IfUndefined{stockwidth}{% \ltx@IfUndefined{paperwidth}{% }{% \ifdim\paperwidth>0pt\relax @@ -451,7 +460,9 @@ \pdfpageheight=\stockheight \fi \fi +}% } +\fi % Colour Support. The following models may be used. % * cmyk supported directly. @@ -1547,7 +1558,8 @@ E \else \ifnum\pdfminorversion>3 % \def\Gin@extensions{% .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,% - .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2% + .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2,% + .eps }% \fi \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}% @@ -1563,7 +1575,7 @@ E \else \@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}} \@namedef{Gin@rule@.pdf}#1{{pdf}{.pdf}{#1}} \@namedef{Gin@rule@.PDF}#1{{pdf}{.PDF}{#1}} - +\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} % Rotation % slightly hacky, but set width of box 0 to 0pt otherwise @@ -1811,7 +1823,7 @@ E \else % * \InputIfFileExists has problems with parameters (#1). % * Implementation of \providecommand is insufficient in miniltx.tex \ltx@ifundefined{convertMPtoPDF}{% - \newcommand*{\convertMPtoPDF}[3]{% + \newcommand{\convertMPtoPDF}[3]{% \GPT@error{% Cannot convert ##1 from MPS to PDF.\MessageBreak The support file `supp-pdf.mkii' (supp-pdf.tex) is missing% @@ -1884,14 +1896,49 @@ E \else \@onlypreamble\LoadMetaPostSpecialExtensions } -% these seem to upset pdftex. ignore them. SPQR 1999/08/02 -% allow for plain graphics, not graphicx. -% pdftex.def is loaded before the definition in graphicx, -% so do all the stuff \AtBeginDocument: -\AtBeginDocument{% - \ltx@IfUndefined{define@key}{}{% - \define@key{Gin}{natwidth}{}% - \define@key{Gin}{natheight}{}% - }% -}% +% Load package epstopdf if +% a) LaTeX is running (plain TeX users are on their own), +% b) and shell escape (\write18) is enabled (possibly restricted), +% c) and \DoNotLoadEpstopdf either does not exist or is not \relax, +% d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). +% +% In other words, by default .eps files will be automatically +% converted to .pdf files when outputting pdf. This can be wrong! +% If the .pdf is the source, rather than the .eps, you should put +% \newcommand{\DoNotLoadEpstopdf}{} +% before even the \documentclass line of your document. +% +% More information about the epstopdf run will be in the .log file; +% see http://ctan.org/pkg/epstopdf-pkg for more info about the +% epstopdf package itself. In turn, it calls the epstopdf script +% (http://ctan.org/pkg/epstopdf). +% +% For the first discussion and background on this, see the thread on latex-l: +% http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465 +% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname DoNotLoadEpstopdf\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname AtEndOfPackage\endcsname\relax + \else + \AtEndOfPackage{% + \AtBeginDocument{% + \ifx\includegraphics\@undefined\else + \@ifpackageloaded{pst-pdf}{}{% + \@ifpackageloaded{pdftricks}{}{% + \RequirePackage{pdftexcmds}[2007/11/11]% + \expandafter\ifx\csname pdf@shellescape\endcsname\relax + \else + \@ifpackageloaded{graphics}{ + \ifnum\pdf@shellescape>0 % + \RequirePackage{epstopdf-base}[2009/07/12]% + \fi}{} + \fi + }% pdftricks not loaded + }% pst-pdf not loaded + \fi + }% AtBeginDocument block + }% AtEndofPackage block + \fi % AtEndofPackage not defined +\fi % DoNotLoadEpstopdf not defined \GPT@AtEnd |