11 files changed, 67 insertions, 9 deletions
diff --git a/tex/context/base/mkiv/char-ini.lua b/tex/context/base/mkiv/char-ini.lua
index c6c8c915b..9ce52cc8a 100644
--- a/tex/context/base/mkiv/char-ini.lua
+++ b/tex/context/base/mkiv/char-ini.lua
@@ -47,9 +47,9 @@ loaded!</p>
 
 -- todo: in 'char-def.lua' assume defaults:
 --
--- directtions = l
--- cjkwd       = a
--- linebreak   = al
+-- directions = l
+-- cjkwd      = a
+-- linebreak  = al
 
 characters       = characters or { }
 local characters = characters
@@ -66,9 +66,17 @@ end
 Extending the table.
 --ldx]]--
 
-if context and not characters.private then
+if context then
 
-    require("char-prv")
+    if not characters.private then
+
+        require("char-prv")
+
+        if storage then
+            storage.register("characters/private", characters.private, "characters.private")
+        end
+
+    end
 
     for unicode, d in next, characters.private do
         data[unicode] = d
@@ -932,7 +940,7 @@ if not characters.fallbacks then
 
 end
 
-if storage then
+if storage then -- in case we extend
     storage.register("characters/fallbacks", characters.fallbacks, "characters.fallbacks") -- accents and such
 end
 
diff --git a/tex/context/base/mkiv/cont-fil.mkiv b/tex/context/base/mkiv/cont-fil.mkiv
index edef8dbc8..1d2a44b1f 100644
--- a/tex/context/base/mkiv/cont-fil.mkiv
+++ b/tex/context/base/mkiv/cont-fil.mkiv
@@ -149,4 +149,6 @@
 %definefilesynonym [set-13]       [setups-proofing]
 %definefilesynonym [set-15]       [setups-generate]
 
+\definefilesynonym [newmml]       [mathml]
+
 \endinput
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index caf46fe43..d4815dd08 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.06.01 17:00}
+\newcontextversion{2021.06.04 17:20}
 
 %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 005fbf05a..ac9434b86 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.06.01 17:00}
+\edef\contextversion{2021.06.04 17:20}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/lxml-ini.lua b/tex/context/base/mkiv/lxml-ini.lua
index 43bc3efc8..6524670fc 100644
--- a/tex/context/base/mkiv/lxml-ini.lua
+++ b/tex/context/base/mkiv/lxml-ini.lua
@@ -162,6 +162,8 @@ if CONTEXTLMTXMODE > 0 then
     local found        = xml.found
     local empty        = xml.empty
     local checkedempty = xml.checkedempty
+    local ifatt        = lxml.ifatt
+    local ifattempty   = lxml.ifattempty
 
     implement {
         name      = "ifxml",
@@ -184,6 +186,27 @@ if CONTEXTLMTXMODE > 0 then
     }
 
     implement {
+        name      = "ifxmlatt",
+        public    = true,
+        usage     = "condition",
+        arguments = "3 arguments",
+        actions   = function(id,name,value)
+            return boolean_code, ifatt(getid(id),name,value)
+        end
+    }
+
+    implement {
+        name      = "ifxmlattempty",
+        public    = true,
+        usage     = "condition",
+        arguments = "2 arguments",
+        actions   = function(id,name)
+            return boolean_code, ifattempty(getid(id),name)
+        end
+    }
+
+
+    implement {
         name      = "ifxmlempty",
         public    = true,
         usage     = "condition",
diff --git a/tex/context/base/mkiv/lxml-tex.lua b/tex/context/base/mkiv/lxml-tex.lua
index 75bd9b84c..148484f51 100644
--- a/tex/context/base/mkiv/lxml-tex.lua
+++ b/tex/context/base/mkiv/lxml-tex.lua
@@ -2070,6 +2070,28 @@ do
         end
     end
 
+    function lxml.ifatt(id,a,value)
+        local e = getid(id)
+        if e then
+            local at = e.at
+            att = at and at[a] or ""
+        else
+            att = ""
+        end
+        return att == value
+    end
+
+    function lxml.ifattempty(id,a)
+        local e = getid(id)
+        if e then
+            local at = e.at
+            if at and at[a] ~= "" then
+                return true
+            end
+        end
+        return false
+    end
+
     function lxml.refatt(id,a)
         local e = getid(id)
         if e then
diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index 1cacdff27..e9572f983 100644
--- a/tex/context/base/mkiv/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
@@ -40,7 +40,10 @@ return {
         --
         "anchorxy", "anchorx", "anchory",
         "anchorht", "anchordp",
-        "anchorll", "anchorur", "anchorbox",
+        "anchorul", "anchorll", "anchorlr", "anchorur",
+        "localanchorbox", "localanchorcell", "localanchorspan",
+        "anchorbox", "anchorcell", "anchorspan",
+        "matrixbox", "matrixcell", "matrixspan",
     },
     commands = {
         "loadfile", "loadimage", "loadmodule",
diff --git a/tex/context/base/mkiv/s-inf-01-pdf-keep.pdf b/tex/context/base/mkiv/s-inf-01-pdf-keep.pdf
new file mode 100644
index 000000000..0002d614e
--- /dev/null
+++ b/tex/context/base/mkiv/s-inf-01-pdf-keep.pdf
diff --git a/tex/context/base/mkiv/s-inf-03-pdf-keep.pdf b/tex/context/base/mkiv/s-inf-03-pdf-keep.pdf
new file mode 100644
index 000000000..b037b49ab
--- /dev/null
+++ b/tex/context/base/mkiv/s-inf-03-pdf-keep.pdf
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 3b3e4165a..0002d614e 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 f276ac586..b037b49ab 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf