--
luatexbase.provides_module({
name = 'luatexja.adjust',
- date = '2014/05/08',
+ date = '2014/09/30',
description = 'Advanced line adjustment for LuaTeX-ja',
})
module('luatexja.adjust', package.seeall)
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 = token.create('ltj@@japanese')[2]
local ltjf_font_metric_table = ltjf.font_metric_table
local spec_zero_glue = ltjj.spec_zero_glue
if gs == 1 then -- stretching
if getfield(qs, 'stretch_order') == go then
return getfield(qs, 'stretch')
+ else return 0
end
else -- shrinking
if getfield(qs, 'shrink_order') == go then
return getfield(qs, 'shrink')
+ else return 0
end
end
end
-- step 1: 行末に kern を挿入(句読点,中点用)
local ltjd_glyph_from_packed = ltjd.glyph_from_packed
local function aw_step1(p, res, total)
- local x = node_tail(getlist(p)); if not x then return false end
+ local head = getlist(p)
+ local x = node_tail(head); if not x then return false end
-- x: \rightskip
x = node_prev(x); if not x then return false end
- if getid(x) == id_glue and getsubtype(x) == 15 then
+ 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 = getid(x)
-- while (get_attr_icflag(x) == PACKED)
-- and ((xi == id_penalty) or (xi == id_kern) or (xi == id_kern)) do
-- x = 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 = ltjd_glyph_from_packed(x)
- while getid(xc) == id_whatsit do xc = node_next(xc) end
+ while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために?
else
return 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
+ .char_type[has_attr(xc, attr_jchar_class) or 0]['end_' .. res.name] or 0
if xk>0 and total>=xk then
total = total - xk