summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-04-12 23:15:36 +0000
committerKarl Berry <karl@freefriends.org>2009-04-12 23:15:36 +0000
commit1a87640a25a3cf2bf77b1cb9c69e3c90f2b3811b (patch)
tree5a6eb1ac516775c93f354fba92bddca5de94c078 /Master/texmf-dist/tex/latex/oberdiek
parentb4c2a162bb8aa0937f3c029e5e103055f55ae3ae (diff)
oberdiek update (12apr09)
git-svn-id: svn://tug.org/texlive/trunk@12705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/embedfile.sty3
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/grfext.sty3
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty11
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/luacolor.sty23
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/picture.sty24
8 files changed, 57 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
index 36bbcd2b060..6cb8e931189 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
@@ -80,6 +80,9 @@
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 1acaf2e89a8..d2d7b7faad2 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-2008 by
+%% Copyright (C) 2001, 2006-2009 by
%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
@@ -79,6 +79,9 @@
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -86,7 +89,7 @@
\fi
\expandafter\x\csname ver@epstopdf.sty\endcsname
\ProvidesPackage{epstopdf}%
- [2008/05/06 v1.7 Conversion with epstopdf on the fly (HO)]
+ [2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -140,7 +143,7 @@
\ifx\Gin@driver\x
\else
\@PackageWarningNoLine{epstopdf}{%
- Graphics driver file \string`pdftex.def\string' not loaded%
+ Other drivers than `pdftex.def' are not supported%
}%
\endgroup
\newcommand*{\epstopdfsetup}[1]{}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty
index 74de58be990..19ea524dba6 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty
@@ -78,6 +78,9 @@
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
index 121ec0bd309..c59ede34755 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2004, 2006, 2007 by
+%% Copyright (C) 2004, 2006, 2007, 2009 by
%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
@@ -77,7 +77,7 @@
\noexpand\endinput
}
\ProvidesPackage{kvoptions-patch}%
- [2007/10/18 v3.0 LaTeX patch for keyval options (HO)]%
+ [2009/04/10 v3.1 LaTeX patch for keyval options (HO)]%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname eTeXversion\endcsname\relax
\PackageWarningNoLine{kvoptions-patch}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index 80c1a7565cb..b560a2bbc58 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2004, 2006, 2007 by
+%% Copyright (C) 2004, 2006, 2007, 2009 by
%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
@@ -83,6 +83,9 @@
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -90,7 +93,7 @@
\fi
\expandafter\x\csname ver@kvoptions.sty\endcsname
\ProvidesPackage{kvoptions}%
- [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]
+ [2009/04/10 v3.1 Keyval support for LaTeX options (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -156,7 +159,7 @@
\DeclareOption{debugshow}{\catcode\@ne=9 }
\DeclareOption{patch}{%
\AtEndOfPackage{%
- \RequirePackage{kvoptions-patch}[2007/10/18]%
+ \RequirePackage{kvoptions-patch}[2009/04/10]%
}%
}
\ProcessOptions\relax
@@ -638,7 +641,7 @@
}%
\fi
}
-\def\KVO@setcurrents#1=#2\@nil{
+\def\KVO@setcurrents#1=#2\@nil{%
\def\CurrentOptionValue{#2}%
\ifx\CurrentOptionValue\@empty
\let\CurrentOptionKey\CurrentOption
diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
index 8054ff37dbb..6dca7414ef8 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2007, 2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -73,18 +73,23 @@
}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luacolor}%
- [2007/12/12 v1.0 Coloring based on LuaTeX's node attributes (HO)]
+ [2009/04/10 v1.1 Coloring based on LuaTeX's node attributes (HO)]
\RequirePackage{infwarerr}[2007/09/09]%
-\RequirePackage{ifluatex}[2007/12/12]%
+\RequirePackage{ifluatex}[2009/04/10]%
\RequirePackage{color}
\ifluatex
- \RequirePackage{luatex}[2007/12/12]%
+ \RequirePackage{luatex}[2009/04/10]%
\else
\@PackageError{luacolor}{%
This package may only be run using LuaTeX%
}\@ehc
\expandafter\LuaCol@AtEnd
\fi
+\ifnum\luatexversion<36 %
+ \def\LuaCol@directlua{\directlua0 }%
+\else
+ \let\LuaCol@directlua\directlua
+\fi
\ifcolors@
\else
\@PackageWarningNoLine{luacolor}{%
@@ -92,7 +97,7 @@
}%
\expandafter\LuaCol@AtEnd
\fi
-\directlua0{%
+\LuaCol@directlua{%
require("oberdiek.luacolor")%
}
\RequirePackage{ifpdf}[2007/09/09]
@@ -107,7 +112,7 @@
\endgroup
}%
\edef\reserved@a{%
- \directlua0{%
+ \LuaCol@directlua{%
oberdiek.luacolor.dvidetect()%
}%
}%
@@ -126,19 +131,19 @@
\endgroup
\fi
\newattribute\LuaCol@Attribute
-\directlua0{%
+\LuaCol@directlua{%
oberdiek.luacolor.setattribute(\number\allocationnumber)%
}
\protected\def\set@color{%
\setattribute\LuaCol@Attribute{%
- \directlua0{%
+ \LuaCol@directlua{%
oberdiek.luacolor.get("\luaescapestring{\current@color}")%
}%
}%
}
\def\reset@color{}
\def\luacolorProcessBox#1{%
- \directlua0{%
+ \LuaCol@directlua{%
oberdiek.luacolor.process(\number#1)%
}%
}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty
index 93b05b91f9e..4bd44d59dac 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2007, 2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/oberdiek/picture.sty b/Master/texmf-dist/tex/latex/oberdiek/picture.sty
index 4c94e064617..849b94fc9db 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/picture.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/picture.sty
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2006, 2007, 2008 by
+%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -29,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{picture}%
- [2007/04/11 v1.1 Dimens for picture macros (HO)]%
+ [2008/11/26 v1.2 Dimens for picture macros (HO)]%
\def\Pc@calcname{calc}
\def\Pc@etexname{etex}
\def\Pc@plainname{plain}
@@ -190,9 +191,26 @@
\picture@redefine\Line{(&1,&2)}%
\picture@redefine\Curve{(&1,&2)}%
\picture@redefine\Vector{(&1,&2)}%
-}{
+}{%
\picture@redefine\@oval{(&1,&2)}%
}
+\def\Pc@checkpackage#1{%
+ \@ifpackageloaded{#1}{%
+ }{%
+ \AtBeginDocument{%
+ \@ifpackageloaded{#1}{%
+ \PackageWarningNoLine{picture}{%
+ Package `#1' is loaded after `picture'.\MessageBreak
+ Load package `picture' afterwards to get full support%
+ \MessageBreak
+ of its additional syntax with length specifications%
+ }%
+ }{}%
+ }%
+ }%
+}
+\Pc@checkpackage{pict2e}
+\Pc@checkpackage{pspicture}
\endinput
%%
%% End of file `picture.sty'.