2018-12-28 11:09:00

1 files changed, 263 insertions, 263 deletions

diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 8d59b474b..7da84980e 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -19,7 +19,7 @@ if not modules then modules = { } end modules ['math-noa'] = {
 -- 20D6 -> 2190
 -- 20D7 -> 2192
 
--- todo: most is math_char so we can have simple dedicated loops
+-- todo: most is mathchar_code so we can have simple dedicated loops
 
 -- nota bene: uunderdelimiter uoverdelimiter etc are radicals (we have 5 types)
 
@@ -31,184 +31,184 @@ local insert, remove = table.insert, table.remove
 local div = math.div
 local bor, band = bit32.bor, bit32.band
 
-local fonts                = fonts
-local nodes                = nodes
-local node                 = node
-local mathematics          = mathematics
-local context              = context
-
-local otf                  = fonts.handlers.otf
-local otffeatures          = fonts.constructors.features.otf
-local registerotffeature   = otffeatures.register
-
-local privateattribute     = attributes.private
-local registertracker      = trackers.register
-local registerdirective    = directives.register
-local logreporter          = logs.reporter
-local setmetatableindex    = table.setmetatableindex
-
-local colortracers         = nodes.tracers.colors
-
-local trace_remapping      = false  registertracker("math.remapping",   function(v) trace_remapping   = v end)
-local trace_processing     = false  registertracker("math.processing",  function(v) trace_processing  = v end)
-local trace_analyzing      = false  registertracker("math.analyzing",   function(v) trace_analyzing   = v end)
-local trace_normalizing    = false  registertracker("math.normalizing", function(v) trace_normalizing = v end)
-local trace_collapsing     = false  registertracker("math.collapsing",  function(v) trace_collapsing  = v end)
-local trace_fixing         = false  registertracker("math.fixing",      function(v) trace_foxing      = v end)
-local trace_patching       = false  registertracker("math.patching",    function(v) trace_patching    = v end)
-local trace_goodies        = false  registertracker("math.goodies",     function(v) trace_goodies     = v end)
-local trace_variants       = false  registertracker("math.variants",    function(v) trace_variants    = v end)
-local trace_alternates     = false  registertracker("math.alternates",  function(v) trace_alternates  = v end)
-local trace_italics        = false  registertracker("math.italics",     function(v) trace_italics     = v end)
-local trace_kernpairs      = false  registertracker("math.kernpairs",   function(v) trace_kernpairs   = v end)
-local trace_domains        = false  registertracker("math.domains",     function(v) trace_domains     = v end)
-local trace_families       = false  registertracker("math.families",    function(v) trace_families    = v end)
-local trace_fences         = false  registertracker("math.fences",      function(v) trace_fences      = v end)
-local trace_unstacking     = false  registertracker("math.unstack",     function(v) trace_unstacking  = v end)
-
-local check_coverage       = true   registerdirective("math.checkcoverage",  function(v) check_coverage  = v end)
-
-local report_processing    = logreporter("mathematics","processing")
-local report_remapping     = logreporter("mathematics","remapping")
-local report_normalizing   = logreporter("mathematics","normalizing")
-local report_collapsing    = logreporter("mathematics","collapsing")
-local report_fixing        = logreporter("mathematics","fixing")
-local report_patching      = logreporter("mathematics","patching")
-local report_goodies       = logreporter("mathematics","goodies")
-local report_variants      = logreporter("mathematics","variants")
-local report_alternates    = logreporter("mathematics","alternates")
-local report_italics       = logreporter("mathematics","italics")
-local report_kernpairs     = logreporter("mathematics","kernpairs")
-local report_domains       = logreporter("mathematics","domains")
-local report_families      = logreporter("mathematics","families")
-local report_fences        = logreporter("mathematics","fences")
-local report_unstacking    = logreporter("mathematics","unstack")
-
-local a_mathrendering      = privateattribute("mathrendering")
-local a_exportstatus       = privateattribute("exportstatus")
-
-local nuts                 = nodes.nuts
-local nodepool             = nuts.pool
-local tonut                = nuts.tonut
-local nutstring            = nuts.tostring
-
-local setfield             = nuts.setfield
-local setlink              = nuts.setlink
-local setlist              = nuts.setlist
-local setnext              = nuts.setnext
-local setprev              = nuts.setprev
-local setchar              = nuts.setchar
-local setfam               = nuts.setfam
-local setsubtype           = nuts.setsubtype
-local setattr              = nuts.setattr
-local setattrlist          = nuts.setattrlist
-local setwidth             = nuts.setwidth
-local setheight            = nuts.setheight
-local setdepth             = nuts.setdepth
-
-local getfield             = nuts.getfield
-local getnext              = nuts.getnext
-local getprev              = nuts.getprev
-local getboth              = nuts.getboth
-local getid                = nuts.getid
-local getsubtype           = nuts.getsubtype
-local getchar              = nuts.getchar
-local getfont              = nuts.getfont
-local getfam               = nuts.getfam
-local getattr              = nuts.getattr
-local getlist              = nuts.getlist
-local getwidth             = nuts.getwidth
-local getheight            = nuts.getheight
-local getdepth             = nuts.getdepth
-
-local getnucleus           = nuts.getnucleus
-local getsub               = nuts.getsub
-local getsup               = nuts.getsup
-
-local setnucleus           = nuts.setnucleus
-local setsub               = nuts.setsub
-local setsup               = nuts.setsup
-
-local flush_node           = nuts.flush
-local copy_node            = nuts.copy
-local slide_nodes          = nuts.slide
-local set_visual           = nuts.setvisual
-
-local mlist_to_hlist       = nodes.mlist_to_hlist
-
-local font_of_family       = node.family_font
-
-local new_kern             = nodepool.kern
-local new_submlist         = nodepool.submlist
-local new_noad             = nodepool.noad
-local new_delimiter        = nodepool.delimiter
-local new_fence            = nodepool.fence
-
-local fonthashes           = fonts.hashes
-local fontdata             = fonthashes.identifiers
-local fontcharacters       = fonthashes.characters
-local fontitalics          = fonthashes.italics
-
-local variables            = interfaces.variables
-local texsetattribute      = tex.setattribute
-local texgetattribute      = tex.getattribute
-local unsetvalue           = attributes.unsetvalue
-local implement            = interfaces.implement
-
-local v_reset              = variables.reset
-
-local chardata             = characters.data
-
-noads                      = noads or { }  -- todo: only here
-local noads                = noads
-
-noads.processors           = noads.processors or { }
-local processors           = noads.processors
-
-noads.handlers             = noads.handlers   or { }
-local handlers             = noads.handlers
-
-local tasks                = nodes.tasks
-local enableaction         = tasks.enableaction
-local setaction            = tasks.setaction
-
-local nodecodes            = nodes.nodecodes
-local noadcodes            = nodes.noadcodes
-local fencecodes           = nodes.fencecodes
-
-local noad_ord             = noadcodes.ord
-local noad_rel             = noadcodes.rel
-local noad_bin             = noadcodes.bin
-local noad_open            = noadcodes.open
-local noad_close           = noadcodes.close
-local noad_punct           = noadcodes.punct
-local noad_opdisplaylimits = noadcodes.opdisplaylimits
-local noad_oplimits        = noadcodes.oplimits
-local noad_opnolimits      = noadcodes.opnolimits
-local noad_inner           = noadcodes.inner
-
-local math_noad            = nodecodes.noad           -- attr nucleus sub sup
-local math_accent          = nodecodes.accent         -- attr nucleus sub sup accent
-local math_radical         = nodecodes.radical        -- attr nucleus sub sup left degree
-local math_fraction        = nodecodes.fraction       -- attr nucleus sub sup left right
-local math_subbox          = nodecodes.subbox         -- attr list
-local math_submlist        = nodecodes.submlist       -- attr list
-local math_char            = nodecodes.mathchar       -- attr fam char
-local math_textchar        = nodecodes.mathtextchar   -- attr fam char
-local math_delim           = nodecodes.delim          -- attr small_fam small_char large_fam large_char
------ math_style           = nodecodes.style          -- attr style
-local math_choice          = nodecodes.choice         -- attr display text script scriptscript
-local math_fence           = nodecodes.fence          -- attr subtype
-
-local left_fence_code      = fencecodes.left
-local middle_fence_code    = fencecodes.middle
-local right_fence_code     = fencecodes.right
+local fonts              = fonts
+local nodes              = nodes
+local node               = node
+local mathematics        = mathematics
+local context            = context
+
+local otf                = fonts.handlers.otf
+local otffeatures        = fonts.constructors.features.otf
+local registerotffeature = otffeatures.register
+
+local privateattribute   = attributes.private
+local registertracker    = trackers.register
+local registerdirective  = directives.register
+local logreporter        = logs.reporter
+local setmetatableindex  = table.setmetatableindex
+
+local colortracers       = nodes.tracers.colors
+
+local trace_remapping    = false  registertracker("math.remapping",   function(v) trace_remapping   = v end)
+local trace_processing   = false  registertracker("math.processing",  function(v) trace_processing  = v end)
+local trace_analyzing    = false  registertracker("math.analyzing",   function(v) trace_analyzing   = v end)
+local trace_normalizing  = false  registertracker("math.normalizing", function(v) trace_normalizing = v end)
+local trace_collapsing   = false  registertracker("math.collapsing",  function(v) trace_collapsing  = v end)
+local trace_fixing       = false  registertracker("math.fixing",      function(v) trace_foxing      = v end)
+local trace_patching     = false  registertracker("math.patching",    function(v) trace_patching    = v end)
+local trace_goodies      = false  registertracker("math.goodies",     function(v) trace_goodies     = v end)
+local trace_variants     = false  registertracker("math.variants",    function(v) trace_variants    = v end)
+local trace_alternates   = false  registertracker("math.alternates",  function(v) trace_alternates  = v end)
+local trace_italics      = false  registertracker("math.italics",     function(v) trace_italics     = v end)
+local trace_kernpairs    = false  registertracker("math.kernpairs",   function(v) trace_kernpairs   = v end)
+local trace_domains      = false  registertracker("math.domains",     function(v) trace_domains     = v end)
+local trace_families     = false  registertracker("math.families",    function(v) trace_families    = v end)
+local trace_fences       = false  registertracker("math.fences",      function(v) trace_fences      = v end)
+local trace_unstacking   = false  registertracker("math.unstack",     function(v) trace_unstacking  = v end)
+
+local check_coverage     = true   registerdirective("math.checkcoverage",  function(v) check_coverage  = v end)
+
+local report_processing  = logreporter("mathematics","processing")
+local report_remapping   = logreporter("mathematics","remapping")
+local report_normalizing = logreporter("mathematics","normalizing")
+local report_collapsing  = logreporter("mathematics","collapsing")
+local report_fixing      = logreporter("mathematics","fixing")
+local report_patching    = logreporter("mathematics","patching")
+local report_goodies     = logreporter("mathematics","goodies")
+local report_variants    = logreporter("mathematics","variants")
+local report_alternates  = logreporter("mathematics","alternates")
+local report_italics     = logreporter("mathematics","italics")
+local report_kernpairs   = logreporter("mathematics","kernpairs")
+local report_domains     = logreporter("mathematics","domains")
+local report_families    = logreporter("mathematics","families")
+local report_fences      = logreporter("mathematics","fences")
+local report_unstacking  = logreporter("mathematics","unstack")
+
+local a_mathrendering    = privateattribute("mathrendering")
+local a_exportstatus     = privateattribute("exportstatus")
+
+local nuts               = nodes.nuts
+local nodepool           = nuts.pool
+local tonut              = nuts.tonut
+local nutstring          = nuts.tostring
+
+local setfield           = nuts.setfield
+local setlink            = nuts.setlink
+local setlist            = nuts.setlist
+local setnext            = nuts.setnext
+local setprev            = nuts.setprev
+local setchar            = nuts.setchar
+local setfam             = nuts.setfam
+local setsubtype         = nuts.setsubtype
+local setattr            = nuts.setattr
+local setattrlist        = nuts.setattrlist
+local setwidth           = nuts.setwidth
+local setheight          = nuts.setheight
+local setdepth           = nuts.setdepth
+
+local getfield           = nuts.getfield
+local getnext            = nuts.getnext
+local getprev            = nuts.getprev
+local getboth            = nuts.getboth
+local getid              = nuts.getid
+local getsubtype         = nuts.getsubtype
+local getchar            = nuts.getchar
+local getfont            = nuts.getfont
+local getfam             = nuts.getfam
+local getattr            = nuts.getattr
+local getlist            = nuts.getlist
+local getwidth           = nuts.getwidth
+local getheight          = nuts.getheight
+local getdepth           = nuts.getdepth
+
+local getnucleus         = nuts.getnucleus
+local getsub             = nuts.getsub
+local getsup             = nuts.getsup
+
+local setnucleus         = nuts.setnucleus
+local setsub             = nuts.setsub
+local setsup             = nuts.setsup
+
+local flush_node         = nuts.flush
+local copy_node          = nuts.copy
+local slide_nodes        = nuts.slide
+local set_visual         = nuts.setvisual
+
+local mlist_to_hlist     = nodes.mlist_to_hlist
+
+local font_of_family     = node.family_font
+
+local new_kern           = nodepool.kern
+local new_submlist       = nodepool.submlist
+local new_noad           = nodepool.noad
+local new_delimiter      = nodepool.delimiter
+local new_fence          = nodepool.fence
+
+local fonthashes         = fonts.hashes
+local fontdata           = fonthashes.identifiers
+local fontcharacters     = fonthashes.characters
+local fontitalics        = fonthashes.italics
+
+local variables          = interfaces.variables
+local texsetattribute    = tex.setattribute
+local texgetattribute    = tex.getattribute
+local unsetvalue         = attributes.unsetvalue
+local implement          = interfaces.implement
+
+local v_reset            = variables.reset
+
+local chardata           = characters.data
+
+noads                    = noads or { }  -- todo: only here
+local noads              = noads
+
+noads.processors         = noads.processors or { }
+local processors         = noads.processors
+
+noads.handlers           = noads.handlers   or { }
+local handlers           = noads.handlers
+
+local tasks              = nodes.tasks
+local enableaction       = tasks.enableaction
+local setaction          = tasks.setaction
+
+local nodecodes          = nodes.nodecodes
+local noadcodes          = nodes.noadcodes
+local fencecodes         = nodes.fencecodes
+
+local ordnoad_code             = noadcodes.ord
+local relnode_code             = noadcodes.rel
+local binnoad_code             = noadcodes.bin
+local opennoad_code            = noadcodes.open
+local closenoad_code           = noadcodes.close
+local punctnoad_code           = noadcodes.punct
+local opdisplaylimitsnoad_code = noadcodes.opdisplaylimits
+local oplimitsnoad_code        = noadcodes.oplimits
+local opnolimitsnoad_code      = noadcodes.opnolimits
+local innernoad_code           = noadcodes.inner
+
+local noad_code          = nodecodes.noad           -- attr nucleus sub sup
+local accent_code        = nodecodes.accent         -- attr nucleus sub sup accent
+local radical_code       = nodecodes.radical        -- attr nucleus sub sup left degree
+local fraction_code      = nodecodes.fraction       -- attr nucleus sub sup left right
+local subbox_code        = nodecodes.subbox         -- attr list
+local submlist_code      = nodecodes.submlist       -- attr list
+local mathchar_code      = nodecodes.mathchar       -- attr fam char
+local mathtextchar_code  = nodecodes.mathtextchar   -- attr fam char
+local delim_code         = nodecodes.delim          -- attr small_fam small_char large_fam large_char
+----- style_code         = nodecodes.style          -- attr style
+local math_choice        = nodecodes.choice         -- attr display text script scriptscript
+local fence_code         = nodecodes.fence          -- attr subtype
+
+local leftfence_code     = fencecodes.left
+local middlefence_code   = fencecodes.middle
+local rightfence_code    = fencecodes.right
 
 -- local mathclasses          = mathematics.classes
 -- local fenceclasses         = {
---     [left_fence_code]   = mathclasses.open,
---     [middle_fence_code] = mathclasses.middle,
---     [right_fence_code]  = mathclasses.close,
+--     [leftfence_code]   = mathclasses.open,
+--     [middlefence_code] = mathclasses.middle,
+--     [rightfence_code]  = mathclasses.close,
 -- }
 
 -- this initial stuff is tricky as we can have removed and new nodes with the same address
@@ -232,9 +232,9 @@ local function process(start,what,n,parent)
     while start do
         local id = getid(start)
         if trace_processing then
-            if id == math_noad then
+            if id == noad_code then
                 report_processing("%w%S, class %a",n*2,nutstring(start),noadcodes[getsubtype(start)])
-            elseif id == math_char then
+            elseif id == mathchar_code then
                 local char = getchar(start)
                 local font = getfont(start)
                 local fam  = getfam(start)
@@ -264,16 +264,16 @@ local function process(start,what,n,parent)
                  -- report_processing("stop processing")
                 end
             end
-        elseif id == math_noad then
+        elseif id == noad_code then
             -- single characters are like this
             local noad = getnucleus(start)              if noad then process(noad,what,n,start) end -- list
                   noad = getsup    (start)              if noad then process(noad,what,n,start) end -- list
                   noad = getsub    (start)              if noad then process(noad,what,n,start) end -- list
-        elseif id == math_char or id == math_textchar or id == math_delim then
+        elseif id == mathchar_code or id == mathtextchar_code or id == delim_code then
             break
-        elseif id == math_subbox or id == math_submlist then
+        elseif id == subbox_code or id == submlist_code then
             local noad = getlist(start)                 if noad then process(noad,what,n,start) end -- list (not getlist !)
-        elseif id == math_fraction then
+        elseif id == fraction_code then
             local noad = getfield(start,"num")          if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"denom")        if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"left")         if noad then process(noad,what,n,start) end -- delimiter
@@ -283,21 +283,21 @@ local function process(start,what,n,parent)
                   noad = getfield(start,"text")         if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"script")       if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"scriptscript") if noad then process(noad,what,n,start) end -- list
-        elseif id == math_fence then
+        elseif id == fence_code then
             local noad = getfield(start,"delim")        if noad then process(noad,what,n,start) end -- delimiter
-        elseif id == math_radical then
+        elseif id == radical_code then
             local noad = getnucleus(start)              if noad then process(noad,what,n,start) end -- list
                   noad = getsup    (start)              if noad then process(noad,what,n,start) end -- list
                   noad = getsub    (start)              if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"left")         if noad then process(noad,what,n,start) end -- delimiter
                   noad = getfield(start,"degree")       if noad then process(noad,what,n,start) end -- list
-        elseif id == math_accent then
+        elseif id == accent_code then
             local noad = getnucleus(start)              if noad then process(noad,what,n,start) end -- list
                   noad = getsup    (start)              if noad then process(noad,what,n,start) end -- list
                   noad = getsub    (start)              if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"accent")       if noad then process(noad,what,n,start) end -- list
                   noad = getfield(start,"bot_accent")   if noad then process(noad,what,n,start) end -- list
-     -- elseif id == math_style then
+     -- elseif id == style_code then
      --     -- has a next
      -- else
      --     -- glue, penalty, etc
@@ -312,13 +312,13 @@ end
 local function processnested(current,what,n)
     local noad = nil
     local id   = getid(current)
-    if id == math_noad then
+    if id == noad_code then
         noad = getnucleus(current)              if noad then process(noad,what,n,current) end -- list
         noad = getsup    (current)              if noad then process(noad,what,n,current) end -- list
         noad = getsub    (current)              if noad then process(noad,what,n,current) end -- list
-    elseif id == math_subbox or id == math_submlist then
+    elseif id == subbox_code or id == submlist_code then
         noad = getlist(current)                 if noad then process(noad,what,n,current) end -- list (not getlist !)
-    elseif id == math_fraction then
+    elseif id == fraction_code then
         noad = getfield(current,"num")          if noad then process(noad,what,n,current) end -- list
         noad = getfield(current,"denom")        if noad then process(noad,what,n,current) end -- list
         noad = getfield(current,"left")         if noad then process(noad,what,n,current) end -- delimiter
@@ -328,15 +328,15 @@ local function processnested(current,what,n)
         noad = getfield(current,"text")         if noad then process(noad,what,n,current) end -- list
         noad = getfield(current,"script")       if noad then process(noad,what,n,current) end -- list
         noad = getfield(current,"scriptscript") if noad then process(noad,what,n,current) end -- list
-    elseif id == math_fence then
+    elseif id == fence_code then
         noad = getfield(current,"delim")        if noad then process(noad,what,n,current) end -- delimiter
-    elseif id == math_radical then
+    elseif id == radical_code then
         noad = getnucleus(current)              if noad then process(noad,what,n,current) end -- list
         noad = getsup    (current)              if noad then process(noad,what,n,current) end -- list
         noad = getsub    (current)              if noad then process(noad,what,n,current) end -- list
         noad = getfield(current,"left")         if noad then process(noad,what,n,current) end -- delimiter
         noad = getfield(current,"degree")       if noad then process(noad,what,n,current) end -- list
-    elseif id == math_accent then
+    elseif id == accent_code then
         noad = getnucleus(current)              if noad then process(noad,what,n,current) end -- list
         noad = getsup    (current)              if noad then process(noad,what,n,current) end -- list
         noad = getsub    (current)              if noad then process(noad,what,n,current) end -- list
@@ -348,13 +348,13 @@ end
 local function processstep(current,process,n,id)
     local noad = nil
     local id   = id or getid(current)
-    if id == math_noad then
+    if id == noad_code then
         noad = getnucleus(current)              if noad then process(noad,n,current) end -- list
         noad = getsup    (current)              if noad then process(noad,n,current) end -- list
         noad = getsub    (current)              if noad then process(noad,n,current) end -- list
-    elseif id == math_subbox or id == math_submlist then
+    elseif id == subbox_code or id == submlist_code then
         noad = getlist(current)                 if noad then process(noad,n,current) end -- list (not getlist !)
-    elseif id == math_fraction then
+    elseif id == fraction_code then
         noad = getfield(current,"num")          if noad then process(noad,n,current) end -- list
         noad = getfield(current,"denom")        if noad then process(noad,n,current) end -- list
         noad = getfield(current,"left")         if noad then process(noad,n,current) end -- delimiter
@@ -364,15 +364,15 @@ local function processstep(current,process,n,id)
         noad = getfield(current,"text")         if noad then process(noad,n,current) end -- list
         noad = getfield(current,"script")       if noad then process(noad,n,current) end -- list
         noad = getfield(current,"scriptscript") if noad then process(noad,n,current) end -- list
-    elseif id == math_fence then
+    elseif id == fence_code then
         noad = getfield(current,"delim")        if noad then process(noad,n,current) end -- delimiter
-    elseif id == math_radical then
+    elseif id == radical_code then
         noad = getnucleus(current)              if noad then process(noad,n,current) end -- list
         noad = getsup    (current)              if noad then process(noad,n,current) end -- list
         noad = getsub    (current)              if noad then process(noad,n,current) end -- list
         noad = getfield(current,"left")         if noad then process(noad,n,current) end -- delimiter
         noad = getfield(current,"degree")       if noad then process(noad,n,current) end -- list
-    elseif id == math_accent then
+    elseif id == accent_code then
         noad = getnucleus(current)              if noad then process(noad,n,current) end -- list
         noad = getsup    (current)              if noad then process(noad,n,current) end -- list
         noad = getsub    (current)              if noad then process(noad,n,current) end -- list
@@ -463,7 +463,7 @@ do
         "pseudobold",
     }
 
-    families[math_fraction] = function(pointer,what,n,parent)
+    families[fraction_code] = function(pointer,what,n,parent)
         local a = getattr(pointer,a_mathfamily)
         if a and a >= 0 then
             if a > 0 then
@@ -477,7 +477,7 @@ do
         processnested(pointer,families,n+1)
     end
 
-    families[math_noad] = function(pointer,what,n,parent)
+    families[noad_code] = function(pointer,what,n,parent)
         local a = getattr(pointer,a_mathfamily)
         if a and a >= 0 then
             if a > 0 then
@@ -491,7 +491,7 @@ do
         processnested(pointer,families,n+1)
     end
 
-    families[math_char] = function(pointer)
+    families[mathchar_code] = function(pointer)
         if getfam(pointer) == 0 then
             local a = getattr(pointer,a_mathfamily)
             if a and a > 0 then
@@ -536,7 +536,7 @@ do
             end
         end
     end
-    families[math_delim] = function(pointer)
+    families[delim_code] = function(pointer)
         if getfield(pointer,"small_fam") == 0 then
             local a = getattr(pointer,a_mathfamily)
             if a and a > 0 then
@@ -568,7 +568,7 @@ do
 
     -- will become:
 
-    -- families[math_delim] = function(pointer)
+    -- families[delim_code] = function(pointer)
     --     if getfam(pointer) == 0 then
     --         local a = getattr(pointer,a_mathfamily)
     --         if a and a > 0 then
@@ -590,7 +590,7 @@ do
     --     end
     -- end
 
-    families[math_textchar] = families[math_char]
+    families[mathtextchar_code] = families[mathchar_code]
 
     function handlers.families(head,style,penalties)
         processnoads(head,families,"families")
@@ -638,7 +638,7 @@ do
         end
     end
 
-    relocate[math_char] = function(pointer)
+    relocate[mathchar_code] = function(pointer)
         local g          = getattr(pointer,a_mathgreek) or 0
         local a          = getattr(pointer,a_mathalphabet) or 0
         local char       = getchar(pointer)
@@ -705,13 +705,13 @@ do
         end
     end
 
-    relocate[math_textchar] = function(pointer)
+    relocate[mathtextchar_code] = function(pointer)
         if trace_analyzing then
             setnodecolor(pointer,"font:init")
         end
     end
 
-    relocate[math_delim] = function(pointer)
+    relocate[delim_code] = function(pointer)
         if trace_analyzing then
             setnodecolor(pointer,"font:fina")
         end
@@ -732,7 +732,7 @@ do
 
     local rendersets = mathematics.renderings.numbers or { } -- store
 
-    render[math_char] = function(pointer)
+    render[mathchar_code] = function(pointer)
         local attr = getattr(pointer,a_mathrendering)
         if attr and attr > 0 then
             local char = getchar(pointer)
@@ -773,9 +773,9 @@ do
     local a_mathsize  = privateattribute("mathsize") -- this might move into other fence code
     local resize      = { }
 
-    resize[math_fence] = function(pointer)
+    resize[fence_code] = function(pointer)
         local subtype = getsubtype(pointer)
-        if subtype == left_fence_code or subtype == right_fence_code then
+        if subtype == leftfence_code or subtype == rightfence_code then
             local a = getattr(pointer,a_mathsize)
             if a and a > 0 then
                 local method, size = div(a,100), a % 100
@@ -871,7 +871,7 @@ do
     local function makelist(noad,f_o,o_next,c_prev,f_c,middle)
         local list = new_submlist()
         setlist(list,f_o)
-        setsubtype(noad,noad_inner)
+        setsubtype(noad,innernoad_code)
         setnucleus(noad,list)
         setlink(f_o,o_next)
         setlink(c_prev,f_c)
@@ -882,7 +882,7 @@ do
                 local m = middle[current]
                 if m then
                     local next  = getnext(current)
-                    local fence = makefence(middle_fence_code,current)
+                    local fence = makefence(middlefence_code,current)
                     setnucleus(current)
                     flush_node(current)
                     middle[current] = nil
@@ -904,8 +904,8 @@ do
         if o_next == close then
             return close
         else
-            local f_o = makefence(left_fence_code,open)
-            local f_c = makefence(right_fence_code,close)
+            local f_o = makefence(leftfence_code,open)
+            local f_c = makefence(rightfence_code,close)
             makelist(open,f_o,o_next,c_prev,f_c,middle)
             setnucleus(close)
             flush_node(close)
@@ -918,8 +918,8 @@ do
     end
 
     local function convert_open(open,last,middle)
-        local f_o = makefence(left_fence_code,open)
-        local f_c = makefence(right_fence_code)
+        local f_o = makefence(leftfence_code,open)
+        local f_c = makefence(rightfence_code)
         local o_prev, o_next = getboth(open)
         local l_prev, l_next = getboth(last)
         makelist(open,f_o,o_next,last,f_c,middle)
@@ -931,8 +931,8 @@ do
     end
 
     local function convert_close(close,first,middle)
-        local f_o = makefence(left_fence_code)
-        local f_c = makefence(right_fence_code,close)
+        local f_o = makefence(leftfence_code)
+        local f_c = makefence(rightfence_code,close)
         local c_prev = getprev(close)
         makelist(close,f_o,first,c_prev,f_c,middle)
         return close
@@ -950,7 +950,7 @@ do
         local middle  = nil -- todo: use properties
         while current do
             local id = getid(current)
-            if id == math_noad then
+            if id == noad_code then
                 local a = getattr(current,a_autofence)
                 if a and a > 0 then
                     local stack = stacks[n]
@@ -1059,9 +1059,9 @@ do
         local next = getnext(pointer)
         local start_super, stop_super, start_sub, stop_sub
         local mode = "unset"
-        while next and getid(next) == math_noad do
+        while next and getid(next) == noad_code do
             local nextnucleus = getnucleus(next)
-            if nextnucleus and getid(nextnucleus) == math_char and not getsub(next) and not getsup(next) then
+            if nextnucleus and getid(nextnucleus) == mathchar_code and not getsub(next) and not getsup(next) then
                 local char = getchar(nextnucleus)
                 local s = superscripts[char]
                 if s then
@@ -1143,7 +1143,7 @@ do
         -- we could return stop
     end
 
-    unscript[math_char] = replace -- not noads as we need to recurse
+    unscript[mathchar_code] = replace -- not noads as we need to recurse
 
     function handlers.unscript(head,style,penalties)
         processnoads(head,unscript,"unscript")
@@ -1158,7 +1158,7 @@ do
     local enabled   = false
     local a_unstack = privateattribute("mathunstack")
 
-    unstack[math_noad] = function(pointer)
+    unstack[noad_code] = function(pointer)
         if getattr(pointer,a_unstack) then
             local sup = getsup(pointer)
             local sub = getsub(pointer)
@@ -1387,7 +1387,7 @@ do
         arguments = { "integer", "string" }
     }
 
-    alternate[math_char] = function(pointer) -- slow
+    alternate[mathchar_code] = function(pointer) -- slow
         local a = getattr(pointer,a_mathalternate)
         if a and a > 0 then
             setattr(pointer,a_mathalternate,0)
@@ -1535,7 +1535,7 @@ do
 
     end
 
-    italics[math_char] = function(pointer,what,n,parent)
+    italics[mathchar_code] = function(pointer,what,n,parent)
         local method = getattr(pointer,a_mathitalics)
         if method and method > 0 and method < 100 then
             local char = getchar(pointer)
@@ -1663,7 +1663,7 @@ do
 
     -- no correction after prime because that moved to a superscript
 
-    kernpairs[math_char] = function(pointer,what,n,parent)
+    kernpairs[mathchar_code] = function(pointer,what,n,parent)
         if getattr(pointer,a_kernpairs) == 1 then
             local font = getfont(pointer)
             local list = hash[font]
@@ -1672,7 +1672,7 @@ do
                 local found = list[first]
                 if found then
                     local next = getnext(parent)
-                    if next and getid(next) == math_noad then
+                    if next and getid(next) == noad_code then
                         pointer = getnucleus(next)
                         if pointer then
                             if getfont(pointer) == font then
@@ -1710,20 +1710,20 @@ do
     local collapse         = { }
     local mathlists        = characters.mathlists
     local validpair        = {
-        [noad_ord]             = true,
-        [noad_rel]             = true,
-        [noad_bin]             = true, -- new
-        [noad_open]            = true, -- new
-        [noad_close]           = true, -- new
-        [noad_punct]           = true, -- new
-        [noad_opdisplaylimits] = true,
-        [noad_oplimits]        = true,
-        [noad_opnolimits]      = true,
+        [ordnoad_code]             = true,
+        [relnode_code]             = true,
+        [binnoad_code]             = true, -- new
+        [opennoad_code]            = true, -- new
+        [closenoad_code]           = true, -- new
+        [punctnoad_code]           = true, -- new
+        [opdisplaylimitsnoad_code] = true,
+        [oplimitsnoad_code]        = true,
+        [opnolimitsnoad_code]      = true,
     }
 
     local reported = setmetatableindex("table")
 
-    collapse[math_char] = function(pointer,what,n,parent)
+    collapse[mathchar_code] = function(pointer,what,n,parent)
 
         if parent and mathlists[getchar(pointer)] then
             local found, last, lucleus, lsup, lsub, category
@@ -1865,7 +1865,7 @@ do
 
  -- local function movesubscript(parent,current_nucleus,oldchar,newchar)
  --     local prev = getprev(parent)
- --     if prev and getid(prev) == math_noad then
+ --     if prev and getid(prev) == noad_code then
  --         local psup = getsup(prev)
  --         local psub = getsub(prev)
  --         if not psup and not psub then
@@ -1908,7 +1908,7 @@ do
         setnucleus(parent,dummy)
     end
 
-    fixscripts[math_char] = function(pointer,what,n,parent,nested) -- todo: switch to turn in on and off
+    fixscripts[mathchar_code] = function(pointer,what,n,parent,nested) -- todo: switch to turn in on and off
         if parent then
             local oldchar = getchar(pointer)
             local newchar = movesub[oldchar]
@@ -1927,7 +1927,7 @@ do
                         -- print("[char] --- sup")
                     else
                         local prev = getprev(parent)
-                        if prev and getid(prev) == math_noad then
+                        if prev and getid(prev) == noad_code then
                             local psub = getsub(prev)
                             local psup = getsup(prev)
                             if psub then
@@ -1982,14 +1982,14 @@ do
         [0x2ACB] = 0xFE00, [0x2ACC] = 0xFE00,
     }
 
-    variants[math_char] = function(pointer,what,n,parent) -- also set export value
+    variants[mathchar_code] = function(pointer,what,n,parent) -- also set export value
         local char = getchar(pointer)
         local selector = validvariants[char]
         if selector then
             local next = getnext(parent)
-            if next and getid(next) == math_noad then
+            if next and getid(next) == noad_code then
                 local nucleus = getnucleus(next)
-                if nucleus and getid(nucleus) == math_char and getchar(nucleus) == selector then
+                if nucleus and getid(nucleus) == mathchar_code and getchar(nucleus) == selector then
                     local variant
                     local tfmdata = fontdata[getfont(pointer)]
                     local mathvariants = tfmdata.resources.variants -- and variantdata
@@ -2031,25 +2031,25 @@ do
 
     local classes = { }
     local colors  = {
-        [noad_rel]             = "trace:dr",
-        [noad_ord]             = "trace:db",
-        [noad_bin]             = "trace:dg",
-        [noad_open]            = "trace:dm",
-        [noad_close]           = "trace:dm",
-        [noad_punct]           = "trace:dc",
-     -- [noad_opdisplaylimits] = "",
-     -- [noad_oplimits]        = "",
-     -- [noad_opnolimits]      = "",
-     -- [noad_inner            = "",
-     -- [noad_under            = "",
-     -- [noad_over             = "",
-     -- [noad_vcenter          = "",
+        [relnode_code]             = "trace:dr",
+        [ordnoad_code]             = "trace:db",
+        [binnoad_code]             = "trace:dg",
+        [opennoad_code]            = "trace:dm",
+        [closenoad_code]           = "trace:dm",
+        [punctnoad_code]           = "trace:dc",
+     -- [opdisplaylimitsnoad_code] = "",
+     -- [oplimitsnoad_code]        = "",
+     -- [opnolimitsnoad_code]      = "",
+     -- [innernoad_code            = "",
+     -- [undernoad_code]           = "",
+     -- [overnoad_code]            = "",
+     -- [vcenternoad_code]         = "",
     }
 
     local setcolor   = colortracers.set
     local resetcolor = colortracers.reset
 
-    classes[math_char] = function(pointer,what,n,parent)
+    classes[mathchar_code] = function(pointer,what,n,parent)
         local color = colors[getsubtype(parent)]
         if color then
             setcolor(pointer,color)
@@ -2087,11 +2087,11 @@ do
     local a_mathdomain  = privateattribute("mathdomain")
     mathematics.domains = categories
     local permitted     = {
-        ordinary    = noad_ord,
-        binary      = noad_bin,
-        relation    = noad_rel,
-        punctuation = noad_punct,
-        inner       = noad_inner,
+        ordinary    = ordnoad_code,
+        binary      = binnoad_code,
+        relation    = relnode_code,
+        punctuation = punctnoad_code,
+        inner       = innernoad_code,
     }
 
     function mathematics.registerdomain(data)
@@ -2194,7 +2194,7 @@ do
         return hash
     end
 
-    domains[math_char] = function(pointer,what,n,parent)
+    domains[mathchar_code] = function(pointer,what,n,parent)
         local attr = getattr(pointer,a_mathdomain)
         if attr then
             local domain = numbers[attr]