--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2014/1/21',
+ date = '2014/02/01',
description = 'Insertion process of JFM glues and kanjiskip',
})
module('luatexja.jfmglue', package.seeall)
local ltjf_find_char_class = ltjf.find_char_class
local node_new = Dnode.new
local node_copy = Dnode.copy
-local node_remove = Dnode.remove
+local node_remove = luatexja.Dnode_remove -- Dnode.remove
local node_tail = Dnode.tail
local node_free = Dnode.free
local node_end_of_math = Dnode.end_of_math
local PACKED = luatexja.icflag_table.PACKED
local KINSOKU = luatexja.icflag_table.KINSOKU
local FROM_JFM = luatexja.icflag_table.FROM_JFM
-local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
-local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
local PROCESSED = luatexja.icflag_table.PROCESSED
local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED
local BOXBDD = luatexja.icflag_table.BOXBDD
setfield(zero_glue, 'spec', spec_zero_glue)
local function skip_table_to_spec(n)
- local g, st = node_new(id_glue_spec), ltjs.fast_get_skip_table(n)
+ local g, st = node_new(id_glue_spec), ltjs.fast_get_stack_skip(n)
setfield(g, 'width', st.width)
setfield(g, 'stretch', st.stretch)
setfield(g, 'shrink', st.shrink)
pid = getid(p) -- p must be non-nil
end
if pid==id_kern then
- if get_attr_icflag(p)==IC_PROCESSED 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));
-- Note that another node_next will be executed outside this if-statement.
else
found_visible_node = true
- if find_first_char then
- find_first_char = false
- else
- last_char = nil
- end
+ find_first_char = false; last_char = nil
end
elseif pid==id_hlist then
if PACKED == get_attr_icflag(p) then
else
if getfield(p, 'shift')==0 then
if check_box(getlist(p), nil) then found_visible_node = true end
- else if find_first_char then
- find_first_char = false
- else
- last_char = nil
- end
+ else
+ find_first_char = false; last_char = nil
end
end
elseif pid==id_math 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 not (pid==id_ins or pid==id_mark
or pid==id_adjust or pid==id_whatsit
or pid==id_penalty) then
found_visible_node = true
- if find_first_char then
- find_first_char = false
- else
- last_char = nil
- end
+ find_first_char = false; last_char = nil
end
p = node_next(p)
end
end
end
-local function calc_np_pbox(lp, last)
+local function calc_np_pbox(lp)
Np.first = Np.first or lp; Np.id = id_pbox
- local lpa = KINSOKU -- dummy=
+ local lpa, nc = KINSOKU, nil
set_attr(lp, attr_icflag, get_attr_icflag(lp));
- while lp~=last and lpa>=PACKED and lpa<BOXBDD do
- Np.nuc = lp;
- lp = node_next(lp); lpa = has_attr(lp, attr_icflag) or 0
- -- get_attr_icflag() ではいけない！
+ while lp and (lpa>=PACKED) and (lpa<BOXBDD) do
+ nc, lp = lp, node_next(lp); lpa = has_attr(lp, attr_icflag) or 0
+ -- get_attr_icflag() ではいけない！
end
+ Np.nuc = nc
return check_next_ickern(lp)
end
[id_whatsit] = function(lp)
local lps = getsubtype(lp)
if lps==sid_user then
- if getsubtype(lp, 'user_id')==luatexja.userid_table.IHB then
+ if getfield(lp, 'user_id')==luatexja.userid_table.IHB then
local lq = node_next(lp);
head = node_remove(head, lp); node_free(lp); ihb_flag = true
return false, lq;
calc_np_auxtable[id_disc] = calc_np_auxtable.discglue
calc_np_auxtable[id_glue] = calc_np_auxtable.discglue
-function calc_np(lp, last)
+function calc_np(lp)
local k
-- We assume lp = node_next(Np.last)
Np, Nq, ihb_flag = Nq, Np, nil
for k in pairs(Np) do Np[k] = nil end
for k = 1,#Bp do Bp[k] = nil end
- while lp ~= last do
+ while lp do
local lpa = has_attr(lp, attr_icflag) or 0
-- unbox 由来ノードの検出
if lpa>=PACKED then
if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then
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)
end -- id_pbox
else
k, lp = calc_np_auxtable[getid(lp)](lp)
local a = (pre or 0) + (post or 0)
if #Bp == 0 then
if (a~=0 and not(g and getid(g)==id_kern)) then
- local p = node_new(id_penalty); --copy_attr(p, Nq.nuc)
+ local p = node_new(id_penalty)
if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end
setfield(p, 'penalty', a)
head = insert_before(head, Np.first, p)
local a = (pre or 0) + (post or 0)
if #Bp == 0 then
if not (g and getid(g)==id_glue) then
- local p = node_new(id_penalty); --copy_attr(p, Nq.nuc)
+ local p = node_new(id_penalty)
if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end
setfield(p, 'penalty', a)
head = insert_before(head, Np.first, p)
local a = (pre or 0) + (post or 0)
if #Bp == 0 then
if g and getid(g)==id_glue then
- local p = node_new(id_penalty); --copy_attr(p, Nq.nuc)
+ local p = node_new(id_penalty)
setfield(p, 'penalty', 10000); head = insert_before(head, Np.first, p)
Bp[1]=p
set_attr(p, attr_icflag, KINSOKU)
local g, d = m.char_type[bc][ac], 0
local n
if g then
- n,d = node_copy(g[2]), g[3];
- if g[1] then setfield(n, 'spec', node_copy(getfield(n, 'spec'))) end
+ n,d = node_copy(g[2]), g[3]
+ if g[1] then
+ local f = node_new(id_glue)
+ set_attr(f, attr_icflag, g[4])
+ setfield(f, 'spec', n)
+ return f, d
+ end
end
return n, d
end
-- get kanjiskip
local get_kanjiskip
-
-local function get_kanjiskip_normal()
- if Np.auto_kspc or Nq.auto_kspc then
- return node_copy(kanji_skip)
- else
- local g = node_copy(zero_glue)
- set_attr(g, attr_icflag, KANJI_SKIP)
- return g
+local get_kanjiskip_normal, get_kanjiskip_jfm
+do
+ local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
+ local KANJI_SKIP_JFM = luatexja.icflag_table.KANJI_SKIP_JFM
+ get_kanjiskip_normal = function ()
+ if Np.auto_kspc or Nq.auto_kspc then
+ return node_copy(kanji_skip)
+ else
+ local g = node_copy(zero_glue)
+ set_attr(g, attr_icflag, KANJI_SKIP)
+ return g
+ end
end
-end
-local function get_kanjiskip_jfm()
- local g
- if Np.auto_kspc or Nq.auto_kspc then
- g = node_new(id_glue); --copy_attr(g, Nq.nuc)
- local gx = node_new(id_glue_spec);
- setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
- local pm, qm = Np.met, Nq.met
- local bk = qm.kanjiskip or {0, 0, 0}
- if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
- setfield(gx, 'width', bk[1])
- setfield(gx, 'stretch', bk[2])
- setfield(gx, 'shrink', bk[3])
+ get_kanjiskip_jfm = function ()
+ local g
+ if Np.auto_kspc or Nq.auto_kspc then
+ g = node_new(id_glue); --copy_attr(g, Nq.nuc)
+ local gx = node_new(id_glue_spec);
+ setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
+ local pm, qm = Np.met, Nq.met
+ local bk = qm.kanjiskip or {0, 0, 0}
+ if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
+ setfield(gx, 'width', bk[1])
+ setfield(gx, 'stretch', bk[2])
+ setfield(gx, 'shrink', bk[3])
+ else
+ local ak = pm.kanjiskip or {0, 0, 0}
+ setfield(gx, 'width', round(diffmet_rule(bk[1], ak[1])))
+ setfield(gx, 'stretch', round(diffmet_rule(bk[2], ak[2])))
+ setfield(gx, 'shrink', -round(diffmet_rule(-bk[3], -ak[3])))
+ end
+ setfield(g, 'spec', gx)
else
- local ak = pm.kanjiskip or {0, 0, 0}
- setfield(gx, 'width', round(diffmet_rule(bk[1], ak[1])))
- setfield(gx, 'stretch', round(diffmet_rule(bk[2], ak[2])))
- setfield(gx, 'shrink', -round(diffmet_rule(-bk[3], -ak[3])))
+ g = node_copy(zero_glue)
end
- setfield(g, 'spec', gx)
- else
- g = node_copy(zero_glue)
+ set_attr(g, attr_icflag, KANJI_SKIP_JFM)
+ return g
end
- set_attr(g, attr_icflag, KANJI_SKIP)
- return g
end
local calc_ja_ja_aux
gb = node_new(id_kern); setfield(gb, 'kern', 0)
else return nil end
elseif not ga then
- ga = node_new(id_kern); gsetfield(ga, 'kern', 0)
+ ga = node_new(id_kern); setfield(ga, 'kern', 0)
end
local k = 2*getid(gb) - getid(ga)
-- get xkanjiskip
local get_xkanjiskip
-local function get_xkanjiskip_normal(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
- else
- local g = node_copy(zero_glue)
- set_attr(g, attr_icflag, XKANJI_SKIP)
- return g
+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 (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
+ else
+ local g = node_copy(zero_glue)
+ set_attr(g, attr_icflag, XKANJI_SKIP)
+ return g
+ end
end
-end
-local function get_xkanjiskip_jfm(Nn)
- local g
- 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 {0, 0, 0}
- setfield(gx, 'width', bk[1])
- setfield(gx, 'stretch', bk[2])
- setfield(gx, 'shrink', bk[3])
- setfield(g, 'spec', gx)
- else
- g = node_copy(zero_glue)
+ get_xkanjiskip_jfm = function (Nn)
+ local g
+ 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 {0, 0, 0}
+ setfield(gx, 'width', bk[1])
+ setfield(gx, 'stretch', bk[2])
+ setfield(gx, 'shrink', bk[3])
+ setfield(g, 'spec', gx)
+ else
+ g = node_copy(zero_glue)
+ end
+ set_attr(g, attr_icflag, XKANJI_SKIP_JFM)
+ return g
end
- set_attr(g, attr_icflag, XKANJI_SKIP)
- return g
end
-------------------- 隣接した「塊」間の処理
-------------------- 開始・終了時の処理
+do
-- リスト末尾の処理
local JWP = luatexja.stack_table_index.JWP
-- initialize
-- return value: (the initial cursor lp), (last node)
-local function init_var(mode)
- -- 1073741823: max_dimen
- Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
- table_current_stack = ltjs.table_current_stack
-
- kanji_skip = node_new(id_glue)
- setfield(kanji_skip, 'spec', skip_table_to_spec('kanjiskip'))
- 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('xkanjiskip'))
- 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,
- }
- 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,
- }
- 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)
- or ((lpi==id_hlist) and (lps==3))) do
- if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end
- lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
- return lp, node_tail(head), par_indented
- else
- -- the current list is the contents of a hbox:
- -- insert a sentinel
- local g = node_new(id_kern)
- insert_after(head, node_tail(head), g); last = g
- return head, g, 'boxbdd'
+local init_var
+do
+ local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
+ local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
+ local KSK = luatexja.stack_table_index.KSK
+ local XSK = luatexja.stack_table_index.XSK
+ init_var = function (mode)
+ -- 1073741823: max_dimen
+ Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
+ table_current_stack = ltjs.table_current_stack
+
+ 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,
+ }
+ 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,
+ }
+ 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)
+ or ((lpi==id_hlist) and (lps==3))) do
+ if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end
+ lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
+ return lp, par_indented
+ else
+ return head, 'boxbdd'
+ end
end
end
-local function cleanup(mode, last)
+local function cleanup(mode)
-- adjust attr_icflag for avoiding error
tex.setattribute('global', attr_icflag, 0)
node_free(kanji_skip); node_free(xkanji_skip)
end
return head
else
- head = node_remove(head, last); node_free(last);-- remove the sentinel
set_attr(head, attr_icflag,
get_attr_icflag(head) + PROCESSED_BEGIN_FLAG);
return head
function main(ahead, mode)
if not ahead then return ahead end
head = ahead;
- local lp, last, par_indented = init_var(mode);
+ local lp, par_indented = init_var(mode);
lp = calc_np(lp, last)
if Np then
extract_np(); handle_list_head(par_indented)
else
return cleanup(mode, last)
end
- lp = calc_np(lp, last)
+ lp = calc_np(lp)
while Np do
extract_np();
adjust_nq();
if Nq.id==id_hlist then handle_nq_ja_hlist()
else handle_nq_jachar() end
end
- lp = calc_np(lp, last)
+ lp = calc_np(lp)
end
handle_list_tail(mode)
- return cleanup(mode, last)
+ return cleanup(mode)
+end
end
do
local x, y = node_prev(Nq.nuc), Nq.nuc
Nq.first, Nq.nuc, Nq.last = x, x, x
head = node_remove(head, y)
+ node_free(y)
end
return s
end
OSDN Git Service
