X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=7018c7adf4aaffe44172fa6b6e4cd5b9a3227e41;hb=c93db4ba7a9e2e366759558ad528789014d788c0;hp=a07e89f7ab87c836ede99cdaede2740fc2d73110;hpb=a6288642d9ea58680b700df833cb6c7f6b65bcc1;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index a07e89f..7018c7a 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -1,10 +1,9 @@ -- --- luatexja/jfmglue.lua +-- luatexja/ltj-jfmglue.lua -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2012/07/19', - version = '0.5', + date = '2013/04/27', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) @@ -19,8 +18,6 @@ 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_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 @@ -44,10 +41,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,28 +52,22 @@ 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 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 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 @@ -90,16 +81,23 @@ 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 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 spec_zero_glue = node_new(id_glue_spec) +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, st = node_new(id_glue_spec), ltjs.fast_get_skip_table(n) @@ -111,54 +109,27 @@ 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 @@ -175,7 +146,7 @@ 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 @@ -189,12 +160,26 @@ 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 + 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 end - if pid==id_kern and get_attr_icflag(p)==IC_PROCESSED then - p = node_next(p); + if pid==id_kern then + if get_attr_icflag(p)==IC_PROCESSED then + -- do nothing + elseif p.subtype==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 + if find_first_char then + find_first_char = false + else + last_char = nil + end + end elseif pid==id_hlist then if PACKED == get_attr_icflag(p) then if find_first_char then @@ -211,6 +196,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 @@ -229,11 +219,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==id_glyph 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 @@ -257,15 +252,13 @@ 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) + set_attr(lp, attr_icflag, IC_PROCESSED) Np.last = lp; return node_next(lp) else Np.last = Np.nuc; return lp @@ -273,14 +266,12 @@ 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= 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) @@ -410,47 +416,54 @@ local calc_np = calc_np -- "Np is an alphabetic character" if Np.pre~=nil, -- "Np is not a character" otherwise. 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 + 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_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) + Nx.met, Nx.char = m, c + 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 + local xc, xs = x.components, x.subtype + if lig == 1 then + 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_fast_get_penalty_table('pre', c, 0) - Nx.post = ltjs_fast_get_penalty_table('post', c, 0) - Nx.char = 'jcharbdd' + 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 @@ -472,10 +485,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==id_glyph 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 @@ -492,36 +509,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) - 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 + 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 @@ -529,14 +528,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 + 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 @@ -549,38 +547,33 @@ local function handle_penalty_suppress(post, pre, g) 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 z = Nn.met.size_cache.char_type[bc] - local g = z.glue[ac] + local z = m.char_type[bc] + local g, d = z.glue[ac], 0 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) + 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 +local function real_insert(g) if g then head = insert_before(head, Np.first, g) Np.first = g @@ -594,89 +587,112 @@ end local get_kanjiskip 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 + 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_jfm() - local g = node_new(id_glue); --copy_attr(g, Nq.nuc) + local g if Np.auto_kspc or Nq.auto_kspc then - 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 - else - ak = Np.met.size_cache.kanjiskip - 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 + 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.kanjiskip or {0, 0, 0} + if (pm.char_type==qm.char_type) and (qm.var==pm.var) then + gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] + else + local ak = pm.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.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, 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 @@ -685,34 +701,27 @@ 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) + 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 - 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 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 - 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 - end + local bk = Nn.met.xkanjiskip or {0, 0, 0} + gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3] g.spec = gx else - g.spec = get_zero_spec() + g = node_copy(zero_glue) end set_attr(g, attr_icflag, XKANJI_SKIP) - --set_attr(g, attr_uniqid, uniq_id) return g end @@ -722,40 +731,42 @@ 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) + 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) 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 @@ -764,30 +775,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 @@ -795,45 +806,53 @@ 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, x.char,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 + -------------------- 開始・終了時の処理 -- リスト末尾の処理 +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) @@ -844,9 +863,10 @@ 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 @@ -862,33 +882,40 @@ 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 + -- 1073741823: max_dimen Bp, widow_Bp, widow_Np = {}, {}, {first = nil} - kanji_skip=skip_table_to_spec('kanjiskip') - get_kanjiskip = (kanji_skip.width == max_dimen) + table_current_stack = ltjs.table_current_stack + + 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 == 1073741823) and get_kanjiskip_jfm or get_kanjiskip_normal - xkanji_skip=skip_table_to_spec('xkanjiskip') - get_xkanjiskip = (xkanji_skip.width == max_dimen) + + 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 == 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, 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, '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 + 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: @@ -934,12 +961,14 @@ function main(ahead, mode) end lp = calc_np(lp, last) 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() @@ -951,49 +980,50 @@ function main(ahead, mode) return cleanup(mode, last) 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 + + -- \inhibitglue + function create_inhibitglue_node() + local tn = node_new(id_whatsit, sid_user) + tn.user_id=IHB; tn.type=100; 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) + tn.user_id=BPAR; tn.type=100; 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 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 - 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) + local function whatsit_after_callback(s, Nq, Np) + if not s and 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) + end + return s + end -end \ No newline at end of file + 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