From c7ec54d7435979ac910d284f2a3a0bf5193a63cd Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Sun, 18 Oct 2009 19:43:16 +0000 Subject: Oberdiek update (epstopdf v2.4). git-svn-id: svn://tug.org/texlive/trunk@15827 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty | 8 +++++--- Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty index 193e1066f29..4e1756fa942 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty @@ -88,7 +88,7 @@ \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2009/09/24 v2.3 Base part for package epstopdf] + [2009/10/17 v2.4 Base part for package epstopdf] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -170,6 +170,7 @@ \DeclareStringOption{outdir} \DeclareStringOption{suffix} \DeclareBoolOption{prefersuffix} +\DeclareStringOption{program@epstopdf} \DeclareBoolOption{disable} \DeclareComplementaryOption{enable}{disable} \newcommand*{\epstopdfsetup}{\setkeys{ETE}} @@ -179,7 +180,8 @@ append,% update,% prefersuffix,% - suffix=-\SourceExt-converted-to% + suffix=-\SourceExt-converted-to,% + program@epstopdf=epstopdf% } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@filemoddate\endcsname\relax @@ -412,7 +414,7 @@ \ETE@epstopdf{#1}% } \def\ETE@epstopdf#1{% - repstopdf % + \ETE@program@epstopdf\space \ifcase\ifx\OutputDirectory\@empty \ifx\ETE@suffix\@empty 1% diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index d06ae6b970e..11766839ebe 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -88,7 +88,7 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2009/09/24 v2.3 Conversion with epstopdf on the fly (HO)] + [2009/10/17 v2.4 Conversion with epstopdf on the fly (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -116,7 +116,7 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{47}{12}% / \let\ETE@SavedAtEnd\ETE@AtEnd -\RequirePackage{epstopdf-base}[2009/09/24] +\RequirePackage{epstopdf-base}[2009/10/17] \let\ETE@AtEnd\ETE@SavedAtEnd \DeclareOption*{% \expandafter\epstopdfsetup\expandafter{\CurrentOption}% -- cgit v1.2.3