2021-06-30 19:20:00

4 files changed, 82 insertions, 9 deletions

diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 9dc2c1797..db941e888 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.06.29 23:10}
+\newcontextversion{2021.06.30 19:17}
 
 %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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 895f817ae..529d2cb2e 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.06.29 23:10}
+\immutable\edef\contextversion{2021.06.30 19:17}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/lang-ini.mkxl b/tex/context/base/mkxl/lang-ini.mkxl
index 6ea18ac41..ba9e37d86 100644
--- a/tex/context/base/mkxl/lang-ini.mkxl
+++ b/tex/context/base/mkxl/lang-ini.mkxl
@@ -441,6 +441,7 @@
 
 \permanent \integerdef \partialhyphenationmodecode \numexpr
     \ignoreboundshyphenationmodecode      % just in case we have hyphens at the edges
+% + \explicithyphenationmodecode          % \-
   + \collapsehyphenationmodecode          % collapse -- and ---
 \relax
 
diff --git a/tex/context/base/mkxl/mlib-scn.lmt b/tex/context/base/mkxl/mlib-scn.lmt
index 2fb4e7428..1d6514a0b 100644
--- a/tex/context/base/mkxl/mlib-scn.lmt
+++ b/tex/context/base/mkxl/mlib-scn.lmt
@@ -795,15 +795,83 @@ registerdirect("newrecord", function()
     return n
 end)
 
+local function merge(old,new)
+    for knew, vnew in next, new do
+        local vold = old[knew]
+        if vold then
+            if type(vnew) == "table" then
+                if type(vold) == "table" then
+                    merge(vold,vnew)
+                else
+                    old[knew] = vnew
+                end
+            else
+                old[knew] = vnew
+            end
+        else
+            old[knew] = vnew
+        end
+    end
+end
+
+registerdirect("setrecord", function()
+    scantoken() -- semicolon
+    local p = get_parameters()
+    local n = 0
+    if interim > 0 then
+        local r = records[interim]
+        if r then
+            merge(r,p)
+        else
+            records[interim] = p
+        end
+        local top = stack[interim]
+        if top then
+            top = stack[interim][#top]
+            if top then
+                setmetatableindex(p,top)
+            end
+        end
+        n = interim
+        interim = 0
+    else
+        nofrecords = nofrecords + 1
+        records[nofrecords] = p
+        n = nofrecords
+    end
+    return n
+end)
+
+
 registerdirect("getrecord", function()
     local n = scaninteger()
     local v = records[n]
     while true do
         local t = scansymbol(true)
-        if t == ";" or t == ")" then
+        if t == ";" or t == ")" or t == ":" then
             return v
         elseif t == "." then
             scansymbol()
+        elseif t == "#" or t == "##" then -- from tex's we get a double
+            scansymbol()
+            t = scansymbol()
+            v = v[t]
+            return type(v) == "table" and #v or 0
+        elseif t == "[" then
+            scansymbol()
+            t = scansymbol(true)
+            if t == "]" then
+                scansymbol()
+                return #v
+            else
+                t = scaninteger()
+                v = v[t]
+                if scansymbol(true) == "]" then
+                    scansymbol()
+                else
+                    report("] expected")
+                end
+            end
         else
             t = scansymbol()
             v = v[t]
@@ -811,12 +879,16 @@ registerdirect("getrecord", function()
     end
 end)
 
-function metapost.runinternal(n,m)
-    if m == 0 then
-        insert(stack[n],records[n])
-        interim = n
-    elseif m == 1 then
-        records[n] = remove(stack[n]) or records[n]
+function metapost.runinternal(action,index,kind)
+    if action == 0 then
+        -- allocate
+    elseif action == 1 then
+        -- save
+        insert(stack[index],records[index])
+        interim = index
+    elseif action == 2 then
+        -- restore
+        records[index] = remove(stack[index]) or records[index]
     end
 end