summaryrefslogtreecommitdiff
path: root/lualibs.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-04-14 19:23:40 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-04-14 19:23:40 +0200
commit9d3e292ead8e354c836d0c4dcd25e0b4aa03486c (patch)
treeb38ef12adc506d92f03887da28e9f68269d039a0 /lualibs.lua
parenteb3482f39ca47f5d1a5bb4b5177fb6cd0c8bafb0 (diff)
downloadlualibs-9d3e292ead8e354c836d0c4dcd25e0b4aa03486c.tar.gz
add compatibility for luaotfload v.1
Diffstat (limited to 'lualibs.lua')
-rw-r--r--lualibs.lua9
1 files changed, 2 insertions, 7 deletions
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