summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
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/source
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/source')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/alphalph.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bitset.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/catchfile.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/embedfile.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/engord.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/grfext.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/iflang.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx133
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx129
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/intcalc.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx29
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/luacolor.dtx46
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/luatex.dtx48
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/magicnum.dtx40
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx54
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/picture.dtx56
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/selinput.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stringenc.dtx5
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/telprint.dtx5
34 files changed, 547 insertions, 149 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
index c5264f53eb9..caf879a5603 100644
--- a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
@@ -178,7 +178,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1134}
+% \CheckSum{1138}
%
% \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
@@ -610,6 +610,9 @@ and the derived files
\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/source/latex/oberdiek/atbegshi.dtx b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
index 8d02251f252..d7ad70fb898 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
@@ -157,7 +157,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1408}
+% \CheckSum{1412}
%
% \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
@@ -840,6 +840,9 @@ The last page.
\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/source/latex/oberdiek/bigintcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
index 8fb7623e058..319a518afc8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
@@ -187,7 +187,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{3629}
+% \CheckSum{3633}
%
% \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
@@ -672,6 +672,9 @@ and the derived files
\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/source/latex/oberdiek/bitset.dtx b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
index 905a389badb..8fee7328f7e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
@@ -153,7 +153,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{3418}
+% \CheckSum{3422}
%
% \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
@@ -708,6 +708,9 @@ and the derived files
\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/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
index 03cc937195d..ba43288d9f7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
@@ -152,7 +152,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{584}
+% \CheckSum{588}
%
% \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
@@ -267,6 +267,9 @@ and the derived files
\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/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
index 981a9dce635..adda4bf6121 100644
--- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
@@ -161,7 +161,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1391}
+% \CheckSum{1395}
%
% \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
@@ -662,6 +662,9 @@ You need Acrobat Reader 8 or higher.
\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/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
index 1124cad605f..ffd03217fc1 100644
--- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
@@ -146,7 +146,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{468}
+% \CheckSum{472}
%
% \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
@@ -326,6 +326,9 @@ and the derived files
\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/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
index 6f78aec4bd6..2086605677a 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-2008 by
+% Copyright (C) 2001, 2006-2009 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%
% This work may be distributed and/or modified under the
@@ -69,7 +69,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: epstopdf 2008/05/06 v1.7 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -80,7 +80,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
@@ -139,7 +139,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{epstopdf.drv}%
- [2008/05/06 v1.7 Conversion with epstopdf on the fly (HO)]%
+ [2009/03/01 v1.8 Conversion with epstopdf on the fly (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -148,7 +148,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{616}
+% \CheckSum{618}
%
% \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
@@ -169,7 +169,7 @@ and the derived files
% \GetFileInfo{epstopdf.drv}
%
% \title{The \xpackage{epstopdf} package}
-% \date{2008/05/06 v1.7}
+% \date{2009/03/01 v1.8}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -464,6 +464,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -471,7 +474,7 @@ and the derived files
\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)]
% \end{macrocode}
%
% \subsubsection{Catcodes}
@@ -549,7 +552,7 @@ and the derived files
\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]{}%
@@ -1116,6 +1119,10 @@ and the derived files
% \item
% Warning messages uses ``loaded'' instead of ``found''.
% \end{Version}
+% \begin{Version}{2009/03/01 v1.8}
+% \item
+% Warning message for missing \xfile{pdftex.def} changed.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
index 335d6fd01de..04e8d8c747c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
@@ -154,7 +154,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{479}
+% \CheckSum{483}
%
% \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
@@ -285,6 +285,9 @@ and the derived files
\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/source/latex/oberdiek/grfext.dtx b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
index b22d25b62c4..d99620fd720 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
@@ -148,7 +148,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{630}
+% \CheckSum{634}
%
% \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
@@ -327,6 +327,9 @@ and the derived files
\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/source/latex/oberdiek/hyphsubst.dtx b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
index 926900ceaf7..0ac8053a5e6 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
@@ -148,7 +148,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{513}
+% \CheckSum{517}
%
% \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
@@ -374,6 +374,9 @@ and the derived files
\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/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
index 16df954a6ca..6feb93d5464 100644
--- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
@@ -156,7 +156,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{829}
+% \CheckSum{833}
%
% \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
@@ -327,6 +327,9 @@ and the derived files
\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/source/latex/oberdiek/ifluatex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx
index 8610fd0ae4b..42f1cf85edb 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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
@@ -17,7 +17,7 @@
% This work consists of the main source file ifluatex.dtx
% and the derived files
% ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-% ifluatex-test1.tex.
+% ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/ifluatex.dtx
@@ -53,6 +53,8 @@
% TDS:tex/generic/oberdiek/ifluatex.sty
% TDS:doc/latex/oberdiek/ifluatex.pdf
% TDS:doc/latex/oberdiek/test/ifluatex-test1.tex
+% TDS:doc/latex/oberdiek/test/ifluatex-test2.tex
+% TDS:doc/latex/oberdiek/test/ifluatex-test3.tex
% TDS:source/latex/oberdiek/ifluatex.dtx
%
%<*ignore>
@@ -68,7 +70,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: ifluatex 2007/12/12 v1.0 Provides the ifluatex switch (HO)}
+\Msg{* Package: ifluatex 2009/04/10 v1.1 Provides the ifluatex switch (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -79,7 +81,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
@@ -96,7 +98,7 @@ This Current Maintainer of this work is Heiko Oberdiek.
This work consists of the main source file ifluatex.dtx
and the derived files
ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
- ifluatex-test1.tex.
+ ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -108,6 +110,8 @@ and the derived files
\file{ifluatex.sty}{\from{ifluatex.dtx}{package}}%
\usedir{doc/latex/oberdiek/test}%
\file{ifluatex-test1.tex}{\from{ifluatex.dtx}{test1}}%
+ \file{ifluatex-test2.tex}{\from{ifluatex.dtx}{test-reload1}}%
+ \file{ifluatex-test3.tex}{\from{ifluatex.dtx}{test-reload2}}%
}
\obeyspaces
@@ -137,7 +141,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ifluatex.drv}%
- [2007/12/12 v1.0 Provides the ifluatex switch (HO)]%
+ [2009/04/10 v1.1 Provides the ifluatex switch (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -146,7 +150,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{363}
+% \CheckSum{462}
%
% \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
@@ -167,14 +171,15 @@ and the derived files
% \GetFileInfo{ifluatex.drv}
%
% \title{The \xpackage{ifluatex} package}
-% \date{2007/12/12 v1.0}
+% \date{2009/04/10 v1.1}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
%
% \begin{abstract}
% This package looks for \LuaTeX\ regardless of its mode
-% and provides the switch \cs{ifluatex}.
+% and provides the switch \cs{ifluatex}. Also it makes
+% \cs{luatexversion} available if it is not present.
% It works with \plainTeX\ or \LaTeX.
% \end{abstract}
%
@@ -199,6 +204,12 @@ and the derived files
% |\fi|
% \end{quote}
%
+% Since version 0.40 \LuaTeX\ only provides \cs{directlua} at startup
+% time. Also the syntax of \cs{directlua} changed in version 0.36.
+% Thus the user might want to check the LuaTeX version.
+% Therefore this package also makes \cs{luatexversion} available,
+% if it is not yet done.
+%
% If you want to detect the mode (DVI or PDF), then use package
% \xpackage{ifpdf}. \LuaTeX\ has inherited \cs{pdfoutput} from \pdfTeX.
%
@@ -268,6 +279,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -275,7 +289,7 @@ and the derived files
\fi
\expandafter\x\csname ver@ifluatex.sty\endcsname
\ProvidesPackage{ifluatex}%
- [2007/12/12 v1.0 Provides the ifluatex switch (HO)]
+ [2009/04/10 v1.1 Provides the ifluatex switch (HO)]
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -305,6 +319,9 @@ and the derived files
\catcode#1 #2\relax
}
\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
\TMP@EnsureCode{44}{12}% ,
\TMP@EnsureCode{45}{12}% -
\TMP@EnsureCode{46}{12}% .
@@ -312,6 +329,7 @@ and the derived files
\TMP@EnsureCode{58}{12}% :
\TMP@EnsureCode{61}{12}% =
\TMP@EnsureCode{94}{7}% ^
+\TMP@EnsureCode{96}{12}% `
% \end{macrocode}
%
% \subsection{Check for previously defined \cs{ifluatex}}
@@ -352,7 +370,24 @@ and the derived files
% Create and set the switch. \cs{newif} initializes the
% switch with \cs{iffalse}.
% \begin{macrocode}
-\newif\ifluatex
+\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
+}
% \end{macrocode}
% Test \cs{pdfoutput}. Is it defined and different from
% \cs{relax}? Someone could have used \LaTeX\ internal
@@ -368,6 +403,55 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \subsection{Lua\TeX\ v0.40}
+%
+% Starting with version 0.40 \LuaTeX\ wants to provide \cs{directlua}
+% as only primitive at startup time beyond vanilla \TeX's primitives.
+% Then \cs{directlua} exists, but \cs{luatexversion} cannot be found.
+% Unhappily also the syntax of \cs{directlua} changed in v0.36,
+% thus the user would want to check \cs{luatexversion}.
+% Therefore we make \cs{luatexversion} available using
+% \LuaTeX's Lua function |tex.enableprimitives|.
+%
+% \begin{macrocode}
+\ifluatex
+\else
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname directlua\endcsname\relax
+ \else
+ \luatextrue
+ \begingroup
+ \newlinechar=10 %
+ \endlinechar=\newlinechar %
+ \ifcase0%
+ \directlua{%
+ if tex.enableprimitives then
+ tex.enableprimitives('ifluatex', {'luatexversion'})
+ else
+ tex.print('1')
+ end
+ }%
+ \ifx\ifluatexluatexversion\@undefined 1\fi %
+ \relax %
+ \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}{%
+ Missing \string\luatexversion%
+ }{%
+ Update LuaTeX.%
+ }%
+ \fi %
+ \endgroup %
+ \fi
+\fi
+% \end{macrocode}
+%
% \subsection{Protocol entry}
%
% Log comment:
@@ -480,6 +564,25 @@ and the derived files
%</test1>
% \end{macrocode}
%
+% \section{Reload check for plain}
+%
+% \begin{macrocode}
+%<*test-reload1>
+\input ifluatex.sty\relax
+\input ifluatex.sty\relax
+\csname @@end\endcsname\end
+%</test-reload1>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*test-reload2>
+\input miniltx.tex\relax
+\input ifluatex.sty\relax
+\input ifluatex.sty\relax
+\csname @@end\endcsname\end
+%</test-reload2>
+% \end{macrocode}
+%
% \section{Installation}
%
% \subsection{Download}
@@ -542,6 +645,8 @@ and the derived files
% ifluatex.sty & tex/generic/oberdiek/ifluatex.sty\\
% ifluatex.pdf & doc/latex/oberdiek/ifluatex.pdf\\
% test/ifluatex-test1.tex & doc/latex/oberdiek/test/ifluatex-test1.tex\\
+% test/ifluatex-test2.tex & doc/latex/oberdiek/test/ifluatex-test2.tex\\
+% test/ifluatex-test3.tex & doc/latex/oberdiek/test/ifluatex-test3.tex\\
% ifluatex.dtx & source/latex/oberdiek/ifluatex.dtx\\
% \end{tabular}^^A
% }^^A
@@ -667,6 +772,12 @@ and the derived files
% \item
% First public version.
% \end{Version}
+% \begin{Version}{2009/04/10 v1.1}
+% \item
+% Test adopted for \LuaTeX\ 0.40.
+% \item
+% Makes \cs{luatexversion} available.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
index bdafa51a806..92fc17bfa3d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2001, 2005, 2006 by
+% Copyright (C) 2001, 2005-2009 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%
% This work may be distributed and/or modified under the
@@ -68,7 +68,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: ifpdf 2007/12/12 v1.6 Provides the ifpdf switch (HO)}
+\Msg{* Package: ifpdf 2009/04/10 v2.0 Provides the ifpdf switch (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -79,7 +79,7 @@
This is a generated file.
-Copyright (C) 2001, 2005, 2006 by
+Copyright (C) 2001, 2005-2009 by
Heiko Oberdiek <oberdiek@uni-freiburg.de>
This work may be distributed and/or modified under the
@@ -137,7 +137,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ifpdf.drv}%
- [2007/12/12 v1.6 Provides the ifpdf switch (HO)]%
+ [2009/04/10 v2.0 Provides the ifpdf switch (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -146,7 +146,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{368}
+% \CheckSum{472}
%
% \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
@@ -167,7 +167,7 @@ and the derived files
% \GetFileInfo{ifpdf.drv}
%
% \title{The \xpackage{ifpdf} package}
-% \date{2007/12/12 v1.6}
+% \date{2009/04/10 v2.0}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -247,23 +247,23 @@ and the derived files
% The package provides the switch \cs{ifpdf}:
% \begin{quote}
% |\ifpdf|\\
-% \hspace{1.5em}\dots\ do things, if \pdfTeX\ is running in pdf mode \dots\\
+% \hspace*{1.5em}\dots\ do things, if \pdfTeX\ is running in pdf mode \dots\\
% |\else|\\
-% \hspace{1.5em}\dots\ other \TeX\ or \pdfTeX\ in dvi mode \dots\\
+% \hspace*{1.5em}\dots\ other \TeX\ or \pdfTeX\ in dvi mode \dots\\
% |\fi|
% \end{quote}
% Users of the package \xpackage{ifthen} can use the switch as boolean:
% \begin{quote}
-% |\boolean{ifpdf}|
+% |\boolean{pdf}|
% \end{quote}
% The package can also be used to set global
% documentclass options:
% \begin{quote}
% |\RequirePackage{ifpdf}|\\
% |\ifpdf|\\
-% \hspace{1.5em}|\documentclass[pdftex,|\dots|]{|\dots|}|\\
+% \hspace*{1.5em}|\documentclass[pdftex,|\dots|]{|\dots|}|\\
% |\else|\\
-% \hspace{1.5em}|\documentclass[|\dots|]{|\dots|}|\\
+% \hspace*{1.5em}|\documentclass[|\dots|]{|\dots|}|\\
% |\fi|
% \end{quote}
%
@@ -274,6 +274,10 @@ and the derived files
% \item It asks the setting of \cs{pdfoutput} for detecting
% \pdfTeX\ in PDF mode.
% \item It never changes \cs{pdfoutput}.
+% \item If \cs{pdfoutput} is undefined or has the meaning \cs{relax},
+% but the engine provides the primitive \cs{pdfoutput},
+% then \cs{pdfoutput} is enabled or restored if possible
+% (only \LuaTeX, version 0.36.0 or higher).
% \item It can be used with many formats including
% \plainTeX\ and \LaTeX.
% \end{itemize}
@@ -298,14 +302,6 @@ and the derived files
% The function \textsf{undefined} checks both cases, undefined command
% and \cs{relax}.
%
-% \subsection{Future}
-%
-% Currently the package can be fooled, by redefining/undefining
-% \cs{pdfoutput}. Therefore the package will use the \cs{primitive}
-% feature that is discussed currently on the \pdfTeX\ developer
-% list (2006), if it hits a stable release. Of course the package
-% will then remain usable with older \pdfTeX\ versions as usual.
-%
% \hypersetup{bookmarksopenlevel=1}
%
% \StopEventually{
@@ -374,6 +370,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -381,7 +380,7 @@ and the derived files
\fi
\expandafter\x\csname ver@ifpdf.sty\endcsname
\ProvidesPackage{ifpdf}%
- [2007/12/12 v1.6 Provides the ifpdf switch (HO)]
+ [2009/04/10 v2.0 Provides the ifpdf switch (HO)]
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -411,6 +410,9 @@ and the derived files
\catcode#1 #2\relax
}
\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
\TMP@EnsureCode{44}{12}% ,
\TMP@EnsureCode{45}{12}% -
\TMP@EnsureCode{46}{12}% .
@@ -419,6 +421,7 @@ and the derived files
\TMP@EnsureCode{60}{12}% <
\TMP@EnsureCode{61}{12}% =
\TMP@EnsureCode{94}{7}% ^
+\TMP@EnsureCode{96}{12}% `
% \end{macrocode}
%
% \subsection{Check for previously defined \cs{ifpdf}}
@@ -453,6 +456,51 @@ and the derived files
\endgroup
% \end{macrocode}
%
+% \subsection{\cs{pdfoutput} and \LuaTeX}
+%
+% It might happen, that \LuaTeX\ is running, but \cs{pdfoutput}
+% does not exist. In version 0.40 only \cs{directlua}
+% is available at startup time. The enabling Lua function was
+% already added in version 0.36. Thus we can ignore older versions,
+% here \cs{pdfoutput} is available at startup time.
+%
+% \begin{macrocode}
+\begingroup
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ \else
+ \def\skip#1\relax\endgroup{\csname fi\endcsname\endgroup}%
+ \skip
+ \fi
+ \expandafter\ifx\csname directlua\endcsname\relax
+ \def\skip#1\endgroup{\csname fi\endcsname\endgroup}%
+ \skip
+ \fi
+ \expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input ifluatex.sty\relax
+ \else
+ \RequirePackage{ifluatex}[2009/04/10]%
+ \fi
+ \ifluatex
+ \ifnum\luatexversion<36 %
+% \end{macrocode}
+% Unhappily \LuaTeX's \cs{primitive} (derived from
+% pdfTeX's \cs{pdfprimitive}) cannot be used:
+% \begin{quote}
+% |\protected\gdef\pdfoutput{\primitive\pdfoutput}|
+% \end{quote}
+% Setting a value works, but getting fails,
+% because \TeX\ does no longer see it as number. It
+% is unexpandable and breaks numerical contexts.
+% \begin{macrocode}
+ \else
+ \directlua{tex.enableprimitives('ifpdf', {'pdfoutput'})}%
+ \global\let\pdfoutput\ifpdfpdfoutput
+ \fi
+ \fi
+ \relax
+\endgroup
+% \end{macrocode}
+%
% \subsection{\cs{ifpdf}}
%
% \begin{macro}{\ifpdf}
@@ -481,6 +529,35 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \subsection{Test for fool attempts}
+%
+% \begin{macrocode}
+\begingroup
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ \else
+ \escapechar=-1 %
+ \edef\m{\meaning\pdfoutput}%
+ \edef\p{%
+ \string p\string d\string f%
+ \string o\string u\string t\string p\string u\string t%
+ }%
+ \ifx\m\p
+ \else
+ \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
+ \def\PackageWarningNoLine#1#2{%
+ \immediate\write16{%
+ Package `#1' Warning: #2.%
+ }%
+ }%
+ \fi
+ \PackageWarningNoLine{ifpdf}{%
+ Someone has redefined \string\\pdfoutput%
+ }%
+ \fi
+ \fi
+\endgroup
+% \end{macrocode}
+%
% \subsection{Protocol entry}
%
% Log comment:
@@ -819,6 +896,18 @@ and the derived files
% \item
% Minor update.
% \end{Version}
+% \begin{Version}{2008/12/12 v1.7}
+% \item
+% Fix in documentation for \cs{boolean} (found by S. Venkataraman).
+% \item
+% Code is not changed.
+% \end{Version}
+% \begin{Version}{2009/04/10 v2.0}
+% \item
+% Support for \LuaTeX\ 0.40 added.
+% \item
+% Checks, whether \cs{pdfoutput} was changed.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
index dd0251af79c..93ef8a4c4ca 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
@@ -146,7 +146,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{439}
+% \CheckSum{443}
%
% \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
@@ -285,6 +285,9 @@ and the derived files
\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/source/latex/oberdiek/infwarerr.dtx b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
index c9217a1f823..c6e3bff3dff 100644
--- a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
@@ -152,7 +152,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{791}
+% \CheckSum{795}
%
% \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
@@ -279,6 +279,9 @@ and the derived files
\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/source/latex/oberdiek/intcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
index a82eb634b69..2f66983020c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
@@ -188,7 +188,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{3144}
+% \CheckSum{3148}
%
% \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
@@ -663,6 +663,9 @@ and the derived files
\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/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index 9b2fb5dce26..a4b97417ec9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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
@@ -73,7 +73,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: kvoptions 2007/10/18 v3.0 Keyval support for LaTeX options (HO)}
+\Msg{* Package: kvoptions 2009/04/10 v3.1 Keyval support for LaTeX options (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -84,7 +84,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
@@ -148,7 +148,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{kvoptions.drv}%
- [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]%
+ [2009/04/10 v3.1 Keyval support for LaTeX options (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -157,7 +157,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1987}
+% \CheckSum{1991}
%
% \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
@@ -178,7 +178,7 @@ and the derived files
% \GetFileInfo{kvoptions.drv}
%
% \title{The \xpackage{kvoptions} package}
-% \date{2007/10/18 v3.0}
+% \date{2009/04/10 v3.1}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -654,7 +654,7 @@ and the derived files
% Package identification
% -----------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2007/10/18 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2009/04/10 Managing my colors]
\RequirePackage{ifpdf}
\RequirePackage{kvoptions}
@@ -1018,6 +1018,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -1025,7 +1028,7 @@ and the derived files
\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)]
% \end{macrocode}
%
% \paragraph{Catcodes}
@@ -1119,7 +1122,7 @@ and the derived files
% \begin{macrocode}
\DeclareOption{patch}{%
\AtEndOfPackage{%
- \RequirePackage{kvoptions-patch}[2007/10/18]%
+ \RequirePackage{kvoptions-patch}[2009/04/10]%
}%
}
% \end{macrocode}
@@ -1813,7 +1816,7 @@ and the derived files
% \begin{macro}{\KVO@setcurrents}
% Extract the key part of a key=value pair.
% \begin{macrocode}
-\def\KVO@setcurrents#1=#2\@nil{
+\def\KVO@setcurrents#1=#2\@nil{%
\def\CurrentOptionValue{#2}%
\ifx\CurrentOptionValue\@empty
\let\CurrentOptionKey\CurrentOption
@@ -1902,7 +1905,7 @@ and the derived files
\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)]%
% \end{macrocode}
%
% Check for \eTeX.
@@ -2842,6 +2845,10 @@ and the derived files
% \item
% New package \xpackage{kvoptions-patch}.
% \end{Version}
+% \begin{Version}{2009/04/10 v3.1}
+% \item
+% Space by line end removed in definition of internal macro.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
index a8869f5d736..2d4336cdcd1 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
@@ -155,7 +155,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1109}
+% \CheckSum{1113}
%
% \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
@@ -521,6 +521,9 @@ and the derived files
\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/source/latex/oberdiek/luacolor.dtx b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
index b07635dd00d..dfe20b3b479 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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,7 +73,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luacolor 2007/12/12 v1.0 Coloring based on LuaTeX's node attributes (HO)}
+\Msg{* Package: luacolor 2009/04/10 v1.1 Coloring based on LuaTeX's node attributes (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -84,7 +84,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
@@ -156,7 +156,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luacolor.drv}%
- [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)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\usepackage{paralist}
@@ -166,7 +166,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{333}
+% \CheckSum{343}
%
% \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
@@ -187,7 +187,7 @@ and the derived files
% \GetFileInfo{luacolor.drv}
%
% \title{The \xpackage{luacolor} package}
-% \date{2007/12/12 v1.0}
+% \date{2009/04/10 v1.1}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -306,7 +306,7 @@ and the derived files
% \begin{macrocode}
\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)]
% \end{macrocode}
%
% \subsection{Check for \LuaTeX}
@@ -314,12 +314,12 @@ and the derived files
% Without \LuaTeX\ there is no point in using this package.
% \begin{macrocode}
\RequirePackage{infwarerr}[2007/09/09]%
-\RequirePackage{ifluatex}[2007/12/12]%
+\RequirePackage{ifluatex}[2009/04/10]%
\RequirePackage{color}
% \end{macrocode}
% \begin{macrocode}
\ifluatex
- \RequirePackage{luatex}[2007/12/12]%
+ \RequirePackage{luatex}[2009/04/10]%
\else
\@PackageError{luacolor}{%
This package may only be run using LuaTeX%
@@ -328,6 +328,16 @@ and the derived files
\fi
% \end{macrocode}
%
+% \begin{macro}{\LuaCol@directlua}
+% \begin{macrocode}
+\ifnum\luatexversion<36 %
+ \def\LuaCol@directlua{\directlua0 }%
+\else
+ \let\LuaCol@directlua\directlua
+\fi
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Check for disabled colors}
%
% \begin{macrocode}
@@ -343,7 +353,7 @@ and the derived files
% \subsection{Find driver}
%
% \begin{macrocode}
-\directlua0{%
+\LuaCol@directlua{%
require("oberdiek.luacolor")%
}
\RequirePackage{ifpdf}[2007/09/09]
@@ -358,7 +368,7 @@ and the derived files
\endgroup
}%
\edef\reserved@a{%
- \directlua0{%
+ \LuaCol@directlua{%
oberdiek.luacolor.dvidetect()%
}%
}%
@@ -383,7 +393,7 @@ and the derived files
% \begin{macro}{\LuaCol@Attribute}
% \begin{macrocode}
\newattribute\LuaCol@Attribute
-\directlua0{%
+\LuaCol@directlua{%
oberdiek.luacolor.setattribute(\number\allocationnumber)%
}
% \end{macrocode}
@@ -393,7 +403,7 @@ and the derived files
% \begin{macrocode}
\protected\def\set@color{%
\setattribute\LuaCol@Attribute{%
- \directlua0{%
+ \LuaCol@directlua{%
oberdiek.luacolor.get("\luaescapestring{\current@color}")%
}%
}%
@@ -411,7 +421,7 @@ and the derived files
% \begin{macro}{\luacolorProcessBox}
% \begin{macrocode}
\def\luacolorProcessBox#1{%
- \directlua0{%
+ \LuaCol@directlua{%
oberdiek.luacolor.process(\number#1)%
}%
}
@@ -722,7 +732,7 @@ end
\pdfoutput=0 %
\fi
\documentclass{minimal}
-\usepackage{luacolor}[2007/12/12]
+\usepackage{luacolor}[2009/04/10]
\csname @@end\endcsname
\end
%</test2>
@@ -734,7 +744,7 @@ end
% \end{macrocode}
% \begin{macrocode}
\documentclass{minimal}
-\usepackage{luacolor}[2007/12/12]
+\usepackage{luacolor}[2009/04/10]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -955,6 +965,10 @@ end
% \item
% First public version.
% \end{Version}
+% \begin{Version}{2009/04/10 v1.1}
+% \item
+% Fixes for changed syntax of \cs{directlua} in \LuaTeX\ 0.36.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
index 1b22aa9d9b7..26df36a878a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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
@@ -75,7 +75,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luatex 2007/12/12 v0.1 LuaTeX basic definition package (HO)}
+\Msg{* Package: luatex 2009/04/10 v0.2 LuaTeX basic definition package (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -86,7 +86,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
@@ -160,7 +160,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luatex.drv}%
- [2007/12/12 v0.1 LuaTeX basic definition package (HO)]%
+ [2009/04/10 v0.2 LuaTeX basic definition package (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\usepackage{paralist}
@@ -170,7 +170,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1201}
+% \CheckSum{1216}
%
% \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
@@ -191,7 +191,7 @@ and the derived files
% \GetFileInfo{luatex.drv}
%
% \title{The \xpackage{luatex} package}
-% \date{2007/12/12 v0.1}
+% \date{2009/04/10 v0.2}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -538,6 +538,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -545,7 +548,7 @@ and the derived files
\fi
\expandafter\x\csname ver@luatex.sty\endcsname
\ProvidesPackage{luatex}%
- [2007/12/12 v0.1 LuaTeX basic definition package (HO)]
+ [2009/04/10 v0.2 LuaTeX basic definition package (HO)]
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -603,7 +606,7 @@ and the derived files
\input ifluatex.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
- \RequirePackage{ifluatex}[2007/12/12]%
+ \RequirePackage{ifluatex}[2009/04/10]%
\fi
% \end{macrocode}
% \begin{macrocode}
@@ -1088,7 +1091,7 @@ and the derived files
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input luatex-loader.sty\relax
\else
- \RequirePackage{luatex-loader}[2007/12/12]%
+ \RequirePackage{luatex-loader}[2009/04/10]%
\fi
% \end{macrocode}
% \begin{macrocode}
@@ -1156,6 +1159,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -1163,7 +1169,7 @@ and the derived files
\fi
\expandafter\x\csname ver@luatex-loader.sty\endcsname
\ProvidesPackage{luatex-loader}%
- [2007/12/12 v0.1 Lua module loader (HO)]
+ [2009/04/10 v0.2 Lua module loader (HO)]
% \end{macrocode}
% \begin{macrocode}
@@ -1175,11 +1181,17 @@ and the derived files
\catcode41 12 % )
\catcode44 12 % ,
\catcode46 12 % .
+ \catcode60 12 % <
\catcode61 12 % =
\catcode95 12 % _ (other!)
\catcode96 12 % `
\endlinechar=10 %
- \directlua0{%
+ \ifnum\luatexversion<36 %
+ \directlua0%
+ \else %
+ \expandafter\directlua %
+ \fi %
+ {%
do
local script = "oberdiek.luatex.lua"
local file = kpse.find_file(script, "texmfscripts")
@@ -1244,7 +1256,7 @@ table.insert(package.loaders, kpse_module_loader)
%<*test2>
\documentclass{article}
\def\LoadCommand{%
- \RequirePackage{luatex}[2007/12/12]%
+ \RequirePackage{luatex}[2009/04/10]%
}
%</test2>
% \end{macrocode}
@@ -1252,7 +1264,7 @@ table.insert(package.loaders, kpse_module_loader)
%<*test3>
\documentclass{article}
\def\LoadCommand{%
- \RequirePackage{luatex-loader}[2007/12/12]%
+ \RequirePackage{luatex-loader}[2009/04/10]%
}
%</test3>
% \end{macrocode}
@@ -1363,7 +1375,7 @@ table.insert(package.loaders, kpse_module_loader)
\advance\count0 by 1 %
\repeat
\documentclass{minimal}
-\usepackage{luatex}[2007/12/12]
+\usepackage{luatex}[2009/04/10]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -1748,6 +1760,14 @@ table.insert(package.loaders, kpse_module_loader)
% \item
% First public version.
% \end{Version}
+% \begin{Version}{2009/04/10 v0.2}
+% \item
+% Requires package \xpackage{ifluatex} in version 2.0 to ensure
+% \cs{luatexversion}.
+% \item
+% Updates the call of \cs{directlua}, the syntax has changed
+% in \LuaTeX\ 0.36.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx
index e826a35b8af..f1a0589d0d5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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
@@ -74,7 +74,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: magicnum 2007/12/12 v1.0 Magic numbers (HO)}
+\Msg{* Package: magicnum 2009/04/10 v1.1 Magic numbers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -85,7 +85,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
@@ -161,7 +161,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{magicnum.drv}%
- [2007/12/12 v1.0 Magic numbers (HO)]%
+ [2009/04/10 v1.1 Magic numbers (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\usepackage{array}
@@ -171,7 +171,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{576}
+% \CheckSum{591}
%
% \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
@@ -192,7 +192,7 @@ and the derived files
% \GetFileInfo{magicnum.drv}
%
% \title{The \xpackage{magicnum} package}
-% \date{2007/12/12 v1.0}
+% \date{2009/04/10 v1.1}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -471,6 +471,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -478,7 +481,7 @@ and the derived files
\fi
\expandafter\x\csname ver@magicnum.sty\endcsname
\ProvidesPackage{magicnum}%
- [2007/12/12 v1.0 Magic numbers (HO)]
+ [2009/04/10 v1.1 Magic numbers (HO)]
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -515,6 +518,7 @@ and the derived files
\TMP@EnsureCode{45}{12}% -
\TMP@EnsureCode{46}{12}% .
\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{60}{12}% <
\TMP@EnsureCode{62}{12}% >
% \end{macrocode}
%
@@ -539,7 +543,7 @@ and the derived files
%
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname luatexversion\endcsname\relax
+\expandafter\ifx\csname directlua\endcsname\relax
% \end{macrocode}
%
% \begin{macro}{\magicnum}
@@ -579,13 +583,23 @@ and the derived files
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input luatex.sty\relax
\else
- \RequirePackage{luatex}[2007/12/12]%
+ \RequirePackage{luatex}[2009/04/10]%
+ \fi
+% \end{macrocode}
+%
+% \begin{macro}{\magicnum@directlua}
+% \begin{macrocode}
+ \ifnum\luatexversion<36 %
+ \def\magicnum@directlua{\directlua0 }%
+ \else
+ \let\magicnum@directlua\directlua
\fi
% \end{macrocode}
+% \end{macro}
% \begin{macro}{\magicnum}
% \begin{macrocode}
\def\magicnum#1{%
- \directlua0{%
+ \magicnum@directlua{%
require("oberdiek.magicnum")%
oberdiek.magicnum.get(%
"\luaescapestring{#1}",\number\CatcodeTableString
@@ -1142,7 +1156,7 @@ end
%<*testlatex>
\NeedsTeXFormat{LaTeX2e}
\documentclass{minimal}
-\usepackage{magicnum}[2007/12/12]
+\usepackage{magicnum}[2009/04/10]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -1376,6 +1390,10 @@ end
% \item
% First public version.
% \end{Version}
+% \begin{Version}{2009/04/10 v1.1}
+% \item
+% Adaptation to \LuaTeX\ 0.40.
+% \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 c0efc6e2b48..75566d16263 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
-% 2008/11/18
+% 2009/04/10
%
% 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 89d353dd7e9..637b3c974b5 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}{2008/11/18}
+\newcommand*{\Date}{2009/04/10}
% Copyright (C) 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -200,7 +200,7 @@
[\entrysep]
\entry{engord}{2008/08/11}{1.7}{Provides English ordinal numbers}%
[\entrysep]
-\entry{epstopdf}{2008/05/06}{1.7}{Conversion with epstopdf on the fly}%
+\entry{epstopdf}{2009/03/01}{1.8}{Conversion with epstopdf on the fly}%
[\entrysep]
\entry{etexcmds}{2007/12/12}{1.2}{Prefix for e-TeX command names}%
[\entrysep]
@@ -230,9 +230,9 @@
[\entrysep]
\entry{iflang}{2007/11/11}{1.5}{Language checks}%
[\entrysep]
-\entry{ifluatex}{2007/12/12}{1.0}{Provides the ifluatex switch}%
+\entry{ifluatex}{2009/04/10}{1.1}{Provides the ifluatex switch}%
[\entrysep]
-\entry{ifpdf}{2007/12/12}{1.6}{Provides the ifpdf switch}%
+\entry{ifpdf}{2009/04/10}{2.0}{Provides the ifpdf switch}%
[\entrysep]
\entry{ifvtex}{2008/11/04}{1.4}{Switches for detecting VTeX and its modes}%
[\entrysep]
@@ -242,7 +242,7 @@
[\entrysep]
\entry{intcalc}{2007/09/27}{1.1}{Expandable integer calculations}%
[\entrysep]
-\entry{kvoptions}{2007/10/18}{3.0}{Keyval support for \LaTeX{} options}%
+\entry{kvoptions}{2009/04/10}{3.1}{Keyval support for \LaTeX{} options}%
[\entrysep]
\entry{kvsetkeys}{2007/09/29}{1.3}{Key value parser with default handler support}%
[\entrysep]
@@ -250,11 +250,11 @@
[\entrysep]
\entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}%
[\entrysep]
-\entry{luacolor}{2007/12/12}{1.0}{Coloring based on LuaTeX's node attributes}%
+\entry{luacolor}{2009/04/10}{1.1}{Coloring based on LuaTeX's node attributes}%
[\entrysep]
-\entry{luatex}{2007/12/12}{0.1}{LuaTeX basic definition package}%
+\entry{luatex}{2009/04/10}{0.2}{LuaTeX basic definition package}%
[\entrysep]
-\entry{magicnum}{2007/12/12}{1.0}{Magic numbers}%
+\entry{magicnum}{2009/04/10}{1.1}{Magic numbers}%
[\entrysep]
\entry{makerobust}{2006/03/18}{1.0}{Making a macro robust}%
[\entrysep]
@@ -276,9 +276,9 @@
[\entrysep]
\entry{pdflscape}{2008/08/11}{0.10}{Landscape pages in PDF}%
[\entrysep]
-\entry{pdftexcmds}{2007/12/12}{0.3}{LuaTeX support for pdfTeX utility functions}%
+\entry{pdftexcmds}{2009/04/10}{0.4}{LuaTeX support for pdfTeX utility functions}%
[\entrysep]
-\entry{picture}{2007/04/11}{1.1}{Dimens for picture macros}%
+\entry{picture}{2008/11/26}{1.2}{Dimens for picture macros}%
[\entrysep]
\entry{pmboxdraw}{2006/05/03}{1.0}{Poor man's box drawing characters}%
[\entrysep]
@@ -685,7 +685,8 @@ based on macro \cs{languagename} or hyphenation patterns.
\label{ifluatex}
\begin{abstract}
This package looks for \LuaTeX\ regardless of its mode
-and provides the switch \cs{ifluatex}.
+and provides the switch \cs{ifluatex}. Also it makes
+\cs{luatexversion} available if it is not present.
It works with \plainTeX\ or \LaTeX.
\end{abstract}
\tocinclude{ifluatex}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
index d6a0a5ddecc..d7648d1cae4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
@@ -152,7 +152,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{640}
+% \CheckSum{644}
%
% \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
@@ -339,6 +339,9 @@ and the derived files
\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/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
index 94aad1f81ca..21f748c975b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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
@@ -79,7 +79,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/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
index c574197f56f..706b7cec6ad 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
@@ -158,7 +158,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1988}
+% \CheckSum{1992}
%
% \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
@@ -315,6 +315,9 @@ and the derived files
\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/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
index d781fee7640..f8e25775291 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
@@ -69,7 +69,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdftexcmds 2007/12/12 v0.3 LuaTeX support for pdfTeX utility functions (HO)}
+\Msg{* Package: pdftexcmds 2009/04/10 v0.4 LuaTeX support for pdfTeX utility functions (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -147,7 +147,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdftexcmds.drv}%
- [2007/12/12 v0.3 LuaTeX support for pdfTeX utility functions (HO)]%
+ [2009/04/10 v0.4 LuaTeX support for pdfTeX utility functions (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\usepackage{paralist}
@@ -157,7 +157,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{552}
+% \CheckSum{570}
%
% \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
@@ -178,7 +178,7 @@ and the derived files
% \GetFileInfo{pdftexcmds.drv}
%
% \title{The \xpackage{pdftexcmds} package}
-% \date{2007/12/12 v0.3}
+% \date{2009/04/10 v0.4}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -405,6 +405,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi
@@ -412,7 +415,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2007/12/12 v0.3 LuaTeX support for pdfTeX utility functions (HO)]
+ [2009/04/10 v0.4 LuaTeX support for pdfTeX utility functions (HO)]
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -459,6 +462,7 @@ and the derived files
\TMP@EnsureCode{62}{12}% >
\TMP@EnsureCode{94}{7}% ^ (superscript)
\TMP@EnsureCode{95}{12}% _ (other)
+\TMP@EnsureCode{96}{12}% `
\TMP@EnsureCode{126}{12}% ~ (other)
% \end{macrocode}
%
@@ -468,16 +472,18 @@ and the derived files
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input infwarerr.sty\relax
+ \input ifluatex.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
+ \RequirePackage{ifluatex}[2009/04/10]%
\fi
% \end{macrocode}
%
% \subsection{Without \LuaTeX}
%
% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname directlua\endcsname\relax
+\ifluatex
+\else
\@PackageInfo{pdftexcmds}{LuaTeX not detected}%
\def\pdftexcmds@nopdftex{%
\@PackageInfoNoLine{pdftexcmds}{pdfTeX >= 1.30 not detected}%
@@ -535,6 +541,16 @@ and the derived files
\fi
% \end{macrocode}
%
+% \begin{macro}{\pdftexcmds@directlua}
+% \begin{macrocode}
+\ifnum\luatexversion<36 %
+ \def\pdftexcmds@directlua{\directlua0 }%
+\else
+ \let\pdftexcmds@directlua\directlua
+\fi
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Load module}
%
% \begin{macrocode}
@@ -542,9 +558,9 @@ and the derived files
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input luatex-loader.sty\relax
\else
- \RequirePackage{luatex-loader}[2007/12/12]%
+ \RequirePackage{luatex-loader}[2009/04/10]%
\fi
-\directlua0{%
+\pdftexcmds@directlua{%
require("oberdiek.pdftexcmds")%
}
% \end{macrocode}
@@ -562,6 +578,13 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+\ifnum\luatexversion<36 %
+\else
+ \catcode`\0=9 %
+\fi
+% \end{macrocode}
+%
% \begin{macro}{\pdf@strcmp}
% \begin{macrocode}
\long\def\pdf@strcmp#1#2{%
@@ -735,11 +758,15 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+\catcode`\0=12 %
+% \end{macrocode}
+%
% \begin{macro}{\pdf@pipe}
% Check availability of |io.popen| first.
% \begin{macrocode}
\ifnum0%
- \directlua0{%
+ \pdftexcmds@directlua{%
if io.popen then %
tex.write("1")%
end%
@@ -747,7 +774,7 @@ and the derived files
=1 %
\def\pdf@pipe#1{%
\the\expandafter\pdftexcmds@toks
- \directlua0{%
+ \pdftexcmds@directlua{%
oberdiek.pdftexcmds.toks="pdftexcmds@toks"%
oberdiek.pdftexcmds.pipe("\luaescapestring{#1}")%
}%
@@ -1346,6 +1373,11 @@ end
% \item
% Organization of Lua code as module.
% \end{Version}
+% \begin{Version}{2009/04/10 v0.4}
+% \item
+% Adaptation for syntax change of \cs{directlua} in
+% \LuaTeX\ 0.36.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/picture.dtx b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
index f103c413b98..1ee261fa49f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% 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
@@ -68,7 +69,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: picture 2007/04/11 v1.1 Dimens for picture macros (HO)}
+\Msg{* Package: picture 2008/11/26 v1.2 Dimens for picture macros (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -79,7 +80,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
@@ -137,7 +139,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{picture.drv}%
- [2007/04/11 v1.1 Dimens for picture macros (HO)]%
+ [2008/11/26 v1.2 Dimens for picture macros (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -146,7 +148,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{294}
+% \CheckSum{304}
%
% \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
@@ -167,7 +169,7 @@ and the derived files
% \GetFileInfo{picture.drv}
%
% \title{The \xpackage{picture} package}
-% \date{2007/04/11 v1.1}
+% \date{2008/11/26 v1.2}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -238,8 +240,8 @@ and the derived files
%
% \subsection{Supported packages}
%
-% Package \xpackage{pspicture} is supported, but it must be loaded
-% before package \xpackage{picture}.
+% Packages \xpackage{pspicture} and \xpackage{pict2e} are supported,
+% but they must be loaded before package \xpackage{picture}.
%
% New macros can be supported by \cs{picture@redefine}.
% The first argument is the macro which contains the arguments
@@ -263,7 +265,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{picture}%
- [2007/04/11 v1.1 Dimens for picture macros (HO)]%
+ [2008/11/26 v1.2 Dimens for picture macros (HO)]%
% \end{macrocode}
%
% \subsection{Options}
@@ -520,10 +522,37 @@ and the derived files
\picture@redefine\Line{(&1,&2)}%
\picture@redefine\Curve{(&1,&2)}%
\picture@redefine\Vector{(&1,&2)}%
-}{
+}{%
\picture@redefine\@oval{(&1,&2)}%
}
% \end{macrocode}
+%
+% \subsection{Check package loading order}
+%
+% \begin{macro}{\PC@checkpackage}
+% \begin{macrocode}
+\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%
+ }%
+ }{}%
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+\Pc@checkpackage{pict2e}
+\Pc@checkpackage{pspicture}
+% \end{macrocode}
+%
% \begin{macrocode}
%</package>
% \end{macrocode}
@@ -719,6 +748,13 @@ and the derived files
% \item
% Line ends sanitized.
% \end{Version}
+% \begin{Version}{2008/11/26 v1.2}
+% \item
+% Package \xpackage{pict2e} added to documentation section ``Supported
+% packages''.
+% \item
+% Package order of supported packages is checked.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
index 3658aa9a8fa..370d34bd290 100644
--- a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
@@ -718,7 +718,7 @@ and the derived files
% \begin{macrocode}
%<*test4>
\usepackage[warning,ucs]{selinput}
-\SelectInputMappings{
+\SelectInputMappings{%
adieresis=^^c3^^a4,%
germandbls=^^c3^^9f,%
Euro=^^e2^^82^^ac,%
@@ -736,7 +736,7 @@ and the derived files
% \begin{macrocode}
%<*test5>
\usepackage[warning,ucs]{selinput}
-\SelectInputMappings{
+\SelectInputMappings{%
adieresis={\"a},%
germandbls={{\ss}},%
Euro=\texteuro{},%
diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
index bc1b77acdbb..0425cf0fb11 100644
--- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
@@ -155,7 +155,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{560}
+% \CheckSum{564}
%
% \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
@@ -413,6 +413,9 @@ by/a/very_long_long_long_path.html}%
\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/source/latex/oberdiek/soulutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
index b59085437e5..31caf5966ed 100644
--- a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
@@ -156,7 +156,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1926}
+% \CheckSum{1930}
%
% \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
@@ -311,6 +311,9 @@ and the derived files
\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/source/latex/oberdiek/stringenc.dtx b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
index 747823da3c1..83b91ee6874 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
@@ -260,7 +260,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{5906}
+% \CheckSum{5910}
%
% \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
@@ -476,6 +476,9 @@ and the derived files
\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/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
index 21cb7ce5be7..74fddec5112 100644
--- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
@@ -149,7 +149,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{521}
+% \CheckSum{525}
%
% \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
@@ -374,6 +374,9 @@ and the derived files
\else
\def\x#1#2[#3]{\endgroup
#2[{#3}]%
+ \ifx#1\@undefined
+ \xdef#1{#3}%
+ \fi
\ifx#1\relax
\xdef#1{#3}%
\fi