X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-stack.lua;h=72e8b8222f582d51c97adefd8eb44d77641ce802;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=21f71d6aa12bb443f8a1ffb363e50f693f71a027;hpb=7f5a821fddcc60d430158e5bf55b014b5876e7bf;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua index 21f71d6..72e8b82 100644 --- a/src/ltj-stack.lua +++ b/src/ltj-stack.lua @@ -3,8 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.stack', - date = '2011/04/01', - version = '0.1', + date = '2014/05/08', description = 'LuaTeX-ja stack system', }) module('luatexja.stack', package.seeall) @@ -12,33 +11,22 @@ local err, warn, info, log = luatexbase.errwarinf(_NAME) 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 hmode = 118 -- in luatexref-t.pdf, this must be 127 +local STCK = luatexja.userid_table.STCK +local fastcopy = table.fastcopy +local setcount = tex.setcount +local scan_int, scan_keyword = luatexja.token.scan_int, luatexja.token.scan_keyword +hmode = 0 -- dummy -local charprop_stack_table={}; charprop_stack_table[0]={} +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') @@ -46,103 +34,76 @@ 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) + 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] = stack_table_copy(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 + 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 のみ 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 end --- local function table_to_str(v) --- local s = '' --- for i, a in pairs(v) do --- s = s .. i .. "=" .. tostring(a) .. ', ' --- end --- return s --- end --- function print_stack_table(i) --- print('\n>>> get_stack_level:') --- for k, v in pairs(charprop_stack_table[i]) do --- print(" " , k, type(k), table_to_str(v)); --- 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() - if type(p)~='number' or pub then +function 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) .. '..' .. 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 - elseif not charprop_stack_table[i][c] then - charprop_stack_table[i][c] = {} end - 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 - 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() - if type(c)~='number' or c<0 or c>255 then +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) .. ")", "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 - 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 - end - end + set_stack_table(m+c, p) end --- EXT: store \ltj@tempskipa -function set_stack_skip(g,m,sp) +-- EXT: sp: glue_spec +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 - 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 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 - for j,v in pairs(charprop_stack_table) do + 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 charprop_stack_table[j][m].stretch = sp.stretch @@ -154,32 +115,27 @@ function set_stack_skip(g,m,sp) end -- These three functions are used in ltj-jfmglue.lua. -local table_current_stack +-- list_dir and orig_char_table are used in other lua files. +orig_char_table = {} +list_dir = nil -- dummy +table_current_stack = nil -- dummy function report_stack_level(bsl) table_current_stack = charprop_stack_table[bsl] + return bsl end -function fast_get_skip_table(m) - return table_current_stack[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 -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] +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(m,c,d, idx) - local i = charprop_stack_table[idx][c] - return (i and i[m]) or d +function get_stack_table(mc, d, idx) + local i = charprop_stack_table[idx][mc] + return i or d end