summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-05 22:54:26 +0000
committerKarl Berry <karl@freefriends.org>2009-09-05 22:54:26 +0000
commit874ece84a0d160db419570dff359a6e4c3c44063 (patch)
tree4ee6c8290f49de79ad922ba8f839da431c78aaad /Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
parent427bf11201b13e9a0778a390b930f70f8b697b8e (diff)
oberdiek update (5sep09)
git-svn-id: svn://tug.org/texlive/trunk@15145 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty35
1 files changed, 17 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 1a5d3a57c6c..c6b554ec603 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
@@ -34,29 +34,26 @@
\catcode46 12 % .
\catcode58 12 % :
\catcode64 11 % @
+ \catcode123 1 % {
+ \catcode125 2 % }
\expandafter\let\expandafter\x\csname ver@epstopdf.sty\endcsname
- \ifcase 0%
- \ifx\x\relax % plain
+ \ifx\x\relax % plain-TeX, first loading
+ \else
+ \def\empty{}%
+ \ifx\x\empty % LaTeX, first loading,
+ % variable is initialized, but \ProvidesPackage not yet seen
\else
- \ifx\x\empty % LaTeX
+ \catcode35 6 % #
+ \expandafter\ifx\csname PackageInfo\endcsname\relax
+ \def\x#1#2{%
+ \immediate\write-1{Package #1 Info: #2.}%
+ }%
\else
- 1%
+ \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
\fi
+ \x{epstopdf}{The package is already loaded}%
+ \aftergroup\endinput
\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}{The package is already loaded}%
- \endgroup
- \expandafter\endinput
\fi
\endgroup
\begingroup
@@ -69,6 +66,8 @@
\catcode47 12 % /
\catcode58 12 % :
\catcode64 11 % @
+ \catcode91 12 % [
+ \catcode93 12 % ]
\catcode123 1 % {
\catcode125 2 % }
\expandafter\ifx\csname ProvidesPackage\endcsname\relax