local attr_icflag = luatexbase.attributes['ltj@icflag']
local ltjf_font_metric_table = ltjf.font_metric_table
-local ltjf_get_vert_glyph = ltjf.get_vert_glyph
+local ltjf_font_extra_info = ltjf.font_extra_info
local PACKED = luatexja.icflag_table.PACKED
local PROCESSED = luatexja.icflag_table.PROCESSED
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
set_attr(p, attr_icflag, PROCESSED)
setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left)
- setfield(p, 'yoffset', - kbl - fshift.down)
+ setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down)
return node_next(p), head, p
elseif ht_diff >= 0 and dp_diff >=0 then -- rule
local box = node_new(id_rule)
- setfield(p, 'yoffset', - kbl - fshift.down)
+ setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down)
setfield(box, 'width', 0)
setfield(box, 'height', fheight - kbl)
setfield(box, 'depth', fdepth + kbl)
else
need_hbox = true
end
- else
+ else
need_hbox = true
end
if need_hbox then
local q
head, q = node_remove(head, p)
- setfield(p, 'yoffset', -fshift.down); setfield(p, 'next', nil)
- setfield(p, 'xoffset', getfield(p, 'xoffset')
+ 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)
local char_data = met.char_type[class]
if not char_data then return node_next(p), head end
local ascent, descent = met.ascent, met.descent
- local fwidth, pwidth = char_data.width, ascent + descent
+ local fwidth, pwidth = char_data.width
+ do
+ local pf = getfont(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
+ and ltjf_font_extra_info[pf][pc].vwidth * met.size or (ascent+descent)
+ 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
fshift = call_callback("luatexja.set_width", fshift, met, class)
local fheight, fdepth = char_data.height, char_data.depth
- setfield(p, 'char', ltjf_get_vert_glyph(getfont(p), getchar(p)))
-
local y_shift
- = - getfield(p, 'yoffset') + (has_attr(p,attr_tkblshift) or 0)
+ = getfield(p, 'xoffset') + (has_attr(p,attr_tkblshift) or 0)
local q
head, q = node_remove(head, p)
local box = node_new(id_hlist)
setfield(box, 'shift', y_shift)
setfield(box, 'dir', dir)
- setfield(p, 'xoffset', -fshift.down)
- setfield(p, 'yoffset', - (getfield(p, 'xoffset') + ascent
+ setfield(p, 'xoffset', - fshift.down)
+ setfield(p, 'yoffset', getfield(p, 'yoffset') -(ascent
+ char_data.align*(fwidth-pwidth) - fshift.left) )
local ws = node_new(id_whatsit, sid_save)
local wm = node_new(id_whatsit, sid_matrix)
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