diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-01-17 18:05:46 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-01-17 18:05:46 +0100 |
| commit | 0cfeab235554eeee0dddd6c3f44d3939ab490ff1 (patch) | |
| tree | fed70e9a3332741e5294a01197c716dff8556506 /tex/context/base/mkiv/tabl-xtb.lua | |
| parent | 72d161c0a522fd92f32edd3588fa126c453f4a3d (diff) | |
| download | context-0cfeab235554eeee0dddd6c3f44d3939ab490ff1.tar.gz | |
2017-01-17 17:43:00
Diffstat (limited to 'tex/context/base/mkiv/tabl-xtb.lua')
| -rw-r--r-- | tex/context/base/mkiv/tabl-xtb.lua | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tex/context/base/mkiv/tabl-xtb.lua b/tex/context/base/mkiv/tabl-xtb.lua index afcdc5855..c3e022b24 100644 --- a/tex/context/base/mkiv/tabl-xtb.lua +++ b/tex/context/base/mkiv/tabl-xtb.lua @@ -67,6 +67,7 @@ local getprev = nuts.getprev local getlist = nuts.getlist local getfield = nuts.getfield local getbox = nuts.getbox +local getdimensions = nuts.dimensions local setfield = nuts.setfield local setlink = nuts.setlink @@ -256,9 +257,7 @@ function xtables.set_reflow_width() -- drc.list = true -- we don't need to keep the content around as we're in trial mode (no: copy_node_list(tb)) -- - local width = getfield(tb,"width") - local height = getfield(tb,"height") - local depth = getfield(tb,"depth") + local width, height, depth = getdimensions(tb) -- local widths = data.widths local heights = data.heights @@ -428,9 +427,7 @@ function xtables.set_reflow_height() local tb = getbox("b_tabl_x") local drc = row[c] -- - local width = getfield(tb,"width") - local height = getfield(tb,"height") - local depth = getfield(tb,"depth") + local width, height, depth = getdimensions(tb) -- if drc.ny < 2 then if data.fixedrows[r] == 0 then -- and drc.dimensionstate < 2 @@ -821,7 +818,8 @@ function xtables.construct() end local list = drc.list if list then - setfield(list,"shift",getfield(list,"height") + getfield(list,"depth")) + local w, h, d = getdimensions(list) + setfield(list,"shift",h+d) -- list = hpack_node_list(list) -- is somehow needed -- setfield(list,"width",0) -- setfield(list,"height",0) @@ -1168,10 +1166,8 @@ function xtables.cleanup() -- local cell = row[i] -- local list = cell.list -- if list then - -- cell.width = getfield(list,"width") - -- cell.height = getfield(list,"height") - -- cell.depth = getfield(list,"depth") - -- cell.list = true + -- cell.width, cell.height, cell.depth = getdimensions(list) + -- cell.list = true -- end -- end -- end |