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

README.md

@@ -1,7 +1,7 @@
 l3build: a testing and building system for LaTeX3
 =================================================
 
-Release 2020-03-13
+Release 2020-03-16
 
 Overview
 --------

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

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

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

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")