--
luatexbase.provides_module({
name = 'luatexja.ruby',
- date = '2012/04/21',
- version = '0.1',
- description = 'Ruby',
+ date = '2022-08-14',
+ description = 'Ruby annotation',
})
-module('luatexja.ruby', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
-local id_hlist = node.id('hlist')
-local id_vlist = node.id('vlist')
-local id_rule = node.id('rule')
-local id_whatsit = node.id('whatsit')
-local id_glue = node.id('glue')
-local id_kern = node.id('kern')
-local id_glue_spec = node.id('glue_spec')
-local sid_user = node.subtype('user_defined')
-local ltjs_get_penalty_table = luatexja.stack.get_penalty_table
-local id_pbox_w = node.id('hlist') + 513 -- cluster which consists of a whatsit
+luatexja.ruby = {}
+luatexja.load_module 'stack'; local ltjs = luatexja.stack
+luatexja.load_module 'base'; local ltjb = luatexja.base
+
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
+
+local getfield = node.direct.getfield
+local getid = node.direct.getid
+local getfont = node.direct.getfont
+local getlist = node.direct.getlist
+local getchar = node.direct.getchar
+local getsubtype = node.direct.getsubtype
+local getkern = node.direct.getkern
+local getwidth = node.direct.getwidth
+local getheight = node.direct.getheight
+local getdepth = node.direct.getdepth
+local getwhd = node.direct.getwhd
+local setfield = node.direct.setfield
+local setglue = luatexja.setglue
+local setkern = node.direct.setkern
+local setnext = node.direct.setnext
+local setshift = node.direct.setshift
+local setwidth = node.direct.setwidth
+local setheight = node.direct.setheight
+local setdepth = node.direct.setdepth
+local setwhd = node.direct.setwhd
+local setlist = node.direct.setlist
+
+local node_new = node.direct.new
+local node_remove = node.direct.remove
+local node_next = node.direct.getnext
+local node_copy, node_tail = node.direct.copy, node.direct.tail
+local node_free = node.direct.flush_node or node.direct.free
+local get_attr, set_attr = node.direct.get_attribute, node.direct.set_attribute
+local insert_before, insert_after = node.direct.insert_before, node.direct.insert_after
+local hpack = node.direct.hpack
+
+local id_hlist = node.id 'hlist'
+local id_vlist = node.id 'vlist'
+local id_rule = node.id 'rule'
+local id_whatsit= node.id 'whatsit'
+local id_glue = node.id 'glue'
+local id_kern = node.id 'kern'
+local id_penalty= node.id 'penalty'
+local sid_user = node.subtype 'user_defined'
+local ltjs_get_stack_table = luatexja.stack.get_stack_table
+local id_pbox_w = 258 -- cluster which consists of a whatsit
local attr_icflag = luatexbase.attributes['ltj@icflag']
-- ルビ処理用の attribute は他のやつの流用なので注意！
-- 進入許容量 (sp)
-local attr_ruby_maxprep = luatexbase.attributes['ltj@charclass']
-local attr_ruby_maxpostp = luatexbase.attributes['ltj@kcat0']
-local attr_ruby_maxmargin = luatexbase.attributes['ltj@kcat1']
-
-local attr_ruby_stretch = luatexbase.attributes['ltj@kcat2']
-local attr_ruby_mode = luatexbase.attributes['ltj@kcat3']
+local attr_ruby_id = luatexbase.attributes['ltj@kcat4'] -- uniq id
local attr_ruby = luatexbase.attributes['ltj@rubyattr']
--- ルビ内部処理用
--- jfmglue 中では「2つ前のクラスタもルビ」のフラグ（true = 1）
--- (whatsit).value node ではルビ全角の値（sp単位）
--- 行分割前後では，「何番目のルビ関連ノード」か
-
-local round = tex.round
-local floor = math.floor
-local min = math.min
-local max = math.max
---local node_type = node.type
-local node_new = node.new
-local node_remove = node.remove
--- local node_prev = node.prev
-local node_next = node.next
-local node_copy = node.copy
-local node_tail = node.tail
-local node_free = node.free
-local has_attr = node.has_attribute
-local set_attr = node.set_attribute
-local node_insert_before = node.insert_before
-local node_insert_after = node.insert_after
-
-local FROM_JFM = 4
-local KANJI_SKIP = 6
-local XKANJI_SKIP = 7
-local PROCESSED = 8
-
-local uid_ruby_pre = 30120
-local uid_ruby_post = 30121
-
-local box_stack_level
+-- ルビ内部処理用，以下のようにノードによって使われ方が異なる
+-- * (whatsit) では JAglue 処理時に，
+-- 「2つ前のクラスタもルビ」 ==> そのルビクラスタの id
+-- otherwise ==> unset
+-- * (whatsit).value node ではルビ全角の値（sp単位）
+-- * 行分割で whatsit の前後に並ぶノードでは，「何番目のルビ関連ノード」か
+-- * (whatsit).value に続く整形済み vbox たちでは post_intrusion の値
+local attr_ruby_post_jfmgk = luatexbase.attributes['ltj@kcat3']
+-- JAglue 処理時に，2つ前のクラスタもルビであれば，そのルビが直後の和文処理グルーへ
+-- 正の進入をしたか否か（した：1，しなかった：0）
+local cat_lp = luatexbase.catcodetables['latex-package']
+
+local round, floor = tex.round, math.floor
+local min, max = math.min, math.max
+
+luatexja.userid_table.RUBY_PRE = luatexbase.newuserwhatsitid('ruby_pre', 'luatexja')
+luatexja.userid_table.RUBY_POST = luatexbase.newuserwhatsitid('ruby_post', 'luatexja')
+local RUBY_PRE = luatexja.userid_table.RUBY_PRE
+local RUBY_POST = luatexja.userid_table.RUBY_POST
+local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
+
+----------------------------------------------------------------
+-- TeX interface 0
+----------------------------------------------------------------
+do
+ local getbox = node.direct.getbox
+ function luatexja.ruby.cpbox() return node_copy(getbox(0)) end
+end
----------------------------------------------------------------
-- 補助関数群 1
local deg = #coef
for i = 1, deg do
if coef[i][i]==0 then
- for j = i+1, deg do
- if coef[j][i]~=0 then
- local tmp = coef[i]; coef[i] = coef[j]; coef[j] = tmp
- break
- end
- end
+ for j = i+1, deg do
+ if coef[j][i]~=0 then
+ coef[i], coef[j] = coef[j], coef[i]; break
+ end
+ end
end
- for j = 1,deg do
- local d = coef[i][i];
- if j~=i then
- local e = coef[j][i]
- for k = 1, deg+1 do coef[j][k] = coef[j][k] - e*coef[i][k]/d end
- else
- for k = 1, deg+1 do coef[i][k] = coef[i][k]/d end
- end
+ for j = 1,deg do
+ local d = coef[i][i];
+ if j~=i then
+ local e = coef[j][i]
+ for k = 1, deg+1 do coef[j][k] = coef[j][k] - e*coef[i][k]/d end
+ else
+ for k = 1, deg+1 do coef[i][k] = coef[i][k]/d end
+ end
end
end
end
--- 実行回数 + ルビ中身 から uniq_id を作る関数
--- 未実装．これを使えば 2 回目以降の組版に 1 回目の情報が使える
+local function solve_1(coef)
+ local a, b, c = coef[1][4], coef[2][4], coef[3][4]
+ coef[1][4], coef[2][4], coef[3][4] = c-b, a+b-c, c-a
+ return coef
+end
+
+local function solve_2(coef)
+ local a, b, c, d, e = coef[1][6], coef[2][6], coef[3][6], coef[4][6], coef[5][6]
+ coef[1][6], coef[2][6], coef[3][6], coef[4][6], coef[5][6]
+ = e-c, a+c-e, e-a-d, b+d-e, e-b
+ return coef
+end
+
+-- 実行回数 + ルビ中身 から uniq_id を作る関数
+luatexja.ruby.old_break_info = {} -- public, 前 run 時の分割情報
+local old_break_info = luatexja.ruby.old_break_info
+local cache_handle
+function luatexja.ruby.read_old_break_info()
+ if tex.jobname then
+ local fname = tex.jobname .. '.ltjruby'
+ local real_file = kpse.find_file(fname)
+ if real_file then dofile(real_file) end
+ cache_handle = io.open(fname, 'w')
+ if cache_handle then
+ cache_handle:write('local lrob=luatexja.ruby.old_break_info\n')
+ end
+ end
+end
+local make_uniq_id
+do
+ local exec_count = 0
+ make_uniq_id = function (w)
+ exec_count = exec_count + 1
+ return exec_count
+ end
+end
-- concatenation of boxes: reusing nodes
-- ルビ組版が行われている段落/hboxでの設定が使われる．
-- ルビ文字を格納しているボックスでの設定ではない！
-local function concat(f, b)
- local r
- if f then
- if b then
- local h = f.head
- node_tail(h).next = b.head
- f.head = nil; b.head = nil
- node_free(f); node_free(b)
- r = node.hpack(luatexja.jfmglue.main(h,false))
- else
- r = f
+local function get_attr_icflag(p)
+ return (get_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+end
+local concat
+do
+ local node_prev = node.direct.getprev
+ function concat(f, b)
+ if f then
+ if b then
+ local h, nh = getlist(f), getlist(b)
+ if getid(nh)==id_whatsit and getsubtype(nh)==sid_user then
+ nh=node_next(nh); node_free(node_prev(nh))
+ end
+ set_attr(nh, attr_icflag,
+ get_attr_icflag(nh) + PROCESSED_BEGIN_FLAG)
+ setnext(node_tail(h), nh)
+ setlist(f, nil); node_free(f)
+ setlist(b, nil); node_free(b)
+ local g = luatexja.jfmglue.main(h,false)
+ return hpack(g)
+ else
+ return f
+ end
+ elseif b then
+ return b
+ else
+ local h = node_new(id_hlist, 0)
+ setwhd(h, 0, 0, 0)
+ setfield(h, 'glue_set', 0)
+ setfield(h, 'glue_order', 0)
+ setlist(h, nil)
+ return h
end
- elseif b then
- r = b
- else
- local h = node_new(id_hlist)
- h.subtype = 0; h.width = 0; h.height = 0; h.depth = 0;
- h.head = nil; h.glue_set = 0; h.glue_order = 0
- r = h
end
- return r
end
local function expand_3bits(num)
local t = {}; local a = num
for i = 1, 10 do
- table.insert(t,a%8); a = floor(a/8)
+ t[i] = a%8; a = floor(a/8)
end
return t
end
----------------------------------------------------------------
-- box の中身のノードは再利用される
-local function enlarge(box, new_width, pre, middle, post, prenw, postnw)
- -- pre, middle, post: 伸縮比率
- -- prenw, postnw: 前後の自然長 (sp)
- local h = box.head; local hh = box.height; local hd = box.depth
- local hx = h
- while hx do
- if has_attr(hx, attr_icflag) == KANJI_SKIP
- or has_attr(hx, attr_icflag) == XKANJI_SKIP
- or has_attr(hx, attr_icflag) == FROM_JFM then
- -- この 3 種類の空白をのばす
- if hx.id == id_kern then
- local k = node_new(id_glue);
- local ks = node_new(id_glue_spec);
- ks.width = hx.kern;
- ks.stretch_order = 2; ks.stretch = round(middle*65536);
- ks.shrink_order = 0; ks.shrink = 0;
- k.subtype = 0; k.spec = ks
- h = node_insert_after(h, hx, k);
- h = node_remove(h, hx); node_free(hx); hx = k;
- else -- glue
- hx.spec = node_copy(hx.spec);
- hx.spec.stretch_order=2; hx.spec.stretch = round(middle*65536);
- hx.spec.shrink_order=0; hx.spec.shrink = 0;
+local enlarge
+do
+ local FROM_JFM = luatexja.icflag_table.FROM_JFM
+ local PROCESSED = luatexja.icflag_table.PROCESSED
+ 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
+ enlarge = function (box, new_width, pre, middle, post, prenw, postnw)
+ -- pre, middle, post: 伸縮比率
+ -- prenw, postnw: 前後の自然長 (sp)
+ local h = getlist(box);
+ local _, hh, hd = getwhd(box)
+ local hx = h
+ while hx do
+ local hic = get_attr(hx, attr_icflag) or 0
+ if (hic == KANJI_SKIP) or (hic == KANJI_SKIP_JFM)
+ or (hic == XKANJI_SKIP) or (hic == XKANJI_SKIP_JFM)
+ or ((hic<=FROM_JFM+63) and (hic>=FROM_JFM)) then
+ -- この 5 種類の空白をのばす
+ if getid(hx) == id_kern then
+ local k = node_new(id_glue, 0)
+ setglue(k, getkern(hx), round(middle*65536), 0,
+ 2, 0)
+ h = insert_after(h, hx, k);
+ h = node_remove(h, hx); node_free(hx); hx = k
+ else -- glue
+ setglue(hx, getwidth(hx), round(middle*65536), 0,
+ 2, 0)
+ end
end
+ hx = node_next(hx)
end
- hx = node_next(hx)
+ -- 先頭の空白を挿入
+ local k = node_new(id_glue);
+ setglue(k, prenw, round(pre*65536), 0, 2, 0)
+ h = insert_before(h, h, k);
+ -- 末尾の空白を挿入
+ local k = node_new(id_glue);
+ setglue(k, postnw, round(post*65536), 0, 2, 0)
+ insert_after(h, node_tail(h), k);
+ -- hpack
+ setlist(box, nil); node_free(box)
+ box = hpack(h, new_width, 'exactly')
+ setheight(box, hh); setdepth(box, hd)
+ return box
end
- -- 先頭と末尾の空白を挿入
- local k = node_new(id_glue);
- local ks = node_new(id_glue_spec);
- ks.width = prenw; ks.stretch_order = 2; ks.stretch = round(pre*65536);
- ks.shrink_order = 0; ks.shrink = 0;
- k.subtype = 0; k.spec = ks; h = node_insert_before(h, h, k);
- local k = node_new(id_glue);
- local ks = node_new(id_glue_spec);
- ks.width = postnw; ks.stretch_order = 2; ks.stretch = round(post*65536);
- ks.shrink_order = 0; ks.shrink = 0;
- k.subtype = 0; k.spec = ks; node_insert_after(h, node_tail(h), k);
- -- hpack
- box.head = nil; node_free(box);
- box = node.hpack(h, new_width, 'exactly')
- box.height = hh; box.depth = hd; return box
end
+
----------------------------------------------------------------
-- TeX interface
----------------------------------------------------------------
+-- rtlr: ルビ部分のボックスたち r1, r2, ...
+-- rtlp: 親文字 のボックスたち p1, p2, ...
local function texiface_low(rst, rtlr, rtlp)
local w = node_new(id_whatsit, sid_user)
- w.type = 110; w.user_id = uid_ruby_pre;
- w.value = node_new(id_whatsit, sid_user)
- w.value.type = 100; w.value.value = floor(#rtlr)
- set_attr(w.value, attr_ruby, rst.rubyzw)
- set_attr(w.value, attr_ruby_maxmargin, rst.maxmargin)
- set_attr(w.value, attr_ruby_maxprep, rst.intrusionpre)
- set_attr(w.value, attr_ruby_maxpostp, rst.intrusionpost)
- set_attr(w.value, attr_ruby_stretch, rst.stretch)
- set_attr(w.value, attr_ruby_mode, rst.mode)
- local m = w.value
+ setfield(w, 'type', 110); setfield(w, 'user_id', RUBY_PRE)
+ local wv = node_new(id_whatsit, sid_user)
+ setfield(w, 'value', to_node(wv))
+ setfield(wv, 'type', 108)
+ setfield(wv, 'value', rst); rst.count = floor(#rtlr)
+ setfield(wv, 'user_id', RUBY_PRE) -- dummy
+ local n = wv
for i = 1, #rtlr do
- local n = rtlr[i]; m.next = n; m = rtlp[i]; n.next = m
+ _, n = insert_after(wv, n, rtlr[i])
+ _, n = insert_after(wv, n, rtlp[i])
end
-- w.value: (whatsit) .. r1 .. p1 .. r2 .. p2
- node.write(w)
+ node.direct.write(w); return w,wv
end
-- rst: table
-function texiface(rst, rtlr, rtlp)
+function luatexja.ruby.texiface(rst, rtlr, rtlp)
if #rtlr ~= #rtlp then
- for i,v in pairs(rtlr) do node_free(v) end
- for i,v in pairs(rtlp) do node_free(v) end
- luatexja.base.package_error('luatexja-ruby',
- 'Group count mismatch between the ruby and\n' ..
- 'the body (' .. #rtlr .. ' != ' .. #rtlp .. ').',
- '')
+ for i=1, #rtlr do node_free(rtlr[i]) end
+ for i=1, #rtlp do node_free(rtlp[i]) end
+ ltjb.package_error('luatexja-ruby',
+ 'Group count mismatch between the ruby and\n' ..
+ 'the body (' .. #rtlr .. ' != ' .. #rtlp .. ').',
+ '')
else
- local f = true
+ local f, eps = true, rst.eps
for i = 1,#rtlr do
- if rtlr[i].width > rtlp[i].width then f = false; break end
+ if getwidth(rtlr[i]) > getwidth(rtlp[i]) + eps then
+ f = false; break
+ end
end
if f then -- モノルビ * n
- local r,p = {true}, {true}
- for i = 1,#rtlr do
- r[1] = rtlr[i]; p[1] = rtlp[i]; texiface_low(rst, r, p)
- end
+ local r,p = {true}, {true}
+ for i = 1,#rtlr do
+ r[1] = rtlr[i]; p[1] = rtlp[i]; texiface_low(rst, r, p)
+ end
else
- texiface_low(rst, rtlr, rtlp)
+ local w, wv = texiface_low(rst, rtlr, rtlp)
+ local id = make_uniq_id(w)
+ set_attr(wv, attr_ruby_id, id)
end
end
end
-
----------------------------------------------------------------
-- pre_line_break
----------------------------------------------------------------
-- r, p の中身のノードは再利用される
-local function enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
- local sumprot = r.width - p.width -- >0
+local function enlarge_parent(r, p, tmp_tbl, no_begin, no_end)
+ -- r: ルビ部分の格納された box，p: 同，親文字
+ local rwidth = getwidth(r)
+ local sumprot = rwidth - getwidth(p) -- >0
local pre_intrusion, post_intrusion
+ local ppre, pmid, ppost = tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost
+ local mapre, mapost = tmp_tbl.mapre, tmp_tbl.mapost
+ local intmode = floor(tmp_tbl.mode/4)%4
+ if no_begin then mapre = mapre + tmp_tbl.before_jfmgk end
+ if no_end then mapost = mapost + tmp_tbl.after_jfmgk end
+ if (tmp_tbl.mode%4 >=2) and (tmp_tbl.pre<0) and (tmp_tbl.post<0) then
+ mapre = min(mapre,mapost); mapost = mapre
+ end
if intmode == 0 then -- とりあえず組んでから決める
- p = enlarge(p, r.width, ppre, pmid, ppost, 0, 0)
- pre_intrusion = min(mapre, round(ppre*p.glue_set*65536))
- post_intrusion = min(mapost, round(ppost*p.glue_set*65536))
+ p = enlarge(p, rwidth, ppre, pmid, ppost, 0, 0)
+ pre_intrusion = min(mapre, round(ppre*getfield(p, 'glue_set')*65536))
+ post_intrusion = min(mapost, round(ppost*getfield(p, 'glue_set')*65536))
elseif intmode == 1 then
- pre_intrusion = min(mapre, sumprot);
+ pre_intrusion = min(mapre, sumprot);
post_intrusion = min(mapost, max(sumprot-pre_intrusion, 0))
- p = enlarge(p, r.width, ppre, pmid, ppost, pre_intrusion, post_intrusion)
+ p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion)
elseif intmode == 2 then
- post_intrusion = min(mapost, sumprot);
+ post_intrusion = min(mapost, sumprot);
pre_intrusion = min(mapre, max(sumprot-post_intrusion, 0))
- p = enlarge(p, r.width, ppre, pmid, ppost, pre_intrusion, post_intrusion)
+ p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion)
else -- intmode == 3
local n = min(mapre, mapost)*2
if n < sumprot then
- pre_intrusion = n/2; post_intrusion = n/2
+ pre_intrusion = n/2; post_intrusion = n/2
else
- pre_intrusion = floor(sumprot/2); post_intrusion = sumprot - pre_intrusion
+ pre_intrusion = floor(sumprot/2); post_intrusion = sumprot - pre_intrusion
end
- p = enlarge(p, r.width, ppre, pmid, ppost, pre_intrusion, post_intrusion)
- pre_intrusion = min(mapre, pre_intrusion + round(ppre*p.glue_set*65536))
- post_intrusion = min(mapost, post_intrusion + round(ppost*p.glue_set*65536))
+ p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion)
+ pre_intrusion = min(mapre, pre_intrusion + round(ppre*getfield(p, 'glue_set')*65536))
+ post_intrusion = min(mapost, post_intrusion + round(ppost*getfield(p, 'glue_set')*65536))
end
- r.shift = -pre_intrusion
- r.width = r.width - pre_intrusion - post_intrusion
- p.width = r.width
- p.head.spec.width = p.head.spec.width - pre_intrusion
- return r, p, post_intrusion
+ setshift(r, -pre_intrusion)
+ local rwidth = rwidth - pre_intrusion - post_intrusion
+ setwidth(r, rwidth); setwidth(p, rwidth)
+ local ps = getlist(p)
+ setwidth(ps, getwidth(ps) - pre_intrusion)
+ local orig_post_intrusion, post_jfmgk = post_intrusion, false
+ if no_end then
+ if orig_post_intrusion > tmp_tbl.after_jfmgk then
+ orig_post_intrusion = orig_post_intrusion - tmp_tbl.after_jfmgk
+ post_jfmgk = (tmp_tbl.after_jfmgk > 0)
+ else
+ orig_post_intrusion = 0
+ post_jfmgk = (post_intrusion > 0)
+ end
+ end
+ return r, p, orig_post_intrusion, post_jfmgk
end
-- ルビボックスの生成（単一グループ）
-- returned value: <new box>, <ruby width>, <post_intrusion>
local max_margin
-local function new_ruby_box(r, p, ppre, pmid, ppost,
- rpre, rmid, rpost, mapre, mapost, intmode)
- local post_intrusion = 0
- if r.width > p.width then -- change the width of p
- r, p, post_intrusion = enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
- elseif r.width < p.width then -- change the width of r
- r = enlarge(r, p.width, rpre, rmid, rpost, 0, 0)
+local function new_ruby_box(r, p, tmp_tbl, no_begin, no_end)
+ local post_intrusion, post_jfmgk = 0, false
+ local imode
+ local ppre, pmid, ppost = tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost
+ local mapre, mapost = tmp_tbl.mapre, tmp_tbl.mapost
+ local rpre, rmid, rpost, rsmash
+ imode = floor(tmp_tbl.mode/0x100000); rsmash = (imode%2 ==1)
+ imode = floor(imode/2); rpost = imode%8;
+ imode = (imode-rpost)/8; rmid = imode%8;
+ imode = (imode-rmid)/8; rpre = imode%8
+ if getwidth(r) > getwidth(p) then -- change the width of p
+ r, p, post_intrusion, post_jfmgk = enlarge_parent(r, p, tmp_tbl, no_begin, no_end)
+ elseif getwidth(r) < getwidth(p) then -- change the width of r
+ r = enlarge(r, getwidth(p), rpre, rmid, rpost, 0, 0)
post_intrusion = 0
local need_repack = false
-- margin が大きくなりすぎた時の処理
- if round(rpre*r.glue_set*65536) > max_margin then
- local sp = r.head.spec; need_repack = true
- sp.width = max_margin; sp.stretch = 1 -- 全く伸縮しないのも困る
+ if round(rpre*getfield(r, 'glue_set')*65536) > max_margin then
+ local ps = getlist(r); need_repack = true
+ setwidth(ps, max_margin)
+ setfield(ps, 'stretch', 1) -- 全く伸縮しないのも困る
end
- if round(rpost*r.glue_set*65536) > max_margin then
- local sp = node_tail(r.head).spec; need_repack = true
- sp.width = max_margin; sp.stretch = 1 -- 全く伸縮しないのも困る
+ if round(rpost*getfield(r, 'glue_set')*65536) > max_margin then
+ local ps = node_tail(getlist(r)); need_repack = true
+ setwidth(ps, max_margin)
+ setfield(ps, 'stretch', 1) -- 全く伸縮しないのも困る
end
if need_repack then
- local rt = r
- r = node.hpack(r.head, r.width, 'exactly')
- rt.head = nil; node_free(rt);
+ local rt = r
+ r = hpack(getlist(r), getwidth(r), 'exactly')
+ setlist(rt, nil); node_free(rt);
end
end
- local a = node_new(id_rule); a.width = 0; a.height = 0; a.depth = 0
- node_insert_after(r, r, a); node_insert_after(r, a, p); p.next = nil
- a = node.vpack(r); a.height = p.height; a.depth = p.depth;
- a.shift = -(r.height+r.depth)
- return a, r.width, post_intrusion
+ local a, k = node_new(id_rule), node_new(id_kern, 1)
+ setwhd(a, 0, 0, 0); setkern(k, tmp_tbl.intergap)
+ insert_after(r, r, a); insert_after(r, a, k);
+ insert_after(r, k, p); setnext(p, nil)
+ if tmp_tbl.rubydepth >= 0 then setdepth(r, tmp_tbl.rubydepth) end
+ if tmp_tbl.baseheight >= 0 then setheight(p, tmp_tbl.baseheight) end
+ a = node.direct.vpack(r); setshift(a, 0)
+ set_attr(a, attr_ruby, post_intrusion)
+ set_attr(a, attr_ruby_post_jfmgk, post_jfmgk and 1 or 0)
+ if rsmash or getheight(a)<getheight(p) then
+ local k = node_new(id_kern, 1)
+ setkern(k, -getheight(a)+getheight(p))
+ setlist(a, k); insert_before(r, r, k)
+ setheight(a, getheight(p))
+ end
+
+ return a, getwidth(r), post_intrusion, post_jfmgk
end
-- High-level routine in pre_linebreak_filter
-local max_post_intrusion_backup
+local post_intrusion_backup, post_jfmgk_backup
local max_allow_pre, max_allow_post
-- kf[i] : container 1--i からなる行末形
-- kf[cmp+i] : container i--cmp からなる行頭形
-- kf[2cmp+1] : 行中形
- local nt, nta, ntb, mdt -- nt*: node temp
+ local wv = getfield(w, 'value')
+ local rst = getfield(wv, 'value')
+ local mdt -- nt*: node temp
local coef = {} -- 連立一次方程式の拡大係数行列
- local rtb = expand_3bits(has_attr(w.value, attr_ruby_stretch))
- local rtc = expand_3bits(has_attr(w.value, attr_ruby_mode))
- local intmode = floor(has_attr(w.value, attr_ruby_mode)/4)%4
+ local rtb = expand_3bits(rst.stretch)
-- node list 展開・行末形の計算
- nta = nil; ntb = nil; nt = w.value
- for i = 1, cmp do
- nt = nt.next; rb[i] = nt; nta = concat(nta, node_copy(nt))
- nt = nt.next; pb[i] = nt; ntb = concat(ntb, node_copy(nt))
+ local nt, nta, ntb = wv, nil, nil -- nt*: node temp
+ rst.ppre, rst.pmid, rst.ppost = rtb[6], rtb[5], rtb[4]
+ rst.mapre, rst.mapost = max_allow_pre, 0
+ for i = 1, cmp do
+ nt = node_next(nt); rb[i] = nt; nta = concat(nta, node_copy(nt))
+ nt = node_next(nt); pb[i] = nt; ntb = concat(ntb, node_copy(nt))
coef[i] = {}
for j = 1, 2*i do coef[i][j] = 1 end
for j = 2*i+1, 2*cmp+1 do coef[i][j] = 0 end
kf[i], coef[i][2*cmp+2]
- = new_ruby_box(node_copy(nta), node_copy(ntb),
- rtb[6], rtb[5], rtb[4], rtc[10], rtc[9], rtc[8],
- max_allow_pre, 0, intmode)
+ = new_ruby_box(node_copy(nta), node_copy(ntb), rst, true, false)
end
- node.free(nta); node.free(ntb)
+ node_free(nta); node_free(ntb)
-- 行頭形の計算
- nta = nil; ntb = nil
+ local nta, ntb = nil, nil
+ rst.ppre, rst.pmid, rst.ppost = rtb[9], rtb[8], rtb[7]
+ rst.mapre, rst.mapost = 0, max_allow_post
for i = cmp,1,-1 do
coef[cmp+i] = {}
for j = 1, 2*i-1 do coef[cmp+i][j] = 0 end
for j = 2*i, 2*cmp+1 do coef[cmp+i][j] = 1 end
nta = concat(node_copy(rb[i]), nta); ntb = concat(node_copy(pb[i]), ntb)
- kf[cmp+i], coef[cmp+i][2*cmp+2], mdt
- = new_ruby_box(node_copy(nta), node_copy(ntb),
- rtb[9], rtb[8], rtb[7], rtc[10], rtc[9], rtc[8],
- 0, max_allow_post, intmode)
- if max_post_intrusion_backup < mdt then max_post_intrusion_backup = mdt end
+ kf[cmp+i], coef[cmp+i][2*cmp+2]
+ = new_ruby_box(node_copy(nta), node_copy(ntb), rst, false, true)
end
-- ここで，nta, ntb には全 container を連結した box が入っているので
-- それを使って行中形を計算する．
coef[2*cmp+1] = {}
for j = 1, 2*cmp+1 do coef[2*cmp+1][j] = 1 end
- kf[2*cmp+1], coef[2*cmp+1][2*cmp+2], mdt
- = new_ruby_box(nta, ntb,
- rtb[3], rtb[2], rtb[1], rtc[10], rtc[9], rtc[8],
- max_allow_pre, max_allow_post, intmode)
- if max_post_intrusion_backup < mdt then max_post_intrusion_backup = mdt end
+ rst.ppre, rst.pmid, rst.ppost = rtb[3], rtb[2], rtb[1]
+ rst.mapre, rst.mapost = max_allow_pre, max_allow_post
+ kf[2*cmp+1], coef[2*cmp+1][2*cmp+2], post_intrusion_backup, post_jfmgk_backup
+ = new_ruby_box(nta, ntb, rst, true, true)
-- w.value の node list 更新．
- nt = w.value
- node.flush_list(nt.next)
- for i = 1, 2*cmp+1 do nt.next = kf[i]; nt = kf[i] end
+ local nt = wv
+ node.direct.flush_list(node_next(wv))
+ for i = 1, 2*cmp+1 do setnext(nt, kf[i]); nt = kf[i] end
- gauss(coef) -- 掃きだし法で連立方程式形 coef を解く
+ if cmp==1 then solve_1(coef)
+ elseif cmp==2 then solve_2(coef)
+ else
+ gauss(coef) -- 掃きだし法で連立方程式形 coef を解く
+ end
return coef
end
+local first_whatsit
+do
+ local traverse_id = node.direct.traverse_id
+ function first_whatsit(n) -- n 以後で最初の whatsit
+ for h in traverse_id(id_whatsit, n) do
+ return h
+ end
+ return nil
+ end
+end
+
+local next_cluster_array = {}
-- ノード追加
local function pre_low_app_node(head, w, cmp, coef, ht, dp)
- local nt, nta, ntb
-- メインの node list 更新
- nt = node_new(id_glue); ntb = node_new(id_glue_spec);
- ntb.width = coef[1][2*cmp+2]; ntb.stretch_order = 0; ntb.stretch = 0;
- ntb.shrink_order = 0; ntb.shrink = 0; nt.subtype = 0; nt.spec = ntb;
- head = node_insert_before(head, w, nt)
- set_attr(nt, attr_ruby, 1)
- set_attr(w, attr_ruby, 2); nt = w
+ local nt = node_new(id_glue)
+ setglue(nt, coef[1][2*cmp+2], 0, 0, 0, 0)
+ set_attr(nt, attr_ruby, 1); set_attr(w, attr_ruby, 2)
+ head = insert_before(head, w, nt)
+ nt = w
for i = 1, cmp do
-- rule
- nta = node_new(id_rule); nta.width = coef[i*2][2*cmp+2];
- nta.height = ht; nta.depth =dp; nta.subtype = 0
- node_insert_after(head, nt, nta); set_attr(nta, attr_ruby, 2*i+1)
+ local nta = node_new(id_rule, 0);
+ setwhd(nta, coef[i*2][2*cmp+2], ht, dp)
+ insert_after(head, nt, nta)
+ set_attr(nta, attr_ruby, 2*i+1)
-- glue
- nt = node_new(id_glue); ntb = node_new(id_glue_spec);
- ntb.width = coef[i*2+1][2*cmp+2]; ntb.stretch_order = 0; ntb.stretch = 0;
- ntb.shrink_order = 0; ntb.shrink = 0; nt.subtype = 0; nt.spec = ntb;
- head = node_insert_after(head, nta, nt); set_attr(nt, attr_ruby, 2*i+2)
+ if i~=cmp or not next_cluster_array[w] then
+ nt = node_new(id_glue); insert_after(head, nta, nt)
+ else
+ nt = next_cluster_array[w]
+ end
+ setglue(nt, coef[i*2+1][2*cmp+2], 0, 0, 0, 0)
+ set_attr(nt, attr_ruby, 2*i+2)
end
- tex.setattribute(attr_ruby, -0x7FFFFFFF);
- w.user_id = uid_ruby_post;
- return head, node_next(nt)
+ tex.setattribute('global', attr_ruby, -0x7FFFFFFF)
+ setfield(w, 'user_id', RUBY_POST)
+ next_cluster_array[w]=nil
+ return head, first_whatsit(node_next(nt))
end
-local function pre_high(head)
- local n = head; max_post_intrusion_backup = 0
- if not n then return head end
+local function pre_high(ahead)
+ if not ahead then return ahead end
+ local head = to_direct(ahead)
+ post_intrusion_backup, post_jfmgk_backup = 0, false
+ local n = first_whatsit(head)
while n do
- if n.id == id_whatsit then
- if n.subtype == sid_user and n.user_id == uid_ruby_pre then
- max_allow_pre = has_attr(n.value, attr_ruby_maxprep) or 0
- if has_attr(n, attr_ruby) == 1 then
- -- 直前のルビで intrusion がおこる可能性あり．安全策をとる．
- max_allow_pre = max(0, max_allow_pre - max_post_intrusion_backup)
- end
- max_post_intrusion_backup = 0
- max_allow_post = has_attr(n.value, attr_ruby_maxpostp) or 0
- max_margin = has_attr(n.value, attr_ruby_maxmargin) or 0
- local coef = pre_low_cal_box(n, n.value.value)
- local s = node_tail(n.value) --ルビ文字
- head, n = pre_low_app_node(
- head, n, n.value.value, coef, s.height, s.depth
- )
- else
- n = n.next
+ if getsubtype(n) == sid_user and getfield(n, 'user_id') == RUBY_PRE then
+ local nv = getfield(n, 'value')
+ local rst = getfield(nv, 'value')
+ max_allow_pre = rst.pre or 0
+ local atr = get_attr(n, attr_ruby) or 0
+ if max_allow_pre < 0 then
+ -- 直前のルビで intrusion がおこる可能性あり．
+ -- 前 run のデータが残っていればそれを使用，
+ -- そうでなければ行中形のデータを利用する
+ local op = (atr>0) and (old_break_info[atr] or post_intrusion_backup) or 0
+ max_allow_pre = max(0, -max_allow_pre - op)
+ end
+ if rst.exclude_pre_from_prev_ruby and atr>0 and old_break_info[-atr]
+ and (old_break_info[-atr]>0 or post_jfmgk_backup) then
+ -- 「直前のルビが JFM グルーに進入→現在のルビの前文字進入はなし」という状況
+ max_allow_pre = 0; rst.exclude_pre_from_prev_ruby=false
+ end
+ if rst.exclude_pre_jfmgk_from_prev_ruby
+ and atr>0 and ((old_break_info[atr] or post_intrusion_backup) > 0) then
+ -- 「直前のルビが文字に進入→現在のルビの和文処理グルーへの進入はなし」という状況
+ rst.before_jfmgk = 0
end
+ post_intrusion_backup, post_jfmgk_backup = 0, false
+ max_allow_post = rst.post or 0
+ max_margin = rst.maxmargin or 0
+ local coef = pre_low_cal_box(n, rst.count)
+ local s = node_tail(nv) --ルビ文字
+ head, n = pre_low_app_node(
+ head, n, rst.count, coef, getheight(s), getdepth(s)
+ )
else
- n = n.next
+ n = first_whatsit(node_next(n))
end
end
- return head
-end
+ return to_node(head)
+end
luatexbase.add_to_callback('pre_linebreak_filter', pre_high, 'ltj.ruby.pre', 100)
luatexbase.add_to_callback('hpack_filter', pre_high, 'ltj.ruby.pre', 100)
----------------------------------------------------------------
-- post_line_break
----------------------------------------------------------------
+local post_lown
+do
+ local function write_aux(wv, num, bool)
+ local id = get_attr(wv, attr_ruby_id) or 0
+ if id>0 and cache_handle then
+ cache_handle:write(
+ 'lrob[' .. tostring(id) .. ']=' .. num .. '\nlrob[' .. tostring(-id) .. ']=' .. tostring(bool) .. '\n')
+ end
+ end
-local function post_lown(rs, rw, ch)
--- ch: the head of `current' hlist
- if #rs ==0 or not rw then return ch end
- local hn = has_attr(rs[1],attr_ruby)
- local fn = has_attr(rs[#rs],attr_ruby)
- local cmp = rw.value.value
- if hn==1 then
- if fn==2*cmp+2 then
- hn = node_tail(rw.value); node_remove(rw.value, hn)
- node_insert_after(ch, rs[#rs], hn)
- set_attr(hn, attr_icflag, PROCESSED)
+ post_lown = function (rs, rw, cmp, ch)
+ -- ch: the head of `current' hlist
+ if #rs ==0 or not rw then return ch end
+ local hn = get_attr(rs[1], attr_ruby)
+ local fn = get_attr(rs[#rs], attr_ruby)
+ local wv = getfield(rw, 'value')
+ if hn==1 then
+ if fn==2*cmp+2 then
+ local hn = node_tail(wv)
+ node_remove(wv, hn)
+ insert_after(ch, rs[1], hn)
+ set_attr(hn, attr_icflag, PROCESSED)
+ write_aux(wv, get_attr(hn, attr_ruby), get_attr(hn, attr_ruby_post_jfmgk))-- 行中形
+ else
+ local deg, hn = (fn-1)/2, wv
+ for i = 1, deg do hn = node_next(hn) end;
+ node_remove(wv, hn)
+ setnext(hn, nil)
+ insert_after(ch, rs[1], hn)
+ set_attr(hn, attr_icflag, PROCESSED)
+ write_aux(wv, get_attr(hn, attr_ruby), get_attr(hn, attr_ruby_post_jfmgk))
+ end
else
- local deg = (fn-1)/2
- hn = rw.value; for i = 1, deg do hn = hn.next end;
- node_remove(rw.value, hn); hn.next = nil;
- node_insert_after(ch, rs[#rs], hn)
+ local deg, hn = max((hn-1)/2,2), wv
+ for i = 1, cmp+deg-1 do hn = node_next(hn) end
+ -- -1 is needed except the case hn = 3,
+ -- because a ending-line form is removed already from the list
+ node_remove(wv, hn); setnext(hn, nil)
+ insert_after(ch, rs[1], hn)
set_attr(hn, attr_icflag, PROCESSED)
- end
- else
- local deg = (hn-1)/2;
- if deg == 1 then deg = 2 end
- hn = rw.value; for i = 1, cmp+deg-1 do hn = hn.next end
- -- -1 is needed except the case hn = 3,
- -- because a ending-line form is removed already from the list
- node_remove(rw.value, hn); hn.next = nil
- node_insert_after(ch, rs[#rs], hn)
- set_attr(hn, attr_icflag, PROCESSED)
- end
- for i, v in ipairs(rs) do ch = node_remove(ch, v); node_free(v) end
- if fn >= 2*cmp+1 then
- rw.next = nil; node_free(rw);
+ if fn == 2*cmp-1 then
+ write_aux(wv, get_attr(hn, attr_ruby), get_attr(hn, attr_ruby_post_jfmgk))
+ end
+ end
+ for i = 1,#rs do
+ local ri = rs[i]
+ ch = node_remove(ch, ri); node_free(ri);
+ end
+ -- cleanup
+ if fn >= 2*cmp+1 then node_free(rw) end
+ return ch;
end
- return ch;
end
-
local function post_high_break(head)
- local h = head;
- local rs = {}; -- rs: sequence of ruby_nodes,
- local rw = nil; -- rw: main whatsit
- while h do
- if h.id == id_hlist then
- local ha = h.head; rs = {}
- while ha do
- local i = (((ha.id == id_glue and ha.subtype==0)
- or (ha.id == id_rule and ha.subtype==0)
- or (ha.id == id_whatsit and ha.subtype==sid_user
- and ha.user_id==uid_ruby_post))
- and has_attr(ha, attr_ruby)) or 0
- if i==1 then
- h.head = post_lown(rs, rw, h.head); rs = {}; rw = nil
- table.insert(rs, ha); ha = node_next(ha)
- elseif i>=3 then
- table.insert(rs, ha); ha = node_next(ha)
- elseif i==2 then
- rw = ha; h.head, ha = node_remove(h.head, rw);
- else
- ha = node_next(ha)
- end
+ local rs = {} -- rs: sequence of ruby_nodes,
+ local rw = nil -- rw: main whatsit
+ local cmp = -2 -- dummy
+ for h in node.direct.traverse_id(id_hlist, to_direct(head)) do
+ for i = 1, #rs do rs[i] = nil end
+ local ha = getlist(h)
+ while ha do
+ local hai = getid(ha)
+ local i = ((hai == id_glue and getsubtype(ha)==0)
+ or (hai == id_rule and getsubtype(ha)==0)
+ or (hai == id_whatsit and getsubtype(ha)==sid_user
+ and getfield(ha, 'user_id', RUBY_POST)))
+ and get_attr(ha, attr_ruby) or 0
+ if i==0 then
+ ha = node_next(ha)
+ elseif i==1 then
+ setlist(h, post_lown(rs, rw, cmp, getlist(h)))
+ for i = 2, #rs do rs[i] = nil end -- rs[1] is set by the next statement
+ rs[1], rw = ha, nil; ha = node_next(ha)
+ elseif i==2 then
+ rw = ha
+ cmp = getfield(getfield(rw, 'value'), 'value').count
+ local hb, hc = node_remove(getlist(h), rw)
+ setlist(h, hb); ha = hc
+ else -- i>=3
+ rs[#rs+1] = ha; ha = node_next(ha)
end
- h.head = post_lown(rs, rw, h.head);
end
- h = node_next(h)
+ setlist(h, post_lown(rs, rw, cmp, getlist(h)))
end
return head
-end
+end
-local function post_high_hbox(head)
- local ha = head;
- local rs = {}; -- rs: sequence of ruby_nodes,
+local function post_high_hbox(ahead)
+ local ha = to_direct(ahead); local head = ha
+ local rs = {}; -- rs: sequence of ruby_nodes,
local rw = nil; -- rw: main whatsit
+ local cmp
while ha do
- local i = (((ha.id == id_glue and ha.subtype==0)
- or (ha.id == id_rule and ha.subtype==0)
- or (ha.id == id_whatsit and ha.subtype==sid_user
- and ha.user_id==uid_ruby_post))
- and has_attr(ha, attr_ruby)) or 0
- if i==1 then
- head = post_lown(rs, rw, head); rs = {}; rw = nil
- table.insert(rs, ha); ha = node_next(ha)
- elseif i>=3 then
- table.insert(rs, ha); ha = node_next(ha)
- elseif i==2 then
- rw = ha; head, ha = node_remove(head, rw);
- else
+ local hai = getid(ha)
+ local i = ((hai == id_glue and getsubtype(ha)==0)
+ or (hai == id_rule and getsubtype(ha)==0)
+ or (hai == id_whatsit and getsubtype(ha)==sid_user
+ and getfield(ha, 'user_id', RUBY_POST)))
+ and get_attr(ha, attr_ruby) or 0
+ if i==0 then
ha = node_next(ha)
+ elseif i==1 then
+ head = post_lown(rs, rw, cmp, head)
+ for i = 2, #rs do rs[i] = nil end -- rs[1] is set by the next statement
+ rs[1], rw = ha, nil; ha = node_next(ha)
+ elseif i==2 then
+ rw = ha
+ cmp = getfield(getfield(rw, 'value'), 'value').count
+ head, ha = node_remove(head, rw)
+ else -- i >= 3
+ rs[#rs+1] = ha; ha = node_next(ha)
end
end
- return post_lown(rs, rw, head);
+ return to_node(post_lown(rs, rw, cmp, head))
end
luatexbase.add_to_callback('post_linebreak_filter', post_high_break, 'ltj.ruby.post_break', 100)
----------------------------------------------------------------
-- for jfmglue callbacks
----------------------------------------------------------------
-function whatsit_callback(Np, lp, Nq, bsl)
- if Np.nuc then return Np
- elseif lp.user_id == uid_ruby_pre then
- Np.first = lp; Np.nuc = lp; Np.last = lp
- local x = lp.value.next.next
- Np.last_char = luatexja.jfmglue.check_box_high(Np, x.head, nil)
- if Nq.id ~=id_pbox_w and Nq.char then
- if has_attr(lp.value, attr_ruby_maxprep) < 0 then -- auto
- local p = round(ltjs_get_penalty_table('ripre', Nq.char, 0, bsl)
- *has_attr(lp.value, attr_ruby))
- if has_attr(lp.value, attr_ruby_mode)%2 == 0 then -- intrusion 無効
- p = 0
- end
- set_attr(lp.value, attr_ruby_maxprep, p)
- end
- if Nq.prev_ruby then
- set_attr(lp, attr_ruby, 1)
- end
+do
+ local RIPRE = luatexja.stack_table_index.RIPRE
+ local RIPOST = luatexja.stack_table_index.RIPOST
+ local abs = math.abs
+ local function whatsit_callback(Np, lp, Nq)
+ if Np.nuc then return Np
+ elseif getfield(lp, 'user_id') == RUBY_PRE then
+ Np.first, Np.nuc, Np.last = lp, lp, lp
+ local lpv = getfield(lp, 'value')
+ local rst = getfield(lpv, 'value')
+ local x = node_next(node_next(lpv))
+ Np.last_char = luatexja.jfmglue.check_box_high(Np, getlist(x), nil)
+ if Nq.id ~=id_pbox_w then
+ if type(Nq.char)=='number' then
+ -- Nq is a JAchar
+ if rst.pre < 0 then -- auto
+ local s = ltjs.table_current_stack[RIPRE + Nq.char] or 0
+ local p = round(abs(s)*rst.rubyzw)
+ if rst.mode%2 == 0 then -- intrusion 無効
+ p = 0
+ end
+ rst.pre = -p; rst.exclude_pre_from_prev_ruby = (s<0);
+ rst.exclude_pre_jfmgk_from_prev_ruby = (ltjs.table_current_stack[RIPOST +Nq.char] or 0)<0;
+ end
+ if Nq.prev_ruby then
+ set_attr(lp, attr_ruby, Nq.prev_ruby)
+ end
+ elseif rst.pre < 0 then -- auto
+ if Nq.char == 'parbdd' then
+ local s = ltjs.table_current_stack[RIPRE - 1] or 0
+ local p = round(abs(s)*rst.rubyzw)
+ p = min(p, Nq.width)
+ if rst.mode%2 == 0 then -- intrusion 無効
+ p = 0
+ end
+ rst.pre = p; rst.exclude_pre_from_prev_ruby = (s<0);
+ rst.exclude_pre_jfmgk_from_prev_ruby = (ltjs.table_current_stack[RIPOST -1] or 0)<0;
+ else
+ rst.pre = 0
+ end
+ end
+ elseif rst.pre < 0 then -- auto
+ rst.pre = 0
+ end
+ return Np
else
- set_attr(lp.value, attr_ruby_maxprep, 0)
+ return Np
end
- return Np
end
+ luatexbase.add_to_callback("luatexja.jfmglue.whatsit_getinfo", whatsit_callback,
+ "luatexja.ruby.np_info", 1)
end
-function whatsit_after_callback(s, Nq, Np, bsl)
- if not s and Nq.nuc.user_id == uid_ruby_pre then
- local x = Nq.nuc.value.next.next
- for i = 2, Nq.nuc.value.value do x = x.next.next end
- Nq.last_char = luatexja.jfmglue.check_box_high(Nq, x.head, nil)
- luatexja.jfmglue.after_hlist(Nq)
- s = true
- if Np and Np.id ~=id_pbox_w and Np.char then
- if has_attr(Nq.nuc.value, attr_ruby_maxpostp) < 0 then -- auto
- local p = floor(ltjs_get_penalty_table('ripost', Np.char, 0, bsl)
- *has_attr(Nq.nuc.value, attr_ruby))
- if has_attr(Nq.nuc.value, attr_ruby_mode)%2 == 0 then -- intrusion 無効
- p = 0
- end
- if has_attr(Nq.nuc.value, attr_ruby_mode)%4 >= 2 then
- local q = has_attr(Nq.nuc.value, attr_ruby_maxprep)
- if q < p then p = q
- elseif q > p then
- set_attr(Nq.nuc.value, attr_ruby_maxprep, p)
+
+do
+ local FROM_JFM = luatexja.icflag_table.FROM_JFM
+ local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
+ local function add_gk(t, index, p)
+ local ic = get_attr_icflag(p)
+ if ic and (ic>FROM_JFM) and (ic<KANJI_SKIP) then ic = FROM_JFM end
+ if t.intrude_jfmgk[ic] then
+ if getid(p)==id_kern then t[index] = t[index] + getkern(p)
+ else t[index] = t[index] + getwidth(p) end
+ end
+ end
+ local RIPOST = luatexja.stack_table_index.RIPOST
+ local abs = math.abs
+ local function whatsit_after_callback(s, Nq, Np, head)
+ if not s and getfield(Nq.nuc, 'user_id') == RUBY_PRE then
+ if Np then
+ local last_glue = node_new(id_glue)
+ set_attr(last_glue, attr_icflag, 0)
+ insert_before(Nq.nuc, Np.first, last_glue)
+ Np.first = last_glue
+ next_cluster_array[Nq.nuc] = last_glue -- ルビ処理用のグルー
+ end
+ local nqnv = getfield(Nq.nuc, 'value')
+ local rst = getfield(nqnv, 'value')
+ if Nq.gk then
+ if type(Nq.gk)=="table" then
+ for _,v in ipairs(Nq.gk) do add_gk(rst, 'before_jfmgk', v) end
+ else add_gk(rst, 'before_jfmgk', Nq.gk) end
+ end
+ local x = node_next(node_next(nqnv))
+ for i = 2, rst.count do x = node_next(node_next(x)) end
+ Nq.last_char = luatexja.jfmglue.check_box_high(Nq, getlist(x), nil)
+ luatexja.jfmglue.after_hlist(Nq)
+ if Np and Np.id ~=id_pbox_w and type(Np.char)=='number' then
+ -- Np is a JAchar
+ if rst.post < 0 then -- auto
+ local p = round(abs(ltjs.table_current_stack[RIPOST + Np.char] or 0)*rst.rubyzw)
+ if rst.mode%2 == 0 then -- intrusion 無効
+ p = 0
end
+ rst.post = p
+ end
+ Np.prev_ruby = get_attr(getfield(Nq.nuc, 'value'), attr_ruby_id)
+ -- 前のクラスタがルビであったことのフラグ
+ else -- 直前が文字以外
+ local nqnv = getfield(Nq.nuc, 'value')
+ local rst = getfield(nqnv, 'value')
+ if rst.post < 0 then -- auto
+ rst.post = 0
end
- set_attr(Nq.nuc.value, attr_ruby_maxpostp, p)
- end
- Np.prev_ruby = true -- 前のクラスタがルビであったことのフラグ
- else -- 直前が文字以外なら intrusion なし
- set_attr(Nq.nuc.value, attr_ruby_maxpostp, 0)
- if has_attr(Nq.nuc.value, attr_ruby_mode)%4 >= 2 then
- set_attr(Nq.nuc.value, attr_ruby_maxprep, 0)
end
- if Np and Np.id == id_pbox_w then
- set_attr(Np.nuc.value, attr_ruby_maxprep, 0)
+ return head
+ else
+ return s
+ end
+ end
+ luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback,
+ "luatexja.ruby.np_info_after", 1)
+ local function w (s, Nq, Np)
+ if not s and getfield(Nq.nuc, 'user_id') == RUBY_PRE then
+ local rst = getfield(getfield(Nq.nuc, 'value'), 'value')
+ if Np.gk then
+ if type(Np.gk)=="table" then
+ for _,v in ipairs(Np.gk) do add_gk(rst, 'after_jfmgk', v) end
+ else add_gk(rst, 'after_jfmgk', Np.gk) end
end
end
end
- return s
+ luatexbase.add_to_callback("luatexja.jfmglue.whatsit_last_minute", w,
+ "luatexja.ruby.np_info_last_minute", 1)
end
-
-luatexbase.add_to_callback("luatexja.jfmglue.whatsit_getinfo", whatsit_callback,
- "luatexja.ruby.np_info", 1)
-luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback,
- "luatexja.ruby.np_info_after", 1)
-
OSDN Git Service
