diff options
author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-07-22 22:33:21 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-07-22 22:33:21 +0200 |
commit | dd7c4b1a54bfc5e358eb9f766c0b865fc47cbe46 (patch) | |
tree | 2e8888da6188eb742a98c3c05a26e2b75b198e62 /tex/context/base/mkiv/page-str.lua | |
parent | 50928735daee408de73737b055b2535d96424824 (diff) | |
download | context-dd7c4b1a54bfc5e358eb9f766c0b865fc47cbe46.tar.gz |
2016-07-22 20:13:00
Diffstat (limited to 'tex/context/base/mkiv/page-str.lua')
-rw-r--r-- | tex/context/base/mkiv/page-str.lua | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tex/context/base/mkiv/page-str.lua b/tex/context/base/mkiv/page-str.lua index 164fc7051..a254e9d7d 100644 --- a/tex/context/base/mkiv/page-str.lua +++ b/tex/context/base/mkiv/page-str.lua @@ -8,7 +8,7 @@ if not modules then modules = { } end modules ['page-str'] = { -- streams -> managers.streams --- work in progresss .. unfinished +-- work in progresss .. unfinished .. non-optimized local concat, insert, remove = table.concat, table.insert, table.remove @@ -20,11 +20,11 @@ local implement = interfaces.implement local nodecodes = nodes.nodecodes -local slide_nodelist = node.slide -local write_node = node.write -local free_node = node.free -local copy_nodelist = node.copy_list -local vpack_nodelist = node.vpack +local slide_node_list = nodes.slide +local write_node = nodes.write +local flush_node = nodes.flush +local copy_node_list = nodes.copy_list +local vpack_node_list = nodes.vpack local settings_to_array = utilities.parsers.settings_to_array @@ -72,7 +72,7 @@ function streams.collect(head,where) end local last = dana[#dana] if last then - local tail = slide_nodelist(last) + local tail = slide_node_list(last) tail.next, head.prev = head, tail elseif last == false then dana[#dana] = head @@ -116,7 +116,7 @@ function streams.flush(name,copy) -- problem: we need to migrate afterwards for i=1,dn do local di = dana[i] if di then - write_node(copy_nodelist(di.list)) -- list, will be option + write_node(copy_node_list(di.list)) -- list, will be option end end if copy then @@ -131,7 +131,7 @@ function streams.flush(name,copy) -- problem: we need to migrate afterwards if di then write_node(di.list) -- list, will be option di.list = nil - free_node(di) + flush_node(di) end end end @@ -164,7 +164,7 @@ function streams.synchronize(list) -- this is an experiment ! local dana = data[name] local slot = dana[m] if slot then - local vbox = vpack_nodelist(slot) + local vbox = vpack_node_list(slot) local ht, dp = vbox.height, vbox.depth if ht > height then height = ht @@ -201,11 +201,11 @@ function streams.synchronize(list) -- this is an experiment ! else -- this is not yet ok as we also need to keep an eye on vertical spacing -- so we might need to do some splitting or whatever - local tail = vbox.list and slide_nodelist(vbox.list) + local tail = vbox.list and slide_node_list(vbox.list) local n, delta = 0, delta_height -- for tracing while delta > 0 do -- we need to add some interline penalties - local line = copy_nodelist(texgetbox("strutbox")) + local line = copy_node_list(texgetbox("strutbox")) line.height, line.depth = strutht, strutdp if tail then tail.next, line.prev = line, tail @@ -213,9 +213,9 @@ function streams.synchronize(list) -- this is an experiment ! tail = line n, delta = n +1, delta - struthtdp end - dana[m] = vpack_nodelist(vbox.list) + dana[m] = vpack_node_list(vbox.list) vbox.list = nil - free_node(vbox) + flush_node(vbox) if trace_flushing then report_streams("slot %s:%s with delta (%p,%p) is compensated by %s lines",m,i,delta_height,delta_depth,n) end |