From 62ceabeefc18d431d171a1d2080bd79e858ff722 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 13 Apr 2022 03:00:47 +0000 Subject: CTAN sync 202204130300 --- macros/latex/contrib/fancyvrb/Changes | 1 + macros/latex/contrib/fancyvrb/README | 2 +- macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf | Bin 141124 -> 141127 bytes macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex | 1 + macros/latex/contrib/fancyvrb/latex/fancyvrb.sty | 10 +++--- macros/latex/contrib/graphics-def/README.md | 2 +- macros/latex/contrib/graphics-def/dvipdfmx.def | 34 ++------------------- macros/latex/contrib/graphics-def/xetex.def | 34 ++------------------- macros/latex/contrib/l3build/CHANGELOG.md | 11 ++++++- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-check.lua | 11 ++++++- macros/latex/contrib/l3build/l3build-variables.lua | 4 ++- macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 2 +- macros/latex/contrib/l3build/l3build.lua | 2 +- macros/latex/contrib/l3build/l3build.pdf | Bin 741870 -> 741424 bytes 16 files changed, 40 insertions(+), 78 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes index c903c62ef2..8053f8e8d7 100644 --- a/macros/latex/contrib/fancyvrb/Changes +++ b/macros/latex/contrib/fancyvrb/Changes @@ -1,4 +1,5 @@ --- fancyvrb.sty +4.2 2022/04/12 - change option file_ext to fileext (hv) 4.1b 2021/12/21 - fix for ~ in message (hv) 4.1a 2021/11/24 - updated filedate (hv) 4.1 2021/11/24 - make lastline without argument possible (hv) diff --git a/macros/latex/contrib/fancyvrb/README b/macros/latex/contrib/fancyvrb/README index 97c41fe60a..68a9168d10 100644 --- a/macros/latex/contrib/fancyvrb/README +++ b/macros/latex/contrib/fancyvrb/README @@ -21,7 +21,7 @@ and conditionally processing text. `fancyvrb' was heavily used in the typesetting of the "LaTeX Graphics Companion", by Michel Goossens, Frank Mittelbach, Sebastian Rahtz, -Denis Roegel, and Herbert Voß, Addison Wesley, 2007. +Denis Roegel, and Herbert Voß, Addison Wesley, 2007 and Lehmanns Media, 2022 It was presented March 31, 1998 for EuroTeX'98. The original paper is available on "Cahiers GUTenberg" diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf index 55ccaceaab..a797fa6253 100644 Binary files a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf and b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf differ diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex index 40cb65ff83..66b211391f 100644 --- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex +++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex @@ -1,3 +1,4 @@ +\listfiles \documentclass[twoside]{article} \usepackage{libertinus-otf} \setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{AnonymousPro-Regular.ttf} diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty index 86fdbef54e..cd7a2478a1 100644 --- a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty +++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty @@ -2,7 +2,7 @@ %% This is file `fancyvrb.sty', %% %% COPYRIGHT 1992-1999, by Timothy Van Zandt -%% 2000-2021 ... , by Herbert Voss +%% 2000-2022 ... , by Herbert Voss %% %% This package may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. @@ -13,8 +13,8 @@ %% verbatim environments and commands and extensive documentation. %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{4.1b} -\def\filedate{2021/12/21} +\def\fileversion{4.2} +\def\filedate{2022/04/12} \ProvidesPackage{fancyvrb}[\filedate\space \fileversion\space verbatim text (tvz,hv)] %\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)} \csname fancyvrb@loaded\endcsname @@ -532,12 +532,12 @@ \catcode`\^^I=\active \gdef\FV@DefineWhiteSpace{\def {\FV@Space}\def^^I{\FV@Tab}}% \endgroup -\define@key{FV}{file_ext}[.tex]{\def\FancyVerbFileExtension{#1}} +\define@key{FV}{fileext}[.tex]{\def\FancyVerbFileExtension{#1}} \define@key{FV}{defineactive}[]{\def\FancyVerbDefineActive{#1\relax}} \define@key{FV}{defineactive*}{% \expandafter\def\expandafter\FancyVerbDefineActive\expandafter{% \FancyVerbDefineActive#1\relax}} -\fvset{defineactive,file_ext=.tex} +\fvset{defineactive,fileext=.tex} \define@booleankey{FV}{showspaces}% {\def\FV@Space{{\FancyVerbSpace}}}% {\def\FV@Space{\ }} diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md index 060344b425..03c905bc88 100644 --- a/macros/latex/contrib/graphics-def/README.md +++ b/macros/latex/contrib/graphics-def/README.md @@ -1,7 +1,7 @@ LaTeX support for color and graphics ==================================== -Release 2022-02-19 +Release 2022-04-12 This bundle contains the 'engine-dependent' part of support for color and graphics in LaTeX2e (the code here will also function diff --git a/macros/latex/contrib/graphics-def/dvipdfmx.def b/macros/latex/contrib/graphics-def/dvipdfmx.def index 0d73189fe2..f8a984cb5a 100644 --- a/macros/latex/contrib/graphics-def/dvipdfmx.def +++ b/macros/latex/contrib/graphics-def/dvipdfmx.def @@ -1,5 +1,5 @@ %% dvipdfmx.def -%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% Copyright (C) 2005-2022 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata %% (with contributions from many others) %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvipdfmx.def} - [2021/03/18 v5.0j Graphics/color driver for dvipdfmx] + [2022/04/12 v5.0k Graphics/color driver for dvipdfmx] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -329,36 +329,6 @@ } \fi \fi -% Disable use of new multiple stacks pending further testing -\endinput -% Updates for newer dvipdfmx versions -% Loaded last as we can then bail-out if not required -\begingroup - \ifcsname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname - \edef\extractbbversion{% - \number\csname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname}% - \else - \immediate\openin 0 = |"extractbb --version" - \ifeof0 % - \def\extractbbversion{0}% - \else - \read0 to \extractbbversion % \par - \ifeof0 % - \def\extractbbversion{0}% - \else - \read0 to \extractbbversion - \long\def\getextractbbversion#1Version #2 #3\stop{% - \def\extractbbversion{#2}}% - \expandafter\getextractbbversion\extractbbversion Version 0 \stop - \fi - \fi - \fi -\ifnum\extractbbversion<20201111 % - \endgroup - \expandafter\endinput -\else - \endgroup -\fi % Conversion functions so the internal representation stays unchanged \let\init@current@color\current@color \def\convert@color#1{% diff --git a/macros/latex/contrib/graphics-def/xetex.def b/macros/latex/contrib/graphics-def/xetex.def index ba109f78aa..0ddde80f15 100644 --- a/macros/latex/contrib/graphics-def/xetex.def +++ b/macros/latex/contrib/graphics-def/xetex.def @@ -1,5 +1,5 @@ %% xetex.def -%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% Copyright (C) 2005-2022 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata %% (with contributions from many others) %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{xetex.def} - [2021/03/18 v5.0k Graphics/color driver for xetex] + [2022/04/12 v5.0l Graphics/color driver for xetex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -428,36 +428,6 @@ } \fi \fi -% Disable use of new multiple stacks pending further testing -\endinput -% Updates for newer dvipdfmx versions -% Loaded last as we can then bail-out if not required -\begingroup - \ifcsname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname - \edef\extractbbversion{% - \number\csname\detokenize{c__kernel_sys_dvipdfmx_version_int}\endcsname}% - \else - \immediate\openin 0 = |"extractbb --version" - \ifeof0 % - \def\extractbbversion{0}% - \else - \read0 to \extractbbversion % \par - \ifeof0 % - \def\extractbbversion{0}% - \else - \read0 to \extractbbversion - \long\def\getextractbbversion#1Version #2 #3\stop{% - \def\extractbbversion{#2}}% - \expandafter\getextractbbversion\extractbbversion Version 0 \stop - \fi - \fi - \fi -\ifnum\extractbbversion<20201111 % - \endgroup - \expandafter\endinput -\else - \endgroup -\fi % Conversion functions so the internal representation stays unchanged \let\init@current@color\current@color \def\convert@color#1{% diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 129cdab7b9..ee19e133b6 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2022-04-12] + +### Added +- Basic support for `make4ht` + +### Changed +- Support `bidi` version string in `\special` lines (closes \#226) + ## [2022-03-15] ### Changed @@ -584,7 +592,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/2022-03-15...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2022-04-12...HEAD +[2022-04-12]: https://github.com/latex3/l3build/compare/2022-03-15...2022-04-12 [2022-03-15]: https://github.com/latex3/l3build/compare/2022-02-24...2022-03-15 [2022-02-24]: https://github.com/latex3/l3build/compare/2021-12-14...2022-02-24 [2021-12-14]: https://github.com/latex3/l3build/compare/2021-12-09...2021-12-14 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 67f37bd53d..0df0bbe27e 100644 --- a/macros/latex/contrib/l3build/README.md +++ b/macros/latex/contrib/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX ================================================= -Release 2022-03-15 +Release 2022-04-12 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index f016c25a62..94ffc671ef 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/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/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index 736df6ae82..131b6b7d55 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/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/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 2329238b1a..fd55c79944 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2022-03-15" +.TH l3build 1 "2022-04-12" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index fbd84ff215..6e6dde9f36 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -237,7 +237,7 @@ % }^^A % } % -% \date{Released 2022-03-15} +% \date{Released 2022-04-12} % % \maketitle % \tableofcontents diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index 80a7b6e3d0..7556fb39d8 100755 --- a/macros/latex/contrib/l3build/l3build.lua +++ b/macros/latex/contrib/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") diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf index def5d5ec3d..98a74b5df2 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ -- cgit v1.2.3