Merge branch 'lltxb' into unstable

1 files changed, 5 insertions, 22 deletions

diff --git a/luaotfload.dtx b/luaotfload.dtx
index 1464b05..1643239 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -458,7 +458,7 @@ luaotfload.module = {
     license       = "CC0"
 }
 
-luatexbase.provides_module(luaotfload.module)
+local error, warning, info, log = luatexbase.provides_module(luaotfload.module)
 %    \end{macrocode}
 %
 %    This is a necessary initalization in order not to rebuild an existing font.
@@ -471,24 +471,6 @@ luatexbase.provides_module(luaotfload.module)
 kpse.init_prog('', 600, '/')
 %    \end{macrocode}
 %
-%    Some helper functions.
-%
-%    \begin{macrocode}
-local format = string.format
-
-local function log(...)
-    luatexbase.module_log    ('luaotfload', format(...))
-end
-
-local function error(...)
-    luatexbase.module_error  ('luaotfload', format(...))
-end
-
-local function warning(...)
-    luatexbase.module_warning('luaotfload', format(...))
-end
-%    \end{macrocode}
-%
 %    The minimal required \LuaTeX\ version.
 %
 %    \begin{macrocode}
@@ -771,13 +753,14 @@ end
 
 \bgroup\expandafter\expandafter\expandafter\egroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-  \input luatextra.sty
+  \input luatexbase.sty
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luaotfload}%
     [2010/10/16 v1.20 OpenType layout system]
-  \RequirePackage{luatextra}
+  \RequirePackage{luatexbase}
 \fi
+\RequireLuaModule{lualibs}
 
 \expandafter\edef\csname otfl@AtEnd\endcsname{%
   \catcode64 \the\catcode64\relax
@@ -802,7 +785,7 @@ end
 %    We load the |lua| file, and we turn the package on.
 %
 %    \begin{macrocode}
-\luatexUseModule{luaotfload}
+\RequireLuaModule{luaotfload}
 
 \otfl@on