diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-11-22 00:16:06 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-11-22 00:16:06 +0100 |
| commit | 39d7f5d2b65d9d21627c73c3436825d39317dced (patch) | |
| tree | 197445bbdf448a0ef9975dacc73a81ad0d754556 /src/luaotfload.sty | |
| parent | c6e5c892171b526c0bd283737a6207bf443765e2 (diff) | |
| parent | 8e66c317251ad8efcfef34a40ac747435e37ed29 (diff) | |
| download | luaotfload-39d7f5d2b65d9d21627c73c3436825d39317dced.tar.gz | |
Merge branch 'canonical-master'
Diffstat (limited to 'src/luaotfload.sty')
| -rw-r--r-- | src/luaotfload.sty | 18 |
1 files changed, 9 insertions, 9 deletions
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 () +} |