2019-06-20 18:53:00

2 files changed, 2 insertions, 80 deletions

diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 2b996829e..418b9d69d 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -12,7 +12,7 @@ end
 
 -- Don't depend on code here as it is only needed to complement the font handler
 -- code. I will move some to another namespace as I don't see other macro packages
--- use the context logic. It's a subset anyway.
+-- use the context logic. It's a subset anyway. More will be stripped.
 
 -- Attributes:
 
@@ -73,75 +73,6 @@ nodes.disccodes    = disccodes
 nodes.handlers.protectglyphs   = node.protect_glyphs   -- beware: nodes!
 nodes.handlers.unprotectglyphs = node.unprotect_glyphs -- beware: nodes!
 
--- These are now gone in generic as they are context specific.
-
--- local flush_node   = node.flush_node
--- local remove_node  = node.remove
--- local traverse_id  = node.traverse_id
---
--- function nodes.remove(head, current, free_too)
---    local t = current
---    head, current = remove_node(head,current)
---    if t then
---         if free_too then
---             flush_node(t)
---             t = nil
---         else
---             t.next, t.prev = nil, nil
---         end
---    end
---    return head, current, t
--- end
---
--- function nodes.delete(head,current)
---     return nodes.remove(head,current,true)
--- end
-
------ getfield = node.getfield
------ setfield = node.setfield
-
------.getfield = getfield
------.setfield = setfield
------.getattr  = getfield
------.setattr  = setfield
-
------.tostring             = node.tostring or tostring
------.copy                 = node.copy
------.copy_node            = node.copy
------.copy_list            = node.copy_list
------.delete               = node.delete
------.dimensions           = node.dimensions
------.end_of_math          = node.end_of_math
------.flush_list           = node.flush_list
------.flush_node           = node.flush_node
------.flush                = node.flush_node
------.free                 = node.free
------.insert_after         = node.insert_after
------.insert_before        = node.insert_before
------.hpack                = node.hpack
------.new                  = node.new
------.tail                 = node.tail
------.traverse             = node.traverse
------.traverse_id          = node.traverse_id
------.slide                = node.slide
------.vpack                = node.vpack
-
------.first_glyph          = node.first_glyph
------.has_glyph            = node.has_glyph or node.first_glyph
------.current_attr         = node.current_attr
------.has_field            = node.has_field
------.usedlist             = node.usedlist
------.protrusion_skippable = node.protrusion_skippable
------.write                = node.write
-
------.has_attribute        = node.has_attribute
------.set_attribute        = node.set_attribute
------.unset_attribute      = node.unset_attribute
-
------.protect_glyphs       = node.protect_glyphs
------.unprotect_glyphs     = node.unprotect_glyphs
------.mlist_to_hlist       = node.mlist_to_hlist
-
 -- in generic code, at least for some time, we stay nodes, while in context
 -- we can go nuts (e.g. experimental); this split permits us us keep code
 -- used elsewhere stable but at the same time play around in context
@@ -166,16 +97,12 @@ nuts.getattr             = direct.get_attribute
 nuts.getboth             = direct.getboth
 nuts.getchar             = direct.getchar
 nuts.getcomponents       = direct.getcomponents
-----.getdepth            = direct.getdepth
-----.getdir              = direct.getdir
 nuts.getdirection        = direct.getdirection
 nuts.getdisc             = direct.getdisc
 nuts.getfield            = direct.getfield
 nuts.getfont             = direct.getfont
-----.getheight           = direct.getheight
 nuts.getid               = direct.getid
 nuts.getkern             = direct.getkern
-----.getleader           = direct.getleader
 nuts.getlist             = direct.getlist
 nuts.getnext             = direct.getnext
 nuts.getoffsets          = direct.getoffsets
@@ -186,15 +113,10 @@ nuts.setattr             = direct.setfield
 nuts.setboth             = direct.setboth
 nuts.setchar             = direct.setchar
 nuts.setcomponents       = direct.setcomponents
-----.setdepth            = direct.setdepth
-----.setdir              = direct.setdir
 nuts.setdirection        = direct.setdirection
 nuts.setdisc             = direct.setdisc
 nuts.setfield            = setfield
-----.setfont             = direct.setfont
-----.setheight           = direct.setheight
 nuts.setkern             = direct.setkern
-----.setleader           = direct.setleader
 nuts.setlink             = direct.setlink
 nuts.setlist             = direct.setlist
 nuts.setnext             = direct.setnext
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 252742e9f..b72b1a888 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 06/14/19 17:49:06
+-- merge date  : 06/20/19 18:47:00
 
 do -- begin closure to overcome local limits and interference