texlive[54379] trunk: l3build (17mar20)
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 17 22:32:22 CET 2020
Revision: 54379
http://tug.org/svn/texlive?view=revision&revision=54379
Author: karl
Date: 2020-03-17 22:32:21 +0100 (Tue, 17 Mar 2020)
Log Message:
-----------
l3build (17mar20)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3build/README.md
trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
trunk/Master/texmf-dist/doc/man/man1/l3build.1
trunk/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
trunk/Master/texmf-dist/scripts/l3build/l3build.lua
trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex
Modified: trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2020-03-17 21:32:21 UTC (rev 54379)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2020-03-13"
+release_date = "2020-03-16"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2020-03-17 21:32:21 UTC (rev 54379)
@@ -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 @@
" 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 @@
}
# 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 @@
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
Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2020-03-17 21:32:21 UTC (rev 54379)
@@ -14,10 +14,6 @@
# 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 @@
set ::env(PATH) "${texbin}:$::env(PATH)"
}
unset texbin
- unset savedir
unset dirs
}
@@ -364,6 +359,12 @@
# 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 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 @@
# 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 @@
if {$ans ne "yes"} {exit}
}
- start_tlmgr
+ start_tlmgr {*}$::argv
if {$::tcl_platform(platform) eq "windows"} {
run_cmd_waiting "option multiuser"
set ::multiuser 0
Modified: trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2020-03-17 21:32:21 UTC (rev 54379)
@@ -7,6 +7,14 @@
## [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 @@
- 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
Modified: trunk/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/README.md 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/doc/latex/l3build/README.md 2020-03-17 21:32:21 UTC (rev 54379)
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX3
=================================================
-Release 2020-03-13
+Release 2020-03-16
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/l3build.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/l3build.1 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/doc/man/man1/l3build.1 2020-03-17 21:32:21 UTC (rev 54379)
@@ -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
Modified: trunk/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua 2020-03-17 21:32:21 UTC (rev 54379)
@@ -225,7 +225,9 @@
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 @@
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
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build.lua 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build.lua 2020-03-17 21:32:21 UTC (rev 54379)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2020-03-13"
+release_date = "2020-03-16"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
Modified: trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2020-03-17 21:32:21 UTC (rev 54379)
@@ -234,7 +234,7 @@
% }^^A
% }
%
-% \date{Released 2020-03-13}
+% \date{Released 2020-03-16}
%
% \maketitle
% \tableofcontents
@@ -2378,10 +2378,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
@@ -2388,6 +2392,7 @@
\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,10 +2452,10 @@
\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
<<
@@ -2458,7 +2462,7 @@
/Creator (TeX)
/CreationDate ()
/ModDate ()
- /Producer (\ifx\XeTeXversion\@undefined\else x\fi dvipdfmx)
+ /Producer (xdvipdfmx)
>>
}
\fi
Modified: trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex 2020-03-17 21:31:37 UTC (rev 54378)
+++ trunk/Master/texmf-dist/tex/latex/l3build/regression-test.tex 2020-03-17 21:32:21 UTC (rev 54379)
@@ -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,10 +273,10 @@
\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
<<
@@ -279,7 +283,7 @@
/Creator (TeX)
/CreationDate ()
/ModDate ()
- /Producer (\ifx\XeTeXversion\@undefined\else x\fi dvipdfmx)
+ /Producer (xdvipdfmx)
>>
}
\fi
More information about the tex-live-commits
mailing list.