local sid_matrix = node.subtype('pdf_setmatrix')
local dir_tate = luatexja.dir_table.dir_tate
-local attr_jchar_class = luatexbase.attributes['ltj@charclass']
-local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
-local attr_yablshift = luatexbase.attributes['ltj@yablshift']
local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
-local attr_tablshift = luatexbase.attributes['ltj@tablshift']
local attr_tkblshift = luatexbase.attributes['ltj@tkblshift']
local attr_icflag = luatexbase.attributes['ltj@icflag']
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 fshift = { down = 0, left = 0}
+local min, max = math.min, math.max
+
+-- 和文文字の位置補正（横）
local function capsule_glyph_yoko(p, met, class, head, dir)
local char_data = met.char_type[class]
if not char_data then return node_next(p), head, p end
+ -- f*: whd specified in JFM
local fwidth, pwidth = char_data.width, getfield(p, 'width')
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
- if (pwidth ~= fwidth or getfield(p, 'height') ~= fheight
- or getfield(p, 'depth') ~= fdepth) then
- local y_shift
- = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0)
+ 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 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', 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', getfield(p, 'yoffset') - kbl - fshift.down)
+ setfield(box, 'width', 0)
+ setfield(box, 'height', fheight - kbl)
+ setfield(box, 'depth', fdepth + kbl)
+ setfield(box, 'dir', dir)
+ set_attr(box, attr_icflag, PACKED)
+ set_attr(p, attr_icflag, PACKED)
+ 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)
- setfield(p, 'yoffset', -fshift.down); setfield(p, 'next', nil)
+ 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, 'height', fheight)
setfield(box, 'depth', fdepth)
setfield(box, 'head', p)
- setfield(box, 'shift', y_shift)
+ 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
- else
- set_attr(p, attr_icflag, PROCESSED)
- setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left)
- setfield(p, 'yoffset', getfield(p, 'yoffset')
- - (has_attr(p, attr_ykblshift) or 0) - fshift.down)
- return node_next(p), head, p
end
end
+
luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko
+-- 和文文字の位置補正（縦）
local function capsule_glyph_tate(p, met, class, head, dir)
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) -- ltjf_get_vert_glyph(pf, 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 and met.v_advance[pc] or 0)
+ 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)
- --local k1 = node_new(id_kern)
- --setfield(k1, 'kern',
- -- getfield(p, 'xoffset') + ascent
- -- + char_data.align*(fwidth-pwidth) - fshift.left)
- 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)
local k2 = node_new(id_kern); setfield(k2, 'kern', - 0.5*getfield(p, 'width'))
local k3 = node_copy(k2)
local wr = node_new(id_whatsit, sid_restore)
- --setfield(box, 'head', k1); setfield(k1, 'next', ws)
setfield(box, 'head', ws)
setfield(ws, 'next', wm); setfield(wm, 'next', k2);
setfield(k2, 'next', p); setfield(p, 'next', k3);
end
luatexja.setwidth.capsule_glyph_math = capsule_glyph_math
-local tex_set_attr = tex.setattribute
-function luatexja.setwidth.set_ja_width(head)
- local attr_ablshift = (ltjs.list_dir==dir_tate) and attr_tablshift or attr_yablshift
- for m in node_traverse_id(id_math, head) do
- if getsubtype(m)==0 then
- -- 数式の位置補正
- for p in node_traverse(m) do
- local pid = getid(p)
- if pid==id_math and getsubtype(p)==1 then
- break
- elseif pid==id_hlist or pid==id_vlist then
- if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
- setfield(p, 'shift', getfield(p, 'shift') + (has_attr(p,attr_ablshift) or 0))
- end
- elseif pid==id_rule then
- if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
- local v = has_attr(p,attr_yablshift) or 0
- setfield(p, 'height', getfield(p, 'height')-v)
- setfield(p, 'depth', getfield(p, 'depth')+v)
- set_attr(p, attr_icflag, PROCESSED)
- end
- end
+-- 数式の位置補正
+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
+ return
+ elseif (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
+ if pid==id_hlist or pid==id_vlist then
+ setfield(p, 'shift', getfield(p, 'shift') + (has_attr(p,attr_ablshift) or 0))
+ elseif pid==id_rule then
+ local v = has_attr(p,attr_ablshift) or 0
+ setfield(p, 'height', getfield(p, 'height')-v)
+ setfield(p, 'depth', getfield(p, 'depth')+v)
+ set_attr(p, attr_icflag, PROCESSED)
+ elseif pid==id_glyph then
+ -- 欧文文字; 和文文字は pid == id_hlist の場合で処理される
+ -- (see conv_jchar_to_hbox_A in ltj-math.lua)
+ setfield(p, 'yoffset',
+ getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0))
end
end
end
- -- adjust attr_icflag
- tex_set_attr('global', attr_icflag, 0)
- return head
+end
+
+-- discretionary の位置補正
+do
+ local attr_yablshift = luatexbase.attributes['ltj@yablshift']
+ local attr_tablshift = luatexbase.attributes['ltj@tablshift']
+ local attr_ablshift
+ local disc, tex_dir
+ local function ashift_disc_inner(field)
+ local head = getfield(disc, field)
+ if not head then return end
+ local y_adjust, node_depth, adj_depth = 0, 0, 0
+ for lp in node_traverse_id(id_glyph, head) do
+ y_adjust = has_attr(lp,attr_ablshift) or 0
+ node_depth = max(getfield(lp, 'depth') + min(y_adjust, 0), node_depth)
+ adj_depth = (y_adjust>0) and max(getfield(lp, 'depth') + y_adjust, adj_depth) or adj_depth
+ setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust)
+ end
+ if adj_depth>node_depth then
+ local r = node_new(id_rule)
+ setfield(r, 'width', 0); setfield(r, 'height', 0)
+ setfield(r, 'depth', adj_depth); setfield(r, 'dir', tex_dir)
+ set_attr(r, attr_icflag, PROCESSED)
+ if field=='post' then
+ node_insert_after(head, head, r)
+ else
+ setfield(disc, field, (node_insert_before(head, head, r)))
+ end
+ end
+ end
+ function luatexja.setwidth.apply_ashift_disc(d, is_dir_tate, dir)
+ attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift
+ disc, tex_dir = d, dir
+ ashift_disc_inner('pre')
+ ashift_disc_inner('post')
+ ashift_disc_inner('replace')
+ end
end
OSDN Git Service
