5 files changed, 22 insertions, 6 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 642c58bd3..96db775a1 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{2022.12.05 18:49}
+\newcontextversion{2022.12.07 20:21}
 
 %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 60320035e..f78fb6cbd 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -49,7 +49,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2022.12.05 18:49}
+\edef\contextversion{2022.12.07 20:21}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/l-string.lua b/tex/context/base/mkiv/l-string.lua
index 1dee85e28..476820a17 100644
--- a/tex/context/base/mkiv/l-string.lua
+++ b/tex/context/base/mkiv/l-string.lua
@@ -7,7 +7,7 @@ if not modules then modules = { } end modules ['l-string'] = {
 }
 
 local string = string
-local sub, gmatch, format, char, byte, rep, lower = string.sub, string.gmatch, string.format, string.char, string.byte, string.rep, string.lower
+local sub, gmatch, format, char, byte, rep, lower, find = string.sub, string.gmatch, string.format, string.char, string.byte, string.rep, string.lower, string.find
 local lpegmatch, patterns = lpeg.match, lpeg.patterns
 local P, S, C, Ct, Cc, Cs = lpeg.P, lpeg.S, lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.Cs
 
@@ -52,10 +52,26 @@ function string.quoted(str)
     return format("%q",str) -- always double quote
 end
 
-function string.count(str,pattern) -- variant 3
+-- function string.count(str,pattern) -- variant 3
+--     local n = 0
+--     for _ in gmatch(str,pattern) do -- not for utf
+--         n = n + 1
+--     end
+--     return n
+-- end
+
+function string.count(str,pattern)
     local n = 0
-    for _ in gmatch(str,pattern) do -- not for utf
-        n = n + 1
+    local i = 1
+    local l = #pattern
+    while true do
+        i = find(str,pattern,i)
+        if i then
+            n = n + 1
+            i = i + l
+        else
+            break
+        end
     end
     return n
 end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 24196b4e9..e8ea30175 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 6c406bfa1..8ff4f4584 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf