--
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 err, warn, info, log = luatexbase .errwarinf(_NAME)
+luatexja.load_module('base'); local ltjb = luatexja.base
luatexja.load_module('stack'); local ltjs = luatexja.stack
luatexja.load_module('jfont'); local ltjf = luatexja.jfont
luatexja.load_module('direction'); local ltjd = luatexja.direction
+luatexja.load_module('setwidth'); local ltjw = luatexja.setwidth
local pairs = pairs
local Dnode = node.direct or node
local insert_after = Dnode.insert_after
local node_next = (Dnode ~= node) and Dnode.getnext or node.next
local round = tex.round
+local ltjd_make_dir_whatsit = ltjd.make_dir_whatsit
local ltjf_font_metric_table = ltjf.font_metric_table
local ltjf_find_char_class = ltjf.find_char_class
local node_new = Dnode.new
local node_copy = Dnode.copy
-local node_remove = luatexja.Dnode_remove -- Dnode.remove
+local node_remove = Dnode.remove
local node_tail = Dnode.tail
local node_free = Dnode.free
local node_end_of_math = Dnode.end_of_math
-local dir_tate = 3
-local dir_yoko = 4
-
local id_glyph = node.id('glyph')
local id_hlist = node.id('hlist')
local id_vlist = node.id('vlist')
local xkanji_skip
local table_current_stack
local list_dir
+local capsule_glyph
+local tex_dir
+local attr_ablshift
+local set_np_xspc_jachar
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_dir = luatexbase.attributes['ltj@dir']
-------------------- Helper functions
-local function copy_attr(new, old)
+local function copy_attr(new, old)
-- 仕様が決まるまで off にしておく
end
end
-- 文字クラスの決定
-local function slow_find_char_class(c, m, oc)
- local xc = c or oc
- local cls = ltjf_find_char_class(oc, m)
- if xc ~= oc and cls==0 then cls = ltjf_find_char_class(-xc, m) end
- return cls, xc
+local slow_find_char_class
+do
+ local start_time_measure = ltjb.start_time_measure
+ local stop_time_measure = ltjb.stop_time_measure
+ slow_find_char_class = function (c, m, oc)
+ local cls = ltjf_find_char_class(oc, m)
+ if oc~=c and cls==0 then
+ return ltjf_find_char_class(-c, m), oc
+ else
+ return cls, oc
+ end
+ end
end
local zero_glue = node_new(id_glue)
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」の間の調整方法
-------------------- hlist 内の文字の検索
local first_char, last_char, find_first_char
-
+do
+local ltjd_glyph_from_packed = ltjd.glyph_from_packed
local function check_box(box_ptr, box_end)
local p = box_ptr; local found_visible_node = false
- if not p then
+ if not p then
find_first_char = false; last_char = nil
return true
end
p = node_next(node_next(node_next(p))); pid = getid(p) -- p must be glyph_node
end
if pid==id_glyph then
- repeat
- if find_first_char then
+ repeat
+ if find_first_char then
first_char = p; find_first_char = false
end
last_char = p; found_visible_node = true; p=node_next(p)
- if (not p) or p==box_end then
- return found_visible_node
+ if (not p) or p==box_end then
+ return found_visible_node
end
until getid(p)~=id_glyph
pid = getid(p) -- p must be non-nil
end
if pid==id_kern then
local pa = get_attr_icflag(p)
- --if pa==IC_PROCESSED or pa == PACKED then
if pa==IC_PROCESSED then
-- do nothing
elseif getsubtype(p)==2 then
- p = node_next(node_next(p));
+ p = node_next(node_next(p));
-- Note that another node_next will be executed outside this if-statement.
else
found_visible_node = true
end
elseif pid==id_hlist then
if PACKED == get_attr_icflag(p) then
+ local s = ltjd_glyph_from_packed(p)
if find_first_char then
- first_char = getlist(p); find_first_char = false
+ first_char = s; find_first_char = false
end
- last_char = getlist(p); found_visible_node = true
+ last_char = s; found_visible_node = true
else
if getfield(p, 'shift')==0 then
if check_box(getlist(p), nil) then found_visible_node = true end
- else
+ else
find_first_char = false; last_char = nil
end
end
elseif pid==id_math then
- if find_first_char then
+ if find_first_char then
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
p = node_next(p)
end
return found_visible_node
-end
+end
function check_box_high(Nx, box_ptr, box_end)
first_char = nil; last_char = nil; find_first_char = true
local first_char = first_char
if first_char then
if getid(first_char)==id_glyph then
- if getfont(first_char) == (has_attr(first_char, attr_curjfnt) or -1) then
+ if getfont(first_char) == (has_attr(first_char, attr_curjfnt) or -1) then
set_np_xspc_jachar(Nx, first_char)
else
set_np_xspc_alchar(Nx, getchar(first_char),first_char, 1)
end
return last_char
end
-
+end
-------------------- Np の計算と情報取得
-luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data",
- function (Np, lp, Nq)
- if Np.nuc then return Np
- else
+luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data",
+ function (Np, lp, Nq)
+ if Np.nuc then return Np
+ else
return Np -- your code
end
end)
-luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data",
+luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data",
function (stat, Nq, Np) return false end)
-- 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)
+ if get_attr_icflag(p)<= ITALIC then
+ set_attr(p, attr_icflag, PROCESSED)
end
end
if lp and getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then
set_attr(lp, attr_icflag, IC_PROCESSED)
Np.last = lp; return node_next(lp)
- else
+ else
Np.last = Np.nuc; return lp
end
end
local function calc_np_pbox(lp, last)
+ local first, lpa, nc = (not Np.first), KINSOKU, nil
Np.first = Np.first or lp; Np.id = id_pbox
- local lpa, nc = KINSOKU, nil
set_attr(lp, attr_icflag, get_attr_icflag(lp));
while lp ~=last and (lpa>=PACKED) and (lpa<BOXBDD) do
- nc, lp = lp, node_next(lp); lpa = lp and has_attr(lp, attr_icflag) or 0
+ if getid(lp)==id_hlist or getid(lp)==id_vlist then
+ head, lp, nc = ltjd_make_dir_whatsit(head, lp, list_dir, 'jfm pbox')
+ if first then Np.first = nc end
+ else
+ nc, lp = lp, node_next(lp)
+ end
+ first, lpa = false, (lp and has_attr(lp, attr_icflag) or 0)
-- get_attr_icflag() ではいけない！
end
Np.nuc = nc
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
+ 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
+ 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, lp
+ end
+end
local calc_np_auxtable = {
[id_glyph] = function (lp)
- Np.first, Np.nuc = (Np.first or lp), lp;
- Np.id = (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1))
- and id_jglyph or id_glyph
- return true, check_next_ickern(node_next(lp));
+ Np.first= (Np.first or lp)
+ return calc_np_aux_glyph_common(lp)
end,
- [id_hlist] = function(lp)
+ [id_hlist] = function(lp)
local op, flag
- head, lp, op, flag = ltjd.make_dir_node(head, lp, list_dir)
- Np.first = Np.first or op; Np.last = op; Np.nuc = op;
- Np.id = (flag or getfield(op, 'shift')~=0) and id_box_like or id_hlist
+ 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;
+ 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,
- box_like = function(lp)
+ [id_vlist] = function(lp)
local op
- head, lp, op = ltjd.make_dir_node(head, lp, list_dir)
- Np.first = Np.first or op; Np.last = op; Np.nuc = op;
+ head, lp, op = ltjd_make_dir_whatsit(head, lp, list_dir, 'jfm:' .. getid(lp))
+ Np.first = Np.first or op; Np.last = op; Np.nuc = op;
Np.id = id_box_like;
return true, lp
end,
- skip = function(lp)
+ box_like = function(lp)
+ Np.first = Np.first or lp; Np.last = lp; Np.nuc = lp;
+ Np.id = id_box_like;
+ return true, node_next(lp)
+ end,
+ skip = function(lp)
set_attr(lp, attr_icflag, PROCESSED)
return false, node_next(lp)
end,
- [id_whatsit] = function(lp)
+ [id_whatsit] = function(lp)
local lps = getsubtype(lp)
if lps==sid_user then
if getfield(lp, 'user_id')==luatexja.userid_table.IHB then
- local lq = node_next(lp);
+ local lq = node_next(lp);
head = node_remove(head, lp); node_free(lp); ihb_flag = true
return false, lq;
else
set_attr(lp, attr_icflag, PROCESSED)
luatexbase.call_callback("luatexja.jfmglue.whatsit_getinfo",
Np, lp, Nq)
- if Np.nuc then
- Np.id = id_pbox_w; Np.first = Np.nuc; Np.last = Np.nuc;
+ if Np.nuc then
+ Np.id = id_pbox_w; Np.first = Np.nuc; Np.last = Np.nuc;
return true, node_next(lp)
else
return false, node_next(lp)
else
-- we do special treatment for these whatsit nodes.
if lps == sid_start_link or lps == sid_start_thread then
- Np.first = lp
+ Np.first = lp
elseif lps == sid_end_link or lps == sid_end_thread then
Np.first, Nq.last = nil, lp;
end
end
end,
[id_math] = function(lp)
- Np.first, Np.nuc = (Np.first or lp), lp;
- set_attr(lp, attr_icflag, PROCESSED)
- lp = node_end_of_math(lp)
+ Np.first, Np.nuc = (Np.first or lp), lp;
set_attr(lp, attr_icflag, PROCESSED)
- Np.last, Np.id = lp, id_math;
- return true, node_next(lp);
+ set_np_xspc_alchar(Np, -1, 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,
+ [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,
- discglue = function(lp)
- Np.first, Np.nuc, Np.last = (Np.first or lp), lp, lp;
+ [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)
+ [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); Np.nuc = lp
- Np.id = (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1)) and id_jglyph or id_glyph
- return true, check_next_ickern(node_next(lp));
+ set_attr(lp, attr_icflag, PROCESSED);
+ return calc_np_aux_glyph_common(lp)
else
Np.id = id_kern; set_attr(lp, attr_icflag, PROCESSED)
Np.last = lp; return true, node_next(lp)
return false, node_next(lp)
end,
}
-calc_np_auxtable[id_vlist] = calc_np_auxtable.box_like
calc_np_auxtable[id_rule] = calc_np_auxtable.box_like
calc_np_auxtable[13] = calc_np_auxtable.box_like
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
-- unbox 由来ノードの検出
if lpa>=PACKED then
if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then
- local lq = node_next(lp)
+ local lq = node_next(lp)
head = node_remove(head, lp); node_free(lp); lp = lq
- else return calc_np_pbox(lp, last)
+ else
+ return calc_np_pbox(lp, last)
end -- id_pbox
else
k, lp = calc_np_auxtable[getid(lp)](lp)
local POST = luatexja.stack_table_index.POST
local KCAT = luatexja.stack_table_index.KCAT
local XSP = luatexja.stack_table_index.XSP
+ local dir_tate = luatexja.dir_table.dir_tate
-- 和文文字のデータを取得
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
local attr_orig_char = luatexbase.attributes['ltj@origchar']
local attr_autospc = luatexbase.attributes['ltj@autospc']
local attr_autoxspc = luatexbase.attributes['ltj@autoxspc']
- function set_np_xspc_jachar(Nx, x)
+ function set_np_xspc_jachar_yoko(Nx, x)
+ 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
+ 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
+ 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)
+ end
+ function set_np_xspc_jachar_tate(Nx, x)
local m = ltjf_font_metric_table[getfont(x)]
local cls, c
- if list_dir == dir_tate then
- local c1, c2 = getchar(x), has_attr(x, attr_orig_char)
- c = has_attr(x, attr_dir) or c1 or c2
- cls = ltjf_find_char_class(c, m)
- if cls==0 then cls = slow_find_char_class(c2, m, c1) end
- else
- cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, getchar(x))
- end
- Nx.met, Nx.char = m, c; Nx.class = cls;
+ local c1, c2 = getchar(x), has_attr(x, attr_orig_char)
+ c = has_attr(x, attr_dir) or c1 or c2
+ 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
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
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)
- end
- local set_np_xspc_jachar = set_np_xspc_jachar
+ end
-- 欧文文字のデータを取得
local floor = math.floor
-- Np の情報取得メインルーチン
extract_np = function ()
local x, i = Np.nuc, Np.id;
- if i == id_jglyph then return set_np_xspc_jachar(Np, x)
- elseif i == id_glyph then return set_np_xspc_alchar(Np, getchar(x), x, 1)
- elseif i == id_hlist then Np.last_char = check_box_high(Np, getlist(x), nil)
- elseif i == id_pbox then Np.last_char = check_box_high(Np, Np.first, node_next(Np.last))
+-- if i == id_jglyph then return set_np_xspc_jachar(Np, x)
+-- elseif i == id_glyph then return set_np_xspc_alchar(Np, getchar(x), x, 1)
+-- if i == id_hlist then Np.last_char = check_box_high(Np, getlist(x), nil)
+ if i == id_pbox then Np.last_char = check_box_high(Np, Np.first, node_next(Np.last))
elseif i == id_disc then Np.last_char = check_box_high(Np, getfield(x, 'replace'), nil)
- elseif i == id_math then return set_np_xspc_alchar(Np, -1, x)
+-- elseif i == id_math then return set_np_xspc_alchar(Np, -1, x)
end
end
-
+
-- change the information for the next loop
-- (will be done if Nx is an alphabetic character or a hlist)
after_hlist = function (Nx)
local s = Nx.last_char
if s then
if getid(s)==id_glyph then
- if getfont(s) == (has_attr(s, attr_curjfnt) or -1) then
+ if getfont(s) == (has_attr(s, attr_curjfnt) or -1) then
set_np_xspc_jachar(Nx, s)
else
set_np_xspc_alchar(Nx, getchar(s), s, 2)
Nx.pre, Nx.met = nil, nil
end
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
if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end
setfield(p, 'penalty', a)
head = insert_before(head, Np.first, p)
- Bp[1]=p;
+ Bp[1]=p;
set_attr(p, attr_icflag, KINSOKU)
end
else for _, v in pairs(Bp) do add_penalty(v,a) end
local function handle_penalty_always(post, pre, g)
local a = (pre or 0) + (post or 0)
if #Bp == 0 then
- if not (g and getid(g)==id_glue) then
+ if not (g and getid(g)==id_glue) or a~=0 then
local p = node_new(id_penalty)
if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end
setfield(p, 'penalty', a)
local n
if g then
n,d = node_copy(g[2]), g[3]
- if g[1] then
+ if g[1] then
local f = node_new(id_glue)
set_attr(f, attr_icflag, g[4])
setfield(f, 'spec', n)
calc_ja_ja_aux = function (gb,ga, db, da)
local rbb, rab = (1-db)/2, (1-da)/2 -- 「前の文字」由来のグルーの割合
local rba, raa = (1+db)/2, (1+da)/2 -- 「前の文字」由来のグルーの割合
- if diffmet_rule ~= math.two_pleft and diffmet_rule ~= math.two_pright
+ if diffmet_rule ~= math.two_pleft and diffmet_rule ~= math.two_pright
and diffmet_rule ~= math.two_paverage then
rbb, rab, rba, raa = 1,0,0,1
end
- if not gb then
- if ga then
- gb = node_new(id_kern); setfield(gb, 'kern', 0)
+ if not gb then
+ if ga then
+ gb = node_new(id_kern); setfield(gb, 'kern', 0)
else return nil end
- elseif not ga then
+ elseif not ga then
ga = node_new(id_kern); setfield(ga, 'kern', 0)
end
-
+
local k = 2*getid(gb) - getid(ga)
if k == bg_ag then
local bs, as = getfield(gb, 'spec'), getfield(ga, 'spec')
setfield(gb, 'kern', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad)))
node_free(ga)
return gb
- elseif k == bk_ag then
+ elseif k == bk_ag then
local as = getfield(ga, 'spec')
-- gb: kern, ga: glue
local bd, ad = getfield(gb, 'kern'), getfield(as, 'width')
local gb, db = new_jfm_glue(qm, Nq.class,
slow_find_char_class(has_attr(npn, attr_orig_char),
qm, getchar(npn)))
- local ga, da = new_jfm_glue(pm,
+ local ga, da = new_jfm_glue(pm,
slow_find_char_class(has_attr(nqn, attr_orig_char),
pm, getchar(nqn)),
Np.class)
- return calc_ja_ja_aux(gb, ga, db, da);
+ return calc_ja_ja_aux(gb, ga, db, da);
end
end
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)
local function get_OA_skip()
if not ihb_flag then
local pm = Np.met
- return new_jfm_glue(pm,
+ return new_jfm_glue(pm,
fast_find_char_class(((Nq.id == id_math and -1) or (type(Nq.char)=='string' and Nq.char or 'jcharbdd')), pm), Np.class)
else return nil
end
local function get_OB_skip()
if not ihb_flag then
local qm = Nq.met
- return new_jfm_glue(qm, Nq.class,
+ return new_jfm_glue(qm, Nq.class,
fast_find_char_class(((Np.id == id_math and -1) or'jcharbdd'), qm))
else return nil
end
-- (anything) .. jachar
local function handle_np_jachar(mode)
local qid = Nq.id
- if qid==id_jglyph or ((qid==id_pbox or qid==id_pbox_w) and Nq.met) then
+ if qid==id_jglyph or ((qid==id_pbox or qid==id_pbox_w) and Nq.met) then
local g = calc_ja_ja_glue() or get_kanjiskip() -- M->K
handle_penalty_normal(Nq.post, Np.pre, g); real_insert(g)
elseif Nq.met then -- qid==id_hlist
local g = get_OA_skip() or get_kanjiskip() -- O_A->K
handle_penalty_normal(0, Np.pre, g); real_insert(g)
- elseif Nq.pre then
+ elseif Nq.pre then
local g = get_OA_skip() or get_xkanjiskip(Np) -- O_A->X
handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g); real_insert(g)
else
-- jachar .. (anything)
local function handle_nq_jachar()
- if Np.pre then
+ if Np.pre then
local g = get_OB_skip() 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
-- (anything) .. (和文文字で始まる hlist)
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
+ if qid==id_jglyph or ((qid==id_pbox or Nq.id == id_pbox_w) and Nq.met) then
local g = get_OB_skip() 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() -- K
handle_penalty_suppress(0, 0, g); real_insert(g)
- elseif Nq.pre then
+ elseif Nq.pre then
local g = get_xkanjiskip(Np) -- X
handle_penalty_suppress(0, 0, g); real_insert(g)
end
-- (和文文字で終わる hlist) .. (anything)
local function handle_nq_ja_hlist()
- if Np.pre then
+ if Np.pre then
local g = get_xkanjiskip(Nq) -- X
handle_penalty_suppress(0, 0, g); real_insert(g)
end
-- 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,
- [id_pbox_w] = function()
+ [id_pbox_w] = function()
luatexbase.call_callback("luatexja.jfmglue.whatsit_after",
- false, Nq, Np)
+ false, Nq, Np)
end,
}
else
-- 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
+ 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))
if g then
set_attr(g, attr_icflag, BOXBDD)
-- リスト先頭の処理
local function handle_list_head(par_indented)
local npi, pm = Np.id, Np.met
- if npi == id_jglyph or (npi==id_pbox and pm) then
+ if npi == id_jglyph or (npi==id_pbox and pm) then
if not ihb_flag then
local g = new_jfm_glue(pm, fast_find_char_class(par_indented, pm), Np.class)
if g then
local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
local KSK = luatexja.stack_table_index.KSK
local XSK = luatexja.stack_table_index.XSK
- local DIR = luatexja.stack_table_index.DIR
- init_var = function (mode)
+ local dir_yoko = luatexja.dir_table.dir_yoko
+ local dir_tate = luatexja.dir_table.dir_tate
+ local attr_yablshift = luatexbase.attributes['ltj@yablshift']
+ local attr_tablshift = luatexbase.attributes['ltj@tablshift']
+ init_var = function (mode,dir)
-- 1073741823: max_dimen
Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
table_current_stack = ltjs.table_current_stack
- list_dir = table_current_stack[DIR] or dir_yoko
+ list_dir = ltjs.list_dir or dir_yoko
+ local is_dir_tate = list_dir==dir_tate
+ capsule_glyph = is_dir_tate and ltjw.capsule_glyph_tate or ltjw.capsule_glyph_yoko
+ 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))
set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
get_kanjiskip = (getfield(getfield(kanji_skip, 'spec'), 'width') == 1073741823)
and get_kanjiskip_jfm or get_kanjiskip_normal
-
+
xkanji_skip = node_new(id_glue)
setfield(xkanji_skip, 'spec', skip_table_to_spec(XSK))
set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
get_xkanjiskip = (getfield(getfield(xkanji_skip, 'spec'), 'width') == 1073741823)
and get_xkanjiskip_jfm or get_xkanjiskip_normal
-
+
Np = {
- auto_kspc=nil, auto_xspc=nil, char=nil, class=nil,
- first=nil, id=nil, last=nil, met=nil, nuc=nil,
- post=nil, pre=nil, xspc=nil,
+ auto_kspc=nil, auto_xspc=nil, char=nil, class=nil,
+ first=nil, id=nil, last=nil, met=nil, nuc=nil,
+ post=nil, pre=nil, xspc=nil,
}
Nq = {
- auto_kspc=nil, auto_xspc=nil, char=nil, class=nil,
- first=nil, id=nil, last=nil, met=nil, nuc=nil,
- post=nil, pre=nil, xspc=nil,
+ auto_kspc=nil, auto_xspc=nil, char=nil, class=nil,
+ first=nil, id=nil, last=nil, met=nil, nuc=nil,
+ post=nil, pre=nil, xspc=nil,
}
- if mode then
+ if mode then
-- the current list is to be line-breaked:
-- hbox from \parindent is skipped.
local lp, par_indented, lpi, lps = head, 'boxbdd', getid(head), getsubtype(head)
- while lp and ((lpi==id_whatsit and lps~=sid_user)
+ while lp and ((lpi==id_whatsit and lps~=sid_user)
or ((lpi==id_hlist) and (lps==3))) do
- if (lpi==id_hlist) and (lps==3) then
+ if (lpi==id_hlist) and (lps==3) then
Np.char, par_indented = 'parbdd', 'parbdd'
Np.width = getfield(lp, 'width')
end
end
end
+local tex_set_attr = tex.setattribute
local function cleanup(mode)
-- adjust attr_icflag for avoiding error
- tex.setattribute('global', attr_icflag, 0)
+ tex_set_attr('global', attr_icflag, 0)
node_free(kanji_skip); node_free(xkanji_skip)
if mode then
local h = node_next(head)
return false
end
end
- return head
- else
- set_attr(head, attr_icflag,
- get_attr_icflag(head) + PROCESSED_BEGIN_FLAG);
- return head
end
+ return head
end
-------------------- 外部から呼ばれる関数
-- main interface
-function main(ahead, mode)
+function main(ahead, mode, dir)
if not ahead then return ahead end
head = ahead;
- local lp, last, par_indented = init_var(mode)
+ local lp, last, par_indented = init_var(mode,dir)
lp = calc_np(lp, last)
- if Np then
+ if Np then
extract_np(); handle_list_head(par_indented)
else
return cleanup(mode)
lp = calc_np(lp, last)
while Np do
extract_np();
- adjust_nq();
+ adjust_nq();
local pid, pm = Np.id, Np.met
-- 挿入部
- if pid == id_jglyph then
+ if pid == id_jglyph then
handle_np_jachar(mode)
- elseif pm then
+ elseif pm then
if pid==id_hlist then handle_np_ja_hlist()
else handle_np_jachar() end
- elseif Nq.met then
+ elseif Nq.met then
if Nq.id==id_hlist then handle_nq_ja_hlist()
else handle_nq_jachar() end
end
end
local function whatsit_callback(Np, lp, Nq)
- if Np and Np.nuc then return Np
+ if Np and Np.nuc then return Np
elseif Np and getfield(lp, 'user_id') == BPAR then
Np.first = lp; Np.nuc = lp; Np.last = lp
Np.char = 'parbdd'
OSDN Git Service
