summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-11 23:51:14 +0000
committerKarl Berry <karl@freefriends.org>2010-02-11 23:51:14 +0000
commit5297ab773b4f1347b313d6b57583c0ff9b789b2e (patch)
treed120bd3cb7fd48ae0ea067960f601bbd8f6c9597 /Master
parente7c607388dec221ed54d76a594553de5b54c1a30 (diff)
oberdiek update (11feb10)
git-svn-id: svn://tug.org/texlive/trunk@16976 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdfbin511837 -> 512791 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdfbin1010630 -> 1010837 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx29
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty6
8 files changed, 30 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
index 30d52268eed..8a7023b60d4 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
index da127656281..829b9629723 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex
index 26a6b286f64..abc4ebab291 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2001, 2006-2009 by
+%% Copyright (C) 2001, 2006-2010 by
%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
index bc3051ad09e..b177a872f8b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2001, 2006-2009 by
+% Copyright (C) 2001, 2006-2010 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%
% This work may be distributed and/or modified under the
@@ -72,7 +72,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: epstopdf 2009/10/17 v2.4 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -83,7 +83,7 @@
This is a generated file.
-Copyright (C) 2001, 2006-2009 by
+Copyright (C) 2001, 2006-2010 by
Heiko Oberdiek <oberdiek@uni-freiburg.de>
This work may be distributed and/or modified under the
@@ -145,7 +145,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{epstopdf.drv}%
- [2009/10/17 v2.4 Conversion with epstopdf on the fly (HO)]%
+ [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -154,7 +154,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{913}
+% \CheckSum{916}
%
% \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
@@ -175,7 +175,7 @@ and the derived files
% \GetFileInfo{epstopdf.drv}
%
% \title{The \xpackage{epstopdf} package}
-% \date{2009/10/17 v2.4}
+% \date{2010/02/09 v2.5}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -570,7 +570,7 @@ and the derived files
\fi
\expandafter\x\csname ver@epstopdf.sty\endcsname
\ProvidesPackage{epstopdf}%
- [2009/10/17 v2.4 Conversion with epstopdf on the fly (HO)]
+ [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]
% \end{macrocode}
% \begin{macrocode}
\begingroup
@@ -603,7 +603,7 @@ and the derived files
%
% \begin{macrocode}
\let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2009/10/17]
+\RequirePackage{epstopdf-base}[2010/02/09]
\let\ETE@AtEnd\ETE@SavedAtEnd
% \end{macrocode}
%
@@ -696,7 +696,7 @@ and the derived files
\fi
\expandafter\x\csname ver@epstopdf-base.sty\endcsname
\ProvidesPackage{epstopdf-base}%
- [2009/10/17 v2.4 Base part for package epstopdf]
+ [2010/02/09 v2.5 Base part for package epstopdf]
% \end{macrocode}
%
% \subsubsection{Catcodes}
@@ -774,7 +774,7 @@ and the derived files
\ifx\Gin@driver\x
\else
\@PackageWarningNoLine{epstopdf}{%
- Other drivers than `pdftex.def' are not supported%
+ Drivers other than `pdftex.def' are not supported%
}%
\endgroup
\newcommand*{\epstopdfsetup}[1]{}%
@@ -964,7 +964,7 @@ and the derived files
\expandafter\fi\if`#1\relax\else
}%
}
-\def\Gin@setfile#1#2#3{%
+\def\ETE@Gin@setfile#1#2#3{%
\ifETE@disable
\ETE@OrgGin@setfile{#1}{#2}{#3}%
\else
@@ -1060,6 +1060,7 @@ and the derived files
\fi
\fi
}
+\let\Gin@setfile\ETE@Gin@setfile
\def\ETE@GenerateName#1#2{%
#1\ETE@suffix#2%
}
@@ -1518,6 +1519,12 @@ and the derived files
% The name of the program `epstopdf' can be configured via
% the new option \xoption{program@epstopdf}.
% \end{Version}
+% \begin{Version}{2010/02/09 v2.5}
+% \item
+% Wording of warning message fixed (Karl Berry).
+% \item
+% \cs{ETE@Gin@setfile} added (Karl Berry).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 7953c7563bd..9371537bc43 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -1,5 +1,5 @@
% oberdiek.ins
-% 2010/02/05
+% 2010/02/09
%
% Copyright (C) 1999, 2001, 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index 97784202f36..ea3ac7e5840 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
@@ -6,7 +6,7 @@
\newcommand*{\Subject}{CTAN:\CTANdir}
\newcommand*{\Author}{Heiko Oberdiek}
\newcommand*{\Email}{oberdiek@uni-freiburg.de}
-\newcommand*{\Date}{2010/02/05}
+\newcommand*{\Date}{2010/02/09}
% Copyright (C) 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -203,7 +203,7 @@
[\entrysep]
\entry{engord}{2008/08/11}{1.7}{Provides English ordinal numbers}%
[\entrysep]
-\entry{epstopdf}{2009/10/17}{2.4}{Conversion with epstopdf on the fly}%
+\entry{epstopdf}{2010/02/09}{2.5}{Conversion with epstopdf on the fly}%
[\entrysep]
\entry{etexcmds}{2010/01/28}{1.3}{Prefix for e-TeX command names}%
[\entrysep]
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
index 0435e58b0ab..27721ad5b31 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2001, 2006-2009 by
+%% Copyright (C) 2001, 2006-2010 by
%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
@@ -90,7 +90,7 @@
\fi
\expandafter\x\csname ver@epstopdf-base.sty\endcsname
\ProvidesPackage{epstopdf-base}%
- [2009/10/17 v2.4 Base part for package epstopdf]
+ [2010/02/09 v2.5 Base part for package epstopdf]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -144,7 +144,7 @@
\ifx\Gin@driver\x
\else
\@PackageWarningNoLine{epstopdf}{%
- Other drivers than `pdftex.def' are not supported%
+ Drivers other than `pdftex.def' are not supported%
}%
\endgroup
\newcommand*{\epstopdfsetup}[1]{}%
@@ -296,7 +296,7 @@
\expandafter\fi\if`#1\relax\else
}%
}
-\def\Gin@setfile#1#2#3{%
+\def\ETE@Gin@setfile#1#2#3{%
\ifETE@disable
\ETE@OrgGin@setfile{#1}{#2}{#3}%
\else
@@ -392,6 +392,7 @@
\fi
\fi
}
+\let\Gin@setfile\ETE@Gin@setfile
\def\ETE@GenerateName#1#2{%
#1\ETE@suffix#2%
}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 6717fd341a0..40fdf757eef 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2001, 2006-2009 by
+%% Copyright (C) 2001, 2006-2010 by
%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
@@ -90,7 +90,7 @@
\fi
\expandafter\x\csname ver@epstopdf.sty\endcsname
\ProvidesPackage{epstopdf}%
- [2009/10/17 v2.4 Conversion with epstopdf on the fly (HO)]
+ [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -118,7 +118,7 @@
\TMP@EnsureCode{45}{12}% -
\TMP@EnsureCode{47}{12}% /
\let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2009/10/17]
+\RequirePackage{epstopdf-base}[2010/02/09]
\let\ETE@AtEnd\ETE@SavedAtEnd
\DeclareOption*{%
\expandafter\epstopdfsetup\expandafter{\CurrentOption}%