--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2014/02/02',
+ date = '2014/10/03',
description = 'Insertion process of JFM glues and kanjiskip',
})
module('luatexja.jfmglue', package.seeall)
local start_time_measure = ltjb.start_time_measure
local stop_time_measure = ltjb.stop_time_measure
slow_find_char_class = function (c, m, oc)
- start_time_measure('slow_find_chr')
local cls = ltjf_find_char_class(oc, m)
- if not c and cls==0 then
- stop_time_measure('slow_find_chr')
+ if oc~=c and cls==0 then
return ltjf_find_char_class(-c, m), oc
else
- stop_time_measure('slow_find_chr')
return cls, oc
end
end
local function add_penalty(p,e)
local pp = getfield(p, 'penalty')
if pp>=10000 then
- if e<=-10000 then pp = 0 end
+ if e<=-10000 then setfield(p, 'penalty', 0) end
elseif pp<=-10000 then
- if e>=10000 then pp = 0 end
+ if e>=10000 then setfield(p, 'penalty', 0) end
else
pp = pp + e
if pp>=10000 then setfield(p, 'penalty', 10000)
elseif pp<=-10000 then setfield(p, 'penalty', -10000)
else setfield(p, 'penalty', pp) end
end
- return
end
-- 「異なる JFM」の間の調整方法
first_char = p; find_first_char = false
end
last_char = p; found_visible_node = true
- --elseif pid==id_rule and get_attr_icflag(p)==PACKED then -- do nothing
+ elseif pid==id_rule and get_attr_icflag(p)==PACKED then
+ -- do nothing
elseif not (pid==id_ins or pid==id_mark
or pid==id_adjust or pid==id_whatsit
or pid==id_penalty) then
-- calc next Np
do
+local traverse = Dnode.traverse
local function set_attr_icflag_processed(p)
if get_attr_icflag(p)<= ITALIC then
set_attr(p, attr_icflag, PROCESSED)
return check_next_ickern(lp)
end
-
+local ltjw_apply_ashift_math = ltjw.apply_ashift_math
+local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc
+local min, max = math.min, math.max
local function calc_np_aux_glyph_common(lp)
Np.nuc = lp
- local npi = (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1))
- and id_jglyph or id_glyph
- Np.id = npi
- if npi==id_jglyph then
- set_np_xspc_jachar(Np, lp)
- lp, head, npi = capsule_glyph(lp, Np.met, Np.class, head, tex_dir)
- Np.first = (Np.first~=Np.nuc) and Np.first or npi
- Np.nuc = npi
+ Np.id = npi
+ if (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1)) then
+ Np.id = id_jglyph
+ set_np_xspc_jachar(Np, lp)
+ local npi, npf
+ lp, head, npi, npf = capsule_glyph(lp, Np.met, Np.class, head, tex_dir)
+ Np.first = (Np.first~=Np.nuc) and Np.first or npf or npi
+ Np.nuc = npi
+ return true, check_next_ickern(lp);
+ else
+ Np.id = id_glyph
+ set_np_xspc_alchar(Np, getchar(lp), lp, 1)
+ -- loop
+ local first_glyph, last_glyph = lp
+ set_attr(lp, attr_icflag, PROCESSED); Np.last = lp
+ local y_adjust = has_attr(lp,attr_ablshift) or 0
+ local node_depth = getfield(lp, 'depth') + min(y_adjust, 0)
+ local adj_depth = (y_adjust>0) and (getfield(lp, 'depth') + y_adjust) or 0
+ setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust)
+ lp = node_next(lp)
+ for lx in traverse(lp) do
+ local lai = get_attr_icflag(lx)
+ if lx==last or lai>=PACKED then
+ lp=lx; break
+ else
+ local lid = getid(lx)
+ if lid==id_glyph and not(getfont(lx) == (has_attr(lx, attr_curjfnt) or -1)) then
+ -- 欧文文字
+ last_glyph = lx; set_attr(lx, attr_icflag, PROCESSED); Np.last = lx
+ y_adjust = has_attr(lx,attr_ablshift) or 0
+ node_depth = max(getfield(lx, '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(lx, 'yoffset', getfield(lx, 'yoffset') - y_adjust)
+ elseif lid==id_kern then
+ local ls = getsubtype(lx)
+ if ls==2 then -- アクセント用の kern
+ set_attr(lx, attr_icflag, PROCESSED)
+ lx = node_next(lx) -- lp: アクセント本体
+ setfield(lx, 'yoffset', getfield(lp, 'yoffset') - (has_attr(lx,attr_ablshift) or 0))
+ lx = node_next(node_next(lx))
+ elseif ls==0 then
+ Np.last = lx
+ elseif (ls==1 and lai==ITALIC) then
+ Np.last = lx; set_attr(lx, attr_icflag, IC_PROCESSED)
+ else
+ lp=lx; break
+ end
+ else
+ lp=lx; break
+ end
+ end
+ end
+ local r
+ if adj_depth>node_depth then
+ 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)
+ end
+ if last_glyph then
+ Np.last_char = last_glyph
+ if r then insert_after(head, first_glyph, r) end
else
- set_np_xspc_alchar(Np, getchar(lp), lp, 1)
- set_attr(lp, attr_icflag, PROCESSED)
- setfield(lp, 'yoffset',
- getfield(lp, 'yoffset') - (has_attr(lp,attr_ablshift) or 0))
- lp = node_next(lp)
+ local npn = Np.nuc
+ Np.last_char = npn
+ if r then
+ local nf, nc = getfont(npn), getchar(npn)
+ local ct = (font.getfont(nf) or font.fonts[nf] ).characters[nc]
+ if (ct.left_protruding or 0) == 0 then
+ head = insert_before(head, npn, r)
+ Np.first = (Np.first==npn) and r or npn
+ elseif (ct.right_protruding or 0) == 0 then
+ insert_after(head, npn, r); Np.last, lp = r, r
+ else
+ ltjb.package_warning_no_line(
+ 'luatexja',
+ 'Check depth of glyph node ' .. tostring(npn) .. '(font=' .. nf
+ .. ', char=' .. nc .. '), because its \\lpcode is ' .. tostring(ct.left_protruding)
+ .. ' and its \\rpcode is ' .. tostring(ct.right_protruding)
+ ); node_free(r)
+ end
+ end
end
- return true, check_next_ickern(lp);
+ return true, lp
+ end
end
local calc_np_auxtable = {
[id_glyph] = function (lp)
head, lp, op, flag = ltjd_make_dir_whatsit(head, lp, list_dir, 'jfm hlist')
set_attr(op, attr_icflag, PROCESSED)
Np.first = Np.first or op; Np.last = op; Np.nuc = op;
- local npi = (flag or getfield(op, 'shift')~=0) and id_box_like or id_hlist
- Np.id = npi
- if npi==id_hlist then
- Np.last_char = check_box_high(Np, getlist(lp), nil)
+ if (flag or getfield(op, 'shift')~=0) then
+ Np.id = id_box_like
+ else
+ Np.id = id_hlist
+ Np.last_char = check_box_high(Np, getlist(op), nil)
end
return true, lp
end,
Np.first, Np.nuc = (Np.first or lp), lp;
set_attr(lp, attr_icflag, PROCESSED)
set_np_xspc_alchar(Np, -1, lp)
- lp = node_end_of_math(lp)
- set_attr(lp, attr_icflag, PROCESSED)
- Np.last, Np.id = lp, id_math;
- return true, node_next(lp);
+ local end_math = node_end_of_math(lp)
+ ltjw_apply_ashift_math(lp, end_math, attr_ablshift)
+ set_attr(end_math, attr_icflag, PROCESSED)
+ Np.last, Np.id = end_math, id_math;
+ return true, node_next(end_math);
end,
- discglue = function(lp)
+ [id_glue] = function(lp)
Np.first, Np.nuc, Np.last = (Np.first or lp), lp, lp;
Np.id = getid(lp); set_attr(lp, attr_icflag, PROCESSED)
return true, node_next(lp)
end,
+ [id_disc] = function(lp)
+ Np.first, Np.nuc, Np.last = (Np.first or lp), lp, lp;
+ Np.id = getid(lp); set_attr(lp, attr_icflag, PROCESSED)
+ ltjw_apply_ashift_disc(lp, (list_dir==dir_tate), tex_dir)
+ return true, node_next(lp)
+ end,
[id_kern] = function(lp)
Np.first = Np.first or lp
if getsubtype(lp)==2 then
set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp)
set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp)
set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp)
- set_attr(lp, attr_icflag, PROCESSED);
+ set_attr(lp, attr_icflag, PROCESSED);
return calc_np_aux_glyph_common(lp)
else
Np.id = id_kern; set_attr(lp, attr_icflag, PROCESSED)
calc_np_auxtable[id_ins] = calc_np_auxtable.skip
calc_np_auxtable[id_mark] = calc_np_auxtable.skip
calc_np_auxtable[id_adjust] = calc_np_auxtable.skip
-calc_np_auxtable[id_disc] = calc_np_auxtable.discglue
-calc_np_auxtable[id_glue] = calc_np_auxtable.discglue
function calc_np(lp, last)
local k
if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then
local lq = node_next(lp)
head = node_remove(head, lp); node_free(lp); lp = lq
- else
+ else
return calc_np_pbox(lp, last)
end -- id_pbox
else
local m = ltjf_font_metric_table[getfont(x)]
local cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, getchar(x))
Nx.met, Nx.char = m, c; Nx.class = cls;
- --if cls~=0 then set_attr(x, attr_jchar_class, cls) end
+ if cls~=0 then set_attr(x, attr_jchar_class, cls) end
Nx.pre = table_current_stack[PRE + c] or 0
Nx.post = table_current_stack[POST + c] or 0
Nx.xspc = table_current_stack[XSP + c] or 3
cls = ltjf_find_char_class(c, m)
if cls==0 then cls = slow_find_char_class(c2, m, c1) end
Nx.met, Nx.char = m, c; Nx.class = cls;
- --if cls~=0 then set_attr(x, attr_jchar_class, cls) end
+ if cls~=0 then set_attr(x, attr_jchar_class, cls) end
Nx.pre = table_current_stack[PRE + c] or 0
Nx.post = table_current_stack[POST + c] or 0
Nx.xspc = table_current_stack[XSP + c] or 3
end
after_alchar = function (Nx)
- local x = Nx.nuc
+ local x = Nx.last_char
return set_np_xspc_alchar(Nx, getchar(x), x, 2)
end
local XKANJI_SKIP_JFM = luatexja.icflag_table.XKANJI_SKIP_JFM
get_xkanjiskip_normal = function (Nn)
if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
- local f = node_copy(xkanji_skip)
- return f
+ return node_copy(xkanji_skip)
else
local g = node_copy(zero_glue)
set_attr(g, attr_icflag, XKANJI_SKIP)
-- Nq が前側のクラスタとなることによる修正
do
local adjust_nq_aux = {
- [id_glyph] = function()
- local x = Nq.nuc
- return set_np_xspc_alchar(Nq, getchar(x),x, 2)
- end, -- after_alchar(Nq)
+ [id_glyph] = function() after_alchar(Nq) end, -- after_alchar(Nq)
[id_hlist] = function() after_hlist(Nq) end,
[id_pbox] = function() after_hlist(Nq) end,
[id_disc] = function() after_hlist(Nq) end,
attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift
set_np_xspc_jachar = is_dir_tate and set_np_xspc_jachar_tate or set_np_xspc_jachar_yoko
-
+
tex_dir = dir or 'TLT'
kanji_skip = node_new(id_glue)
setfield(kanji_skip, 'spec', skip_table_to_spec(KSK))
OSDN Git Service
