local ltjf_font_metric_table = ltjf.font_metric_table
local ltjf_font_extra_info = ltjf.font_extra_info
-local ltjf_get_vert_glyph = ltjf.get_vert_glyph
local PACKED = luatexja.icflag_table.PACKED
local PROCESSED = luatexja.icflag_table.PROCESSED
-local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED
-local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
local get_pr_begin_flag
do
+ local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
local floor = math.floor
get_pr_begin_flag = function (p)
local i = has_attr(p, attr_icflag) or 0
fshift = call_callback("luatexja.set_width", fshift, met, class)
local fheight, fdepth = char_data.height, char_data.depth
local kbl = has_attr(p, attr_ykblshift) or 0
- --
- local need_hbox
+ --
if pwidth==fwidth then
-- 補正後glyph node は ht: p.height - kbl - down, dp: p.depth + min(0, kbl+down) を持つ
-- 設定されるべき寸法: ht: fheight - kbl, dp: fdepth + kbl
- local ht_diff = fheight + fshift.down - getfield(p, 'height')
+ local ht_diff = fheight + fshift.down - getfield(p, 'height')
local dp_diff = fdepth + kbl - getfield(p, 'depth') - min(kbl + fshift.down, 0)
- if ht_diff == 0 and dp_diff ==0 then -- offset only
+ if ht_diff == 0 and dp_diff ==0 then -- offset only
set_attr(p, attr_icflag, PROCESSED)
setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left)
setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down)
head = p and node_insert_before(head, p, box)
or node_insert_after(head, node_tail(head), box)
return node_next(p), head, p, box
- else
- need_hbox = true
end
- else
- need_hbox = true
end
- if need_hbox then
- local q
- head, q = node_remove(head, p)
- local box = node_new(id_hlist)
- setfield(p, 'yoffset', getfield(p, 'yoffset') -fshift.down);
- setfield(p, 'next', nil)
- setfield(p, 'xoffset', getfield(p, 'xoffset')
- + char_data.align*(fwidth-pwidth) - fshift.left)
- local box = node_new(id_hlist)
- setfield(box, 'width', fwidth)
- setfield(box, 'height', fheight)
- setfield(box, 'depth', fdepth)
- setfield(box, 'head', p)
- setfield(box, 'shift', kbl)
- setfield(box, 'dir', dir)
- set_attr(box, attr_icflag, PACKED)
- head = q and node_insert_before(head, q, box)
- or node_insert_after(head, node_tail(head), box)
- return q, head, box
- end
+ local q
+ head, q = node_remove(head, p)
+ setfield(p, 'yoffset', getfield(p, 'yoffset') -fshift.down);
+ setfield(p, 'next', nil)
+ setfield(p, 'xoffset', getfield(p, 'xoffset')
+ + char_data.align*(fwidth-pwidth) - fshift.left)
+ local box = node_new(id_hlist)
+ setfield(box, 'width', fwidth)
+ setfield(box, 'height', fheight)
+ setfield(box, 'depth', fdepth)
+ setfield(box, 'head', p)
+ setfield(box, 'shift', kbl)
+ setfield(box, 'dir', dir)
+ set_attr(box, attr_icflag, PACKED)
+ head = q and node_insert_before(head, q, box)
+ or node_insert_after(head, node_tail(head), box)
+ return q, head, box
end
luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko
local fwidth, pwidth = char_data.width
do
local pf = getfont(p)
- local pc = getchar(p) -- ltjf_get_vert_glyph(pf, getchar(p))
+ local pc = getchar(p)
setfield(p, 'char', pc)
- pwidth = ltjf_font_extra_info[pf] and ltjf_font_extra_info[pf][pc]
- and ltjf_font_extra_info[pf][pc].vwidth
+ pwidth = ltjf_font_extra_info[pf] and ltjf_font_extra_info[pf][pc]
+ and ltjf_font_extra_info[pf][pc].vwidth
and ltjf_font_extra_info[pf][pc].vwidth * met.size or (ascent+descent)
- pwidth = pwidth + (met.v_advance and met.v_advance[pc] or 0)
- print(pc, met.v_advance[pc], getfield(p, 'yoffset'))
+ pwidth = pwidth + (met.v_advance[pc] or 0)
+ ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent
end
fwidth = (fwidth ~= 'prop') and fwidth or pwidth
fshift.down = char_data.down; fshift.left = char_data.left
local ws = node_new(id_whatsit, sid_save)
local wm = node_new(id_whatsit, sid_matrix)
setfield(wm, 'data', '0 1 -1 0')
- local pwnh = - 0.5*getfield(p, 'width')
- local k2 = node_new(id_kern); setfield(k2, 'kern', - 0.5*getfield(p, 'width'))
- local k3 = node_copy(k2)
+ local pwnh = -round(0.5*getfield(p, 'width'))
+ local k2 = node_new(id_kern); setfield(k2, 'kern', pwnh)
+ local k3 = node_new(id_kern); setfield(k3, 'kern', -getfield(p, 'width')-pwnh)
local wr = node_new(id_whatsit, sid_restore)
setfield(box, 'head', ws)
setfield(ws, 'next', wm); setfield(wm, 'next', k2);
function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift)
for p in node_traverse(head) do
local pid = getid(p)
- if p==last then
+ if p==last then
return
elseif (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
if pid==id_hlist or pid==id_vlist then