From 636cbf03f6dcdc84f121e242abcf036015800524 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 17 Mar 2020 21:32:21 +0000 Subject: l3build (17mar20) git-svn-id: svn://tug.org/texlive/trunk@54379 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 11 +++++++- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 706872 -> 707228 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 14807 -> 14923 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 6 +++-- Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- Master/texmf-dist/source/latex/l3build/l3build.dtx | 28 ++++++++++++--------- .../tex/latex/l3build/regression-test.tex | 22 +++++++++------- 9 files changed, 46 insertions(+), 27 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index da71282103f..c7dfda8d225 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-03-16] + +### Changed +- Suppress PDF compression in DVI route +- Suppress PDF ID data in DVI route +- Default to `dvips` for (p)TeX +- Refinement of `/ID` line suppression + ## [2020-03-13] ### Changed @@ -452,7 +460,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2020-03-13...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2020-03-16...HEAD +[2020-03-16]: https://github.com/latex3/l3build/compare/2020-03-13...2020-03-16 [2020-03-13]: https://github.com/latex3/l3build/compare/2020-03-12...2020-03-13 [2020-03-12]: https://github.com/latex3/l3build/compare/2020-02-21...2020-03-12 [2020-02-21]: https://github.com/latex3/l3build/compare/2020-02-17...2020-02-21 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index ff6848df7a6..49635e3d94a 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 LaTeX3 ================================================= -Release 2020-03-13 +Release 2020-03-16 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index 92ad88bc74b..ea6b310b2fc 100644 Binary files a/Master/texmf-dist/doc/latex/l3build/l3build.pdf and b/Master/texmf-dist/doc/latex/l3build/l3build.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index 9c91cd5914c..7271ec549d8 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 "2020-03-13" +.TH l3build 1 "2020-03-16" .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 index 6aedc69d5e3..286e31c5292 100644 Binary files a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf and b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf differ diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 1487d372541..9f83b934122 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -225,7 +225,9 @@ local function normalize_log(content,engine,errlevels) end end -- Remove the \special line that in DVI mode keeps PDFs comparable - if match(line, "^%.*\\special%{pdf: docinfo << /Creator") then + if match(line, "^%.*\\special%{pdf: docinfo << /Creator") or + match(line, "^%.*\\special%{ps: /setdistillerparams") or + match(line, "^%.*\\special%{! <]+><[^>]+>]","/ID []") + line = gsub(line,"%/ID( ?)%[<[^>]+><[^>]+>]","/ID%1[]") new_content = new_content .. line .. os_newline end end diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index f2632f1724e..63eed703068 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 = "2020-03-13" +release_date = "2020-03-16" -- 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 c39c0f9c295..a8d812d6d90 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -234,7 +234,7 @@ % }^^A % } % -% \date{Released 2020-03-13} +% \date{Released 2020-03-16} % % \maketitle % \tableofcontents @@ -2378,16 +2378,21 @@ \pdfvariable objcompresslevel=0 % \fi \else - \ifnum 0% - \ifx\XeTeXversion\@undefined\else 1\fi - \ifx\kanjiskip\@undefined\else 1\fi - >0 % + \ifx\XeTeXversion\@undefined + \special{% + ps: /setdistillerparams + where + {pop << /CompressPages false /CompressStreams false >> setdistillerparams} + if + }% + \else \special{dvipdfmx:config z 0}% Compress level \special{dvipdfmx:config C 0x40}% Object compression \fi \fi % \end{macrocode} % +% % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname protected\endcsname\relax @@ -2415,8 +2420,7 @@ % % To make any PDF file produced comparable we need to suppress various % pieces of data. This works in concert with setting the epoch from the -% environment side (as not all output can be controlled here). We are -% somewhat stuck if \texttt{dvips} is being used so just hope for the best! +% environment side (as not all output can be controlled here). % There is a limit to what can be done with the underlying PDF structure so % there is no point entirely suppressing \texttt{Producer}: simply avoid % any version numbers. @@ -2448,17 +2452,17 @@ \relax \fi \else - \ifnum 0% - \ifx\XeTeXversion\@undefined\else 1\fi - \ifx\kanjiskip\@undefined\else 1\fi - >0 % + \ifx\XeTeXversion\@undefined + \special{! <> setpagedevice} + \special{! <> setpagedevice} + \else \special{% pdf: docinfo << /Creator (TeX) /CreationDate () /ModDate () - /Producer (\ifx\XeTeXversion\@undefined\else x\fi dvipdfmx) + /Producer (xdvipdfmx) >> } \fi diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index b589c5fc786..57f40ce6a11 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -216,10 +216,14 @@ \pdfvariable objcompresslevel=0 % \fi \else - \ifnum 0% - \ifx\XeTeXversion\@undefined\else 1\fi - \ifx\kanjiskip\@undefined\else 1\fi - >0 % + \ifx\XeTeXversion\@undefined + \special{% + ps: /setdistillerparams + where + {pop << /CompressPages false /CompressStreams false >> setdistillerparams} + if + }% + \else \special{dvipdfmx:config z 0}% Compress level \special{dvipdfmx:config C 0x40}% Object compression \fi @@ -269,17 +273,17 @@ \relax \fi \else - \ifnum 0% - \ifx\XeTeXversion\@undefined\else 1\fi - \ifx\kanjiskip\@undefined\else 1\fi - >0 % + \ifx\XeTeXversion\@undefined + \special{! <> setpagedevice} + \special{! <> setpagedevice} + \else \special{% pdf: docinfo << /Creator (TeX) /CreationDate () /ModDate () - /Producer (\ifx\XeTeXversion\@undefined\else x\fi dvipdfmx) + /Producer (xdvipdfmx) >> } \fi -- cgit v1.2.3