From 1a87640a25a3cf2bf77b1cb9c69e3c90f2b3811b Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 12 Apr 2009 23:15:36 +0000
Subject: oberdiek update (12apr09)

git-svn-id: svn://tug.org/texlive/trunk@12705 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/source/latex/oberdiek/magicnum.dtx  | 40 ++++++++++++++++------
 1 file changed, 29 insertions(+), 11 deletions(-)

(limited to 'Master/texmf-dist/source/latex/oberdiek/magicnum.dtx')

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
-- 
cgit v1.2.3

