summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtxrun.lua11
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua11
-rwxr-xr-xscripts/context/stubs/unix/mtxrun11
-rw-r--r--tex/context/base/colo-icc.lua14
-rw-r--r--tex/context/base/context-version.pdfbin4133 -> 4137 bytes
-rw-r--r--tex/context/base/context-version.pngbin39995 -> 40279 bytes
-rw-r--r--tex/context/base/data-tmp.lua5
-rw-r--r--tex/context/base/font-otb.lua4
-rw-r--r--tex/context/base/font-otn.lua4
-rw-r--r--tex/context/base/font-pre.mkiv4
-rw-r--r--tex/context/base/status-files.pdfbin24773 -> 24771 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin210153 -> 210117 bytes
-rw-r--r--tex/context/base/util-sql-imp-library.lua5
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua10
14 files changed, 44 insertions, 35 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index b444e4918..d442b0e30 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -11941,7 +11941,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-tmp"] = package.loaded["data-tmp"] or true
--- original size: 14019, stripped down to: 10708
+-- original size: 14066, stripped down to: 10753
if not modules then modules={} end modules ['data-tmp']={
version=1.100,
@@ -11954,6 +11954,7 @@ local format,lower,gsub,concat=string.format,string.lower,string.gsub,table.conc
local serialize,serializetofile=table.serialize,table.tofile
local mkdirs,isdir=dir.mkdirs,lfs.isdir
local addsuffix,is_writable,is_readable=file.addsuffix,file.is_writable,file.is_readable
+local formatters=string.formatters
local trace_locating=false trackers.register("resolvers.locating",function(v) trace_locating=v end)
local trace_cache=false trackers.register("resolvers.cache",function(v) trace_cache=v end)
local report_caches=logs.reporter("resolvers","caches")
@@ -12070,10 +12071,10 @@ function caches.usedpaths()
for i=1,#readables do
local readable=readables[i]
if usedreadables[i] or readable==writable then
- result[#result+1]=format("readable: %a (order %s)",readable,i)
+ result[#result+1]=formatters["readable: %a (order %s)"](readable,i)
end
end
- result[#result+1]=format("writable: %a",writable)
+ result[#result+1]=formatters["writable: %a"](writable)
return result
else
return writable
@@ -15385,8 +15386,8 @@ end -- of closure
-- used libraries : l-lua.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 636029
--- stripped bytes : 230329
+-- original bytes : 636076
+-- stripped bytes : 230331
-- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index b444e4918..d442b0e30 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -11941,7 +11941,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-tmp"] = package.loaded["data-tmp"] or true
--- original size: 14019, stripped down to: 10708
+-- original size: 14066, stripped down to: 10753
if not modules then modules={} end modules ['data-tmp']={
version=1.100,
@@ -11954,6 +11954,7 @@ local format,lower,gsub,concat=string.format,string.lower,string.gsub,table.conc
local serialize,serializetofile=table.serialize,table.tofile
local mkdirs,isdir=dir.mkdirs,lfs.isdir
local addsuffix,is_writable,is_readable=file.addsuffix,file.is_writable,file.is_readable
+local formatters=string.formatters
local trace_locating=false trackers.register("resolvers.locating",function(v) trace_locating=v end)
local trace_cache=false trackers.register("resolvers.cache",function(v) trace_cache=v end)
local report_caches=logs.reporter("resolvers","caches")
@@ -12070,10 +12071,10 @@ function caches.usedpaths()
for i=1,#readables do
local readable=readables[i]
if usedreadables[i] or readable==writable then
- result[#result+1]=format("readable: %a (order %s)",readable,i)
+ result[#result+1]=formatters["readable: %a (order %s)"](readable,i)
end
end
- result[#result+1]=format("writable: %a",writable)
+ result[#result+1]=formatters["writable: %a"](writable)
return result
else
return writable
@@ -15385,8 +15386,8 @@ end -- of closure
-- used libraries : l-lua.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 636029
--- stripped bytes : 230329
+-- original bytes : 636076
+-- stripped bytes : 230331
-- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index b444e4918..d442b0e30 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -11941,7 +11941,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-tmp"] = package.loaded["data-tmp"] or true
--- original size: 14019, stripped down to: 10708
+-- original size: 14066, stripped down to: 10753
if not modules then modules={} end modules ['data-tmp']={
version=1.100,
@@ -11954,6 +11954,7 @@ local format,lower,gsub,concat=string.format,string.lower,string.gsub,table.conc
local serialize,serializetofile=table.serialize,table.tofile
local mkdirs,isdir=dir.mkdirs,lfs.isdir
local addsuffix,is_writable,is_readable=file.addsuffix,file.is_writable,file.is_readable
+local formatters=string.formatters
local trace_locating=false trackers.register("resolvers.locating",function(v) trace_locating=v end)
local trace_cache=false trackers.register("resolvers.cache",function(v) trace_cache=v end)
local report_caches=logs.reporter("resolvers","caches")
@@ -12070,10 +12071,10 @@ function caches.usedpaths()
for i=1,#readables do
local readable=readables[i]
if usedreadables[i] or readable==writable then
- result[#result+1]=format("readable: %a (order %s)",readable,i)
+ result[#result+1]=formatters["readable: %a (order %s)"](readable,i)
end
end
- result[#result+1]=format("writable: %a",writable)
+ result[#result+1]=formatters["writable: %a"](writable)
return result
else
return writable
@@ -15385,8 +15386,8 @@ end -- of closure
-- used libraries : l-lua.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 636029
--- stripped bytes : 230329
+-- original bytes : 636076
+-- stripped bytes : 230331
-- end library merge
diff --git a/tex/context/base/colo-icc.lua b/tex/context/base/colo-icc.lua
index 157a03198..f7ed561c1 100644
--- a/tex/context/base/colo-icc.lua
+++ b/tex/context/base/colo-icc.lua
@@ -8,6 +8,7 @@ if not modules then modules = { } end modules ['colo-icc'] = {
local char, byte, gsub, match, format, strip = string.char, string.byte, string.gsub, string.match, string.format, string.strip
local readstring, readnumber = io.readstring, io.readnumber
+local formatters = string.formatters
local colors = attributes and attributes.colors or { } -- when used in mtxrun
@@ -27,11 +28,13 @@ function colors.iccprofile(filename,verbose)
end
end
if fullname == "" then
- return nil, false, format("profile %a cannot be found",filename)
+ report_colors("profile %a cannot be found",filename)
+ return nil, false
end
local f = io.open(fullname,"rb")
if not f then
- return nil, false, format("profile %a cannot be loaded",fullname)
+ report_colors("profile %a cannot be loaded",fullname)
+ return nil, false
end
local header = {
size = readnumber(f,4),
@@ -112,9 +115,6 @@ function colors.iccprofile(filename,verbose)
header = header,
tags = tags,
}
- return profile, true, format("profile %a loaded",fullname)
+ report_colors("profile %a loaded",fullname)
+ return profile, true
end
-
---~ local profile, error, message = colors.iccprofile("ussheetfedcoated.icc")
---~ print(error,message)
---~ table.print(profile)
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index b99817f88..8533f51c4 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 4890e14d2..a0e3d860a 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/data-tmp.lua b/tex/context/base/data-tmp.lua
index 6246bfb61..c9180dba6 100644
--- a/tex/context/base/data-tmp.lua
+++ b/tex/context/base/data-tmp.lua
@@ -26,6 +26,7 @@ local format, lower, gsub, concat = string.format, string.lower, string.gsub, ta
local serialize, serializetofile = table.serialize, table.tofile
local mkdirs, isdir = dir.mkdirs, lfs.isdir
local addsuffix, is_writable, is_readable = file.addsuffix, file.is_writable, file.is_readable
+local formatters = string.formatters
local trace_locating = false trackers.register("resolvers.locating", function(v) trace_locating = v end)
local trace_cache = false trackers.register("resolvers.cache", function(v) trace_cache = v end)
@@ -169,10 +170,10 @@ function caches.usedpaths()
for i=1,#readables do
local readable = readables[i]
if usedreadables[i] or readable == writable then
- result[#result+1] = format("readable: %a (order %s)",readable,i)
+ result[#result+1] = formatters["readable: %a (order %s)"](readable,i)
end
end
- result[#result+1] = format("writable: %a",writable)
+ result[#result+1] = formatters["writable: %a"](writable)
return result
else
return writable
diff --git a/tex/context/base/font-otb.lua b/tex/context/base/font-otb.lua
index 3c38cad7f..0ae46c6f0 100644
--- a/tex/context/base/font-otb.lua
+++ b/tex/context/base/font-otb.lua
@@ -64,9 +64,9 @@ end
local function cref(feature,lookupname)
if lookupname then
- return format("feature %a, lookup %a",feature,lookupname)
+ return formatters["feature %a, lookup %a"](feature,lookupname)
else
- return format("feature %a",feature)
+ return formatters["feature %a"](feature)
end
end
diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua
index b6ee5a475..4a0052904 100644
--- a/tex/context/base/font-otn.lua
+++ b/tex/context/base/font-otn.lua
@@ -301,7 +301,7 @@ local function gref(n) -- currently the same as in font-otb
end
end
-local function cref(kind,chainname,chainlookupname,lookupname,index)
+local function cref(kind,chainname,chainlookupname,lookupname,index) -- not in the mood to alias f_
if index then
return formatters["feature %a, chain %a, sub %a, lookup %a, index %a"](kind,chainname,chainlookupname,lookupname,index)
elseif lookupname then
@@ -316,7 +316,7 @@ local function cref(kind,chainname,chainlookupname,lookupname,index)
end
local function pref(kind,lookupname)
- return format("feature %s, lookup %s",kind,lookupname)
+ return formatters["feature %a, lookup %a"](kind,lookupname)
end
-- We can assume that languages that use marks are not hyphenated. We can also assume
diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv
index 21da2bf26..4230cafb6 100644
--- a/tex/context/base/font-pre.mkiv
+++ b/tex/context/base/font-pre.mkiv
@@ -48,6 +48,10 @@
tlig=yes,
trep=yes] % texligatures=yes,texquotes=yes
+% \definefontfeature
+% [newstyle]
+% [onum=no]
+
\definefontfeature % == default unless redefined
[ligatures]
[always]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 3914e74be..769f3ecb9 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 8c8020263..b1551f6d8 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/util-sql-imp-library.lua b/tex/context/base/util-sql-imp-library.lua
index 34b9b339d..15754e26a 100644
--- a/tex/context/base/util-sql-imp-library.lua
+++ b/tex/context/base/util-sql-imp-library.lua
@@ -80,6 +80,7 @@ local querysplitter = helpers.querysplitter
local dataprepared = helpers.preparetemplate
local serialize = sql.serialize
local deserialize = sql.deserialize
+local formatters = string.formatters
local initialize = mysql.mysql
@@ -109,11 +110,11 @@ local function fetched(specification,query,converter)
if not connection then
session = initialize()
if not session then
- return format("no session for %a",id)
+ return formatters["no session for %a"](id)
end
connection = connect(session,specification)
if not connection then
- return format("no connection for %a",id)
+ return formatters["no connection for %a"](id)
end
cache[id] = { session = session, connection = connection }
end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index dd5587d62..f9533f82f 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 : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 03/14/13 23:02:19
+-- merge date : 03/15/13 00:17:23
do -- begin closure to overcome local limits and interference
@@ -7001,9 +7001,9 @@ local function gref(descriptions,n)
end
local function cref(feature,lookupname)
if lookupname then
- return format("feature %a, lookup %a",feature,lookupname)
+ return formatters["feature %a, lookup %a"](feature,lookupname)
else
- return format("feature %a",feature)
+ return formatters["feature %a"](feature)
end
end
local function report_alternate(feature,lookupname,descriptions,unicode,replacement,value,comment)
@@ -8385,7 +8385,7 @@ local function gref(n)
return "<error in node mode tracing>"
end
end
-local function cref(kind,chainname,chainlookupname,lookupname,index)
+local function cref(kind,chainname,chainlookupname,lookupname,index)
if index then
return formatters["feature %a, chain %a, sub %a, lookup %a, index %a"](kind,chainname,chainlookupname,lookupname,index)
elseif lookupname then
@@ -8399,7 +8399,7 @@ local function cref(kind,chainname,chainlookupname,lookupname,index)
end
end
local function pref(kind,lookupname)
- return format("feature %s, lookup %s",kind,lookupname)
+ return formatters["feature %a, lookup %a"](kind,lookupname)
end
local function copy_glyph(g)
local components=g.components
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 04:19:31 +0000