summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-06 23:54:10 +0000
committerKarl Berry <karl@freefriends.org>2009-07-06 23:54:10 +0000
commitcca863496e8adf1f6715230a728ce587c77f0086 (patch)
treec9789c5b9d74967416644a3b693d2ad65c290ad9 /Master/texmf-dist/tex/latex/oberdiek
parent7feea261bf7f5a8afa8241dddf6c30e30cf8fde4 (diff)
epstopdf update with suffix option
git-svn-id: svn://tug.org/texlive/trunk@14163 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty24
1 files changed, 19 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index d2d7b7faad2..e35587aec62 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/03/01 v1.8 Conversion with epstopdf on the fly (HO)]
+ [2009/07/06 v1.9 Conversion with epstopdf on the fly (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -169,6 +169,7 @@
\DeclareVoidOption{prepend}{\ETE@prependtrue}
\DeclareVoidOption{append}{\ETE@prependfalse}
\DeclareStringOption{outdir}
+\DeclareStringOption{suffix}
\ProcessKeyvalOptions*
\newcommand*{\epstopdfsetup}{\setkeys{ETE}}
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -257,13 +258,15 @@
\fi
\let\OutputDirectory\ETE@outdir
\ifx\OutputDirectory\@empty
- \def\OutputFile{\Gin@base#2}%
+ \edef\OutputFile{\ETE@GenerateName{\Gin@base}{#2}}%
\else
\begingroup
\filename@parse{\Gin@base#2}%
\edef\x{\endgroup
\def\noexpand\OutputFile{%
- \OutputDirectory\filename@base#2%
+ \ETE@GenerateName{%
+ \OutputDirectory\filename@base
+ }{#2}%
}%
}%
\x
@@ -292,6 +295,10 @@
\OutputDirectory\noexpand\filename@base
}%
\fi
+ \ifx\ETE@suffix\@empty
+ \else
+ \edef\noexpand\Gin@base{\Gin@base\ETE@suffix}%
+ \fi
\noexpand\ETE@OrgGin@setfile{%
\GraphicsType
}{%
@@ -305,6 +312,9 @@
\ETE@OrgGin@setfile{#1}{#2}{#3}%
\fi
}
+\def\ETE@GenerateName#1#2{%
+ #1\ETE@suffix#2%
+}
\expandafter\ifx\csname Gin@rule@.eps\endcsname\relax
\else
\@PackageInfo{epstopdf}{Overwriting graphics rule for `.eps'}%
@@ -312,8 +322,12 @@
\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`\ETE@epstopdf{#1}}}
\def\ETE@epstopdf#1{%
epstopdf %
- \ifx\OutputDirectory\@empty
- \else
+ \ifcase\ifx\OutputDirectory\@empty
+ \ifx\ETE@suffix\@empty
+ 1%
+ \fi
+ \fi
+ 0 %
--outfile=\OutputFile\space
\fi
#1%