2018-05-12 00:16:00

1 files changed, 73 insertions, 13 deletions

diff --git a/tex/context/base/mkiv/trac-vis.lua b/tex/context/base/mkiv/trac-vis.lua
index 91ee1cf7d..e744f84f2 100644
--- a/tex/context/base/mkiv/trac-vis.lua
+++ b/tex/context/base/mkiv/trac-vis.lua
@@ -74,11 +74,12 @@ local copy_list           = nuts.copy_list
 local flush_node_list     = nuts.flush_list
 local insert_node_before  = nuts.insert_before
 local insert_node_after   = nuts.insert_after
-local traverse_nodes      = nuts.traverse
 local apply_to_nodes      = nuts.apply
 local find_tail           = nuts.tail
 local effectiveglue       = nuts.effective_glue
 
+local nextnode            = nuts.traversers.node
+
 local hpack_string        = nuts.typesetters.tohpack
 
 local texgetattribute     = tex.getattribute
@@ -188,7 +189,8 @@ end
 
 -- we can preset a bunch of bits
 
-local userrule -- bah, not yet defined: todo, delayed(nuts.rules,"userrule")
+local userrule    -- bah, not yet defined: todo, delayed(nuts.rules,"userrule")
+local outlinerule -- bah, not yet defined: todo, delayed(nuts.rules,"userrule")
 
 local function enable()
     if not usedfont then
@@ -233,6 +235,9 @@ local function enable()
     if not userrule then
        userrule = nuts.rules.userrule
     end
+    if not outlinerule then
+       outlinerule = nuts.pool.outlinerule
+    end
 end
 
 local function setvisual(n,a,what,list) -- this will become more efficient when we have the bit lib linked in
@@ -700,7 +705,7 @@ local ruledbox do
         local wd, ht, dp = getwhd(current)
         if wd ~= 0 then
             local shift = getshift(current)
-            local dir   = getdir(current)
+         -- local dir   = getdir(current)
          -- if dir == "LTL" or dir == "RRT" then
          --     wd, ht, dp = ht + dp, wd, 0
          -- end
@@ -761,7 +766,7 @@ local ruledbox do
             --
             local info = setlink(
                 this and copy_list(this) or nil,
-                userrule {
+                (dp == 0 and outlinerule and outlinerule(wd,ht,dp,linewidth)) or userrule {
                     width  = wd,
                     height = ht,
                     depth  = dp,
@@ -772,7 +777,7 @@ local ruledbox do
             )
             --
             setlisttransparency(info,c_text)
-            info = new_hlist(info)
+         -- info = new_hlist(info)
             --
             setattr(info,a_layer,layer)
             if vertical then
@@ -849,10 +854,10 @@ local ruledglyph do
      -- local wd = chardata[getfont(current)][getchar(current)].width
         if wd ~= 0 then
             local wd, ht, dp = getwhd(current)
-    --         local dir = getdir(current)
-    -- if dir == "LTL" or dir = "RTT" then
-    --     wd, ht, dp = ht + dp, wd, 0
-    -- end
+         -- local dir = getdir(current)
+         -- if dir == "LTL" or dir = "RTT" then
+         --     wd, ht, dp = ht + dp, wd, 0
+         -- end
             local next = getnext(current)
             local prev = previous
             setboth(current)
@@ -895,7 +900,7 @@ local ruledglyph do
             -- userrules:
             --
             info = setlink(
-                userrule {
+                (dp == 0 and outlinerule and outlinerule(wd,ht,dp,linewidth)) or userrule {
                     width  = wd,
                     height = ht,
                     depth  = dp,
@@ -1198,6 +1203,8 @@ do
     local listcodes           = nodes.listcodes
     local line_code           = listcodes.line
 
+    local cache
+
     local function visualize(head,vertical,forced,parent)
         local trace_hbox           = false
         local trace_vbox           = false
@@ -1225,6 +1232,58 @@ do
         local prev_trace_fontkern  = nil
         local prev_trace_italic    = nil
         local prev_trace_expansion = nil
+
+     -- local function setthem(t,k)
+     --     local v_trace_hbox          = band(k,     1) ~= 0
+     --     local v_trace_vbox          = band(k,     2) ~= 0
+     --     local v_trace_vtop          = band(k,     4) ~= 0
+     --     local v_trace_kern          = band(k,     8) ~= 0
+     --     local v_trace_glue          = band(k,    16) ~= 0
+     --     local v_trace_penalty       = band(k,    32) ~= 0
+     --     local v_trace_fontkern      = band(k,    64) ~= 0
+     --     local v_trace_strut         = band(k,   128) ~= 0
+     --     local v_trace_whatsit       = band(k,   256) ~= 0
+     --     local v_trace_glyph         = band(k,   512) ~= 0
+     --     local v_trace_simple        = band(k,  1024) ~= 0
+     --     local v_trace_user          = band(k,  2048) ~= 0
+     --     local v_trace_math          = band(k,  4096) ~= 0
+     --     local v_trace_italic        = band(k,  8192) ~= 0
+     --     local v_trace_origin        = band(k, 16384) ~= 0
+     --     local v_trace_discretionary = band(k, 32768) ~= 0
+     --     local v_trace_expansion     = band(k, 65536) ~= 0
+     --     local v_trace_line          = band(k,131072) ~= 0
+     --     local v_trace_space         = band(k,262144) ~= 0
+     --     local v_trace_depth         = band(k,524288) ~= 0
+     --     local v = function()
+     --         trace_hbox          = v_trace_hbox
+     --         trace_vbox          = v_trace_vbox
+     --         trace_vtop          = v_trace_vtop
+     --         trace_kern          = v_trace_kern
+     --         trace_glue          = v_trace_glue
+     --         trace_penalty       = v_trace_penalty
+     --         trace_fontkern      = v_trace_fontkern
+     --         trace_strut         = v_trace_strut
+     --         trace_whatsit       = v_trace_whatsit
+     --         trace_glyph         = v_trace_glyph
+     --         trace_simple        = v_trace_simple
+     --         trace_user          = v_trace_user
+     --         trace_math          = v_trace_math
+     --         trace_italic        = v_trace_italic
+     --         trace_origin        = v_trace_origin
+     --         trace_discretionary = v_trace_discretionary
+     --         trace_expansion     = v_trace_expansion
+     --         trace_line          = v_trace_line
+     --         trace_space         = v_trace_space
+     --         trace_depth         = v_trace_depth
+     --     end
+     --     t[k] = v
+     --     return v
+     -- end
+     --
+     -- if not cache then
+     --     cache = setmetatableindex(setthem)
+     -- end
+
         while current do
             local id = getid(current)
             local a = forced or getattr(current,a_visual) or unsetvalue
@@ -1254,6 +1313,7 @@ do
                     trace_space         = false
                     trace_depth         = false
                 else -- dead slow:
+                 -- cache[a]()
                     trace_hbox          = band(a,     1) ~= 0
                     trace_vbox          = band(a,     2) ~= 0
                     trace_vtop          = band(a,     4) ~= 0
@@ -1390,9 +1450,9 @@ do
     local function handler(head)
         if usedfont then
             starttiming(visualizers)
-            head = visualize(tonut(head),true)
+            head = visualize(head,true)
             stoptiming(visualizers)
-            return tonode(head), true
+            return head, true
         else
             return head, false
         end
@@ -1433,7 +1493,7 @@ do
     }
 
     local function markfonts(list)
-        for n, id in traverse_nodes(list) do
+        for n, id in nextnode, list do
             if id == glyph_code then
                 local font = getfont(n)
                 local okay = used[font]