summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-06 23:28:44 +0000
committerKarl Berry <karl@freefriends.org>2014-02-06 23:28:44 +0000
commitc33fed8d37bc51a8a9ff5a5f1a806dac56765c8d (patch)
treef95a9e2a7ddf6ffa449a8d74ecaca762ab845c09 /Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
parent55bbd0a3dd6e4f70a9cae6283e0e84b2aba02989 (diff)
luatexja (4feb14)
git-svn-id: svn://tug.org/texlive/trunk@32895 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.lua53
1 files changed, 22 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
index 9602939fdbf..2a90fd2c89f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
@@ -3,7 +3,7 @@
--
luatexbase.provides_module({
name = 'luatexja.stack',
- date = '2013/04/13',
+ date = '2014/01/24',
description = 'LuaTeX-ja stack system',
})
module('luatexja.stack', package.seeall)
@@ -28,7 +28,7 @@ function get_stack_level()
if j > tex.getcount('ltj@@group@level') then
i = i+1 -- new stack level
local gd = tex.globaldefs
- if gd>0 then tex.globaldefs = 0 end
+ if gd~=0 then tex.globaldefs = 0 end
-- 'tex.globaldefs = 0' is local even if \globaldefs > 0.
tex.setcount('ltj@@group@level', j)
for k,v in pairs(charprop_stack_table) do -- clear the stack above i
@@ -36,7 +36,7 @@ function get_stack_level()
end
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 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)
@@ -60,10 +60,19 @@ end
-- end
-- end
+function set_stack_table(m,p)
+ local i = get_stack_level()
+ charprop_stack_table[i][m] = p
+ if luatexja.isglobal=='global' then
+ for j,v in pairs(charprop_stack_table) do
+ charprop_stack_table[j][m] = p
+ end
+ end
+end
+local set_stack_table = set_stack_table
-- EXT
-function set_stack_table(g,m,c,p,lb,ub)
- local i = get_stack_level()
+function set_stack_perchar(m,c,p,lb,ub)
if type(p)~='number' or p<lb or p>ub then
ltjb.package_error('luatexja',
"invalid code (".. tostring(p) .. ")",
@@ -71,25 +80,12 @@ function set_stack_table(g,m,c,p,lb,ub)
tostring(ub) .. ".\n" ..
"I'm going to use 0 instead of that illegal code value.")
p=0
- elseif type(c)~='number' or c<-1 or c>0x10ffff then
- ltjb.package_error('luatexja',
- 'bad character code (' .. tostring(c) .. ')',
- 'A character number must be between -1 and 0x10ffff.\n' ..
- "(-1 is used for denoting `math boundary')\n" ..
- 'So I changed this one to zero.')
- c=0
end
- charprop_stack_table[i][c+m] = p
- if g=='global' then
- for j,v in pairs(charprop_stack_table) do
- charprop_stack_table[j][c+m] = p
- end
- end
+ set_stack_table(m+ltjb.in_unicode(c, true), p)
end
-- EXT
-function set_stack_font(g,m,c,p)
- local i = get_stack_level()
+function set_stack_font(m,c,p)
if type(c)~='number' or c<0 or c>255 then
ltjb.package_error('luatexja',
"invalid family number (".. tostring(c) .. ")",
@@ -97,16 +93,11 @@ function set_stack_font(g,m,c,p)
"I'm going to use 0 instead of that illegal family number.")
c=0
end
- charprop_stack_table[i][c+m] = p
- if g=='global' then
- for j,v in pairs(charprop_stack_table) do
- charprop_stack_table[j][c+m] = p
- end
- end
+ set_stack_table(m+c, p)
end
-- EXT: store \ltj@tempskipa
-function set_stack_skip(g,m,sp)
+function set_stack_skip(m,sp)
local i = get_stack_level()
if not sp then return end
if not charprop_stack_table[i][m] then
@@ -117,7 +108,7 @@ function set_stack_skip(g,m,sp)
charprop_stack_table[i][m].shrink = sp.shrink
charprop_stack_table[i][m].stretch_order = sp.stretch_order
charprop_stack_table[i][m].shrink_order = sp.shrink_order
- if g=='global' then
+ if luatexja.isglobal=='global' then
for j,v in pairs(charprop_stack_table) do
if not charprop_stack_table[j][m] then charprop_stack_table[j][m] = {} end
charprop_stack_table[j][m].width = sp.width
@@ -133,17 +124,17 @@ end
function report_stack_level(bsl)
table_current_stack = charprop_stack_table[bsl]
end
-function fast_get_skip_table(m)
+function fast_get_stack_skip(m)
return table_current_stack[m]
or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
end
-- For other situations, use the following instead:
-function get_skip_table(m, idx)
+function get_stack_skip(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(mc, d, idx)
+function get_stack_table(mc, d, idx)
local i = charprop_stack_table[idx][mc]
return i or d
end