stack_table_index.JWP = 0 -- これだけ
stack_table_index.KSK = 1 -- これだけ
stack_table_index.XSK = 2 -- これだけ
-stack_table_index.DIR = 3 -- これだけ
stack_table_index.MJT = 0x100 -- 0--255
stack_table_index.MJS = 0x200 -- 0--255
stack_table_index.MJSS = 0x300 -- 0--255
userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」
userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向
+local dir_table = {}
+luatexja.dir_table = dir_table
+dir_table.dir_dtou = 1
+dir_table.dir_tate = 3
+dir_table.dir_yoko = 4
+dir_table.dir_math_mod = 8
+dir_table.dir_node_auto = 128 -- 組方向を合わせるために自動で作られたもの
+dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの
+dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod
+ -- 「縦数式ディレクション」 in pTeX
+
+
------------------------------------------------------------------------
-- FIX node.remove
------------------------------------------------------------------------
load_module('base'); local ltjb = luatexja.base
load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st
--- define_font
-do
- local otfl_fdr = fonts.definers.read
- local ltjr_font_callback = ltjr.font_callback
- function luatexja.font_callback(name, size, id)
- local res = ltjr_font_callback(name, size, id, otfl_fdr)
- luatexbase.call_callback('luatexja.define_font', res, name, size, id)
- return res
- end
- luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end)
- luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
-end
-
+if luatexja_debug then load_module('debug') end
load_module('charrange'); local ltjc = luatexja.charrange
+load_module('stack'); local ltjs = luatexja.stack
+load_module('direction'); local ltjd = luatexja.direction
load_module('jfont'); local ltjf = luatexja.jfont
load_module('inputbuf'); local ltji = luatexja.inputbuf
-load_module('stack'); local ltjs = luatexja.stack
load_module('pretreat'); local ltjp = luatexja.pretreat
load_module('jfmglue'); local ltjj = luatexja.jfmglue
load_module('setwidth'); local ltjw = luatexja.setwidth
load_module('math'); local ltjm = luatexja.math
load_module('tangle'); local ltjb = luatexja.base
-load_module('direction'); local ltjd = luatexja.direction
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
elseif f == math.two_add then r = 'both'
end
return r
- end
+ end,
+ direction = function()
+ local v = ltjd.get_dir_count()
+ if math.abs(tex.nest[tex.nest.ptr].mode) == ltjs.mmode and v == dir_table.dir_tate then
+ v = dir_table.dir_utod
+ end
+ return v
+ end,
+ adjustdir = ltjd.get_adjust_dir_count,
}
local unary_pars = luatexja.unary_pars
if unary_pars[k] then
tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack'))))
end
+ ltjb.stop_time_measure('get_par')
end
end
return ltjs.get_stack_table(stack_table_index.XSP
+ ltjb.in_unicode(c, true), 3, t)
end,
+ boxdir = function(c, t)
+ if type(c)~='number' or c<0 or c>65535 then
+ ltjb.package_error('luatexja',
+ 'Bad register code (' .. tostring(c) .. ')',
+ 'A register must be between 0 and 65535.\n'..
+ 'I changed this one to zero.')
+ c=0
+ end
+ return ltjd.get_register_dir(c)
+ end,
}
local binary_pars = luatexja.binary_pars
if binary_pars[k] then
tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack'))))
end
+ ltjb.stop_time_measure('get_par')
end
end
if luatexja.isglobal=='global' then tex.sprint(cat_lp, '\\global') end
end
+
-- main process
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 tex_set_attr = tex.setattribute
-- mode = true iff main_process is called from pre_linebreak_filter
local function main_process(head, mode, dir, gc)
+ tex_set_attr('global', attr_icflag, 0)
if gc == 'fin_row' then return head
else
- tex.setattribute('global', attr_icflag, 0)
- local p = to_direct(head)
- p = ltjj.main(p,mode)
- if p then p = ltjw.set_ja_width(p, dir) end
+ --luatexja.ext_show_node_list(head, 'T> ', print)
+ start_time_measure('jfmglue')
+ local p = ltjj.main(to_direct(head),mode, dir)
+ stop_time_measure('jfmglue')
return to_node(p)
end
end
local function adjust_icflag(h)
-- kern from luaotfload will have icflag = 1
-- (same as italic correction)
- tex.setattribute('global', attr_icflag, 1)
+ tex_set_attr('global', attr_icflag, 1)
return h
end
-- callbacks
-
luatexbase.add_to_callback(
'pre_linebreak_filter',
function (head,groupcode)
end,'ltj.hpack_filter',
luatexbase.priority_in_callback('hpack_filter',
'luaotfload.node_processor') + 1)
- luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'adjust_icflag', 1)
- luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'adjust_icflag', 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
return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG
end
-local debug_depth
+local prefix, inner_depth
-local function debug_show_node_X(p,print_fn)
- local k = debug_depth
+local function debug_show_node_X(p,print_fn, limit)
+ local k = prefix
local s
local pt=node_type(p.id)
- local base = debug_depth .. string.format('%X', get_attr_icflag(p))
+ 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)
+ s = base .. ' ' .. utf.char(p.char) .. ' '
+ .. tostring(p.font)
.. ' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
print_fn(s)
- elseif pt=='hlist' or pt=='vlist' or pt=='unset' then
- s = base .. '(' .. print_scaled(p.height) .. '+'
- .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) .. p.dir
- if p.shift or 0~=0 then
+ elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then
+ if pt=='ins' then
+ s = base .. '(' .. print_scaled(p.height) .. '+'
+ .. print_scaled(p.depth) .. ')'
+ .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
+ else
+ s = base .. '(' .. print_scaled(p.height) .. '+'
+ .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
+ .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
+ end
+ if (p.shift or 0)~=0 then
s = s .. ', shifted ' .. print_scaled(p.shift)
end
- if p.glue_sign >= 1 then
+ if p.glue_set and p.glue_sign ==2 or ( p.glue_sign==1 and p.glue_set>0) then
s = s .. ' glue set '
if p.glue_sign == 2 then s = s .. '-' end
s = s .. tostring(floor(p.glue_set*10000)/10000)
if get_attr_icflag(p) == icflag_table.PACKED then
s = s .. ' (packed)'
end
- print_fn(s); debug_depth=debug_depth.. '.'
- for q in node.traverse(p.head) do
- debug_show_node_X(q, print_fn)
+ print_fn(s);
+ local bid = inner_depth
+ 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)
+ end
end
- debug_depth=k
+ prefix=k
+ elseif pt=='rule' then
+ s = base .. '(' .. print_scaled(p.height) .. '+'
+ .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
+ .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
+ print_fn(s)
elseif pt == 'glue' then
s = base .. ' ' .. print_spec(p.spec)
if get_attr_icflag(p)>icflag_table.KINSOKU
end
print_fn(s)
elseif pt == 'whatsit' then
- s = base .. '(' .. node.whatsits()[p.subtype] .. ') '
+ s = base
if p.subtype==sid_user then
+ local t = tostring(p.user_id) .. ' (' ..
+ luatexbase.get_user_whatsit_name(p.user_id) .. ') '
if p.type ~= 110 then
- s = s .. ' user_id: ' .. p.user_id .. ' ' .. p.value
+ s = s .. ' userid:' .. t .. p.value
print_fn(s)
else
- s = s .. ' user_id: ' .. p.user_id .. ' (node list)'
+ s = s .. ' userid:' .. t .. '(node list)'
+ if p.user_id==userid_table.DIR then
+ s = s .. ' dir: ' .. tostring(node.has_attribute(p, attr_dir))
+ end
print_fn(s)
- local q = p.value
- debug_depth=debug_depth.. '.'
- while q do
- debug_show_node_X(q, print_fn); q = node_next(q)
- end
- debug_depth=k
+ local bid = inner_depth
+ 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)
+ end
+ end
+ prefix, inner_depth = k, bid
end
else
- s = s .. node.subtype(p.subtype); print_fn(s)
+ s = s .. node.subtype(p.subtype)
+ 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])))
+ end
+ else
+ print_fn(s)
+ end
end
-------- math node --------
elseif pt=='noad' then
s = base ; print_fn(s)
if p.nucleus then
- debug_depth = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
+ prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
end
if p.sup then
- debug_depth = k .. '^'; debug_show_node_X(p.sup, print_fn);
+ prefix = k .. '^'; debug_show_node_X(p.sup, print_fn);
end
if p.sub then
- debug_depth = k .. '_'; debug_show_node_X(p.sub, print_fn);
+ prefix = k .. '_'; debug_show_node_X(p.sub, print_fn);
end
- debug_depth = k;
+ prefix = k;
elseif pt=='math_char' then
s = base .. ' fam: ' .. p.fam .. ' , char = ' .. utf.char(p.char)
print_fn(s)
elseif pt=='sub_box' or pt=='sub_mlist' then
print_fn(base)
if p.head then
- debug_depth = k .. '.';
+ prefix = k .. '.';
for q in node.traverse(p.head) do
debug_show_node_X(q, print_fn)
end
end
p=node_next(p)
end
-function luatexja.ext_show_node_list(head,depth,print_fn)
- debug_depth = depth
+function luatexja.ext_show_node_list(head,depth,print_fn, lim)
+ prefix = depth
+ inner_depth = 0
if head then
while head do
- debug_show_node_X(head, print_fn); head = node_next(head)
+ debug_show_node_X(head, print_fn, lim or 1/0); head = node_next(head)
end
else
- print_fn(debug_depth .. ' (null list)')
+ print_fn(prefix .. ' (null list)')
end
end
-function luatexja.ext_show_node(head,depth,print_fn)
- debug_depth = depth
+function luatexja.ext_show_node(head,depth,print_fn, lim)
+ prefix = depth
+ inner_depth = 0
if head then
- debug_show_node_X(head, print_fn)
+ debug_show_node_X(head, print_fn, lim or 1/0)
else
- print_fn(debug_depth .. ' (null list)')
+ print_fn(prefix .. ' (null list)')
end
end