X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-stack.lua;h=121804d20c4b9a9401fea37cb618bf64fc26795b;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=81fd8519cd8a5f6e28c695319d05d1b828ac2b5a;hpb=328aede261ad1bba2815dd8c3d6e62e57e7aaf43;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua index 81fd851..121804d 100644 --- a/src/ltj-stack.lua +++ b/src/ltj-stack.lua @@ -3,26 +3,31 @@ -- luatexbase.provides_module({ name = 'luatexja.stack', - date = '2014/09/24', + date = '2018/02/18', description = 'LuaTeX-ja stack system', }) -module('luatexja.stack', package.seeall) -local err, warn, info, log = luatexbase.errwarinf(_NAME) - +luatexja.stack = {} +local ltjs=luatexja.stack luatexja.load_module('base'); local ltjb = luatexja.base +-------------------------------------------------------------------------------- +-- stack table (obeys TeX's grouping) +-------------------------------------------------------------------------------- local node_new = node.new local id_whatsit = node.id('whatsit') local sid_user = node.subtype('user_defined') local STCK = luatexja.userid_table.STCK -hmode = 0 -- dummy +local fastcopy = table.fastcopy +local setcount = tex.setcount +local scan_int, scan_keyword = token.scan_int, token.scan_keyword +ltjs.hmode = 0 -- dummy -charprop_stack_table={}; -local charprop_stack_table = charprop_stack_table +local charprop_stack_table={}; +ltjs.charprop_stack_table = charprop_stack_table charprop_stack_table[0]={} -function get_stack_level() +local function get_stack_level() local i = tex.getcount('ltj@@stack') local j = tex.currentgrouplevel if j > tex.getcount('ltj@@group@level') then @@ -30,35 +35,39 @@ function get_stack_level() local gd = tex.globaldefs if gd~=0 then tex.globaldefs = 0 end -- 'tex.globaldefs = 0' is local even if \globaldefs > 0. - tex.setcount('ltj@@group@level', j) + setcount('ltj@@group@level', j) 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] = table.fastcopy(charprop_stack_table[i-1]) - tex.setcount('ltj@@stack', i) + charprop_stack_table[i] = fastcopy(charprop_stack_table[i-1]) + setcount('ltj@@stack', i) if gd~=0 then tex.globaldefs = gd end - if tex.nest[tex.nest.ptr].mode == -hmode then -- rest. hmode のみ + if tex.nest[tex.nest.ptr].mode == -ltjs.hmode then -- rest. hmode のみ local g = node_new(id_whatsit, sid_user) g.user_id=STCK; g.type=100; g.value=j; node.write(g) end end return i end +ltjs.get_stack_level = get_stack_level -function set_stack_table(m, p) +local 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 + 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 +ltjs.set_stack_table = set_stack_table -- EXT -function set_stack_perchar(m,c,p,lb,ub) - if type(p)~='number' or pub then +function ltjs.set_stack_perchar(m,lb,ub, getter) + local c = scan_int() + scan_keyword(',') + local p = tonumber((getter or scan_int)()) + if pub then ltjb.package_error('luatexja', "invalid code (".. tostring(p) .. ")", "The code should in the range "..tostring(lb) .. '..' .. @@ -70,8 +79,8 @@ function set_stack_perchar(m,c,p,lb,ub) end -- EXT -function set_stack_font(m,c,p) - if type(c)~='number' or c<0 or c>255 then +function ltjs.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) .. ")", "The family number should in the range 0 .. 255.\n" .. @@ -81,12 +90,12 @@ function set_stack_font(m,c,p) set_stack_table(m+c, p) end --- EXT: store \ltj@tempskipa -function set_stack_skip(m,sp) +-- EXT: sp: glue_spec +function ltjs.set_stack_skip(m,sp) local i = get_stack_level() if not sp then return end - if not charprop_stack_table[i][m] then - charprop_stack_table[i][m] = {} + if not charprop_stack_table[i][m] then + charprop_stack_table[i][m] = {} end charprop_stack_table[i][m].width = sp.width charprop_stack_table[i][m].stretch = sp.stretch @@ -94,7 +103,7 @@ function set_stack_skip(m,sp) charprop_stack_table[i][m].stretch_order = sp.stretch_order charprop_stack_table[i][m].shrink_order = sp.shrink_order if luatexja.isglobal=='global' then - for j,v in pairs(charprop_stack_table) do + 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 charprop_stack_table[j][m].stretch = sp.stretch @@ -106,20 +115,26 @@ function set_stack_skip(m,sp) end -- These three functions are used in ltj-jfmglue.lua. -function report_stack_level(bsl) - table_current_stack = charprop_stack_table[bsl] +-- list_dir and orig_char_table are used in other lua files. +local orig_char_table = {} +ltjs.orig_char_table = orig_char_table +ltjs.list_dir = nil -- dummy +ltjs.table_current_stack = nil -- dummy +function ltjs.report_stack_level(bsl) + ltjs.table_current_stack = charprop_stack_table[bsl] + return bsl end -function fast_get_stack_skip(m) - return table_current_stack[m] +function ltjs.fast_get_stack_skip(m) + return ltjs.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_stack_skip(m, idx) - return charprop_stack_table[idx][m] +function ltjs.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_stack_table(mc, d, idx) +function ltjs.get_stack_table(mc, d, idx) local i = charprop_stack_table[idx][mc] return i or d end