also donotloadepstopdf if pdftricks is loaded

(along with previous test for pst-pdf)


git-svn-id: svn://tug.org/texlive/trunk@19403 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 14 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg
index e8b6062f5b7..c63f3211d2e 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg
+++ b/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg
@@ -34,7 +34,7 @@
   % 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 pst-pdf is not loaded.
+  % 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!
@@ -58,18 +58,20 @@
       \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]%
+            \@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
-            \fi
-          }%
-        }%
-      }%
-    \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}%