luatextra 0.99 (8nov10)

git-svn-id: svn://tug.org/texlive/trunk@20371 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 20 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua b/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua
index 6a590cd5a0a..164d67a8ea8 100644
--- a/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua
+++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua
@@ -13,9 +13,9 @@
 --  
 module("luatextra", package.seeall)
 luatexbase.provides_module {
-    version     = 0.971,
+    version     = 0.99,
     name        = "luatextra",
-    date        = "2010/08/02",
+    date        = "2010/10/08",
     description = "Additional low level functions for LuaTeX",
     author      = "Elie Roux and Manuel Pegourie-Gonnard",
     copyright   = "Elie Roux, 2009 and Manuel Pegourie-Gonnard, 2010",
diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty b/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty
index f69184acb13..6ab2a11f48b 100644
--- a/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty
+++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty
@@ -24,24 +24,22 @@
   \RequirePackage{ifluatex}
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luatextra}
-    [2010/08/02 v0.971 LuaTeX extra low-level macros]
+    [2010/10/08 v0.98 LuaTeX extra low-level macros]
 \fi
 
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax \else
-  \RequirePackage{metalogo}
-\fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatextra}{LuaTeX is required for this package.^^J
-    Aborting package loading.}
+  \x{luatextra}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \expandafter\endinput
 \fi
 \bgroup\expandafter\expandafter\expandafter\egroup
@@ -49,21 +47,22 @@
   \input luatexbase.sty
   \input luatexbase-modutils.sty
   \input luatexbase-mcb.sty
+  \luatexUseModule{lualibs}
+  \input luaotfload.sty
 \else
   \RequirePackage{luatexbase}
   \RequirePackage{luatexbase-modutils}
   \RequirePackage{luatexbase-mcb}
-\fi
-\luatexUseModule{lualibs}
-\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname ProvidesPackage\endcsname\relax \else
-  \RequirePackage{environ}
-  \NewEnviron{luacode}{\directlua{\BODY}}
+  \luatexUseModule{lualibs}
+  \RequirePackage{luaotfload}
+  %
+  \RequirePackage{metalogo}
+  \RequirePackage{luacode}
+  \RequirePackage{fixltx2e}
 \fi
 \ifnum\luatexversion<36
   \def\directlua{\pdfprimitive\directlua0}
   \def\latelua{\pdfprimitive\latelua0}
-  \def\luadirect{\pdfprimitive\directlua0}
   \def\lualate{\pdfprimitive\latelua0}
   \def\luatexattribute{\attribute}
   \def\luatexattributedef{\attributedef}
@@ -85,13 +84,11 @@
   \directlua{tex.enableprimitives('luatex', {'initcatcodetable'})}
   \directlua{tex.enableprimitives('luatex', {'savecatcodetable'})}
   \directlua{tex.enableprimitives('luatex', {'closelua'})}
-  \let\luadirect\directlua
   \let\lualate\luatexlatelua
   \let\initluatexcatcodetable\luatexinitcatcodetable
   \let\saveluatexcatcodetable\luatexsavecatcodetable
   \let\luaclose\luatexcloselua
 \fi
-\directlua{dofile(kpse.find_file("luatextra.lua"))}
 \let\newluaattribute\newluatexattribute
 \let\luaattribute\luatexattribute
 \let\unsetluaattribute\unsetluatexattribute
@@ -102,15 +99,10 @@
 \let\luaModuleError\luatexModuleError
 \let\luaRequireModule\luatexRequireModule
 \let\luaUseModule\luatexUseModule
+\directlua{dofile(kpse.find_file("luatextra.lua"))}
 \def\ltxtra@RegisterFontCallback{
   \directlua{luatextra.register_font_callback()}
 }
-\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname ProvidesPackage\endcsname\relax
-  \input luaotfload.sty
-\else
-  \RequirePackage{luaotfload}
-\fi
 \endinput
 %%
 %% End of file `luatextra.sty'.