X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=3d7e31e0c409e4f4d75d30cb7b803a6562901a12;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=4e335289b74994f15a5cfba8f4dc32afe9cbb311;hpb=1dc395e8e6e5fa0352799748b530a987f4dafed8;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua index 4e33528..3d7e31e 100644 --- a/src/ltj-adjust.lua +++ b/src/ltj-adjust.lua @@ -1,19 +1,20 @@ -- -- ltj-adjust.lua -- +luatexja.load_module('base'); local ltjb = luatexja.base 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.load_module('lineskip'); local ltjl = luatexja.lineskip +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 getglue = luatexja.getglue local getfield = node.direct.getfield -local is_zero_glue = node.direct.is_zero_glue local getlist = node.direct.getlist local getid = node.direct.getid local getfont = node.direct.getfont @@ -21,8 +22,6 @@ local getsubtype = node.direct.getsubtype local node_traverse_id = node.direct.traverse_id local node_new = node.direct.new -local node_copy = node.direct.copy -local node_hpack = node.direct.hpack local node_next = node.direct.getnext local node_free = node.direct.free local node_prev = node.direct.getprev @@ -36,12 +35,13 @@ local id_kern = node.id('kern') local id_hlist = node.id('hlist') local id_glue = node.id('glue') 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 lang_ja = luatexja.lang_ja local ltjf_font_metric_table = ltjf.font_metric_table -local round, pairs = tex.round, pairs +local ipairs, pairs = ipairs, pairs local PACKED = luatexja.icflag_table.PACKED local LINEEND = luatexja.icflag_table.LINEEND @@ -51,16 +51,6 @@ 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 get_attr_icflag do local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG @@ -69,40 +59,68 @@ do end 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 go, gf, gs - = getfield(p, 'glue_order'), getfield(p, 'glue_set'), getfield(p, 'glue_sign') + 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_table do - total_st[priority_table[i]]=0; total_sh[priority_table[i]]=0; - 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 - total_st[-1]=0; total_sh[-1]=0; - local pf, pfw - for q in node_traverse_id(id_glue, getlist(p)) do + for q in node_traverse_id(id_glue, ph) do local a = getfield(q, 'stretch_order') - if a>0 then a=a*65536 else - total_st[0] = total_st[0]+getfield(q, 'stretch') - a = get_attr_icflag(q) - if a == KANJI_SKIP_JFM then a = KANJI_SKIP - elseif a == XKANJI_SKIP_JFM then a = XKANJI_SKIP - elseif type(total_st[a])~='number' then a = -1 end + 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] = total_st[a]+getfield(q, 'stretch') + total_st[a*65536] = total_st[a]+getfield(q, 'stretch') local a = getfield(q, 'shrink_order') - if a>0 then a=a*65536 else - total_sh[0] = total_sh[0]+getfield(q, 'shrink') - a = get_attr_icflag(q) - if a == KANJI_SKIP_JFM then a = KANJI_SKIP - elseif a == XKANJI_SKIP_JFM then a = XKANJI_SKIP - elseif type(total_sh[a])~='number' then a = -1 end + 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] = total_sh[a]+getfield(q, 'shrink') + 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 @@ -112,37 +130,8 @@ local function get_total_stretched(p) if not total_sh.order then total_sh.order, total_sh[-65536] = -1,0.1 -- dummy end - if gs==0 then - return 0 - else - return round((3-2*gs)*total_stsh[gs][go*65536]*gf) - end + return getfield(p,'width') - dimensions(ph) end - -local function clear_stretch(p, ic, name) - for q in node_traverse_id(id_glue, getlist(p)) do - local f = get_attr_icflag(q) - if (f == ic) or ((ic ==KANJI_SKIP) and (f == KANJI_SKIP_JFM)) - or ((ic ==XKANJI_SKIP) and (f == XKANJI_SKIP_JFM)) then - setfield(q, name..'_order', 0) - setfield(q, name, 0) - end - end -end - -local function set_stretch(p, after, before, ic, name) - if before > 0 then - local ratio = after/before - for q in node_traverse_id(id_glue, getlist(p)) do - local f = get_attr_icflag(q) - if (f == ic) or ((ic ==KANJI_SKIP) and (f == KANJI_SKIP_JFM)) - or ((ic ==XKANJI_SKIP) and (f == XKANJI_SKIP_JFM)) then - if getfield(q, name..'_order')==0 then - setfield(q, name, getfield(q, name)*ratio) - end - end - end - end end -- step 1: 行末に kern を挿入（句読点，中点用） @@ -154,6 +143,11 @@ local function aw_step1(p, total) -- 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 @@ -200,7 +194,8 @@ local function aw_step1(p, total) end end --- 行末用 +-- step 1 最終行用 +local min, max = math.min, math.max local function aw_step1_last(p, total) local head = getlist(p) local x = node_tail(head); if not x then return total, false end @@ -239,21 +234,23 @@ local function aw_step1_last(p, total) if not eadt then return total, false end - -- 続行条件2: eadt[1]<= \parfillskip <= eadt[#eadt] + -- 続行条件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 pfw 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 + end end end -local function aw_step2(p, total, added_flag) + +function aw_step2(p, total, added_flag) local name = (total>0) and 'stretch' or 'shrink' - local res = total_stsh[(total>0) and 1 or 2] + 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 -- 行末に kern 追加したので，それによる補正 - local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly') - setfield(f, 'head', nil) - setfield(p, 'glue_set', getfield(f, 'glue_set')) - setfield(p, 'glue_order', getfield(f, 'glue_order')) - setfield(p, 'glue_sign', getfield(f, 'glue_sign')) - node_free(f) - return - end + if added_flag then return repack(p) end end - total = math.abs(total) - if total <= res[-1] then -- 和文処理グルー以外で足りる - for _,v in pairs(priority_table) do clear_stretch(p, v, name) end - local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly') - setfield(f, 'head', nil) - setfield(p, 'glue_set', getfield(f, 'glue_set')) - setfield(p, 'glue_order', getfield(f, 'glue_order')) - setfield(p, 'glue_sign', getfield(f, 'glue_sign')) - node_free(f) - else - total = total - res[-1]; - for i = 1, #priority_table do - local v = priority_table[i] - if total <= res[v] then - for j = i+1,#priority_table do - clear_stretch(p, priority_table[j], name) - end - set_stretch(p, total, res[v], v, name); break + 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 - total = total - res[v] + set_stretch(p, total, res[i], i, a, name); break end - local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly') - setfield(f, 'head', nil) - setfield(p, 'glue_set', getfield(f, 'glue_set')) - setfield(p, 'glue_order', getfield(f, 'glue_order')) - setfield(p, 'glue_sign', getfield(f, 'glue_sign')) - node_free(f) + total = total - res[i] end + return repack(p) +end end - +-- step 1': lineend=extended の場合（行分割時に考慮）） local insert_lineend_kern do - local id_penalty = node.id('penalty') local insert_before = node.direct.insert_before local KINSOKU = luatexja.icflag_table.KINSOKU function insert_lineend_kern(head, nq, np, Bp) @@ -357,7 +359,8 @@ do setfield(x, 'kern', eadt[1]); set_attr(x, attr_icflag, LINEEND) insert_before(head, np.first, x) end - for i=2,#eadt do + 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 @@ -365,12 +368,12 @@ do setfield(x, 'kern', eadt[i]-eadt[i-1]); set_attr(x, attr_icflag, LINEEND) insert_before(head, np.first, x) end - if #eadt>1 or eadt[1]~=0 then + 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]); set_attr(x, attr_icflag, LINEEND) + 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) @@ -380,7 +383,7 @@ do end end -local adust_width +local adjust_width do local myaw_atep1, myaw_step2, myaw_step1_last local dummy = function(p,t,n) return t, false end @@ -400,19 +403,19 @@ do return to_node(head) end local is_reg = false - function enable_cb(status_le, status_pr) + function enable_cb(status_le, status_pr, status_lp, status_ls) 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) + ltjb.add_to_callback('post_linebreak_filter', + adjust_width, 'Adjust width', + luatexbase.priority_in_callback('post_linebreak_filter', 'ltj.lineskip')-1) 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 - myaw_step1 = dummy --(status%2>0) and aw_step1 or dummy 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') + ltjb.add_to_callback('luatexja.adjust_jfmglue', insert_lineend_kern, 'luatexja.adjust') end myaw_step1, myaw_step1_last = dummy, aw_step1_last else @@ -426,13 +429,123 @@ do end end myaw_step2 = (status_pr>0) and aw_step2 or aw_step2_dummy + luatexja.lineskip.setting( + status_lp>0 and 'profile' or 'dummy', + status_ls>0 and 'step' or 'dummy' + ) end function disable_cb() -- only for compatibility - enable_cs(0) + enable_cs(0,0,0,0) end - luatexja.adjust = luatexja.adjust or {enable_cb=enable_cb, disable_cb=disable_cb} + 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 + +-- ---------------------------------- +do + local max, ins, sort = math.max, table.insert, table.sort + local function insert(package, ind, d, b, e) + local bound = package[2] + bound[b], bound[e]=true, true + ins(package[1], {b,e,[ind]=d}) + end + local function flatten(package) + local bd={} for i,_ in pairs(package[2]) do ins(bd,{i}) end + sort(bd, function (a,b) return a[1]=3 then + bd[j][k]=bd[j][k] and max(bd[j][k],w) or w + end + end + j=j+1 + end + end + package[2]=nil; package[1]=nil; package.flatten, package.insert=nil, nil + bd[#bd]=nil + return bd + end + function init_range() + return {{},{}, insert=insert, flatten=flatten} + end +end + +-- ----------------------------------- +luatexja.adjust.step_factor = 0.5 +luatexja.unary_pars.linestep_factor = function(t) + return luatexja.adjust.step_factor +end +luatexja.adjust.profile_hgap_factor = 1 +luatexja.unary_pars.profile_hgap_factor = function(t) + return luatexja.adjust.profile_hgap_factor +end +do + local insert = table.insert + local rangedimensions, max = node.direct.rangedimensions, math.max + local function profile_inner(box, range, ind, vmirrored, adj) + local w_acc, d_before = getfield(box,'shift'), 0 + local x = getlist(box); local xn = node_next(x) + while x do + local w, h, d + if xn then w, h, d= rangedimensions(box,x,xn) + else w, h, d= rangedimensions(box,x) end + if vmirrored then h=d end + local w_new = w_acc + w + if w>=0 then + range:insert(ind, h, w_acc-adj, w_new) + else + range:insert(ind, h, w_new-adj, w_acc) + end + w_acc = w_new; x = xn; if x then xn = node_next(x) end + end + end + function ltjl.p_profile(before, after, mirrored, bw) + local range, tls + = init_range(), luatexja.adjust.profile_hgap_factor*tex.lineskip.width + profile_inner(before, range, 3, true, tls) + profile_inner(after, range, 4, mirrored, tls) + range = range:flatten() + do + local dmax, d, hmax, h, lmin = 0, 0, 0, 0, 1/0 + for i,v in ipairs(range) do + d, h = (v[3] or 0), (v[4] or 0) + if d>dmax then dmax=d end + if h>hmax then hmax=h end + if bw-h-d