summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfontdbutil.lua4
-rw-r--r--luaotfload-font-nms.lua4
2 files changed, 6 insertions, 2 deletions
diff --git a/fontdbutil.lua b/fontdbutil.lua
index a17dbe7..464cc62 100755
--- a/fontdbutil.lua
+++ b/fontdbutil.lua
@@ -20,6 +20,10 @@ local loader_file = "luatexbase.loader.lua"
local loader_path = assert(kpse.find_file(loader_file, "lua"),
"File '"..loader_file.."' not found")
+string.quoted = string.quoted or function (str)
+ return string.format("%q",str)
+end
+
--texiowrite_nl("("..loader_path..")")
dofile(loader_path) -- FIXME this pollutes stdout with filenames
diff --git a/luaotfload-font-nms.lua b/luaotfload-font-nms.lua
index 54abf67..67619be 100644
--- a/luaotfload-font-nms.lua
+++ b/luaotfload-font-nms.lua
@@ -45,12 +45,12 @@ local utf8lower = unicode.utf8.lower
local dirglob = dir.glob
local dirmkdirs = dir.mkdirs
local filebasename = file.basename
-local filecollapsepath = file.collapsepath
+local filecollapsepath = file.collapsepath or file.collapse_path
local fileextname = file.extname
local fileiswritable = file.iswritable
local filejoin = file.join
local filereplacesuffix = file.replacesuffix
-local filesplitpath = file.splitpath
+local filesplitpath = file.splitpath or file.split_path
local stringis_empty = string.is_empty
local stringsplit = string.split
local stringstrip = string.strip