diff options
author | Karl Berry <karl@freefriends.org> | 2016-08-28 22:18:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-08-28 22:18:55 +0000 |
commit | a0eaab2fea8dde90ee74f98064e78f6231b8f48d (patch) | |
tree | b64b6209d3b1878d75cd9943330d25eccb87f32a /Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | |
parent | dec9524f80a61822aa1c7d7e69152592d2ee928e (diff) |
luatexja (28aug16)
git-svn-id: svn://tug.org/texlive/trunk@41945 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index 2f7ab6399f7..bd40eccf06f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -425,10 +425,6 @@ calc_np_auxtable = { Np.id = id_box_like; return true, node_next(lp) end, - skip = function(lp) - set_attr(lp, attr_icflag, PROCESSED) - return false, node_next(lp) - end, [id_whatsit] = function(lp) local lps = getsubtype(lp) if lps==sid_user then @@ -507,10 +503,11 @@ calc_np_auxtable = { end calc_np_auxtable[id_rule] = calc_np_auxtable.box_like calc_np_auxtable[15] = calc_np_auxtable.box_like -calc_np_auxtable[id_ins] = calc_np_auxtable.skip -calc_np_auxtable[id_mark] = calc_np_auxtable.skip -calc_np_auxtable[id_adjust] = calc_np_auxtable.skip -calc_np_auxtable[node.id('local_par')] = calc_np_auxtable.skip + +local function calc_np_aux_skip (lp) + set_attr(lp, attr_icflag, PROCESSED) + return false, node_next(lp) +end function calc_np(last, lp) local k @@ -535,7 +532,7 @@ function calc_np(last, lp) return calc_np_pbox(lp, last) end -- id_pbox else - k, lp = calc_np_auxtable[getid(lp)](lp) + k, lp = (calc_np_auxtable[getid(lp)] or calc_np_aux_skip)(lp) if k then return lp end end end @@ -728,10 +725,10 @@ do end if not gb then if ga then - gb = node_new(id_kern); setfield(gb, 'kern', 0) + gb = node_new(id_kern, 1); setfield(gb, 'kern', 0) else return nil end elseif not ga then - ga = node_new(id_kern); setfield(ga, 'kern', 0) + ga = node_new(id_kern, 1); setfield(ga, 'kern', 0) end local k = 2*getid(gb) - getid(ga) |