From 2985566f7f478d5f0ac8eb9c9ec7330f6e9a10c2 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Tue, 28 Jul 2015 18:39:05 +0100 Subject: Patch to not assume luatexbase needs to be loaded The ltluatex code being trialed at https://github.com/josephwright/ltluatex includes a luatexbase emulation package that allows luaotfload to run without change but the core code that is intended to be included in future latex formats requires two small changes and also would require that luaotfload detect that luatex support is already provided and so not load luatexbase. \RequireLuaModule is not defined by default in TeX and luatexbase.reset_callback is not defined by default in lua in the core ltluatex code. --- src/luaotfload.sty | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/luaotfload.sty') 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} -- cgit v1.2.3