2021-05-27 14:14:00

7 files changed, 18 insertions, 83 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index aac21a01b..98a99ad06 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.05.26 09:57}
+\newcontextversion{2021.05.27 14:12}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 68cb51afe..f6324f7f0 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.05.26 09:57}
+\edef\contextversion{2021.05.27 14:12}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 309642747..0a5ee4aeb 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -55,7 +55,7 @@ local trace_processing   = false  registertracker("math.processing",  function(v
 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_fixing       = false  registertracker("math.fixing",      function(v) trace_fixing      = 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)
@@ -1930,8 +1930,6 @@ do
 
     mathematics.virtualize(movesub)
 
-    local options_supported = tokens.defined("Unosuperscript")
-
     local function fixsupscript(parent,current,current_char,new_char)
         if new_char ~= current_char and new_char ~= true then
             setchar(current,new_char)
@@ -1943,9 +1941,7 @@ do
                 report_fixing("fixing subscript, superscript %U",current_char)
             end
         end
-        if options_supported then
-            setfield(parent,"options",0x08+0x22)
-        end
+        setfield(parent,"options",0x08+0x22)
     end
 
  -- local function movesubscript(parent,current_nucleus,oldchar,newchar)
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 710934ae6..e7eb8dde4 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -356,6 +356,7 @@ return {
   "ifhastoks",
   "ifhasxtoks",
   "ifincsname",
+  "ifinsert",
   "ifmathparameter",
   "ifmathstyle",
   "ifnumval",
@@ -368,8 +369,19 @@ return {
   "immediate",
   "immutable",
   "initcatcodetable",
+  "insertbox",
+  "insertcopy",
+  "insertdepth",
+  "insertdistance",
+  "insertheight",
   "insertheights",
-  "insertht",
+  "insertlimit",
+  "insertmode",
+  "insertmultiplier",
+  "insertprogress",
+  "insertunbox",
+  "insertuncopy",
+  "insertwidth",
   "instance",
   "integerdef",
   "lastarguments",
@@ -382,7 +394,6 @@ return {
   "letprotected",
   "linedirection",
   "linepar",
-  "listcallbackmode",
   "localbrokenpenalty",
   "localcontrol",
   "localcontrolled",
@@ -457,6 +468,7 @@ return {
   "swapcsvalues",
   "textdirection",
   "thewithoutunit",
+  "thewithproperty",
   "tokenized",
   "toksapp",
   "tokspre",
diff --git a/tex/context/base/mkiv/node-met.lua b/tex/context/base/mkiv/node-met.lua
index c39c9dd86..45639b5ba 100644
--- a/tex/context/base/mkiv/node-met.lua
+++ b/tex/context/base/mkiv/node-met.lua
@@ -558,76 +558,3 @@ metatable.__unm = function(head)
     n_setnext(last)
     return first
 end
-
--- see node-nut.lua for more info on going nuts
-
--- if not gonuts then
---
---     local nuts = { }
---     nodes.nuts = nuts
---
---     local function dummy(f) return f end
---
---     nodes.vianuts  = dummy
---     nodes.vianodes = dummy
---
---     for k, v in next, nodes do
---         if type(v) == "function" then
---             nuts[k] = v
---         end
---     end
---
--- end
-
--- also handy
-
-local tonode       = nodes.tonode
-local whatsit_code = nodecodes.whatsit
-local getfields    = node.fields
-local sort         = table.sort
-local whatsitkeys  = { }
-local keys         = { whatsit = whatsitkeys }
-local messyhack    = table.tohash { -- temporary solution
-    nodecodes.attributelist,
-    nodecodes.attribute,
-    nodecodes.action, -- hm
-}
-
-setmetatableindex(keys,function(t,k)
-    local v = (k == "attributelist" or k == nodecodes.attributelist) and { } or getfields(k)
-    if messyhack[k] then
-        for i=1,#v do
-            if v[i] == "subtype" then
-                remove(v,i)
-                break
-            end
-        end
-    end
-    if v[ 0] then v[#v+1] = "next" v[ 0] = nil end
-    if v[-1] then v[#v+1] = "prev" v[-1] = nil end
-    sort(v)
-    t[k] = v
-    return v
-end)
-
-setmetatableindex(whatsitkeys,function(t,k)
-    local v = getfields(whatsit_code,k)
-    if v[ 0] then v[#v+1] = "next" v[ 0] = nil end
-    if v[-1] then v[#v+1] = "prev" v[-1] = nil end
-    sort(v)
-    t[k] = v
-    return v
-end)
-
-local function nodefields(n)
-    n = tonode(n)
-    local id = n.id
-    if id == whatsit_code then
-        return whatsitkeys[n.subtype]
-    else
-        return keys[id]
-    end
-end
-
-nodes.keys   = keys       -- [id][subtype]
-nodes.fields = nodefields -- (n)
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 965fc11ee..bfff547ae 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index f7532b9ac..7180e25c2 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf