X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=7131bbc7b773d564050baebff2210d78db27e278;hb=b8c305dd73c8b482090d16dbf0e336df6abb1a33;hp=4c418b39552d2a5690d8c35047ebd6f2c8a1f4be;hpb=5bb70ef57e9fd117aea6bd8f76e800fce285d1c7;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua index 4c418b3..7131bbc 100644 --- a/src/ltj-adjust.lua +++ b/src/ltj-adjust.lua @@ -1,246 +1,439 @@ -- --- luatexja/otf.lua +-- ltj-adjust.lua -- -luatexbase.provides_module({ - name = 'luatexja.adjust', - date = '2013/03/14', - description = 'Advanced line adjustment for LuaTeX-ja', -}) -module('luatexja.adjust', package.seeall) - luatexja.load_module('jfont'); local ltjf = luatexja.jfont luatexja.load_module('jfmglue'); local ltjj = luatexja.jfmglue +luatexja.load_module('stack'); local ltjs = luatexja.stack +luatexja.load_module('direction'); local ltjd = luatexja.direction +luatexja.adjust = luatexja.adjust or {} + +local to_node = node.direct.tonode +local to_direct = node.direct.todirect + +local setfield = node.direct.setfield +local setglue = luatexja.setglue +local getfield = node.direct.getfield +local getlist = node.direct.getlist +local getid = node.direct.getid +local getfont = node.direct.getfont +local getsubtype = node.direct.getsubtype + +local node_traverse_id = node.direct.traverse_id +local node_new = node.direct.new +local node_next = node.direct.getnext +local node_free = node.direct.free +local node_prev = node.direct.getprev +local node_tail = node.direct.tail +local has_attr = node.direct.has_attribute +local set_attr = node.direct.set_attribute +local insert_after = node.direct.insert_after local id_glyph = node.id('glyph') local id_kern = node.id('kern') local id_hlist = node.id('hlist') local id_glue = node.id('glue') -local id_glue_spec = node.id('glue_spec') -local has_attr = node.has_attribute -local set_attr = node.set_attribute +local id_whatsit = node.id('whatsit') +local id_penalty = node.id('penalty') local attr_icflag = luatexbase.attributes['ltj@icflag'] local attr_jchar_class = luatexbase.attributes['ltj@charclass'] -local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] -local node_copy = node.copy -local node_next = node.next -local node_free = node.free +local lang_ja = luatexja.lang_ja local ltjf_font_metric_table = ltjf.font_metric_table -local spec_zero_glue = ltjj.spec_zero_glue +local ipairs, pairs = ipairs, pairs local PACKED = luatexja.icflag_table.PACKED +local LINEEND = luatexja.icflag_table.LINEEND local FROM_JFM = luatexja.icflag_table.FROM_JFM local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP +local KANJI_SKIP_JFM = luatexja.icflag_table.KANJI_SKIP_JFM local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP +local XKANJI_SKIP_JFM = luatexja.icflag_table.XKANJI_SKIP_JFM -local priority_table = { - FROM_JFM + 2, - FROM_JFM + 1, - FROM_JFM, - FROM_JFM - 1, - FROM_JFM - 2, - XKANJI_SKIP, - KANJI_SKIP -} - -local PROCESSED_BEGIN_FLAG = 32 -local function get_attr_icflag(p) - return (node.has_attribute(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG -end - --- box 内で伸縮された glue の合計値を計算 - -local function get_stretched(q, go, gs) - local qs = q.spec - if not qs.writable then return 0 end - if gs == 1 then -- stretching - if qs.stretch_order == go then return qs.stretch end - else -- shrinking - if qs.shrink_order == go then return qs.shrink end +local get_attr_icflag +do + local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG + get_attr_icflag = function(p) + return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG end end --- local new_ks, new_xs -local function get_total_stretched(p) - local go, gf, gs = p.glue_order, p.glue_set, p.glue_sign - local res = { - [0] = 0, - glue_set = gf, name = (gs==1) and 'stretch' or 'shrink' - } - for i=1,#priority_table do res[priority_table[i]]=0 end - if go ~= 0 then return nil end - if gs ~= 1 and gs ~= 2 then return res end - local head = p.head - q = p.head - --luatexja.ext_show_node_list(p.head, '>>> ', print) - while q do - if q.id==id_glue then - local a, ic = get_stretched(q, go, gs), get_attr_icflag(q) - if type(res[ic]) == 'number' then - -- kanjiskip, xkanjiskip は段落内で spec を共有しているが, - -- それはここでは望ましくないので,各 glue ごとに異なる spec を使う. - -- JFM グルーはそれぞれ異なる glue_spec を用いているので,問題ない. - res[ic] = res[ic] + a - if ic == KANJI_SKIP or ic == XKANJI_SKIP then - if q.spec ~= spec_zero_glue then - local ts, g; - q.spec, ts = node_copy(q.spec), q.spec - g = node.copy(q); q.spec = ts - node.insert_before(head, q, g); - head = node.remove(head, q); node.free(q); q = g - end - end - else - res[0] = res[0] + a - end +local priority_num = { 0, 0 } +local at2pr = { {}, {} } +local at2pr_st, at2pr_sh = at2pr[1], at2pr[2] +do + local priority_table = {{},{}} + luatexja.adjust.priority_table = priority_table + local tmp = {} + local function cmp(a,b) return a[1]>b[1] end -- 大きいほうが先! + local function make_priority_table(glue_sign) + for i,_ in pairs(tmp) do tmp[i]=nil end + if glue_sign==2 then -- shrink + for i=0,63 do tmp[#tmp+1] = { (i%8)-4, FROM_JFM+i } end + else -- stretch + for i=0,63 do tmp[#tmp+1] = { math.floor(i/8)-4, FROM_JFM+i } end + end + local pt = priority_table[glue_sign] + tmp[#tmp+1] = { pt[2]/10, XKANJI_SKIP } + tmp[#tmp+1] = { pt[2]/10, XKANJI_SKIP_JFM } + tmp[#tmp+1] = { pt[1]/10, KANJI_SKIP } + tmp[#tmp+1] = { pt[1]/10, KANJI_SKIP_JFM } + tmp[#tmp+1] = { pt[3]/10, -1 } + table.sort(tmp, cmp) + local a, m, n = at2pr[glue_sign], 10000000, 0 + for i=1,#tmp do + if tmp[i][1] + local ph = getlist(p) + if not ph then return 0 end + for i,_ in pairs(total_st) do total_st[i]=nil; total_sh[i]=nil end + for i=1,priority_num[1] do total_st[i]=0 end + for i=1,priority_num[2] do total_sh[i]=0 end + for i=0,4 do total_st[i*65536]=0; total_sh[i*65536]=0 end + for q in node_traverse_id(id_glue, ph) do + local a = getfield(q, 'stretch_order') + if a==0 then + local b = at2pr_st[get_attr_icflag(q)]; + total_st[b] = total_st[b]+getfield(q, 'stretch') end + total_st[a*65536] = total_st[a]+getfield(q, 'stretch') + local a = getfield(q, 'shrink_order') + if a==0 then + local b = at2pr_sh[get_attr_icflag(q)]; + total_sh[b] = total_sh[b]+getfield(q, 'shrink') + end + total_sh[a*65536] = total_sh[a]+getfield(q, 'shrink') + end + for i=4,1,-1 do if total_st[i*65536]~=0 then total_st.order=i; break end; end + if not total_st.order then + total_st.order, total_st[-65536] = -1,0.1 -- dummy end + for i=4,1,-1 do if total_sh[i*65536]~=0 then total_sh.order=i; break end; end + if not total_sh.order then + total_sh.order, total_sh[-65536] = -1,0.1 -- dummy + end + return getfield(p,'width') - dimensions(ph) +end end -local set_stretch_table = {} -local function set_stretch(p, after, before, ic, name) - if before > 0 then - --print (ic, before, after) - local ratio = after/before - for i,_ in pairs(set_stretch_table) do - set_stretch_table[i] = nil - end - for q in node.traverse_id(id_glue, p.head) do - if get_attr_icflag(q) == ic then - local qs, do_flag = q.spec, true - for i=1,#set_stretch_table do - if set_stretch_table[i]==qs then do_flag = false end - end - if qs.writable and qs[name..'_order'] == 0 and do_flag then - qs[name] = qs[name]*ratio; - set_stretch_table[#set_stretch_table+1] = qs - end - end +-- step 1: 行末に kern を挿入(句読点,中点用) +local abs = math.abs +local ltjd_glyph_from_packed = ltjd.glyph_from_packed +local function aw_step1(p, total) + local head = getlist(p) + local x = node_tail(head); if not x then return total, false end + -- x: \rightskip + x = node_prev(x); if not x then return total, false end + local xi, xc = getid(x) + -- x may be penalty + while xi==id_penalty do + x = node_prev(x); if not x then return total, false end + xi = getid(x) + end + if (total>0 and total_st.order>0) or (total<0 and total_sh.order>0) then + -- 無限大のグルーで処理が行われているときは処理中止. + return total, false + end + if xi == id_glyph and getfield(x, 'lang')==lang_ja then + -- 和文文字 + xc = x + elseif xi == id_hlist and get_attr_icflag(x) == PACKED then + -- packed JAchar + xc = ltjd_glyph_from_packed(x) + while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために? + else + return total, false-- それ以外は対象外. + end + local eadt = ltjf_font_metric_table[getfont(xc)] + .char_type[has_attr(xc, attr_jchar_class) or 0].end_adjust + if not eadt then + return total, false + end + local eadt_ratio = {} + for i, v in ipairs(eadt) do + local t = total - v + if t>0 then + eadt_ratio[i] = {i, t/total_st[65536*total_st.order], t, v} + else + eadt_ratio[i] = {i, t/total_sh[65536*total_sh.order], t, v} end end + table.sort(eadt_ratio, + function (a,b) + for i=2,4 do + local at, bt = abs(a[i]), abs(b[i]) + if at~=bt then return at0 and total>=xk then - --print("ADDED") - total = total - xk - local kn = node.new(id_kern) - kn.kern = (res.name=='shrink' and -1 or 1) * xk - set_attr(kn, attr_icflag, FROM_JFM) - node.insert_after(p.head, x, kn) - return true - else return false + return total, false-- それ以外は対象外. + end + -- 続行条件1:無限の伸縮度を持つグルーは \parfillskipのみ + if total>0 and total_st.order>0 then + if total_st.order ~= getfield(pf, 'stretch_order') then return total, false end + if total_st[total_st.order*65536] ~= getfield(pf, 'stretch') then return total, false end + for i=total_st.order-1, 1, -1 do + if total_st[i*65536] ~= 0 then return total, false end + end + end + if total<0 and total_sh.order>0 then + if total_sh.order ~= getfield(pf, 'shrink_order') then return total, false end + if total_sh[total_sh.order*65536] ~= getfield(pf, 'shrink') then return total, false end + for i=total_sh.order-1, 1, -1 do + if total_sh[i*65536] ~= 0 then return total, false end + end + end + local eadt = ltjf_font_metric_table[getfont(xc)] + .char_type[has_attr(xc, attr_jchar_class) or 0].end_adjust + if not eadt then + return total, false + end + -- 続行条件2: min(eadt[1], 0)<= \parfillskip <= max(eadt[#eadt], 0) + local pfw = getfield(pf, 'width') + + (total>0 and getfield(pf, 'stretch') or -getfield(pf, 'shrink')) *getfield(p, 'glue_set') + if pfw0 then + eadt_ratio[i] = {i, t/total_st[65536*total_st.order], t, v} + else + eadt_ratio[i] = {i, t/total_sh[65536*total_sh.order], t, v} + end + end + table.sort(eadt_ratio, + function (a,b) + for i=2,4 do + local at, bt = abs(a[i]), abs(b[i]) + if at~=bt then return at 0 then + local ratio = after/before + for q in node_traverse_id(id_glue, getlist(p)) do + local f = ap[get_attr_icflag(q)] + if (f==ind) and getfield(q, name..'_order')==0 then + setfield(q, name, getfield(q, name)*ratio) end - total, i= total - res[v], i+1 - end - if i == #priority_table + 10 or added_flag then - local f = node.hpack(p.head, p.width, 'exactly') - f.head, p.glue_set, p.glue_sign, p.glue_order - = nil, f.glue_set, f.glue_sign, f.glue_order - node.free(f) end end end - -function adjust_width(head) - if not head then return head end - for p in node.traverse_id(id_hlist, head) do - local res = get_total_stretched(p) - --print(table.serialize(res)) - if res then - -- 調整量の合計 - local total = 0 - for i,v in pairs(res) do - if type(i)=='number' then - total = total + v - end - end; total = tex.round(total * res.glue_set) - local added_flag = aw_step1(p, res, total) - --print(total, res[0], res[KANJI_SKIP], res[FROM_JFM]) - aw_step2(p, res, total, added_flag) +function aw_step2(p, total, added_flag) + local name = (total>0) and 'stretch' or 'shrink' + local id = (total>0) and 1 or 2 + local res = total_stsh[id] + local pnum = priority_num[id] + if total==0 or res.order > 0 then + -- もともと伸縮の必要なしか,残りの伸縮量は無限大 + if added_flag then return repack(p) end + end + total = abs(total) + for i = 1, pnum do + if total <= res[i] then + local a = at2pr[id] + for j = i+1,pnum do + clear_stretch(p, j, a, name) + end + set_stretch(p, total, res[i], i, a, name); break end + total = total - res[i] end - return head + return repack(p) +end end -local is_reg = false -function enable_cb() - if not is_reg then - luatexbase.add_to_callback('post_linebreak_filter', adjust_width, 'Adjust width', 100) - is_reg = true +-- step 1': lineend=extended の場合(行分割時に考慮)) +local insert_lineend_kern +do + local insert_before = node.direct.insert_before + local KINSOKU = luatexja.icflag_table.KINSOKU + function insert_lineend_kern(head, nq, np, Bp) + if nq.met then + local eadt = nq.met.char_type[nq.class].end_adjust + if not eadt then return end + if eadt[1]~=0 then + local x = node_new(id_kern, 1) + setfield(x, 'kern', eadt[1]); set_attr(x, attr_icflag, LINEEND) + insert_before(head, np.first, x) + end + local eadt_num = #eadt + for i=2,eadt_num do + local x = node_new(id_penalty) + setfield(x, 'penalty', 0); set_attr(x, attr_icflag, KINSOKU) + insert_before(head, np.first, x); Bp[#Bp+1] = x + local x = node_new(id_kern, 1) + setfield(x, 'kern', eadt[i]-eadt[i-1]); set_attr(x, attr_icflag, LINEEND) + insert_before(head, np.first, x) + end + if eadt_num>1 or eadt[1]~=0 then + local x = node_new(id_penalty) + setfield(x, 'penalty', 0); set_attr(x, attr_icflag, KINSOKU) + insert_before(head, np.first, x); Bp[#Bp+1] = x + local x = node_new(id_kern, 1) + setfield(x, 'kern', -eadt[eadt_num]); set_attr(x, attr_icflag, LINEEND) + insert_before(head, np.first, x) + local x = node_new(id_penalty) + setfield(x, 'penalty', 10000); set_attr(x, attr_icflag, KINSOKU) + insert_before(head, np.first, x); Bp[#Bp+1] = x + end + end end end -function disable_cb() - if is_reg then - luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width') - is_reg = false + +local adjust_width +do + local myaw_atep1, myaw_step2, myaw_step1_last + local dummy = function(p,t,n) return t, false end + local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip + function adjust_width(head) + if not head then return head end + local last_p + for p in node_traverse_id(id_hlist, to_direct(head)) do + if last_p then + myaw_step2(last_p, myaw_step1(last_p, get_total_stretched(last_p))) + end + last_p = p + end + if last_p then + myaw_step2(last_p, myaw_step1_last(last_p, get_total_stretched(last_p))) + end + return to_node(head) end + local is_reg = false + function enable_cb(status_le, status_pr) + if (status_le>0 or status_pr>0) and (not is_reg) then + luatexbase.add_to_callback('post_linebreak_filter', + adjust_width, 'Adjust width', 100) + is_reg = true + elseif is_reg and (status_le==0 and status_pr==0) then + luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width') + is_reg = false + end + if status_le==2 then + if not luatexbase.in_callback('luatexja.adjust_jfmglue', 'luatexja.adjust') then + luatexbase.add_to_callback('luatexja.adjust_jfmglue', insert_lineend_kern, 'luatexja.adjust') + end + myaw_step1, myaw_step1_last = dummy, aw_step1_last + else + if status_le==0 then + myaw_step1, myaw_step1_last = dummy, dummy + else + myaw_step1, myaw_step1_last = aw_step1, aw_step1_last + end + if luatexbase.in_callback('luatexja.adjust_jfmglue', 'luatexja.adjust') then + luatexbase.remove_from_callback('luatexja.adjust_jfmglue', 'luatexja.adjust') + end + end + myaw_step2 = (status_pr>0) and aw_step2 or aw_step2_dummy + end + function disable_cb() -- only for compatibility + enable_cs(0) + end + luatexja.adjust.enable_cb=enable_cb + luatexja.adjust.disable_cb=disable_cb +end + +luatexja.unary_pars.adjust = function(t) + return is_reg and 1 or 0 end