diff options
| -rw-r--r-- | src/luaotfload-main.lua | 1 | ||||
| -rw-r--r-- | src/luaotfload.sty | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index 62765e4..17d06d4 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -217,7 +217,6 @@ local install_loaders = function () return loaders end - luaotfload.main = function () luaotfload.loaders = install_loaders () diff --git a/src/luaotfload.sty b/src/luaotfload.sty index ec62dad..1b31b1d 100644 --- a/src/luaotfload.sty +++ b/src/luaotfload.sty @@ -33,17 +33,17 @@ %% \csname ifluaotfloadloaded\endcsname \let\ifluaotfloadloaded\endinput -\bgroup\expandafter\expandafter\expandafter\egroup -\expandafter\ifx\csname selectfont\endcsname\relax - \input luatexbase.sty -\else - \NeedsTeXFormat{LaTeX2e} +\ifx\newluafunction\@undefined + \input ltluatex +\fi +\ifdefined\ProvidesPackage \ProvidesPackage{luaotfload}% %% FIXME The date is meaningless, we need to find a way to %% use the git revision instead. - [2015/03/29 v2.6 OpenType layout system] - \RequirePackage{luatexbase} + [2015/03/29 v2.6 OpenType layout system] \fi -\RequireLuaModule{luaotfload-main} -\directlua{local _void = luaotfload.main ()} +\directlua{ +require('luaotfload-main') +local _void = luaotfload.main () +} |