diff options
author | Karl Berry <karl@freefriends.org> | 2009-04-12 23:15:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-04-12 23:15:36 +0000 |
commit | 1a87640a25a3cf2bf77b1cb9c69e3c90f2b3811b (patch) | |
tree | 5a6eb1ac516775c93f354fba92bddca5de94c078 /Master/texmf-dist/tex | |
parent | b4c2a162bb8aa0937f3c029e5e103055f55ae3ae (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')
33 files changed, 291 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty index f021e09f26b..0946a887970 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 0faa867ac99..d325a493373 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty index 16927659a5c..ac36c3eccc6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty index 46a096d71d2..c080f6ef63b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bitset.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/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty index 4ee5e898fd6..c7b1d5d3a6e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty index ae181ba9001..0d0808c35fb 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/engord.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/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty index b8c5d1f6c07..3550e42a177 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty b/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty index d914edefe71..bbef4f3e871 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.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/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty index a39c842d607..c9b64c0acd8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty index 7272b7eeaa7..30e604e2c7e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.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 @@ -25,7 +25,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. %% \begingroup \catcode44 12 % , @@ -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 @@ -85,7 +88,7 @@ \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)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -110,6 +113,9 @@ \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}% . @@ -117,6 +123,7 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{94}{7}% ^ +\TMP@EnsureCode{96}{12}% ` \begingroup \expandafter\ifx\csname ifluatex\endcsname\relax \else @@ -144,12 +151,65 @@ \expandafter\endinput \fi \endgroup -\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 +} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname luatexversion\endcsname\relax \else \luatextrue \fi +\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 \begingroup \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty index b94902260bc..5f7ad4edf8a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -8,7 +8,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 @@ -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 @@ -85,7 +88,7 @@ \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)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -110,6 +113,9 @@ \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}% . @@ -118,6 +124,7 @@ \TMP@EnsureCode{60}{12}% < \TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{94}{7}% ^ +\TMP@EnsureCode{96}{12}% ` \begingroup \expandafter\ifx\csname ifpdf\endcsname\relax \else @@ -145,6 +152,30 @@ \expandafter\endinput \fi \endgroup +\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 % + \else + \directlua{tex.enableprimitives('ifpdf', {'pdfoutput'})}% + \global\let\pdfoutput\ifpdfpdfoutput + \fi + \fi + \relax +\endgroup \newif\ifpdf \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfoutput\endcsname\relax @@ -155,6 +186,30 @@ \fi \fi \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 +\begingroup \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty index 9878492f2b0..d71bd883acc 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.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/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty index 43ff35f4409..238f8a808b8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty index ce7154b6d26..6084c88a886 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index 46278fdfc6a..6510b6b5cde 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty index 52d39a888aa..25739de1a05 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.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 @@ -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@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)] \begingroup \catcode10 12 % ^^J @@ -96,11 +99,17 @@ \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") diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty index 649b32dcd1a..c932a0b5f9e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/luatex.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 @@ -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@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)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -133,7 +136,7 @@ \input ifluatex.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% - \RequirePackage{ifluatex}[2007/12/12]% + \RequirePackage{ifluatex}[2009/04/10]% \fi \ifluatex \else @@ -411,7 +414,7 @@ \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 \LuT@AtEnd \endinput diff --git a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty index 5262b191af6..fbceb2ded81 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/magicnum.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 @@ -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@magicnum.sty\endcsname \ProvidesPackage{magicnum}% - [2007/12/12 v1.0 Magic numbers (HO)] + [2009/04/10 v1.1 Magic numbers (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -118,6 +121,7 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{60}{12}% < \TMP@EnsureCode{62}{12}% > \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newcommand\endcsname\relax @@ -132,7 +136,7 @@ \newcommand*{\magicnum}{}% \fi \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname luatexversion\endcsname\relax +\expandafter\ifx\csname directlua\endcsname\relax \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ifcsname\endcsname\relax \def\magicnum#1{% @@ -159,10 +163,15 @@ \expandafter\ifx\csname RequirePackage\endcsname\relax \input luatex.sty\relax \else - \RequirePackage{luatex}[2007/12/12]% + \RequirePackage{luatex}[2009/04/10]% + \fi + \ifnum\luatexversion<36 % + \def\magicnum@directlua{\directlua0 }% + \else + \let\magicnum@directlua\directlua \fi \def\magicnum#1{% - \directlua0{% + \magicnum@directlua{% require("oberdiek.magicnum")% oberdiek.magicnum.get(% "\luaescapestring{#1}",\number\CatcodeTableString diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty index cf5175c5b01..71381bd0660 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.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/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty index e897304c64e..d5d42dabc7e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.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/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index 6ff76866446..59a32176aac 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.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 @@ -85,7 +88,7 @@ \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)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -127,15 +130,18 @@ \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{95}{12}% _ (other) +\TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{126}{12}% ~ (other) \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 -\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}% @@ -191,13 +197,18 @@ \pdftexcmds@AtEnd \expandafter\endinput \fi +\ifnum\luatexversion<36 % + \def\pdftexcmds@directlua{\directlua0 }% +\else + \let\pdftexcmds@directlua\directlua +\fi \begingroup\expandafter\expandafter\expandafter\endgroup \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")% } \begingroup\expandafter\expandafter\expandafter\endgroup @@ -206,6 +217,10 @@ \else \csname newtoks\endcsname\pdftexcmds@toks \fi +\ifnum\luatexversion<36 % +\else + \catcode`\0=9 % +\fi \long\def\pdf@strcmp#1#2{% \directlua0{% oberdiek.pdftexcmds.strcmp("\luaescapestring{#1}",% @@ -303,8 +318,9 @@ oberdiek.pdftexcmds.lastsystemexit()% }% } +\catcode`\0=12 % \ifnum0% - \directlua0{% + \pdftexcmds@directlua{% if io.popen then % tex.write("1")% end% @@ -312,7 +328,7 @@ =1 % \def\pdf@pipe#1{% \the\expandafter\pdftexcmds@toks - \directlua0{% + \pdftexcmds@directlua{% oberdiek.pdftexcmds.toks="pdftexcmds@toks"% oberdiek.pdftexcmds.pipe("\luaescapestring{#1}")% }% diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty index c74c8dff879..e7b68d32742 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.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/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty index 835bb6c5ca7..423e49ddebf 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty @@ -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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty index b78b29b5549..0c01db4be10 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty @@ -90,6 +90,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/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty index a89ac5aedfb..2ff0b2acbfe 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty @@ -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 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'. |