summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-14 22:41:10 +0000
committerKarl Berry <karl@freefriends.org>2016-06-14 22:41:10 +0000
commitd2c7b41935ad636a2c5c951667a065e092b1273f (patch)
treefa78f13d0c8f1f6a34015aa688c36763be17aa9c /Master
parent9a1c781313c984e8d5c88b832b1c08e1da3fe155 (diff)
graphics-cfg (14jun16)
git-svn-id: svn://tug.org/texlive/trunk@41448 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/graphics-cfg/README.md3
-rw-r--r--Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg44
2 files changed, 1 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/graphics-cfg/README.md b/Master/texmf-dist/doc/latex/graphics-cfg/README.md
index a50e3af01dc..9a7bf16b2e0 100644
--- a/Master/texmf-dist/doc/latex/graphics-cfg/README.md
+++ b/Master/texmf-dist/doc/latex/graphics-cfg/README.md
@@ -19,9 +19,6 @@ luatex, pdftex, vtex, xetex or dvips.
Note that pdftex option is used for luatex versions older than
luatex 0.87.
-graphics.cfg also has code to enable EPS to PDF conversion if used
-with pdftex, this code may be moved to pdftex.def later.
-
These files are currently maintained by the LaTeX3 project but
diff --git a/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg b/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
index 85f95c463ff..7a6d9ac737e 100644
--- a/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
+++ b/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
@@ -1,7 +1,7 @@
% https://creativecommons.org/publicdomain/zero/1.0/
\ProvidesFile{graphics.cfg}%
- [2016/01/02 v1.10 sample graphics configuration]%
+ [2016/06/04 v1.11 sample graphics configuration]%
% Select an appropriate default driver
\begingroup
@@ -43,48 +43,6 @@
% pdfTeX is running in pdf mode
\def\Gin@driver{pdftex.def}%
\ExecuteOptions{pdftex}%
- % 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{%
- \@ifpackageloaded{pst-pdf}{}{%
- \@ifpackageloaded{pdftricks}{}{%
- \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
- }% pdftricks not loaded
- }% pst-pdf not loaded
- }% AtBeginDocument block
- }% AtEndofPackage block
- \fi % AtEndofPackage not defined
- \fi % DoNotLoadEpstopdf not defined
\or
% VTeX is running
\def\Gin@driver{vtex.def}%