diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-17 21:32:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-17 21:32:21 +0000 |
commit | 636cbf03f6dcdc84f121e242abcf036015800524 (patch) | |
tree | 7b9733c2f72e4c4483bb2840616755819aa59d8c | |
parent | f853b6bb8fe5ed8eea324afcd32ad325056fe1e2 (diff) |
l3build (17mar20)
git-svn-id: svn://tug.org/texlive/trunk@54379 c570f23f-e606-0410-a88d-b1316a301751
-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 | 13 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl | 31 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3build/l3build.pdf | bin | 706872 -> 707228 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 | 14807 -> 14923 bytes | |||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 6 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/l3build/l3build.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3build/regression-test.tex | 22 |
12 files changed, 68 insertions, 51 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index f2632f1724e..63eed703068 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 = "2020-03-13" +release_date = "2020-03-16" -- 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 e76604ba58d..b7d21cf0111 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 54286 2020-03-13 22:01:43Z karl $ +# $Id: tlmgr.pl 54357 2020-03-16 20:54:33Z karl $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 54286 $'; -my $datrev = '$Date: 2020-03-13 23:01:43 +0100 (Fri, 13 Mar 2020) $'; +my $svnrev = '$Revision: 54357 $'; +my $datrev = '$Date: 2020-03-16 21:54:33 +0100 (Mon, 16 Mar 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -2833,7 +2833,8 @@ sub action_update { " collection, not auto-installing it!\n"); next; } else { - tlwarn("\n$prg: $pkg mentioned, but neither new nor forcibly removed\n"); + tlwarn("\n$prg: $pkg mentioned, but neither new nor forcibly removed"); + tlwarn("\n$prg: perhaps try tlmgr search or tlmgr info.\n"); next; } # install new packages @@ -3517,7 +3518,7 @@ sub action_update { } # infra update and tlmgr restart on w32 is done by the updater batch script - if (win32() && !$opts{"list"} && @critical) { + if (win32() && $opts{'self'} && !$opts{"list"} && @critical) { info("$prg: Preparing TeX Live infrastructure update...\n"); for my $f (@infra_files_to_be_removed) { debug("file scheduled for removal $f\n"); @@ -10010,7 +10011,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 54286 2020-03-13 22:01:43Z karl $ +$Id: tlmgr.pl 54357 2020-03-16 20:54:33Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl index 4ddc53509ea..24ae2ea74ae 100755 --- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl +++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl @@ -14,10 +14,6 @@ catch {rename send {}} # on windows, a wrapper takes care of this. if {$::tcl_platform(platform) ne "windows"} { set texbin [file dirname [file normalize [info script]]] - set savedir [pwd] - cd $texbin - set texbin [pwd] - cd $savedir # prepend texbin to PATH, unless it is already the _first_ # path component set dirs [split $::env(PATH) ":"] @@ -25,7 +21,6 @@ if {$::tcl_platform(platform) ne "windows"} { set ::env(PATH) "${texbin}:$::env(PATH)" } unset texbin - unset savedir unset dirs } @@ -364,6 +359,12 @@ proc start_tlmgr {{args ""}} { # to process initial tlmgr output before continuing. unset -nocomplain ::done_waiting do_debug "opening tlmgr" + # -gui -. -gui-lang + for {set i 0} {$i < [llength $args]} {incr i} { + if {[lindex $args $i] eq "-lang"} { + set args [lreplace $args $i $i "-gui-lang"] + } + } set cmd [list "|tlmgr" {*}$args "--machine-readable" "shell" 2>>$::err_file] if [catch {open $cmd w+} ::tlshl] { tk_messageBox -message [get_stacktrace] @@ -1578,17 +1579,6 @@ proc restore_backups_dialog {} { proc update_tlmgr_w32 {} { close_tlmgr - # cannot overwrite runscript.dll because it is in use. - # move it aside instead and put a copy in its place. - set runbk [file join $::instroot "temp" "runbk"] - if [file exists $runbk] { - file delete -force $runbk - } - file mkdir $runbk - file rename -force -- "${::instroot}/bin/win32/runscript.dll" $runbk - file copy "$runbk/runscript.dll" "${::instroot}/bin/win32" - # tell tlmgr via an environment variable that it was invoked by tlshell - set ::env(from_tcl) 1 # don't try pipes or capturing, because of # tlmgr's acrobatics with nested command prompts wm iconify . @@ -2163,6 +2153,13 @@ proc populate_main {} { # top of main window ppack [ttk::frame .topf] -in .bg -side top -anchor w -fill x + if $::ddebug { + ppack [ttk::label .topf.test -text [info nameofexecutable]] + ppack [ttk::label .topf.test2 -text $::progname] + ppack [ttk::label .topf.test3 -text \ + [string range $::env(PATH) 0 59]] + } + # left frame pack [ttk::frame .topfl] -in .topf -side left -anchor nw @@ -2397,7 +2394,7 @@ proc initialize {} { if {$ans ne "yes"} {exit} } - start_tlmgr + start_tlmgr {*}$::argv if {$::tcl_platform(platform) eq "windows"} { run_cmd_waiting "option multiuser" set ::multiuser 0 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 Binary files differindex 92ad88bc74b..ea6b310b2fc 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 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 Binary files differindex 6aedc69d5e3..286e31c5292 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 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%{! <</........UUID") then return "" end -- Remove \special lines for DVI .pro files @@ -540,7 +542,7 @@ local function normalize_pdf(content) elseif not match(line, "^ *$") and not match(line,"^%%%%Invocation") and not match(line,"^%%%%%+") then - line = gsub(line,"%/ID %[<[^>]+><[^>]+>]","/ID [<ID-STRING><ID-STRING>]") + line = gsub(line,"%/ID( ?)%[<[^>]+><[^>]+>]","/ID%1[<ID-STRING><ID-STRING>]") 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{! <</DocumentUUID (DocumentUUID)>> setpagedevice} + \special{! <</InstanceUUID (InstanceUUID)>> 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{! <</DocumentUUID (DocumentUUID)>> setpagedevice} + \special{! <</InstanceUUID (InstanceUUID)>> setpagedevice} + \else \special{% pdf: docinfo << /Creator (TeX) /CreationDate () /ModDate () - /Producer (\ifx\XeTeXversion\@undefined\else x\fi dvipdfmx) + /Producer (xdvipdfmx) >> } \fi |