diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index 096b22d4abd..41800a8805d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -44,6 +44,9 @@ \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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \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}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)] -\expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)] +\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 @@ -107,6 +125,7 @@ \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}{% @@ -130,9 +149,9 @@ \fi \endgroup \begingroup - \expandafter\ifx\csname pdfshellescape\endcsname\relax + \expandafter\ifx\csname pdf@shellescape\endcsname\relax \else - \ifnum\pdfshellescape>0 % + \ifnum\pdf@shellescape>0 % \else \@PackageWarningNoLine{epstopdf}{% Shell escape feature is not enabled% @@ -150,7 +169,7 @@ \ProcessKeyvalOptions* \newcommand*{\epstopdfsetup}{\setkeys{ETE}} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilemoddate\endcsname\relax +\expandafter\ifx\csname pdf@filemoddate\endcsname\relax \def\ETE@Make#1#2{% \ifETE@update \ETE@WarnModDate @@ -168,7 +187,7 @@ \else \def\ETE@Make#1#2{% \ifETE@update - \ifnum\pdfstrcmp{\pdffilemoddate{#1}}{\pdffilemoddate{#2}}>0 % + \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 % \expandafter\expandafter\expandafter\@firstofone \else \@PackageInfoNoLine{epstopdf}{% @@ -182,8 +201,10 @@ }% \def\ETE@FileInfo#1#2{% #1 file: <#2>% - \expandafter\ETE@Date\pdffilemoddate{#2}\@nil - \expandafter\ETE@Size\pdffilesize{#2}\@nil + \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\\% @@ -254,7 +275,7 @@ }% \fi \ETE@Make\SourceFile\OutputFile{% - \immediate\write18{\CommandLine}% + \pdf@system{\CommandLine}% \ifETE@verbose \@PackageInfoNoLine{epstopdf}{% \ETE@FileInfo{Result}\OutputFile |