2021-09-03 18:47:00

7 files changed, 12 insertions, 8 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 02cd004aa..a85b450ea 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 19:53}
+\newcontextversion{2021.09.03 18:45}
 
 %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 22a3fbe3e..ec6653a3a 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 19:53}
+\edef\contextversion{2021.09.03 18:45}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/font-imp-reorder.lua b/tex/context/base/mkiv/font-imp-reorder.lua
index b2dec781c..323978cde 100644
--- a/tex/context/base/mkiv/font-imp-reorder.lua
+++ b/tex/context/base/mkiv/font-imp-reorder.lua
@@ -35,6 +35,7 @@ local trace_reorder  = trackers.register("fonts.reorderlookups",function(v) trac
 local report_reorder = logs.reporter("fonts","reorder")
 
 local vectors = { }
+otf.vectors   = vectors -- kind of private
 
 vectors.arab = {
     gsub = {
@@ -97,7 +98,7 @@ function otf.reorderlookups(tfmdata,vector)
                     if not what then
                         what = find(kind,"^gsub") and "gsub" or "gpos"
                     end
-                    local newwhen = order[what][feature]
+--                     local newwhen = order[what][feature]
                     if not newwhen then
                         -- skip
                     elseif not when then
diff --git a/tex/context/base/mkiv/libs-ini.lua b/tex/context/base/mkiv/libs-ini.lua
index ed3fb842f..d3cfe634f 100644
--- a/tex/context/base/mkiv/libs-ini.lua
+++ b/tex/context/base/mkiv/libs-ini.lua
@@ -54,10 +54,10 @@ local function findlib(required) -- todo: cache
         for i=1,#list do
             local name  = list[i]
             local found = findfile(name,"lib")
-            if not found then
+            if not found or found == "" then
                 found = findfile(addsuffix(name,suffix),"lib")
             end
-            if found then
+            if found and found ~= "" then
                 if trace then
                     report("library %a resolved via %a path to %a",name,"tds lib",found)
                 end
@@ -70,9 +70,9 @@ local function findlib(required) -- todo: cache
             for i=1,#list do
                 local full  = joinfile(list[i],base)
                 local found = isfile(full) and full
-                if found then
+                if found and found ~= "" then
                     if trace then
-                        report("library %a resolved via %a path to %a",name,"system",found)
+                        report("library %a resolved via %a path to %a",full,"system",found)
                     end
                     return found
                 end
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 81afd645b..28a8f41de 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -54,7 +54,6 @@ return {
   "splitdiscards",
   "splitfirstmarks",
   "topmarks",
-  "tracingalignments",
   "tracingassigns",
   "tracinggroups",
   "tracingifs",
@@ -299,6 +298,7 @@ return {
   "crampedscriptstyle",
   "crampedtextstyle",
   "csstring",
+  "currentmarks",
   "defcsname",
   "dimensiondef",
   "dimexpression",
@@ -321,6 +321,7 @@ return {
   "explicitdiscretionary",
   "explicithyphenpenalty",
   "firstvalidlanguage",
+  "flushmarks",
   "fontid",
   "fontmathcontrol",
   "fontspecifiedsize",
@@ -506,9 +507,11 @@ return {
   "tokspre",
   "tolerant",
   "tpack",
+  "tracingalignments",
   "tracingexpressions",
   "tracingfonts",
   "tracinghyphenation",
+  "tracingmarks",
   "tracingmath",
   "undent",
   "unletfrozen",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index dd8c7d78d..f91a256e1 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 608b86c32..8c1e5bbc9 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf