--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2015/01/13',
+ date = '2015/05/03',
description = 'Insertion process of JFM glues and kanjiskip',
})
module('luatexja.jfmglue', package.seeall)
local id_pbox = 257 -- already processed nodes (by \unhbox)
local id_pbox_w = 258 -- cluster which consists of a whatsit
local sid_user = node.subtype('user_defined')
-local lang_ja = token.create('ltj@@japanese')[2]
+local lang_ja = luatexja.lang_ja
local sid_start_link = node.subtype('pdf_start_link')
local sid_start_thread = node.subtype('pdf_start_thread')
local ITALIC = luatexja.icflag_table.ITALIC
local PACKED = luatexja.icflag_table.PACKED
local KINSOKU = luatexja.icflag_table.KINSOKU
+local FROM_JFM = luatexja.icflag_table.FROM_JFM
local PROCESSED = luatexja.icflag_table.PROCESSED
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 = node_new(id_glue)
-local xkanji_skip = node_new(id_glue)
-do
- local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
- local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
- set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
- set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
-end
-
+local kanji_skip
+local xkanji_skip
local table_current_stack
local list_dir
local capsule_glyph
last_char = s; found_visible_node = true
else
if getfield(p, 'shift')==0 then
+ last_char = nil
if check_box(getlist(p), nil) then found_visible_node = true end
else
find_first_char = false; last_char = nil
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)
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(lx) -- lx: アクセント本体
+ setfield(lx, 'yoffset', getfield(lx, 'yoffset') - (has_attr(lx,attr_ablshift) or 0))
lx = node_next(node_next(lx))
elseif ls==0 then
Np.last = lx
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
+ if not ct then -- variation selector
+ node_free(r)
+ elseif (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
-------------------- 最下層の処理
-- change penalties (or create a new penalty, if needed)
-local pen_skel = node_new(id_penalty)
-set_attr(pen_skel, attr_icflag, KINSOKU)
-
local function handle_penalty_normal(post, pre, g)
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_copy(pen_skel)
+ 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)
Bp[1]=p;
+ set_attr(p, attr_icflag, KINSOKU)
end
else for _, v in pairs(Bp) do add_penalty(v,a) end
end
local a = (pre or 0) + (post or 0)
if #Bp == 0 then
if not (g and getid(g)==id_glue) or a~=0 then
- local p = node_copy(pen_skel)
+ 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)
Bp[1]=p
+ set_attr(p, attr_icflag, KINSOKU)
end
else for _, v in pairs(Bp) do add_penalty(v,a) end
end
local a = (pre or 0) + (post or 0)
if #Bp == 0 then
if g and getid(g)==id_glue then
- local p = node_copy(pen_skel)
+ 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)
end
else for _, v in pairs(Bp) do add_penalty(v,a) end
end
end
-- 和文文字間の JFM glue を node 化
-local new_jfm_glue
-do
- local FROM_JFM = luatexja.icflag_table.FROM_JFM
- local glue_skel = {}
- for i=FROM_JFM-2,FROM_JFM+2 do
- glue_skel[i]= node_new(id_glue); set_attr(glue_skel[i], attr_icflag, i)
- end
- function new_jfm_glue(m, bc, ac)
- -- bc, ac: char classes
- local g = m.char_type[bc][ac]
- if g then
- if g[1] then
- local f = node_copy(glue_skel[g[4]])
- setfield(f, 'spec', node_copy(g[2]))
- return f, g[3]
- else
- return node_copy(g[2]), g[3]
- end
+local function new_jfm_glue(m, bc, ac)
+-- bc, ac: char classes
+ local g = m.char_type[bc][ac]
+ if g then
+ if g[1] then
+ local f = node_new(id_glue)
+ set_attr(f, attr_icflag, g[4])
+ setfield(f, 'spec', node_copy(g[2]))
+ return f, g[3]
+ else
+ return node_copy(g[2]), g[3]
end
- return nil, 0
end
+ return nil, 0
end
-- Nq.last (kern w) .... (glue/kern g) Np.first
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 = non_ihb_flag and 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 = non_ihb_flag and get_OA_skip() or get_kanjiskip() -- O_A->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 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
+ local TEMP = node_new(id_glue)
+ -- TEMP is a dummy node, which will be freed at the end of the callback.
+ -- ithout this node, set_attr(kanji_skip, ...) somehow creates an "orphaned" attribute list.
+
+ 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
- setfield(kanji_skip, 'spec', skip_table_to_spec(KSK))
- get_kanjiskip = (getfield(getfield(kanji_skip, 'spec'), 'width') == 1073741823)
- and get_kanjiskip_jfm or get_kanjiskip_normal
-
- setfield(xkanji_skip, 'spec', skip_table_to_spec(XSK))
- get_xkanjiskip = (getfield(getfield(xkanji_skip, 'spec'), 'width') == 1073741823)
- and get_xkanjiskip_jfm or get_xkanjiskip_normal
+ 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:
Np.width = getfield(lp, 'width')
end
lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
- return lp, node_tail(head), par_indented
+ return lp, node_tail(head), par_indented, TEMP
else
- return head, nil, 'boxbdd'
+ return head, nil, 'boxbdd', TEMP
end
end
end
-local tex_set_attr = tex.setattribute
-local function cleanup(mode)
+local ensure_tex_attr = ltjb.ensure_tex_attr
+local function cleanup(mode, TEMP)
-- adjust attr_icflag for avoiding error
- if tex.getattribute(attr_icflag)~=0 then tex_set_attr('global', attr_icflag, 0) end
- node_free(getfield(kanji_skip, 'spec'))
- node_free(getfield(xkanji_skip, 'spec'))
+ if tex.getattribute(attr_icflag)~=0 then ensure_tex_attr(attr_icflag, 0) end
+ node_free(kanji_skip); node_free(xkanji_skip); node_free(TEMP)
+
if mode then
local h = node_next(head)
if getid(h) == id_penalty and getfield(h, 'penalty') == 10000 then
function main(ahead, mode, dir)
if not ahead then return ahead end
head = ahead;
- local lp, last, par_indented = init_var(mode,dir)
+ local lp, last, par_indented, TEMP = init_var(mode,dir)
lp = calc_np(last, lp)
if Np then
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)
+ 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
handle_list_tail(mode)
end
- return cleanup(mode)
+ return cleanup(mode, TEMP)
end
end
OSDN Git Service
