summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtx-context.lua20
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin25388 -> 25384 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin257036 -> 257025 bytes
-rw-r--r--tex/context/base/mkxl/cont-new.mkxl2
-rw-r--r--tex/context/base/mkxl/context.mkxl2
-rw-r--r--tex/context/base/mkxl/driv-shp.lmt10
-rw-r--r--tex/context/base/mkxl/lpdf-ini.lmt2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 27 insertions, 19 deletions
diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index 5b159158c..7ae350111 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -1452,20 +1452,29 @@ function scripts.context.pages()
end
if page or list then
if page then
+ for i=1,#page do
+ page[i] = string.topattern(page[i])
+ end
for i=1,#p do
local pi = p[i]
local m = pi.marked
if m then
+ local ml = #m
for j=1,#page do
local n = page[j]
- if table.contains(m,n) then
- report("page : %04i %s",i,n)
+ for k=1,ml do
+ if find(m[k],n) then
+ report("page : %04i %s",i,m[k])
+ end
end
end
end
end
end
if list then
+ for i=1,#list do
+ list[i] = string.topattern(list[i])
+ end
for i=1,#l do
local li = l[i]
local r = li.references
@@ -1473,10 +1482,13 @@ function scripts.context.pages()
local rr = r.reference
if rr then
rr = splitstring(rr,",")
+ local rrl = #rr
for j=1,#list do
local n = list[j]
- if table.contains(rr,n) then
- report("list : %04i %s",r.realpage,n)
+ for k=1,rrl do
+ if find(rr[k],n) then
+ report("list : %04i %s",r.realpage,rr[k])
+ end
end
end
end
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 892644485..ca8b992be 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.03.05 11:13}
+\newcontextversion{2021.03.05 19:11}
%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 beba48148..33f8c3aba 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.03.05 11:13}
+\edef\contextversion{2021.03.05 19:11}
%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 f12dfde45..89ef1e6c3 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.03.05 11:13}
+\newcontextversion{2021.03.05 19:11}
%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 c149869df..49eb15049 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.03.05 11:13}
+\edef\contextversion{2021.03.05 19:11}
%D Kind of special:
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index eccdf2ee0..e890fa88c 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 4ccd668fc..ffeb01fef 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index e1a59c4e4..b60dd2ddd 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.03.05 11:13}
+\newcontextversion{2021.03.05 19:11}
%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 b3633879c..88b99e7d4 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.03.05 11:13}
+\immutable\edef\contextversion{2021.03.05 19:11}
%overloadmode 1 % check frozen / warning
%overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/driv-shp.lmt b/tex/context/base/mkxl/driv-shp.lmt
index 7bbe0a8e9..d3a47bf0d 100644
--- a/tex/context/base/mkxl/driv-shp.lmt
+++ b/tex/context/base/mkxl/driv-shp.lmt
@@ -1323,21 +1323,17 @@ do
local function showdetails(n,l)
local p = properties[tonut(n)]
if p then
- local done = false
for k, v in sortedhash(p) do
local t = type(v)
--- if done then
--- flushline("\n")
--- else
--- done = true
--- end
if t == "string" then
if find(v,"[\n\r]") then
v = "\n" .. stripstring(v) .. "\n"
end
+ elseif t == "number" or t == "boolean" then
+ v = tostring(v)
elseif t == "table" then
v = sequenced(v)
- elseif t ~= "number" and t ~= "boolean" then
+ else
v = "<" .. tostring(v) .. ">"
end
flushline(periods[l+1] .. " " .. k .. " = " .. v)
diff --git a/tex/context/base/mkxl/lpdf-ini.lmt b/tex/context/base/mkxl/lpdf-ini.lmt
index 759f5e33f..27625606a 100644
--- a/tex/context/base/mkxl/lpdf-ini.lmt
+++ b/tex/context/base/mkxl/lpdf-ini.lmt
@@ -1069,7 +1069,7 @@ do
local luatexfunctionality = tostring(LUATEXFUNCTIONALITY)
metadata = {
producer = format("LuaTeX-%s",luatexversion),
- creator = format("LuaTeX %s %s + ConTeXt MkIV %s",luatexversion,luatexfunctionality,contextversion),
+ creator = format("LuaTeX %s %s + ConTeXt LMTX %s",luatexversion,luatexfunctionality,contextversion),
luatexversion = luatexversion,
contextversion = contextversion,
luatexfunctionality = luatexfunctionality,
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index faecb07c3..0dae380ef 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-03-05 11:13
+-- merge date : 2021-03-05 19:11
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 04:42:31 +0000