From 7653d470fb19a1d1c83c674f847a3abc926fd115 Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Sat, 3 Oct 2015 13:30:55 +0100
Subject: just use ltluatex not luatexbase

---
 src/luaotfload.sty | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'src/luaotfload.sty')

diff --git a/src/luaotfload.sty b/src/luaotfload.sty
index 825a3a5..1445a28 100644
--- a/src/luaotfload.sty
+++ b/src/luaotfload.sty
@@ -33,24 +33,14 @@
 %%
 \csname ifluaotfloadloaded\endcsname
 \let\ifluaotfloadloaded\endinput
-\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname selectfont\endcsname\relax
- \ifdefined\newluafunction\else
-  \input luatexbase.sty
- \fi
-\else
-  \NeedsTeXFormat{LaTeX2e}
+\let\ifluaotfloadloaded\endinput
+\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]
- \ifdefined\newluafunction\else
-    \RequirePackage{luatexbase}
- \fi
-\fi
-\ifdefined \RequireLuaModule
- \RequireLuaModule{luaotfload-main}
-\else
-  \directlua{require("luaotfload-main")}
+    [2014/08/10 v2.5-4 OpenType layout system]
 \fi
-
+\directlua{require('luaotfload-main')}
-- 
cgit v1.2.3

