X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=6ca1b67836b56f8d489c249581331fe1d49c6a44;hb=1379fbf6aae445cdce3906e7b83cc1c8550e78d5;hp=421903534716d0249194bc060c3ddba3b1d79147;hpb=e443a06babd498f9e5c64d00383a94bda80655ba;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 4219035..6ca1b67 100644
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -48,7 +48,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,6 +60,15 @@ userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- 
 userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par',    'luatexja') -- 「段落始め」
 userid_table.DIR  = luatexbase.newuserwhatsitid('direction',    'luatexja') -- 組方向
 
+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_node_auto   = 16 -- 組方向を合わせるために自動で作られたもの
+dir_table.dir_node_manual = 32 -- 寸法代入によって作られたもの
+
+
 ------------------------------------------------------------------------
 -- FIX node.remove
 ------------------------------------------------------------------------
@@ -118,7 +126,7 @@ do
    luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
 end
 
-
+if luatexja_debug then load_module('debug') end
 load_module('charrange'); local ltjc = luatexja.charrange
 load_module('jfont');     local ltjf = luatexja.jfont
 load_module('inputbuf');  local ltji = luatexja.inputbuf
@@ -296,18 +304,24 @@ end
 
 -- main process
 do
+   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 
    -- 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)
       if gc == 'fin_row' then return head
       else
 	    local p = to_direct(head)
+	    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')
 	    return to_node(p)
       end
    end
@@ -379,8 +393,9 @@ local function debug_show_node_X(p,print_fn)
       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
+         .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) 
+	 .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
+      if (p.shift or 0)~=0 then
          s = s .. ', shifted ' .. print_scaled(p.shift)
       end
       if p.glue_sign >= 1 then
@@ -437,18 +452,19 @@ local function debug_show_node_X(p,print_fn)
       end
       print_fn(s)
    elseif pt == 'whatsit' then
-      s = base .. '(' .. node.whatsits()[p.subtype] .. ') '
+      s = base
       if p.subtype==sid_user then
+	 local t = tostring(p.user_id) .. ' (' .. 
+	    luatexbase.get_user_whatsit_name(p.user_id) .. ') '
          if p.type ~= 110 then
-            s = s .. ' user_id: ' .. p.user_id .. ' ' .. p.value
+            s = s .. ' userid:' .. t .. p.value
             print_fn(s)
          else
-            s = s .. ' user_id: ' .. p.user_id .. ' (node list)'
+            s = s .. ' userid:' .. t .. '(node list)'
             print_fn(s)
-            local q = p.value
             debug_depth=debug_depth.. '.'
-            while q do
-               debug_show_node_X(q, print_fn); q = node_next(q)
+            for q in node.traverse(p.value) do
+               debug_show_node_X(q, print_fn)
             end
             debug_depth=k
          end