OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kitagawa_test' into cjascale
[luatex-ja/luatexja.git]
/
src
/
ltj-jfont.lua
diff --git
a/src/ltj-jfont.lua
b/src/ltj-jfont.lua
index
40042ec
..
e18fece
100644
(file)
--- a/
src/ltj-jfont.lua
+++ b/
src/ltj-jfont.lua
@@
-3,7
+3,7
@@
--
luatexbase.provides_module({
name = 'luatexja.jfont',
--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2017/0
8/09
',
+ date = '2017/0
9/04
',
description = 'Loader for Japanese fonts',
})
module('luatexja.jfont', package.seeall)
description = 'Loader for Japanese fonts',
})
module('luatexja.jfont', package.seeall)
@@
-859,12
+859,21
@@
do
end
prepare_fl_data = function (dest, id)
local t = fontloader.info(id.filename)
end
prepare_fl_data = function (dest, id)
local t = fontloader.info(id.filename)
+ if not t then return dest end
local fl
local fl
- if t.f
ile
name then
+ if t.f
ont
name then
fl = fontloader.open(id.filename)
else
fl = fontloader.open(id.filename)
else
- fl = fontloader.open(id.filename, id.fullname)
+ fl = fontloader.open(id.filename, id.fontname) -- マニュアルにはこっちで書いてあるが?
+ if not fl then
+ local index
+ for i,v in ipairs(t) do
+ if v.fontname == id.fontname then index=i; break end
+ end
+ fl = fontloader.open(id.filename, index)
+ end
end
end
+ if not fl then fontloader.close(fl); return dest end
local ind_to_uni, unicodes = {}, {}
for i,v in pairs(id.characters) do
ind_to_uni[v.index] = i
local ind_to_uni, unicodes = {}, {}
for i,v in pairs(id.characters) do
ind_to_uni[v.index] = i
@@
-940,7
+949,7
@@
do
font_extra_basename[bname] = dat or {}
ltjb.save_cache( v,
{
font_extra_basename[bname] = dat or {}
ltjb.save_cache( v,
{
- chksum =
checksum(id.filename)
,
+ chksum =
newsum
,
version = cache_ver,
dat,
})
version = cache_ver,
dat,
})