2021-11-24 19:47:00

10 files changed, 18 insertions, 16 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index f6691f252..e0f571a21 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.11.24 15:16}
+\newcontextversion{2021.11.24 19:45}
 
 %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 1a6bc2ed0..1d4ad08ca 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.11.24 15:16}
+\edef\contextversion{2021.11.24 19:45}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index c9f60da6c..d958478c6 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.11.24 15:16}
+\newcontextversion{2021.11.24 19: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 c9393a335..cb8389083 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{2021.11.24 15:16}
+\edef\contextversion{2021.11.24 19:45}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/page-flt.lua b/tex/context/base/mkiv/page-flt.lua
index b1f729f7a..7c2220840 100644
--- a/tex/context/base/mkiv/page-flt.lua
+++ b/tex/context/base/mkiv/page-flt.lua
@@ -12,7 +12,7 @@ if not modules then modules = { } end modules ['page-flt'] = {
 local next = next
 local tostring = tostring
 local insert, remove = table.insert, table.remove
-local find = string.find
+local find, topattern = string.find, string.topattern
 local abs = math.abs
 
 local trace_floats     = false  trackers.register("floats.caching",    function(v) trace_floats     = v end)
@@ -21,7 +21,7 @@ local trace_collecting = false  trackers.register("floats.collecting", function(
 local report_floats     = logs.reporter("floats","caching")
 local report_collecting = logs.reporter("floats","collecting")
 
-local C, S, P, lpegmatch = lpeg.C, lpeg.S, lpeg.P, lpeg.match
+local C, Cc, S, P, lpegmatch = lpeg.C, lpeg.Cc, lpeg.S, lpeg.P, lpeg.match
 
 -- we use floatbox, floatwidth, floatheight
 -- text page leftpage rightpage (todo: top, bottom, margin, order)
@@ -119,7 +119,7 @@ local function get(stack,n,bylabel)
     if bylabel then
         for i=1,#stack do
             local s = stack[i]
-            local n = string.topattern(tostring(n)) -- to be sure
+            local n = topattern(tostring(n)) -- to be sure
             if find(s.data.label,n) then
                 return s, s.box, i
             end
@@ -326,16 +326,18 @@ end
 
 -- todo: check for digits !
 
+local digits   = lpeg.patterns.digits
+local nothing  = Cc("")
 local method   = C((1-S(", :"))^1)
-local position = P(":") * C((1-S("*,"))^1) * (P("*") * C((1-S(","))^1))^0
+local position = P(":") * C(digits^1) * (P("*") * C(digits^1) + nothing)
 local label    = P(":") * C((1-S(",*: "))^0)
 
 local pattern = method * (
-    label * position * C("")
-  + C("") * position * C("")
-  + label * C("") * C("")
-  + C("") * C("") * C("")
-) + C("") * C("") * C("") * C("")
+    label * position
+  + nothing * position
+  + label * nothing * nothing
+  + nothing * nothing * nothing
+) + nothing * nothing * nothing * nothing
 
 -- inspect { lpegmatch(pattern,"somewhere:blabla,crap") }
 -- inspect { lpegmatch(pattern,"somewhere:1*2") }
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 6e310ba05..d880990ea 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 fbb5dddc8..732a6ddb9 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 acab1e472..b4fe6aca0 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.11.24 15:16}
+\newcontextversion{2021.11.24 19: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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 36991e8e6..92fdea6ed 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.11.24 15:16}
+\immutable\edef\contextversion{2021.11.24 19:45}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 9e290295f..211277fa7 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-11-24 15:16
+-- merge date  : 2021-11-24 19:45
 
 do -- begin closure to overcome local limits and interference