From 2f8058544f8a3fead8186bdcb3835f1f67416cc3 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 28 Dec 2018 11:57:23 +0100 Subject: 2018-12-28 11:09:00 --- tex/context/base/mkiv/page-cst.lua | 161 ++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 81 deletions(-) (limited to 'tex/context/base/mkiv/page-cst.lua') diff --git a/tex/context/base/mkiv/page-cst.lua b/tex/context/base/mkiv/page-cst.lua index 155d6e8b0..1c2f5fc0b 100644 --- a/tex/context/base/mkiv/page-cst.lua +++ b/tex/context/base/mkiv/page-cst.lua @@ -19,87 +19,86 @@ local trace_cells = false trackers.register("columnsets.cells", function(v) t local report = logs.reporter("column sets") -local setmetatableindex = table.setmetatableindex - -local properties = nodes.properties - -local nodecodes = nodes.nodecodes -local rulecodes = nodes.rulecodes - -local hlist_code = nodecodes.hlist -local vlist_code = nodecodes.vlist -local kern_code = nodecodes.kern -local glue_code = nodecodes.glue -local penalty_code = nodecodes.penalty -local rule_code = nodecodes.rule - -local nuts = nodes.nuts -local tonode = nuts.tonode -local tonut = nuts.tonut - -local hpack = nuts.hpack -local vpack = nuts.vpack -local flushlist = nuts.flush_list ------ removenode = nuts.remove - -local setlink = nuts.setlink -local setlist = nuts.setlist -local setnext = nuts.setnext -local setprev = nuts.setprev -local setsubtype = nuts.setsubtype -local setbox = nuts.setbox -local getwhd = nuts.getwhd -local setwhd = nuts.setwhd -local getkern = nuts.getkern -local getpenalty = nuts.getpenalty -local getwidth = nuts.getwidth -local getheight = nuts.getheight - -local getnext = nuts.getnext -local getprev = nuts.getprev -local getid = nuts.getid -local getlist = nuts.getlist -local getsubtype = nuts.getsubtype -local takebox = nuts.takebox -local takelist = nuts.takelist -local splitbox = nuts.splitbox -local getattribute = nuts.getattribute -local copylist = nuts.copy_list - -local getbox = nuts.getbox -local getcount = tex.getcount -local getdimen = tex.getdimen - -local texsetbox = tex.setbox -local texsetcount = tex.setcount -local texsetdimen = tex.setdimen - -local theprop = nuts.theprop - -local nodepool = nuts.pool - -local new_vlist = nodepool.vlist -local new_trace_rule = nodepool.rule -local new_empty_rule = nodepool.emptyrule - -local context = context -local implement = interfaces.implement - -local variables = interfaces.variables -local v_here = variables.here -local v_fixed = variables.fixed -local v_top = variables.top -local v_bottom = variables.bottom -local v_repeat = variables["repeat"] -local v_yes = variables.yes -local v_page = variables.page -local v_first = variables.first -local v_last = variables.last ------ v_wide = variables.wide - -pagebuilders = pagebuilders or { } -- todo: pages.builders -pagebuilders.columnsets = pagebuilders.columnsets or { } -local columnsets = pagebuilders.columnsets +local setmetatableindex = table.setmetatableindex + +local properties = nodes.properties + +local nodecodes = nodes.nodecodes + +local hlist_code = nodecodes.hlist +local vlist_code = nodecodes.vlist +local kern_code = nodecodes.kern +local glue_code = nodecodes.glue +local penalty_code = nodecodes.penalty +local rule_code = nodecodes.rule + +local nuts = nodes.nuts +local tonode = nuts.tonode +local tonut = nuts.tonut + +local hpack = nuts.hpack +local vpack = nuts.vpack +local flushlist = nuts.flush_list +----- removenode = nuts.remove + +local setlink = nuts.setlink +local setlist = nuts.setlist +local setnext = nuts.setnext +local setprev = nuts.setprev +local setsubtype = nuts.setsubtype +local setbox = nuts.setbox +local getwhd = nuts.getwhd +local setwhd = nuts.setwhd +local getkern = nuts.getkern +local getpenalty = nuts.getpenalty +local getwidth = nuts.getwidth +local getheight = nuts.getheight + +local getnext = nuts.getnext +local getprev = nuts.getprev +local getid = nuts.getid +local getlist = nuts.getlist +local getsubtype = nuts.getsubtype +local takebox = nuts.takebox +local takelist = nuts.takelist +local splitbox = nuts.splitbox +local getattribute = nuts.getattribute +local copylist = nuts.copy_list + +local getbox = nuts.getbox +local getcount = tex.getcount +local getdimen = tex.getdimen + +local texsetbox = tex.setbox +local texsetcount = tex.setcount +local texsetdimen = tex.setdimen + +local theprop = nuts.theprop + +local nodepool = nuts.pool + +local new_vlist = nodepool.vlist +local new_trace_rule = nodepool.rule +local new_empty_rule = nodepool.emptyrule + +local context = context +local implement = interfaces.implement + +local variables = interfaces.variables +local v_here = variables.here +local v_fixed = variables.fixed +local v_top = variables.top +local v_bottom = variables.bottom +local v_repeat = variables["repeat"] +local v_yes = variables.yes +local v_page = variables.page +local v_first = variables.first +local v_last = variables.last +----- v_wide = variables.wide + +pagebuilders = pagebuilders or { } -- todo: pages.builders +pagebuilders.columnsets = pagebuilders.columnsets or { } +local columnsets = pagebuilders.columnsets local data = { [""] = { } } -- cgit v1.2.3