--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2015/05/03',
+ date = '2015/09/19',
description = 'Loader for Japanese fonts',
})
module('luatexja.jfont', package.seeall)
local defjfm_res
local jfm_dir, is_def_jfont, is_vert_enabled
+local function norm_val(a)
+ if (not a) or (a==0.) then
+ return nil
+ elseif a==true then
+ return 1
+ else
+ return a
+ end
+end
+
+
function define_jfm(t)
local real_char -- Does current character class have the 'real' character?
if t.dir~=jfm_dir then
v.chars = nil
end
v.kern = v.kern or {}; v.glue = v.glue or {}
- for j in pairs(v.glue) do
+ for j,x in pairs(v.glue) do
if v.kern[j] then defjfm_res= nil; return end
+ x.ratio, x[5] = (x.ratio or (x[5] and 0.5*(1+x[5]) or 0.5)), nil
+ x.priority, x[4] = (x.priority or x[4] or 0), nil
+ x.ksp_natural = norm_val(x.ksp_natural)
+ x.ksp_stretch = norm_val(x.ksp_stretch)
+ x.ksp_shrink = norm_val(x.ksp_shrink)
end
for j,x in pairs(v.kern) do
if type(x)=='number' then
- v.kern[j] = {x, 0}
+ v.kern[j] = {x, 0.5}
elseif type(x)=='table' then
- v.kern[j] = {x[1], x[2] or 0}
+ v.kern[j] = { x[1], ratio=x.ratio or (x[2] and 0.5*(1+x[2]) or 0.5) }
end
end
t.char_type[i] = v
return new
else return nil end
end
-
update_jfm_cache = function (j,sz)
if metrics[j].size_cache[sz] then return end
--local TEMP = node_new(id_kern)
for k,w in pairs(v.glue) do
local h = node_new(id_glue_spec)
v[k] = {
- true, h, (w[5] and w[5]/sz or 0),
- FROM_JFM + (w[4] and w[4]/sz or 0),
- ksp_natural = w.ksp_natural,
- ksp_stretch = w.ksp_stretch,
- ksp_shrink = w.ksp_shrink,
+ true, h,
+ ratio=w.ratio/sz,
+ priority=FROM_JFM + w.priority/sz,
+ ksp_natural = w.ksp_natural and w.ksp_natural/sz,
+ ksp_stretch = w.ksp_stretch and w.ksp_stretch/sz,
+ ksp_shrink = w.ksp_shrink and w.ksp_shrink/sz,
}
setfield(h, 'width', w[1])
setfield(h, 'stretch', w[2])
setfield(g, 'kern', w[1])
setfield(g, 'subtype', 1)
set_attr(g, attr_icflag, FROM_JFM)
- v[k] = {false, g, w[2]/sz}
+ v[k] = {false, g, ratio=w[2]/sz}
end
end
v.glue, v.kern = nil, nil
local sort = table.sort
local function add_fl_table(dest, glyphs, unitable, asc_des, units)
- local tg, glyphmin, glyphmax = glyphs.glyphs, glyphs.glyphmin or 0, glyphs.glyphmax
+ local tg, glyphmin, glyphmax = glyphs.glyphs, 0, glyphs.glyphmax
+ for _,v in pairs(fields(glyphs)) do
+ if v=='glyphmin' then glyphmin = glyphs.glyphmin; break end
+ end
for i = glyphmin, glyphmax-1 do
local gv = tg[i]
if gv then
local bx = font_extra_basename[bname].vkerns
local lookuphash = id.resources.lookuphash
local desc = id.shared.rawdata.descriptions
- if bx then
+ if bx and lookuphash then
for i,v in pairs(bx) do
lookuphash[i] = lookuphash[i] or v
for j,w in pairs(v) do