get rid of attr_orig_char

[luatex-ja/luatexja.git] / src / luatexja.lua

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 94ad475..70f576a 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -65,7 +65,7 @@ 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_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
@@ -328,10 +328,9 @@ do
       tex_set_attr('global', 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, dir)
-           if p then p = ltjw.set_ja_width(p, dir) end
+           local p = ltjj.main(to_direct(head),mode, dir)
            stop_time_measure('jfmglue')
            return to_node(p)
       end
@@ -388,13 +387,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) .. ' '
@@ -402,14 +401,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)
@@ -423,11 +428,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
@@ -476,11 +490,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)
@@ -498,22 +515,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
@@ -523,22 +540,24 @@ 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