diff options
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/l3build/l3build.lua | 2 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/l3build.pdf | bin | 742105 -> 742027 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/l3build.1 | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/l3build.man1.pdf | bin | 14932 -> 14956 bytes | |||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 6 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-zip.lua | 31 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/l3build/l3build.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.dtx | 2 |
11 files changed, 51 insertions, 16 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index 0aead12f956..55d6999808e 100644 --- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua +++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2023-02-26" +release_date = "2023-03-08" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 4b8b66783d5..335c52ef0de 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 66378 2023-03-05 21:09:54Z karl $ +# $Id: tlmgr.pl 66457 2023-03-07 23:07:12Z preining $ # Copyright 2008-2023 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -8,8 +8,8 @@ use strict; use warnings; -my $svnrev = '$Revision: 66378 $'; -my $datrev = '$Date: 2023-03-05 22:09:54 +0100 (Sun, 05 Mar 2023) $'; +my $svnrev = '$Revision: 66457 $'; +my $datrev = '$Date: 2023-03-08 00:07:12 +0100 (Wed, 08 Mar 2023) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -896,7 +896,7 @@ sub handle_execute_actions { my $lmtx = "$bindir/luametatex"; if (defined($localtlpdb->get_package('context')) && (-x "$lmtx" || -x "$lmtx.exe") - && (wndws() || TeXLive::TLUtils::system_ok("$lmtx --version")) + && TeXLive::TLUtils::system_ok("$lmtx --version") ) { $errors += do_cmd_and_check("mtxrun --generate"); $errors += do_cmd_and_check("context --luatex --generate"); @@ -10254,7 +10254,7 @@ This script and its documentation were written for the TeX Live distribution (L<https://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 66378 2023-03-05 21:09:54Z karl $ +$Id: tlmgr.pl 66457 2023-03-07 23:07:12Z preining $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index d65bbfc7d0d..39389f6fb8e 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-03-08] + +### Changed +- Generalize normalization of ghostscript version in PDF-based tests +- Include UNIX timestamps in generated ZIP files +- Normalize pdfTeX `.enc` file loading + ## [2023-02-26] ### Changed @@ -640,7 +647,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-26...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-08...HEAD +[2023-03-08]: https://github.com/latex3/l3build/compare/2023-02-26...2023-03-08 [2023-02-26]: https://github.com/latex3/l3build/compare/2023-02-20...2023-02-26 [2023-02-20]: https://github.com/latex3/l3build/compare/2023-02-16...2023-02-20 [2023-02-16]: https://github.com/latex3/l3build/compare/2022-11-10...2023-02-16 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index d66bf91b0f3..e1e5a05212f 100644 --- a/Master/texmf-dist/doc/latex/l3build/README.md +++ b/Master/texmf-dist/doc/latex/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX ================================================= -Release 2023-02-26 +Release 2023-03-08 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf Binary files differindex 617ba9b69a0..da58149a235 100644 --- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf +++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index 2044b290a6f..746b894accc 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2023-02-26" +.TH l3build 1 "2023-03-08" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf Binary files differindex 8c53d5cf9d7..90a12247b0d 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 8c3afa4a7e1..e7569b69d22 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -156,6 +156,10 @@ local function normalize_log(content,engine,errlevels) if match(line, "^%.+\\XeTeX.?.?.?file") then line = gsub(line, pattern, "../%1") end + -- pdfTeX .enc files + if match(line, "%.enc%}") then + line = gsub(line,"%{" .. pattern .. "%}","") + end -- Deal with dates if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..") @@ -556,7 +560,7 @@ local function normalize_pdf(content) 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>]") - line = gsub(line,"GhostScript %d%.%d+%.?%d*","GhostScript ...") + line = gsub(line,"Ghost[sS]cript %d+%.%d+%.?%d*","Ghostscript ...") new_content = new_content .. line .. os_newline end end diff --git a/Master/texmf-dist/scripts/l3build/l3build-zip.lua b/Master/texmf-dist/scripts/l3build/l3build-zip.lua index 06f37cd8b3c..bf03439f0d2 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-zip.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-zip.lua @@ -39,6 +39,26 @@ local function encode_time(unix) return date, time end +local function extra_timestamp(mod, access, creation) + local flags = 0 + local local_extra, central_extra = '', '' + if mod then + flags = flags | 0x1 + local_extra = pack('<I4', mod) + central_extra = local_extra + end + if access then + flags = flags | 0x2 + local_extra = local_extra .. pack('<I4', access) + end + if creation then + flags = flags | 0x4 + local_extra = local_extra .. pack('<I4', creation) + end + if flags == 0 then return '', '' end + return pack('<c2I2B', 'UT', #central_extra + 1, flags) .. central_extra, pack('<c2I2B', 'UT', #local_extra + 1, flags) .. local_extra +end + local meta = {__index = { add = function(z, filename, innername, binary, executable) innername = innername or filename @@ -55,7 +75,9 @@ local meta = {__index = { if #compressed >= #content then compressed = nil end - local date, time = encode_time(nil) + local timestamp = os.time() + local date, time = encode_time(timestamp) + local central_extra, local_extra = extra_timestamp(timestamp, nil, nil) z.f:write(pack("<c4I2I2I2I2I2I4I4I4I2I2", 'PK\3\4', compressed and 20 or 10, -- ZIP 2.0 to allow deflate @@ -67,8 +89,9 @@ local meta = {__index = { compressed and #compressed or #content, #content, #innername, - 0), + #local_extra), innername, + local_extra, compressed or content) local central = pack("<c4I2I2I2I2I2I2I4I4I4I2I2I2I2I2I4I4", 'PK\1\2', @@ -82,13 +105,13 @@ local meta = {__index = { compressed and #compressed or #content, #content, #innername, - 0, -- no extra data + #central_extra, 0, -- no comment 0, -- Disc 0 binary and 0 or 1, (executable and 0x81ED--[[0100755]] or 0x81A4--[[0100644]]) << 16, offset) - z.central[#z.central+1] = central .. innername + z.central[#z.central+1] = central .. innername .. central_extra end, close = function(z, comment) comment = comment or '' diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 0aead12f956..55d6999808e 100755 --- a/Master/texmf-dist/scripts/l3build/l3build.lua +++ b/Master/texmf-dist/scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2023-02-26" +release_date = "2023-03-08" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 6df655fb980..8ab6295ccb4 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -236,7 +236,7 @@ % }^^A % } % -% \date{Released 2023-02-26} +% \date{Released 2023-03-08} % % \maketitle % \tableofcontents |