diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/latex/contrib/l3build/CHANGELOG.md | 12 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/README.md | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-check.lua | 19 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-manifest.lua | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build-typesetting.lua | 23 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.1 | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.dtx | 8 | ||||
-rwxr-xr-x | macros/latex/contrib/l3build/l3build.lua | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3build/l3build.pdf | bin | 741562 -> 742232 bytes | |||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-DropCap.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-FileData.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-Fonts.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-Footnotes.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-Images.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-JC200103.clo (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-PostLayout.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-Sandbox.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-TextMacros.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-microtype.cfg (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-pdfx.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel-xmppacket.sty (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/lualatex/novel.cls (renamed from macros/luatex/latex/novel/tex/lualatex/novel/novel.cls) | 0 | ||||
-rw-r--r-- | macros/luatex/latex/novel/opentype/NovelDeco.otf (renamed from macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf) | bin | 132000 -> 132000 bytes |
29 files changed, 37 insertions, 33 deletions
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 700a00e85d..f14e4db1a0 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,15 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-02-16] + +### Changed +- Drop a redundant setup line for upTeX +- Normalise more Lua stack trace data (may require `.tlg` rebuild) + +### Fixed +- Ensure `texmf.cnf` work correctly for `dvips` + ## [2022-11-10] ### Changed @@ -611,7 +620,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-11-10...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-16...HEAD +[2023-02-16]: https://github.com/latex3/l3build/compare/2022-11-10...2023-02-16 [2022-11-10]: https://github.com/latex3/l3build/compare/2022-09-15...2022-11-10 [2022-09-15]: https://github.com/latex3/l3build/compare/2022-04-19...2022-09-15 [2022-04-19]: https://github.com/latex3/l3build/compare/2022-04-12...2022-04-19 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 9941279422..e33fee3229 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-11-10 +Release 2023-02-16 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 7b3191aa20..d6d68086bc 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-2022 The LaTeX Project +File l3build-check.lua Copyright (C) 2018-2023 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 @@ -126,8 +126,8 @@ local function normalize_log(content,engine,errlevels) -- Zap line numbers from \show, \showbox, \box_show and the like: -- do this before wrapping lines line = gsub(line, "^l%.%d+ ", "l. ...") - -- Also from lua stack traces. - line = gsub(line, "lua:%d+: in function", "lua:...: in function") + -- Also from Lua stack traces + line = gsub(line, "lua:%d+:", "lua:...:") -- Allow for wrapped lines: preserve the content and wrap -- Skip lines that have an explicit marker for truncation if len(line) == maxprintline and @@ -778,8 +778,7 @@ function runtest(name, engine, hide, ext, test_type, breakout) rmfile(testdir,name .. logext) local errlevels = {} for i = 1, checkruns do - errlevels[i] = run( - testdir, + errlevels[i] = runcmd( -- No use of localdir here as the files get copied to testdir: -- avoids any paths in the logs os_setenv .. " TEXINPUTS=." .. localtexmf() @@ -788,13 +787,6 @@ function runtest(name, engine, hide, ext, test_type, breakout) os_setenv .. " LUAINPUTS=." .. localtexmf() .. (checksearch and os_pathsep or "") .. os_concat .. - -- Avoid spurious output from (u)pTeX - os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0" - .. os_concat .. - -- Allow for local texmf files - os_setenv .. " TEXMFCNF=." .. os_pathsep - .. os_concat .. - set_epoch_cmd(epoch, forcecheckepoch) .. -- Ensure lines are of a known length os_setenv .. " max_print_line=" .. maxprintline .. os_concat .. @@ -803,7 +795,8 @@ function runtest(name, engine, hide, ext, test_type, breakout) .. setup(lvtfile) .. (hide and (" > " .. os_null) or "") .. os_concat .. - runtest_tasks(jobname(lvtfile),i) + runtest_tasks(jobname(lvtfile),i), + testdir ) -- Break the loop if the result is stable if breakout and i < checkruns then diff --git a/macros/latex/contrib/l3build/l3build-manifest.lua b/macros/latex/contrib/l3build/l3build-manifest.lua index 8f3e5ef421..5642c91c43 100644 --- a/macros/latex/contrib/l3build/l3build-manifest.lua +++ b/macros/latex/contrib/l3build/l3build-manifest.lua @@ -58,6 +58,8 @@ function manifest() printline = "Manifest written to " .. manifestfile print((printline:gsub(".","*"))) print(printline) print((printline:gsub(".","*"))) + return 0 + end --[[ diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua index c173b2593b..7f5327b5a2 100644 --- a/macros/latex/contrib/l3build/l3build-typesetting.lua +++ b/macros/latex/contrib/l3build/l3build-typesetting.lua @@ -35,18 +35,6 @@ local match = string.match local os_type = os.type -function dvitopdf(name, dir, engine, hide) - run( - dir, - set_epoch_cmd(epoch, forcecheckepoch) .. - "dvips " .. name .. dviext - .. (hide and (" > " .. os_null) or "") - .. os_concat .. - "ps2pdf " .. ps2pdfopt .. name .. psext - .. (hide and (" > " .. os_null) or "") - ) -end - -- An auxiliary used to set up the environmental variables function runcmd(cmd,dir,vars) dir = dir or "." @@ -67,6 +55,17 @@ function runcmd(cmd,dir,vars) return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. os_concat .. cmd) end +function dvitopdf(name, dir, engine, hide) + runcmd( + "dvips " .. name .. dviext + .. (hide and (" > " .. os_null) or "") + .. os_concat .. + "ps2pdf " .. ps2pdfopt .. name .. psext + .. (hide and (" > " .. os_null) or ""), + dir + ) +end + function biber(name,dir) if fileexists(dir .. "/" .. name .. ".bcf") then return diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 7ae1070e1a..f36d695a06 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2022-11-10" +.TH l3build 1 "2023-02-16" .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 215ce3d631..435036c8bf 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -1,6 +1,6 @@ % \iffalse % -% File l3build.dtx (C) Copyright 2014-2022 The LaTeX Project +% File l3build.dtx (C) Copyright 2014-2023 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 @@ -236,7 +236,7 @@ % }^^A % } % -% \date{Released 2022-11-10} +% \date{Released 2023-02-16} % % \maketitle % \tableofcontents @@ -1129,7 +1129,7 @@ % if run == 1 then % return "biber " .. name % else -% return 0 +% return "" % end % end % \end{lstlisting} @@ -1553,7 +1553,7 @@ % the zip file to be uploaded. You may wish to specify that this file % is ignored by any version control in that directory (using % |.gitignore| or similar). Or alternatively you can use the -% |uploadconfig.curl_file| field in the |build.lua| file to specify an +% |uploadconfig.curlopt_file| field in the |build.lua| file to specify an % alternative name or location for this file. % % \paragraph{Validating} diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index d0657cfd70..110d394772 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-11-10" +release_date = "2023-02-16" -- 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 Binary files differindex 617ecb459d..5172226c84 100644 --- a/macros/latex/contrib/l3build/l3build.pdf +++ b/macros/latex/contrib/l3build/l3build.pdf diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo b/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo index a304ed3e63..a304ed3e63 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-CGATSTR001.clo +++ b/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty index 40308f6590..40308f6590 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-CalculateLayout.sty +++ b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty index 89d77c718f..89d77c718f 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-ChapterScene.sty +++ b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty index 7d418b45f5..7d418b45f5 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-DropCap.sty +++ b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo b/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo index fb20757902..fb20757902 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-FOGRA39.clo +++ b/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty b/macros/luatex/latex/novel/lualatex/novel-FileData.sty index 4d4535ead0..4d4535ead0 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-FileData.sty +++ b/macros/luatex/latex/novel/lualatex/novel-FileData.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty index f35708f606..f35708f606 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Fonts.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty index 5465b0b70b..5465b0b70b 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Footnotes.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty index 4e003edd15..4e003edd15 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-HeadFootStyles.sty +++ b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty b/macros/luatex/latex/novel/lualatex/novel-Images.sty index 206f130565..206f130565 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Images.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Images.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo b/macros/luatex/latex/novel/lualatex/novel-JC200103.clo index 7286dac7dc..7286dac7dc 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-JC200103.clo +++ b/macros/luatex/latex/novel/lualatex/novel-JC200103.clo diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty index a9b2bb09e1..a9b2bb09e1 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-LayoutSettings.sty +++ b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty index 5096645cac..5096645cac 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-PostLayout.sty +++ b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty index 71b890738e..71b890738e 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-Sandbox.sty +++ b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty index 23a6a8af9d..23a6a8af9d 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-TextMacros.sty +++ b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg b/macros/luatex/latex/novel/lualatex/novel-microtype.cfg index e9076d5593..e9076d5593 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-microtype.cfg +++ b/macros/luatex/latex/novel/lualatex/novel-microtype.cfg diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty index 537ccf65c7..537ccf65c7 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-pdfx.sty +++ b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty b/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty index 006c5f777e..006c5f777e 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel-xmppacket.sty +++ b/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty diff --git a/macros/luatex/latex/novel/tex/lualatex/novel/novel.cls b/macros/luatex/latex/novel/lualatex/novel.cls index 0d894e1fdf..0d894e1fdf 100644 --- a/macros/luatex/latex/novel/tex/lualatex/novel/novel.cls +++ b/macros/luatex/latex/novel/lualatex/novel.cls diff --git a/macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf b/macros/luatex/latex/novel/opentype/NovelDeco.otf Binary files differindex b0c81ecb61..b0c81ecb61 100644 --- a/macros/luatex/latex/novel/fonts/opentype/novel/NovelDeco.otf +++ b/macros/luatex/latex/novel/opentype/NovelDeco.otf |