--
--- luatexja/otf.lua
+-- ltj-adjust.lua
--
-luatexbase.provides_module({
- name = 'luatexja.adjust',
- date = '2014/01/24',
- 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
-local Dnode = node.direct or node
-
-local nullfunc = function(n) return n end
-local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
-local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
-local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
-local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
+local setfield = node.direct.setfield
+local setglue = luatexja.setglue
+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
+local getsubtype = node.direct.getsubtype
-local node_traverse_id = Dnode.traverse_id
-local node_new = Dnode.new
-local node_copy = Dnode.copy
-local node_hpack = Dnode.hpack
-local node_next = Dnode.getnext
-local node_free = Dnode.free
-local node_prev = Dnode.getprev
-local node_tail = Dnode.tail
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
-local insert_after = Dnode.insert_after
+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
+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 id_whatsit = node.id('whatsit')
local attr_icflag = luatexbase.attributes['ltj@icflag']
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
-local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
+local lang_ja = luatexja.lang_ja
local ltjf_font_metric_table = ltjf.font_metric_table
-local spec_zero_glue = ltjj.spec_zero_glue
-local round = tex.round
+local round, pairs = tex.round, pairs
local PACKED = luatexja.icflag_table.PACKED
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,
KANJI_SKIP
}
-local PROCESSED_BEGIN_FLAG = 32
-local function get_attr_icflag(p)
- return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+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
-- box 内で伸縮された glue の合計値を計算
-local function get_stretched(q, go, gs)
- local qs = getfield(q, 'spec')
- if not getfield(qs, 'writable') then return 0 end
- if gs == 1 then -- stretching
- if getfield(qs, 'stretch_order') == go then
- return getfield(qs, 'stretch')
- end
- else -- shrinking
- if getfield(qs, 'shrink_order') == go then
- return getfield(qs, 'shrink')
- end
+local total_stsh = {{},{}}
+local total_st, total_sh = total_stsh[1], total_stsh[2]
+local function get_total_stretched(p, line)
+-- return value: <補正値(sp)>
+ local go, gf, gs
+ = getfield(p, 'glue_order'), getfield(p, 'glue_set'), getfield(p, 'glue_sign')
+ 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
-end
-
-local res = {}
-local is_skip_normal = {}
-local function get_total_stretched(p)
- local go, gf, gs
- = getfield(p, 'glue_order'), getfield(p, 'glue_set'), getfield(p, 'glue_sign')
- res[0], res.glue_set, res.name = 0, gf, (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
+ for i=0,4 do total_st[i*65536]=0; total_sh[i*65536]=0 end
+ total_st[-1]=0; total_sh[-1]=0;
for q in node_traverse_id(id_glue, getlist(p)) do
- 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) and getsubtype(q)==0 then
- local qs = getfield(q, 'spec')
- if is_skip_normal[ic] and qs ~= spec_zero_glue then
- setfield(q, 'spec', node_copy(qs))
- end
- end
- else
- res[0] = res[0] + a
+ 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
end
+ total_st[a] = 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
+ end
+ total_sh[a] = total_sh[a]+getfield(q, 'shrink')
+ end
+ for i=4,0,-1 do if total_st[i*65536]~=0 then total_st.order=i; break end; end
+ for i=4,0,-1 do if total_sh[i*65536]~=0 then total_sh.order=i; break end; end
+ print('gf', (gs==0) and ' ' or (gs==1 and '+' or '-') .. gf )
+ print('**STRETCH')
+ for i,v in pairs(total_st) do print(i, v); end
+ print('**shrink')
+ for i,v in pairs(total_sh) do print(i, v); end
+ print('****** END ******')
+ if gs==0 then
+ return 0, gf
+ else
+ return round((3-2*gs)*total_stsh[gs][go*65536]*gf), gf
end
- return res
end
local function clear_stretch(p, ic, name)
+ print('clear', ic)
for q in node_traverse_id(id_glue, getlist(p)) do
- if get_attr_icflag(q) == ic then
- local qs = getfield(q, 'spec')
- if getfield(qs, 'writable') then
- setfield(qs, name..'_order', 0)
- setfield(qs, name, 0)
- end
+ 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 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, getlist(p)) do
- if get_attr_icflag(q) == ic then
- local qs, do_flag = getfield(q, 'spec'), true
- for i=1,#set_stretch_table do
- if set_stretch_table[i]==qs then do_flag = false end
- end
- if getfield(qs, 'writable') and getfield(qs, name..'_order')==0 and do_flag then
- setfield(qs, name, getfield(qs, name)*ratio)
- set_stretch_table[#set_stretch_table+1] = qs
+ 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
-- step 1: 行末に kern を挿入（句読点，中点用）
-local function aw_step1(p, res, total)
+local ltjd_glyph_from_packed = ltjd.glyph_from_packed
+local function aw_step1(p, total, ntr)
local head = getlist(p)
- local x = node_tail(head); if not x then return false end
- x = node_prev(x); if not x then return false end
- -- 本当の行末の node を格納
- if getid(x) == id_glue and getsubtype(x) == 15 then
+ 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)
+ if xi == id_glue and getsubtype(x) == 15 then
-- 段落最終行のときは，\penalty10000 \parfillskip が入るので，
-- その前の node が本来の末尾文字となる
- x = node_prev(node_prev(x))
+ x = node_prev(node_prev(x)); xi = getid(x)
end
- local xi, xc = getid(x)
- if xi == id_glyph and has_attr(x, attr_curjfnt) == getfont(x) then
+ 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 = getlist(x)
- while getid(xc) == id_whatsit do xc = node_next(xc) end
+ xc = ltjd_glyph_from_packed(x)
+ while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために？
else
- return false-- それ以外は対象外．
+ return total, false-- それ以外は対象外．
end
- local xk = ltjf_font_metric_table[getfont(xc)]
- xk = xk.char_type[has_attr(xc, attr_jchar_class) or 0]
- xk = xk['end_' .. res.name] or 0
+ local xkst = ltjf_font_metric_table[getfont(xc)]
+ .char_type[has_attr(xc, attr_jchar_class) or 0]['end_stretch'] or 0
+ local xksh = ltjf_font_metric_table[getfont(xc)]
+ .char_type[has_attr(xc, attr_jchar_class) or 0]['end_shrink'] or 0
+ local xkni = ltjf_font_metric_table[getfont(xc)]
+ .char_type[has_attr(xc, attr_jchar_class) or 0]['end_natural_inhibit']
- if xk>0 and total>=xk then
- total = total - xk
+ print(total, xkst, xksh, ntr)
+ if total>=xkst and xkst>0 then
local kn = node_new(id_kern)
- setfield(kn, 'kern', (res.name=='shrink' and -1 or 1) * xk)
- set_attr(kn, attr_icflag, FROM_JFM)
+ setfield(kn, 'kern', xkst); set_attr(kn, attr_icflag, FROM_JFM)
insert_after(head, x, kn)
- return true
- else return false
+ return total - xkst, true
+ elseif total<=-xksh and xksh<0 then
+ local kn = node_new(id_kern)
+ setfield(kn, 'kern', -xksh); set_attr(kn, attr_icflag, FROM_JFM)
+ insert_after(head, x, kn)
+ return total + xksh, true
+ else --
+ local str = -(total-xkst)/total_sh[65536*total_sh.order] -- end_stretch を入れたときの glue_set (shrink)
+ local shr = (xksh+total)/total_st[65536*total_st.order] -- end_shrink を入れたときの glue_set (stretch)
+ print(xkni, str, ntr, shr)
+ if xkni then
+ if str<shr then
+ local kn = node_new(id_kern)
+ setfield(kn, 'kern', xkst); set_attr(kn, attr_icflag, FROM_JFM)
+ insert_after(head, x, kn)
+ return total- xkst, true
+ else
+ local kn = node_new(id_kern)
+ setfield(kn, 'kern', -xksh); set_attr(kn, attr_icflag, FROM_JFM)
+ insert_after(head, x, kn)
+ return total + xksh, true
+ end
+ else
+ return total, false
+ end
end
end
-- step 2: 行中の glue を変える
-local function aw_step2(p, res, total, added_flag)
- if total == 0 then -- もともと伸縮の必要なし
+local 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]
+ print('STEP2', total)
+ 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)
node_free(f)
return
end
- elseif total <= res[0] then -- 和文処理グルー以外で足りる
- for _,v in pairs(priority_table) do clear_stretch(p, v, res.name) 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'))
+ 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
- local orig_total, avail = total, res[0]
- total, i = total - res[0], 1
- while i <= #priority_table do
- local v = priority_table[i]
+ total = total - res[-1]; print('のこり', total)
+ for i = 1, #priority_table do
+ local v = priority_table[i]
+ print('total vs v', total, res[v], v)
if total <= res[v] then
for j = i+1,#priority_table do
- clear_stretch(p, priority_table[j], res.name)
+ clear_stretch(p, priority_table[j], name)
end
- set_stretch(p, total, res[v], v, res.name)
- avail = avail + total
- i = #priority_table + 9 -- ループから抜けさせたいため
+ set_stretch(p, total, res[v], v, name); break
end
- total, i, avail = total - res[v], i+1, avail + res[v]
- end
- if i == #priority_table + 10 or added_flag then
- 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[v]
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)
end
end
-function adjust_width(head)
+local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip
+local function adjust_width(head)
if not head then return head end
- is_skip_normal[KANJI_SKIP] = (ltjs.fast_get_stack_skip('kanjiskip').width ~= 1073741823)
- is_skip_normal[XKANJI_SKIP] = (ltjs.fast_get_stack_skip('xkanjiskip').width ~= 1073741823)
+ local line = 1
for p in node_traverse_id(id_hlist, to_direct(head)) do
- local res = get_total_stretched(p)
- if res then
- -- 調整量の合計
- local total = 0
- for i,v in pairs(res) do
- if type(i)=='number' then
- total = total + v
- end
- end; total = 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)
- end
+ line = line + 1
+ aw_step2(p, aw_step1(p, get_total_stretched(p, line)))
end
return to_node(head)
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
+do
+ luatexja.adjust = luatexja.adjust or {}
+ local is_reg = false
+ function luatexja.adjust.enable_cb()
+ if not is_reg then
+ luatexbase.add_to_callback('post_linebreak_filter',
+ adjust_width, 'Adjust width', 100)
+ is_reg = true
+ end
end
-end
-function disable_cb()
- if is_reg then
- luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
- is_reg = false
+ function luatexja.adjust.disable_cb()
+ if is_reg then
+ luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
+ is_reg = false
+ end
end
end
OSDN Git Service
