summaryrefslogtreecommitdiff
path: root/tex/context/base/mkiv/node-res.lua
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2019-02-26 20:54:52 +0100
committerContext Git Mirror Bot <phg@phi-gamma.net>2019-02-26 20:54:52 +0100
commit4916c5e036f646daaa3ec913c4c69ce4fb3da1c5 (patch)
tree0d3bc2e085c5842b1d8fd1165c4db4e2de67e49e /tex/context/base/mkiv/node-res.lua
parentb55beadd32489008a75cf46c9eeb22aa20764cc7 (diff)
downloadcontext-4916c5e036f646daaa3ec913c4c69ce4fb3da1c5.tar.gz
2019-02-26 20:12:00
Diffstat (limited to 'tex/context/base/mkiv/node-res.lua')
-rw-r--r--tex/context/base/mkiv/node-res.lua24
1 files changed, 6 insertions, 18 deletions
diff --git a/tex/context/base/mkiv/node-res.lua b/tex/context/base/mkiv/node-res.lua
index d9999968a..5b4961683 100644
--- a/tex/context/base/mkiv/node-res.lua
+++ b/tex/context/base/mkiv/node-res.lua
@@ -364,49 +364,37 @@ function nutpool.direction(dir,swap)
return t
end
-function nutpool.rule(width,height,depth,direction) -- w/h/d == nil will let them adapt
+function nutpool.rule(width,height,depth) -- w/h/d == nil will let them adapt
local n = copy_nut(rule)
if width or height or depth then
setwhd(n,width,height,depth)
end
- if direction then
- setdirection(n,direction)
- end
return n
end
-function nutpool.emptyrule(width,height,depth,direction) -- w/h/d == nil will let them adapt
+function nutpool.emptyrule(width,height,depth) -- w/h/d == nil will let them adapt
local n = copy_nut(emptyrule)
if width or height or depth then
setwhd(n,width,height,depth)
end
- if direction then
- setdirection(n,direction)
- end
return n
end
-function nutpool.userrule(width,height,depth,direction) -- w/h/d == nil will let them adapt
+function nutpool.userrule(width,height,depth) -- w/h/d == nil will let them adapt
local n = copy_nut(userrule)
if width or height or depth then
setwhd(n,width,height,depth)
end
- if direction then
- setdirection(n,direction)
- end
return n
end
-function nutpool.outlinerule(width,height,depth,line,direction) -- w/h/d == nil will let them adapt
+function nutpool.outlinerule(width,height,depth,line) -- w/h/d == nil will let them adapt
local n = copy_nut(outlinerule)
if width or height or depth then
setwhd(n,width,height,depth)
end
if line then
- setfield(n,"transform",line)
- end
- if direction then
- setdirection(n,direction)
+ if CONTEXTLMTXMODE > 1 then setdata(n,line) else setfield(n,"transform",line) end
end
return n
end
@@ -576,7 +564,7 @@ end
local function usage()
local t = { }
for n, tag in gmatch(status.node_mem_usage,"(%d+) ([a-z_]+)") do
- t[tag] = n
+ t[tag] = tonumber(n) or 0
end
return t
end