X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=ec5f902c8c3609f3bb206dddd546003d2c33ef00;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=d40427883c77027460d1d70e41cb00cf1ce922b6;hpb=eceecf1e377fb936af0fd151ad67a92889bec979;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja.lua b/src/luatexja.lua index d404278..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 @@ -70,46 +91,6 @@ 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 - - ------------------------------------------------------------------------- --- 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 load_module = luatexja.load_module @@ -120,16 +101,18 @@ 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 +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('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 + 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'] @@ -158,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) @@ -230,7 +214,7 @@ do end return r end, - direction = function() + 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 @@ -316,18 +300,19 @@ 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 tex_set_attr = tex.setattribute + 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_set_attr('global', attr_icflag, 0) + ensure_tex_attr(attr_icflag, 0) if gc == 'fin_row' then return head else + --luatexja.ext_show_node_list(head, 'T> ', print) start_time_measure('jfmglue') local p = ltjj.main(to_direct(head),mode, dir) stop_time_measure('jfmglue') @@ -338,30 +323,35 @@ do local function adjust_icflag(h) -- kern from luaotfload will have icflag = 1 -- (same as italic correction) - tex_set_attr('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, 'ltj.adjust_icflag', 1) - luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'ltj.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 @@ -372,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') @@ -407,13 +396,13 @@ local function debug_show_node_X(p,print_fn, limit) .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) else s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. 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 or 0>= 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) @@ -427,7 +416,7 @@ local function debug_show_node_X(p,print_fn, limit) if get_attr_icflag(p) == icflag_table.PACKED then s = s .. ' (packed)' end - print_fn(s); + print_fn(s); local bid = inner_depth prefix, inner_depth = prefix.. '.', inner_depth + 1 if inner_depth < limit then @@ -438,11 +427,11 @@ local function debug_show_node_X(p,print_fn, limit) prefix=k elseif pt=='rule' then s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. 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)