X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=8946027d9eb9fdc90f5b2a681d1a48226e451155;hb=a693b63eadfcabe5f4f513a4cc90302f2360b18b;hp=abf02d8190a5d13fb79b4a58e934947f81a71f06;hpb=a3c13e3f6448ab01e819b837e826f3cca36abc9e;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index abf02d8..8946027 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -1,33 +1,47 @@ -- --- luatexja/jfmglue.lua +-- luatexja/ltj-jfmglue.lua -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2012/07/19', - version = '0.5', + date = '2014/02/01', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) -local err, warn, info, log = luatexbase.errwarinf(_NAME) +local err, warn, info, log = luatexbase .errwarinf(_NAME) luatexja.load_module('stack'); local ltjs = luatexja.stack luatexja.load_module('jfont'); local ltjf = luatexja.jfont -luatexja.load_module('pretreat'); local ltjp = luatexja.pretreat +local pairs = pairs -local has_attr = node.has_attribute -local set_attr = node.set_attribute -local insert_before = node.insert_before -local node_next = node.next +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.getnext local round = tex.round -local uniq_id = 0 -- unique id -local ltjs_fast_get_penalty_table = ltjs.fast_get_penalty_table local ltjf_font_metric_table = ltjf.font_metric_table local ltjf_find_char_class = ltjf.find_char_class -local node_new = node.new -local node_copy = node.copy +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 ligature_head = 1 -local ligature_tail = 2 local id_glyph = node.id('glyph') local id_hlist = node.id('hlist') @@ -44,10 +58,10 @@ local id_kern = node.id('kern') local id_penalty = node.id('penalty') local id_glue_spec = node.id('glue_spec') -local id_jglyph = node.id('glyph') + 256 -- Japanese character -local id_box_like = node.id('hlist') + 256 -- vbox, shifted hbox -local id_pbox = node.id('hlist') + 512 -- already processed nodes (by \unhbox) -local id_pbox_w = node.id('hlist') + 513 -- cluster which consists of a whatsit +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 sid_start_link = node.subtype('pdf_start_link') @@ -55,32 +69,24 @@ local sid_start_thread = node.subtype('pdf_start_thread') local sid_end_link = node.subtype('pdf_end_link') local sid_end_thread = node.subtype('pdf_end_thread') -local ITALIC = 1 -local PACKED = 2 -local KINSOKU = 3 -local FROM_JFM = 4 -local LINE_END = 5 -local KANJI_SKIP = 6 -local XKANJI_SKIP = 7 -local PROCESSED = 8 -local IC_PROCESSED = 9 -local BOXBDD = 15 -local PROCESSED_BEGIN_FLAG = 16 - -local function get_attr_icflag(p) - return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG -end - +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 kanji_skip local xkanji_skip +local table_current_stack -local attr_orig_char = luatexbase.attributes['ltj@origchar'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] local attr_icflag = luatexbase.attributes['ltj@icflag'] -local attr_autospc = luatexbase.attributes['ltj@autospc'] -local attr_autoxspc = luatexbase.attributes['ltj@autoxspc'] -local attr_uniqid = luatexbase.attributes['ltj@uniqid'] -local max_dimen = 1073741823 + +local function get_attr_icflag(p) + return (has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG +end -------------------- Helper functions @@ -90,75 +96,62 @@ end -- This function is called only for acquiring `special' characters. local function fast_find_char_class(c,m) - return m.size_cache.chars[c] or 0 + return m.chars[c] or 0 end -local spec_zero_glue = node_new(id_glue_spec) - spec_zero_glue.width = 0; spec_zero_glue.stretch_order = 0; spec_zero_glue.stretch = 0 - spec_zero_glue.shrink_order = 0; spec_zero_glue.shrink = 0 - -local function get_zero_spec() - return node_copy(spec_zero_glue) +-- 文字クラスの決定 +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 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_skip_table(n) - g.width = st.width; g.stretch = st.stretch; g.shrink = st.shrink - g.stretch_order = st.stretch_order; g.shrink_order = st.shrink_order + 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 end -- penalty 値の計算 local function add_penalty(p,e) - if p.penalty>=10000 then - if e<=-10000 then p.penalty = 0 end - elseif p.penalty<=-10000 then - if e>=10000 then p.penalty = 0 end + local pp = getfield(p, 'penalty') + if pp>=10000 then + if e<=-10000 then pp = 0 end + elseif pp<=-10000 then + if e>=10000 then pp = 0 end else - p.penalty = p.penalty + e - if p.penalty>=10000 then p.penalty = 10000 - elseif p.penalty<=-10000 then p.penalty = -10000 end + 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」の間の調整方法 -diffmet_rule = math.two_average +diffmet_rule = math.two_paverage function math.two_add(a,b) return a+b end function math.two_average(a,b) return (a+b)*0.5 end - --------------------- idea --- 2 node の間に glue/kern/penalty を挿入する． --- 基本方針: char node q と char node p の間 - --- 　Np: 「p を核とする塊」 --- 　　first: 最初の node，nuc: p，last: 最後の node --- 　　id: 核 node の種類 --- 　Nq: 「q を核とする塊」 --- 　　実際の glue は Np.last, Nq.first の間に挿入される --- 　Bp: Np.last, Nq.first の間の penalty node 達の配列 - --- Np, Nq, Bp, widow_Bp について --- Np, Nq は別々のテーブル． --- 1回のループごとに Nq = Np, Np = (new table) となるのは効率が悪いので， --- Np <-> Nq 入れ替え，その後 Np をクリアすることでテーブルを再利用． --- 同様の関係は Bp, widow_Bp にも． - - --- 核の定義： --- 　node x が non-char node のときは，x のみ --- 　x が char_node のときは， --- 　- x が \accent の第二引数だったとき --- 　 [kern2 kern y kern2] x の 3 node が核に加わる --- 　- x の直後に \/ 由来 kern があったとき --- 　 その \/ 由来の kern が核に加わる --- p, q の走査で無視するもの： --- 　ins, mark, adjust, whatsit, penalty --- --- Nq.last .. + .. Bp.first .... Bp[last] .... * .. Np.first --- +: kern from LINEEND はここに入る --- *: jfm glue はここに入る +function math.two_paverage(a,b) return (a+b)/2 end +function math.two_pleft(a,b) return a end +function math.two_pright(a,b) return b end local head -- the head of current list @@ -175,13 +168,13 @@ local first_char, last_char, find_first_char local function check_box(box_ptr, box_end) local p = box_ptr; local found_visible_node = false if not p then - find_first_char = false; first_char = nil; last_char = nil + find_first_char = false; last_char = nil return true end while p and p~=box_end do - local pid = p.id - if pid==id_kern and p.subtype==2 then - p = node_next(node_next(node_next(p))); pid = p.id -- p must be glyph_node + local pid = getid(p) + if pid==id_kern and getsubtype(p)==2 then + p = node_next(node_next(node_next(p))); pid = getid(p) -- p must be glyph_node end if pid==id_glyph then repeat @@ -189,37 +182,48 @@ local function check_box(box_ptr, box_end) 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 end - until p.id~=id_glyph - pid = p.id -- p must be non-nil + 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 and get_attr_icflag(p)==IC_PROCESSED then - p = node_next(p); + 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)); + -- Note that another node_next will be executed outside this if-statement. + else + found_visible_node = true + find_first_char = false; last_char = nil + end elseif pid==id_hlist then if PACKED == get_attr_icflag(p) then if find_first_char then - first_char = p.head; find_first_char = false + first_char = getlist(p); find_first_char = false end - last_char = p.head; found_visible_node = true + last_char = getlist(p); found_visible_node = true else - if p.shift==0 then - if check_box(p.head, nil) then found_visible_node = true end - else if find_first_char then - find_first_char = false - else - last_char = nil - end + if getfield(p, 'shift')==0 then + if check_box(getlist(p), nil) then found_visible_node = true end + else + find_first_char = false; last_char = nil end end + elseif pid==id_math 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 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 @@ -229,11 +233,16 @@ end function check_box_high(Nx, box_ptr, box_end) first_char = nil; last_char = nil; find_first_char = true if check_box(box_ptr, box_end) then + local first_char = first_char if first_char then - if first_char.font == has_attr(first_char, attr_curjfnt) then - set_np_xspc_jachar(Nx, first_char) - else - set_np_xspc_alchar(Nx, first_char.char,first_char, ligature_head) + 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) + else + set_np_xspc_alchar(Nx, getchar(first_char),first_char, 1) + end + else -- math_node + set_np_xspc_alchar(Nx, -1,first_char) end end end @@ -257,116 +266,114 @@ do local function set_attr_icflag_processed(p) if get_attr_icflag(p)<= ITALIC then - --set_attr(p, attr_uniqid, uniq_id) set_attr(p, attr_icflag, PROCESSED) end end local function check_next_ickern(lp) - if lp.id == id_kern and ITALIC == get_attr_icflag(lp) then - set_attr(lp, attr_icflag, IC_PROCESSED) - --set_attr(lp, attr_uniqid, uniq_id) + if 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 Np.last = Np.nuc; return lp end end -local function calc_np_pbox(lp, last) - local uid = has_attr(lp, attr_uniqid) +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=PACKED) and (lpa=PACKED then - if lpa == BOXBDD 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) + head = node_remove(head, lp); node_free(lp); lp = lq + else return calc_np_pbox(lp) end -- id_pbox else - k, lp = calc_np_auxtable[lp.id](lp) + k, lp = calc_np_auxtable[getid(lp)](lp) if k then return lp end end end @@ -407,119 +420,106 @@ local calc_np = calc_np -- We think that "Np is a Japanese character" if Np.met~=nil, -- "Np is an alphabetic character" if Np.pre~=nil, -- "Np is not a character" otherwise. +local after_hlist, after_alchar, extract_np do + local PRE = luatexja.stack_table_index.PRE + local POST = luatexja.stack_table_index.POST + local KCAT = luatexja.stack_table_index.KCAT + local XSP = luatexja.stack_table_index.XSP -- 和文文字のデータを取得 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) - local m = ltjf_font_metric_table[x.font] - local c = has_attr(x, attr_orig_char) - local cls = ltjf_find_char_class(x.char, m) - if c ~= x.char and cls==0 then cls = ltjf_find_char_class(-c, m) end - Nx.class = cls; set_attr(x, attr_jchar_class, cls) - Nx.lend = m.size_cache.char_type[cls].kern[fast_find_char_class('lineend', m)] or 0 - Nx.met, Nx.var, Nx.char = m, m.var, c - Nx.pre = ltjs_fast_get_penalty_table('pre', c, 0) - Nx.post = ltjs_fast_get_penalty_table('post', c, 0) - local y = ltjs_fast_get_penalty_table('xsp', c, 3) - Nx.xspc_before, Nx.xspc_after = (y%2==1), (y>=2) + 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 + end local set_np_xspc_jachar = set_np_xspc_jachar -- 欧文文字のデータを取得 local floor = math.floor function set_np_xspc_alchar(Nx, c,x, lig) if c~=-1 then - if lig == ligature_head then - while x.components and x.subtype and math.floor(x.subtype*0.5)%2==1 do - x = x.components; c = x.char - end - else - while x.components and x.subtype and math.floor(x.subtype*0.5)%2==1 do - x = node.tail(x.components); c = x.char - end + local f = (lig ==1) and nullfunc or node_tail + local xc, xs = getfield(x, 'components'), getsubtype(x) + while xc and xs and xs%4>=2 do + x = f(xc); xc, xs = getfield(x, 'components'), getsubtype(x) end - Nx.pre = ltjs_fast_get_penalty_table('pre', c, 0) - Nx.post = ltjs_fast_get_penalty_table('post', c, 0) + c = getchar(x) + 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.xspc = table_current_stack[XSP - 1] or 3 end Nx.met = nil - local y = ltjs_fast_get_penalty_table('xsp', c, 3) - Nx.xspc_before, Nx.xspc_after = (y%2==1), (y>=2) Nx.auto_xspc = (has_attr(x, attr_autoxspc)==1) end local set_np_xspc_alchar = set_np_xspc_alchar -- Np の情報取得メインルーチン - function extract_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, x.char, x, ligature_head) - elseif i == id_hlist then Np.last_char = check_box_high(Np, x.head, nil) + 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, x.replace, nil) + 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) - function after_hlist(Nx) + after_hlist = function (Nx) local s = Nx.last_char if s then - if s.font == has_attr(s, attr_curjfnt) then - set_np_xspc_jachar(Nx, s) + if getid(s)==id_glyph 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) + end else - set_np_xspc_alchar(Nx, s.char, s, ligature_tail) + set_np_xspc_alchar(Nx, -1, s) end else Nx.pre, Nx.met = nil, nil end end - function after_alchar(Nx) + after_alchar = function (Nx) local x = Nx.nuc - return set_np_xspc_alchar(Nx, x.char,x, ligature_tail) + return set_np_xspc_alchar(Nx, getchar(x), x, 2) end end -local after_hlist, after_alchar, extract_np = after_hlist, after_alchar, extract_np -------------------- 最下層の処理 -local function lineend_fix(g) - if g and g.id==id_kern then - Nq.lend = 0 - elseif Nq.lend~=0 then - if not g then - g = node_new(id_kern); --copy_attr(g, Nq.nuc); - g.subtype = 1; g.kern = -Nq.lend; - set_attr(g, attr_icflag, LINEEND) - --set_attr(g, attr_uniqid, uniq_id) - else - g.spec.width = g.spec.width - Nq.lend - end - end - return g -end - -- change penalties (or create a new penalty, if needed) 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 g.id==id_kern)) or Nq.lend~=0 then - local p = node_new(id_penalty); --copy_attr(p, Nq.nuc) + if (a~=0 and not(g and getid(g)==id_kern)) then + local p = node_new(id_penalty) if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end - p.penalty = a + setfield(p, 'penalty', a) head = insert_before(head, Np.first, p) Bp[1]=p; set_attr(p, attr_icflag, KINSOKU) - --set_attr(p, attr_uniqid, uniq_id) end - --else for _, v in pairs(Bp) do v.penalty = v.penalty + a end else for _, v in pairs(Bp) do add_penalty(v,a) end end end @@ -527,14 +527,13 @@ 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 g.id==id_glue) or Nq.lend~=0 then - local p = node_new(id_penalty); --copy_attr(p, Nq.nuc) + if not (g and getid(g)==id_glue) then + local p = node_new(id_penalty) if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end - p.penalty = a + setfield(p, 'penalty', a) head = insert_before(head, Np.first, p) Bp[1]=p - set_attr(p, attr_icflag, KINSOKU) - --set_attr(p, attr_uniqid, uniq_id) + set_attr(p, attr_icflag, KINSOKU) end else for _, v in pairs(Bp) do add_penalty(v,a) end end @@ -543,42 +542,35 @@ end local function handle_penalty_suppress(post, pre, g) local a = (pre or 0) + (post or 0) if #Bp == 0 then - if g and g.id==id_glue then - local p = node_new(id_penalty); --copy_attr(p, Nq.nuc) - p.penalty = 10000; head = insert_before(head, Np.first, p) + if g and getid(g)==id_glue then + 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) - --set_attr(p, attr_uniqid, uniq_id) + 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 function new_jfm_glue(Nn, bc, ac) +local function new_jfm_glue(m, bc, ac) -- bc, ac: char classes - local z = Nn.met.size_cache.char_type[bc] - local g = z.glue[ac] + local g, d = m.char_type[bc][ac], 0 + local n if g then - g = node_copy(g); g.spec = node.copy(g.spec); - --set_attr(g, attr_uniqid, uniq_id) - elseif z.kern[ac] then - g = node_new(id_kern); --copy_attr(g, Nn.nuc) - g.subtype = 1; g.kern = z.kern[ac] - set_attr(g, attr_icflag, FROM_JFM); --set_attr(g, attr_uniqid, uniq_id) + 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 g + return n, d end -- Nq.last (kern w) .... (glue/kern g) Np.first -local function real_insert(w, g) - if w~=0 then - local h = node_new(id_kern); --copy_attr(h, Nq.nuc) - set_attr(h, attr_icflag, LINE_END) - --set_attr(h, attr_uniqid, uniq_id) - h.kern = w; h.subtype = 1 - head = node.insert_after(head, Nq.last, h) - end +local function real_insert(g) if g then head = insert_before(head, Np.first, g) Np.first = g @@ -590,79 +582,108 @@ 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 -local function get_kanjiskip_normal() - local g = node_new(id_glue); --copy_attr(g, Nq.nuc) - g.spec = (Np.auto_kspc or Nq.auto_kspc) and node_copy(kanji_skip) or get_zero_spec() - set_attr(g, attr_icflag, KANJI_SKIP) - --set_attr(g, attr_uniqid, uniq_id) - return g -end -local function get_kanjiskip_jfm() - local g = node_new(id_glue); --copy_attr(g, Nq.nuc) - if Np.auto_kspc or Nq.auto_kspc then + 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); - gx.stretch_order, gx.shrink_order = 0, 0 - local bk = Nq.met.size_cache.kanjiskip - local ak - if (Np.met.size_cache==Nq.met.size_cache) and (Nq.var==Np.var) then - ak = nil + 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 - ak = Np.met.size_cache.kanjiskip + 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 - if bk then - if ak then - gx.width = round(diffmet_rule(bk[1], ak[1])) - gx.stretch = round(diffmet_rule(bk[2], ak[2])) - gx.shrink = -round(diffmet_rule(-bk[3], -ak[3])) - else - gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] - end - elseif ak then - gx.width = ak[1]; gx.stretch = ak[2]; gx.shrink = ak[3] - else - gx.width, gx.stretch, gx.shrink = 0, 0, 0 - end - g.spec = gx - else - g.spec = get_zero_spec() + setfield(g, 'spec', gx) + else + g = node_copy(zero_glue) + end + set_attr(g, attr_icflag, KANJI_SKIP_JFM) + return g end - set_attr(g, attr_icflag, KANJI_SKIP) - --set_attr(g, attr_uniqid, uniq_id) - return g end -local function calc_ja_ja_aux(gb,ga) - if not gb then - return ga - else - if not ga then return gb end - local k = node.type(gb.id) .. node.type(ga.id) - if k == 'glueglue' then +local calc_ja_ja_aux +do + local bg_ag = 2*id_glue - id_glue + local bg_ak = 2*id_glue - id_kern + 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 -- 「前の文字」由来のグルーの割合 + 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) + else return nil end + 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') -- 両方とも glue． - gb.spec.width = round(diffmet_rule(gb.spec.width, ga.spec.width)) - gb.spec.stretch = round(diffmet_rule(gb.spec.stretch,ga.spec.shrink)) - gb.spec.shrink = -round(diffmet_rule(-gb.spec.shrink, -ga.spec.shrink)) - node.free(ga) + 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))) + node_free(ga) return gb - elseif k == 'kernkern' then + elseif k == bk_ak then -- 両方とも kern． - gb.kern = round(diffmet_rule(gb.kern, ga.kern)) - node.free(ga) + local bd, ad = getfield(gb, 'kern'), getfield(ga, 'kern') + setfield(gb, 'kern', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) + node_free(ga) return gb - elseif k == 'kernglue' then + elseif k == bk_ag then + local as = getfield(ga, 'spec') -- gb: kern, ga: glue - ga.spec.width = round(diffmet_rule(gb.kern,ga.spec.width)) - ga.spec.stretch = round(diffmet_rule(ga.spec.stretch, 0)) - ga.spec.shrink = -round(diffmet_rule(-ga.spec.shrink, 0)) - node.free(gb) + 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))) + node_free(gb) return ga else + local bs = getfield(gb, 'spec') -- gb: glue, ga: kern - gb.spec.width = round(diffmet_rule(ga.kern, gb.spec.width)) - gb.spec.stretch = round(diffmet_rule(gb.spec.stretch, 0)) - gb.spec.shrink = -round(diffmet_rule(-gb.spec.shrink, 0)) - node.free(ga) + 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))) + node_free(ga) return gb end end @@ -670,11 +691,21 @@ end local function calc_ja_ja_glue() if ihb_flag then return nil - elseif (Nq.met.size_cache==Np.met.size_cache) and (Nq.var==Np.var) then - return new_jfm_glue(Nq, Nq.class, Np.class) else - return calc_ja_ja_aux(new_jfm_glue(Nq, Nq.class, fast_find_char_class('diffmet',Nq.met)), - new_jfm_glue(Np, fast_find_char_class('diffmet',Np.met), Np.class)) + 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 end end @@ -682,78 +713,79 @@ end -- get xkanjiskip local get_xkanjiskip -local function get_xkanjiskip_normal(Nn) - local g = node_new(id_glue); --copy_attr(g, Nn.nuc) - local gx = node_new(id_glue_spec); g.spec = gx - if Nq.xspc_after and Np.xspc_before and (Nq.auto_xspc or Np.auto_xspc) then - g.spec = node_copy(xkanji_skip) - else - g.spec = get_zero_spec() +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 - set_attr(g, attr_icflag, XKANJI_SKIP) - --set_attr(g, attr_uniqid, uniq_id) - return g -end -local function get_xkanjiskip_jfm(Nn) - local g = node_new(id_glue); --copy_attr(g, Nn.nuc) - if Nq.xspc_after and Np.xspc_before and (Nq.auto_xspc or Np.auto_xspc) then - local gx = node_new(id_glue_spec); - gx.stretch_order, gx.shrink_order = 0, 0 - local bk = Nn.met.size_cache.xkanjiskip - if bk then - gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] - else - gx.width, gx.stretch, gx.shrink = 0, 0, 0 + 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 - g.spec = gx - else - g.spec = get_zero_spec() + set_attr(g, attr_icflag, XKANJI_SKIP_JFM) + return g end - set_attr(g, attr_icflag, XKANJI_SKIP) - --set_attr(g, attr_uniqid, uniq_id) - return g end - - -------------------- 隣接した「塊」間の処理 local function get_OA_skip() if not ihb_flag then - return new_jfm_glue(Np, - fast_find_char_class(((Nq.id == id_math and -1) or 'jcharbdd'), Np.met), Np.class) + 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 end local function get_OB_skip() if not ihb_flag then - return new_jfm_glue(Nq, Nq.class, - fast_find_char_class(((Np.id == id_math and -1) or'jcharbdd'), Nq.met)) + 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 end -- (anything) .. jachar local function handle_np_jachar(mode) - if Nq.id==id_jglyph or ((Nq.id==id_pbox or Nq.id==id_pbox_w) and Nq.met) then - local g = lineend_fix(calc_ja_ja_glue() or get_kanjiskip()) -- M->K - handle_penalty_normal(Nq.post, Np.pre, g); real_insert(Nq.lend, g) - elseif Nq.met then -- Nq.id==id_hlist + 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) + 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(0, g) + 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 - if Nq.id==id_hlist then Nq.post = 0 end - handle_penalty_normal(Nq.post, Np.pre, g); real_insert(0, g) + 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 - if Nq.id==id_glue then handle_penalty_normal(0, Np.pre, g) - elseif Nq.id==id_kern then handle_penalty_suppress(0, Np.pre, g) + 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) end - real_insert(0, g) + real_insert(g) end - if mode and ltjs_fast_get_penalty_table('kcat', Np.char, 0)%2~=1 then + if mode and Np.kcat%2~=1 then widow_Np.first, widow_Bp, Bp = Np.first, Bp, widow_Bp end end @@ -762,30 +794,30 @@ end -- jachar .. (anything) local function handle_nq_jachar() if Np.pre then - if Np.id==id_hlist then Np.pre = 0 end - local g = lineend_fix(get_OB_skip() or get_xkanjiskip(Nq)) -- O_B->X - handle_penalty_normal(Nq.post, Np.pre, g); real_insert(Nq.lend, g) + 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 - local g = lineend_fix(get_OB_skip()) -- O_B + local g = 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) end - real_insert(Nq.lend, g) + real_insert(g) end end -- (anything) .. (和文文字で始まる hlist) local function handle_np_ja_hlist() - if Nq.id==id_jglyph or ((Nq.id==id_pbox or Nq.id == id_pbox_w) and Nq.met) then - local g = lineend_fix(get_OB_skip() or get_kanjiskip()) -- O_B->K - handle_penalty_normal(Nq.post, 0, g); real_insert(Nq.lend, g) + 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 + 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(0, g) + handle_penalty_suppress(0, 0, g); real_insert(g) elseif Nq.pre then local g = get_xkanjiskip(Np) -- X - handle_penalty_suppress(0, 0, g); real_insert(0, g) + handle_penalty_suppress(0, 0, g); real_insert(g) end end @@ -793,48 +825,57 @@ end local function handle_nq_ja_hlist() if Np.pre then local g = get_xkanjiskip(Nq) -- X - handle_penalty_suppress(0, 0, g); real_insert(0, g) + handle_penalty_suppress(0, 0, g); real_insert(g) end end + -- Nq が前側のクラスタとなることによる修正 -local function adjust_nq() - if Nq.id==id_glyph then after_alchar(Nq) - elseif Nq.id==id_hlist or Nq.id==id_pbox or Nq.id==id_disc then after_hlist(Nq) - elseif Nq.id == id_pbox_w then - luatexbase.call_callback("luatexja.jfmglue.whatsit_after", - false, Nq, Np) +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_hlist] = function() after_hlist(Nq) end, + [id_pbox] = function() after_hlist(Nq) end, + [id_disc] = function() after_hlist(Nq) end, + [id_pbox_w] = function() + luatexbase.call_callback("luatexja.jfmglue.whatsit_after", + false, Nq, Np) + end, + } + + function adjust_nq() + local x = adjust_nq_aux[Nq.id] + if x then x() end end end + -------------------- 開始・終了時の処理 +do -- リスト末尾の処理 +local JWP = luatexja.stack_table_index.JWP local function handle_list_tail(mode) adjust_nq(); Np = Nq if mode then - -- the current list is to be line-breaked: - if Np.id == id_jglyph or (Np.id==id_pbox and Np.met) then - if Np.lend~=0 then - g = node_new(id_kern); g.subtype = 0; g.kern = Np.lend - --copy_attr(g, Np.nuc); - set_attr(g, attr_icflag, BOXBDD) - node.insert_after(head, Np.last, g) - end - end + -- the current list is to be line-breaked. -- Insert \jcharwidowpenalty - Bp = widow_Bp; Np = widow_Np; Nq.lend = 0 + Bp = widow_Bp; Np = widow_Np if Np.first then handle_penalty_normal(0, - ltjs_fast_get_penalty_table('jwp', 0, 0)) + table_current_stack[JWP] or 0) end else -- the current list is the contents of a hbox - if Np.id == id_jglyph or (Np.id==id_pbox and Np.met) then - local g = new_jfm_glue(Np, Np.class, fast_find_char_class('boxbdd',Np.met)) + 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)) if g then set_attr(g, attr_icflag, BOXBDD) - head = node.insert_after(head, Np.last, g) + head = insert_after(head, Np.last, g) end end end @@ -842,14 +883,15 @@ end -- リスト先頭の処理 local function handle_list_head(par_indented) - if Np.id == id_jglyph or (Np.id==id_pbox and Np.met) then + 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(Np, fast_find_char_class(par_indented, Np.met), Np.class) + local g = new_jfm_glue(pm, fast_find_char_class(par_indented, pm), Np.class) if g then set_attr(g, attr_icflag, BOXBDD) - if g.id==id_glue and #Bp==0 then - local h = node_new(id_penalty); --copy_attr(h, Np.nuc) - h.penalty = 10000; set_attr(h, attr_icflag, BOXBDD) + if getid(g)==id_glue and #Bp==0 then + local h = node_new(id_penalty) + setfield(h, 'penalty', 10000); set_attr(h, attr_icflag, BOXBDD) end head = insert_before(head, Np.first, g) end @@ -859,59 +901,68 @@ end -- initialize -- return value: (the initial cursor lp), (last node) -local function init_var(mode) - uniq_id = uniq_id +1 - if uniq_id == 0x7FFFFFF then uniq_id = 0 end - Bp, widow_Bp, widow_Np = {}, {}, {first = nil} - kanji_skip=skip_table_to_spec('kanjiskip') - get_kanjiskip = (kanji_skip.width == max_dimen) - and get_kanjiskip_jfm or get_kanjiskip_normal - xkanji_skip=skip_table_to_spec('xkanjiskip') - get_xkanjiskip = (xkanji_skip.width == max_dimen) - 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, lend=0, met=nil, nuc=nil, - post=nil, pre=nil, xspc_after=nil, xspc_before=nil, - } - Nq = { - auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, - first=nil, id=nil, last=nil, lend=0, met=nil, nuc=nil, - post=nil, pre=nil, xspc_after=nil, xspc_before=nil, - } - if mode then - -- the current list is to be line-breaked: - -- hbox from \parindent is skipped. - local lp, par_indented = head, 'boxbdd' - while lp and ((lp.id==id_whatsit and lp.subtype~=sid_user) - or ((lp.id==id_hlist) and (lp.subtype==3))) do - if (lp.id==id_hlist) and (lp.subtype==3) then par_indented = 'parbdd' end - lp=node_next(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) - node.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) + node_free(kanji_skip); node_free(xkanji_skip) if mode then local h = node_next(head) - if h.id == id_penalty and h.penalty == 10000 then - h = h.next - if h.id == id_glue and h.subtype == 15 and not h.next then + if getid(h) == id_penalty and getfield(h, 'penalty') == 10000 then + h = node_next(h) + if getid(h) == id_glue and getsubtype(h) == 15 and not node_next(h) then return false end 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 @@ -923,75 +974,86 @@ end 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() + extract_np(); + adjust_nq(); + local pid, pm = Np.id, Np.met -- 挿入部 - if Np.id == id_jglyph then + if pid == id_jglyph then handle_np_jachar(mode) - elseif Np.met then - if Np.id==id_hlist then handle_np_ja_hlist() + 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(lp, last) + lp = calc_np(lp) end handle_list_tail(mode) - return cleanup(mode, last) + return cleanup(mode) end - --- \inhibitglue - -function create_inhibitglue_node() - local tn = node_new(id_whatsit, sid_user) - tn.user_id=30111; tn.type=100; tn.value=1 - node.write(tn) -end - --- Node for indicating beginning of a paragraph --- (for ltjsclasses) -function create_beginpar_node() - local tn = node_new(id_whatsit, sid_user) - tn.user_id=30114; tn.type=100; tn.value=1 - node.write(tn) end do + local IHB = luatexja.userid_table.IHB + local BPAR = luatexja.userid_table.BPAR + local node_prev = Dnode.getprev + local node_write = Dnode.write + + -- \inhibitglue + function create_inhibitglue_node() + local tn = node_new(id_whatsit, sid_user) + setfield(tn, 'user_id', IHB) + setfield(tn, 'type', 100) + setfield(tn, 'value', 1) + node_write(tn) + end -local function whatsit_callback(Np, lp, Nq) - if Np and Np.nuc then return Np - elseif Np and lp.user_id == 30114 then - Np.first = lp; Np.nuc = lp; Np.last = lp - Np.char = 'parbdd' - Np.met = nil - Np.pre = 0; Np.post = 0 - Np.xspc_before = false - Np.xspc_after = false - Np.auto_xspc = false - return Np + -- Node for indicating beginning of a paragraph + -- (for ltjsclasses) + function create_beginpar_node() + local tn = node_new(id_whatsit, sid_user) + setfield(tn, 'user_id', BPAR) + setfield(tn, 'type', 100) + setfield(tn, 'value', 1) + node_write(tn) end -end -local function whatsit_after_callback(s, Nq, Np) - if not s and Nq.nuc.user_id == 30114 then - local x, y = node.prev(Nq.nuc), Nq.nuc - Nq.first, Nq.nuc, Nq.last = x, x, x - head = node.remove(head, y) + + local function whatsit_callback(Np, lp, Nq) + 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 + + local function whatsit_after_callback(s, Nq, Np) + 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 + head = node_remove(head, y) + node_free(y) + end + return s end - return s -end -luatexbase.add_to_callback("luatexja.jfmglue.whatsit_getinfo", whatsit_callback, - "luatexja.beginpar.np_info", 1) -luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback, - "luatexja.beginpar.np_info_after", 1) + luatexbase.add_to_callback("luatexja.jfmglue.whatsit_getinfo", whatsit_callback, + "luatexja.beginpar.np_info", 1) + luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback, + "luatexja.beginpar.np_info_after", 1) -end \ No newline at end of file +end