summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/oberdiek
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-21 22:31:18 +0000
committerKarl Berry <karl@freefriends.org>2009-07-21 22:31:18 +0000
commitbecf9bfec772c5af4610a0dc6f6840cdc2e6627a (patch)
tree084c959153bbb923eed65327eeb0ed9574c63803 /Master/texmf-dist/tex/generic/oberdiek
parenta2fd4ec211630f47a2a28ef4ced1e05b2a528fc2 (diff)
oberdiek update (22jul09)
git-svn-id: svn://tug.org/texlive/trunk@14365 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/oberdiek')
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty114
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty7
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty1
3 files changed, 69 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
index 30e604e2c7e..88905e0a284 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
@@ -88,7 +88,7 @@
\fi
\expandafter\x\csname ver@ifluatex.sty\endcsname
\ProvidesPackage{ifluatex}%
- [2009/04/10 v1.1 Provides the ifluatex switch (HO)]
+ [2009/04/17 v1.2 Provides the ifluatex switch (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -121,29 +121,32 @@
\TMP@EnsureCode{46}{12}% .
\TMP@EnsureCode{47}{12}% /
\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
\TMP@EnsureCode{61}{12}% =
\TMP@EnsureCode{94}{7}% ^
\TMP@EnsureCode{96}{12}% `
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname PackageError\endcsname\relax
+ \def\ifluatex@Error#1#2{%
+ \begingroup
+ \newlinechar=10 %
+ \def\MessageBreak{^^J}%
+ \edef\x{\errhelp{#2}}%
+ \x
+ \errmessage{Package ifluatex Error: #1}%
+ \endgroup
+ }%
+\else
+ \def\ifluatex@Error{%
+ \PackageError{ifluatex}%
+ }%
+\fi
\begingroup
\expandafter\ifx\csname ifluatex\endcsname\relax
\else
\edef\i/{\expandafter\string\csname ifluatex\endcsname}%
- \expandafter\ifx\csname PackageError\endcsname\relax
- \def\x#1#2{%
- \edef\z{#2}%
- \expandafter\errhelp\expandafter{\z}%
- \errmessage{Package ifluatex Error: #1}%
- }%
- \def\y{^^J}%
- \newlinechar=10 %
- \else
- \def\x#1#2{%
- \PackageError{ifluatex}{#1}{#2}%
- }%
- \def\y{\MessageBreak}%
- \fi
- \x{Name clash, \i/ is already defined}{%
- Incompatible versions of \i/ can cause problems,\y
+ \ifluatex@Error{Name clash, \i/ is already defined}{%
+ Incompatible versions of \i/ can cause problems,\MessageBreak
therefore package loading is aborted.%
}%
\endgroup
@@ -151,57 +154,35 @@
\expandafter\endinput
\fi
\endgroup
-\begingroup
- \expandafter\ifx\csname newif\endcsname\relax
- \def\x#1#2{#1}%
- \else
- \def\x#1#2{#2}%
- \fi
-\expandafter\endgroup\x
-{%
- \let\ifluatex\iffalse
- \def\luatextrue{%
- \let\ifluatex\iftrue
- }%
- \def\luatexfalse{%
- \let\luatexfalse
- }%
-}{%
- \csname newif\endcsname\ifluatex
-}
+\let\ifluatex\iffalse
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname luatexversion\endcsname\relax
\else
- \luatextrue
+ \expandafter\let\csname ifluatex\expandafter\endcsname
+ \csname iftrue\endcsname
\fi
\ifluatex
\else
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname directlua\endcsname\relax
\else
- \luatextrue
+ \expandafter\let\csname ifluatex\expandafter\endcsname
+ \csname iftrue\endcsname
\begingroup
\newlinechar=10 %
\endlinechar=\newlinechar %
- \ifcase0%
+ \ifnum0%
\directlua{%
if tex.enableprimitives then
tex.enableprimitives('ifluatex', {'luatexversion'})
- else
tex.print('1')
end
}%
- \ifx\ifluatexluatexversion\@undefined 1\fi %
- \relax %
- \global\let\luatexversion\ifluatexluatexversion
+ \ifx\ifluatexluatexversion\@undefined\else 1\fi %
+ =11 %
+ \global\let\luatexversion\ifluatexluatexversion %
\else %
- \expandafter\ifx\csname PackageError\endcsname\relax %
- \def\PackageError#1#2#3{%
- \errhelp{#3}%
- \errmessage{Package `#1' Error: #2}%
- }%
- \fi %
- \PackageError{ifluatex}{%
+ \ifluatex@Error{%
Missing \string\luatexversion%
}{%
Update LuaTeX.%
@@ -210,6 +191,41 @@
\endgroup %
\fi
\fi
+\ifluatex
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname luatexrevision\endcsname\relax
+ \ifnum\luatexversion<36 %
+ \else
+ \begingroup
+ \ifx\luatexrevision\relax
+ \let\luatexrevision\@undefined
+ \fi
+ \newlinechar=10 %
+ \endlinechar=\newlinechar %
+ \ifcase0%
+ \directlua{%
+ if tex.enableprimitives then
+ tex.enableprimitives('ifluatex', {'luatexrevision'})
+ else
+ tex.print('1')
+ end
+ }%
+ \ifx\ifluatexluatexrevision\@undefined 1\fi %
+ \relax %
+ \global\let\luatexrevision\ifluatexluatexrevision
+ \fi
+ \endgroup
+ \fi
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname luatexrevision\endcsname\relax
+ \ifluatex@Error{%
+ Missing \string\luatexrevision%
+ }{%
+ Update LuaTeX.%
+ }%
+ \fi
+ \fi
+\fi
\begingroup
\expandafter\ifx\csname PackageInfo\endcsname\relax
\def\x#1#2{%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
index 6510b6b5cde..7fd6ba87c7a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.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, 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
@@ -89,7 +90,7 @@
\fi
\expandafter\x\csname ver@kvsetkeys.sty\endcsname
\ProvidesPackage{kvsetkeys}%
- [2007/09/29 v1.3 Key value parser with default handler support (HO)]
+ [2009/07/19 v1.4 Key value parser with default handler support (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -171,7 +172,7 @@ $ \expandafter\endgroup
\KVS@CommaComma
\KVS@Equals
\KVS@SpaceEquals{ }%
- \KVS@EqualsSpace{ }%
+ \KVS@EqualsSpace
\xdef\KVS@Global{\the\toks@}%
\endgroup
\let\kv@list\KVS@Global
diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
index 25739de1a05..dfb0b3ba664 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
@@ -90,7 +90,6 @@
\expandafter\x\csname ver@luatex-loader.sty\endcsname
\ProvidesPackage{luatex-loader}%
[2009/04/10 v0.2 Lua module loader (HO)]
-
\begingroup
\catcode10 12 % ^^J
\catcode34 12 % "