--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2015/09/19',
+ date = '2016/04/03',
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
------------------------------------------------------------------------
((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)
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
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
"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
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,
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'
+ name = name .. ';+vert;+vrt2'
end
- print(name)
else
is_vert_enabled = nil
end
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
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 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
+ if v=='glyphmin' then glyphmin, glyphmax = glyphs.glyphmin, glyphmax+1; break end
end
for i = glyphmin, glyphmax-1 do
local gv = tg[i]
end
if fl.subfonts then
for _,v in pairs(fl.subfonts) do
- dest = add_fl_table(dest, v, unicodes,
+ dest = add_fl_table(dest, v, unicodes,
fl.ascent + fl.descent, fl.units_per_em)
end
end
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)
+ setfield(g, 'subtype', 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
[0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33,
}
setmetatable(vert_form_table, {__index=function(t,k) return k end});
-