t.xkanjiskip = mult_table(metrics[j].xkanjiskip,sz)
t.zw = round(metrics[j].zw*sz)
t.zh = round(metrics[j].zh*sz)
+ t.size = sz
end
end
end
-
------------------------------------------------------------------------
--- 縦書き用字形への変換テーブル
+-- 追加のフォント情報
------------------------------------------------------------------------
-local font_vert_table = {} -- key: fontnumber
+font_extra_info = {}
+local font_extra_info = font_extra_info -- key: fontnumber
+local font_extra_basename = {} -- key: basename
+
+-- IVS and vertical metrics
+local prepare_fl_data
+local supply_vkern_table
+do
+ local fields = fontloader.fields
+ local function glyph_vmetric(glyph)
+ local flds = fields(glyph)
+ local vw, tsb, vk = nil, nil, nil
+ for _,i in ipairs(flds) do
+ if i=='vwidth' then vw = glyph.vwidth end
+ if i=='tsidebearing' then tsb = glyph.tsidebearing end
+ if i=='vkerns' then vk = glyph.vkerns end
+ end
+ return vw, tsb, vk
+ end
+
+ local sort = table.sort
+ local function add_fl_table(dest, tg, unitable, glyphmax, asc_des, units)
+ for i = 0, glyphmax-1 do
+ local gv = tg[i]
+ if gv then
+ if gv.altuni then
+ for _,at in pairs(gv.altuni) do
+ local bu, vsel = at.unicode, at.variant
+ if vsel then
+ if vsel>=0xE0100 then vsel = vsel - 0xE0100 end
+ dest = dest or {}; dest[bu] = dest[bu] or {}
+ local uniq_flag = true
+ for i,_ in pairs(dest[bu]) do
+ if i==vs then uniq_flag = false; break end
+ end
+ if uniq_flag then
+ dest[bu][vsel] = unitable[gv.name]
+ end
+ end
+ end
+ end
+ -- vertical metric
+ local vw, tsb, vk = glyph_vmetric(gv)
+ local gi = unitable[gv.name]
+ if vw and vw~=asc_des then
+ -- We do not use tsidebearing, since (1) fontloader does not read VORG table
+ -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields.
+ -- Hence, we assume that vertical origin == ascender
+ -- (see capsule_glyph_tate in ltj-setwidth.lua)
+ dest = dest or {}; dest[gi] = dest[gi] or {}
+ dest[gi].vwidth = vw/units
+ end
+ -- vertical kern
+ if vk then
+ dest = dest or {};
+ local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk
+ for _,v in pairs(vk) do
+ dest_vk[v.lookup] = dest_vk[v.lookup] or {}
+ dest_vk[v.lookup][gi] = dest_vk[v.lookup][gi] or {}
+ dest_vk[v.lookup][gi][unitable[v.char]] = v.off
+ end
+ end
+ end
+ end
+ return dest
+ end
+ prepare_fl_data = function (dest, id)
+ local fl = fontloader.open(id.filename)
+ local unicodes = id.resources.unicodes
+ if fl.glyphs then
+ dest = add_fl_table(dest, fl.glyphs, id.resources.unicodes, fl.glyphmax,
+ fl.ascent + fl.descent, fl.units_per_em)
+ end
+ if fl.subfonts then
+ for _,v in pairs(fl.subfonts) do
+ dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax,
+ fl.ascent + fl.descent, fl.units_per_em)
+ end
+ end
+ fontloader.close(fl)
+ return dest
+ end
+ -- supply vkern table
+ supply_vkern_table = function(id, bname)
+ local bx = font_extra_basename[bname].vkerns
+ local lookuphash = id.resources.lookuphash
+ local desc = id.shared.rawdata.descriptions
+ if bx then
+ for i,v in pairs(bx) do
+ lookuphash[i] = lookuphash[i] or v
+ for j,w in pairs(v) do
+ desc[j].kerns = desc[j].kerns or {}
+ desc[j].kerns[i] = w
+ end
+ end
+ end
+ end
+end
+
+-- 縦書き用字形への変換テーブル
+local prepare_vert_data
do
- local font_vert_basename = {} -- key: basename
local function add_feature_table(tname, src, dest)
for i,v in pairs(src) do
if type(v.slookups)=='table' then
local s = v.slookups[tname]
- if s and not dest[i] then
- dest[i] = s
+ if s then
+ dest = dest or {}
+ dest[i] = dest[i] or {}
+ dest[i].vert = dest[i].vert or s
end
end
end
+ return dest
end
-
- local function prepare_vert_data(n, id)
- -- test if already loaded
- if type(id)=='number' then -- sometimes id is an integer
- font_vert_table[n] = font_vert_table[id]; return
- elseif (not id) or font_vert_table[n] then return
- end
- local fname = id.filename
- local bname = file.basename(fname)
- if not fname then
- font_vert_table[n] = {}; return
- elseif font_vert_basename[bname] then
- font_vert_table[n] = font_vert_basename[bname]; return
- end
- local vtable = {}
+ prepare_vert_data = function (dest, id)
local a = id.resources.sequences
if a then
local s = id.shared.rawdata.descriptions
for i,v in pairs(a) do
if v.features.vert or v.features.vrt2 then
- add_feature_table(v.subtables[1], s, vtable)
+ dest= add_feature_table(v.subtables[1], s, dest)
end
end
end
- font_vert_basename[bname] = vtable
- font_vert_table[n] = vtable
+ return dest
end
-- 縦書き用字形への変換
function get_vert_glyph(n, chr)
- local fn = font_vert_table[n]
- return fn and fn[chr] or chr
+ local fn = font_extra_info[n]
+ return (fn and fn[chr] and fn[chr].vert) or chr
end
- luatexbase.add_to_callback('luatexja.define_font',
- function (res, name, size, id)
- prepare_vert_data(id, res)
- end,
- 'prepare_vert_data', 1)
+end
- local function a (n, dat) font_vert_table[n] = dat end
+--
+do
+ local cache_ver = 3
+ local checksum = file.checksum
+
+ local function prepare_extra_data_base(id)
+ if not id then return end
+ local bname = file.nameonly(id.filename or '')
+ if not font_extra_basename[bname] then
+ -- if the cache is present, read it
+ local newsum = checksum(id.filename) -- MD5 checksum of the fontfile
+ local v = "extra_" .. string.lower(file.nameonly(id.filename))
+ local dat = ltjb.load_cache(
+ v,
+ function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end
+ )
+ -- if the cache is not found or outdated, save the cache
+ if dat then
+ font_extra_basename[bname] = dat[1] or {}
+ else
+ local dat = nil
+ dat = prepare_vert_data(dat, id)
+ dat = prepare_fl_data(dat, id)
+ font_extra_basename[bname] = dat or {}
+ ltjb.save_cache( v,
+ {
+ chksum = checksum(id.filename),
+ version = cache_ver,
+ dat,
+ })
+ end
+ return bname
+ end
+ end
+ local function prepare_extra_data_font(id, res)
+ if type(res)=='table' and res.shared then
+ font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
+ end
+ end
+ luatexbase.add_to_callback(
+ 'luaotfload.patch_font',
+ function (tfmdata)
+ -- these function is executed one time per one fontfile
+ local bname = prepare_extra_data_base(tfmdata)
+ if bname then supply_vkern_table(tfmdata, bname) end
+ end,
+ 'ltj.prepare_extra_data', 1)
+ luatexbase.add_to_callback(
+ 'luatexja.define_font',
+ function (res, name, size, id)
+ prepare_extra_data_font(id, res)
+ end,
+ 'ltj.prepare_extra_data', 1)
+
+ local function a (n, dat) font_extra_info[n] = dat end
ltjr.vert_addfunc = a
+ local identifiers = fonts.hashes.identifiers
+ for i=1,font.nextid()-1 do
+ if identifiers[i] then
+ prepare_extra_data_base(identifiers[i])
+ prepare_extra_data_font(i,identifiers[i])
+ end
+ end
end
+
+------------------------------------------------------------------------
+-- calculate vadvance
+------------------------------------------------------------------------
+do
+ local function acc_feature(table_vadv, subtables, ft)
+ for char_num,v in pairs(ft.shared.rawdata.descriptions) do
+ if v.slookups then
+ for sn, sv in pairs(v.slookups) do
+ if subtables[sn] and type(sv)=='table' and sv[4]~=0 then
+ table_vadv[char_num]
+ = (table_vadv[char_num] or 0) + sv[4]
+ end
+ end
+ end
+ end
+ end
+
+luatexbase.add_to_callback(
+ "luatexja.define_jfont",
+ function (fmtable, fnum)
+ local vadv = {}; fmtable.v_advance = vadv
+ local ft = font_getfont(fnum)
+ local subtables = {}
+ if ft.specification then
+ for feat_name,v in pairs(ft.specification.features.normal) do
+ if v then
+ for _,i in pairs(ft.resources.sequences) do
+ if i.order[1]== feat_name and i.type == 'gpos_single' then
+ for _,st in pairs(i.subtables) do
+ subtables[st] = true
+ end
+ end
+ end
+ end
+ end
+ acc_feature(vadv, subtables, ft)
+ for i,v in pairs(vadv) do
+ vadv[i]=vadv[i]/ft.units_per_em*fmtable.size
+ end
+ end
+ return fmtable
+ end, 1, 'ltj.v_advance'
+)
+end
------------------------------------------------------------------------
-- MISC
------------------------------------------------------------------------
do
+ local get_dir_count = ltjd.get_dir_count
local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
local tex_set_attr = tex.setattribute
local font = font
setfield(g, 'subtype', 1)
set_attr(g, attr_icflag, ITALIC)
if is_ucs_in_japanese_char(p) then
- f = has_attr(p, attr_curjfnt)
+ f = has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
local j = font_metric_table[f]
setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic)
else
end
end
end
+