summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-10-15 00:09:04 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-10-15 00:09:04 +0000
commit4ccc83c4dac84253f918e3595f37b1bfcd8a08eb (patch)
treeaa0e07f3256826d6364a76e26c60fa52bb097738
parent16a7e6a574f3844d5fab11d2ed5f85778f721aee (diff)
Re-enable epstopdf in graphics.cfg.
Locally hack epstopdf-base.sty to make it use repstopdf. git-svn-id: svn://tug.org/texlive/trunk@15801 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/graphics.cfg35
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty2
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%