--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2014/10/03',
+ date = '2015/02/07'
description = 'Insertion process of JFM glues and kanjiskip',
})
module('luatexja.jfmglue', package.seeall)
local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED
local BOXBDD = luatexja.icflag_table.BOXBDD
local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
+
+local attr_icflag = luatexbase.attributes['ltj@icflag']
local kanji_skip
local xkanji_skip
local table_current_stack
local tex_dir
local attr_ablshift
local set_np_xspc_jachar
+local set_np_xspc_jachar_hbox
-local attr_dir = luatexbase.attributes['ltj@dir']
-local attr_icflag = luatexbase.attributes['ltj@icflag']
+local ltjs_orig_char_table = ltjs.orig_char_table
local function get_attr_icflag(p)
return (has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG
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
+ if oc~=c and c and cls==0 then
+ return ltjf_find_char_class(c, m)
else
- return cls, oc
+ return cls
end
end
end
local Np, Nq, Bp
local widow_Bp, widow_Np -- \jcharwidowpenalty 挿入位置管理用
-local ihb_flag -- JFM グルー挿入抑止用 flag
- -- on: \inhibitglue 指定時，hlist の周囲
+local non_ihb_flag -- JFM グルー挿入抑止用 flag
+-- false: \inhibitglue 指定時 true: それ以外
-------------------- hlist 内の文字の検索
if first_char then
if getid(first_char)==id_glyph then
if getfield(first_char, 'lang') == lang_ja then
- set_np_xspc_jachar(Nx, first_char)
+ set_np_xspc_jachar_hbox(Nx, first_char)
else
set_np_xspc_alchar(Nx, getchar(first_char),first_char, 1)
end
function (stat, Nq, Np) return false end)
-- calc next Np
+local calc_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)
- end
-end
-
local function check_next_ickern(lp)
if lp and getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then
set_attr(lp, attr_icflag, IC_PROCESSED)
while lp ~=last and (lpa>=PACKED) and (lpa<BOXBDD) do
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
+ Np.first = first and nc or Np.first
else
nc, lp = lp, node_next(lp)
end
-- get_attr_icflag() ではいけない！
end
Np.nuc = nc
- return check_next_ickern(lp)
+ lp = check_next_ickern(lp)
+ Np.last_char = check_box_high(Np, Np.first, lp)
+ return lp
end
local ltjw_apply_ashift_math = ltjw.apply_ashift_math
local min, max = math.min, math.max
local function calc_np_aux_glyph_common(lp)
Np.nuc = lp
- Np.id = npi
+ Np.first= (Np.first or lp)
if getfield(lp, 'lang') == lang_ja then
Np.id = id_jglyph
- set_np_xspc_jachar(Np, lp)
+ local m, cls = set_np_xspc_jachar(Np, lp)
local npi, npf
- lp, head, npi, npf = capsule_glyph(lp, Np.met, Np.class, head, tex_dir)
+ lp, head, npi, npf = capsule_glyph(lp, m, cls, head, tex_dir, lp)
Np.first = (Np.first~=Np.nuc) and Np.first or npf or npi
Np.nuc = npi
return true, check_next_ickern(lp);
end
end
local calc_np_auxtable = {
- [id_glyph] = function (lp)
- Np.first= (Np.first or lp)
- return calc_np_aux_glyph_common(lp)
- end,
+ [id_glyph] = calc_np_aux_glyph_common,
[id_hlist] = function(lp)
local op, flag
head, lp, op, flag = ltjd_make_dir_whatsit(head, lp, list_dir, 'jfm hlist')
if lps==sid_user 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
+ head = node_remove(head, lp); node_free(lp); non_ihb_flag = false
return false, lq;
else
set_attr(lp, attr_icflag, PROCESSED)
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)
+ Np.last_char = check_box_high(Np, getfield(lp, 'replace'), nil)
return true, node_next(lp)
end,
[id_kern] = function(lp)
- Np.first = Np.first or lp
if getsubtype(lp)==2 then
+ Np.first = Np.first or 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); lp = node_next(lp)
set_attr(lp, attr_icflag, PROCESSED);
return calc_np_aux_glyph_common(lp)
else
+ Np.first = Np.first or lp
Np.id = id_kern; set_attr(lp, attr_icflag, PROCESSED)
Np.last = lp; return true, node_next(lp)
end
calc_np_auxtable[id_mark] = calc_np_auxtable.skip
calc_np_auxtable[id_adjust] = calc_np_auxtable.skip
-function calc_np(lp, last)
+function calc_np(last, lp)
local k
-- We assume lp = node_next(Np.last)
- Np, Nq, ihb_flag = Nq, Np, nil
+ Np, Nq, non_ihb_flag = Nq, Np, true
-- We clear `predefined' entries of Np before pairs() loop,
-- because using only pairs() loop is slower.
Np.post, Np.pre, Np.xspc = nil, nil, nil
if k then return lp end
end
end
- Np = nil; return lp
+ Np=nil
end
-
end
-local calc_np = calc_np
-- extract informations from Np
-- We think that "Np is a Japanese character" if Np.met~=nil,
-- 和文文字のデータを取得
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
- local attr_orig_char = luatexbase.attributes['ltj@origchar']
+ local attr_jchar_code = luatexbase.attributes['ltj@charcode']
local attr_autospc = luatexbase.attributes['ltj@autospc']
local attr_autoxspc = luatexbase.attributes['ltj@autoxspc']
- function set_np_xspc_jachar_yoko(Nx, x)
+ --local ltjf_get_vert_glyph = ltjf.get_vert_glyph
+ function set_np_xspc_jachar(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;
+ local c, c_glyph = ltjs_orig_char_table[x], getchar(x)
+ c = c or c_glyph
+ local cls = slow_find_char_class(c, m, c_glyph)
+ Nx.met, Nx.class, Nx.char = m, cls, c;
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.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)
+ return m, cls
end
- function set_np_xspc_jachar_tate(Nx, x)
+ function set_np_xspc_jachar_hbox(Nx, x)
local m = ltjf_font_metric_table[getfont(x)]
- local cls, c
- 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
+ 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;
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.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.char = 'jcharbdd'
else
- Nx.pre, Nx.post, Nx.char = 0, 0, -1
+ Nx.pre, Nx.post = 0, 0
Nx.xspc = table_current_stack[XSP - 1] or 3
end
Nx.met = nil
end
local set_np_xspc_alchar = set_np_xspc_alchar
--- 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)
--- 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)
- 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)
if s then
if getid(s)==id_glyph then
if getfield(s, 'lang') == lang_ja then
- set_np_xspc_jachar(Nx, s)
+ set_np_xspc_jachar_hbox(Nx, s)
else
set_np_xspc_alchar(Nx, getchar(s), s, 2)
end
-- 和文文字間の JFM glue を node 化
local function new_jfm_glue(m, bc, ac)
-- bc, ac: char classes
- local g, d = m.char_type[bc][ac], 0
- local n
+ local g = m.char_type[bc][ac]
if g then
- 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
+ setfield(f, 'spec', node_copy(g[2]))
+ return f, g[3]
+ else
+ return node_copy(g[2]), g[3]
end
end
- return n, d
+ return nil, 0
end
-- Nq.last (kern w) .... (glue/kern g) Np.first
-------------------- 和文文字間空白量の決定
-
+local null_skip_table = {0, 0, 0}
-- get kanjiskip
local get_kanjiskip
local get_kanjiskip_normal, get_kanjiskip_jfm
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}
+ local bk = qm.kanjiskip or null_skip_table
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}
+ local ak = pm.kanjiskip or null_skip_table
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])))
local bk_ak = 2*id_kern - id_kern
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 -- 「前の文字」由来のグルーの割合
+ local rbb, rab = 0.5*(1-db), 0.5*(1-da) -- 「前の文字」由来のグルーの割合
+ local rba, raa = 0.5*(1+db), 0.5*(1+da) -- 「前の文字」由来のグルーの割合
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
local function calc_ja_ja_glue()
- if ihb_flag then return nil
+ local qm, pm = Nq.met, Np.met
+ if (qm.char_type==pm.char_type) and (qm.var==pm.var) then
+ return new_jfm_glue(qm, Nq.class, Np.class)
else
- local qm, pm = Nq.met, Np.met
- if (qm.char_type==pm.char_type) and (qm.var==pm.var) then
- return new_jfm_glue(qm, Nq.class, Np.class)
- else
- local npn, nqn = Np.nuc, Nq.nuc
- 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,
- slow_find_char_class(has_attr(nqn, attr_orig_char),
- pm, getchar(nqn)),
- Np.class)
- return calc_ja_ja_aux(gb, ga, db, da);
- end
+ local npn, nqn = Np.nuc, Nq.nuc
+ local gb, db = new_jfm_glue(qm, Nq.class,
+ slow_find_char_class(Np.char,
+ qm, getchar(npn)))
+ local ga, da = new_jfm_glue(pm,
+ slow_find_char_class(Nq.char,
+ pm, getchar(nqn)),
+ Np.class)
+ return calc_ja_ja_aux(gb, ga, db, da);
end
end
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}
+ local bk = Nn.met.xkanjiskip or null_skip_table
setfield(gx, 'width', bk[1])
setfield(gx, 'stretch', bk[2])
setfield(gx, 'shrink', bk[3])
-------------------- 隣接した「塊」間の処理
local function get_OA_skip()
- if not ihb_flag then
- local pm = Np.met
- 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 pm = Np.met
+ return new_jfm_glue(pm,
+ fast_find_char_class((Nq.id == id_math and -1 or 'jcharbdd'), pm), Np.class)
end
local function get_OB_skip()
- if not ihb_flag then
- local qm = Nq.met
- return new_jfm_glue(qm, Nq.class,
- fast_find_char_class(((Np.id == id_math and -1) or'jcharbdd'), qm))
- else return nil
- end
+ local qm = Nq.met
+ return new_jfm_glue(qm, Nq.class,
+ fast_find_char_class((Np.id == id_math and -1 or'jcharbdd'), qm))
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
- local g = calc_ja_ja_glue() or get_kanjiskip() -- M->K
+ local g = non_ihb_flag and 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
+ local g = non_ihb_flag and get_OA_skip() or get_kanjiskip() -- O_A->K
handle_penalty_normal(0, Np.pre, g); real_insert(g)
elseif Nq.pre then
- local g = get_OA_skip() or get_xkanjiskip(Np) -- O_A->X
+ local g = non_ihb_flag and 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
- local g = 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 = get_OB_skip() or get_xkanjiskip(Nq) -- O_B->X
+ local g = non_ihb_flag and 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
- local g = 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 = get_OB_skip() or get_kanjiskip() -- O_B->K
+ local g = non_ihb_flag and 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
-- Insert \jcharwidowpenalty
Bp = widow_Bp; Np = widow_Np
if Np.first then
- handle_penalty_normal(0,
- table_current_stack[JWP] or 0)
+ handle_penalty_normal(0, table_current_stack[JWP] or 0)
end
else
-- the current list is the contents of a hbox
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 not ihb_flag then
+ if non_ihb_flag then
local g = new_jfm_glue(pm, fast_find_char_class(par_indented, pm), Np.class)
if g then
set_attr(g, attr_icflag, BOXBDD)
local dir_tate = luatexja.dir_table.dir_tate
local attr_yablshift = luatexbase.attributes['ltj@yablshift']
local attr_tablshift = luatexbase.attributes['ltj@tablshift']
+ local table_pool = {
+ {}, {}, {first=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, },
+ { 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, },
+ }
init_var = function (mode,dir)
-- 1073741823: max_dimen
- Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
+ Bp, widow_Bp, widow_Np, Np, Nq
+ = table_pool[1], table_pool[2], table_pool[3], table_pool[4], table_pool[5]
+ for i=1,5 do for j,_ in pairs(table_pool[i]) do table_pool[i][j]=nil end end
table_current_stack = ltjs.table_current_stack
- list_dir = ltjs.list_dir or dir_yoko
+ list_dir, tex_dir = (ltjs.list_dir or dir_yoko), (dir or 'TLT')
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,
- }
- 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,
- }
+
+ do
+ kanji_skip = node_new(id_glue); set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
+ local s = skip_table_to_spec(KSK)
+ setfield(kanji_skip, 'spec', s)
+ get_kanjiskip = (getfield(s, 'width') == 1073741823)
+ and get_kanjiskip_jfm or get_kanjiskip_normal
+ end
+
+ do
+ 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
+ end
+
if mode then
-- the current list is to be line-breaked:
-- hbox from \parindent is skipped.
end
end
-local tex_set_attr = tex.setattribute
+local ensure_tex_attr = ltjb.ensure_tex_attr
local function cleanup(mode)
-- adjust attr_icflag for avoiding error
- tex_set_attr('global', attr_icflag, 0)
+ if tex.getattribute(attr_icflag)~=0 then ensure_tex_attr(attr_icflag, 0) end
node_free(kanji_skip); node_free(xkanji_skip)
+
if mode then
local h = node_next(head)
if getid(h) == id_penalty and getfield(h, 'penalty') == 10000 then
if not ahead then return ahead end
head = ahead;
local lp, last, par_indented = init_var(mode,dir)
- lp = calc_np(lp, last)
+ lp = calc_np(last, lp)
if Np then
- extract_np(); handle_list_head(par_indented)
- else
- return cleanup(mode)
- end
- lp = calc_np(lp, last)
- while Np do
- extract_np();
- adjust_nq();
- local pid, pm = Np.id, Np.met
- -- 挿入部
- if pid == id_jglyph then
- handle_np_jachar(mode)
- elseif pm then
- if pid==id_hlist then handle_np_ja_hlist()
- else handle_np_jachar() end
- elseif Nq.met then
- if Nq.id==id_hlist then handle_nq_ja_hlist()
- else handle_nq_jachar() end
+ handle_list_head(par_indented)
+ lp = calc_np(last,lp); while Np do
+ adjust_nq();
+ local pid, pm = Np.id, Np.met
+ -- 挿入部
+ if pid == id_jglyph then
+ handle_np_jachar(mode)
+ elseif pm then
+ if pid==id_hlist then handle_np_ja_hlist()
+ else handle_np_jachar() end
+ elseif Nq.met then
+ if Nq.id==id_hlist then handle_nq_ja_hlist()
+ else handle_nq_jachar() end
+ end
+ lp = calc_np(last,lp)
end
- lp = calc_np(lp, last)
+ handle_list_tail(mode)
end
- handle_list_tail(mode)
return cleanup(mode)
end
end
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'
- Np.met = nil
- Np.pre = 0; Np.post = 0
- Np.xspc = 0
- Np.auto_xspc = false
return Np
end
end
if not s and getfield(Nq.nuc, 'user_id') == BPAR then
local x, y = node_prev(Nq.nuc), Nq.nuc
Nq.first, Nq.nuc, Nq.last = x, x, x
+ if Np then
+ if Np.met then
+ Nq.class = fast_find_char_class('parbdd', Np.met)
+ end
+ Nq.met = Np.met; Nq.pre = 0; Nq.post = 0; Nq.xspc = 0
+ Nq.auto_xspc = false
+ end
head = node_remove(head, y)
node_free(y)
end
OSDN Git Service
