summaryrefslogtreecommitdiff
path: root/Master/bin
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-05-06 22:03:57 +0000
committerKarl Berry <karl@freefriends.org>2023-05-06 22:03:57 +0000
commit996ab582db894fb0949df386489a5101ed07062e (patch)
treea124f1b8886ff8c004c9960709f056b3d898aa99 /Master/bin
parent6a69999bbc827b94cfa79dae2264da0d4b2f0e02 (diff)
luametatex 2.10.08, context 2023.05.05 18:36
git-svn-id: svn://tug.org/texlive/trunk@67034 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/bin')
-rwxr-xr-xMaster/bin/aarch64-linux/luametatexbin3117168 -> 3165648 bytes
-rwxr-xr-xMaster/bin/amd64-freebsd/luametatexbin2972064 -> 3045968 bytes
-rwxr-xr-xMaster/bin/armhf-linux/luametatexbin2367724 -> 2414360 bytes
-rwxr-xr-xMaster/bin/i386-freebsd/luametatexbin2651300 -> 2714536 bytes
-rwxr-xr-xMaster/bin/i386-linux/luametatexbin3822280 -> 3927316 bytes
-rwxr-xr-xMaster/bin/i386-solaris/luametatexbin2880096 -> 2944452 bytes
-rw-r--r--Master/bin/windows/context.lua82
-rwxr-xr-xMaster/bin/windows/luametatex.exebin3005146 -> 2886144 bytes
-rwxr-xr-xMaster/bin/windows/mtxrun.lua135
-rwxr-xr-xMaster/bin/x86_64-darwinlegacy/luametatexbin2823900 -> 2888284 bytes
-rwxr-xr-xMaster/bin/x86_64-linuxmusl/luametatexbin3084312 -> 3159520 bytes
-rwxr-xr-xMaster/bin/x86_64-solaris/luametatexbin3404712 -> 3481440 bytes
12 files changed, 131 insertions, 86 deletions
diff --git a/Master/bin/aarch64-linux/luametatex b/Master/bin/aarch64-linux/luametatex
index 510f75311f7..7ef2ca03861 100755
--- a/Master/bin/aarch64-linux/luametatex
+++ b/Master/bin/aarch64-linux/luametatex
Binary files differ
diff --git a/Master/bin/amd64-freebsd/luametatex b/Master/bin/amd64-freebsd/luametatex
index db20750a2a3..f3ca40325d1 100755
--- a/Master/bin/amd64-freebsd/luametatex
+++ b/Master/bin/amd64-freebsd/luametatex
Binary files differ
diff --git a/Master/bin/armhf-linux/luametatex b/Master/bin/armhf-linux/luametatex
index 0ada2c271f9..06bf251af6e 100755
--- a/Master/bin/armhf-linux/luametatex
+++ b/Master/bin/armhf-linux/luametatex
Binary files differ
diff --git a/Master/bin/i386-freebsd/luametatex b/Master/bin/i386-freebsd/luametatex
index 36377d15a13..182e534f388 100755
--- a/Master/bin/i386-freebsd/luametatex
+++ b/Master/bin/i386-freebsd/luametatex
Binary files differ
diff --git a/Master/bin/i386-linux/luametatex b/Master/bin/i386-linux/luametatex
index ec56c2772c7..e078586c377 100755
--- a/Master/bin/i386-linux/luametatex
+++ b/Master/bin/i386-linux/luametatex
Binary files differ
diff --git a/Master/bin/i386-solaris/luametatex b/Master/bin/i386-solaris/luametatex
index edfbdaee242..74392bea502 100755
--- a/Master/bin/i386-solaris/luametatex
+++ b/Master/bin/i386-solaris/luametatex
Binary files differ
diff --git a/Master/bin/windows/context.lua b/Master/bin/windows/context.lua
index da2442d85ab..b44312cfab1 100644
--- a/Master/bin/windows/context.lua
+++ b/Master/bin/windows/context.lua
@@ -1,41 +1,41 @@
--- This file is a companion to "context(.exe)" and is effectively the same
--- as:
---
--- mtxrun -script context ...
---
--- which will locate "mtx-context.lua" and load that one. The binary is a
--- copy of "luametatex(.exe)" aka luatex 2.0 for context lmtx. In a similar
--- fashion "mtxrun(.exe)" will load the "mtrun.lua" script.
---
--- The installation of context should do this on Windows:
---
--- luametatex.exe -> tex/texmf-win64/bin/luatex.exe
--- luametatex.exe -> tex/texmf-win64/bin/mtxrun.exe
--- luametatex.exe -> tex/texmf-win64/bin/context.exe
--- mtxrun.lua -> tex/texmf-win64/bin/mtxrun.lua
--- context.lua -> tex/texmf-win64/bin/context.lua
---
--- and this on Unix:
---
--- luametatex -> tex/texmf-linux-64/bin/luatex
--- luametatex -> tex/texmf-linux-64/bin/mtxrun
--- luametatex -> tex/texmf-linux-64/bin/context
--- mtxrun.lua -> tex/texmf-linux-64/bin/mtxrun.lua
--- context.lua -> tex/texmf-linux-64/bin/context.lua
---
--- The static binary is smaller than 3MB so the few copies provide no real
--- overhead.
-
-local selfpath = os.selfpath
-
-if not arg or not selfpath then
- print("invalid stub")
- os.exit()
-end
-
-arg[0] = "mtxrun"
-
-table.insert(arg,1,"mtx-context")
-table.insert(arg,1,"--script")
-
-dofile(selfpath .. "/" .. "mtxrun.lua")
+-- This file is a companion to "context(.exe)" and is effectively the same
+-- as:
+--
+-- mtxrun -script context ...
+--
+-- which will locate "mtx-context.lua" and load that one. The binary is a
+-- copy of "luametatex(.exe)" aka luatex 2.0 for context lmtx. In a similar
+-- fashion "mtxrun(.exe)" will load the "mtrun.lua" script.
+--
+-- The installation of context should do this on Windows:
+--
+-- luametatex.exe -> tex/texmf-win64/bin/luatex.exe
+-- luametatex.exe -> tex/texmf-win64/bin/mtxrun.exe
+-- luametatex.exe -> tex/texmf-win64/bin/context.exe
+-- mtxrun.lua -> tex/texmf-win64/bin/mtxrun.lua
+-- context.lua -> tex/texmf-win64/bin/context.lua
+--
+-- and this on Unix:
+--
+-- luametatex -> tex/texmf-linux-64/bin/luatex
+-- luametatex -> tex/texmf-linux-64/bin/mtxrun
+-- luametatex -> tex/texmf-linux-64/bin/context
+-- mtxrun.lua -> tex/texmf-linux-64/bin/mtxrun.lua
+-- context.lua -> tex/texmf-linux-64/bin/context.lua
+--
+-- The static binary is smaller than 3MB so the few copies provide no real
+-- overhead.
+
+local selfpath = os.selfpath
+
+if not arg or not selfpath then
+ print("invalid stub")
+ os.exit()
+end
+
+arg[0] = "mtxrun"
+
+table.insert(arg,1,"mtx-context")
+table.insert(arg,1,"--script")
+
+dofile(selfpath .. "/" .. "mtxrun.lua")
diff --git a/Master/bin/windows/luametatex.exe b/Master/bin/windows/luametatex.exe
index 7bd6876f4e8..2be235a9119 100755
--- a/Master/bin/windows/luametatex.exe
+++ b/Master/bin/windows/luametatex.exe
Binary files differ
diff --git a/Master/bin/windows/mtxrun.lua b/Master/bin/windows/mtxrun.lua
index cd83189a40f..f8ef741105e 100755
--- a/Master/bin/windows/mtxrun.lua
+++ b/Master/bin/windows/mtxrun.lua
@@ -5136,7 +5136,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["l-dir"] = package.loaded["l-dir"] or true
--- original size: 18893, stripped down to: 11170
+-- original size: 19139, stripped down to: 11345
if not modules then modules={} end modules ['l-dir']={
version=1.001,
@@ -5154,7 +5154,7 @@ dir=dir or {}
local dir=dir
local lfs=lfs
local attributes=lfs.attributes
-local walkdir=lfs.dir
+local scandir=lfs.dir
local isdir=lfs.isdir
local isfile=lfs.isfile
local currentdir=lfs.currentdir
@@ -5185,6 +5185,15 @@ else
lfs.isdir=isdir
lfs.isfile=isfile
end
+local isreadable=file.isreadable
+local walkdir=function(p,...)
+ if isreadable(p.."/.") then
+ return scandir(p,...)
+ else
+ return function() end
+ end
+end
+lfs.walkdir=walkdir
function dir.current()
return (gsub(currentdir(),"\\","/"))
end
@@ -8657,7 +8666,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["util-sac"] = package.loaded["util-sac"] or true
--- original size: 14071, stripped down to: 10417
+-- original size: 14107, stripped down to: 10453
if not modules then modules={} end modules ['util-sac']={
version=1.001,
@@ -9136,13 +9145,13 @@ if bit32 and not streams.tocardinal1 then
local extract=bit32.extract
local char=string.char
streams.tocardinal1=char
- function streams.tocardinal2(n) return char(extract(8,8),extract(0,8)) end
- function streams.tocardinal3(n) return char(extract(16,8),extract(8,8),extract(0,8)) end
- function streams.tocardinal4(n) return char(extract(24,8),extract(16,8),extract(8,8),extract(0,8)) end
+ function streams.tocardinal2(n) return char(extract(n,8,8),extract(n,0,8)) end
+ function streams.tocardinal3(n) return char(extract(n,16,8),extract(n,8,8),extract(n,0,8)) end
+ function streams.tocardinal4(n) return char(extract(n,24,8),extract(n,16,8),extract(n,8,8),extract(n,0,8)) end
streams.tocardinal1le=char
- function streams.tocardinal2le(n) return char(extract(0,8),extract(8,8)) end
- function streams.tocardinal3le(n) return char(extract(0,8),extract(8,8),extract(16,8)) end
- function streams.tocardinal4le(n) return char(extract(0,8),extract(8,8),extract(16,8),extract(24,8)) end
+ function streams.tocardinal2le(n) return char(extract(n,0,8),extract(n,8,8)) end
+ function streams.tocardinal3le(n) return char(extract(n,0,8),extract(n,8,8),extract(n,16,8)) end
+ function streams.tocardinal4le(n) return char(extract(n,0,8),extract(n,8,8),extract(n,16,8),extract(n,24,8)) end
end
if not streams.readcstring then
local readchar=streams.readchar
@@ -9338,7 +9347,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["util-prs"] = package.loaded["util-prs"] or true
--- original size: 25542, stripped down to: 16783
+-- original size: 25716, stripped down to: 16805
if not modules then modules={} end modules ['util-prs']={
version=1.001,
@@ -9546,7 +9555,9 @@ function parsers.groupedsplitat(symbol,withaction)
if not pattern then
local symbols=S(symbol)
local separator=space^0*symbols*space^0
- local value=lbrace*C((nobrace+nestedbraces)^0)*rbrace+C((nestedbraces+(1-(space^0*(symbols+P(-1)))))^0)
+ local value=lbrace*C((nobrace+nestedbraces)^0)
+*(rbrace*(#symbols+P(-1)))
++C((nestedbraces+(1-(space^0*(symbols+P(-1)))))^0)
if withaction then
local withvalue=Carg(1)*value/function(f,s) return f(s) end
pattern=spaces*withvalue*(separator*withvalue)^0
@@ -9940,7 +9951,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["util-fmt"] = package.loaded["util-fmt"] or true
--- original size: 2541, stripped down to: 1624
+-- original size: 3379, stripped down to: 2273
if not modules then modules={} end modules ['util-fmt']={
version=1.001,
@@ -9953,19 +9964,21 @@ utilities=utilities or {}
utilities.formatters=utilities.formatters or {}
local formatters=utilities.formatters
local concat,format=table.concat,string.format
-local tostring,type=tostring,type
+local tostring,type,unpack=tostring,type,unpack
local strip=string.strip
local lpegmatch=lpeg.match
local stripper=lpeg.patterns.stripzeros
function formatters.stripzeros(str)
return lpegmatch(stripper,str)
end
-function formatters.formatcolumns(result,between)
+function formatters.formatcolumns(result,between,header)
if result and #result>0 then
- between=between or " "
- local widths,numbers={},{}
+ local widths={}
+ local numbers={}
+ local templates={}
local first=result[1]
local n=#first
+ between=between or " "
for i=1,n do
widths[i]=0
end
@@ -9987,31 +10000,61 @@ function formatters.formatcolumns(result,between)
end
end
end
+ if header then
+ for i=1,#header do
+ local h=header[i]
+ for j=1,n do
+ local hj=tostring(h[j])
+ h[j]=hj
+ local w=#hj
+ if w>widths[j] then
+ widths[j]=w
+ end
+ end
+ end
+ end
for i=1,n do
local w=widths[i]
if numbers[i] then
if w>80 then
- widths[i]="%s"..between
- else
- widths[i]="%0"..w.."i"..between
+ templates[i]="%s"..between
+ else
+ templates[i]="% "..w.."i"..between
end
else
if w>80 then
- widths[i]="%s"..between
- elseif w>0 then
- widths[i]="%-"..w.."s"..between
+ templates[i]="%s"..between
+ elseif w>0 then
+ templates[i]="%-"..w.."s"..between
else
- widths[i]="%s"
+ templates[i]="%s"
end
end
end
- local template=strip(concat(widths))
+ local template=strip(concat(templates))
for i=1,#result do
local str=format(template,unpack(result[i]))
result[i]=strip(str)
end
+ if header then
+ for i=1,n do
+ local w=widths[i]
+ if w>80 then
+ templates[i]="%s"..between
+ elseif w>0 then
+ templates[i]="%-"..w.."s"..between
+ else
+ templates[i]="%s"
+ end
+ end
+ local template=strip(concat(templates))
+ for i=1,#header do
+ local str=format(template,unpack(header[i]))
+ header[i]=strip(str)
+ end
+ end
end
- return result
+ return result,header
end
@@ -14760,7 +14803,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["util-sbx"] = package.loaded["util-sbx"] or true
--- original size: 21145, stripped down to: 13271
+-- original size: 21146, stripped down to: 13272
if not modules then modules={} end modules ['util-sbx']={
version=1.001,
@@ -15070,7 +15113,7 @@ local runners={
if trace then
report("resultof: %s",command)
end
- local handle=iopopen(command,"r")
+ local handle=iopopen(command,"rb")
if handle then
local result=handle:read("*all") or ""
handle:close()
@@ -16395,7 +16438,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
--- original size: 62810, stripped down to: 36225
+-- original size: 62221, stripped down to: 36225
if not modules then modules={} end modules ['lxml-tab']={
version=1.001,
@@ -17876,7 +17919,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["lxml-lpt"] = package.loaded["lxml-lpt"] or true
--- original size: 54733, stripped down to: 31258
+-- original size: 54589, stripped down to: 31258
if not modules then modules={} end modules ['lxml-lpt']={
version=1.001,
@@ -19127,7 +19170,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["lxml-mis"] = package.loaded["lxml-mis"] or true
--- original size: 3574, stripped down to: 1808
+-- original size: 3542, stripped down to: 1808
if not modules then modules={} end modules ['lxml-mis']={
version=1.001,
@@ -19196,7 +19239,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
--- original size: 34661, stripped down to: 21511
+-- original size: 34522, stripped down to: 21511
if not modules then modules={} end modules ['lxml-aux']={
version=1.001,
@@ -21703,7 +21746,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-tmp"] = package.loaded["data-tmp"] or true
--- original size: 16456, stripped down to: 11636
+-- original size: 16433, stripped down to: 11636
if not modules then modules={} end modules ['data-tmp']={
version=1.100,
@@ -22238,7 +22281,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 69576, stripped down to: 44470
+-- original size: 70711, stripped down to: 44839
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -22306,13 +22349,15 @@ local criticalvars={
if environment.default_texmfcnf then
resolvers.luacnfspec="home:texmf/web2c;"..environment.default_texmfcnf
else
- resolvers.luacnfspec=concat ({
- "home:texmf/web2c",
- "selfautoparent:/texmf-local/web2c",
- "selfautoparent:/texmf-context/web2c",
- "selfautoparent:/texmf-dist/web2c",
- "selfautoparent:/texmf/web2c",
- },";")
+ local texroot=environment.texroot
+ resolvers.luacnfspec="home:texmf/web2c;selfautoparent:/texmf-local/web2c;selfautoparent:/texmf-context/web2c;selfautoparent:/texmf/web2c"
+ if texroot and isdir(texroot.."/texmf-context") then
+ elseif texroot and isdir(texroot.."/texmf-dist") then
+ resolvers.luacnfspec="home:texmf/web2c;selfautoparent:/texmf-local/web2c;selfautoparent:/texmf-dist/web2c;selfautoparent:/texmf/web2c"
+ elseif ostype~="windows" and isdir("/etc/texmf/web2c") then
+ resolvers.luacnfspec="home:texmf/web2c;/etc/texmf/web2c;selfautodir:/share/texmf/web2c"
+ else
+ end
end
local unset_variable="unset"
local formats=resolvers.formats
@@ -24247,7 +24292,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-con"] = package.loaded["data-con"] or true
--- original size: 5487, stripped down to: 3757
+-- original size: 5477, stripped down to: 3757
if not modules then modules={} end modules ['data-con']={
version=1.100,
@@ -24465,7 +24510,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-zip"] = package.loaded["data-zip"] or true
--- original size: 10805, stripped down to: 7951
+-- original size: 10789, stripped down to: 7951
if not modules then modules={} end modules ['data-zip']={
version=1.001,
@@ -25806,7 +25851,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
--- original size: 11691, stripped down to: 8350
+-- original size: 12056, stripped down to: 8398
if not modules then modules={} end modules ['luat-fmt']={
version=1.001,
@@ -26093,8 +26138,8 @@ end -- of closure
-- used libraries : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.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-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-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 libs-ini.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 1035743
--- stripped bytes : 408144
+-- original bytes : 1037585
+-- stripped bytes : 408686
-- end library merge
diff --git a/Master/bin/x86_64-darwinlegacy/luametatex b/Master/bin/x86_64-darwinlegacy/luametatex
index 07c07ee28cf..dab706a6b9f 100755
--- a/Master/bin/x86_64-darwinlegacy/luametatex
+++ b/Master/bin/x86_64-darwinlegacy/luametatex
Binary files differ
diff --git a/Master/bin/x86_64-linuxmusl/luametatex b/Master/bin/x86_64-linuxmusl/luametatex
index 9ad7ff17734..d091d1c6114 100755
--- a/Master/bin/x86_64-linuxmusl/luametatex
+++ b/Master/bin/x86_64-linuxmusl/luametatex
Binary files differ
diff --git a/Master/bin/x86_64-solaris/luametatex b/Master/bin/x86_64-solaris/luametatex
index c38a8627a36..8db94b94825 100755
--- a/Master/bin/x86_64-solaris/luametatex
+++ b/Master/bin/x86_64-solaris/luametatex
Binary files differ