OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8a2a31e
)
ltj-jfont.lua: id.filename may be nil in luaotfload v2.7
author
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Sat, 23 Apr 2016 11:39:34 +0000
(20:39 +0900)
committer
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Sat, 23 Apr 2016 11:39:34 +0000
(20:39 +0900)
src/ltj-jfont.lua
patch
|
blob
|
history
diff --git
a/src/ltj-jfont.lua
b/src/ltj-jfont.lua
index
735d751
..
16ba9d9
100644
(file)
--- a/
src/ltj-jfont.lua
+++ b/
src/ltj-jfont.lua
@@
-781,8
+781,8
@@
do
local checksum = file.checksum
local function prepare_extra_data_base(id)
local checksum = file.checksum
local function prepare_extra_data_base(id)
- if
not id
then return end
- local bname = file.nameonly(id.filename
or ''
)
+ if
(not id) or (not id.filename)
then return end
+ local bname = file.nameonly(id.filename)
if not font_extra_basename[bname] then
-- if the cache is present, read it
local newsum = checksum(id.filename) -- MD5 checksum of the fontfile
if not font_extra_basename[bname] then
-- if the cache is present, read it
local newsum = checksum(id.filename) -- MD5 checksum of the fontfile
@@
-809,7
+809,7
@@
do
end
end
local function prepare_extra_data_font(id, res)
end
end
local function prepare_extra_data_font(id, res)
- if type(res)=='table' and res.shared then
+ if type(res)=='table' and res.shared
and res.filename
then
font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
end
end
font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
end
end