diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-22 16:13:07 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-22 16:13:07 +0200 |
| commit | 406f05fe9ffa53b6bac44b3150801e8461afc2a5 (patch) | |
| tree | 1062e5bef0da9658386266124defd1672e83479d | |
| parent | 9c573708a2e74b51062fc5cef728790dd85f66d6 (diff) | |
| parent | 00358e48e13b112392d1a3da71795bbc1bf336a0 (diff) | |
| download | luaotfload-406f05fe9ffa53b6bac44b3150801e8461afc2a5.tar.gz | |
Merge branch 'master' of https://github.com/phi-gamma/luaotfload
| -rwxr-xr-x | fontdbutil.lua | 4 | ||||
| -rw-r--r-- | luaotfload-font-nms.lua | 4 |
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 |