X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=7f787417d4b36118472cfdf8d9100312dedd844e;hb=5cacff7566d354102546a09869ed303c5a6130d9;hp=1887b78b4a2bf559a231b8b37c2fe33f69da5cd0;hpb=ae1314aae218985b5db11fb08f143476ce5df3e3;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index 1887b78..7f78741 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -9,7 +9,6 @@ luatexbase.provides_module({ }) module('luatexja.jfmglue', package.seeall) local err, warn, info, log = luatexbase.errwarinf(_NAME) -local node = node luatexja.load_module('stack'); local ltjs = luatexja.stack luatexja.load_module('jfont'); local ltjf = luatexja.jfont @@ -20,10 +19,11 @@ local set_attr = node.set_attribute local insert_before = node.insert_before local node_next = node.next local round = tex.round -local uniq_id = 0 -- unique id -local ltjs_get_penalty_table = ltjs.get_penalty_table +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 ligature_head = 1 local ligature_tail = 2 @@ -54,29 +54,26 @@ 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 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 KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP +local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP +local PROCESSED = luatexja.icflag_table.PROCESSED +local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED +local BOXBDD = luatexja.icflag_table.BOXBDD +local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG local kanji_skip local xkanji_skip -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 box_stack_level +local function get_attr_icflag(p) + return (has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG +end -------------------- Helper functions @@ -89,72 +86,52 @@ local function fast_find_char_class(c,m) return m.size_cache.chars[c] or 0 end -local spec_zero_glue = node.new(id_glue_spec) +-- 文字クラスの決定 +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, xc = ltjf_find_char_class(-xc, m) end + return cls, xc +end + +local zero_glue = node_new(id_glue) +spec_zero_glue = node_new(id_glue_spec) -- must be public, since mentioned from other sources +local spec_zero_glue = spec_zero_glue 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) -end + zero_glue.spec = spec_zero_glue local function skip_table_to_spec(n) - local g = node.new(id_glue_spec) - local st = ltjs.get_skip_table(n, box_stack_level) + 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 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 = 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 p.penalty = 10000 + elseif pp<=-10000 then p.penalty = -10000 + else 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)*0.5 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 @@ -176,13 +153,9 @@ local function check_box(box_ptr, box_end) end while p and p~=box_end do local pid = p.id - if pid==id_kern then - if p.subtype==2 then - p = node_next(node_next(node_next(p))); pid = p.id - elseif IC_PROCESSED == has_attr(p, attr_icflag) then - p = node_next(p); pid = p.id - end - end + 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 + end if pid==id_glyph then repeat if find_first_char then @@ -191,10 +164,12 @@ local function check_box(box_ptr, box_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 + pid = p.id -- p must be non-nil end - if pid==id_hlist then - if PACKED == has_attr(p, attr_icflag) then + if pid==id_kern and get_attr_icflag(p)==IC_PROCESSED then + p = node_next(p); + 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 end @@ -209,6 +184,11 @@ local function check_box(box_ptr, box_end) end 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 not (pid==id_ins or pid==id_mark or pid==id_adjust or pid==id_whatsit or pid==id_penalty) then @@ -227,11 +207,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 first_char.id==glyph_node then + if first_char.font == (has_attr(first_char, attr_curjfnt) or -1) then + set_np_xspc_jachar(Nx, first_char) + else + set_np_xspc_alchar(Nx, first_char.char,first_char, ligature_head) + end + else -- math_node + set_np_xspc_alchar(Nx, -1,first_char) end end end @@ -241,29 +226,27 @@ end -------------------- Np の計算と情報取得 luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data", - function (Np, lp, Nq, box_stack_level) + function (Np, lp, Nq) if Np.nuc then return Np else return Np -- your code end end) luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data", - function (stat, Nq, Np, box_stack_level) return false end) + function (stat, Nq, Np) return false end) -- calc next Np do local function set_attr_icflag_processed(p) - if (has_attr(p, attr_icflag) or 0)<= ITALIC then - set_attr(p, attr_uniqid, uniq_id) + if get_attr_icflag(p)<= ITALIC then set_attr(p, attr_icflag, PROCESSED) end end local function check_next_ickern(lp) - if lp.id == id_kern and ITALIC == has_attr(lp, attr_icflag) then - set_attr(lp, attr_icflag, IC_PROCESSED) - set_attr(lp, attr_uniqid, uniq_id) + if lp.id == 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 @@ -271,23 +254,22 @@ local function check_next_ickern(lp) end local function calc_np_pbox(lp, last) - local uid = has_attr(lp, attr_uniqid) Np.first = Np.first or lp; Np.id = id_pbox local lpa = KINSOKU -- dummy= - while lp~=last and lpa>=PACKED and lpa~=BOXBDD - and uid == has_attr(lp, attr_uniqid) do - Np.nuc = lp; set_attr(lp, attr_uniqid, uniq_id) + set_attr(lp, attr_icflag, get_attr_icflag(lp)); + while lp~=last and lpa>=PACKED and lpa=PACKED then if lpa == BOXBDD then local lq = node_next(lp) @@ -394,7 +384,6 @@ function calc_np(lp, last) end end Np = nil; return lp - --Np = nil; return end end @@ -408,44 +397,49 @@ do -- 和文文字のデータを取得 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) or 0 - local cls = ltjf_find_char_class(x.char, m) - if cls==0 and c ~= x.char then cls = ltjf_find_char_class(-c, m) end + local cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, x.char) 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_get_penalty_table('pre', c, 0, box_stack_level) - Nx.post = ltjs_get_penalty_table('post', c, 0, box_stack_level) - local y = ltjs_get_penalty_table('xsp', c, 3, box_stack_level) - Nx.xspc_before, Nx.xspc_after = (y%2==1), (y>=2) + Nx.met, Nx.char = m, c + local t = ltjs.fast_get_penalty_table_parent(c) + Nx.pre = t.pre or 0 + Nx.post = t.post or 0 + Nx.xspc = t.xsp or 3 + Nx.kcat = t.kcat 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 + local xc, xs = x.components, x.subtype 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 + while xc and xs and xs%4>=2 do + x = xc; xc, xs = x.components, x.subtype end + c = x.char 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 + while xc and xs and xs%4>=2 do + x = node.tail(xc); xc, xs = x.components, x.subtype end + c = x.char end - Nx.pre = ltjs_get_penalty_table('pre', c, 0, box_stack_level) - Nx.post = ltjs_get_penalty_table('post', c, 0, box_stack_level) + local t = ltjs.fast_get_penalty_table_parent(c) + Nx.pre = t.pre or 0 + Nx.post = t.post or 0 + Nx.xspc = t.xsp or 3 Nx.char = 'jcharbdd' else Nx.pre, Nx.post, Nx.char = 0, 0, -1 + Nx.xspc = ltjs_fast_get_penalty_table('xsp', -1) or 3 end Nx.met = nil - local y = ltjs_get_penalty_table('xsp', c, 3, box_stack_level) - 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 @@ -467,10 +461,14 @@ do function after_hlist(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 s.id==glyph_node then + if s.font == (has_attr(s, attr_curjfnt) or -1) then + set_np_xspc_jachar(Nx, s) + else + set_np_xspc_alchar(Nx, s.char, s, ligature_tail) + 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 @@ -487,38 +485,18 @@ local after_hlist, after_alchar, extract_np = after_hlist, after_alchar, extract -------------------- 最下層の処理 -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) - elseif g.id==id_kern then - g.kern = g.kern - Nq.lend - 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 g.id==id_kern)) then + local p = node_new(id_penalty); --copy_attr(p, Nq.nuc) if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end 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 @@ -526,14 +504,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 g.id==id_glue) then + local p = node_new(id_penalty); --copy_attr(p, Nq.nuc) if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end 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,237 +520,257 @@ 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) + local p = node_new(id_penalty); --copy_attr(p, Nq.nuc) 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 g = nil - local z = Nn.met.size_cache.char_type[bc] - local gt = z.glue[ac] - if gt then - local h = node.new(id_glue_spec) - h.width, h.stretch, h.shrink = gt[1], gt[2], gt[3] - h.stretch_order, h.shrink_order = 0, 0 - g = node.new(id_glue); copy_attr(g, Nn.nuc) - g.subtype = 0; g.spec = h - set_attr(g, attr_icflag, FROM_JFM); 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) + local z = m.size_cache.char_type[bc] + local g, d = z.glue[ac], 0 + if g then + g,d = node_copy(g[1]), g[2]; + g.spec = node_copy(g.spec); -- node_copy は spec をコピーする + else + local k = z.kern[ac] + if k then + g = node_new(id_kern); --copy_attr(g, Nn.nuc) + g.subtype = 1; g.kern, d = k[1], k[2] + set_attr(g, attr_icflag, FROM_JFM); + end end - return g + return g, 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 if g then - head = insert_before(head, Np.first, g) + head = insert_before(head, Np.first, g) Np.first = g end end + -------------------- 和文文字間空白量の決定 -- get kanjiskip -local function get_kanji_skip_from_jfm(Nn) - local i = Nn.met.size_cache.kanjiskip - if i then - return { i[1], i[2], i[3] } - else return nil +local get_kanjiskip + +local function get_kanjiskip_normal() + if Np.auto_kspc or Nq.auto_kspc then + return node_copy(kanji_skip) + else + local g = node_copy(zero_glue) + set_attr(g, attr_icflag, KANJI_SKIP) + return g end end -local function get_kanjiskip() - local g = node.new(id_glue); copy_attr(g, Nq.nuc) +local function get_kanjiskip_jfm() + local g if Np.auto_kspc or Nq.auto_kspc then - if kanji_skip.width == max_dimen then - local gx = node.new(id_glue_spec); - gx.stretch_order = 0; gx.shrink_order = 0 - local bk = get_kanji_skip_from_jfm(Nq) - local ak - if (Np.met.size_cache==Nq.met.size_cache) and (Nq.var==Np.var) then - ak = nil - else - ak = get_kanji_skip_from_jfm(Np) - 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 node.free(gx); gx = get_zero_spec() -- fallback - end - g.spec = gx - else g.spec=node.copy(kanji_skip) end + 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 pm, qm = Np.met, Nq.met + local bk = qm.size_cache.kanjiskip or {0, 0, 0} + if (pm.size_cache==qm.size_cache) and (qm.var==pm.var) then + gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] + else + local ak = pm.size_cache.kanjiskip or {0, 0, 0} + 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])) + end + g.spec = gx else - g.spec = get_zero_spec() + g = node_copy(zero_glue) 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) +local function calc_ja_ja_aux(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); gb.kern = 0 else return nil end + elseif not ga then + ga = node_new(id_kern); ga.kern = 0 + end + + local k = node.type(gb.id) .. node.type(ga.id) + if k == 'glueglue' then + -- 両方とも glue． + gb.spec.width = round(diffmet_rule( + rbb*gb.spec.width + rba*ga.spec.width, + rab*gb.spec.width + raa*ga.spec.width )) + gb.spec.stretch = round(diffmet_rule( + rbb*gb.spec.stretch + rba*ga.spec.stretch, + rab*gb.spec.stretch + raa*ga.spec.stretch )) + gb.spec.shrink = -round(diffmet_rule( + -rbb*gb.spec.shrink - rba*ga.spec.shrink, + -rab*gb.spec.shrink - raa*ga.spec.shrink )) + node.free(ga) + return gb + elseif k == 'kernkern' then + -- 両方とも kern． + gb.kern = round(diffmet_rule( + rbb*gb.kern + rba*ga.kern, + rab*gb.kern + raa*ga.kern )) + node.free(ga) + return gb + elseif k == 'kernglue' then + -- gb: kern, ga: glue + ga.spec.width = round(diffmet_rule( + rbb*gb.kern + rba*ga.spec.width, + rab*gb.kern + raa*ga.spec.width )) + ga.spec.stretch = round(diffmet_rule( + rba*ga.spec.stretch, raa*ga.spec.stretch )) + ga.spec.shrink = -round(diffmet_rule( + -rba*ga.spec.shrink,-raa*ga.spec.shrink )) + node.free(gb) return ga else - if not ga then return gb end - local k = node.type(gb.id) .. node.type(ga.id) - if k == 'glueglue' then - -- 両方とも 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) - return gb - elseif k == 'kernkern' then - -- 両方とも kern． - gb.kern = round(diffmet_rule(gb.kern, ga.kern)) - node.free(ga) - return gb - elseif k == 'kernglue' then - -- 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) - return ga - else - -- 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) - return gb - end + -- gb: glue, ga: kern + gb.spec.width = round(diffmet_rule( + rba*ga.kern + rbb*gb.spec.width, + raa*ga.kern + rab*gb.spec.width )) + gb.spec.stretch = round(diffmet_rule( + rbb*gb.spec.stretch, rab*gb.spec.stretch )) + gb.spec.shrink = -round(diffmet_rule( + -rbb*gb.spec.shrink,-rab*gb.spec.shrink )) + node.free(ga) + return gb end 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.size_cache==pm.size_cache) 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, npn.char)) + local ga, da = new_jfm_glue(pm, + slow_find_char_class(has_attr(nqn, attr_orig_char), pm, nqn.char), + Np.class) + return calc_ja_ja_aux(gb, ga, db, da); + end end end -------------------- 和欧文間空白量の決定 -- get xkanjiskip -local function get_xkanji_skip_from_jfm(Nn) - local i = Nn.met.size_cache.xkanjiskip - if i then - return i and { i[1], i[2], i[3] } - else return nil - end -end -local function get_xkanjiskip(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 - if xkanji_skip.width == max_dimen then - local gx = node.new(id_glue_spec); - gx.stretch_order = 0; gx.shrink_order = 0 - local bk = get_xkanji_skip_from_jfm(Nn) - if bk then - gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] - else node.free(gx); gx = get_zero_spec() -- fallback - end - g.spec = gx - else g.spec=node.copy(xkanji_skip) end +local get_xkanjiskip +local function get_xkanjiskip_normal(Nn) + if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then + return node_copy(xkanji_skip) else - g.spec = get_zero_spec() + local g = node_copy(zero_glue) + set_attr(g, attr_icflag, XKANJI_SKIP) + return g + end +end +local function get_xkanjiskip_jfm(Nn) + local g + if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then + g = node_new(id_glue); --copy_attr(g, Nn.nuc) + local gx = node_new(id_glue_spec); + gx.stretch_order, gx.shrink_order = 0, 0 + local bk = Nn.met.size_cache.xkanjiskip or {0, 0, 0} + gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] + g.spec = gx + else + g = node_copy(zero_glue) 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 '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(0, 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) 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 + if qid==id_hlist then Nq.post = 0 end handle_penalty_normal(Nq.post, Np.pre, g); real_insert(0, 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) end - -- \jcharwidowpenalty 挿入予定箇所更新 - if mode and ltjs_get_penalty_table('kcat', Np.char, 0, box_stack_level)%2~=1 then + if mode and Np.kcat%2~=1 then widow_Np.first, widow_Bp, Bp = Np.first, Bp, widow_Bp end 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.pre, g); real_insert(0, 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(0, 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(0, g) elseif Nq.met then -- Nq.id==id_hlist local g = get_kanjiskip() -- K handle_penalty_suppress(0, 0, g); real_insert(0, g) @@ -797,7 +794,7 @@ local function adjust_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, box_stack_level) + false, Nq, Np) end end @@ -807,24 +804,18 @@ end 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_get_penalty_table('jwp', 0, 0, box_stack_level)) + ltjs_fast_get_penalty_table('jwp', 0) 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) @@ -835,18 +826,14 @@ 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 - if par_indented then - g = new_jfm_glue(Np, fast_find_char_class('parbdd',Np.met), Np.class) - else - g = new_jfm_glue(Np, fast_find_char_class('boxbdd',Np.met), Np.class) - end + 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) + local h = node_new(id_penalty); --copy_attr(h, Np.nuc) h.penalty = 10000; set_attr(h, attr_icflag, BOXBDD) end head = insert_before(head, Np.first, g) @@ -858,37 +845,45 @@ 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} - box_stack_level = ltjp.box_stack_level - kanji_skip=skip_table_to_spec('kanjiskip') - xkanji_skip=skip_table_to_spec('xkanjiskip') + Bp, widow_Bp, widow_Np = {}, {}, {first = nil} + + kanji_skip = node_new(id_glue) + kanji_skip.spec = skip_table_to_spec('kanjiskip') + set_attr(kanji_skip, attr_icflag, KANJI_SKIP) + get_kanjiskip = (kanji_skip.spec.width == max_dimen) + and get_kanjiskip_jfm or get_kanjiskip_normal + + xkanji_skip = node_new(id_glue) + xkanji_skip.spec = skip_table_to_spec('xkanjiskip') + set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP) + get_xkanjiskip = (xkanji_skip.spec.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, + 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, lend=0, met=nil, nuc=nil, - post=nil, pre=nil, xspc_after=nil, xspc_before=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 = head, false - 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 = true end - lp=node_next(lp) end + local lp, par_indented, lpi, lps = head, 'boxbdd', head.id, head.subtype + 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 = lp.id, lp.subtype end return lp, node.tail(head), par_indented else -- the current list is the contents of a hbox: - -- insert a sentinelEG - local g = node.new(id_kern) + -- insert a sentinel + local g = node_new(id_kern) node.insert_after(head, node.tail(head), g); last = g - return head, g, false + return head, g, 'boxbdd' end end @@ -907,6 +902,8 @@ local function cleanup(mode, last) 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 end end @@ -926,11 +923,12 @@ function main(ahead, mode) lp = calc_np(lp, last) while Np do 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() @@ -945,7 +943,7 @@ end -- \inhibitglue function create_inhibitglue_node() - local tn = node.new(id_whatsit, sid_user) + local tn = node_new(id_whatsit, sid_user) tn.user_id=30111; tn.type=100; tn.value=1 node.write(tn) end @@ -953,27 +951,28 @@ end -- Node for indicating beginning of a paragraph -- (for ltjsclasses) function create_beginpar_node() - local tn = node.new(id_whatsit, sid_user) + local tn = node_new(id_whatsit, sid_user) tn.user_id=30114; tn.type=100; tn.value=1 node.write(tn) end do -local function whatsit_callback(Np, lp, Nq, bsl) +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.xspc = 0 Np.auto_xspc = false return Np end end -local function whatsit_after_callback(s, Nq, Np, bsl) + + +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