X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=3ceec931cc8e413a32ffab086ce8dc9794ef368c;hb=658da80b1c2604867c026642868e4b6d6d223694;hp=b67fcdd25e6d883ee95deaf81bc70cc13a2485a8;hpb=7ff5e9e0b59dfad031bc3850606a3238edf4dab4;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index b67fcdd..3ceec93 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2014/02/02', + date = '2014/10/03', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) @@ -13,6 +13,7 @@ luatexja.load_module('base'); local ltjb = luatexja.base luatexja.load_module('stack'); local ltjs = luatexja.stack luatexja.load_module('jfont'); local ltjf = luatexja.jfont luatexja.load_module('direction'); local ltjd = luatexja.direction +luatexja.load_module('setwidth'); local ltjw = luatexja.setwidth local pairs = pairs local Dnode = node.direct or node @@ -83,6 +84,10 @@ local kanji_skip local xkanji_skip local table_current_stack local list_dir +local capsule_glyph +local tex_dir +local attr_ablshift +local set_np_xspc_jachar local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] local attr_dir = luatexbase.attributes['ltj@dir'] @@ -109,13 +114,10 @@ do local start_time_measure = ltjb.start_time_measure local stop_time_measure = ltjb.stop_time_measure slow_find_char_class = function (c, m, oc) - start_time_measure('slow_find_chr') local cls = ltjf_find_char_class(oc, m) - if not c and cls==0 then - stop_time_measure('slow_find_chr') + if oc~=c and cls==0 then return ltjf_find_char_class(-c, m), oc else - stop_time_measure('slow_find_chr') return cls, oc end end @@ -147,16 +149,15 @@ end local function add_penalty(p,e) local pp = getfield(p, 'penalty') if pp>=10000 then - if e<=-10000 then pp = 0 end + if e<=-10000 then setfield(p, 'penalty', 0) end elseif pp<=-10000 then - if e>=10000 then pp = 0 end + if e>=10000 then setfield(p, 'penalty', 0) end else pp = pp + e if pp>=10000 then setfield(p, 'penalty', 10000) elseif pp<=-10000 then setfield(p, 'penalty', -10000) else setfield(p, 'penalty', pp) end end - return end -- 「異なる JFM」の間の調整方法 @@ -233,7 +234,8 @@ local function check_box(box_ptr, box_end) first_char = p; find_first_char = false end last_char = p; found_visible_node = true - --elseif pid==id_rule and get_attr_icflag(p)==PACKED then -- do nothing + elseif pid==id_rule and get_attr_icflag(p)==PACKED then + -- do nothing elseif not (pid==id_ins or pid==id_mark or pid==id_adjust or pid==id_whatsit or pid==id_penalty) then @@ -279,6 +281,7 @@ luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data", -- calc next Np do +local traverse = Dnode.traverse local function set_attr_icflag_processed(p) if get_attr_icflag(p)<= ITALIC then set_attr(p, attr_icflag, PROCESSED) @@ -312,20 +315,113 @@ local function calc_np_pbox(lp, last) return check_next_ickern(lp) end - +local ltjw_apply_ashift_math = ltjw.apply_ashift_math +local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc +local min, max = math.min, math.max +local function calc_np_aux_glyph_common(lp) + Np.nuc = lp + Np.id = npi + if (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1)) then + Np.id = id_jglyph + set_np_xspc_jachar(Np, lp) + local npi, npf + lp, head, npi, npf = capsule_glyph(lp, Np.met, Np.class, head, tex_dir) + Np.first = (Np.first~=Np.nuc) and Np.first or npf or npi + Np.nuc = npi + return true, check_next_ickern(lp); + else + Np.id = id_glyph + set_np_xspc_alchar(Np, getchar(lp), lp, 1) + -- loop + local first_glyph, last_glyph = lp + set_attr(lp, attr_icflag, PROCESSED); Np.last = lp + local y_adjust = has_attr(lp,attr_ablshift) or 0 + local node_depth = getfield(lp, 'depth') + min(y_adjust, 0) + local adj_depth = (y_adjust>0) and (getfield(lp, 'depth') + y_adjust) or 0 + setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust) + lp = node_next(lp) + for lx in traverse(lp) do + local lai = get_attr_icflag(lx) + if lx==last or lai>=PACKED then + lp=lx; break + else + local lid = getid(lx) + if lid==id_glyph and not(getfont(lx) == (has_attr(lx, attr_curjfnt) or -1)) then + -- 欧文文字 + last_glyph = lx; set_attr(lx, attr_icflag, PROCESSED); Np.last = lx + y_adjust = has_attr(lx,attr_ablshift) or 0 + node_depth = max(getfield(lx, 'depth') + min(y_adjust, 0), node_depth) + adj_depth = (y_adjust>0) and max(getfield(lp, 'depth') + y_adjust, adj_depth) or adj_depth + setfield(lx, 'yoffset', getfield(lx, 'yoffset') - y_adjust) + elseif lid==id_kern then + local ls = getsubtype(lx) + if ls==2 then -- アクセント用の kern + set_attr(lx, attr_icflag, PROCESSED) + lx = node_next(lx) -- lp: アクセント本体 + setfield(lx, 'yoffset', getfield(lp, 'yoffset') - (has_attr(lx,attr_ablshift) or 0)) + lx = node_next(node_next(lx)) + elseif ls==0 then + Np.last = lx + elseif (ls==1 and lai==ITALIC) then + Np.last = lx; set_attr(lx, attr_icflag, IC_PROCESSED) + else + lp=lx; break + end + else + lp=lx; break + end + end + end + local r + if adj_depth>node_depth then + r = node_new(id_rule) + setfield(r, 'width', 0); setfield(r, 'height', 0) + setfield(r, 'depth',adj_depth); setfield(r, 'dir', tex_dir) + set_attr(r, attr_icflag, PROCESSED) + end + if last_glyph then + Np.last_char = last_glyph + if r then insert_after(head, first_glyph, r) end + else + local npn = Np.nuc + Np.last_char = npn + if r then + local nf, nc = getfont(npn), getchar(npn) + local ct = (font.getfont(nf) or font.fonts[nf] ).characters[nc] + if (ct.left_protruding or 0) == 0 then + head = insert_before(head, npn, r) + Np.first = (Np.first==npn) and r or npn + elseif (ct.right_protruding or 0) == 0 then + insert_after(head, npn, r); Np.last, lp = r, r + else + ltjb.package_warning_no_line( + 'luatexja', + 'Check depth of glyph node ' .. tostring(npn) .. '(font=' .. nf + .. ', char=' .. nc .. '), because its \\lpcode is ' .. tostring(ct.left_protruding) + .. ' and its \\rpcode is ' .. tostring(ct.right_protruding) + ); node_free(r) + end + end + end + return true, lp + end +end local calc_np_auxtable = { [id_glyph] = function (lp) - Np.first, Np.nuc = (Np.first or lp), lp; - Np.id = (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1)) - and id_jglyph or id_glyph - return true, check_next_ickern(node_next(lp)); + Np.first= (Np.first or lp) + return calc_np_aux_glyph_common(lp) end, [id_hlist] = function(lp) local op, flag head, lp, op, flag = ltjd_make_dir_whatsit(head, lp, list_dir, 'jfm hlist') set_attr(op, attr_icflag, PROCESSED) Np.first = Np.first or op; Np.last = op; Np.nuc = op; - Np.id = (flag or getfield(op, 'shift')~=0) and id_box_like or id_hlist + if (flag or getfield(op, 'shift')~=0) then + Np.id = id_box_like + else + Np.id = id_hlist + Np.last_char = check_box_high(Np, getlist(op), nil) + end return true, lp end, [id_vlist] = function(lp) @@ -376,14 +472,22 @@ local calc_np_auxtable = { [id_math] = function(lp) Np.first, Np.nuc = (Np.first or lp), lp; set_attr(lp, attr_icflag, PROCESSED) - lp = node_end_of_math(lp) - set_attr(lp, attr_icflag, PROCESSED) - Np.last, Np.id = lp, id_math; - return true, node_next(lp); + set_np_xspc_alchar(Np, -1, lp) + local end_math = node_end_of_math(lp) + ltjw_apply_ashift_math(lp, end_math, attr_ablshift) + set_attr(end_math, attr_icflag, PROCESSED) + Np.last, Np.id = end_math, id_math; + return true, node_next(end_math); + end, + [id_glue] = function(lp) + Np.first, Np.nuc, Np.last = (Np.first or lp), lp, lp; + Np.id = getid(lp); set_attr(lp, attr_icflag, PROCESSED) + return true, node_next(lp) end, - discglue = function(lp) + [id_disc] = function(lp) Np.first, Np.nuc, Np.last = (Np.first or lp), lp, lp; Np.id = getid(lp); set_attr(lp, attr_icflag, PROCESSED) + ltjw_apply_ashift_disc(lp, (list_dir==dir_tate), tex_dir) return true, node_next(lp) end, [id_kern] = function(lp) @@ -392,9 +496,8 @@ local calc_np_auxtable = { set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp) set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp) set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp) - set_attr(lp, attr_icflag, PROCESSED); Np.nuc = lp - Np.id = (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1)) and id_jglyph or id_glyph - return true, check_next_ickern(node_next(lp)); + set_attr(lp, attr_icflag, PROCESSED); + return calc_np_aux_glyph_common(lp) else Np.id = id_kern; set_attr(lp, attr_icflag, PROCESSED) Np.last = lp; return true, node_next(lp) @@ -410,8 +513,6 @@ calc_np_auxtable[13] = calc_np_auxtable.box_like calc_np_auxtable[id_ins] = calc_np_auxtable.skip calc_np_auxtable[id_mark] = calc_np_auxtable.skip calc_np_auxtable[id_adjust] = calc_np_auxtable.skip -calc_np_auxtable[id_disc] = calc_np_auxtable.discglue -calc_np_auxtable[id_glue] = calc_np_auxtable.discglue function calc_np(lp, last) local k @@ -432,7 +533,7 @@ function calc_np(lp, last) if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then local lq = node_next(lp) head = node_remove(head, lp); node_free(lp); lp = lq - else + else return calc_np_pbox(lp, last) end -- id_pbox else @@ -464,17 +565,24 @@ do 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) + function set_np_xspc_jachar_yoko(Nx, x) + 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 + function set_np_xspc_jachar_tate(Nx, x) local m = ltjf_font_metric_table[getfont(x)] local cls, c - if list_dir == dir_tate then - local c1, c2 = getchar(x), has_attr(x, attr_orig_char) - c = has_attr(x, attr_dir) or c1 or c2 - cls = ltjf_find_char_class(c, m) - if cls==0 then cls = slow_find_char_class(c2, m, c1) end - else - cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, getchar(x)) - end + local c1, c2 = getchar(x), has_attr(x, attr_orig_char) + c = has_attr(x, attr_dir) or c1 or c2 + cls = ltjf_find_char_class(c, m) + if cls==0 then cls = slow_find_char_class(c2, m, c1) end 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 @@ -483,7 +591,6 @@ do Nx.kcat = table_current_stack[KCAT + c] or 0 Nx.auto_kspc, Nx.auto_xspc = (has_attr(x, attr_autospc)==1), (has_attr(x, attr_autoxspc)==1) end - local set_np_xspc_jachar = set_np_xspc_jachar -- 欧文文字のデータを取得 local floor = math.floor @@ -511,12 +618,12 @@ do -- Np の情報取得メインルーチン extract_np = function () local x, i = Np.nuc, Np.id; - if i == id_jglyph then return set_np_xspc_jachar(Np, x) - elseif i == id_glyph then return set_np_xspc_alchar(Np, getchar(x), x, 1) - elseif i == id_hlist then Np.last_char = check_box_high(Np, getlist(x), nil) - elseif i == id_pbox then Np.last_char = check_box_high(Np, Np.first, node_next(Np.last)) +-- if i == id_jglyph then return set_np_xspc_jachar(Np, x) +-- elseif i == id_glyph then return set_np_xspc_alchar(Np, getchar(x), x, 1) +-- if i == id_hlist then Np.last_char = check_box_high(Np, getlist(x), nil) + if i == id_pbox then Np.last_char = check_box_high(Np, Np.first, node_next(Np.last)) elseif i == id_disc then Np.last_char = check_box_high(Np, getfield(x, 'replace'), nil) - elseif i == id_math then return set_np_xspc_alchar(Np, -1, x) +-- elseif i == id_math then return set_np_xspc_alchar(Np, -1, x) end end @@ -540,7 +647,7 @@ do end after_alchar = function (Nx) - local x = Nx.nuc + local x = Nx.last_char return set_np_xspc_alchar(Nx, getchar(x), x, 2) end @@ -567,7 +674,7 @@ end local function handle_penalty_always(post, pre, g) local a = (pre or 0) + (post or 0) if #Bp == 0 then - if not (g and getid(g)==id_glue) then + if not (g and getid(g)==id_glue) or a~=0 then local p = node_new(id_penalty) if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end setfield(p, 'penalty', a) @@ -759,8 +866,7 @@ do 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 + return node_copy(xkanji_skip) else local g = node_copy(zero_glue) set_attr(g, attr_icflag, XKANJI_SKIP) @@ -873,10 +979,7 @@ end -- Nq が前側のクラスタとなることによる修正 do local adjust_nq_aux = { - [id_glyph] = function() - local x = Nq.nuc - return set_np_xspc_alchar(Nq, getchar(x),x, 2) - end, -- after_alchar(Nq) + [id_glyph] = function() after_alchar(Nq) end, -- after_alchar(Nq) [id_hlist] = function() after_hlist(Nq) end, [id_pbox] = function() after_hlist(Nq) end, [id_disc] = function() after_hlist(Nq) end, @@ -948,12 +1051,22 @@ do local KSK = luatexja.stack_table_index.KSK local XSK = luatexja.stack_table_index.XSK local dir_yoko = luatexja.dir_table.dir_yoko - init_var = function (mode) + local dir_tate = luatexja.dir_table.dir_tate + local attr_yablshift = luatexbase.attributes['ltj@yablshift'] + local attr_tablshift = luatexbase.attributes['ltj@tablshift'] + init_var = function (mode,dir) -- 1073741823: max_dimen Bp, widow_Bp, widow_Np = {}, {}, {first = nil} table_current_stack = ltjs.table_current_stack list_dir = ltjs.list_dir or dir_yoko + local is_dir_tate = list_dir==dir_tate + capsule_glyph = is_dir_tate and ltjw.capsule_glyph_tate or ltjw.capsule_glyph_yoko + attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift + set_np_xspc_jachar = is_dir_tate and set_np_xspc_jachar_tate or set_np_xspc_jachar_yoko + + + tex_dir = dir or 'TLT' kanji_skip = node_new(id_glue) setfield(kanji_skip, 'spec', skip_table_to_spec(KSK)) set_attr(kanji_skip, attr_icflag, KANJI_SKIP) @@ -1013,10 +1126,10 @@ end -------------------- 外部から呼ばれる関数 -- main interface -function main(ahead, mode) +function main(ahead, mode, dir) if not ahead then return ahead end head = ahead; - local lp, last, par_indented = init_var(mode) + local lp, last, par_indented = init_var(mode,dir) lp = calc_np(lp, last) if Np then extract_np(); handle_list_head(par_indented)