if type(x)=='number' then
v.kern[j] = {x, 0.5}
elseif type(x)=='table' then
- v.kern[j] = { x[1], ratio=x.ratio or (x[2] and 0.5*(1+x[2]) or 0.5) }
+ v.kern[j] = { x[1], (x.ratio or (x[2] and 0.5*(1+x[2]) or 0.5)) }
end
end
t.char_type[i] = v
t[i] = nil
end
end
+ if t.version<3 then
+ -- In version 3, 'jcharbdd' is divided into
+ -- 'alchar': ALchar (or math boundary)
+ -- 'nox_alchar': ALchar (or math boundary), where xkanjiskip won't inserted
+ -- 'glue': glue/kern, 'jcharbdd': other cases (和文B, rule, ...)
+ t.chars.alchar = t.chars.jcharbdd
+ t.chars.nox_alchar = t.chars.jcharbdd
+ t.chars.glue = t.chars.jcharbdd
+ end
t = luatexbase.call_callback("luatexja.load_jfm", t, jfm_file_name)
t.size_cache = {}
defjfm_res = t
end
end
local function prepare_extra_data_font(id, res)
- if type(res)=='table' and res.shared and res.filename then
- font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
+ if type(res)=='table' and res.shared and (res.psname or res.filename) then
+ font_extra_info[id] = font_extra_basename[res.psname or file.nameonly(res.filename)]
end
end
luatexbase.add_to_callback(