X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=ec5f902c8c3609f3bb206dddd546003d2c33ef00;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=6dddc1ada8e39308439b2ecfbe8c7054eeadc7ea;hpb=4285693e49ee8fdf6681a1343a0e8f86a5e73511;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja.lua b/src/luatexja.lua index 6dddc1a..ec5f902 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -1,5 +1,6 @@ require('lualibs') +tableunpack = table.unpack ------------------------------------------------------------------------ -- naming: @@ -19,6 +20,26 @@ function luatexja.load_lua(fn) end end +local setfield = node.direct.setfield +luatexja.setglue = node.direct.setglue or + function(g,w,st,sh,sto,sho) + setfield(g,'width', w or 0) + setfield(g,'stretch',st or 0) + setfield(g,'shrink', sh or 0) + setfield(g,'stretch_order',sto or 0) + setfield(g,'shrink_order', sho or 0) + end + +-- check token library +if newtoken then + luatexja.token = newtoken +else + local luatex_version = status.list().luatex_version + if luatex_version >80 then + luatexja.token = token + end +end + --- 以下は全ファイルで共有される定数 local icflag_table = {} luatexja.icflag_table = icflag_table @@ -48,7 +69,6 @@ stack_table_index.RIPOST = 0xC00000 -- characterごと，ruby post stack_table_index.JWP = 0 -- これだけ stack_table_index.KSK = 1 -- これだけ stack_table_index.XSK = 2 -- これだけ -stack_table_index.DIR = 3 -- これだけ stack_table_index.MJT = 0x100 -- 0--255 stack_table_index.MJS = 0x200 -- 0--255 stack_table_index.MJSS = 0x300 -- 0--255 @@ -61,78 +81,38 @@ userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」 userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向 ------------------------------------------------------------------------- --- FIX node.remove ------------------------------------------------------------------------- -do - local node_remove, node_next, node_prev = node.remove, node.next, node.prev - function luatexja.node_remove (head, current) - if head==current then - local q, r = node_next(current), node_prev(current) - if q then q.prev = r end - if r and node_next(r)==current then - r.next = q - end - return q, q - else - return node_remove(head, current) - end - end - local Dnode = node.direct or node - if Dnode~=node then - local Dnode_remove, setfield = Dnode.remove, Dnode.setfield - local Dnode_next, Dnode_prev = Dnode.getnext, Dnode.getprev - function luatexja.Dnode_remove (head, current) - if head==current then - local q, r = Dnode_next(current), Dnode_prev(current) - if q then setfield(q, 'prev', r) end - if r and Dnode_next(r) == current then - setfield(r, 'next', q) - end - return q, q - else - return Dnode_remove(head, current) - end - end - else - luatexja.Dnode_remove = luatexja.node_remove - end -end - +local dir_table = {} +luatexja.dir_table = dir_table +dir_table.dir_dtou = 1 +dir_table.dir_tate = 3 +dir_table.dir_yoko = 4 +dir_table.dir_math_mod = 8 +dir_table.dir_node_auto = 128 -- 組方向を合わせるために自動で作られたもの +dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの +dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod + -- 「縦数式ディレクション」 in pTeX --- 定義終わり local load_module = luatexja.load_module load_module('base'); local ltjb = luatexja.base load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st --- define_font -do - local otfl_fdr = fonts.definers.read - local ltjr_font_callback = ltjr.font_callback - function luatexja.font_callback(name, size, id) - local res = ltjr_font_callback(name, size, id, otfl_fdr) - luatexbase.call_callback('luatexja.define_font', res, name, size, id) - return res - end - luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) - luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) -end - - ---load_module('debug') +if luatexja_debug then load_module('debug') end load_module('charrange'); local ltjc = luatexja.charrange +load_module('stack'); local ltjs = luatexja.stack +load_module('direction'); local ltjd = luatexja.direction -- +1 hlist +1 attr_list load_module('jfont'); local ltjf = luatexja.jfont load_module('inputbuf'); local ltji = luatexja.inputbuf -load_module('stack'); local ltjs = luatexja.stack load_module('pretreat'); local ltjp = luatexja.pretreat -load_module('jfmglue'); local ltjj = luatexja.jfmglue load_module('setwidth'); local ltjw = luatexja.setwidth +load_module('jfmglue'); local ltjj = luatexja.jfmglue -- +1 glue +1 gs +1 attr_list load_module('math'); local ltjm = luatexja.math load_module('tangle'); local ltjb = luatexja.base -load_module('direction'); local ltjd = luatexja.direction + local attr_jchar_class = luatexbase.attributes['ltj@charclass'] +local attr_jchar_code = luatexbase.attributes['ltj@charcode'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] local attr_yablshift = luatexbase.attributes['ltj@yablshift'] local attr_icflag = luatexbase.attributes['ltj@icflag'] @@ -161,6 +141,7 @@ local function print_scaled(s) until s<=delta return out end +luatexja.print_scaled = print_scaled local function print_glue(d,order) local out=print_scaled(d) @@ -232,7 +213,15 @@ do elseif f == math.two_add then r = 'both' end return r - end + end, + direction = function() + local v = ltjd.get_dir_count() + if math.abs(tex.nest[tex.nest.ptr].mode) == ltjs.mmode and v == dir_table.dir_tate then + v = dir_table.dir_utod + end + return v + end, + adjustdir = ltjd.get_adjust_dir_count, } local unary_pars = luatexja.unary_pars @@ -240,6 +229,7 @@ do if unary_pars[k] then tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack')))) end + ltjb.stop_time_measure('get_par') end end @@ -280,6 +270,16 @@ do return ltjs.get_stack_table(stack_table_index.XSP + ltjb.in_unicode(c, true), 3, t) end, + boxdir = function(c, t) + if type(c)~='number' or c<0 or c>65535 then + ltjb.package_error('luatexja', + 'Bad register code (' .. tostring(c) .. ')', + 'A register must be between 0 and 65535.\n'.. + 'I changed this one to zero.') + c=0 + end + return ltjd.get_register_dir(c) + end, } local binary_pars = luatexja.binary_pars @@ -288,6 +288,7 @@ do if binary_pars[k] then tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack')))) end + ltjb.stop_time_measure('get_par') end end @@ -296,26 +297,25 @@ function luatexja.ext_print_global() if luatexja.isglobal=='global' then tex.sprint(cat_lp, '\\global') end end + -- main process do - local start_time_measure, stop_time_measure + local start_time_measure, stop_time_measure = ltjb.start_time_measure, ltjb.stop_time_measure - local Dnode = node.direct or node local nullfunc = function (n) return n end - local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc - local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc - local time_jfm, time_width = 0,0 + local to_node = node.direct.tonode + local to_direct = node.direct.todirect + local ensure_tex_attr = ltjb.ensure_tex_attr + -- mode = true iff main_process is called from pre_linebreak_filter local function main_process(head, mode, dir, gc) - tex.setattribute('global', attr_icflag, 0) + ensure_tex_attr(attr_icflag, 0) if gc == 'fin_row' then return head else - local p = to_direct(head) + --luatexja.ext_show_node_list(head, 'T> ', print) start_time_measure('jfmglue') - p = ltjj.main(p,mode) - stop_time_measure('jfmglue'); start_time_measure('setwidth') - if p then p = ltjw.set_ja_width(p, dir) end - stop_time_measure('setwidth') + local p = ltjj.main(to_direct(head),mode, dir) + stop_time_measure('jfmglue') return to_node(p) end end @@ -323,31 +323,35 @@ do local function adjust_icflag(h) -- kern from luaotfload will have icflag = 1 -- (same as italic correction) - tex.setattribute('global', attr_icflag, 1) + ensure_tex_attr(attr_icflag, 1) return h end -- callbacks - - luatexbase.add_to_callback( + ltjb.add_to_callback( 'pre_linebreak_filter', function (head,groupcode) return main_process(head, true, tex.textdir, groupcode) - end,'ltj.pre_linebreak_filter', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'luaotfload.node_processor') + 1) - luatexbase.add_to_callback( + end,'ltj.main', + luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')+1) + ltjb.add_to_callback( 'hpack_filter', function (head,groupcode,size,packtype, dir) return main_process(head, false, dir, groupcode) - end,'ltj.hpack_filter', - luatexbase.priority_in_callback('hpack_filter', - 'luaotfload.node_processor') + 1) - luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'adjust_icflag', 1) - luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'adjust_icflag', 1) + end,'ltj.main', + luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')+1) + ltjb.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1) + ltjb.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1) end +-- cleanup process +function luatexja.ext_cleanup() + ltjf.cleanup_size_cache() + ltjd.remove_end_whatsit() +end + + -- debug do @@ -358,7 +362,6 @@ local has_attr = node.has_attribute local id_penalty = node.id('penalty') local id_glyph = node.id('glyph') -local id_glue_spec = node.id('glue_spec') local id_glue = node.id('glue') local id_kern = node.id('kern') local id_hlist = node.id('hlist') @@ -372,26 +375,34 @@ local function get_attr_icflag(p) return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG end -local debug_depth +local prefix, inner_depth -local function debug_show_node_X(p,print_fn) - local k = debug_depth +local function debug_show_node_X(p,print_fn, limit) + local k = prefix local s local pt=node_type(p.id) - local base = debug_depth .. string.format('%X', get_attr_icflag(p)) + local base = prefix .. string.format('%X', get_attr_icflag(p)) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then - s = base .. ' ' .. utf.char(p.char) .. ' ' .. tostring(p.font) + s = base .. ' ' .. utf.char(p.char) .. ' ' + .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) print_fn(s) - elseif pt=='hlist' or pt=='vlist' or pt=='unset' then - s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) .. p.dir - if p.shift or 0~=0 then + elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then + if pt=='ins' then + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')' + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + else + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + end + if (p.shift or 0)~=0 then s = s .. ', shifted ' .. print_scaled(p.shift) end - if p.glue_sign >= 1 then + if p.glue_set and p.glue_sign ==2 or ( p.glue_sign==1 and p.glue_set>0) then s = s .. ' glue set ' if p.glue_sign == 2 then s = s .. '-' end s = s .. tostring(floor(p.glue_set*10000)/10000) @@ -405,13 +416,22 @@ local function debug_show_node_X(p,print_fn) if get_attr_icflag(p) == icflag_table.PACKED then s = s .. ' (packed)' end - print_fn(s); debug_depth=debug_depth.. '.' - for q in node.traverse(p.head) do - debug_show_node_X(q, print_fn) + print_fn(s); + local bid = inner_depth + prefix, inner_depth = prefix.. '.', inner_depth + 1 + if inner_depth < limit then + for q in node.traverse(p.head) do + debug_show_node_X(q, print_fn, limit) + end end - debug_depth=k + prefix=k + elseif pt=='rule' then + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + print_fn(s) elseif pt == 'glue' then - s = base .. ' ' .. print_spec(p.spec) + s = base .. ' ' .. print_spec(p) if get_attr_icflag(p)>icflag_table.KINSOKU and get_attr_icflag(p)