summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/luatexja.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.lua26
1 files changed, 13 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index 9f3bd36a383..67a9e9b3df3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -20,14 +20,16 @@ function luatexja.load_lua(fn)
end
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
end
--- 以下は全ファイルで共有される定数
@@ -292,10 +294,9 @@ 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
@@ -353,7 +354,6 @@ local has_attr = node.has_attribute
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')
@@ -423,7 +423,7 @@ local function debug_show_node_X(p,print_fn, limit)
.. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
print_fn(s)
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 .. ')'