diff options
author | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-22 02:53:39 -0700 |
---|---|---|
committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-04-22 02:53:39 -0700 |
commit | 00358e48e13b112392d1a3da71795bbc1bf336a0 (patch) | |
tree | ec858e83c66da05054a6925e56f9103c25947585 | |
parent | 17488f095c0c1f7007fee89da8a337763605280e (diff) | |
parent | c170cba2b369564a94b10e992822cbe8601b0f99 (diff) | |
download | luaotfload-00358e48e13b112392d1a3da71795bbc1bf336a0.tar.gz |
Merge pull request #2 from eroux/master
Backward compatibility with current lualibs
-rwxr-xr-x | mkluatexfontdb.lua | 4 | ||||
-rw-r--r-- | otfl-font-nms.lua | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua index 776fbb3..96dcf60 100755 --- a/mkluatexfontdb.lua +++ b/mkluatexfontdb.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/otfl-font-nms.lua b/otfl-font-nms.lua index cec2a54..35611a6 100644 --- a/otfl-font-nms.lua +++ b/otfl-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 |