From 9d3e292ead8e354c836d0c4dcd25e0b4aa03486c Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 14 Apr 2013 19:23:40 +0200 Subject: add compatibility for luaotfload v.1 --- lualibs.lua | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'lualibs.lua') diff --git a/lualibs.lua b/lualibs.lua index 59d7907..4f354b5 100644 --- a/lualibs.lua +++ b/lualibs.lua @@ -52,18 +52,13 @@ loadmodule = _G.loadmodule or function (name, t) return true end -local merged_suffix = "-merged.lua" - -local p_suffix = lpeg.P".lua" * lpeg.P(-1) -local p_nosuffix = (1 - p_suffix)^0 -local p_hassuffix = (p_nosuffix) * p_suffix -local p_stripsuffix = lpeg.C(p_nosuffix) * p_suffix - --[[doc-- The separation of the “basic” from the “extended” sets coincides with the split into luat-bas.mkiv and luat-lib.mkiv. --doc]]-- loadmodule"lualibs-basic.lua" +loadmodule"lualibs-compat.lua" --- restore stuff gone since v1.* + if load_extended == true then loadmodule"lualibs-extended.lua" end -- cgit v1.2.3