X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=940ed213525d9180ca9a304f600b937a72bab51f;hb=eb118f3e5ea0852407b5261817700401699528b9;hp=5becb544194a26940ff65d6d031564ccef4cd7c7;hpb=d9e95ad2a91ff3a20a3fb1ddb542ca9f53bf5620;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 5becb54..940ed21 100644
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -1,5 +1,6 @@
 
 require('lualibs')
+tableunpack = table.unpack
 
 ------------------------------------------------------------------------
 -- naming:
@@ -19,6 +20,16 @@ function luatexja.load_lua(fn)
    end
 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
@@ -65,49 +76,11 @@ luatexja.dir_table = dir_table
 dir_table.dir_dtou = 1
 dir_table.dir_tate = 3
 dir_table.dir_yoko = 4
-dir_table.dir_utod = 11 -- 「縦数式ディレクション」 in pTeX
+dir_table.dir_math_mod    = 8
 dir_table.dir_node_auto   = 128 -- 組方向を合わせるために自動で作られたもの
 dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの
-
-
-------------------------------------------------------------------------
--- 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
-
+dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod
+   -- 「縦数式ディレクション」 in pTeX
 --- 定義終わり
 
 local load_module = luatexja.load_module
@@ -117,34 +90,19 @@ load_module('rmlgbm');    local ltjr = luatexja.rmlgbm -- must be 1st
 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
-
--- define_font
-do
-   local otfl_fdr = fonts.definers.read
-   local ltjr_font_callback = ltjr.font_callback
-   local ltjf_extract_metric = ltjf.extract_metric
-   function luatexja.font_callback(name, size, id)
-      local new_name = ltjf_extract_metric(name)
-      local res =  ltjr_font_callback(new_name, size, id, otfl_fdr)
-      luatexbase.call_callback('luatexja.define_font', res, new_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('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']
@@ -245,7 +203,13 @@ do
 	 end
 	 return r
       end,
-      direction = ltjd.get_dir_count,
+      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,
    }
 
@@ -254,6 +218,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
 
@@ -312,6 +277,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
 
@@ -323,24 +289,23 @@ 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 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
-	    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
@@ -348,7 +313,7 @@ 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
 
@@ -372,6 +337,13 @@ do
 
 end
 
+-- cleanup process
+function luatexja.ext_cleanup()
+   ltjf.cleanup_size_cache()
+   ltjd.remove_end_whatsit()
+end
+
+
 -- debug
 
 do
@@ -396,13 +368,13 @@ 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) .. ' '
@@ -410,14 +382,20 @@ local function debug_show_node_X(p,print_fn)
          .. ' (' .. 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) 
-	 .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
+   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)
@@ -431,11 +409,20 @@ 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)
       if get_attr_icflag(p)>icflag_table.KINSOKU
@@ -473,7 +460,7 @@ local function debug_show_node_X(p,print_fn)
    elseif pt == 'whatsit' then
       s = base
       if p.subtype==sid_user then
-	 local t = tostring(p.user_id) .. ' (' .. 
+	 local t = tostring(p.user_id) .. ' (' ..
 	    luatexbase.get_user_whatsit_name(p.user_id) .. ') '
          if p.type ~= 110 then
             s = s .. ' userid:' .. t .. p.value
@@ -484,11 +471,14 @@ local function debug_show_node_X(p,print_fn)
 	       s = s .. ' dir: ' .. tostring(node.has_attribute(p, attr_dir))
 	    end
             print_fn(s)
-            debug_depth=debug_depth.. '.'
-            for q in node.traverse(p.value) do
-               debug_show_node_X(q, print_fn)
-            end
-            debug_depth=k
+	    local bid = inner_depth
+            prefix, inner_depth =prefix.. '.', inner_depth + 1
+            if inner_depth < limit then
+	       for q in node.traverse(p.value) do
+		  debug_show_node_X(q, print_fn, limit)
+	       end
+	    end
+            prefix, inner_depth = k, bid
          end
       else
          s = s .. node.subtype(p.subtype)
@@ -496,7 +486,7 @@ local function debug_show_node_X(p,print_fn)
 	    s = s .. ' stream=' .. p.stream
 	    print_fn(s)
 	    for i=1,#p.data do
-	       print_fn(base .. ' [' .. i .. '] = ' .. tostring(p.data[i]))
+	       print_fn(s .. '  [' .. i .. '] = ' .. tostring(token.command_name(p.data[i])))
 	    end
 	 else
 	    print_fn(s)
@@ -506,22 +496,22 @@ local function debug_show_node_X(p,print_fn)
    elseif pt=='noad' then
       s = base ; print_fn(s)
       if p.nucleus then
-         debug_depth = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
+         prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
       end
       if p.sup then
-         debug_depth = k .. '^'; debug_show_node_X(p.sup, print_fn);
+         prefix = k .. '^'; debug_show_node_X(p.sup, print_fn);
       end
       if p.sub then
-         debug_depth = k .. '_'; debug_show_node_X(p.sub, print_fn);
+         prefix = k .. '_'; debug_show_node_X(p.sub, print_fn);
       end
-      debug_depth = k;
+      prefix = k;
    elseif pt=='math_char' then
       s = base .. ' fam: ' .. p.fam .. ' , char = ' .. utf.char(p.char)
       print_fn(s)
    elseif pt=='sub_box' or pt=='sub_mlist' then
       print_fn(base)
       if p.head then
-         debug_depth = k .. '.';
+         prefix = k .. '.';
 	 for q in node.traverse(p.head) do
 	    debug_show_node_X(q, print_fn)
 	 end
@@ -531,24 +521,25 @@ local function debug_show_node_X(p,print_fn)
    end
    p=node_next(p)
 end
-function luatexja.ext_show_node_list(head,depth,print_fn)
-   debug_depth = depth
+function luatexja.ext_show_node_list(head,depth,print_fn, lim)
+   prefix = depth
+   inner_depth = 0
    if head then
       while head do
-         debug_show_node_X(head, print_fn); head = node_next(head)
+         debug_show_node_X(head, print_fn, lim or 1/0); head = node_next(head)
       end
    else
-      print_fn(debug_depth .. ' (null list)')
+      print_fn(prefix .. ' (null list)')
    end
 end
-function luatexja.ext_show_node(head,depth,print_fn)
-   debug_depth = depth
+function luatexja.ext_show_node(head,depth,print_fn, lim)
+   prefix = depth
+   inner_depth = 0
    if head then
-      debug_show_node_X(head, print_fn)
+      debug_show_node_X(head, print_fn, lim or 1/0)
    else
-      print_fn(debug_depth .. ' (null list)')
+      print_fn(prefix .. ' (null list)')
    end
 end
 
 end
-