2020-08-14 18:27:00

8 files changed, 14 insertions, 17 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 0f6ad84f5..20b7f5554 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{2020.08.13 19:42}
+\newcontextversion{2020.08.14 18:24}
 
 %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 cee7d0ebc..29513dad7 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{2020.08.13 19:42}
+\edef\contextversion{2020.08.14 18:24}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index c344a48d1..b54d1c46e 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.08.13 19:42}
+\edef\contextversion{2020.08.14 18:24}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/spac-chr.lua b/tex/context/base/mkiv/spac-chr.lua
index 087bff89a..ac04a4c8e 100644
--- a/tex/context/base/mkiv/spac-chr.lua
+++ b/tex/context/base/mkiv/spac-chr.lua
@@ -38,7 +38,6 @@ local setchar            = nuts.setchar
 local setattrlist        = nuts.setattrlist
 local getfont            = nuts.getfont
 local setsubtype         = nuts.setsubtype
-local setdisc            = nuts.setdisc
 local isglyph            = nuts.isglyph
 
 local setcolor           = nodes.tracers.colors.set
@@ -58,7 +57,6 @@ local new_penalty        = nodepool.penalty
 local new_glue           = nodepool.glue
 local new_kern           = nodepool.kern
 local new_rule           = nodepool.rule
-local new_disc           = nodepool.disc
 
 local nodecodes          = nodes.nodecodes
 local gluecodes          = nodes.gluecodes
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index d652c1143..0b5a3fd8c 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 b1af2f3e8..53da6b027 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv
index 2c8ed8ddf..fe25e236e 100644
--- a/tex/context/base/mkiv/strc-mat.mkiv
+++ b/tex/context/base/mkiv/strc-mat.mkiv
@@ -1,5 +1,4 @@
 %D \module
-%D \module
 %D   [       file=strc-mat,
 %D        version=2008.10.20,
 %D          title=\CONTEXT\ Structure Macros,
diff --git a/tex/context/base/mkiv/supp-box.lmt b/tex/context/base/mkiv/supp-box.lmt
index 98bf828b5..61ec9b328 100644
--- a/tex/context/base/mkiv/supp-box.lmt
+++ b/tex/context/base/mkiv/supp-box.lmt
@@ -967,13 +967,15 @@ do
     local setprop            = nuts.setprop
     local getprop            = nuts.getprop
 
-    local line_code          = nodes.listcodes.line
-    local unknown_code       = nodes.listcodes.unknown
+    local listcodes          = nodes.listcodes
+    local line_code          = listcodes.line
+    local equation_code      = listcodes.equation
+    local unknown_code       = listcodes.unknown
 
     local values             = tokens.values
     local dimension_value    = values.dimension
     local cardinal_value     = values.cardinal
-    local list_value         = values.list
+    local direct_value       = values.direct
 
     -- todo: make helper that formats
 
@@ -992,7 +994,7 @@ do
             prop = { }
             if list then
                 for n, subtype in nexthlist, list do
-                    if subtype == line_code then
+                    if subtype == line_code then -- or subtype == equation_code then
                         line = line + 1
                         prop[line] = n
                     end
@@ -1063,7 +1065,7 @@ do
     local function getline(props,line,found,box,value)
         local p, n = getboth(found)
         local temp = new_hlist()
-        setsubtype(temp,line_code)
+        setsubtype(temp,getsubtype(found))
         setwhd(temp,getwhd(found))
         if found == getlist(box) then
             setlink(temp,n)
@@ -1074,22 +1076,20 @@ do
         getprop(box,"boxlines")[line] = temp
         setboth(found)
         setsubtype(found, unknown_code)
-        found = tonode(found)
         if value then
-            return list_value, found
+            return direct_value, found
         else
-            context(found)
+            context(tonode(found))
         end
     end
 
     local function copyline(props,line,found,box,value)
         found = copy_node(found)
         setsubtype(found, unknown_code)
-        found = tonode(found)
         if value then
-            return list_value, found
+            return direct_value, found
         else
-            context(found)
+            context(tonode(found))
         end
     end