[latex3-commits] [git/LaTeX3-latex3-l3build] master: Suppress PDF ID data lines in DVI mode (again) (d4eff39)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/d4eff392594440ae026510727f85227d17d49c06

>---------------------------------------------------------------

commit d4eff392594440ae026510727f85227d17d49c06
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Mar 16 20:14:46 2020 +0000

    Suppress PDF ID data lines in DVI mode (again)


>---------------------------------------------------------------

d4eff392594440ae026510727f85227d17d49c06
 CHANGELOG.md      | 1 +
 l3build-check.lua | 3 ++-
 l3build.dtx       | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5785e46..4cfc6bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### 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
 
diff --git a/l3build-check.lua b/l3build-check.lua
index 6253daf..9f83b93 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -226,7 +226,8 @@ local function normalize_log(content,engine,errlevels)
      end
      -- Remove the \special line that in DVI mode keeps PDFs comparable
     if match(line, "^%.*\\special%{pdf: docinfo << /Creator") or
-      match(line, "^%.*\\special%{ps: /setdistillerparams") then
+      match(line, "^%.*\\special%{ps: /setdistillerparams") or
+      match(line, "^%.*\\special%{! <</........UUID") then
       return ""
     end
      -- Remove \special lines for DVI .pro files
diff --git a/l3build.dtx b/l3build.dtx
index 8b6aa95..1006e1e 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -2420,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.
@@ -2453,7 +2452,10 @@
       \relax
   \fi
 \else
-  \ifx\XeTeXversion\@undefined\else
+  \ifx\XeTeXversion\@undefined
+    \special{! <</DocumentUUID (DocumentUUID)>> setpagedevice}
+    \special{! <</InstanceUUID (InstanceUUID)>> setpagedevice}
+  \else
     \special{%
       pdf: docinfo
         <<