6 files changed, 25 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf b/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf
index a840debbc17..662a8d33243 100644
--- a/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf
+++ b/Master/texmf-dist/doc/latex/epstopdf-pkg/epstopdf.pdf
diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv
index 49ccf9fa6bd..845eb4bf2b6 100644
--- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv
+++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.drv
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: epstopdf
-%% Version: 2019/11/27 v2.8
+%% Version: 2019-11-30 v2.9
 %% 
 %% Copyright (C)
 %%   2001, 2006-2010 Heiko Oberdiek
@@ -39,7 +39,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{epstopdf.drv}%
-  [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
+  [2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx
index ef98cac49f4..e5bd67ebcb7 100644
--- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: epstopdf.dtx
-% Version: 2019/11/27 v2.8
+% Version: 2019-11-30 v2.9
 % Info: Conversion with epstopdf on the fly
 %
 % Copyright (C)
@@ -80,7 +80,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: epstopdf 2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -92,7 +92,7 @@
 This is a generated file.
 
 Project: epstopdf
-Version: 2019/11/27 v2.8
+Version: 2019-11-30 v2.9
 
 Copyright (C)
   2001, 2006-2010 Heiko Oberdiek
@@ -161,7 +161,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{epstopdf.drv}%
-  [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
+  [2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -174,7 +174,7 @@ and the derived files
 % \GetFileInfo{epstopdf.drv}
 %
 % \title{The \xpackage{epstopdf} package}
-% \date{2019/11/27 v2.8}
+% \date{2019-11-30 v2.9}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/epstopdf/issues}}}
 %
@@ -576,7 +576,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@epstopdf.sty\endcsname
 \ProvidesPackage{epstopdf}%
-  [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
+  [2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)]%
 %    \end{macrocode}
 %    Larger catcode set because of configuration files needed.
 %    \begin{macrocode}
@@ -729,7 +729,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@epstopdf-base.sty\endcsname
 \ProvidesPackage{epstopdf-base}%
-  [2019/11/27 v2.8 Base part for package epstopdf]%
+  [2019-11-30 v2.9 Base part for package epstopdf]%
 %    \end{macrocode}
 %
 % \subsubsection{Catcodes}
@@ -1236,7 +1236,6 @@ and the derived files
 %
 %    \begin{macrocode}
 \ifx\SetupKeyvalOptions\@undefined
-\InputIfFileExists{epstopdf-sys.cfg}{}{}
 \else
 %    \end{macrocode}
 %
@@ -1251,14 +1250,15 @@ and the derived files
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\InputIfFileExists{epstopdf-sys.cfg}{}{}
-\InputIfFileExists{epstopdf.cfg}{}{}
+\fi
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\fi
+\InputIfFileExists{epstopdf-sys.cfg}{}{}
+\InputIfFileExists{epstopdf.cfg}{}{}
 %    \end{macrocode}
 %
+%
 %    \begin{macrocode}
 \ETE@AtEnd%
 %</base>
@@ -1667,9 +1667,12 @@ and the derived files
 %     The base package configured not to require additional
 %     packages if called with no arguments.
 %   \item
-%    Code re-arranged to avoidP
+%    Code re-arranged to avoid:
 %    \verb|\end occurred when \ifx on line 165 was incomplete| warning in dvi mode.
 %   \end{Version}
+%   \begin{Version}{2019-11-30 v2.9}
+%   \item Read the \verb|epstopdf.cfg| file even in the base code is being used.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins
index 222873c0d19..fa9f6bdf1ef 100644
--- a/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins
+++ b/Master/texmf-dist/source/latex/epstopdf-pkg/epstopdf.ins
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: epstopdf
-%% Version: 2019/11/27 v2.8
+%% Version: 2019-11-30 v2.9
 %% 
 %% Copyright (C)
 %%   2001, 2006-2010 Heiko Oberdiek
@@ -40,7 +40,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: epstopdf 2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -52,7 +52,7 @@
 This is a generated file.
 
 Project: epstopdf
-Version: 2019/11/27 v2.8
+Version: 2019-11-30 v2.9
 
 Copyright (C)
   2001, 2006-2010 Heiko Oberdiek
diff --git a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty
index 1db31203bb8..d4ebf3171f6 100644
--- a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: epstopdf
-%% Version: 2019/11/27 v2.8
+%% Version: 2019-11-30 v2.9
 %% 
 %% Copyright (C)
 %%   2001, 2006-2010 Heiko Oberdiek
@@ -103,7 +103,7 @@
   \fi
 \expandafter\x\csname ver@epstopdf-base.sty\endcsname
 \ProvidesPackage{epstopdf-base}%
-  [2019/11/27 v2.8 Base part for package epstopdf]%
+  [2019-11-30 v2.9 Base part for package epstopdf]%
 \begingroup\catcode61\catcode48\catcode32=10\relax%
   \catcode13=5 % ^^M
   \endlinechar=13 %
@@ -505,7 +505,6 @@
 \fi
 \let\ETE@prepend\@undefined
 \ifx\SetupKeyvalOptions\@undefined
-\InputIfFileExists{epstopdf-sys.cfg}{}{}
 \else
 \DeclareVoidOption{prepend}{%
   \PrependGraphicsExtensions{.eps}%
@@ -514,9 +513,9 @@
 \DeclareVoidOption{append}{%
   \AppendGraphicsExtensions{.eps}%
 }
+\fi
 \InputIfFileExists{epstopdf-sys.cfg}{}{}
 \InputIfFileExists{epstopdf.cfg}{}{}
-\fi
 \ETE@AtEnd%
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty
index 8edbd4cdca1..32700f26cf3 100644
--- a/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/epstopdf-pkg/epstopdf.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: epstopdf
-%% Version: 2019/11/27 v2.8
+%% Version: 2019-11-30 v2.9
 %% 
 %% Copyright (C)
 %%   2001, 2006-2010 Heiko Oberdiek
@@ -103,7 +103,7 @@
   \fi
 \expandafter\x\csname ver@epstopdf.sty\endcsname
 \ProvidesPackage{epstopdf}%
-  [2019/11/27 v2.8 Conversion with epstopdf on the fly (HO)]%
+  [2019-11-30 v2.9 Conversion with epstopdf on the fly (HO)]%
 \begingroup\catcode61\catcode48\catcode32=10\relax%
   \catcode13=5 % ^^M
   \endlinechar=13 %