diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2011-03-02 20:46:35 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2011-03-02 20:46:35 +0200 |
| commit | 63b91e48730d3396e8291dd6151f8164b0e96aac (patch) | |
| tree | b219d3ac7d81f5f313be6435eeb242eb11d0f28a /otfl-font-otf.lua | |
| parent | 9883a4f6bb58473e3620ec6614315b546a2c6a9b (diff) | |
| parent | 8151f93bac4474b23b51e941ab69b9a817daf82c (diff) | |
| download | luaotfload-63b91e48730d3396e8291dd6151f8164b0e96aac.tar.gz | |
Merge remote branch 'origin/master' into unstable
Conflicts:
luaotfload.dtx
Diffstat (limited to 'otfl-font-otf.lua')
| -rw-r--r-- | otfl-font-otf.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/otfl-font-otf.lua b/otfl-font-otf.lua index 25bccfa..7656f13 100644 --- a/otfl-font-otf.lua +++ b/otfl-font-otf.lua @@ -332,7 +332,9 @@ function otf.load(filename,format,sub,featurefile) local attr = lfs.attributes(filename) local size, time = attr and attr.size or 0, attr and attr.modification or 0 if featurefile then - name = name .. "@" .. file.removesuffix(file.basename(featurefile)) + local fattr = lfs.attributes(featurefile) + local fsize, ftime = fattr and fattr.size or 0, fattr and fattr.modification or 0 + name = name .. "@" .. file.removesuffix(file.basename(featurefile)) .. ftime .. fsize end if sub == "" then sub = false end local hash = name |