diff options
author | Karl Berry <karl@freefriends.org> | 2013-03-18 22:35:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-03-18 22:35:48 +0000 |
commit | d40cbce1401307dacf242faddc54bc3eb8651595 (patch) | |
tree | 35f82af7bfd3f3afc76fa87f0d255071422af922 /Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua | |
parent | 8cd524f9b8baa45ef34f1683ca7b2aa151af9098 (diff) |
luatexja (18mar13)
git-svn-id: svn://tug.org/texlive/trunk@29424 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua | 57 |
1 files changed, 11 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua index de985d59175..f77d5b71f7e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua @@ -15,32 +15,13 @@ luatexja.load_module('base'); local ltjb = luatexja.base local node_new = node.new local id_whatsit = node.id('whatsit') local sid_user = node.subtype('user_defined') -local hmode = 118 -- in luatexref-t.pdf, this must be 127 +local STCK = luatexja.userid_table.STCK +hmode = 0 -- dummy charprop_stack_table={}; local charprop_stack_table = charprop_stack_table charprop_stack_table[0]={} --- modified from table.fastcopy -local next = next -local function stack_table_copy_aux(old) - local new = {} - for i,v in next, old do - new[i] = v - end - return new -end -local function stack_table_copy(old) - if old then - local new = {} - for i,v in next, old do - new[i] = stack_table_copy_aux(v) - end - return new - else - return {} - end -end function get_stack_level() local i = tex.getcount('ltj@@stack') @@ -54,13 +35,13 @@ function get_stack_level() for k,v in pairs(charprop_stack_table) do -- clear the stack above i if k>=i then charprop_stack_table[k]=nil end end - charprop_stack_table[i] = stack_table_copy(charprop_stack_table[i-1]) + charprop_stack_table[i] = table.fastcopy(charprop_stack_table[i-1]) tex.setcount('ltj@@stack', i) if gd>0 then tex.globaldefs = gd end if tex.nest[tex.nest.ptr].mode == hmode or tex.nest[tex.nest.ptr].mode == -hmode then local g = node_new(id_whatsit, sid_user) - g.user_id=30112; g.type=100; g.value=j; node.write(g) + g.user_id=STCK; g.type=100; g.value=j; node.write(g) end end return i @@ -98,14 +79,11 @@ function set_stack_table(g,m,c,p,lb,ub) "(-1 is used for denoting `math boundary')\n" .. 'So I changed this one to zero.') c=0 - elseif not charprop_stack_table[i][c] then - charprop_stack_table[i][c] = {} end - charprop_stack_table[i][c][m] = p + charprop_stack_table[i][c+m] = p if g=='global' then for j,v in pairs(charprop_stack_table) do - if not charprop_stack_table[j][c] then charprop_stack_table[j][c] = {} end - charprop_stack_table[j][c][m] = p + charprop_stack_table[j][c+m] = p end end end @@ -119,14 +97,11 @@ function set_stack_font(g,m,c,p) "The family number should in the range 0 .. 255.\n" .. "I'm going to use 0 instead of that illegal family number.") c=0 - elseif not charprop_stack_table[i][c] then - charprop_stack_table[i][c] = {} end - charprop_stack_table[i][c][m] = p + charprop_stack_table[i][c+m] = p if g=='global' then for j,v in pairs(charprop_stack_table) do - if not charprop_stack_table[j][c] then charprop_stack_table[j][c] = {} end - charprop_stack_table[j][c][m] = p + charprop_stack_table[j][c+m] = p end end end @@ -156,7 +131,6 @@ function set_stack_skip(g,m,sp) end -- These three functions are used in ltj-jfmglue.lua. -local table_current_stack function report_stack_level(bsl) table_current_stack = charprop_stack_table[bsl] end @@ -164,24 +138,15 @@ function fast_get_skip_table(m) return table_current_stack[m] or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 } end -function fast_get_penalty_table(m,c) - local i = table_current_stack[c] - return (i and i[m]) -end - -local empty_table = {} -function fast_get_penalty_table_parent(c) - return table_current_stack[c] or empty_table -end -- For other situations, use the following instead: function get_skip_table(m, idx) return charprop_stack_table[idx][m] or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 } end -function get_penalty_table(m,c,d, idx) - local i = charprop_stack_table[idx][c] - return (i and i[m]) or d +function get_penalty_table(mc, d, idx) + local i = charprop_stack_table[idx][mc] + return i or d end |