diff options
| -rw-r--r-- | Master/texmf-dist/tex/latex/latexconfig/graphics.cfg | 35 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty | 2 |
2 files changed, 17 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg index 80793aa633c..a500c629f96 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg +++ b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg @@ -50,25 +50,22 @@ % For the discussion and background on this, see the thread on latex-l: % http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465 % - % Last-minute 13oct09: disable this by default, until we have a safe - % epstopdf to use. - % -% \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{% + \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}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty index 2825290c983..193e1066f29 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty @@ -412,7 +412,7 @@ \ETE@epstopdf{#1}% } \def\ETE@epstopdf#1{% - epstopdf % + repstopdf % \ifcase\ifx\OutputDirectory\@empty \ifx\ETE@suffix\@empty 1% |