diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf | bin | 368012 -> 262914 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx | 564 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty | 444 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty | 226 |
4 files changed, 312 insertions, 922 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf Binary files differindex 67bffd7d6e9..d920404f771 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 210c8b54421..2086605677a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx @@ -18,7 +18,7 @@ % This work consists of the main source file epstopdf.dtx % and the derived files % epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -% epstopdf-base.sty, epstopdf-test1.tex. +% epstopdf-test1.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/epstopdf.dtx @@ -52,7 +52,6 @@ % % Installation: % TDS:tex/latex/oberdiek/epstopdf.sty -% TDS:tex/latex/oberdiek/epstopdf-base.sty % TDS:doc/latex/oberdiek/epstopdf.pdf % TDS:doc/latex/oberdiek/test/epstopdf-test1.tex % TDS:source/latex/oberdiek/epstopdf.dtx @@ -70,7 +69,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: epstopdf 2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)} +\Msg{* Package: epstopdf 2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)} \Msg{************************************************************************} \keepsilent @@ -99,7 +98,7 @@ This Current Maintainer of this work is Heiko Oberdiek. This work consists of the main source file epstopdf.dtx and the derived files epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, - epstopdf-base.sty, epstopdf-test1.tex. + epstopdf-test1.tex. \endpreamble \let\MetaPrefix\DoubleperCent @@ -109,7 +108,6 @@ and the derived files \file{epstopdf.drv}{\from{epstopdf.dtx}{driver}}% \usedir{tex/latex/oberdiek}% \file{epstopdf.sty}{\from{epstopdf.dtx}{package}}% - \file{epstopdf-base.sty}{\from{epstopdf.dtx}{base}}% \usedir{doc/latex/oberdiek/test}% \file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}% } @@ -118,9 +116,9 @@ and the derived files \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} -\Msg{* files into a directory searched by TeX:} +\Msg{* file into a directory searched by TeX:} \Msg{*} -\Msg{* epstopdf.sty, epstopdf-base.sty} +\Msg{* epstopdf.sty} \Msg{*} \Msg{* And install the following script file:} \Msg{*} @@ -141,7 +139,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{epstopdf.drv}% - [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)]% + [2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -150,7 +148,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{907} +% \CheckSum{618} % % \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 +169,7 @@ and the derived files % \GetFileInfo{epstopdf.drv} % % \title{The \xpackage{epstopdf} package} -% \date{2009/07/16 v2.2} +% \date{2009/03/01 v1.8} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -209,7 +207,7 @@ and the derived files % does not allow the execution of external commands. % Therefore commands in the last argument of % \cs{DeclareGraphicsRule} were of no use. -% But external programs can be called within \pdfTeX. +% But external programs can be calles within \pdfTeX. % This feature is called ``shell escape'' or ``write 18'' % and must usually enabled explicitely because of security reasons. % Now, this package \xpackage{epstopdf} hooks @@ -248,8 +246,8 @@ and the derived files % be used and configured by \cs{DeclareGraphicsRule}. % Example: % \begin{quote} -% |\epstopdfDeclareGraphicsRule{.eps}{pdf}{.pdf}{%|\\ -% | ps2pdf -dEPSCrop #1 \OutputFile|\\ +% |\DeclareGraphicsRule{.eps}{pdf}{.pdf}{%|\\ +% | `ps2pdf -dEPSCrop #1 \OutputFile|\\ % |}| % \end{quote} % \end{itemize} @@ -278,34 +276,28 @@ and the derived files % The algorithm: % \begin{quote} % \def\>{\mbox{}\quad} -% function search( \meta{filebase} )\\ +% function search( \meta{filebase} ) % \>foreach \meta{ext} in \meta{graphics extensions}\\ % \>\>foreach \meta{dir} in \meta{current directory}, \meta{\cs{graphicspath}}\\ % \>\>\>\meta{file} := \meta{dir} + \meta{filebase} + \meta{ext}\\ -% \>\>\>if exist \meta{file}\\ -% \>\>\>\>return found\\ +% \>\>\>if exist \meta{file} +% \>\>\>\>return found % \>return not found % \end{quote} % Package \xpackage{epstopdf} puts \xfile{.eps} at the end of the -% graphics extension search list. This is the behaviour of option +% graphics extension list. This is the behaviour of option % \xoption{append} that is enabled by default. % That means, the conversion is called last % 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 unless -% \xoption{suffix} is used that is the default since version 2.0. -% -% With an empty option \xoption{suffix} and option -% \xoption{prepend} there is a risk that an original PDF file is overwritten: +% 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. Then option \xoption{update} +% have the control and can compare file dates. % -% 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. -% -% \textbf{Note:} Usually the conversion program needs the exact location +% 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 @@ -320,14 +312,6 @@ 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 @@ -348,100 +332,33 @@ and the derived files % \end{quote} % For other directories ensure, that they can be found. % See \cs{graphicspath} or |TEXINPUTS|. -% \It{suffix} -% This option takes a string that is put between the file name base -% and the extension of the output file. Rationale: It can happen, -% that a PDF file is the original file and the EPS file the -% generated file. If now the package thinks, that the PDF file -% is the generated file, it will `regnerate' it. But in reality -% the original file is lost. Therefore I recommend to use this -% option always to generate a separate name space for generated -% files. Proposed value is \texttt{-generated} or \texttt{.generated}. -% The suffix \texttt{.generated} will also work here without the need for -% package \xpackage{grffile}). -% -% Example: -% \begin{quote} -% |\epstopdfsetup{suffix=-generated}|\\ -% Then \xfile{foo.eps} is converted to \xfile{foo-generated.pdf}. -% \end{quote} -% \cs{SourceExt} can be used inside the suffix string. -% It's will be replaced by the extension of the image source -% file without the leading dot, for instance: -% \begin{quote} -% |\epstopdfsetup{suffix=-\SourceExt-converted-to}|\\ -% \xfile{foo.eps} $\Rightarrow$ \xfile{foo-eps-converted-to.pdf} -% \end{quote} -% See also the next option \xoption{prefersuffix} that -% modifies the behaviour of option \xoption{suffix} in some -% cases. -% -% Default for \xoption{suffix} is `|-\SourceExt-converted-to|'. -% -% \It{prefersuffix} -% If a suffix is set by option \xoption{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 \xfile{foo.eps} -% the names could be: -% \begin{quote} -% \xfile{foo-suffix.pdf}, \xfile{foo.pdf} -% \end{quote} -% If option \xoption{perfersuffix} is turned on, the -% file \xfile{foo-suffix.pdf} and its generation is preferred -% over using \xfile{foo.pdf}. Otherwise \xfile{foo.pdf} is included -% without generating \xfile{foo-suffix.pdf}. -% The default of option \xoption{prefersuffix} is \texttt{true}. % \It{verbose} -% It prints some information about the image in the \xfile{.log} file -% (default). +% It prints some information about the image in the \xfile{.log} file. % \end{description} % % \subsection{Configuration} % -% \subsubsection{System configuration file \xfile{epstopdf-sys.cfg}} -% -% If \xfile{epstopdf-sys} exists it is loaded at the end of the -% package \xpackage{epstopdf-base} and before the user configuration -% file. It's intended for TeX distributors. Thus they could add -% additional conversion rules (e.g., .gif -> .png) or set options. -% -% \subsubsection{User configuration file \xfile{epstopdf.cfg}} +% \subsubsection{Configuration file} % % A configuration file \xfile{epstopdf.cfg} is loaded at the end % of the package if it exists. It can be used for changing -% the default option setting. Example: +% the default option setting. My favourite setting is: % \begin{quote} -% |\epstopdfsetup{verbose=false}| +% |\epstopdfsetup{update,prepend,verbose}| % \end{quote} % % \subsubsection{Conversion program} % -% You can use \cs{DeclareGraphicsRule} in a similar way as the +% You can use \cs{DeclareGraphicsRule} the same way as the % route via \xprogram{dvips} to specify the conversion -% command line. -% The conversion argument starts with a back tick, followed -% by the conversion command including parameters. -% -% The whole conversion argument should also be wrapped inside -% \cs{epstopdfcall}. This reduces the problem with packages -% (e.g. \xpackage{pst-pdf}) that use the conversion argument -% and expands it. Macros \cs{SourceFile}, \cs{OutputFile}, and -% \cs{SourceExt} are not defined outside \xpackage{epstopdf-base}'s -% \cs{Gin@setfile} and error messages because of undefined -% command names are the result. If \cs{epstopdfcall} detects that -% it is called outside \xpackage{epstopdf-base}'s \cs{Gin@setfile} -% then it replaces the conversion argument by -% package \xpackage{graphics}'s -% default, usually the image file. -% -% The following macros are available inside: +% command line, examples below. +% +% Additionally you can use the following macros: % \begin{description} % \def\It#1{\item[\cs{#1}:]} % \It{OutputFile}: output file name (with known path and extension) % \It{SourceFile}: source file name (with known path and extension), -% usually the same as |#1|, -% \It{SourceExt}: source extension without leading dot. +% usually the same as |#1|. % \end{description} % % \paragraph{Conversion from EPS to PDF.} @@ -449,19 +366,11 @@ and the derived files % EPS to PDF. Example that uses \xprogram{Ghostscript}: % \begin{quote} % |\DeclareGraphicsRule{.eps}{pdf}{.pdf}{%|\\ -% | \epstopdfcall{`ps2pdf -dEPSCrop #1 \noexpand\OutputFile}%|\\ +% | `ps2pdf -dEPSCrop #1 \noexpand\OutputFile|\\ % |}| % \end{quote} % \cs{DeclareGraphicsRule} expands the argument, therefore \cs{noexpand} -% is necessary. As convenience package \xpackage{epstopdf-base} defines -% \cs{epstopdfDeclareGraphicsRule}. Then the conversion argument -% is not expanded, \cs{epstopdfcall} and the back tick are added: -% \begin{quote} -% |\epstopdfDeclareGraphicsRule{.eps}{pdf}{.pdf}{%|\\ -% | ps2pdf -dEPSCrop #1 \OutputFile|\\ -% |}| -% \end{quote} -% +% is necessary. % Also \cs{OutputFile} respects the setting of option \xoption{outdir}. % % \subsection{Other image formats} @@ -472,8 +381,8 @@ and the derived files % ImageMagick's \xprogram{convert}: %\begin{quote} %\begin{verbatim} -%\epstopdfDeclareGraphicsRule{.gif}{png}{.png}{% -% convert #1 \OutputFile +%\DeclareGraphicsRule{.gif}{png}{.png}{% +% `convert #1 \noexpand\OutputFile %} %\end{verbatim} %\end{quote} @@ -496,8 +405,9 @@ and the derived files %<*package> % \end{macrocode} % -% \subsection{Wrapper package} +% \subsection{Preparations} % +% \subsubsection{Relead check and identification} % Reload check, especially if the package is not used with \LaTeX. % \begin{macrocode} \begingroup @@ -564,134 +474,7 @@ and the derived files \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)] -% \end{macrocode} -% \begin{macrocode} -\begingroup - \catcode123 1 % { - \catcode125 2 % } - \def\x{\endgroup - \expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax - }% - }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } -\def\TMP@EnsureCode#1#2{% - \edef\ETE@AtEnd{% - \ETE@AtEnd - \catcode#1 \the\catcode#1\relax - }% - \catcode#1 #2\relax -} -\TMP@EnsureCode{42}{12}% * -\TMP@EnsureCode{45}{12}% - -\TMP@EnsureCode{47}{12}% / -% \end{macrocode} -% -% \begin{macrocode} -\let\ETE@SavedAtEnd\ETE@AtEnd -\RequirePackage{epstopdf-base}[2009/07/16] -\let\ETE@AtEnd\ETE@SavedAtEnd -% \end{macrocode} -% -% \subsubsection{Option handling} -% -% \begin{macrocode} -\DeclareOption*{% - \expandafter\epstopdfsetup\expandafter{\CurrentOption}% -} -\ProcessOptions*\relax -% \end{macrocode} -% -% \begin{macrocode} -\ETE@AtEnd -%</package> -% \end{macrocode} -% -% \subsection{Base package} -% -% \begin{macrocode} -%<*base> -% \end{macrocode} -% -% \subsection{Preparations} -% -% \subsubsection{Relead check and identification} -% -% Reload check, especially if the package is not used with \LaTeX. -% \begin{macrocode} -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \expandafter\let\expandafter\x\csname ver@epstopdf-base.sty\endcsname - \ifcase 0% - \ifx\x\relax % plain - \else - \ifx\x\empty % LaTeX - \else - 1% - \fi - \fi - \else - \catcode35 6 % # - \catcode123 1 % { - \catcode125 2 % } - \expandafter\ifx\csname PackageInfo\endcsname\relax - \def\x#1#2{% - \immediate\write-1{Package #1 Info: #2.}% - }% - \else - \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% - \fi - \x{epstopdf-base}{The package is already loaded}% - \endgroup - \expandafter\endinput - \fi -\endgroup -% \end{macrocode} -% Package identification: -% \begin{macrocode} -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } - \expandafter\ifx\csname ProvidesPackage\endcsname\relax - \def\x#1#2#3[#4]{\endgroup - \immediate\write-1{Package: #3 #4}% - \xdef#1{#4}% - }% - \else - \def\x#1#2[#3]{\endgroup - #2[{#3}]% - \ifx#1\@undefined - \xdef#1{#3}% - \fi - \ifx#1\relax - \xdef#1{#3}% - \fi - }% - \fi -\expandafter\x\csname ver@epstopdf-base.sty\endcsname -\ProvidesPackage{epstopdf-base}% - [2009/07/16 v2.2 Base part for package epstopdf] + [2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)] % \end{macrocode} % % \subsubsection{Catcodes} @@ -810,32 +593,10 @@ and the derived files \DeclareVoidOption{prepend}{\ETE@prependtrue} \DeclareVoidOption{append}{\ETE@prependfalse} \DeclareStringOption{outdir} -\DeclareStringOption{suffix} -\DeclareBoolOption{prefersuffix} -% \end{macrocode} -% Options \xoption{disable} and \xoption{enable} are for testing -% only. Therefore they are not documented on purpose. -% \begin{macrocode} -\DeclareBoolOption{disable} -\DeclareComplementaryOption{enable}{disable} -% \end{macrocode} -% \begin{macrocode} +\ProcessKeyvalOptions* \newcommand*{\epstopdfsetup}{\setkeys{ETE}} % \end{macrocode} % -% \subsubsection{Default setting} -% -% \begin{macrocode} -\epstopdfsetup{% - verbose,% - enable,% - append,% - update,% - prefersuffix,% - suffix=-\SourceExt-converted-to% -} -% \end{macrocode} -% % \subsection{Make and verbose} % % \begin{macrocode} @@ -920,177 +681,79 @@ and the derived files \@ehc }% \fi -\def\ETE@IfFileExists{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname grffile@IfFileExists\endcsname\relax - \expandafter\IfFileExists - \else - \global\let\ETE@IfFileExists\grffile@IfFileExists - \expandafter\grffile@IfFileExists - \fi -} -\def\ETE@Skip#1#2\x\fi\fi{% - \fi - \fi - \endgroup - \fi - \fi - #1% -} -\newif\ifETE@InsideSetfile -\newcommand*{\epstopdfcall}[1]{% - \ifETE@InsideSetfile - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi - {`#1}% - {\Gin@base\Gin@ext}% -} -\def\ETE@DefCommandLine#1{% - \edef\CommandLine{\expandafter\fi\if`#1}% -} -\def\ETE@DefX#1{% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\x - \expandafter\expandafter\expandafter{% - \expandafter\fi\if`#1\relax\else - }% -} \def\Gin@setfile#1#2#3{% - \ifETE@disable - \ETE@OrgGin@setfile{#1}{#2}{#3}% - \else + \if`\@car #3\relax\@nil \begingroup - \ETE@InsideSetfiletrue - \ETE@DefX{#3}% - \expandafter\endgroup - \ifx\x\@empty - \ETE@OrgGin@setfile{#1}{#2}{#3}% - \else - \begingroup - \ETE@InsideSetfiletrue - \def\GraphicsType{#1}% - \def\GraphicsRead{#2}% - \ifETE@prefersuffix - \else - \ifx\ETE@suffix\@empty - \else - \ETE@IfFileExists{\Gin@base\GraphicsRead}{% - \ETE@Skip{% - \ETE@OrgGin@setfile{#1}{#2}{\Gin@base#2}% - }% - }{% - \let\next\relax + \def\GraphicsType{#1}% + \def\GraphicsRead{#2}% + \ifx\Gin@ext\relax + \def\SourceFile{\Gin@base\Gin@eext}% + \else + \def\SourceFile{\Gin@base\Gin@ext}% + \fi + \let\OutputDirectory\ETE@outdir + \ifx\OutputDirectory\@empty + \def\OutputFile{\Gin@base#2}% + \else + \begingroup + \filename@parse{\Gin@base#2}% + \edef\x{\endgroup + \def\noexpand\OutputFile{% + \OutputDirectory\filename@base#2% }% - \next - \fi - \fi - \ifx\Gin@ext\relax - \let\SourceExt\Gin@eext - \def\SourceFile{\Gin@base\Gin@eext}% - \else - \let\SourceExt\Gin@ext - \def\SourceFile{\Gin@base\Gin@ext}% - \fi - \edef\SourceExt{% remove dot - \expandafter\@cdr\SourceExt\@empty\@nil + }% + \x + \fi + \edef\CommandLine{\@cdr#3\@empty\@nil}% + \ifETE@verbose + \@PackageInfo{epstopdf}{% + \ETE@FileInfo{Source}\SourceFile\MessageBreak + \ETE@FileInfo{Output}\OutputFile\MessageBreak + Command: <\CommandLine>\MessageBreak + \string\includegraphics }% - \let\OutputDirectory\ETE@outdir - \ifx\OutputDirectory\@empty - \edef\OutputFile{\ETE@GenerateName{\Gin@base}{#2}}% - \else - \begingroup - \filename@parse{\Gin@base#2}% - \edef\x{\endgroup - \def\noexpand\OutputFile{% - \ETE@GenerateName{% - \OutputDirectory\filename@base - }{#2}% - }% - }% - \x - \fi - \ETE@DefCommandLine{#3}% + \fi + \ETE@Make\SourceFile\OutputFile{% + \pdf@system{\CommandLine}% \ifETE@verbose - \@PackageInfo{epstopdf}{% - \ETE@FileInfo{Source}\SourceFile\MessageBreak - \ETE@FileInfo{Output}\OutputFile\MessageBreak - Command: <\CommandLine>\MessageBreak - \string\includegraphics + \@PackageInfoNoLine{epstopdf}{% + \ETE@FileInfo{Result}\OutputFile }% \fi - \ETE@Make\SourceFile\OutputFile{% - \pdf@system{\CommandLine}% - \ifETE@verbose - \@PackageInfoNoLine{epstopdf}{% - \ETE@FileInfo{Result}\OutputFile - }% - \fi - }% - \edef\x{\endgroup - \ifx\OutputDirectory\@empty - \else - \def\noexpand\Gin@base{% - \OutputDirectory\noexpand\filename@base - }% - \fi - \ifx\ETE@suffix\@empty - \else - \edef\noexpand\Gin@base{\Gin@base\ETE@suffix}% - \fi - \noexpand\ETE@OrgGin@setfile{% - \GraphicsType - }{% - \GraphicsRead - }{% - \OutputFile + }% + \edef\x{\endgroup + \ifx\OutputDirectory\@empty + \else + \def\noexpand\Gin@base{% + \OutputDirectory\noexpand\filename@base }% - }% - \x - \fi - \fi -} -\def\ETE@GenerateName#1#2{% - #1\ETE@suffix#2% -} -% \end{macrocode} -% -% \subsection{Declare graphics rule} -% -% \begin{macrocode} -\newcommand*{\epstopdfDeclareGraphicsRule}[4]{% - \ifx\\#4\\% - \@PackageError{epstopdf-base}{% - Conversion command is missing% - }\@ehc - \else - \begingroup - \@ifundefined{Gin@rule@#1}{% - }{% - \@PackageInfo{epstopdf-base}{% - Redefining graphics rule for `#1'% + \fi + \noexpand\ETE@OrgGin@setfile{% + \GraphicsType + }{% + \GraphicsRead + }{% + \OutputFile }% }% - \endgroup - \@namedef{Gin@rule@#1}##1{{#2}{#3}{\epstopdfcall{#4}}}% + \x + \else + \ETE@OrgGin@setfile{#1}{#2}{#3}% \fi } % \end{macrocode} % % \cs{DeclareGraphicsRule} for .eps % \begin{macrocode} -\epstopdfDeclareGraphicsRule{.eps}{pdf}{.pdf}{% - \ETE@epstopdf{#1}% -} +\expandafter\ifx\csname Gin@rule@.eps\endcsname\relax +\else + \@PackageInfo{epstopdf}{Overwriting graphics rule for `.eps'}% +\fi +\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`\ETE@epstopdf{#1}}} \def\ETE@epstopdf#1{% epstopdf % - \ifcase\ifx\OutputDirectory\@empty - \ifx\ETE@suffix\@empty - 1% - \fi - \fi - 0 % + \ifx\OutputDirectory\@empty + \else --outfile=\OutputFile\space \fi #1% @@ -1115,13 +778,12 @@ and the derived files % \end{macrocode} % % \begin{macrocode} -\InputIfFileExists{epstopdf-sys.cfg}{}{} \InputIfFileExists{epstopdf.cfg}{}{} % \end{macrocode} % % \begin{macrocode} \ETE@AtEnd -%</base> +%</package> % \end{macrocode} % % \section{Test} @@ -1284,7 +946,6 @@ and the derived files % \def\t{^^A % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} % epstopdf.sty & tex/latex/oberdiek/epstopdf.sty\\ -% epstopdf-base.sty & tex/latex/oberdiek/epstopdf-base.sty\\ % epstopdf.pdf & doc/latex/oberdiek/epstopdf.pdf\\ % test/epstopdf-test1.tex & doc/latex/oberdiek/test/epstopdf-test1.tex\\ % epstopdf.dtx & source/latex/oberdiek/epstopdf.dtx\\ @@ -1462,43 +1123,6 @@ and the derived files % \item % Warning message for missing \xfile{pdftex.def} changed. % \end{Version} -% \begin{Version}{2009/07/06 v1.9} -% \item -% Option \xoption{suffix} added. -% \end{Version} -% \begin{Version}{2009/07/07 v1.10} -% \item -% \cs{SourceExt} added. -% \item -% If option \xoption{suffix} is set, the inclusion of -% an image without the suffix namespace is preferred over generating the -% the image within the suffix namespace. -% \end{Version} -% \begin{Version}{2009/07/12 v2.0} -% \item -% New default settings. -% \item -% Package is split into \xpackage{epstopdf} that only takes package -% options and loads \xpackage{epstopdf-base} that does the work. -% \item -% \cs{epstopdfDeclareGraphicsRule} and \cs{epstopdfcall} added. -% \item -% \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 deleted file mode 100644 index e022c212e40..00000000000 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty +++ /dev/null @@ -1,444 +0,0 @@ -%% -%% This is file `epstopdf-base.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% epstopdf.dtx (with options: `base') -%% -%% This is a generated file. -%% -%% Copyright (C) 2001, 2006-2009 by -%% Heiko Oberdiek <oberdiek@uni-freiburg.de> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3 of this license or (at your option) any later -%% version. The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% This Current Maintainer of this work is Heiko Oberdiek. -%% -%% This work consists of the main source file epstopdf.dtx -%% and the derived files -%% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -%% epstopdf-base.sty, epstopdf-test1.tex. -%% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \expandafter\let\expandafter\x\csname ver@epstopdf-base.sty\endcsname - \ifcase 0% - \ifx\x\relax % plain - \else - \ifx\x\empty % LaTeX - \else - 1% - \fi - \fi - \else - \catcode35 6 % # - \catcode123 1 % { - \catcode125 2 % } - \expandafter\ifx\csname PackageInfo\endcsname\relax - \def\x#1#2{% - \immediate\write-1{Package #1 Info: #2.}% - }% - \else - \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% - \fi - \x{epstopdf-base}{The package is already loaded}% - \endgroup - \expandafter\endinput - \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } - \expandafter\ifx\csname ProvidesPackage\endcsname\relax - \def\x#1#2#3[#4]{\endgroup - \immediate\write-1{Package: #3 #4}% - \xdef#1{#4}% - }% - \else - \def\x#1#2[#3]{\endgroup - #2[{#3}]% - \ifx#1\@undefined - \xdef#1{#3}% - \fi - \ifx#1\relax - \xdef#1{#3}% - \fi - }% - \fi -\expandafter\x\csname ver@epstopdf-base.sty\endcsname -\ProvidesPackage{epstopdf-base}% - [2009/07/16 v2.2 Base part for package epstopdf] -\begingroup - \catcode123 1 % { - \catcode125 2 % } - \def\x{\endgroup - \expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax - }% - }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } -\def\TMP@EnsureCode#1#2{% - \edef\ETE@AtEnd{% - \ETE@AtEnd - \catcode#1 \the\catcode#1\relax - }% - \catcode#1 #2\relax -} -\TMP@EnsureCode{33}{12}% ! -\TMP@EnsureCode{39}{12}% ' -\TMP@EnsureCode{42}{12}% * -\TMP@EnsureCode{44}{12}% , -\TMP@EnsureCode{45}{12}% - -\TMP@EnsureCode{46}{12}% . -\TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = -\TMP@EnsureCode{62}{12}% > -\TMP@EnsureCode{96}{12}% ` -\RequirePackage{infwarerr}[2007/09/09] -\RequirePackage{grfext}\relax -\RequirePackage{kvoptions}[2007/10/02] -\RequirePackage{pdftexcmds}[2007/11/11] -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname Gin@setfile\endcsname\relax - \@PackageWarningNoLine{epstopdf}{% - No graphics package \string`graphic{s,x}\string' loaded% - }% - \newcommand*{\epstopdfsetup}[1]{}% - \ETE@AtEnd - \expandafter\endinput -\fi -\begingroup - \def\x{pdftex.def}% - \ifx\Gin@driver\x - \else - \@PackageWarningNoLine{epstopdf}{% - Other drivers than `pdftex.def' are not supported% - }% - \endgroup - \newcommand*{\epstopdfsetup}[1]{}% - \ETE@AtEnd - \expandafter\endinput - \fi -\endgroup -\begingroup - \expandafter\ifx\csname pdf@shellescape\endcsname\relax - \else - \ifnum\pdf@shellescape>0 % - \else - \@PackageWarningNoLine{epstopdf}{% - Shell escape feature is not enabled% - }% - \fi - \fi -\endgroup -\SetupKeyvalOptions{family=ETE,prefix=ETE@} -\DeclareBoolOption{update} -\DeclareBoolOption{verbose} -\newif\ifETE@prepend -\DeclareVoidOption{prepend}{\ETE@prependtrue} -\DeclareVoidOption{append}{\ETE@prependfalse} -\DeclareStringOption{outdir} -\DeclareStringOption{suffix} -\DeclareBoolOption{prefersuffix} -\DeclareBoolOption{disable} -\DeclareComplementaryOption{enable}{disable} -\newcommand*{\epstopdfsetup}{\setkeys{ETE}} -\epstopdfsetup{% - verbose,% - enable,% - append,% - update,% - prefersuffix,% - suffix=-\SourceExt-converted-to% -} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdf@filemoddate\endcsname\relax - \def\ETE@Make#1#2{% - \ifETE@update - \ETE@WarnModDate - \fi - \@firstofone - }% - \def\ETE@WarnModDate{% - \@PackageWarningNoLine{epstopdf}{% - \string\pdffilemoddate\space is not available,\MessageBreak - option `update' will be ignored% - }% - \global\let\ETE@WarnModDate\relax - }% - \def\ETE@FileInfo#1#2{#1 file: <#2>}% -\else - \def\ETE@Make#1#2{% - \ifETE@update - \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 % - \expandafter\expandafter\expandafter\@firstofone - \else - \@PackageInfoNoLine{epstopdf}{% - Output file is already uptodate% - }% - \expandafter\expandafter\expandafter\@gobble - \fi - \else - \expandafter\@firstofone - \fi - }% - \def\ETE@FileInfo#1#2{% - #1 file: <#2>% - \expandafter\expandafter\expandafter - \ETE@Date\pdf@filemoddate{#2}\@nil - \expandafter\expandafter\expandafter - \ETE@Size\pdf@filesize{#2}\@nil - }% - \def\ETE@Date#1\@nil{% - \ifx\\#1\\% - \else - \ETE@@Date#1\@nil - \fi - }% - \def\ETE@@Date#1:#2#3#4#5#6#7#8#9{% - \MessageBreak - \@spaces\space\space\space date: #2#3#4#5-#6#7-#8#9 % - \ETE@@Time - }% - \def\ETE@@Time#1#2#3#4#5#6#7\@nil{% - #1#2:#3#4:#5#6% - }% - \def\ETE@Size#1\@nil{% - \ifx\\#1\\% - \else - \MessageBreak - \@spaces\space\space\space size: #1 bytes% - \fi - }% -\fi -\expandafter\ifx\csname ETE@OrgGin@setfile\endcsname\relax - \let\ETE@OrgGin@setfile\Gin@setfile -\else - \@PackageError{epstopdf}{% - Command \string\ETE@OrgGin@setfile\space - already defined.\MessageBreak - }{% - Probably some package has included the code of this package% - \MessageBreak - instead of using \string\RequirePackage{epstopdf}.% - \MessageBreak - \@ehc - }% -\fi -\def\ETE@IfFileExists{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname grffile@IfFileExists\endcsname\relax - \expandafter\IfFileExists - \else - \global\let\ETE@IfFileExists\grffile@IfFileExists - \expandafter\grffile@IfFileExists - \fi -} -\def\ETE@Skip#1#2\x\fi\fi{% - \fi - \fi - \endgroup - \fi - \fi - #1% -} -\newif\ifETE@InsideSetfile -\newcommand*{\epstopdfcall}[1]{% - \ifETE@InsideSetfile - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi - {`#1}% - {\Gin@base\Gin@ext}% -} -\def\ETE@DefCommandLine#1{% - \edef\CommandLine{\expandafter\fi\if`#1}% -} -\def\ETE@DefX#1{% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\x - \expandafter\expandafter\expandafter{% - \expandafter\fi\if`#1\relax\else - }% -} -\def\Gin@setfile#1#2#3{% - \ifETE@disable - \ETE@OrgGin@setfile{#1}{#2}{#3}% - \else - \begingroup - \ETE@InsideSetfiletrue - \ETE@DefX{#3}% - \expandafter\endgroup - \ifx\x\@empty - \ETE@OrgGin@setfile{#1}{#2}{#3}% - \else - \begingroup - \ETE@InsideSetfiletrue - \def\GraphicsType{#1}% - \def\GraphicsRead{#2}% - \ifETE@prefersuffix - \else - \ifx\ETE@suffix\@empty - \else - \ETE@IfFileExists{\Gin@base\GraphicsRead}{% - \ETE@Skip{% - \ETE@OrgGin@setfile{#1}{#2}{\Gin@base#2}% - }% - }{% - \let\next\relax - }% - \next - \fi - \fi - \ifx\Gin@ext\relax - \let\SourceExt\Gin@eext - \def\SourceFile{\Gin@base\Gin@eext}% - \else - \let\SourceExt\Gin@ext - \def\SourceFile{\Gin@base\Gin@ext}% - \fi - \edef\SourceExt{% remove dot - \expandafter\@cdr\SourceExt\@empty\@nil - }% - \let\OutputDirectory\ETE@outdir - \ifx\OutputDirectory\@empty - \edef\OutputFile{\ETE@GenerateName{\Gin@base}{#2}}% - \else - \begingroup - \filename@parse{\Gin@base#2}% - \edef\x{\endgroup - \def\noexpand\OutputFile{% - \ETE@GenerateName{% - \OutputDirectory\filename@base - }{#2}% - }% - }% - \x - \fi - \ETE@DefCommandLine{#3}% - \ifETE@verbose - \@PackageInfo{epstopdf}{% - \ETE@FileInfo{Source}\SourceFile\MessageBreak - \ETE@FileInfo{Output}\OutputFile\MessageBreak - Command: <\CommandLine>\MessageBreak - \string\includegraphics - }% - \fi - \ETE@Make\SourceFile\OutputFile{% - \pdf@system{\CommandLine}% - \ifETE@verbose - \@PackageInfoNoLine{epstopdf}{% - \ETE@FileInfo{Result}\OutputFile - }% - \fi - }% - \edef\x{\endgroup - \ifx\OutputDirectory\@empty - \else - \def\noexpand\Gin@base{% - \OutputDirectory\noexpand\filename@base - }% - \fi - \ifx\ETE@suffix\@empty - \else - \edef\noexpand\Gin@base{\Gin@base\ETE@suffix}% - \fi - \noexpand\ETE@OrgGin@setfile{% - \GraphicsType - }{% - \GraphicsRead - }{% - \OutputFile - }% - }% - \x - \fi - \fi -} -\def\ETE@GenerateName#1#2{% - #1\ETE@suffix#2% -} -\newcommand*{\epstopdfDeclareGraphicsRule}[4]{% - \ifx\\#4\\% - \@PackageError{epstopdf-base}{% - Conversion command is missing% - }\@ehc - \else - \begingroup - \@ifundefined{Gin@rule@#1}{% - }{% - \@PackageInfo{epstopdf-base}{% - Redefining graphics rule for `#1'% - }% - }% - \endgroup - \@namedef{Gin@rule@#1}##1{{#2}{#3}{\epstopdfcall{#4}}}% - \fi -} -\epstopdfDeclareGraphicsRule{.eps}{pdf}{.pdf}{% - \ETE@epstopdf{#1}% -} -\def\ETE@epstopdf#1{% - epstopdf % - \ifcase\ifx\OutputDirectory\@empty - \ifx\ETE@suffix\@empty - 1% - \fi - \fi - 0 % - --outfile=\OutputFile\space - \fi - #1% -} -\ifETE@prepend - \expandafter\PrependGraphicsExtensions -\else - \expandafter\AppendGraphicsExtensions -\fi -{.eps} -\let\ETE@prepend\@undefined -\DeclareVoidOption{prepend}{% - \PrependGraphicsExtensions{.eps}% -} -\let\ETE@append\@undefined -\DeclareVoidOption{append}{% - \AppendGraphicsExtensions{.eps}% -} -\InputIfFileExists{epstopdf-sys.cfg}{}{} -\InputIfFileExists{epstopdf.cfg}{}{} -\ETE@AtEnd -\endinput -%% -%% End of file `epstopdf-base.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index 1a5d3a57c6c..d2d7b7faad2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -26,7 +26,7 @@ %% This work consists of the main source file epstopdf.dtx %% and the derived files %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, -%% epstopdf-base.sty, epstopdf-test1.tex. +%% epstopdf-test1.tex. %% \begingroup \catcode44 12 % , @@ -89,7 +89,7 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)] + [2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -113,16 +113,226 @@ }% \catcode#1 #2\relax } +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\let\ETE@SavedAtEnd\ETE@AtEnd -\RequirePackage{epstopdf-base}[2009/07/16] -\let\ETE@AtEnd\ETE@SavedAtEnd -\DeclareOption*{% - \expandafter\epstopdfsetup\expandafter{\CurrentOption}% +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{96}{12}% ` +\RequirePackage{infwarerr}[2007/09/09] +\RequirePackage{grfext}\relax +\RequirePackage{kvoptions}[2007/10/02] +\RequirePackage{pdftexcmds}[2007/11/11] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname Gin@setfile\endcsname\relax + \@PackageWarningNoLine{epstopdf}{% + No graphics package \string`graphic{s,x}\string' loaded% + }% + \newcommand*{\epstopdfsetup}[1]{}% + \ETE@AtEnd + \expandafter\endinput +\fi +\begingroup + \def\x{pdftex.def}% + \ifx\Gin@driver\x + \else + \@PackageWarningNoLine{epstopdf}{% + Other drivers than `pdftex.def' are not supported% + }% + \endgroup + \newcommand*{\epstopdfsetup}[1]{}% + \ETE@AtEnd + \expandafter\endinput + \fi +\endgroup +\begingroup + \expandafter\ifx\csname pdf@shellescape\endcsname\relax + \else + \ifnum\pdf@shellescape>0 % + \else + \@PackageWarningNoLine{epstopdf}{% + Shell escape feature is not enabled% + }% + \fi + \fi +\endgroup +\SetupKeyvalOptions{family=ETE,prefix=ETE@} +\DeclareBoolOption{update} +\DeclareBoolOption{verbose} +\newif\ifETE@prepend +\DeclareVoidOption{prepend}{\ETE@prependtrue} +\DeclareVoidOption{append}{\ETE@prependfalse} +\DeclareStringOption{outdir} +\ProcessKeyvalOptions* +\newcommand*{\epstopdfsetup}{\setkeys{ETE}} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@filemoddate\endcsname\relax + \def\ETE@Make#1#2{% + \ifETE@update + \ETE@WarnModDate + \fi + \@firstofone + }% + \def\ETE@WarnModDate{% + \@PackageWarningNoLine{epstopdf}{% + \string\pdffilemoddate\space is not available,\MessageBreak + option `update' will be ignored% + }% + \global\let\ETE@WarnModDate\relax + }% + \def\ETE@FileInfo#1#2{#1 file: <#2>}% +\else + \def\ETE@Make#1#2{% + \ifETE@update + \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 % + \expandafter\expandafter\expandafter\@firstofone + \else + \@PackageInfoNoLine{epstopdf}{% + Output file is already uptodate% + }% + \expandafter\expandafter\expandafter\@gobble + \fi + \else + \expandafter\@firstofone + \fi + }% + \def\ETE@FileInfo#1#2{% + #1 file: <#2>% + \expandafter\expandafter\expandafter + \ETE@Date\pdf@filemoddate{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Size\pdf@filesize{#2}\@nil + }% + \def\ETE@Date#1\@nil{% + \ifx\\#1\\% + \else + \ETE@@Date#1\@nil + \fi + }% + \def\ETE@@Date#1:#2#3#4#5#6#7#8#9{% + \MessageBreak + \@spaces\space\space\space date: #2#3#4#5-#6#7-#8#9 % + \ETE@@Time + }% + \def\ETE@@Time#1#2#3#4#5#6#7\@nil{% + #1#2:#3#4:#5#6% + }% + \def\ETE@Size#1\@nil{% + \ifx\\#1\\% + \else + \MessageBreak + \@spaces\space\space\space size: #1 bytes% + \fi + }% +\fi +\expandafter\ifx\csname ETE@OrgGin@setfile\endcsname\relax + \let\ETE@OrgGin@setfile\Gin@setfile +\else + \@PackageError{epstopdf}{% + Command \string\ETE@OrgGin@setfile\space + already defined.\MessageBreak + }{% + Probably some package has included the code of this package% + \MessageBreak + instead of using \string\RequirePackage{epstopdf}.% + \MessageBreak + \@ehc + }% +\fi +\def\Gin@setfile#1#2#3{% + \if`\@car #3\relax\@nil + \begingroup + \def\GraphicsType{#1}% + \def\GraphicsRead{#2}% + \ifx\Gin@ext\relax + \def\SourceFile{\Gin@base\Gin@eext}% + \else + \def\SourceFile{\Gin@base\Gin@ext}% + \fi + \let\OutputDirectory\ETE@outdir + \ifx\OutputDirectory\@empty + \def\OutputFile{\Gin@base#2}% + \else + \begingroup + \filename@parse{\Gin@base#2}% + \edef\x{\endgroup + \def\noexpand\OutputFile{% + \OutputDirectory\filename@base#2% + }% + }% + \x + \fi + \edef\CommandLine{\@cdr#3\@empty\@nil}% + \ifETE@verbose + \@PackageInfo{epstopdf}{% + \ETE@FileInfo{Source}\SourceFile\MessageBreak + \ETE@FileInfo{Output}\OutputFile\MessageBreak + Command: <\CommandLine>\MessageBreak + \string\includegraphics + }% + \fi + \ETE@Make\SourceFile\OutputFile{% + \pdf@system{\CommandLine}% + \ifETE@verbose + \@PackageInfoNoLine{epstopdf}{% + \ETE@FileInfo{Result}\OutputFile + }% + \fi + }% + \edef\x{\endgroup + \ifx\OutputDirectory\@empty + \else + \def\noexpand\Gin@base{% + \OutputDirectory\noexpand\filename@base + }% + \fi + \noexpand\ETE@OrgGin@setfile{% + \GraphicsType + }{% + \GraphicsRead + }{% + \OutputFile + }% + }% + \x + \else + \ETE@OrgGin@setfile{#1}{#2}{#3}% + \fi +} +\expandafter\ifx\csname Gin@rule@.eps\endcsname\relax +\else + \@PackageInfo{epstopdf}{Overwriting graphics rule for `.eps'}% +\fi +\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`\ETE@epstopdf{#1}}} +\def\ETE@epstopdf#1{% + epstopdf % + \ifx\OutputDirectory\@empty + \else + --outfile=\OutputFile\space + \fi + #1% +} +\ifETE@prepend + \expandafter\PrependGraphicsExtensions +\else + \expandafter\AppendGraphicsExtensions +\fi +{.eps} +\let\ETE@prepend\@undefined +\DeclareVoidOption{prepend}{% + \PrependGraphicsExtensions{.eps}% +} +\let\ETE@append\@undefined +\DeclareVoidOption{append}{% + \AppendGraphicsExtensions{.eps}% } -\ProcessOptions*\relax +\InputIfFileExists{epstopdf.cfg}{}{} \ETE@AtEnd \endinput %% |