19 files changed, 103 insertions, 48 deletions
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-alignments.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-alignments.tex
index c641e0d65..d0a3c47af 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-alignments.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-alignments.tex
@@ -504,7 +504,7 @@ specifier in the preamble definition because that will trigger the plugin.
 \starttabulate[|lG{}|lG{}|]
 \NC \showglyphs \setalignmentcharacter{.}1.1     \NC \setalignmentcharacter{.}1.1     \NC\NR
 \NC \showglyphs \setalignmentcharacter{,}11,11   \NC \setalignmentcharacter{,}11,11   \NC\NR
-    \NC \showglyphs \setalignmentcharacter{=}111=111 \NC \setalignmentcharacter{=}111=111 \NC\NR
+\NC \showglyphs \setalignmentcharacter{=}111=111 \NC \setalignmentcharacter{=}111=111 \NC\NR
 \stoptabulate
 \stopbuffer
 
diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index 65b9b4a9c..2c142bf49 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -20,18 +20,18 @@ local lpegpatterns, lpegmatch, Cs, P = lpeg.patterns, lpeg.match, lpeg.Cs, lpeg.
 local getargument   = environment.getargument or environment.argument
 local setargument   = environment.setargument
 
-local filejoinname  = file.join
-local filebasename  = file.basename
-local filenameonly  = file.nameonly
-local filepathpart  = file.pathpart
-local filesuffix    = file.suffix
-local fileaddsuffix = file.addsuffix
-local filenewsuffix = file.replacesuffix
-local removesuffix  = file.removesuffix
-local validfile     = lfs.isfile
-local removefile    = os.remove
-local renamefile    = os.rename
-local formatters    = string.formatters
+local filejoinname      = file.join
+local filebasename      = file.basename
+local filenameonly      = file.nameonly
+local filepathpart      = file.pathpart
+local filesuffix        = file.suffix
+local fileaddsuffix     = file.addsuffix
+local filereplacesuffix = file.replacesuffix
+local removesuffix      = file.removesuffix
+local validfile         = lfs.isfile
+local removefile        = os.remove
+local renamefile        = os.rename
+local formatters        = string.formatters
 
 local application = logs.application {
     name     = "mtx-context",
diff --git a/scripts/context/lua/mtx-install.lua b/scripts/context/lua/mtx-install.lua
index 08befc322..9087a6524 100644
--- a/scripts/context/lua/mtx-install.lua
+++ b/scripts/context/lua/mtx-install.lua
@@ -75,11 +75,14 @@ local platforms = {
     ["windows"]        = "mswin",
     ["win32"]          = "mswin",
     ["win"]            = "mswin",
+    ["arm32"]          = "windows-arm32",
+    ["windows-arm32"]  = "windows-arm32",
     --
     ["mswin-64"]       = "win64",
     ["windows-64"]     = "win64",
     ["win64"]          = "win64",
     ["arm64"]          = "windows-arm64",
+    ["windows-arm64"]  = "windows-arm64",
     --
     ["linux"]          = "linux",
     ["linux-32"]       = "linux",
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 44dbb8906..26f947c5e 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -3840,7 +3840,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19673, stripped down to: 10502
+-- original size: 19687, stripped down to: 10516
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -4026,14 +4026,14 @@ do
  local bits=os.getenv("MTX_BITS") or find(platform,"64") and 64 or 32
  if platform~="" then
  elseif os.type=="windows" then
-  architecture=architecture or os.getenv("PROCESSOR_ARCHITECTURE") or ""
+  architecture=string.lower(architecture or os.getenv("PROCESSOR_ARCHITECTURE") or "")
   if architecture=="x86_64" then
    bits,platform=64,"win64"
-  elseif find(architecture,"AMD64") then
+  elseif find(architecture,"amd64") then
    bits,platform=64,"win64"
-  elseif find(architecture,"ARM64") then
+  elseif find(architecture,"arm64") then
    bits,platform=64,"windows-arm64"
-  elseif find(architecture,"ARM32") then
+  elseif find(architecture,"arm32") then
    bits,platform=32,"windows-arm32"
   else
    bits,platform=32,"mswin"
@@ -25932,7 +25932,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1027044
+-- original bytes    : 1027058
 -- stripped bytes    : 403435
 
 -- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 44dbb8906..26f947c5e 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -3840,7 +3840,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19673, stripped down to: 10502
+-- original size: 19687, stripped down to: 10516
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -4026,14 +4026,14 @@ do
  local bits=os.getenv("MTX_BITS") or find(platform,"64") and 64 or 32
  if platform~="" then
  elseif os.type=="windows" then
-  architecture=architecture or os.getenv("PROCESSOR_ARCHITECTURE") or ""
+  architecture=string.lower(architecture or os.getenv("PROCESSOR_ARCHITECTURE") or "")
   if architecture=="x86_64" then
    bits,platform=64,"win64"
-  elseif find(architecture,"AMD64") then
+  elseif find(architecture,"amd64") then
    bits,platform=64,"win64"
-  elseif find(architecture,"ARM64") then
+  elseif find(architecture,"arm64") then
    bits,platform=64,"windows-arm64"
-  elseif find(architecture,"ARM32") then
+  elseif find(architecture,"arm32") then
    bits,platform=32,"windows-arm32"
   else
    bits,platform=32,"mswin"
@@ -25932,7 +25932,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1027044
+-- original bytes    : 1027058
 -- stripped bytes    : 403435
 
 -- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 44dbb8906..26f947c5e 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -3840,7 +3840,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19673, stripped down to: 10502
+-- original size: 19687, stripped down to: 10516
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -4026,14 +4026,14 @@ do
  local bits=os.getenv("MTX_BITS") or find(platform,"64") and 64 or 32
  if platform~="" then
  elseif os.type=="windows" then
-  architecture=architecture or os.getenv("PROCESSOR_ARCHITECTURE") or ""
+  architecture=string.lower(architecture or os.getenv("PROCESSOR_ARCHITECTURE") or "")
   if architecture=="x86_64" then
    bits,platform=64,"win64"
-  elseif find(architecture,"AMD64") then
+  elseif find(architecture,"amd64") then
    bits,platform=64,"win64"
-  elseif find(architecture,"ARM64") then
+  elseif find(architecture,"arm64") then
    bits,platform=64,"windows-arm64"
-  elseif find(architecture,"ARM32") then
+  elseif find(architecture,"arm32") then
    bits,platform=32,"windows-arm32"
   else
    bits,platform=32,"mswin"
@@ -25932,7 +25932,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1027044
+-- original bytes    : 1027058
 -- stripped bytes    : 403435
 
 -- end library merge
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 44dbb8906..26f947c5e 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -3840,7 +3840,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19673, stripped down to: 10502
+-- original size: 19687, stripped down to: 10516
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -4026,14 +4026,14 @@ do
  local bits=os.getenv("MTX_BITS") or find(platform,"64") and 64 or 32
  if platform~="" then
  elseif os.type=="windows" then
-  architecture=architecture or os.getenv("PROCESSOR_ARCHITECTURE") or ""
+  architecture=string.lower(architecture or os.getenv("PROCESSOR_ARCHITECTURE") or "")
   if architecture=="x86_64" then
    bits,platform=64,"win64"
-  elseif find(architecture,"AMD64") then
+  elseif find(architecture,"amd64") then
    bits,platform=64,"win64"
-  elseif find(architecture,"ARM64") then
+  elseif find(architecture,"arm64") then
    bits,platform=64,"windows-arm64"
-  elseif find(architecture,"ARM32") then
+  elseif find(architecture,"arm32") then
    bits,platform=32,"windows-arm32"
   else
    bits,platform=32,"mswin"
@@ -25932,7 +25932,7 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1027044
+-- original bytes    : 1027058
 -- stripped bytes    : 403435
 
 -- end library merge
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 81b839988..e4e7ae826 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2021.08.30 16:21}
+\newcontextversion{2021.08.30 16:23}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 0974ce519..daed25401 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.08.30 16:21}
+\edef\contextversion{2021.08.30 16:23}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii
index 0e1e0a92c..aa936d180 100644
--- a/tex/context/base/mkii/mult-cs.mkii
+++ b/tex/context/base/mkii/mult-cs.mkii
@@ -79,6 +79,7 @@
 \setinterfacevariable{anchor}{anchor}
 \setinterfacevariable{and}{and}
 \setinterfacevariable{answerarea}{answerarea}
+\setinterfacevariable{append}{append}
 \setinterfacevariable{appendices}{dodatky}
 \setinterfacevariable{appendix}{dodatek}
 \setinterfacevariable{april}{duben}
@@ -150,6 +151,7 @@
 \setinterfacevariable{commands}{prikazy}
 \setinterfacevariable{comment}{komentar}
 \setinterfacevariable{component}{komponenta}
+\setinterfacevariable{compress}{compress}
 \setinterfacevariable{compressseparator}{compressseparator}
 \setinterfacevariable{compressstopper}{compressstopper}
 \setinterfacevariable{concept}{koncept}
@@ -207,6 +209,8 @@
 \setinterfacevariable{fixed}{fixne}
 \setinterfacevariable{flexible}{prizpusobive}
 \setinterfacevariable{float}{plvouciobjekt}
+\setinterfacevariable{flushbackward}{flushbackward}
+\setinterfacevariable{flushforward}{flushforward}
 \setinterfacevariable{flushinner}{flushinner}
 \setinterfacevariable{flushleft}{flushleft}
 \setinterfacevariable{flushouter}{flushouter}
@@ -434,6 +438,7 @@
 \setinterfacevariable{postscript}{postscript}
 \setinterfacevariable{precedingpage}{precedingpage}
 \setinterfacevariable{preference}{nastaveni}
+\setinterfacevariable{prepend}{prepend}
 \setinterfacevariable{preview}{nahled}
 \setinterfacevariable{previous}{predchozi}
 \setinterfacevariable{previousevenpage}{predchozisudastranka}
@@ -1236,6 +1241,7 @@
 \setinterfaceconstant{splitoffset}{splitoffset}
 \setinterfaceconstant{spot}{spot}
 \setinterfaceconstant{stack}{stack}
+\setinterfaceconstant{stacking}{stacking}
 \setinterfaceconstant{stackname}{stackname}
 \setinterfaceconstant{start}{start}
 \setinterfaceconstant{starter}{starter}
@@ -1364,6 +1370,8 @@
 \setinterfaceelement{load}{nacist}
 \setinterfaceelement{local}{lokalne}
 \setinterfaceelement{makeup}{zlom}
+\setinterfaceelement{namednotation}{namednotation}
+\setinterfaceelement{namedtyping}{namedtyping}
 \setinterfaceelement{next}{dalsi}
 \setinterfaceelement{place}{umisti}
 \setinterfaceelement{previous}{predchozi}
@@ -1532,6 +1540,7 @@
 \setinterfacecommand{definereferencelist}{definujseznamodkazu}
 \setinterfacecommand{defineregister}{definujrejstrik}
 \setinterfacecommand{definerule}{definerule}
+\setinterfacecommand{definesavebuffer}{startsavebuffer}
 \setinterfacecommand{definesection}{definujsekci}
 \setinterfacecommand{definesectionblock}{definujbloksekce}
 \setinterfacecommand{definesorting}{definujtrideni}
@@ -1708,6 +1717,9 @@
 \setinterfacecommand{moveformula}{moveformula}
 \setinterfacecommand{moveongrid}{premistinamrizku}
 \setinterfacecommand{movesidefloat}{movesidefloat}
+\setinterfacecommand{namedconstruction}{namedconstruction}
+\setinterfacecommand{nameddescription}{nameddescription}
+\setinterfacecommand{namedenumeration}{namedenumeration}
 \setinterfacecommand{navigating}{navigating}
 \setinterfacecommand{nodimension}{zadnyrozmer}
 \setinterfacecommand{noheaderandfooterlines}{zadnezahlaviaupati}
@@ -2079,6 +2091,13 @@
 \setinterfacecommand{startmakeup}{startuprava}
 \setinterfacecommand{startmarginblock}{startmarginalniblok}
 \setinterfacecommand{startmarginrule}{startmarginalnilinka}
+\setinterfacecommand{startnamedconstruction}{startnamedconstruction}
+\setinterfacecommand{startnameddescription}{startnameddescription}
+\setinterfacecommand{startnamedenumeration}{startnamedenumeration}
+\setinterfacecommand{startnamedmatrix}{startnamedmatrix}
+\setinterfacecommand{startnamedsection}{startnamedsection}
+\setinterfacecommand{startnamedsubformulas}{startnamedsubformulas}
+\setinterfacecommand{startnamedtyping}{startnamedtyping}
 \setinterfacecommand{startnarrower}{startzuzeni}
 \setinterfacecommand{startopposite}{startprotejsek}
 \setinterfacecommand{startoverlay}{startprekryv}
@@ -2122,6 +2141,13 @@
 \setinterfacecommand{stopmakeup}{stopuprava}
 \setinterfacecommand{stopmarginblock}{stopmarginalniblok}
 \setinterfacecommand{stopmarginrule}{stopmarginalnilinka}
+\setinterfacecommand{stopnamedconstruction}{stopnamedconstruction}
+\setinterfacecommand{stopnameddescription}{stopnameddescription}
+\setinterfacecommand{stopnamedenumeration}{stopnamedenumeration}
+\setinterfacecommand{stopnamedmatrix}{stopnamedmatrix}
+\setinterfacecommand{stopnamedsection}{stopnamedsection}
+\setinterfacecommand{stopnamedsubformulas}{stopnamedsubformulas}
+\setinterfacecommand{stopnamedtyping}{stopnamedtyping}
 \setinterfacecommand{stopnarrower}{stopzuzeni}
 \setinterfacecommand{stopopposite}{stopprotejsek}
 \setinterfacecommand{stopoverlay}{stopprekryv}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 6f5333832..83aaf8fcf 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.08.30 16:21}
+\newcontextversion{2021.08.30 16:23}
 
 %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 7226ee7b2..f6da6448a 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.08.30 16:21}
+\edef\contextversion{2021.08.30 16:23}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/l-os.lua b/tex/context/base/mkiv/l-os.lua
index dc70d0c5e..e5a43c1d0 100644
--- a/tex/context/base/mkiv/l-os.lua
+++ b/tex/context/base/mkiv/l-os.lua
@@ -299,14 +299,14 @@ do
         -- PROCESSOR_ARCHITECTURE : binary platform
         -- PROCESSOR_ARCHITEW6432 : OS platform
 
-        architecture = architecture or os.getenv("PROCESSOR_ARCHITECTURE") or ""
+        architecture = string.lower(architecture or os.getenv("PROCESSOR_ARCHITECTURE") or "")
         if architecture == "x86_64" then
             bits, platform = 64, "win64"
-        elseif find(architecture,"AMD64") then
+        elseif find(architecture,"amd64") then
             bits, platform = 64, "win64"
-        elseif find(architecture,"ARM64") then
+        elseif find(architecture,"arm64") then
             bits, platform = 64, "windows-arm64"
-        elseif find(architecture,"ARM32") then
+        elseif find(architecture,"arm32") then
             bits, platform = 32, "windows-arm32"
         else
             bits, platform = 32, "mswin"
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 833f69b1d..7fde2e004 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 ded84acc1..dfa5e77ef 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 0ae1cfbff..4c1bc29d9 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.08.30 16:21}
+\newcontextversion{2021.08.30 16:23}
 
 %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 c965778c8..1f39b86c1 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.08.30 16:21}
+\immutable\edef\contextversion{2021.08.30 16:23}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml
index 0a69cdd6d..54178696b 100644
--- a/tex/context/interface/mkii/keys-cs.xml
+++ b/tex/context/interface/mkii/keys-cs.xml
@@ -82,6 +82,7 @@
 		<cd:variable name='anchor' value='anchor'/>
 		<cd:variable name='and' value='and'/>
 		<cd:variable name='answerarea' value='answerarea'/>
+		<cd:variable name='append' value='append'/>
 		<cd:variable name='appendices' value='dodatky'/>
 		<cd:variable name='appendix' value='dodatek'/>
 		<cd:variable name='april' value='duben'/>
@@ -153,6 +154,7 @@
 		<cd:variable name='commands' value='prikazy'/>
 		<cd:variable name='comment' value='komentar'/>
 		<cd:variable name='component' value='komponenta'/>
+		<cd:variable name='compress' value='compress'/>
 		<cd:variable name='compressseparator' value='compressseparator'/>
 		<cd:variable name='compressstopper' value='compressstopper'/>
 		<cd:variable name='concept' value='koncept'/>
@@ -210,6 +212,8 @@
 		<cd:variable name='fixed' value='fixne'/>
 		<cd:variable name='flexible' value='prizpusobive'/>
 		<cd:variable name='float' value='plvouciobjekt'/>
+		<cd:variable name='flushbackward' value='flushbackward'/>
+		<cd:variable name='flushforward' value='flushforward'/>
 		<cd:variable name='flushinner' value='flushinner'/>
 		<cd:variable name='flushleft' value='flushleft'/>
 		<cd:variable name='flushouter' value='flushouter'/>
@@ -437,6 +441,7 @@
 		<cd:variable name='postscript' value='postscript'/>
 		<cd:variable name='precedingpage' value='precedingpage'/>
 		<cd:variable name='preference' value='nastaveni'/>
+		<cd:variable name='prepend' value='prepend'/>
 		<cd:variable name='preview' value='nahled'/>
 		<cd:variable name='previous' value='predchozi'/>
 		<cd:variable name='previousevenpage' value='predchozisudastranka'/>
@@ -1242,6 +1247,7 @@
 		<cd:constant name='splitoffset' value='splitoffset'/>
 		<cd:constant name='spot' value='spot'/>
 		<cd:constant name='stack' value='stack'/>
+		<cd:constant name='stacking' value='stacking'/>
 		<cd:constant name='stackname' value='stackname'/>
 		<cd:constant name='start' value='start'/>
 		<cd:constant name='starter' value='starter'/>
@@ -1373,6 +1379,8 @@
 		<cd:element name='load' value='nacist'/>
 		<cd:element name='local' value='lokalne'/>
 		<cd:element name='makeup' value='zlom'/>
+		<cd:element name='namednotation' value='namednotation'/>
+		<cd:element name='namedtyping' value='namedtyping'/>
 		<cd:element name='next' value='dalsi'/>
 		<cd:element name='place' value='umisti'/>
 		<cd:element name='previous' value='predchozi'/>
@@ -1544,6 +1552,7 @@
 		<cd:command name='definereferencelist' value='definujseznamodkazu'/>
 		<cd:command name='defineregister' value='definujrejstrik'/>
 		<cd:command name='definerule' value='definerule'/>
+		<cd:command name='definesavebuffer' value='startsavebuffer'/>
 		<cd:command name='definesection' value='definujsekci'/>
 		<cd:command name='definesectionblock' value='definujbloksekce'/>
 		<cd:command name='definesorting' value='definujtrideni'/>
@@ -1720,6 +1729,9 @@
 		<cd:command name='moveformula' value='moveformula'/>
 		<cd:command name='moveongrid' value='premistinamrizku'/>
 		<cd:command name='movesidefloat' value='movesidefloat'/>
+		<cd:command name='namedconstruction' value='namedconstruction'/>
+		<cd:command name='nameddescription' value='nameddescription'/>
+		<cd:command name='namedenumeration' value='namedenumeration'/>
 		<cd:command name='navigating' value='navigating'/>
 		<cd:command name='nodimension' value='zadnyrozmer'/>
 		<cd:command name='noheaderandfooterlines' value='zadnezahlaviaupati'/>
@@ -2091,6 +2103,13 @@
 		<cd:command name='startmakeup' value='startuprava'/>
 		<cd:command name='startmarginblock' value='startmarginalniblok'/>
 		<cd:command name='startmarginrule' value='startmarginalnilinka'/>
+		<cd:command name='startnamedconstruction' value='startnamedconstruction'/>
+		<cd:command name='startnameddescription' value='startnameddescription'/>
+		<cd:command name='startnamedenumeration' value='startnamedenumeration'/>
+		<cd:command name='startnamedmatrix' value='startnamedmatrix'/>
+		<cd:command name='startnamedsection' value='startnamedsection'/>
+		<cd:command name='startnamedsubformulas' value='startnamedsubformulas'/>
+		<cd:command name='startnamedtyping' value='startnamedtyping'/>
 		<cd:command name='startnarrower' value='startzuzeni'/>
 		<cd:command name='startopposite' value='startprotejsek'/>
 		<cd:command name='startoverlay' value='startprekryv'/>
@@ -2134,6 +2153,13 @@
 		<cd:command name='stopmakeup' value='stopuprava'/>
 		<cd:command name='stopmarginblock' value='stopmarginalniblok'/>
 		<cd:command name='stopmarginrule' value='stopmarginalnilinka'/>
+		<cd:command name='stopnamedconstruction' value='stopnamedconstruction'/>
+		<cd:command name='stopnameddescription' value='stopnameddescription'/>
+		<cd:command name='stopnamedenumeration' value='stopnamedenumeration'/>
+		<cd:command name='stopnamedmatrix' value='stopnamedmatrix'/>
+		<cd:command name='stopnamedsection' value='stopnamedsection'/>
+		<cd:command name='stopnamedsubformulas' value='stopnamedsubformulas'/>
+		<cd:command name='stopnamedtyping' value='stopnamedtyping'/>
 		<cd:command name='stopnarrower' value='stopzuzeni'/>
 		<cd:command name='stopopposite' value='stopprotejsek'/>
 		<cd:command name='stopoverlay' value='stopprekryv'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fe1f83d18..c4be8211b 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2021-08-30 16:21
+-- merge date  : 2021-08-30 19:02
 
 do -- begin closure to overcome local limits and interference