summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-12 23:04:14 +0000
committerKarl Berry <karl@freefriends.org>2021-11-12 23:04:14 +0000
commit0ff2ba12c9b350c0546c2256e398168d325d234a (patch)
treead8b6639a8ea08db1ae7b1092f84aab7e8ad43ee /Master/texmf-dist/scripts
parent933d3ad47a7b54da768a6a1f8a2fe702bcfa9b2e (diff)
l3 (12nov21)
git-svn-id: svn://tug.org/texlive/trunk@61040 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-arguments.lua4
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-aux.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua3
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-clean.lua3
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-ctan.lua3
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-file-functions.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-help.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-install.lua12
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-manifest.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-stdmain.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-tagging.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-unpack.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-upload.lua8
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-variables.lua2
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua6
17 files changed, 29 insertions, 30 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
index 8f62e8b433f..470290db562 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-arguments.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-arguments.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -141,7 +141,7 @@ option_list =
},
["show-saves"] =
{
- desc = "If tests fail, show the l3build save invocation to regenerate the tests",
+ desc = "Show the invocation to update failing .tlg files",
short = "S",
type = "boolean"
},
diff --git a/Master/texmf-dist/scripts/l3build/l3build-aux.lua b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
index 12fe704af49..42e7f6a53a5 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-aux.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-aux.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-aux.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index f83dee4e448..3e8089970a3 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-check.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-check.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -548,6 +548,7 @@ local function normalize_pdf(content)
not match(line,"^%%%%Invocation") and
not match(line,"^%%%%%+") then
line = gsub(line,"%/ID( ?)%[<[^>]+><[^>]+>]","/ID%1[<ID-STRING><ID-STRING>]")
+ line = gsub(line,"%/ID( ?)%[(%b())%2%]","/ID%1[<ID-STRING><ID-STRING>]")
new_content = new_content .. line .. os_newline
end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-clean.lua b/Master/texmf-dist/scripts/l3build/l3build-clean.lua
index f548a392eb9..226650b478d 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-clean.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-clean.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-clean.lua Copyright (C) 2018,2020 The LaTeX Project
+File l3build-clean.lua Copyright (C) 2018,2020,2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -77,4 +77,3 @@ function bundleclean()
+ rmdir(ctandir)
+ rmdir(tdsdir)
end
-
diff --git a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
index e5b3b7e8f84..1f5aa2bc906 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-ctan.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-ctan.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -160,4 +160,3 @@ function ctan()
end
return errorlevel
end
-
diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
index 53364bd3010..1fc9e1d47af 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-file-functions.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-file-functions.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-help.lua b/Master/texmf-dist/scripts/l3build/l3build-help.lua
index 6431ac547ef..2e7d776a730 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-help.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-help.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-help.lua Copyright (C) 2018,2020 The LaTeX Project
+File l3build-help.lua Copyright (C) 2018,2020,2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index f4839fdca77..21257aad0d6 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-install.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-install.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -234,11 +234,11 @@ function install_files(target,full,dry_run)
typesetlist = create_file_list(docfiledir,typesetfiles,{sourcefiles})
sourcelist = create_file_list(sourcefiledir,sourcefiles,
{bstfiles,installfiles,makeindexfiles,scriptfiles})
-
+
if dry_run then
print("\nFor installation inside " .. target .. ":")
- end
-
+ end
+
errorlevel = create_install_map(sourcefiledir,"source",{sourcelist})
+ create_install_map(docfiledir,"doc",
{bibfiles,demofiles,docfiles,pdffiles,textfiles,typesetlist})
@@ -290,8 +290,8 @@ function install_files(target,full,dry_run)
for _,v in ipairs(installmap) do
errorlevel = cp(v.file,v.source,v.dest)
if errorlevel ~= 0 then return errorlevel end
- end
-
+ end
+
return 0
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua
index 9fcf4937297..f7051dac5c5 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-manifest-setup.lua Copyright (C) 2018,2020 The LaTeX Project
+File l3build-manifest-setup.lua Copyright (C) 2018,2020,2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
index f9b1c4e82e9..8f3e5ef4217 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-manifest.lua Copyright (C) 2018,2020 The LaTeX Project
+File l3build-manifest.lua Copyright (C) 2018,2020,2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index 80b5cc84be1..4b6da6675e9 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-stdmain.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-stdmain.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-tagging.lua b/Master/texmf-dist/scripts/l3build/l3build-tagging.lua
index e255aba5cdd..9f396505980 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-tagging.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-tagging.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-tagging.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-tagging.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 716648f7fd4..4934c3f4979 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-typesetting.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-typesetting.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
index 7ab21ee09d4..a734d4c8ea9 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-unpack.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-unpack.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build-upload.lua b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
index 47268f5b6a9..be814ce5ae8 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-upload.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-upload.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-upload.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -145,9 +145,9 @@ function upload(tagnames)
output(curlopt)
write(ctan_post)
close(curlopt)
-
+
ctan_post=curlexe .. " --config " .. curloptfile
-
+
if options["debug"] then
ctan_post = ctan_post .. ' https://httpbin.org/post'
@@ -254,7 +254,7 @@ function construct_ctan_post(uploadfile,debug)
-- start building the curl command:
-- commandline ctan_post = curlexe .. " "
ctan_post=""
-
+
-- build up the curl command field-by-field:
-- field max desc mandatory multi
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index f1032004b60..9f2b25b8d2e 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-variables.lua Copyright (C) 2018-2020 The LaTeX Project
+File l3build-variables.lua Copyright (C) 2018-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 51b7a493e31..b48aa306f71 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -2,7 +2,7 @@
--[[
-File l3build.lua Copyright (C) 2014-2020 The LaTeX Project
+File l3build.lua Copyright (C) 2014-2021 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2021-08-28"
+release_date = "2021-11-12"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -201,7 +201,7 @@ end
if #checkconfigs == 1 and
checkconfigs[1] ~= "build" and
(options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then
- local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua"
+ local config = "./" .. gsub(checkconfigs[1],"%.lua$","") .. ".lua"
if fileexists(config) then
local savedtestfiledir = testfiledir
dofile(config)