4 files changed, 46 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
index 548ad36fd74..67bffd7d6e9 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
index 0a707fd5b63..210c8b54421 100644
--- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
@@ -70,7 +70,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: epstopdf 2009/07/12 v2.0 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -141,7 +141,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{epstopdf.drv}%
-  [2009/07/12 v2.0 Conversion with epstopdf on the fly (HO)]%
+  [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2008/08/11]
 \begin{document}
@@ -150,7 +150,7 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{906}
+% \CheckSum{907}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -171,7 +171,7 @@ and the derived files
 % \GetFileInfo{epstopdf.drv}
 %
 % \title{The \xpackage{epstopdf} package}
-% \date{2009/07/12 v2.0}
+% \date{2009/07/16 v2.2}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -293,24 +293,19 @@ and the derived files
 % unless a supported file type cannot be found earlier. This avoids
 % unnecessary conversion steps that slow down the \LaTeX\ run.
 % If you want to use option \xoption{update} and your \pdfTeX\ supports
-% it, then an outdated PDF file also would be found earlier.
-% Therefore extension \xfile{.eps} should be put in front of the list.
-% This is achieved by option \xoption{prepend}. Then the EPS file
-% is found before the PDF file.
+% it, then an outdated PDF file also would be found earlier unless
+% \xoption{suffix} is used that is the default since version 2.0.
 %
-% However, if there is a case where
-% the original image file is the PDF file and there is also a generated
+% With an empty option \xoption{suffix} and option
+% \xoption{prepend} there is a risk that an original PDF file is overwritten:
+%
+% If the original image file is the PDF file and there is also a generated
 % EPS file, then the original PDF file can be regenerated (depending
 % on the option settings) and the original PDF file gets lost.
 % Therefore option \xoption{suffix} is introduced in version 1.9
 % to create a separate name space for generated output files.
 %
-% On the other hand, option \xoption{append} prevents the
-% utility of option `update'. After the first conversion,
-% the PDF file is found and used first, before even considering
-% the conversion from EPS to PDF.
-%
-% Note: Usually the conversion program needs the exact location
+% \textbf{Note:} Usually the conversion program needs the exact location
 % of the image file. Usually the current directory works.
 % Also if the image file is found using \cs{graphicspath}, the
 % location is known. However, if the image is somewhere
@@ -325,6 +320,14 @@ and the derived files
 % Options can be given as package options or later using:
 % \begin{declcs}{epstopdfsetup} \M{key value list}
 % \end{declcs}
+% \LaTeX\ expands the option list before passing the option list
+% to the package's option handling code. This can fail
+% for option \xoption{suffix} if it contains some of the macros
+% described below. Use \cs{epstopdfsetup} after the package is loaded.
+% Or load package \xpackage{kvoptions-patch} before. This package
+% is also loaded by option \xoption{patch} of package \xpackage{kvoptions}.
+% \LaTeX's option code is redefined to respect key value options and
+% let the values untouched.
 %
 % \begin{description}
 % \def\It#1{\item[\xoption{#1}:]}^^A
@@ -561,7 +564,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@epstopdf.sty\endcsname
 \ProvidesPackage{epstopdf}%
-  [2009/07/12 v2.0 Conversion with epstopdf on the fly (HO)]
+  [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)]
 %    \end{macrocode}
 %    \begin{macrocode}
 \begingroup
@@ -594,7 +597,7 @@ and the derived files
 %
 %    \begin{macrocode}
 \let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2009/07/12]
+\RequirePackage{epstopdf-base}[2009/07/16]
 \let\ETE@AtEnd\ETE@SavedAtEnd
 %    \end{macrocode}
 %
@@ -688,7 +691,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@epstopdf-base.sty\endcsname
 \ProvidesPackage{epstopdf-base}%
-  [2009/07/12 v2.0 Base part for package epstopdf]
+  [2009/07/16 v2.2 Base part for package epstopdf]
 %    \end{macrocode}
 %
 % \subsubsection{Catcodes}
@@ -824,6 +827,7 @@ and the derived files
 %
 %    \begin{macrocode}
 \epstopdfsetup{%
+  verbose,%
   enable,%
   append,%
   update,%
@@ -925,13 +929,13 @@ and the derived files
     \expandafter\grffile@IfFileExists
   \fi
 }
-\def\ETE@Skip#1#2\x\else{%
-  \fi
+\def\ETE@Skip#1#2\x\fi\fi{%
   \fi
   \fi
   \endgroup
+  \fi
+  \fi
   #1%
-  \iffalse
 }
 \newif\ifETE@InsideSetfile
 \newcommand*{\epstopdfcall}[1]{%
@@ -1482,6 +1486,19 @@ and the derived files
 %     \xfile{epstopdf-sys.cfg} is loaded before \xfile{epstopdf.cfg}
 %     if \xfile{epstopdf-sys.cfg} exists.
 %   \end{Version}
+%   \begin{Version}{2009/07/15 v2.1}
+%   \item
+%     Default setting: \xoption{verbose} is now turned on as the
+%     documentation for v2.0 said.
+%   \item
+%     Documentation fixes.
+%   \end{Version}
+%   \begin{Version}{2009/07/16 v2.2}
+%   \item
+%     Fixed redefined \cs{Gin@setfile}.
+%   \item
+%     Documentation extended for package options.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
index 357e5bd11e0..e022c212e40 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
@@ -89,7 +89,7 @@
   \fi
 \expandafter\x\csname ver@epstopdf-base.sty\endcsname
 \ProvidesPackage{epstopdf-base}%
-  [2009/07/12 v2.0 Base part for package epstopdf]
+  [2009/07/16 v2.2 Base part for package epstopdf]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -175,6 +175,7 @@
 \DeclareComplementaryOption{enable}{disable}
 \newcommand*{\epstopdfsetup}{\setkeys{ETE}}
 \epstopdfsetup{%
+  verbose,%
   enable,%
   append,%
   update,%
@@ -264,13 +265,13 @@
     \expandafter\grffile@IfFileExists
   \fi
 }
-\def\ETE@Skip#1#2\x\else{%
-  \fi
+\def\ETE@Skip#1#2\x\fi\fi{%
   \fi
   \fi
   \endgroup
+  \fi
+  \fi
   #1%
-  \iffalse
 }
 \newif\ifETE@InsideSetfile
 \newcommand*{\epstopdfcall}[1]{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 629ac06a46b..1a5d3a57c6c 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
@@ -89,7 +89,7 @@
   \fi
 \expandafter\x\csname ver@epstopdf.sty\endcsname
 \ProvidesPackage{epstopdf}%
-  [2009/07/12 v2.0 Conversion with epstopdf on the fly (HO)]
+  [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -117,7 +117,7 @@
 \TMP@EnsureCode{45}{12}% -
 \TMP@EnsureCode{47}{12}% /
 \let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2009/07/12]
+\RequirePackage{epstopdf-base}[2009/07/16]
 \let\ETE@AtEnd\ETE@SavedAtEnd
 \DeclareOption*{%
   \expandafter\epstopdfsetup\expandafter{\CurrentOption}%