epspdfconversion 0.61 (1jun10)

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

5 files changed, 151 insertions, 58 deletions

diff --git a/Master/texmf-dist/doc/latex/epspdfconversion/README b/Master/texmf-dist/doc/latex/epspdfconversion/README
index 8ad3f46af06..28f09af687b 100644
--- a/Master/texmf-dist/doc/latex/epspdfconversion/README
+++ b/Master/texmf-dist/doc/latex/epspdfconversion/README
@@ -1,9 +1,25 @@
-epspdfconversion.sty facilitates the use of the epspdf tools (on
-CTAN in pub/tex/support) from within PDFLaTeX. EPS graphic
-files are converted "on the fly". It is similar to and based
-on the epstopdf package and allows to pass several options
-such as grayscale, prepress, pdfversion etc. to the epspdf
-conversion-command.
-
-This material is subject to the LaTeX Project Public License 
-in its most recent version.
\ No newline at end of file
+epspdfconversion.sty facilitates the use of the epspdf tools (on CTAN in
+pub/tex/support) from within PDFLaTeX. EPS graphic files are converted
+"on the fly". It is similar to and based on the epstopdf package and
+allows to pass several options such as grayscale, prepress, pdfversion
+etc. to the epspdf conversion-command. Can also be used to trigger a
+conversion of PDF- and PS-files.
+
+New in version 0.61:
+
+* new options pdftopdf and pstopdf. Uses epspdf to do pdf-to-pdf and
+  ps-to-pdf conversions. Allows grayscaling, calculation of bounding boxes
+  etc for pdf's that already exist an for .ps-files. Disabled by default.
+
+* bugfix for the outdir-option (converted files in subdirectories are
+  again saved in those subdirectories) (Thanks to Stefan Pofahl for the
+  feedback.) 
+
+* small improvement of the documentation (on the windows
+  epspdf.bat file, on epstopdf's option 'outdir') 
+
+* now uses epstopdf's \epstopdfDeclareGraphicsRule
+
+
+This material is subject to the LaTeX Project Public License in its most
+recent version.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/epspdfconversion/epspdfconversion.pdf b/Master/texmf-dist/doc/latex/epspdfconversion/epspdfconversion.pdf
index 71177c1f426..faac057bf9c 100644
--- a/Master/texmf-dist/doc/latex/epspdfconversion/epspdfconversion.pdf
+++ b/Master/texmf-dist/doc/latex/epspdfconversion/epspdfconversion.pdf
diff --git a/Master/texmf-dist/doc/latex/epspdfconversion/example/epspdfconversion_docu.tex b/Master/texmf-dist/doc/latex/epspdfconversion/example/epspdfconversion_docu.tex
index 7deb81a42b0..d27d5a7f822 100644
--- a/Master/texmf-dist/doc/latex/epspdfconversion/example/epspdfconversion_docu.tex
+++ b/Master/texmf-dist/doc/latex/epspdfconversion/example/epspdfconversion_docu.tex
@@ -6,12 +6,12 @@
 \usepackage{booktabs}
 \usepackage{tabularx} 
  
-\usepackage[a4paper,left=1in,right=1in,top=1in,bottom=1in]{geometry}% For setting page dimensions / another option: landscape ,,left=1in,right=1in,top=1in,bottom=1in 
+%\usepackage[a4paper,left=1.6cm,right=1.6cm,top=1.6cm,bottom=1.6cm]{geometry}% For setting page dimensions / another option: landscape ,,left=1in,right=1in,top=1in,bottom=1in 
 \usepackage{fancyvrb}
 \VerbatimFootnotes
 
 %\usepackage{multitoc}
-
+ \usepackage{setspace}
 
 %DRAWING, IMAGES 
 \usepackage[final]{graphicx}
@@ -48,7 +48,7 @@ filecolor=black,
 menucolor=black, 
 pagecolor=black, 
 urlcolor=dunkelblau,
-pdftitle = {The package epspdfconversion v0.6}, 
+pdftitle = {The package epspdfconversion v0.61}, 
 pdfsubject = {documentation of the package epspdfconversion.sty }, 
 pdfkeywords = {epspdf, epspdfconversion, LaTeX, eps, eps->pdf, images in pdflatex}, 
 pdfauthor = {d.becker@jpberlin.de}
@@ -82,12 +82,16 @@ pdfauthor = {d.becker@jpberlin.de}
 \author{Daniel Becker\\ \texttt{\href{mailto:d.becker@jpberlin.de}{d.becker@jpberlin.de}}
 \thanks{Many thanks to Siep Kroonenberg and Heiko Oberdiek for their help.}
 } 
-\date{30. April 2010, version 0.6}
+\date{\today \\ version 0.61}
 
 
 \maketitle
 
+\begin{spacing}{0.8}
+\small 
 \tableofcontents
+\end{spacing}
+
 
 
 
@@ -95,23 +99,17 @@ pdfauthor = {d.becker@jpberlin.de}
 
 This package enables the use of the epspdf tools (see \url{http://tex.aanhet.net/epspdf/}) from within (pdf)LaTeX \enquote{on the fly}. It is similar to and based on the epstopdf package that uses the script \verb"epstopdf" for the actual conversion while this packages uses \verb"epspdf" (Note the \verb"epsTOpdf" vs \verb"epspdf").\footnote{You might also want to read the documentation of epstopdf. See \url{http://www.ctan.org/tex-archive/macros/latex/contrib/oberdiek/epstopdf.pdf}.} It is possible to pass several options to the \verb"epspdf" conversion-command. 
 
-While this package can be used for the conversion of eps-files to pdf, the \verb"epspdf"-tools itself can do the conversion both ways.\footnote{It might be possible to add support for conversion like pdf->pdf or pdf->eps and so on. If you are interested, contact me.}
+While this package can be used for the conversion of eps-files to pdf, the \verb"epspdf"-tools itself can do the conversion both ways. Version of the 0.61 adds support for pdf->pdf and ps->pdf conversion, too. 
 
-I am using this package for the inclusion of eps-figures that are produced en-masse by a software packages like Stata, Mathematica or Maple and that are often updated. The package makes sure that I can include the eps-figures easily and the updating of the corresponding pdf's is done ``on-the-fly''. Using the \verb"epspdf"-tools (and not \verb"epstopdf") helps a lot to prepare a final pdf that is, for example, accepted by your print shop (really grayscale, prepress-ready, ...).
+I am using this package for the inclusion of eps-figures (or .pdf or .ps) that are produced en-masse by a software packages like Stata, Mathematica or Maple and that are often updated. The package makes sure that I can include the eps-figures easily and the updating of the corresponding pdf's is done ``on-the-fly''. Using the \verb"epspdf"-tools (and not \verb"epstopdf") helps a lot to prepare a final pdf that is, for example, accepted by your print shop (really grayscale, prepress-ready, ...).
 
 \section{Installation}
 
-If you are using a recent version of TeXLive ($\geqslant$ 2008), you can skip steps 1-4.
+If you are using a recent version of TeXLive ($\geqslant$ 2008), you can skip this section.
 
 \begin{enumerate}
 %%%%%%%%%%%%%% 
-  \item Install \verb"epspdf": Go to \url{http://tex.aanhet.net/epspdf/} and follow the installation instructions there.\footnote{If you are using Windows and do not know how to install epspdf and use it from the command line: The trick is to create a batch-file \verb"epspdf.bat" and place it somewhere where windows can find it (in your path, similar to pdflatex.exe etc.). This file should contain the line\\
-\verb+ruby "<path\_to\_epspdf.rb>" \%*+ \\ 
- where 
-\verb"path\_to\_epspdf.rb"
- needs to replaced the path to epspdf that is valid in your machine, for example by 
-\verb"<C:\Programme\epspdf\epspdf\epspdf.rb>"
-. If everything went ok, you should be able to execute the command epspdf from the command line in Windows (\enquote{Start > Programs > Accessories > Command Prompt}.}
+  \item Install \verb"epspdf": Go to \url{http://tex.aanhet.net/epspdf/} and follow the installation instructions there.
 %%%%%%%%%%%%%% 
 %  \item the package needs a recent version of the epstopf-package as a prerequisite, at least version 2.2.
 %%%%%%%%%%%%%% 
@@ -125,16 +123,42 @@ It results in a file \verb"/Users/daniel/Desktop/testimage.pdf".
 %%%%%%%%%%%%%% 
   \item The package requires that shell-escape are enabled such that TeX is allowed to execute the command epspdf if needed. You should get a warning in your .log-file if this is not the case. Be aware that allowing that is a security risk. 
   
-Enabling shell-escape means that you have to call pdflatex with additional options. In my case -- I use TeXShop on Mac OS X with MacTeX/TeXLive as the TeX-installation in the background -- the command specified for pdflatex is\\ \verb"pdflatex --file-line-error --shell-escape --synctex=1". If you are using MikTeX on Windows as TeX-installation, use \verb"--enable-write18" instead of \verb"--shell-escape". Look for \enquote{shell escape} and \enquote{write18} in the Help-Section of your preferred application for Typesetting on how to enable it (TeXShop, WinEdt, ....).
+Enabling shell-escape means that you have to call pdflatex with additional options. In my case -- I use TeXShop on Mac OS X with MacTeX/TeXLive as the TeX-installation in the background -- the command specified for pdflatex is\\ \verb"pdflatex --file-line-error --shell-escape --synctex=1". If you are using MikTeX on Windows as TeX-installation, use \verb"--enable-write18" instead of\linebreak \verb"--shell-escape". Look for \enquote{shell escape} and \enquote{write18} in the Help-Section of your preferred application for Typesetting on how to enable it (TeXShop, WinEdt, ....).
+\item \emph{Special Note for Windows-Users:} If you are using Windows and do not know how to install epspdf and use it from the command line: The trick is to create a batch-file \verb"epspdf.bat" and place it somewhere where windows can find it (in your path, similar to pdflatex.exe etc.). This file should contain the line\\
+\verb+ruby "C:\Programme\epspdf\epspdf\epspdf.rb" %*+ \\ 
+ where 
+\verb"path\_to\_epspdf.rb"
+ needs to replaced the path to epspdf that is valid in your machine, for example by 
+\verb"<C:\Programme\epspdf\epspdf\epspdf.rb>". If everything went ok, you should be able to execute the command epspdf from the command line in Windows (\enquote{Start > Programs > Accessories > Command Prompt}.
+
+Stefan Pofahl (thanks!) suggested the following \verb"epspdf.bat" batch file:
+\begin{verbatim}
+@ECHO OFF
+REM ---
+SET ruby= "C:\Programme\epspdf\rubysub\bin\ruby.exe"
+SET rb="C:\Programme\epspdf\epspdf\epspdf.rb"
+REM ---
+%ruby% %rb% %*
+\end{verbatim} 
+
+Where, again, the path to \verb"ruby.exe" and \verb"\epspdf.rb" need to be adjusted to your local settings. The advantage is that epspdf.rb and ruby.exe not necessarily need to be in your path...  
+
 \end{enumerate}
 
+
+
 \section{Usage}
 
 Put in the preamble of your .tex-file the line
 \begin{verbatim}
 \usepackage[OPTIONSHERE]{epspdfconversion}
 \end{verbatim}
-where ``OPTIONSHERE'' can be either empty or be filled with the options described below.
+where ``OPTIONSHERE'' can be either empty or be filled with the options described below. {\pack} loads, among others, the \verb"graphics"-package and also \verb"epstopdf", so you don't need to do that. If you prefer \verb"graphicx" over \verb"graphics", load in before {\pack}, i.e.
+
+\begin{verbatim}
+\usepackage{graphicx}
+\usepackage{epspdfconversion}
+\end{verbatim}
 
 If you typeset your document, and (pdf)LaTeX detects that you want to use an eps-figure, the {\pack}-package makes sure that it is converted to a pdf that is then included.
 
@@ -160,29 +184,20 @@ Package grfext Info: Graphics extension search list:
 (grfext)             [.eps,.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,
 .JPG,.JPEG,.JBIG2,.JB2]
 \end{verbatim}
-This implies that image.eps is found first and used with a conversion to pdf is necessary. Complicated? Consider to use \verb"\includegraphics" \emph{with} the extension. This avoids confusion which file actually makes it into your document. See options prepend, prefersuffix, update, suffix below and try to figure out how many different scenarios there are. 
+This implies that image.eps is found first and used if a conversion to pdf is necessary. Complicated? Consider to use \verb"\includegraphics" \emph{with} the extension. This avoids confusion which file actually makes it into your document. See options prepend, prefersuffix, update, suffix below and try to figure out how many different scenarios there are. 
 
-Below, I include a figure \verb"testimage.eps" and another \verb"testimage-static.eps" with the following lines.
 
-\label{bilderbefehle}
-\begin{verbatim}
-\begin{center}
-\includegraphics[width=0.5\textwidth]{testimage.eps}\\
-\includegraphics[width=0.5\textwidth]{testimage-static}
-\end{center} 
-\end{verbatim}
 
 \section{Options}
 
-{\pack} accepts several options.  Table \ref{optiontable} gives an overview. The explanations are more or less taken from the documentation of  epspdf and epstopdf.
+{\pack} accepts several options.  Table \ref{optiontable} below gives an overview. The explanations are more or less taken from the documentation of  epspdf and epstopdf. 
 
 %Put the following code in your main document. store the table in an extra-tex-file named LongTable.tex that might live in a subfolder Tables
 
 \LTXtable{\textwidth}{optionstable.tex}
 
 
-
-Important: When there are several options in the first column, divided by |, this means that you should \emph{choose only one} of them. For example, it does not make sense have this in the preamble:
+When there are several options in the first column, divided by |, this means that you should \emph{choose only one} of them. For example, it does not make sense have this in the preamble:
 \begin{verbatim}
 \usepackage[pdfversion=1.3,pdfversion=1.4]{epspdfconversion}
 \end{verbatim}
@@ -263,7 +278,7 @@ add_cus_dep('eps', 'pdf', 0, 'cus_dep_require_primary_run');
 \end{verbatim}
 \normalsize
 
-This makes latexmk to pay attention for .eps-files. If they are updated, pdflatexmk triggers a run of pdflatex (uses the subroutine \verb+cus_dep_require_primary_run+) and {\pack} can do the necessary conversion of the file. 
+This makes latexmk to pay attention for .eps-files. If they are updated, pdflatexmk triggers a run of pdflatex (uses the subroutine \verb+cus_dep_require_primary_run+) and {\pack} can do the necessary conversion of the file.\footnote{If you enable the options pdftopdf and pstopdf, you should add the corresponding configuration.} 
 
 Note that both epstopdf and latexmk are under active development. If you have difficulties to use latexmk together with  {\pack}, please let me know.
 
@@ -321,7 +336,18 @@ Note that both epstopdf and latexmk are under active development. If you have di
 \section{Version-history, ToDo's}
 
 \begin{description}
-  \item[Possible ToDo's] add support for ps->pdf, pdf->pdf / add support for tif and others in pdflatex via convert / add support for pdf-inclusion in latex (not pdf-latex) / add support for more file-types (tif, jpeg,...) in latex (not pdf-latex). Please report errors and missing features.
+  \item[Possible ToDo's] add support for tif and others in pdflatex via convert / add support for pdf-inclusion in latex (not pdf-latex) / add support for more file-types (tif, jpeg,...) in latex (not pdf-latex) / add support for sam2p.
+  
+  Please report errors, missing features and other suggestions.
+ \item[v.0.61, 2010-06-1:]
+ \begin{itemize}
+  \item new options pdftopdf and pstopdf. Uses epspdf to do pdf-to-pdf and ps-to-pdf conversions. Allows grayscaling, calculation of 
+bounding boxes etc for pdf's that already exist an for .ps-files. Disabled by default.
+  \item bugfix for the outdir-option (converted files in subdirectories are again saved in those subdirectories)
+      (Thanks to Stefan Pofahl for the feedback.)
+  \item small improvement of the documentation (on the windows epspdf.bat file, on epstopdf's option 'outdir')
+  \item now uses epstopdf's \verb"\epstopdfDeclareGraphicsRule"
+\end{itemize}
   \item[v.0.6, 2010-04-30:] small improvements and documentation updates
   \begin{itemize}
   \item  pdfversion now uses epspdf's --pdfversion. --version in epspdf is to print the version number of epspdf (currently, epspdf is at 0.5)
diff --git a/Master/texmf-dist/doc/latex/epspdfconversion/example/optionstable.tex b/Master/texmf-dist/doc/latex/epspdfconversion/example/optionstable.tex
index 8db060e2ebb..f165d0fb9d5 100644
--- a/Master/texmf-dist/doc/latex/epspdfconversion/example/optionstable.tex
+++ b/Master/texmf-dist/doc/latex/epspdfconversion/example/optionstable.tex
@@ -60,34 +60,36 @@ the Ghostscript documentation set. The example on the left adds \verb"-dPDFX" to
 %
 \verb"psoptions={-level2}" & This sets the options for pdftops; the default is -level2, don't include -eps or page number options; these will be generated by epstopdf itself \\  & \\
 %
-\verb"pagenumber={1}" & Page (in the eps-file) to be converted\\  & \\
+\verb"pagenumber={1}" & Page (in the source-file) to be converted\\  & \\
 %
 \multicolumn{2}{l}{\textbf{Options related to epstopdf.sty (the package)}}  \\
 %
  &  These options are options that are passed over to epstopdf.sty that works in the background. You could also use 
-\verb"\epstopdfsetup{OPTIONSforEPSTOPDF.sty}", 
-but you can also control the behaviour of epstopdf.sty by means of setting option to {\pack}. The explanation is borrowed from the \href{http://www.ctan.org/tex-archive/macros/latex/contrib/oberdiek/epstopdf.pdf}{documentation of epstopdf}.\\  & \\
+\verb"\epstopdfsetup{OPTIONSforEPSTOPDF}", 
+but you can also control the behaviour of epstopdf.sty by means of setting options of {\pack}. The explanation is borrowed from the \href{http://www.ctan.org/tex-archive/macros/latex/contrib/oberdiek/epstopdf.pdf}{documentation of epstopdf}.\\  & \\
 %
 \verb"prepend" | \verb"prepend=true" | \verb"prepend=false"  &  Determines whether .eps is appended (if false) or prepended (if true) to the Graphics extension search list. (default: false). (Note that there is no option append. Use \verb"prepend=false" instead.)\\  & \\
 %
-\verb"update" | \verb"update=true" | \verb"update=false" & The conversion program is only called, if the target file does not exist or is older than the source image file. If false, the conversion is done with any run of pdflatex.\\  & \\
+\verb"update" | \verb"update=true" | \verb"update=false" & The conversion program is only called, if the target file does not exist or is older than the source image file. If false, the conversion is done with every run of pdflatex. \verb"update=false" makes sense when you are not yet sure which settings for the conversion to pdf you are going to use.\\  & \\
 %
 \verb"verbose" | \verb"verbose=true" | \verb"verbose=false" & prints some information about the image in the .log file (default: true). 
 \\  & \\
 %
 \verb"suffix={-mysuffix}" & defines a string that is put between the file name base and the extension of the output file. This avoids that existing pdf-files are overwritten. See the  \href{http://www.ctan.org/tex-archive/macros/latex/contrib/oberdiek/epstopdf.pdf}{documentation of epstopdf} for a more detailed explanation. (default: suffix=-epspdf-to)\\  & \\
 %
-\verb"prefersuffix" | \verb"prefersuffix=true" | \verb"prefersuffix=false" & If a suffix is set by option su?x, then there can be two image file names that could be taken into account for inclusion: A image ?le name with the suffix string inside its name and a image file name without; e.g. for 
+\verb"prefersuffix" | \verb"prefersuffix=true" | \verb"prefersuffix=false" & If a suffix is set by option suffix, then there can be two image file names that could be taken into account for inclusion: A image file name with the suffix string inside its name and a image file name without; e.g. for 
 \verb"foo.eps" the names could be: 
 \verb"foo-suffix.pdf", \verb"foo.pdf" 
 If option prefersuffix is turned on, the file \verb"foo-suffix.pdf" and its generation 
 is preferred over using \verb"foo.pdf". Otherwise \verb"foo.pdf" is included without generating \verb"foo-suffix.pdf". (default: true)\\  & \\
 %
-\verb"outdir=./" & The converted file may put in an other output directory. The value of outdir must include the directory separator. Example for the current directory: \newline
+\verb"outdir=./" & The converted file may put in another output directory. The value of outdir must include the directory separator. Example for the current directory: \newline
 \verb"\epstopdfsetup{outdir=./}"\newline
-For other directories ensure that they can be found. See \verb"\graphicspath" or \verb"TEXINPUTS". You might need to set \verb"suffix=" to use another directory than the current. (default: outdir=)  \\
+For other directories ensure that they can be found. See \verb"\graphicspath" or \verb"TEXINPUTS". You might need to set \verb"suffix=" to use another directory than the current. (default: outdir not set, converted images are saved in the same directory as the source-files.)  \\
 %
-\end{longtable}
+\verb"pdftopdf" | \verb"pdftopdf=true" | \verb"pdftopdf=false" &  Enable conversion also for .pdf-files. Detects an .pdf-file, converts it to an pdf, applying the other options that are set (grayscaling, ... ) and used the converted .pdf-file. (default: \verb"pdftopdf =false")  \\
+%
+\verb"pstopdf" | \verb"pstopdf=true" | \verb"pstopdf=false" &  Enable conversion also for .ps-files. Detects an .ps-file, converts it to an pdf and used this. (default: \verb"pstopdf=false")  \\ \end{longtable}
 %END CODE FOR THE LONG TABLE
 
 
diff --git a/Master/texmf-dist/tex/latex/epspdfconversion/epspdfconversion.sty b/Master/texmf-dist/tex/latex/epspdfconversion/epspdfconversion.sty
index 85fa9c1bc00..ed6816a6f0b 100644
--- a/Master/texmf-dist/tex/latex/epspdfconversion/epspdfconversion.sty
+++ b/Master/texmf-dist/tex/latex/epspdfconversion/epspdfconversion.sty
@@ -10,6 +10,12 @@
 %%
 %%
 %% version history:
+%% 0.61 * new options pdftopdf and pstopdf. Uses epspdf to do pdf-to-pdf and ps-to-pdf conversions. Allows grayscaling, calculation of 
+%%        bounding boxes etc for pdf's that already exist an for .ps-files. Disabled by default.
+%%      * bugfix for the outdir-option (converted files in subdirectories are again saved in those subdirectories)
+%%        (Thanks to Stefan Pofahl for the feedback.)
+%%      * small improvement of the documentation (on the windows epspdf.bat file, on epstopdf's option 'outdir')
+%%      * now uses epstopdf's \epstopdfDeclareGraphicsRule
 %% 0.6  * pdfversion now uses epspdf's --pdfversion. --version in epspdf is to print the 
 %%        version number of epspdf (currently, epspdf is at 0.5)
 %%      * new author email
@@ -39,7 +45,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{epspdfconversion}%
-  [2010/04/30 v0.6 Conversion eps->pdf with epspdf-tools on the fly]
+  [2010/06/01 v0.61 Conversion eps->pdf with epspdf-tools on the fly]
 
 
 %% this loads the graphics, epstopdf and the kvoptions packages. 
@@ -78,6 +84,8 @@
   \def\EPC@optgray{ }%
 }
 
+
+
 % Target
 % \EPC@target stores the target only
 % target         ==> --target=default
@@ -153,6 +161,12 @@
 % bbox=false ==> option disabled
 \DeclareBoolOption{bbox}
 
+%support for pdftopdf-conversion
+\DeclareBoolOption{pdftopdf}
+
+%support for pstopdf-conversion
+\DeclareBoolOption{pstopdf}
+
 \DeclareVoidOption{pdftops}{%
   \def\EPC@optpdftops{-U }%
 }
@@ -221,7 +235,7 @@
 }
 
 %% message in the log-file:
-\def\EPC@printlog{  \PackageInfo{epspdfconversion}{\MessageBreak%
+\def\EPC@printlog{\PackageInfo{epspdfconversion}{\MessageBreak%
 \epspdfconversioncmdline{<file>} is used to convert eps->pdf \MessageBreak(not epstopdf (script))\MessageBreak
   }%
 }
@@ -245,10 +259,9 @@
 % suffix. Avoids accidental overwriting of files. 
 % usage: suffix={bla}
 \DeclareStringOption[-epspdf-to]{suffix}
-%  specifies an outdir ...
+%  specifies an outdir, default is current directory ...
 \DeclareStringOption{outdir}
 
-
 \DeclareBoolOption[false]{prepend}
 
 
@@ -258,7 +271,6 @@
 \ProcessKeyvalOptions*
 
 \typeout{%
-^^Jepspdfconversion info:
 ^^Jepspdfconversion.sty is using epstopdf.sty with the following setup:}
 
 % use them to set epstopdf up
@@ -289,9 +301,16 @@
 % suffix
 \epstopdfsetup{suffix=\EPC@suffix}%
 \typeout{\space\space\space\space suffix=\EPC@suffix,}%
+
 % outdir
-\epstopdfsetup{outdir=\EPC@outdir}%
-\typeout{\space\space\space\space outdir=\EPC@outdir,}%
+\let\CheckOutdir\EPC@outdir
+    \ifx\CheckOutdir\@empty
+      \typeout{\space\space\space\space option outdir not set. Default: same directory as the .eps-source-file}%
+    \else
+     \epstopdfsetup{outdir={\EPC@outdir}}%
+     \typeout{\space\space\space\space outdir=\EPC@outdir}%
+    \fi
+
 % prepend
 \ifEPC@prepend
 \epstopdfsetup{prepend}%
@@ -310,17 +329,47 @@
 \typeout{\space\space\space\space \epspdfconversioncmdline{<file>} }
 
 
-% end of message about epstopdf-setup
-\typeout{}
+
 
 \EPC@printlog
 
 
 %%% the main functionality of this package: 
 %%% this changes the definition provided by epstopdf:
-\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`\epspdfconversioncmdline{#1} \OutputFile}}
+
+% previously, I used:
+%\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`\epspdfconversioncmdline{#1} \OutputFile}}
+
+% since version 0.61: use the mechanism provided by epstopdf to define the eps-pdf conversion rule:
+
+\epstopdfDeclareGraphicsRule{.eps}{pdf}{.pdf}{% 
+\epspdfconversioncmdline #1 \OutputFile
+}
+
+% pdftopdf
+\ifEPC@pdftopdf
+\epstopdfDeclareGraphicsRule{.pdf}{pdf}{.pdf}{% 
+\epspdfconversioncmdline #1 \OutputFile
+}
+\typeout{support for pdf-to-pdf is ENABLED}%
+\typeout{}
+\else
+\typeout{support for pdf-to-pdf is DISABLED}%
+\typeout{}
+\fi
+
+% pstopdf
+\ifEPC@pstopdf
+\epstopdfDeclareGraphicsRule{.ps}{pdf}{.pdf}{% 
+\epspdfconversioncmdline #1 \OutputFile
+}
+\typeout{support for ps-to-pdf is ENABLED}%
+\typeout{}
+\else
+\typeout{support for ps-to-pdf is DISABLED}%
+\typeout{}
+\fi
 
 
-  
 
 \endinput