--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2015/05/03',
+ date = '2015/09/19',
description = 'Loader for Japanese fonts',
})
module('luatexja.jfont', package.seeall)
luatexbase.create_callback("luatexja.load_jfm", "data", function (ft, jn) return ft end)
-local jfm_file_name, jfm_var
+local jfm_file_name, jfm_var, jfm_ksp
local defjfm_res
-local jfm_dir, is_def_jfont
+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 type(i) == 'number' then -- char_type
if not v.chars then
if i ~= 0 then defjfm_res= nil; return end
- real_char = true
else
- real_char = false
for j,w in pairs(v.chars) do
if type(w) == 'number' and w~=-1 then
- real_char = true;
elseif type(w) == 'string' and utf.len(w)==1 then
- real_char = true; w = utf.byte(w)
+ w = utf.byte(w)
elseif type(w) == 'string' and utf.len(w)==2 and utf.sub(w,2) == '*' then
- real_char = true; w = utf.byte(utf.sub(w,1,1))
+ w = utf.byte(utf.sub(w,1,1))
end
if not t.chars[w] then
t.chars[w] = i
defjfm_res= nil; return
end
end
- if type(v.align)~='string' then
- v.align = 'left' -- left
- end
- if real_char then
- if type(v.width)~='number' and v.width~='prop' then
- defjfm_res= nil; return
- else
- if v.width=='prop' and jfm_dir=='tate' then
- v.width = 1.0
- end
- if type(v.height)~='number' then
- v.height = 0.0
- end
- if type(v.depth)~='number' then
- v.depth = 0.0
- end
- if type(v.italic)~='number' then
- v.italic = 0.0
- end
- if type(v.left)~='number' then
- v.left = 0.0
- end
- if type(v.down)~='number' then
- v.down = 0.0
- end
- end
- end
v.chars = nil
end
+ if type(v.align)~='string' then
+ v.align = 'left' -- left
+ end
+ if type(v.width)~='number' then
+ v.width = (jfm_dir=='tate') and 1.0
+ end
+ if type(v.height)~='number' then
+ v.height = (jfm_dir=='tate') and 0.0
+ end
+ if type(v.depth)~='number' then
+ v.depth = (jfm_dir=='tate') and 0.0
+ end
+ if type(v.italic)~='number' then
+ v.italic = 0.0
+ end
+ if type(v.left)~='number' then
+ v.left = 0.0
+ end
+ if type(v.down)~='number' then
+ v.down = 0.0
+ 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.kanjiskip_natural = norm_val(x.kanjiskip_natural)
+ x.kanjiskip_stretch = norm_val(x.kanjiskip_stretch)
+ x.kanjiskip_shrink = norm_val(x.kanjiskip_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)
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, (w[5] and w[5]/sz or 0), FROM_JFM + (w[4] and w[4]/sz or 0)}
+ v[k] = {
+ true, h,
+ ratio=w.ratio/sz,
+ priority=FROM_JFM + w.priority/sz,
+ 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(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 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,
zw = sz.zw, zh = sz.zh,
ascent = ad.ascender,
descent = ad.descender,
chars = sz.chars, char_type = sz.char_type,
kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip,
chars_cbcache = {},
+ vert_activated = is_vert_enabled,
}
fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn)
-- extract jfm_file_name and jfm_var
-- normalize position of 'jfm=' and 'jfmvar=' keys
local function extract_metric(name)
- jfm_file_name = ''; jfm_var = ''
+ 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
index = 6
name = name .. 'jfmvar=' .. jfm_var
end
end
+ for x in string.gmatch (name, "[:;]([+%%-]?)ltjks") do
+ jfm_ksp = not (x=='-')
+ 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
+ else
+ is_vert_enabled = nil
end
- return name
+ return is_braced and ('{' .. name .. '}') or name
end
-- define_font callback
function luatexja.font_callback(name, size, id)
local new_name = is_def_jfont and extract_metric(name) or name
is_def_jfont = false
+ --local res = otfl_fdr(new_name, size, id)
local res = ltjr_font_callback(new_name, size, id, otfl_fdr)
luatexbase.call_callback('luatexja.define_font', res, new_name, size, id)
-- this callback processes variation selector, so we execute it always
------------------------------------------------------------------------
do
-- these function are called from ltj-latex.sty
- local kyenc_list, ktenc_list = {}, {}
+ local fenc_list, kyenc_list, ktenc_list = {}, {}, {}
+ function add_fenc_list(enc) fenc_list[enc] = 'true ' end
function add_kyenc_list(enc) kyenc_list[enc] = 'true ' end
function add_ktenc_list(enc) ktenc_list[enc] = 'true ' end
function is_kyenc(enc)
end
local kfam_list, Nkfam_list = {}, {}
- function add_kfam_list(enc, fam)
- if not kfam_list[enc] then kfam_list[enc] = {} end
- kfam_list[enc][fam] = 'true '
- end
- function add_Nkfam_list(enc, fam)
- if not Nkfam_list[enc] then Nkfam_list[enc] = {} end
- Nkfam_list[enc][fam] = 'true '
+ function add_kfam(fam)
+ kfam_list[fam]=true
+ end
+ function search_kfam(fam, use_fd)
+ if kfam_list[fam] then
+ tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+ elseif Nkfam_list[fam] then
+ tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+ elseif use_fd then
+ for i,_ in pairs(kyenc_list) do
+ if kpse.find_file(string.lower(i)..fam..'.fd') then
+ tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+ end
+ end
+ for i,_ in pairs(ktenc_list) do
+ if kpse.find_file(string.lower(i)..fam..'.fd') then
+ tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+ end
+ end
+ Nkfam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+ else
+ tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+ end
end
- function is_kfam(enc, fam)
- tex.sprint(cat_lp, '\\let\\ifin@\\if'
- .. (kfam_list[enc] and kfam_list[enc][fam] or 'false ')) end
- function is_Nkfam(enc, fam)
- tex.sprint(cat_lp, '\\let\\ifin@\\if'
- .. (Nkfam_list[enc] and Nkfam_list[enc][fam] or 'false ')) end
-
local ffam_list, Nffam_list = {}, {}
- function add_ffam_list(enc, fam)
- if not ffam_list[enc] then ffam_list[enc] = {} end
- ffam_list[enc][fam] = 'true '
- end
- function add_Nffam_list(enc, fam)
- if not Nffam_list[enc] then Nffam_list[enc] = {} end
- Nffam_list[enc][fam] = 'true '
+ function is_ffam(fam)
+ tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (ffam_list[fam] or 'false '))
+ end
+ function add_ffam(fam)
+ ffam_list[fam]='true '
+ end
+ function search_ffam_declared()
+ local s = ''
+ for i,_ in pairs(fenc_list) do
+ s = s .. '\\cdp@elt{' .. i .. '}'
+ end
+ tex.sprint(cat_lp, s)
+ end
+ function search_ffam_fd(fam)
+ if Nffam_list[fam] then
+ tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+ else
+ for i,_ in pairs(fenc_list) do
+ if kpse.find_file(string.lower(i)..fam..'.fd') then
+ tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+ end
+ end
+ Nffam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+ end
end
- function is_ffam(enc, fam)
- tex.sprint(cat_lp, '\\let\\ifin@\\if'
- .. (ffam_list[enc] and ffam_list[enc][fam] or 'false ')) end
- function is_Nffam(enc, fam)
- tex.sprint(cat_lp, '\\let\\ifin@\\if'
- .. (Nffam_list[enc] and Nffam_list[enc][fam] or 'false ')) end
+
end
------------------------------------------------------------------------
-- ALTERNATE FONTS
end
local sort = table.sort
- local function add_fl_table(dest, tg, unitable, glyphmax, asc_des, units)
- for i = 0, glyphmax-1 do
+ 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 gv = tg[i]
if gv then
if gv.altuni then
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,
+ dest = add_fl_table(dest, fl, unicodes,
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,
+ dest = add_fl_table(dest, v, unicodes,
fl.ascent + fl.descent, fl.units_per_em)
end
end
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
end, 1, 'ltj.v_advance'
)
end
+
+------------------------------------------------------------------------
+-- supply tounicode entries
+------------------------------------------------------------------------
+do
+ local ltjr_prepare_cid_font = ltjr.prepare_cid_font
+ 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)
+ if rd then
+ local ru, rc = rd.resources.unicodes, rd.characters
+ for i,v in pairs(tfmdata.characters) do
+ local w = ru["Japan1." .. tostring(v.index)]
+ if w then
+ v.tounicode = v.tounicode or rc[w]. tounicode
+ end
+ end
+ end
+ end
+
+ return tfmdata
+ end,
+ 'ltj.supply_tounicode', 1)
+end
+
+
------------------------------------------------------------------------
-- MISC
------------------------------------------------------------------------
OSDN Git Service
