require('lualibs')
------------------------------------------------------------------------
--- naming:
--- ext_... : called from \directlua{}
--- int_... : called from other Lua codes, but not from \directlua{}
--- (other) : only called from this file
-function luatexja.load_module(name)
- require('ltj-' .. name.. '.lua')
-end
-function luatexja.load_lua(fn)
+local function load_lua(fn)
local found = kpse.find_file(fn, 'tex')
if not found then
tex.error("LuaTeX-ja error: File `" .. fn .. "' not found")
dofile(found)
end
end
+luatexja.load_lua = load_lua
+function luatexja.load_module(name)
+ require('ltj-' .. name.. '.lua')
+end
--- check token library
-if newtoken then
- luatexja.token = newtoken
-else
- local luatex_version = status.list().luatex_version
- if luatex_version >80 then
- luatexja.token = token
- end
+do
+ local setfield = node.direct.setfield
+ luatexja.setglue = node.direct.setglue or
+ function(g,w,st,sh,sto,sho)
+ setfield(g,'width', w or 0)
+ setfield(g,'stretch',st or 0)
+ setfield(g,'shrink', sh or 0)
+ setfield(g,'stretch_order',sto or 0)
+ setfield(g,'shrink_order', sho or 0)
+ end
+ local getfield = node.direct.getfield
+ luatexja.getglue = node.direct.getglue or
+ function(g)
+ return getfield(g,'width'),
+ getfield(g,'stretch'),
+ getfield(g,'shrink'),
+ getfield(g,'stretch_order'),
+ getfield(g,'shrink_order')
+ end
end
--- 以下は全ファイルで共有される定数
icflag_table.ITALIC = 1
icflag_table.PACKED = 2
icflag_table.KINSOKU = 3
-icflag_table.FROM_JFM = 6
+icflag_table.FROM_JFM = 4
-- FROM_JFM: 4, 5, 6, 7, 8 →優先度高（伸びやすく，縮みやすい）
-- 6 が標準
-icflag_table.KANJI_SKIP = 9
-icflag_table.KANJI_SKIP_JFM = 10
-icflag_table.XKANJI_SKIP = 11
-icflag_table.XKANJI_SKIP_JFM = 12
-icflag_table.PROCESSED = 13
-icflag_table.IC_PROCESSED = 14
-icflag_table.BOXBDD = 15
-icflag_table.PROCESSED_BEGIN_FLAG = 128
+icflag_table.KANJI_SKIP = 68 -- = 4+64
+icflag_table.KANJI_SKIP_JFM = 69
+icflag_table.XKANJI_SKIP = 70
+icflag_table.XKANJI_SKIP_JFM = 71
+icflag_table.LINEEND = 72
+icflag_table.PROCESSED = 73
+icflag_table.IC_PROCESSED = 74
+icflag_table.BOXBDD = 75
+icflag_table.PROCESSED_BEGIN_FLAG = 4096 -- sufficiently large power of 2
local stack_table_index = {}
luatexja.stack_table_index = stack_table_index
userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理
userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」
userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向
+userid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」
+userid_table.JA_AL_BDD = luatexbase.newuserwhatsitid('ja_al_boundary', 'luatexja')
local dir_table = {}
luatexja.dir_table = dir_table
if luatexja_debug then load_module('debug') end
+load_module('lotf_aux'); local ltju = luatexja.lotf_aux
load_module('charrange'); local ltjc = luatexja.charrange
load_module('stack'); local ltjs = luatexja.stack
load_module('direction'); local ltjd = luatexja.direction -- +1 hlist +1 attr_list
+load_module('lineskip'); local ltjl = luatexja.lineskip -- +1 hlist +1 attr_list
load_module('jfont'); local ltjf = luatexja.jfont
load_module('inputbuf'); local ltji = luatexja.inputbuf
load_module('pretreat'); local ltjp = luatexja.pretreat
load_module('setwidth'); local ltjw = luatexja.setwidth
load_module('jfmglue'); local ltjj = luatexja.jfmglue -- +1 glue +1 gs +1 attr_list
load_module('math'); local ltjm = luatexja.math
-load_module('tangle'); local ltjb = luatexja.base
+load_module('base'); local ltjb = luatexja.base
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
until s<=delta
return out
end
+luatexja.print_scaled = print_scaled
local function print_glue(d,order)
local out=print_scaled(d)
-- EXT: print parameters that don't need arguments
do
+ local tex_getattr = tex.getattribute
+ local function getattr(a)
+ local r = tex.getattribute(a)
+ return (r==-0x7FFFFFFF) and 0 or r
+ end
luatexja.unary_pars = {
yalbaselineshift = function(t)
- return print_scaled(tex.getattribute('ltj@yablshift'))..'pt'
+ return print_scaled(getattr('ltj@yablshift'))..'pt'
end,
yjabaselineshift = function(t)
- return print_scaled(tex.getattribute('ltj@ykblshift'))..'pt'
+ return print_scaled(getattr('ltj@ykblshift'))..'pt'
end,
talbaselineshift = function(t)
- return print_scaled(tex.getattribute('ltj@tablshift'))..'pt'
+ return print_scaled(getattr('ltj@tablshift'))..'pt'
end,
tjabaselineshift = function(t)
- return print_scaled(tex.getattribute('ltj@tkblshift'))..'pt'
+ return print_scaled(getattr('ltj@tkblshift'))..'pt'
end,
kanjiskip = function(t)
return print_spec(ltjs.get_stack_skip(stack_table_index.KSK, t))
return ltjs.get_stack_table(stack_table_index.JWP, 0, t)
end,
autospacing = function(t)
- return tex.getattribute('ltj@autospc')
+ return getattr('ltj@autospc')
end,
autoxspacing = function(t)
- return tex.getattribute('ltj@autoxspc')
+ return getattr('ltj@autoxspc')
end,
differentjfm = function(t)
local f, r = luatexja.jfmglue.diffmet_rule, '???'
}
local unary_pars = luatexja.unary_pars
- function luatexja.ext_get_parameter_unary(k)
+ local scan_arg = token.scan_argument
+ function luatexja.ext_get_parameter_unary()
+ local k= scan_arg()
if unary_pars[k] then
tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack'))))
end
do
luatexja.binary_pars = {
jacharrange = function(c, t)
- if type(c)~='number' or c<0 or c>31*ltjc.ATTR_RANGE then
- -- 0 はエラーにしない（隠し）
+ if type(c)~='number' or c<-1 or c>31*ltjc.ATTR_RANGE then
+ -- 0, -1 はエラーにしない（隠し）
ltjb.package_error('luatexja',
'invalid character range number (' .. tostring(c) .. ')',
'A character range number should be in the range 1..'
end,
}
local binary_pars = luatexja.binary_pars
-
+ local scan_arg, scan_int = token.scan_argument, token.scan_int
binary_pars.alxspmode = binary_pars.jaxspmode
- function luatexja.ext_get_parameter_binary(k,c)
+ function luatexja.ext_get_parameter_binary(k, c)
if binary_pars[k] then
tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack'))))
end
do
local start_time_measure, stop_time_measure
= ltjb.start_time_measure, ltjb.stop_time_measure
- 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 ensure_tex_attr = ltjb.ensure_tex_attr
-- mode = true iff main_process is called from pre_linebreak_filter
end
-- callbacks
- luatexbase.add_to_callback(
+ ltjb.add_to_callback(
'pre_linebreak_filter',
function (head,groupcode)
return main_process(head, true, tex.textdir, groupcode)
- end,'ltj.pre_linebreak_filter',
- luatexbase.priority_in_callback('pre_linebreak_filter',
- 'luaotfload.node_processor') + 1)
- luatexbase.add_to_callback(
+ end,'ltj.main',
+ luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')+1)
+ ltjb.add_to_callback(
'hpack_filter',
function (head,groupcode,size,packtype, dir)
return main_process(head, false, dir, groupcode)
- end,'ltj.hpack_filter',
- luatexbase.priority_in_callback('hpack_filter',
- 'luaotfload.node_processor') + 1)
- luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1)
- luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1)
+ end,'ltj.main',
+ luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')+1)
+ ltjb.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1)
+ ltjb.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1)
end
end
+-- lastnodechar
+do
+ local id_glyph = node.id('glyph')
+ function luatexja.pltx_composite_last_node_char()
+ local n = tex.nest[tex.nest.ptr].tail
+ local r = '-1'
+ if n then
+ if n.id==id_glyph then
+ while n.componetns and n.subtype and n.subtype%4 >= 2 do
+ n = node.tail(n)
+ end
+ r = tostring(n.char)
+ end
+ end
+ tex.sprint(r)
+ end
+end
+
-- debug
do
local id_penalty = node.id('penalty')
local id_glyph = node.id('glyph')
-local id_glue_spec = node.id('glue_spec')
local id_glue = node.id('glue')
local id_kern = node.id('kern')
local id_hlist = node.id('hlist')
end
local prefix, inner_depth
-
-local function debug_show_node_X(p,print_fn, limit)
+local utfchar = utf.char
+local function debug_show_node_X(p,print_fn, limit, inner_depth)
local k = prefix
local s
local pt=node_type(p.id)
local base = prefix .. string.format('%X', get_attr_icflag(p))
.. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' '
if pt == 'glyph' then
- s = base .. ' ' .. utf.char(p.char) .. ' '
- .. tostring(p.font)
- .. ' (' .. print_scaled(p.height) .. '+'
+ s = base .. ' ' ..
+ (p.char<0xF0000 and utfchar(p.char) or '')
+ .. string.format(' (U+%X) ', p.char)
+ .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
+ if p.xoffset~=0 or p.yoffset~=0 then
+ s = s .. ' off: (' .. print_scaled(p.xoffset)
+ .. ',' .. print_scaled(p.yoffset) .. ')'
+ end
print_fn(s)
elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then
if pt=='ins' then
prefix, inner_depth = prefix.. '.', inner_depth + 1
if inner_depth < limit then
for q in node.traverse(p.head) do
- debug_show_node_X(q, print_fn, limit)
+ debug_show_node_X(q, print_fn, limit, inner_depth)
end
end
prefix=k
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
.. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
print_fn(s)
+ elseif pt=='disc' then
+ print_fn(s)
+ local bid = inner_depth
+ if inner_depth < limit then
+ prefix, inner_depth = k.. 'p.', inner_depth + 1
+ for q in node.traverse(p.pre) do
+ debug_show_node_X(q, print_fn, limit, inner_depth)
+ end
+ prefix = k.. 'P.'
+ for q in node.traverse(p.post) do
+ debug_show_node_X(q, print_fn, limit, inner_depth)
+ end
+ prefix = k.. 'R.'
+ for q in node.traverse(p.replace) do
+ debug_show_node_X(q, print_fn, limit, inner_depth)
+ end
+ end
+ prefix=k
elseif pt == 'glue' then
- s = base .. ' ' .. print_spec(p.spec)
+ s = base .. ' ' .. print_spec(p)
if get_attr_icflag(p)>icflag_table.KINSOKU
and get_attr_icflag(p)<icflag_table.KANJI_SKIP then
s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-icflag_table.FROM_JFM .. ')'
s = s .. ' (for accent)'
elseif get_attr_icflag(p)==icflag_table.IC_PROCESSED then
s = s .. ' (italic correction)'
+ elseif get_attr_icflag(p)==icflag_table.LINEEND then
+ s = s .. ' (end-of-line)'
-- elseif get_attr_icflag(p)==ITALIC then
-- s = s .. ' (italic correction)'
elseif get_attr_icflag(p)>icflag_table.KINSOKU
s = s .. ' (for kinsoku)'
end
print_fn(s)
+ elseif pt == 'dir' then
+ s = base .. ' ' .. tostring(p.dir) .. ' (level ' .. tostring(p.level) .. ')'
+ print_fn(s)
elseif pt == 'whatsit' then
s = base
if p.subtype==sid_user then
prefix, inner_depth =prefix.. '.', inner_depth + 1
if inner_depth < limit then
for q in node.traverse(p.value) do
- debug_show_node_X(q, print_fn, limit)
+ debug_show_node_X(q, print_fn, limit, inner_depth)
end
end
prefix, inner_depth = k, bid
end
else
- s = s .. node.subtype(p.subtype)
+ s = s .. (node.subtype(p.subtype) or '')
if p.subtype==1 then
s = s .. ' stream=' .. p.stream
print_fn(s)
for i=1,#p.data do
- print_fn(s .. ' [' .. i .. '] = ' .. tostring(token.command_name(p.data[i])))
+ print_fn(s .. ' [' .. i .. '] = ' .. tostring(p.data[i].csname))
end
else
print_fn(s)
elseif pt=='noad' then
s = base ; print_fn(s)
if p.nucleus then
- prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
+ prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn, limit, inner_depth);
end
if p.sup then
- prefix = k .. '^'; debug_show_node_X(p.sup, print_fn);
+ prefix = k .. '^'; debug_show_node_X(p.sup, print_fn, limit, inner_depth);
end
if p.sub then
- prefix = k .. '_'; debug_show_node_X(p.sub, print_fn);
+ prefix = k .. '_'; debug_show_node_X(p.sub, print_fn, limit, inner_depth);
end
prefix = k;
elseif pt=='math_char' then
- s = base .. ' fam: ' .. p.fam .. ' , char = ' .. utf.char(p.char)
+ s = base .. ' fam: ' .. p.fam .. ' , char = ' .. utfchar(p.char)
print_fn(s)
elseif pt=='sub_box' or pt=='sub_mlist' then
print_fn(base)
if p.head then
prefix = k .. '.';
for q in node.traverse(p.head) do
- debug_show_node_X(q, print_fn)
+ debug_show_node_X(q, print_fn, limit, inner_depth)
end
end
else
inner_depth = 0
if head then
while head do
- debug_show_node_X(head, print_fn, lim or 1/0); head = node_next(head)
+ debug_show_node_X(head, print_fn, lim or 1/0, inner_depth); head = node_next(head)
end
else
print_fn(prefix .. ' (null list)')
prefix = depth
inner_depth = 0
if head then
- debug_show_node_X(head, print_fn, lim or 1/0)
+ debug_show_node_X(head, print_fn, lim or 1/0, inner_depth)
else
print_fn(prefix .. ' (null list)')
end
OSDN Git Service
