diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/luaotfload-main.lua | 4 | ||||
| -rw-r--r-- | src/luaotfload.sty | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index b633ed7..919e343 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -249,7 +249,9 @@ do definers.info_generic = mk_info "generic" end -reset_callback "define_font" +if not reset_callback == nil then + reset_callback "define_font" +end --[[doc-- diff --git a/src/luaotfload.sty b/src/luaotfload.sty index c9c9864..825a3a5 100644 --- a/src/luaotfload.sty +++ b/src/luaotfload.sty @@ -35,14 +35,22 @@ \let\ifluaotfloadloaded\endinput \bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname selectfont\endcsname\relax + \ifdefined\newluafunction\else \input luatexbase.sty + \fi \else \NeedsTeXFormat{LaTeX2e} \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} + \ifdefined\newluafunction\else + \RequirePackage{luatexbase} + \fi +\fi +\ifdefined \RequireLuaModule + \RequireLuaModule{luaotfload-main} +\else + \directlua{require("luaotfload-main")} \fi -\RequireLuaModule{luaotfload-main} |