--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2015/09/19',
+ date = '2017/08/09',
description = 'Loader for Japanese fonts',
})
module('luatexja.jfont', package.seeall)
luatexja.load_module('rmlgbm'); local ltjr = luatexja.rmlgbm
luatexja.load_module('direction'); local ltjd = luatexja.direction
+local setfield = node.direct.setfield
+local getid = node.direct.getid
+local to_direct = node.direct.todirect
-local Dnode = node.direct or node
-
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-
-local nullfunc = function(n) return n end
-local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-
-local node_new = Dnode.new
-local node_free = Dnode.free
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
+local node_new = node.direct.new
+local node_free = node.direct.free
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
local round = tex.round
local font_getfont = font.getfont
local attr_curtfnt = luatexbase.attributes['ltj@curtfnt']
local id_glyph = node.id('glyph')
local id_kern = node.id('kern')
-local id_glue_spec = node.id('glue_spec')
-local id_glue = node.id('glue')
local cat_lp = luatexbase.catcodetables['latex-package']
local FROM_JFM = luatexja.icflag_table.FROM_JFM
-local tokenlib = luatexja.token
------------------------------------------------------------------------
-- LOADING JFM
------------------------------------------------------------------------
local jfm_file_name, jfm_var, jfm_ksp
local defjfm_res
-local jfm_dir, is_def_jfont, is_vert_enabled
+local jfm_dir, is_def_jfont, is_vert_enabled, auto_enable_vrt2
local function norm_val(a)
if (not a) or (a==0.) then
elseif type(t.zw)~='number' or type(t.zh)~='number' then
defjfm_res= nil; return
end
+ t.version = (type(t.version)=='number') and t.version or 1
t.char_type = {}; t.chars = {}
for i,v in pairs(t) do
if type(i) == 'number' then -- char_type
v.align = 'left' -- left
end
if type(v.width)~='number' then
- v.width = (jfm_dir=='tate') and 1.0
+ v.width = nil
end
if type(v.height)~='number' then
v.height = (jfm_dir=='tate') and 0.0
if type(v.down)~='number' then
v.down = 0.0
end
+ if t.version>=2 then
+ if v.end_stretch then defjfm_res= nil; return end
+ if v.end_shrink then defjfm_res= nil; return end
+ if v.end_adjust then
+ if type(v.end_adjust)~='table' then
+ v.end_adjust = nil
+ elseif #(v.end_adjust)==0 then
+ v.end_adjust = nil
+ else
+ table.sort(v.end_adjust)
+ end
+ end
+ else
+ v.end_adjust = nil
+ if v.end_stretch and v.end_stretch~=0.0 then
+ v.end_adjust = (v.end_adjust or {})
+ v.end_adjust[#(v.end_adjust)+1] = v.end_stretch
+ end
+ if v.end_shrink and v.end_ahrink~=0.0 then
+ v.end_adjust = (v.end_adjust or {})
+ v.end_adjust[#(v.end_adjust)+1] = -v.end_shrink
+ end
+ if v.end_adjust then v.end_adjust[#(v.end_adjust)+1] = 0.0 end
+ end
v.kern = v.kern or {}; v.glue = v.glue or {}
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
+ do
+ local xp
+ xp, x[4] = (x.priority or x[4]), nil
+ if type(xp)=='table' and t.version>=2 then
+ if type(xp[1])~='number' or xp[1]<-4 or xp[1]>3 then defjfm_res=nil end -- stretch
+ if type(xp[2])~='number' or xp[2]<-4 or xp[2]>3 then defjfm_res=nil end -- shrink
+ xp = (xp[1]+4)*8+(xp[2]+4)
+ elseif xp and type(xp)~='number' then
+ defjfm_res = nil
+ else
+ xp = (xp or 0)*9+36
+ if xp<0 or xp>=64 then defjfm_res=nil end
+ end
+ x.priority = xp
+ end
x.kanjiskip_natural = norm_val(x.kanjiskip_natural)
x.kanjiskip_stretch = norm_val(x.kanjiskip_stretch)
x.kanjiskip_shrink = norm_val(x.kanjiskip_shrink)
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
update_jfm_cache = function (j,sz)
if metrics[j].size_cache[sz] then return end
- --local TEMP = node_new(id_kern)
local t = {}
metrics[j].size_cache[sz] = t
t.chars = metrics[j].chars
((v.align=='right') and 1 or 0.5)
if type(i) == 'number' then -- char_type
for k,w in pairs(v.glue) do
- local h = node_new(id_glue_spec)
v[k] = {
- true, h,
- ratio=w.ratio/sz,
+ nil,
+ ratio=w.ratio/sz,
priority=FROM_JFM + w.priority/sz,
+ width = w[1], stretch = w[2], shrink = w[3],
kanjiskip_natural = w.kanjiskip_natural and w.kanjiskip_natural/sz,
kanjiskip_stretch = w.kanjiskip_stretch and w.kanjiskip_stretch/sz,
kanjiskip_shrink = w.kanjiskip_shrink and w.kanjiskip_shrink/sz,
}
- setfield(h, 'width', w[1])
- setfield(h, 'stretch', w[2])
- setfield(h, 'shrink', w[3])
- setfield(h, 'stretch_order', 0)
- setfield(h, 'shrink_order', 0)
end
for k,w in pairs(v.kern) do
- local g = node_new(id_kern)
+ local g = node_new(id_kern, 1)
setfield(g, 'kern', w[1])
- setfield(g, 'subtype', 1)
set_attr(g, attr_icflag, FROM_JFM)
- v[k] = {false, g, ratio=w[2]/sz}
+ v[k] = {g, ratio=w[2]/sz}
end
end
v.glue, v.kern = nil, nil
t.zw = round(metrics[j].zw*sz)
t.zh = round(metrics[j].zh*sz)
t.size = sz
- --node_free(TEMP)
end
end
cstemp = csname:sub( (utf8.byte(csname,1,1) == tex.escapechar) and 2 or 1, -1)
cstemp = cstemp:sub(1, ((cstemp:sub(-1,-1)==' ') and (cstemp:len()>=2)) and -2 or -1)
global_flag = g and '\\global' or ''
- tex.sprint(cat_lp, '\\expandafter\\font\\csname ',
+ tex.sprint(cat_lp, '\\expandafter\\font\\csname ',
(cstemp==' ') and '\\space' or cstemp, '\\endcsname')
end
-- EXT
local identifiers = fonts.hashes.identifiers
+ local provides_feature = luaotfload.aux.provides_feature
function jfontdefY()
local j = load_jfont_metric(jfm_dir)
local fn = font.id(cstemp)
"bad JFM `" .. jfm_file_name .. "'",
'The JFM file you specified is not valid JFM file.\n'..
'So defining Japanese font is cancelled.')
- tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ',
+ tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ',
(cstemp==' ') and '\\space' or cstemp,
'\\endcsname=\\relax')
return
end
+ if not f then return end
update_jfm_cache(j, f.size)
local ad = identifiers[fn].parameters
local sz = metrics[j].size_cache[f.size]
local fmtable = { jfm = j, size = f.size, var = jfm_var,
- with_kanjiskip = jfm_ksp,
+ with_kanjiskip = jfm_ksp,
zw = sz.zw, zh = sz.zh,
ascent = ad.ascender,
descent = ad.descender,
chars_cbcache = {},
vert_activated = is_vert_enabled,
}
+ if auto_enable_vrt2 then
+ local t = identifiers[fn]
+ local lang, scr = t.properties.language, t.properties.script
+ local vrt2_exist = provides_feature(
+ fn, t.properties.script, t.properties.language, 'vrt2'
+ )
+ t.shared.features[vrt2_exist and 'vrt2' or 'vert'] = true
+ end
fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn)
font_metric_table[fn]=fmtable
-- extract jfm_file_name and jfm_var
-- normalize position of 'jfm=' and 'jfmvar=' keys
local function extract_metric(name)
+ local is_braced = name:match('^{(.*)}$')
+ name= is_braced or name
jfm_file_name = ''; jfm_var = ''; jfm_ksp = true
local tmp, index = name:sub(1, 5), 1
if tmp == 'file:' or tmp == 'name:' or tmp == 'psft:' then
end
if jfm_dir == 'tate' then
is_vert_enabled = (not name:match('[:;]%-vert')) and (not name:match('[:;]%-vrt2'))
- if not name:match('vert') and not name:match('vrt2') then
- name = name .. ';vert;vrt2'
- end
+ auto_enable_vrt2 = (not name:match('vert') and not name:match('vrt2'))
else
- is_vert_enabled = nil
+ is_vert_enabled, auto_enable_vrt2 = nil, nil
end
- return name
+ return is_braced and ('{' .. name .. '}') or name
end
-- define_font callback
- local otfl_fdr = fonts.definers.read
+ local otfl_fdr
local ltjr_font_callback = ltjr.font_callback
function luatexja.font_callback(name, size, id)
local new_name = is_def_jfont and extract_metric(name) or name
return res
end
luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end)
+ otfl_fdr= luatexbase.remove_from_callback('define_font', 'luaotfload.define_font')
luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
end
kfam_list[fam]=true
end
function search_kfam(fam, use_fd)
- if kfam_list[fam] then
+ if kfam_list[fam] then
tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
- elseif Nkfam_list[fam] then
+ elseif Nkfam_list[fam] then
tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
elseif use_fd then
for i,_ in pairs(kyenc_list) do
tex.sprint(cat_lp, s)
end
function search_ffam_fd(fam)
- if Nffam_list[fam] then
+ if Nffam_list[fam] then
tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
else
for i,_ in pairs(fenc_list) do
for k,w in pairs(v) do
if type(k)=='number' then
--if w[1] then gs = gs + 1 else ke = ke + 1 end
- node_free(w[2])
+ if w[1] then node_free(w[1]) end
end
end
end
n.size_cache[i]=nil
end
end
- --print('glue spec: ', gs, 'kern: ', ke)
end
end
local font_extra_info = font_extra_info -- key: fontnumber
local font_extra_basename = {} -- key: basename
--- IVS and vertical metrics
+local list_rotate_glyphs
+do
+ -- output of function_utr50.lua
+ local function rotate_in_utr50(i)
+ -- UTR#50 revision 17; 2016-10-20
+ if (0x0000<=i)and(i<0x00A7) then return true end
+ if (0x00A8<=i)and(i<0x00A9) then return true end
+ if (0x00AA<=i)and(i<0x00AE) then return true end
+ if (0x00AF<=i)and(i<0x00B1) then return true end
+ if (0x00B2<=i)and(i<0x00BC) then return true end
+ if (0x00BF<=i)and(i<0x00D7) then return true end
+ if (0x00D8<=i)and(i<0x00F7) then return true end
+ if (0x00F8<=i)and(i<0x02EA) then return true end
+ if (0x02EC<=i)and(i<0x0860) then return true end
+ if (0x08A0<=i)and(i<0x1100) then return true end
+ if (0x1200<=i)and(i<0x1401) then return true end
+ if (0x1680<=i)and(i<0x18B0) then return true end
+ if (0x1900<=i)and(i<0x1C90) then return true end
+ if (0x1CC0<=i)and(i<0x2016) then return true end
+ if (0x2017<=i)and(i<0x2020) then return true end
+ if (0x2022<=i)and(i<0x2030) then return true end
+ if (0x2032<=i)and(i<0x203B) then return true end
+ if (0x203D<=i)and(i<0x2042) then return true end
+ if (0x2043<=i)and(i<0x2047) then return true end
+ if (0x204A<=i)and(i<0x2051) then return true end
+ if (0x2052<=i)and(i<0x2065) then return true end
+ if (0x2066<=i)and(i<0x20DD) then return true end
+ if (0x20E1<=i)and(i<0x20E2) then return true end
+ if (0x20E5<=i)and(i<0x2100) then return true end
+ if (0x2102<=i)and(i<0x2103) then return true end
+ if (0x210A<=i)and(i<0x210F) then return true end
+ if (0x2110<=i)and(i<0x2113) then return true end
+ if (0x2115<=i)and(i<0x2116) then return true end
+ if (0x2118<=i)and(i<0x211E) then return true end
+ if (0x2124<=i)and(i<0x2125) then return true end
+ if (0x2126<=i)and(i<0x2127) then return true end
+ if (0x2128<=i)and(i<0x2129) then return true end
+ if (0x212A<=i)and(i<0x212E) then return true end
+ if (0x212F<=i)and(i<0x2135) then return true end
+ if (0x2140<=i)and(i<0x2145) then return true end
+ if (0x214B<=i)and(i<0x214C) then return true end
+ if (0x214E<=i)and(i<0x214F) then return true end
+ if (0x218A<=i)and(i<0x218C) then return true end
+ if (0x2190<=i)and(i<0x221E) then return true end
+ if (0x221F<=i)and(i<0x2234) then return true end
+ if (0x2236<=i)and(i<0x2300) then return true end
+ if (0x2308<=i)and(i<0x230C) then return true end
+ if (0x2320<=i)and(i<0x2324) then return true end
+ if (0x2329<=i)and(i<0x232B) then return true end
+ if (0x232C<=i)and(i<0x237D) then return true end
+ if (0x239B<=i)and(i<0x23BE) then return true end
+ if (0x23CE<=i)and(i<0x23CF) then return true end
+ if (0x23D0<=i)and(i<0x23D1) then return true end
+ if (0x23DC<=i)and(i<0x23E2) then return true end
+ if (0x2423<=i)and(i<0x2424) then return true end
+ if (0x2500<=i)and(i<0x25A0) then return true end
+ if (0x261A<=i)and(i<0x2620) then return true end
+ if (0x2768<=i)and(i<0x2776) then return true end
+ if (0x2794<=i)and(i<0x2B12) then return true end
+ if (0x2B30<=i)and(i<0x2B50) then return true end
+ if (0x2B5A<=i)and(i<0x2BB8) then return true end
+ if (0x2BEC<=i)and(i<0x2BF0) then return true end
+ if (0x2C00<=i)and(i<0x2E80) then return true end
+ if (0x3008<=i)and(i<0x3012) then return true end
+ if (0x3014<=i)and(i<0x3020) then return true end
+ if (0x3030<=i)and(i<0x3031) then return true end
+ if (0x30A0<=i)and(i<0x30A1) then return true end
+ if (0x30FC<=i)and(i<0x30FD) then return true end
+ if (0xA4D0<=i)and(i<0xA960) then return true end
+ if (0xA980<=i)and(i<0xAC00) then return true end
+ if (0xD800<=i)and(i<0xE000) then return true end
+ if (0xFB00<=i)and(i<0xFE10) then return true end
+ if (0xFE20<=i)and(i<0xFE30) then return true end
+ if (0xFE49<=i)and(i<0xFE50) then return true end
+ if (0xFE58<=i)and(i<0xFE5F) then return true end
+ if (0xFE63<=i)and(i<0xFE67) then return true end
+ if (0xFE70<=i)and(i<0xFF01) then return true end
+ if (0xFF08<=i)and(i<0xFF0A) then return true end
+ if (0xFF0D<=i)and(i<0xFF0E) then return true end
+ if (0xFF1A<=i)and(i<0xFF1F) then return true end
+ if (0xFF3B<=i)and(i<0xFF3C) then return true end
+ if (0xFF3D<=i)and(i<0xFF3E) then return true end
+ if (0xFF3F<=i)and(i<0xFF40) then return true end
+ if (0xFF5B<=i)and(i<0xFFE0) then return true end
+ if (0xFFE3<=i)and(i<0xFFE4) then return true end
+ if (0xFFE8<=i)and(i<0xFFF0) then return true end
+ if (0xFFF9<=i)and(i<0xFFFC) then return true end
+ if (0xFFFE<=i)and(i<0x10200) then return true end
+ if (0x10280<=i)and(i<0x103E0) then return true end
+ if (0x10400<=i)and(i<0x10570) then return true end
+ if (0x10600<=i)and(i<0x10780) then return true end
+ if (0x10800<=i)and(i<0x108B0) then return true end
+ if (0x108E0<=i)and(i<0x10940) then return true end
+ if (0x109A0<=i)and(i<0x10AA0) then return true end
+ if (0x10AC0<=i)and(i<0x10BB0) then return true end
+ if (0x10C00<=i)and(i<0x10C50) then return true end
+ if (0x10C80<=i)and(i<0x10D00) then return true end
+ if (0x10E60<=i)and(i<0x10E80) then return true end
+ if (0x11000<=i)and(i<0x11250) then return true end
+ if (0x11280<=i)and(i<0x11380) then return true end
+ if (0x11400<=i)and(i<0x114E0) then return true end
+ if (0x11600<=i)and(i<0x116D0) then return true end
+ if (0x11700<=i)and(i<0x11740) then return true end
+ if (0x118A0<=i)and(i<0x11900) then return true end
+ if (0x11AC0<=i)and(i<0x11B00) then return true end
+ if (0x11C00<=i)and(i<0x11CC0) then return true end
+ if (0x12000<=i)and(i<0x12550) then return true end
+ if (0x16800<=i)and(i<0x16A70) then return true end
+ if (0x16AD0<=i)and(i<0x16B90) then return true end
+ if (0x16F00<=i)and(i<0x16FA0) then return true end
+ if (0x1BC00<=i)and(i<0x1BCB0) then return true end
+ if (0x1D200<=i)and(i<0x1D250) then return true end
+ if (0x1D400<=i)and(i<0x1D800) then return true end
+ if (0x1E000<=i)and(i<0x1E030) then return true end
+ if (0x1E800<=i)and(i<0x1E8E0) then return true end
+ if (0x1E900<=i)and(i<0x1E960) then return true end
+ if (0x1EE00<=i)and(i<0x1EF00) then return true end
+ if (0x1F800<=i)and(i<0x1F900) then return true end
+ if (0xE0000<=i)and(i<0xE0080) then return true end
+ if (0xE0100<=i)and(i<0xE01F0) then return true end
+ end
+ list_rotate_glyphs = function (dest, id)
+ if id.specification and id.resources then
+ local rot = {}
+ for i,_ in pairs(id.characters) do
+ if rotate_in_utr50(i) then rot[i] = true end
+ end
+ if id.resources.sequences then
+ for _,i in pairs(id.resources.sequences) do
+ if i.order[1]== 'vert' and i.type == 'gsub_single' and i.steps then
+ for _,j in pairs(i.steps) do
+ if type(j)=='table' then
+ if type(j,coverage)=='table' then
+ for i,_ in pairs(j.coverage) do rot[i]=nil end
+ end
+ end
+ end
+ end
+ end; end
+ -- コードポイントが共有されているグリフについて
+ if id.resources.duplicates then
+ for i,v in pairs(id.resources.duplicates) do
+ local f = rot[i]
+ for j,_ in pairs(v) do f = f and rot[j] end
+ rot[i]=f
+ for j,_ in pairs(v) do rot[j] = f end
+ end; end
+
+ for i,_ in pairs(rot) do
+ dest = dest or {}
+ dest[i] = dest[i] or {}
+ dest[i].rotation = true
+ end
+ end
+ return dest
+ end
+end
+
+-- vertical metrics
local prepare_fl_data
local supply_vkern_table
do
end
local sort = table.sort
- local function add_fl_table(dest, glyphs, unitable, asc_des, units)
- 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 function add_fl_table(dest, glyphs, unitable, asc_des, units, id)
+ local glyphmin, glyphmax = glyphs.glyphmin, glyphs.glyphmax
+ if glyphmax < 0 then return dest end
+ local tg = glyphs.glyphs
+ for i = glyphmin, glyphmax do
local gv = tg[i]
if gv then
if gv.altuni then
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 dest and dest[bu] then
+ for i,_ in pairs(dest[bu]) do
+ if i==vsel then uniq_flag = false; break end
+ end
+ end
if uniq_flag then
+ dest = dest or {}; dest[bu] = dest[bu] or {}
dest[bu][vsel] = unitable[gv.name]
end
end
return dest
end
prepare_fl_data = function (dest, id)
- local fl = fontloader.open(id.filename)
- local unicodes = id.resources.unicodes
+ local t = fontloader.info(id.filename)
+ local fl
+ if t.filename then
+ fl = fontloader.open(id.filename)
+ else
+ fl = fontloader.open(id.filename, id.fullname)
+ end
+ local ind_to_uni, unicodes = {}, {}
+ for i,v in pairs(id.characters) do
+ ind_to_uni[v.index] = i
+ end
if fl.glyphs then
+ local tg, glyphmin, glyphmax = fl.glyphs, fl.glyphmin, fl.glyphmax
+ if 0 <= glyphmax then
+ for i = glyphmin, glyphmax do
+ if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end
+ end
+ end
dest = add_fl_table(dest, fl, unicodes,
- fl.ascent + fl.descent, fl.units_per_em)
+ fl.ascent + fl.descent, fl.units_per_em, id)
end
if fl.subfonts then
for _,v in pairs(fl.subfonts) do
- dest = add_fl_table(dest, v, unicodes,
- fl.ascent + fl.descent, fl.units_per_em)
+ local tg, glyphmin, glyphmax = v.glyphs, v.glyphmin, v.glyphmax
+ if 0 <= glyphmax then
+ for i = glyphmin, glyphmax do
+ if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end
+ end
+ end
+ end
+ for _,v in pairs(fl.subfonts) do
+ dest = add_fl_table(dest, v, unicodes,
+ fl.ascent + fl.descent, fl.units_per_em, id)
end
- end
- fontloader.close(fl); collectgarbage("collect")
- return dest
+ end
+ if dest then dest.unicodes = unicodes end
+ fontloader.close(fl); collectgarbage("collect")
+ return dest
end
-- supply vkern table
supply_vkern_table = function(id, bname)
--
do
- local cache_ver = 6
+ local cache_ver = 14
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 id) or (not id.filename) then return end
+ local bname = id.psname or file.nameonly(id.filename)
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 v = "extra_" .. string.lower(bname)
local dat = ltjb.load_cache(
v,
function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end
else
local dat = nil
dat = prepare_fl_data(dat, id)
+ dat = list_rotate_glyphs(dat, id)
font_extra_basename[bname] = dat or {}
ltjb.save_cache( v,
{
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)]
+ 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(
local subtables = {}
if ft.specification then
for feat_name,v in pairs(ft.specification.features.normal) do
- if v==true then
+ if v==true and ft.resources then
for _,i in pairs(ft.resources.sequences) do
- if i.order[1]== feat_name and i.type == 'gpos_single' then
+ if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then
for _,st in pairs(i.subtables) do
subtables[st] = true
end
end
end
return fmtable
- end, 1, 'ltj.v_advance'
+ end, 'ltj.v_advance', 1
+)
+end
+
+------------------------------------------------------------------------
+-- make table of vertical glyphs which does not covered by vert feature
+-- nor UTR#50
+------------------------------------------------------------------------
+do
+------------------------------------------------------------------------
+-- VERT VARIANT TABLE
+------------------------------------------------------------------------
+ local vert_form_table = {
+ [0x3001]=0xFE11, [0x3002]=0xFE12, [0x3016]=0xFE17, [0x3017]=0xFE18,
+ [0x2026]=0xFE19,
+ [0x2025]=0xFE30, [0x2014]=0xFE31, [0x2013]=0xFE32, [0xFF3F]=0xFE33,
+ [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38,
+ [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C,
+ [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40,
+ [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44,
+ [0xFF3B]=0xFE47, [0xFF3D]=0xFE48,
+ }
+ local function add_vform(coverage, vform, ft)
+ if type(coverage)~='table' then return end
+ for i,v in pairs(vert_form_table) do
+ if (not coverage[i]) and ft.characters[v] then
+ vform[i] = v
+ end
+ end
+ end
+
+luatexbase.add_to_callback(
+ "luatexja.define_jfont",
+ function (fmtable, fnum)
+ local vform = {}; fmtable.vform = vform
+ local ft = font_getfont(fnum)
+ if ft.specification and ft.resources then
+ for _,i in pairs(ft.resources.sequences) do
+ if i.order[1]== 'vert' and i.type == 'gsub_single' and i.steps then
+ for _,j in pairs(i.steps) do
+ if type(j)=='table' then add_vform(j.coverage,vform, ft) end
+ end
+ end
+ end
+ end
+ return fmtable
+ end, 'ltj.get_vert_form', 1
)
end
luatexbase.add_to_callback(
'luaotfload.patch_font',
function (tfmdata)
- if tfmdata.cidinfo then
- local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+ local cidinfo = tfmdata.cidinfo or tfmdata.resources.cidinfo
+ if cidinfo and cidinfo.registry and cidinfo.ordering then
+ local rd = ltjr_prepare_cid_font(cidinfo.registry, cidinfo.ordering)
if rd then
local ru, rc = rd.resources.unicodes, rd.characters
for i,v in pairs(tfmdata.characters) do
return tfmdata
end,
- 'ltj.supply_tounicode', 1)
+ 'ltj.supply_tounicode', 1)
end
-- MISC
------------------------------------------------------------------------
do
- local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
- local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
+ local getfont = node.direct.getfont
+ local getchar = node.direct.getchar
local get_dir_count = ltjd.get_dir_count
local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
local ensure_tex_attr = ltjb.ensure_tex_attr
- local node_write = Dnode.write
+ local node_write = node.direct.write
local font = font
- local ITALIC = luatexja.icflag_table.ITALIC
+ local new_ic_kern
+ if status.luatex_version>=89 then
+ new_ic_kern = function(g) return node_new(id_kern,3) end
+ else
+ local ITALIC = luatexja.icflag_table.ITALIC
+ new_ic_kern = function()
+ local g = node_new(id_kern, 1)
+ set_attr(g, attr_icflag, ITALIC)
+ return g
+ end
+ end
-- EXT: italic correction
function append_italic()
local p = to_direct(tex.nest[tex.nest.ptr].tail)
local j = font_metric_table[
has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
]
- local g = node_new(id_kern)
- setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
+ local g = new_ic_kern()
setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic)
node_write(g); ensure_tex_attr(attr_icflag, 0)
else
local f = getfont(p)
local h = font_getfont(f) or font.fonts[f]
if h then
- local g = node_new(id_kern)
- setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
- setfield(g, 'kern', h.characters[getchar(p)].italic)
- node_write(g); ensure_tex_attr(attr_icflag, 0)
+ local g = new_ic_kern()
+ if h.characters[getchar(p)] and h.characters[getchar(p)].italic then
+ setfield(g, 'kern', h.characters[getchar(p)].italic)
+ node_write(g); ensure_tex_attr(attr_icflag, 0)
+ end
end
end
end
end
end
-------------------------------------------------------------------------
--- VERT VARIANT TABLE
-------------------------------------------------------------------------
-vert_form_table = {
- [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30,
- [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38,
- [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C,
- [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40,
- [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44,
- [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33,
-}
-setmetatable(vert_form_table, {__index=function(t,k) return k end});
-
OSDN Git Service
