dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの
dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod
-- 「縦数式ディレクション」 in pTeX
-
-
-------------------------------------------------------------------------
--- FIX node.remove
-------------------------------------------------------------------------
-do
- local node_remove, node_next, node_prev = node.remove, node.next, node.prev
- function luatexja.node_remove (head, current)
- if head==current then
- local q, r = node_next(current), node_prev(current)
- if q then q.prev = r end
- if r and node_next(r)==current then
- r.next = q
- end
- return q, q
- else
- return node_remove(head, current)
- end
- end
- local Dnode = node.direct or node
- if Dnode~=node then
- local Dnode_remove, setfield = Dnode.remove, Dnode.setfield
- local Dnode_next, Dnode_prev = Dnode.getnext, Dnode.getprev
- function luatexja.Dnode_remove (head, current)
- if head==current then
- local q, r = Dnode_next(current), Dnode_prev(current)
- if q then setfield(q, 'prev', r) end
- if r and Dnode_next(r) == current then
- setfield(r, 'next', q)
- end
- return q, q
- else
- return Dnode_remove(head, current)
- end
- end
- else
- luatexja.Dnode_remove = luatexja.node_remove
- end
-end
-
--- 定義終わり
local load_module = luatexja.load_module
load_module('charrange'); local ltjc = luatexja.charrange
load_module('stack'); local ltjs = luatexja.stack
-load_module('direction'); local ltjd = luatexja.direction
+load_module('direction'); local ltjd = luatexja.direction -- +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('jfmglue'); local ltjj = luatexja.jfmglue
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
+
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
+local attr_jchar_code = luatexbase.attributes['ltj@charcode']
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_yablshift = luatexbase.attributes['ltj@yablshift']
local attr_icflag = luatexbase.attributes['ltj@icflag']
end
return r
end,
- direction = function()
+ 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
-- main process
do
- local start_time_measure, stop_time_measure
+ 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
tex_set_attr('global', attr_icflag, 0)
if gc == 'fin_row' then return head
else
+ --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')
.. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
else
s = base .. '(' .. print_scaled(p.height) .. '+'
- .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
+ .. 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 or 0>= 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);
+ print_fn(s);
local bid = inner_depth
prefix, inner_depth = prefix.. '.', inner_depth + 1
if inner_depth < limit then
prefix=k
elseif pt=='rule' then
s = base .. '(' .. print_scaled(p.height) .. '+'
- .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
+ .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
.. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
print_fn(s)
elseif pt == 'glue' then
elseif pt == 'whatsit' then
s = base
if p.subtype==sid_user then
- local t = tostring(p.user_id) .. ' (' ..
+ local t = tostring(p.user_id) .. ' (' ..
luatexbase.get_user_whatsit_name(p.user_id) .. ') '
if p.type ~= 110 then
s = s .. ' userid:' .. t .. p.value
s = s .. ' stream=' .. p.stream
print_fn(s)
for i=1,#p.data do
- print_fn(base .. ' [' .. i .. '] = ' .. tostring(p.data[i]))
+ print_fn(s .. ' [' .. i .. '] = ' .. tostring(token.command_name(p.data[i])))
end
else
print_fn(s)
end
end
-