end
-
------------------------------------------------------------------------
--- 縦書き用字形への変換テーブル
+-- 追加のフォント情報
------------------------------------------------------------------------
-local font_vert_table = {} -- key: fontnumber
+font_extra_info = {}
+local font_extra_info = font_extra_info -- key: fontnumber
+
+-- IVS and vertical metrics
+local prepare_fl_data
+do
+ local ivs -- temp table
+ local sort = table.sort
+ local function add_fl_table(dest, tg, unitable, glyphmax)
+ for i = 0, glyphmax-1 do
+ if tg[i] then
+ local gv = tg[i]
+ 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
+ end
+ end
+ return dest
+ end
+ prepare_fl_data = function (dest, id, fname)
+ local fl = fontloader.open(fname)
+ local unicodes = id.resources.unicodes
+ if fl.glyphs then
+ dest = add_fl_table(dest, fl.glyphs, id.resources.unicodes, fl.glyphmax)
+ end
+ if fl.subfonts then
+ for _,v in pairs(fl.subfonts) do
+ dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax)
+ end
+ end
+ fontloader.close(fl)
+ return dest
+ 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
+ if not dest then dest = {} end
+ if not dest[i] then dest[i] = {} end
+ 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
- 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 then
- add_feature_table(v.subtables[1], s, vtable)
+ if v.features.vert or v.features.vrt2 then
+ 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
+end
+
+--
+do
+ local font_extra_basename = {} -- key: basename
+ local cache_ver = 2
+ local checksum = file.checksum
+
+ local function prepare_extra_data(n, id)
+ -- test if already loaded
+ if type(id)=='number' then -- sometimes id is an integer
+ return
+ elseif (not id) or font_extra_info[n] then return
+ end
+ local fname = id.filename
+ local bname = file.basename(fname)
+ if not fname then
+ font_extra_info[n] = {}; return
+ elseif font_extra_basename[bname] then
+ font_extra_info[n] = font_extra_basename[bname]; return
+ end
+ -- if the cache is present, read it
+ local newsum = checksum(fname) -- MD5 checksum of the fontfile
+ local v = "extra_" .. string.lower(file.nameonly(fname))
+ 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, fname)
+ font_extra_basename[bname] = dat or {}
+ ltjb.save_cache( v,
+ {
+ chksum = checksum(fname),
+ version = cache_ver,
+ dat,
+ })
+ end
+ font_extra_info[n] = font_extra_basename[bname]
end
luatexbase.add_to_callback('luatexja.define_font',
function (res, name, size, id)
- prepare_vert_data(id, res)
+ prepare_extra_data(id, res)
end,
- 'prepare_vert_data', 1)
+ 'ltj.prepare_extra_data', 1)
- local function a (n, dat) font_vert_table[n] = dat end
+ 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(i, identifiers[i]) end
+ end
end
------------------------------------------------------------------------
end
end
end
+
local node_write = Dnode.write
local node_traverse_id = Dnode.traverse_id
-local identifiers = fonts.hashes.identifiers
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_curtfnt = luatexbase.attributes['ltj@curtfnt']
local attr_tablshift = luatexbase.attributes['ltj@tablshift']
local attr_tkblshift = luatexbase.attributes['ltj@tkblshift']
local lang_ja = token.create('ltj@@japanese')[2]
+local identifiers = fonts.hashes.identifiers
local ltjf_font_metric_table = ltjf.font_metric_table
+local ltjf_font_extra_info = ltjf.font_extra_info
local ltjf_find_char_class = ltjf.find_char_class
local ltjr_cidfont_data = ltjr.cidfont_data
local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
cid_set_char_class, "ltj.otf.find_char_class", 1)
-------------------- IVS
-local font_ivs_table = {} -- key: fontnumber
local enable_ivs
do
local is_ivs_enabled = false
- local ivs -- temp table
- local sort = table.sort
- local uniq_flag
- local function add_ivs_table(tg, unitable, glyphmax)
- for i = 0, glyphmax-1 do
- if tg[i] then
- local gv = tg[i]
- 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
- if not ivs[bu] then ivs[bu] = {} end
- uniq_flag = true
- for i,_ in pairs(ivs[bu]) do
- if i==vs then uniq_flag = false; break end
- end
- if uniq_flag then
- ivs[bu][vsel] = unitable[gv.name]
- end
- end
- end
- end
- end
- end
- end
- local function make_ivs_table(id, fname)
- ivs = {}
- local fl = fontloader.open(fname)
- local unicodes = id.resources.unicodes
- if fl.glyphs then
- add_ivs_table(fl.glyphs, id.resources.unicodes, fl.glyphmax)
- end
- if fl.subfonts then
- for _,v in pairs(fl.subfonts) do
- add_ivs_table(v.glyphs, id.resources.unicodes, v.glyphmax)
- end
- end
- fontloader.close(fl)
- return ivs
- end
-
--- loading and saving
- local font_ivs_basename = {} -- key: basename
- local cache_ver = 4
- local checksum = file.checksum
-
- local function prepare_ivs_data(n, id)
- -- test if already loaded
- if type(id)=='number' then -- sometimes id is an integer
- font_ivs_table[n] = font_ivs_table[id]; return
- elseif not id then return
- end
- local fname = id.filename
- local bname = file.basename(fname)
- if not fname then
- font_ivs_table[n] = {}; return
- elseif font_ivs_basename[bname] then
- font_ivs_table[n] = font_ivs_basename[bname]; return
- end
-
- -- if the cache is present, read it
- local newsum = checksum(fname) -- MD5 checksum of the fontfile
- local v = "ivs_" .. string.lower(file.nameonly(fname))
- 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_ivs_basename[bname] = dat[1] or {}
- else
- dat = make_ivs_table(id, fname)
- font_ivs_basename[bname] = dat or {}
- ltjb.save_cache( v,
- {
- chksum = checksum(fname),
- version = cache_ver,
- dat,
- })
- end
- font_ivs_table[n] = font_ivs_basename[bname]
- end
-
-- 組版時
local function ivs_jglyph(char, bp, pf, uid)
local p = node_new(id_whatsit,sid_user)
if (qc>=0xFE00 and qc<=0xFE0F) or (qc>=0xE0100 and qc<0xE01F0) then
-- q is a variation selector
if qc>=0xE0100 then qc = qc - 0xE0100 end
- local pt = font_ivs_table[pf]
+ local pt = ltjf_font_extra_info[pf]
pt = pt and pt[getchar(p)]; pt = pt and pt[qc]
head, r = node_remove(head,q)
node_free(q)
do_ivs_repr, 'do_ivs',
luatexbase.priority_in_callback('pre_linebreak_filter',
'ltj.pre_linebreak_filter_pre')+1)
- local ivs_callback = function (name, size, id)
- return font_callback(
- name, size, id,
- function (name, size, id) return luatexja.font_callback(name, size, id) end
- )
- end
- luatexbase.add_to_callback('luatexja.define_font',
- function (res, name, size, id)
- prepare_ivs_data(id, res)
- end,
- 'prepare_ivs_data', 1)
- for i=1,font.nextid()-1 do
- if identifiers[i] then prepare_ivs_data(i, identifiers[i]) end
- end
is_ivs_enabled = true
end
end
luatexja.otf = {
append_jglyph = append_jglyph,
enable_ivs = enable_ivs, -- 隠し機能: IVS
- font_ivs_table = font_ivs_table,
cid = cid,
}
OSDN Git Service
