Np.char is needed for ruby annotations

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

diff --git a/src/luatexja.lua b/src/luatexja.lua
index df3ca12..d1ec6c4 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
@@ -230,7 +230,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,7 +316,7 @@ 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
@@ -328,6 +328,7 @@ do
       tex_set_attr('global', 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')
@@ -400,14 +401,20 @@ local function debug_show_node_X(p,print_fn, limit)
          .. ' (' .. 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)
@@ -421,7 +428,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
@@ -430,6 +437,11 @@ local function debug_show_node_X(p,print_fn, limit)
         end
       end
       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
@@ -467,7 +479,7 @@ local function debug_show_node_X(p,print_fn, limit)
    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
@@ -493,7 +505,7 @@ local function debug_show_node_X(p,print_fn, limit)
            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)
@@ -550,4 +562,3 @@ function luatexja.ext_show_node(head,depth,print_fn, lim)
 end
 
 end
-