9 files changed, 40 insertions, 11 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 8bad7dd12..022391a60 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.10.10 23:40}
+\newcontextversion{2021.10.13 16:56}
 
 %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 3924c7104..ed579d53a 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.10.10 23:40}
+\edef\contextversion{2021.10.13 16:56}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 30e1eac10..e3626b417 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -76,7 +76,7 @@ return {
         "loosenessfrozenparcode", "lastlinefrozenparcode", "linepenaltyfrozenparcode", "clubpenaltyfrozenparcode",
         "widowpenaltyfrozenparcode", "displaypenaltyfrozenparcode", "brokenpenaltyfrozenparcode",
         "demeritsfrozenparcode", "shapefrozenparcode", "linefrozenparcode", "hyphenationfrozenparcode",
-        "allfrozenparcode",
+        "shapingpenaltiesfrozenparcode", "allfrozenparcode",
         --
         "activemathcharcode",
         --
@@ -91,6 +91,8 @@ return {
         "localboxgroupcode", "splitoffgroupcode", "splitkeepgroupcode", "preamblegroupcode",
         "alignsetgroupcode", "finrowgroupcode", "discretionarygroupcode",
         --
+        "markautomigrationcode",  "insertautomigrationcode", "preautomigrationcode", "postautomigrationcode",
+        --
         "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode",
         "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode",
         "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode",
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index ab89b665a..92f85011a 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -502,6 +502,8 @@ return {
   "semiexpanded",
   "semiprotected",
   "setfontid",
+  "shapingpenaltiesmode",
+  "shapingpenalty",
   "snapshotpar",
   "supmarkmode",
   "swapcsvalues",
diff --git a/tex/context/base/mkiv/publ-ini.lua b/tex/context/base/mkiv/publ-ini.lua
index 584b23dbf..bc0a9106f 100644
--- a/tex/context/base/mkiv/publ-ini.lua
+++ b/tex/context/base/mkiv/publ-ini.lua
@@ -3523,10 +3523,14 @@ do
             local list = structures.lists.tobesaved
             local done = false
             for i=1,#list do
-                local u = list[i].userdata
-                if u.btxref == tag then
-                    done = true
-                    break
+                local l = list[i]
+                local m = l.metadata
+                if m and m.kind == "btx" then
+                    local u = l.userdata
+                    if u and u.btxref == tag then
+                        done = true
+                        break
+                    end
                 end
             end
             ctx_doifelse(done)
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index ff8592826..50a3a1f99 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 389d9cfd0..57b1a2f59 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/util-evo-imp-server.lua b/tex/context/base/mkiv/util-evo-imp-server.lua
index f4dd5b3f7..b26720128 100644
--- a/tex/context/base/mkiv/util-evo-imp-server.lua
+++ b/tex/context/base/mkiv/util-evo-imp-server.lua
@@ -65,6 +65,13 @@ function evohome.server(specification)
     local port = specification.port or (presets.server and presets.server.port) or 8068
     local host = specification.host or (presets.server and presets.server.host) or "*"
 
+    if presets.initial == "alloff" then
+        report("turning all zones off")
+        evohome.actions.alloff(presets)
+    else
+        report("using default initial state")
+    end
+
     package.extraluapath(presets.filepath)
 
     local socket = socket or require("socket")
diff --git a/tex/context/base/mkiv/util-evo.lua b/tex/context/base/mkiv/util-evo.lua
index dfb395e08..75c2282f0 100644
--- a/tex/context/base/mkiv/util-evo.lua
+++ b/tex/context/base/mkiv/util-evo.lua
@@ -44,7 +44,7 @@ local formatters = string.formatters
 local floor, div = math.floor, math.div
 local resultof, ostime, osdate, ossleep = os.resultof, os.time, os.date, os.sleep
 local jsontolua, jsontostring = json.tolua, json.tostring
-local savetable, loadtable, sortedkeys = table.save, table.load, table.sortedkeys
+local savetable, loadtable, sortedkeys, sortedhash = table.save, table.load, table.sortedkeys, table.sortedhash
 local setmetatableindex, setmetatablenewindex = table.setmetatableindex, table.setmetatablenewindex
 local replacer = utilities.templates.replacer
 local lower = string.lower -- no utf support yet (encoding needs checking in evohome)
@@ -172,9 +172,11 @@ local function loadedtable(filename)
     return { }
 end
 
-local function savedtable(filename,data)
+local function savedtable(filename,data,trace)
     savetable(filename,data)
-    report("file %a saved",filename)
+    if trace then
+        report("file %a saved",filename)
+    end
 end
 
 local function loadpresets(filename)
@@ -823,11 +825,12 @@ local function settask(presets,when,tag,action)
                 done     = false,
                 category = category,
                 action   = action,
+                tag      = tag,
             }
         else
             list[tag] = nil
         end
-        savedtable(presets.files.schedules,list)
+        savedtable(presets.files.schedules,list,false)
     end
 end
 
@@ -990,6 +993,15 @@ local function poller(presets)
     return step, process, presets
 end
 
+local function alloff(presets)
+    local zones = getzonenames(presets)
+    if zones then
+        for i=1,#zones do
+            setzonestate(presets,zones[i],5,true)
+        end
+    end
+end
+
 --
 
 evohome = {
@@ -1023,6 +1035,8 @@ evohome = {
         schedule           = schedule,           -- presets, name
         permanent          = permanent,          -- presets, name
         --
+        alloff             = alloff,             -- presets
+        --
         settomorrow        = settomorrow,        -- presets, tag, function
         resettomorrow      = resettomorrow,      -- presets, tag
         tomorrowset        = tomorrowset,        -- presets, tag