summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-17 21:25:44 +0000
committerKarl Berry <karl@freefriends.org>2016-10-17 21:25:44 +0000
commitfd53574128b6dde54f5f7cbf551d5a1cd1703e48 (patch)
treeab000103c2da0fecb7d0e46eab49473294902535 /Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
parent0ef9e5e0733974cb6927cb3512c75165998e0b59 (diff)
luatexja (17oct16)
git-svn-id: svn://tug.org/texlive/trunk@42295 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index 1c77e829fa9..86d553a7e80 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -953,9 +953,9 @@ luatexbase.add_to_callback(
local subtables = {}
if ft.specification then
for feat_name,v in pairs(ft.specification.features.normal) do
- if v==true then
+ if v==true and ft.resources then
for _,i in pairs(ft.resources.sequences) do
- if i.order[1]== feat_name and i.type == 'gpos_single' then
+ if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then
for _,st in pairs(i.subtables) do
subtables[st] = true
end
@@ -985,8 +985,9 @@ do
luatexbase.add_to_callback(
'luaotfload.patch_font',
function (tfmdata)
- if tfmdata.cidinfo then
- local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+ local cidinfo = tfmdata.cidinfo or tfmdata.resources.cidinfo
+ if cidinfo and cidinfo.registry and cidinfo.ordering then
+ local rd = ltjr_prepare_cid_font(cidinfo.registry, cidinfo.ordering)
if rd then
local ru, rc = rd.resources.unicodes, rd.characters
for i,v in pairs(tfmdata.characters) do