diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/latexconfig/graphics.cfg | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg index b8323b9a30e..e8b6062f5b7 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg +++ b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg @@ -1,7 +1,7 @@ % Public domain. % Written by Thomas Esser, Heiko Oberdiek, Sebastian Rahtz, and others. \ProvidesFile{graphics.cfg}% - [2009/08/28 v1.8 graphics configuration of TeX Live]% + [2010/04/23 v1.9 graphics configuration of TeX Live]% % Select an appropriate default driver \begingroup @@ -30,18 +30,15 @@ % pdfTeX is running in pdf mode \def\Gin@driver{pdftex.def}% \ExecuteOptions{pdftex}% - % The below is inoperative for the TL'09 DVD; we could not secure all - % the necessary components before the release. - % % 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. + % c) and \DoNotLoadEpstopdf either does not exist or is not \relax, + % d) and pst-pdf is not loaded. % % In other words, by default .eps files will be automatically % converted to .pdf files when outputting pdf. This can be wrong! - % If you created the .pdf as the source of a graphic, and derived a - % .eps from it, you should put + % If the .pdf is the source, rather than the .eps, you should put % \newcommand{\DoNotLoadEpstopdf}{} % before even the \documentclass line of your document. % @@ -53,22 +50,26 @@ % 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{% -% \RequirePackage{pdftexcmds}[2007/11/11]% -% \expandafter\ifx\csname pdf@shellescape\endcsname\relax -% \else -% \ifnum\pdf@shellescape>0 % -% \RequirePackage{epstopdf-base}[2009/07/12]% -% \fi -% \fi -% }% -% \fi -% \fi + \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{% + \@ifpackageloaded{pst-pdf}{}{% + \RequirePackage{pdftexcmds}[2007/11/11]% + \expandafter\ifx\csname pdf@shellescape\endcsname\relax + \else + \ifnum\pdf@shellescape>0 % + \RequirePackage{epstopdf-base}[2009/07/12]% + \fi + \fi + }% + }% + }% + \fi + \fi \or % VTeX is running \def\Gin@driver{vtex.def}% |