X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=371c17f2e47898f2aa33c22f53778601bd8ad0d2;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=e37e687ca4c36d2691d68e7beb9f28e7a653ec56;hpb=a6c37dba4272ef5de87886c805f6f902aa5f7175;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index e37e687..371c17f 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -3,49 +3,47 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2014/02/02', + date = '2016/03/31', 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 nullfunc = function(n) return n end -local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc -local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc - -local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end -local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end -local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end -local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end -local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end -local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end -local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end - -local has_attr = Dnode.has_attribute -local set_attr = Dnode.set_attribute -local insert_before = Dnode.insert_before -local insert_after = Dnode.insert_after -local node_next = (Dnode ~= node) and Dnode.getnext or node.next +local to_node = node.direct.tonode +local to_direct = node.direct.todirect + +local setfield = node.direct.setfield +local setglue = luatexja.setglue +local getfield = node.direct.getfield +local getid = node.direct.getid +local getfont = node.direct.getfont +local getlist = node.direct.getlist +local getchar = node.direct.getchar +local getsubtype = node.direct.getsubtype + +local has_attr = node.direct.has_attribute +local set_attr = node.direct.set_attribute +local insert_before = node.direct.insert_before +local insert_after = node.direct.insert_after +local node_next = node.direct.getnext local round = tex.round -local ltjd_make_dir_node = ltjd.make_dir_node +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_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 node_new = node.direct.new +local node_copy = node.direct.copy +local node_remove = node.direct.remove +local node_tail = node.direct.tail +local node_free = node.direct.free +local node_end_of_math = node.direct.end_of_math local id_glyph = node.id('glyph') local id_hlist = node.id('hlist') @@ -61,12 +59,12 @@ local id_glue = node.id('glue') local id_kern = node.id('kern') local id_penalty = node.id('penalty') -local id_glue_spec = node.id('glue_spec') local id_jglyph = 512 -- Japanese character local id_box_like = 256 -- vbox, shifted hbox 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 = luatexja.lang_ja local sid_start_link = node.subtype('pdf_start_link') local sid_start_thread = node.subtype('pdf_start_thread') @@ -81,14 +79,19 @@ 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 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 set_np_xspc_jachar_hbox -local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] -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 @@ -96,42 +99,30 @@ end -------------------- Helper functions -local function copy_attr(new, old) - -- 仕様が決まるまで off にしておく -end - -- This function is called only for acquiring `special' characters. local function fast_find_char_class(c,m) return m.chars[c] or 0 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 c and cls==0 then + return ltjf_find_char_class(c, m) + else + return cls + end + end end -local zero_glue = node_new(id_glue) -spec_zero_glue = to_node(node_new(id_glue_spec)) - -- must be public, since mentioned from other sources -local spec_zero_glue = to_direct(spec_zero_glue) -setfield(spec_zero_glue, 'width', 0) -setfield(spec_zero_glue, 'stretch', 0) -setfield(spec_zero_glue, 'shrink', 0) -setfield(spec_zero_glue, 'stretch_order', 0) -setfield(spec_zero_glue, 'shrink_order', 0) -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_stack_skip(n) - setfield(g, 'width', st.width) - setfield(g, 'stretch', st.stretch) - setfield(g, 'shrink', st.shrink) - setfield(g, 'stretch_order', st.stretch_order) - setfield(g, 'shrink_order', st.shrink_order) - return g +local function skip_table_to_glue(n) + local g, st = node_new(id_glue), ltjs.fast_get_stack_skip(n) + setglue(g, st.width, st.stretch, st.shrink, st.stretch_order, st.shrink_order) + return g, (st.width==1073741823) end @@ -139,16 +130,15 @@ end 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」の間の調整方法 @@ -164,13 +154,14 @@ local head -- the head of current list 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 内の文字の検索 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 @@ -196,7 +187,6 @@ local function check_box(box_ptr, box_end) 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 @@ -208,12 +198,14 @@ local function check_box(box_ptr, box_end) 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 + last_char = nil if check_box(getlist(p), nil) then found_visible_node = true end else find_first_char = false; last_char = nil @@ -224,7 +216,8 @@ local function check_box(box_ptr, box_end) 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 @@ -242,8 +235,8 @@ function check_box_high(Nx, box_ptr, box_end) 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 - set_np_xspc_jachar(Nx, first_char) + if getfield(first_char, 'lang') == lang_ja then + set_np_xspc_jachar_hbox(Nx, first_char) else set_np_xspc_alchar(Nx, getchar(first_char),first_char, 1) end @@ -254,7 +247,7 @@ function check_box_high(Nx, box_ptr, box_end) end return last_char end - +end -------------------- Np の計算と情報取得 luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data", @@ -268,17 +261,13 @@ luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data", function (stat, Nq, Np) return false end) -- calc next Np +local calc_np do -local function set_attr_icflag_processed(p) - if get_attr_icflag(p)<= ITALIC then - set_attr(p, attr_icflag, PROCESSED) - end -end - +local traverse = node.direct.traverse 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) + if lp and getid(lp) == id_kern and ( getsubtype(lp)==3 or ITALIC == get_attr_icflag(lp)) then + set_attr(lp, attr_icflag, IC_PROCESSED); Np.last = lp; return node_next(lp) else Np.last = Np.nuc; return lp @@ -286,35 +275,145 @@ local function check_next_ickern(lp) 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=85) and 3 or 0 +local function calc_np_aux_glyph_common(lp) + Np.nuc = lp + Np.first= (Np.first or lp) + if getfield(lp, 'lang') == lang_ja then + Np.id = id_jglyph + local m, mc, cls = set_np_xspc_jachar(Np, lp) + local npi, npf + 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); + 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 getfield(lx, 'lang') ~= lang_ja 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(lx, '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) -- lx: アクセント本体 + if getid(lx)==id_glyph then + setfield(lx, 'yoffset', getfield(lx, 'yoffset') - (has_attr(lx,attr_ablshift) or 0)) + else -- アクセントは上下にシフトされている + setfield(lx, 'shift', getfield(lx, 'shift') + (has_attr(lx,attr_ablshift) or 0)) + end + lx = node_next(node_next(lx)) + elseif ls==0 then + Np.last = lx + elseif (ls==3) or (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,rule_subtype) + 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 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 + 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)); - end, + [id_glyph] = calc_np_aux_glyph_common, [id_hlist] = function(lp) local op, flag - head, lp, op, flag = ltjd_make_dir_node(head, lp, list_dir, 'jfm 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; - Np.id = (flag or getfield(op, 'shift')~=0) and id_box_like or id_hlist + 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, [id_vlist] = function(lp) local op - head, lp, op = ltjd_make_dir_node(head, lp, list_dir, 'jfm:' .. getid(lp)) + 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 @@ -333,7 +432,7 @@ local calc_np_auxtable = { 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) @@ -360,26 +459,40 @@ local calc_np_auxtable = { [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) - 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) + [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) + 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) + if getid(lp)==id_glyph then -- アクセント本体 + setfield(lp, 'yoffset', getfield(lp, 'yoffset') - (has_attr(lp,attr_ablshift) or 0)) + else -- アクセントは上下にシフトされている + setfield(lp, 'shift', getfield(lp, 'shift') + (has_attr(lp,attr_ablshift) or 0)) + end 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.first = Np.first or lp Np.id = id_kern; set_attr(lp, attr_icflag, PROCESSED) Np.last = lp; return true, node_next(lp) end @@ -390,17 +503,22 @@ local calc_np_auxtable = { end, } calc_np_auxtable[id_rule] = calc_np_auxtable.box_like -calc_np_auxtable[13] = calc_np_auxtable.box_like +if status.luatex_version>=85 then + calc_np_auxtable[15] = calc_np_auxtable.box_like +else + calc_np_auxtable[13] = calc_np_auxtable.box_like +end 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 +if node.id('local_par') then + calc_np_auxtable[node.id('local_par')] = calc_np_auxtable.skip +end -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 @@ -411,23 +529,22 @@ function calc_np(lp, last) for k = 1,#Bp do Bp[k] = nil end while lp ~= last do local lpa = has_attr(lp, attr_icflag) or 0 - -- unbox 由来ノードの検出 + -- 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, last) end -- id_pbox else k, lp = calc_np_auxtable[getid(lp)](lp) 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, @@ -440,32 +557,41 @@ do 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_jchar_code = luatexbase.attributes['ltj@charcode'] local attr_autospc = luatexbase.attributes['ltj@autospc'] local attr_autoxspc = luatexbase.attributes['ltj@autoxspc'] + --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 - 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 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; + 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.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, 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 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 -- 欧文文字のデータを取得 local floor = math.floor @@ -480,9 +606,8 @@ do 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 @@ -490,26 +615,14 @@ do 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) - 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)) - 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) 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 - set_np_xspc_jachar(Nx, s) + if getfield(s, 'lang') == lang_ja then + set_np_xspc_jachar_hbox(Nx, s) else set_np_xspc_alchar(Nx, getchar(s), s, 2) end @@ -522,7 +635,7 @@ do 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 @@ -549,7 +662,7 @@ 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) @@ -575,20 +688,20 @@ local function handle_penalty_suppress(post, pre, g) 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, d = m.char_type[bc][ac], 0 - local n + local g = mc[bc][ac] if g then - n,d = node_copy(g[2]), g[3] - if g[1] then + if g[1] then + return node_copy(g[1]), g.ratio, false, false, false + else local f = node_new(id_glue) - set_attr(f, attr_icflag, g[4]) - setfield(f, 'spec', n) - return f, d + set_attr(f, attr_icflag, g.priority) + setglue(f, g.width, g.stretch, g.shrink) + return f, g.ratio, g.kanjiskip_natural, g.kanjiskip_stretch, g.kanjiskip_shrink end end - return n, d + return false, 0 end -- Nq.last (kern w) .... (glue/kern g) Np.first @@ -601,50 +714,6 @@ end -------------------- 和文文字間空白量の決定 - --- get kanjiskip -local get_kanjiskip -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 - - 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 - g = node_copy(zero_glue) - end - set_attr(g, attr_icflag, KANJI_SKIP_JFM) - return g - end -end - local calc_ja_ja_aux do local bg_ag = 2*id_glue - id_glue @@ -652,12 +721,13 @@ do local bk_ag = 2*id_kern - id_glue 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 function blend_diffmet(b, a, rb, ra) + return round(diffmet_rule((1-rb)*b+rb*a, (1-ra)*b+ra*a)) + end + calc_ja_ja_aux = function (gb, ga, db, 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 + db, da = 0, 1 end if not gb then if ga then @@ -669,64 +739,120 @@ do local k = 2*getid(gb) - getid(ga) if k == bg_ag then - local bs, as = getfield(gb, 'spec'), getfield(ga, 'spec') -- 両方とも glue． - local bd, ad = getfield(bs, 'width'), getfield(as, 'width') - setfield(bs, 'width', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) - bd, ad = getfield(bs, 'stretch'), getfield(as, 'stretch') - setfield(bs, 'stretch', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) - bd, ad = getfield(bs, 'shrink'), getfield(as, 'shrink') - setfield(bs, 'shrink', -round(diffmet_rule(-rbb*bd - rba*ad, -rab*bd - raa*ad))) + setglue(gb, blend_diffmet( + getfield(gb, 'width'), getfield(ga, 'width'), db, da), + blend_diffmet( + getfield(gb, 'stretch'), getfield(ga, 'stretch'), db, da), + -blend_diffmet( + -getfield(gb, 'shrink'), -getfield(ga, 'shrink'), db, da)) node_free(ga) return gb elseif k == bk_ak then -- 両方とも kern． - local bd, ad = getfield(gb, 'kern'), getfield(ga, 'kern') - setfield(gb, 'kern', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) + setfield(gb, 'kern', blend_diffmet( + getfield(gb, 'kern'), getfield(ga, 'kern'), db, da)) node_free(ga) return gb elseif k == bk_ag then - local as = getfield(ga, 'spec') -- gb: kern, ga: glue - local bd, ad = getfield(gb, 'kern'), getfield(as, 'width') - setfield(as, 'width', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) - ad = getfield(as, 'stretch') - setfield(bs, 'stretch', round(diffmet_rule(rba*ad, raa*ad))) - ad = getfield(as, 'shrink') - setfield(bs, 'shrink', -round(diffmet_rule(-rba*ad, -raa*ad))) + setglue(ga, blend_diffmet( + getfield(gb, 'kern'), getfield(ga, 'width'), db, da), + blend_diffmet( + 0, getfield(ga, 'stretch'), db, da), + -blend_diffmet( + 0, -getfield(ga, 'shrink'), db, da)) node_free(gb) - return ga + return ga, 0, 0, 0 else - local bs = getfield(gb, 'spec') -- gb: glue, ga: kern - local bd, ad = getfield(bs, 'width'), getfield(ga, 'kern') - setfield(bs, 'width', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) - bd = getfield(bs, 'stretch') - setfield(bs, 'stretch', round(diffmet_rule(rbb*bd, rab*bd))) - bd = getfield(bs, 'shrink') - setfield(bs, 'shrink', -round(diffmet_rule(-rbb*bd, -rab*bd))) + setglue(gb, blend_diffmet( + getfield(gb, 'width'), getfield(ga, 'kern'), db, da), + blend_diffmet( + getfield(gb, 'stretch'), 0, db, da), + -blend_diffmet( + -getfield(gb, 'shrink'), 0, db, da)) node_free(ga) return gb end end end -local function calc_ja_ja_glue() - if ihb_flag then return nil - else +local null_skip_table = {0, 0, 0} +-- get kanjiskip +local get_kanjiskip, kanjiskip_jfm_flag +local calc_ja_ja_glue +do + local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP + local KANJI_SKIP_JFM = luatexja.icflag_table.KANJI_SKIP_JFM + + get_kanjiskip_low = function(flag, qm, bn, bp, bh) + 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 bk = qm.kanjiskip or null_skip_table + setglue(g, bn and (bn*bk[1]) or 0, + bp and (bp*bk[2]) or 0, + bh and (bh*bk[3]) or 0, 0, 0) + set_attr(g, attr_icflag, KANJI_SKIP_JFM) + return g + elseif flag then + return node_copy(kanji_skip) + else + local g = node_new(id_glue); + setglue(g, + bn and (bn*getfield(kanji_skip, 'width')) or 0, + bp and (bp*getfield(kanji_skip, 'stretch')) or 0, + bh and (bh*getfield(kanji_skip, 'shrink')) or 0, + 0, 0) + set_attr(g, attr_icflag, KANJI_SKIP_JFM) + return g + end + end + end + + get_kanjiskip = function() + 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, 1, 1, 1) + else + 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_new(id_glue) + 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 - return 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 = 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); + local npn, nqn = Np.nuc, Nq.nuc + local gb, db, bn, bp, bh + = new_jfm_glue(qmc, Nq.class, + slow_find_char_class(Np.char, + qm, getchar(npn))) + local ga, da, an, ap, ah + = 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 (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) + end + return g, k end end end @@ -734,73 +860,102 @@ end -------------------- 和欧文間空白量の決定 -- 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 (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 + + 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 bk = qm.xkanjiskip or null_skip_table + setglue(g, bn and bk[1] or 0, + bp and bk[2] or 0, + bh and bk[3] or 0, 0, 0) + 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); + setglue(g, + bn and (bn*getfield(xkanji_skip, 'width')) or 0, + bp and (bp*getfield(xkanji_skip, 'stretch')) or 0, + bh and (bh*getfield(xkanji_skip, 'shrink')) or 0, + 0, 0) + 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 {0, 0, 0} - 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_new(id_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() - 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 +local function get_OA_skip(is_kanji) + local pm = Np.met + local g, _, kn, kp, kh = new_jfm_glue( + pm.char_type, + fast_find_char_class((Nq.id == id_math and -1 or 'jcharbdd'), pm), + 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() - 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 +local function get_OB_skip(is_kanji) + local qm = Nq.met + 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 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 - handle_penalty_normal(Nq.post, Np.pre, g); real_insert(g) + local g, k + if non_ihb_flag then g, k = calc_ja_ja_glue() end -- M->K + 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 = get_OA_skip() or get_kanjiskip() -- 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 = 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) + 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 = 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) @@ -816,10 +971,10 @@ end -- 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(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 = 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) @@ -832,7 +987,7 @@ end 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(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() -- K @@ -855,10 +1010,7 @@ 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, @@ -887,14 +1039,13 @@ local function handle_list_tail(mode) -- 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 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) @@ -907,8 +1058,8 @@ end 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 - local g = new_jfm_glue(pm, fast_find_char_class(par_indented, pm), Np.class) + if non_ihb_flag then + 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 @@ -925,61 +1076,76 @@ end -- return value: (the initial cursor lp), (last node) local init_var do + local id_local = node.id('local_par') 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 - 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'] + 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 = table_current_stack[DIR] or dir_yoko - 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, - } + 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 + 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, kanjiskip_jfm_flag = skip_table_to_glue(KSK) + set_attr(kanji_skip, attr_icflag, KANJI_SKIP) + end + + do + xkanji_skip, xkanjiskip_jfm_flag = skip_table_to_glue(XSK) + set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP) + end + 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 + while lp and + ((lpi==id_whatsit and lps~=sid_user) + or ((lpi==id_hlist) and (lps==3)) + or (lpi==id_local)) do if (lpi==id_hlist) and (lps==3) then Np.char, par_indented = 'parbdd', 'parbdd' 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 function cleanup(mode) +local ensure_tex_attr = ltjb.ensure_tex_attr +local function cleanup(mode, TEMP) -- adjust attr_icflag for avoiding error - tex.setattribute('global', attr_icflag, 0) - node_free(kanji_skip); node_free(xkanji_skip) + 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 @@ -988,53 +1154,46 @@ local function cleanup(mode) 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) - lp = calc_np(lp, last) + local lp, last, par_indented, TEMP = init_var(mode,dir) + 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) + return cleanup(mode, TEMP) end end do local IHB = luatexja.userid_table.IHB local BPAR = luatexja.userid_table.BPAR - local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev - local node_write = Dnode.write + local node_prev = node.direct.getprev + local node_write = node.direct.write -- \inhibitglue function create_inhibitglue_node() @@ -1059,11 +1218,6 @@ do 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 @@ -1072,6 +1226,13 @@ do 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