From 6b24ace7ac8a3fdf71412e67df9b68eeedbde8e4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Apr 2022 20:41:57 +0000 Subject: l3build (12apr22) git-svn-id: svn://tug.org/texlive/trunk@63014 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/l3build/l3build-check.lua | 11 ++++++++++- Master/texmf-dist/scripts/l3build/l3build-variables.lua | 4 +++- Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/scripts/l3build') diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index f016c25a62b..94ffc671ef8 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-2021 The LaTeX Project +File l3build-check.lua Copyright (C) 2018-2022 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 @@ -246,6 +246,10 @@ local function normalize_log(content,engine,errlevels) if match(line, "^%.*\\special%{papersize") then return "" end + -- Remove bidi version in \special lines line + if match(line, "BIDI.Fullbanner") then + line = gsub(line,"Version %d*%.%d*", "Version ...") + end -- Remove ConTeXt stuff if match(line, "^backend >") or match(line, "^close source >") or @@ -750,6 +754,11 @@ function runtest(name, engine, hide, ext, test_type, breakout) if match(checkformat,"^context$") then function setup(file) return tokens .. ' "' .. file .. '" ' end end + if match(binary,"make4ht") then + function setup(file) return tokens .. ' "' .. file .. '" ' end + format = "" + checkopts = "" + end local basename = testdir .. "/" .. name local gen_file = basename .. test_type.generated local new_file = basename .. "." .. engine .. test_type.generated diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua index 736df6ae826..131b6b7d55a 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-2021 The LaTeX Project +File l3build-variables.lua Copyright (C) 2018-2022 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 @@ -134,6 +134,8 @@ if not string.find(status.banner,"2019") then specialformats["latex-dev"] = specialformats["latex-dev"] or {luatex = {binary="luahbtex",format = "lualatex-dev"}} end +specialformats.latex["make4ht"] = specialformats.latex["make4ht"] or + {binary = "make4ht"} stdengine = stdengine or checkengines[1] or "pdftex" diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 80a7b6e3d01..7556fb39d85 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 = "2022-03-15" +release_date = "2022-04-12" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") -- cgit v1.2.3