summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luatexja/src/ltj-otf.lua
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-27 03:01:30 +0000
committerNorbert Preining <norbert@preining.info>2020-03-27 03:01:30 +0000
commit6c0ddfe655a39b71d1ab6a4a95d57a7ea0d94243 (patch)
tree65567ae2d29e1e8af56375fccfc1debc19b190c5 /macros/luatex/generic/luatexja/src/ltj-otf.lua
parent2bd4f7f317b392c32ce18c70d03fd5ba9ddd9e6d (diff)
CTAN sync 202003270301
Diffstat (limited to 'macros/luatex/generic/luatexja/src/ltj-otf.lua')
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-otf.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-otf.lua b/macros/luatex/generic/luatexja/src/ltj-otf.lua
index 48fe4bde2e..f0088944c2 100644
--- a/macros/luatex/generic/luatexja/src/ltj-otf.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-otf.lua
@@ -78,7 +78,7 @@ local function get_ucs_from_rmlgbm(c)
local tfmdata = font_getfont(curjfnt)
if tfmdata and tfmdata.resources then
local base, ivs = v % 0x200000, 0xE00FF + math.floor(v/0x200000)
- curjfnt = tfmdata and tfmdata.variants
+ curjfnt = tfmdata.resources.variants
curjfnt = curjfnt and curjfnt[ivs]
return curjfnt and curjfnt[base] or base
else return base
@@ -144,7 +144,7 @@ do
if key==0 then return append_jglyph(0) end
local curjfnt = tex_get_attr((ltjd_get_dir_count()==dir_tate)
and attr_curtfnt or attr_curjfnt)
- local cidinfo = ltju.get_cidinfo(cudjfnt)
+ local cidinfo = ltju.get_cidinfo(curjfnt)
if type(cidinfo)~="table" or
cidinfo.ordering ~= "Japan1" and
cidinfo.ordering ~= "GB1" and
@@ -205,7 +205,7 @@ ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf',
local function ind_to_uni(fmtable, fn)
if fn<0 then return end
local cid = ltju.get_cidinfo(fn);
- local t = ltjf_font_extra_info[fn].ind_to_uni
+ local t = ltjf_font_extra_info[fn]; t = t and t.ind_to_uni
if t and cid.ordering == "Japan1" then
for i, v in pairs(fmtable.chars) do
local j = string.match(i, "^AJ1%-([0-9]*)")