Np.first = Np.first or lp; Np.id = id_pbox
set_attr(lp, attr_icflag, get_attr_icflag(lp));
while lp ~=last and (lpa>=PACKED) and (lpa<BOXBDD) do
- if getid(lp)==id_hlist or getid(lp)==id_vlist then
+ local lpi = getid(lp)
+ if lpi==id_hlist or lpi==id_vlist then
head, lp, nc = ltjd_make_dir_whatsit(head, lp, list_dir, 'jfm pbox')
Np.first = first and nc or Np.first
+ elseif (lpi==id_rule) and (lpa==PACKED) then
+ lp = node_next(lp)
+ nc, lp = lp, node_next(lp)
else
nc, lp = lp, node_next(lp)
end
Np.first= (Np.first or lp)
if getfield(lp, 'lang') == lang_ja then
Np.id = id_jglyph
- local m, cls = set_np_xspc_jachar(Np, lp)
+ local m, mc, cls = set_np_xspc_jachar(Np, lp)
local npi, npf
- lp, head, npi, npf = capsule_glyph(lp, m, cls, head, tex_dir, lp)
+ lp, head, npi, npf = capsule_glyph(lp, m, mc[cls], 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);
c = c or c_glyph
local cls = slow_find_char_class(c, m, c_glyph)
Nx.met, Nx.class, Nx.char = m, cls, c;
+ local mc = m.char_type; Nx.char_type = mc
if cls~=0 then set_attr(x, attr_jchar_class, cls) end
if c~=c_glyph then set_attr(x, attr_jchar_code, c) end
Nx.pre = table_current_stack[PRE + c] or 0
Nx.xspc = table_current_stack[XSP + c] or 3
Nx.kcat = table_current_stack[KCAT + c] or 0
Nx.auto_kspc, Nx.auto_xspc = (has_attr(x, attr_autospc)==1), (has_attr(x, attr_autoxspc)==1)
- return m, cls
+ return m, mc, cls
end
function set_np_xspc_jachar_hbox(Nx, x)
local m = ltjf_font_metric_table[getfont(x)]
local c = has_attr(x, attr_jchar_code) or getchar(x)
Nx.met, Nx.char = m, c; Nx.class = has_attr(x, attr_jchar_class) or 0;
+ local mc = m.char_type; Nx.char_type = mc
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
-- 和文文字間の JFM glue を node 化
-local function new_jfm_glue(m, bc, ac)
+local function new_jfm_glue(mc, bc, ac)
-- bc, ac: char classes
- local g = m.char_type[bc][ac]
+ local g = mc[bc][ac]
if g then
if g[1] then
local f = node_new(id_glue)
set_attr(f, attr_icflag, g.priority)
setfield(f, 'spec', node_copy(g[2]))
- return f, g.ratio, g.ksp_natural, g.ksp_stretch, g.ksp_shrink
+ return f, g.ratio, g.kanjiskip_natural, g.kanjiskip_stretch, g.kanjiskip_shrink
else
return node_copy(g[2]), g.ratio, false, false, false
end
local KANJI_SKIP_JFM = luatexja.icflag_table.KANJI_SKIP_JFM
get_kanjiskip_low = function(flag, qm, bn, bp, bh)
- if flag or bn or bp or bh then
+ if flag or (qm.with_kanjiskip and (bn or bp or bh)) then
if kanjiskip_jfm_flag then
local g = node_new(id_glue);
local gx = node_new(id_glue_spec);
setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
local bk = qm.kanjiskip or null_skip_table
- setfield(gx, 'width', bn and bk[1] or 0)
- setfield(gx, 'stretch', bp and bk[2] or 0)
- setfield(gx, 'shrink', bh and bk[3] or 0)
+ setfield(gx, 'width', bn and (bn*bk[1]) or 0)
+ setfield(gx, 'stretch', bp and (bp*bk[2]) or 0)
+ setfield(gx, 'shrink', bh and (bh*bk[3]) or 0)
setfield(g, 'spec', gx)
set_attr(g, attr_icflag, KANJI_SKIP_JFM)
return g
local gx = node_new(id_glue_spec);
setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
local ks = getfield(kanji_skip, 'spec')
- setfield(gx, 'width', bn and getfield(ks, 'width') or 0)
- setfield(gx, 'stretch', bp and getfield(ks, 'stretch') or 0)
- setfield(gx, 'shrink', bh and getfield(ks, 'shrink') or 0)
+ setfield(gx, 'width', bn and (bn*getfield(ks, 'width')) or 0)
+ setfield(gx, 'stretch', bp and (bp*getfield(ks, 'stretch')) or 0)
+ setfield(gx, 'shrink', bh and (bh*getfield(ks, 'shrink')) or 0)
setfield(g, 'spec', gx)
set_attr(g, attr_icflag, KANJI_SKIP_JFM)
return g
if Np.auto_kspc or Nq.auto_kspc then
local pm, qm = Np.met, Nq.met
if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
- return get_kanjiskip_low(true, qm, true, true, true)
+ return get_kanjiskip_low(true, qm, 1, 1, 1)
else
- local gb = get_kanjiskip_low(true, qm, true, true, true)
- local ga = get_kanjiskip_low(true, pm, true, true, true)
+ local gb = get_kanjiskip_low(true, qm, 1, 1, 1)
+ local ga = get_kanjiskip_low(true, pm, 1, 1, 1)
return calc_ja_ja_aux(gb, ga, 0, 1)
end
else
local g = node_copy(zero_glue)
- set_attr(g, attr_icflag, jfm_flag and KANJI_SKIP_JFM or KANJI_SKIP)
+ set_attr(g, attr_icflag, kanjiskip_jfm_flag and KANJI_SKIP_JFM or KANJI_SKIP)
return g
end
end
calc_ja_ja_glue = function ()
local qm, pm = Nq.met, Np.met
- if (qm.char_type==pm.char_type) and (qm.var==pm.var) then
- local g, _, kn, kp, kh = new_jfm_glue(qm, Nq.class, Np.class)
+ local qmc, pmc = qm.char_type, pm.char_type
+ if (qmc==pmc) and (qm.var==pm.var) then
+ local g, _, kn, kp, kh = new_jfm_glue(qmc, Nq.class, Np.class)
return g, (Np.auto_kspc or Nq.auto_kspc) and get_kanjiskip_low(false, qm, kn, kp, kh)
else
local npn, nqn = Np.nuc, Nq.nuc
local gb, db, bn, bp, bh
- = new_jfm_glue(qm, Nq.class,
+ = new_jfm_glue(qmc, Nq.class,
slow_find_char_class(Np.char,
qm, getchar(npn)))
local ga, da, an, ap, ah
- = new_jfm_glue(pm,
+ = new_jfm_glue(pmc,
slow_find_char_class(Nq.char,
pm, getchar(nqn)),
Np.class)
local g = calc_ja_ja_aux(gb, ga, db, da)
local k
- if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
+ if (pmc==qmc) and (qm.var==pm.var) then
gb = get_kanjiskip_low(false, qm, bn, bp, bh)
ga = get_kanjiskip_low(false, pm, an, ap, ah)
k = calc_ja_ja_aux(gb, ga, db, da)
-------------------- 和欧文間空白量の決定
-- get xkanjiskip
-local get_xkanjiskip
+local get_xkanjiskip, xkanjiskip_jfm_flag
local get_xkanjiskip_normal, get_xkanjiskip_jfm
do
local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
local XKANJI_SKIP_JFM = luatexja.icflag_table.XKANJI_SKIP_JFM
- get_xkanjiskip_normal = function ()
- if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
- return node_copy(xkanji_skip)
- else
- local g = node_copy(zero_glue)
- set_attr(g, attr_icflag, XKANJI_SKIP)
- return g
+
+ get_xkanjiskip_low = function(flag, qm, bn, bp, bh)
+ if flag or (qm.with_kanjiskip and (bn or bp or bh)) then
+ if xkanjiskip_jfm_flag then
+ local g = node_new(id_glue);
+ local gx = node_new(id_glue_spec);
+ setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
+ local bk = qm.xkanjiskip or null_skip_table
+ setfield(gx, 'width', bn and bk[1] or 0)
+ setfield(gx, 'stretch', bp and bk[2] or 0)
+ setfield(gx, 'shrink', bh and bk[3] or 0)
+ setfield(g, 'spec', gx)
+ set_attr(g, attr_icflag, XKANJI_SKIP_JFM)
+ return g
+ elseif flag then
+ return node_copy(xkanji_skip)
+ else
+ local g = node_new(id_glue);
+ local gx = node_new(id_glue_spec);
+ setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
+ local ks = getfield(xkanji_skip, 'spec')
+ setfield(gx, 'width', bn and getfield(ks, 'width') or 0)
+ setfield(gx, 'stretch', bp and getfield(ks, 'stretch') or 0)
+ setfield(gx, 'shrink', bh and getfield(ks, 'shrink') or 0)
+ setfield(g, 'spec', gx)
+ set_attr(g, attr_icflag, XKANJI_SKIP_JFM)
+ return g
+ end
end
end
- get_xkanjiskip_jfm = function (Nn)
- local g
+
+ get_xkanjiskip = function(Nn)
if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
- g = node_new(id_glue)
- local gx = node_new(id_glue_spec);
- setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
- local bk = Nn.met.xkanjiskip or null_skip_table
- setfield(gx, 'width', bk[1])
- setfield(gx, 'stretch', bk[2])
- setfield(gx, 'shrink', bk[3])
- setfield(g, 'spec', gx)
+ return get_xkanjiskip_low(true, Nn.met, 1, 1, 1)
else
- g = node_copy(zero_glue)
+ local g = node_copy(zero_glue)
+ set_attr(g, attr_icflag, xkanjiskip_jfm_flag and XKANJI_SKIP_JFM or XKANJI_SKIP)
+ return g
end
- set_attr(g, attr_icflag, XKANJI_SKIP_JFM)
- return g
end
end
-------------------- 隣接した「塊」間の処理
-local function get_OA_skip()
+local function get_OA_skip(is_kanji)
local pm = Np.met
local g, _, kn, kp, kh = new_jfm_glue(
- pm,
+ pm.char_type,
fast_find_char_class((Nq.id == id_math and -1 or 'jcharbdd'), pm),
- Np.class, getfield(xkanji_skip,'spec'))
- return g
+ Np.class)
+ local k
+ if is_kanji==0 then
+ k = (Np.auto_kspc or Nq.auto_kspc) and get_kanjiskip_low(false, pm, kn, kp, kh)
+ elseif is_kanji==1 then
+ k = ((Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc))
+ and get_xkanjiskip_low(false, pm, kn, kp, kh)
+ end
+ return g, k
end
-local function get_OB_skip()
+local function get_OB_skip(is_kanji)
local qm = Nq.met
- return new_jfm_glue(qm, Nq.class,
- fast_find_char_class((Np.id == id_math and -1 or'jcharbdd'), qm),
- getfield(xkanji_skip,'spec'))
+ local g, _, kn, kp, kh = new_jfm_glue(
+ qm.char_type, Nq.class,
+ fast_find_char_class((Np.id == id_math and -1 or'jcharbdd'), qm))
+ local k
+ if is_kanji==0 then
+ k = (Np.auto_kspc or Nq.auto_kspc) and get_kanjiskip_low(false, qm, kn, kp, kh)
+ elseif is_kanji==1 then
+ k = ((Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc))
+ and get_xkanjiskip_low(false, qm, kn, kp, kh)
+ end
+ return g, k
end
-- (anything) .. jachar
if qid==id_jglyph or ((qid==id_pbox or qid==id_pbox_w) and Nq.met) then
local g, k
if non_ihb_flag then g, k = calc_ja_ja_glue() end -- M->K
- if not g then g = get_kanjiskip(true) end
+ if not g then g = get_kanjiskip() end
handle_penalty_normal(Nq.post, Np.pre, g);
real_insert(g); real_insert(k)
elseif Nq.met then -- qid==id_hlist
- local g = non_ihb_flag and get_OA_skip(get_kanjiskip) or get_kanjiskip(true) -- O_A->K
- handle_penalty_normal(0, Np.pre, g); real_insert(g)
+ local g, k
+ if non_ihb_flag then g, k = get_OA_skip(0) end -- O_A->K
+ if not g then g = get_kanjiskip() end
+ handle_penalty_normal(0, Np.pre, g); real_insert(g); real_insert(k)
elseif Nq.pre then
- local g = non_ihb_flag and get_OA_skip(get_kanjiskip) or get_xkanjiskip(Np) -- O_A->X
- handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g); real_insert(g)
+ local g, k
+ if non_ihb_flag then g, k = get_OA_skip(1) end -- O_A->X
+ if not g then g = get_xkanjiskip(Np) end
+ handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g);
+ real_insert(g); real_insert(k)
else
- local g = non_ihb_flag and get_OA_skip() -- O_A
+ local g = non_ihb_flag and (get_OA_skip()) -- O_A
if qid==id_glue then handle_penalty_normal(0, Np.pre, g)
elseif qid==id_kern then handle_penalty_suppress(0, Np.pre, g)
else handle_penalty_always(0, Np.pre, g)
-- jachar .. (anything)
local function handle_nq_jachar()
if Np.pre then
- local g = non_ihb_flag and get_OB_skip() or get_xkanjiskip(Nq) -- O_B->X
+ local g = non_ihb_flag and get_OB_skip(1) or get_xkanjiskip(Nq) -- O_B->X
handle_penalty_normal(Nq.post, (Np.id==id_hlist and 0 or Np.pre), g); real_insert(g)
else
- local g =non_ihb_flag and get_OB_skip() -- O_B
+ local g =non_ihb_flag and (get_OB_skip()) -- O_B
if Np.id==id_glue then handle_penalty_normal(Nq.post, 0, g)
elseif Np.id==id_kern then handle_penalty_suppress(Nq.post, 0, g)
else handle_penalty_always(Nq.post, 0, g)
local function handle_np_ja_hlist()
local qid = Nq.id
if qid==id_jglyph or ((qid==id_pbox or Nq.id == id_pbox_w) and Nq.met) then
- local g = non_ihb_flag and get_OB_skip() or get_kanjiskip(true) -- O_B->K
+ local g = non_ihb_flag and get_OB_skip(0) or get_kanjiskip() -- O_B->K
handle_penalty_normal(Nq.post, 0, g); real_insert(g)
elseif Nq.met then -- Nq.id==id_hlist
- local g = get_kanjiskip(true) -- K
+ local g = get_kanjiskip() -- K
handle_penalty_suppress(0, 0, g); real_insert(g)
elseif Nq.pre then
local g = get_xkanjiskip(Np) -- X
-- the current list is the contents of a hbox
local npi, pm = Np.id, Np.met
if npi == id_jglyph or (npi==id_pbox and pm) then
- local g = new_jfm_glue(pm, Np.class, fast_find_char_class('boxbdd', pm))
+ local g = new_jfm_glue(pm.char_type, Np.class, fast_find_char_class('boxbdd', pm))
if g then
set_attr(g, attr_icflag, BOXBDD)
head = insert_after(head, Np.last, g)
local npi, pm = Np.id, Np.met
if npi == id_jglyph or (npi==id_pbox and pm) then
if non_ihb_flag then
- local g = new_jfm_glue(pm, fast_find_char_class(par_indented, pm), Np.class)
+ local g = new_jfm_glue(pm.char_type, fast_find_char_class(par_indented, pm), Np.class)
if g then
set_attr(g, attr_icflag, BOXBDD)
if getid(g)==id_glue and #Bp==0 then
xkanji_skip = node_new(id_glue); set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
local s = skip_table_to_spec(XSK)
setfield(xkanji_skip, 'spec', s)
- get_xkanjiskip = (getfield(s, 'width') == 1073741823)
- and get_xkanjiskip_jfm or get_xkanjiskip_normal
+ xkanjiskip_jfm_flag = (getfield(s, 'width') == 1073741823)
end
if mode then