[latex3-commits] [git/LaTeX3-latex3-l3build] master: Refinement of /ID line suppression (3aeedd8)

[Joseph Wright]

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

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

commit 3aeedd8f6c04903d51919f68247998f5f6a940f2
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Mar 16 19:39:17 2020 +0000

    Refinement of /ID line suppression


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

3aeedd8f6c04903d51919f68247998f5f6a940f2
 CHANGELOG.md      | 1 +
 l3build-check.lua | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f02f3e5..5785e46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ this project uses date-based 'snapshot' version identifiers.
 ### Changed
 - Suppress PDF compression in DVI route
 - Default to `dvips` for (p)TeX
+- Refinement of `/ID` line suppression
 
 ## [2020-03-13]
 
diff --git a/l3build-check.lua b/l3build-check.lua
index 21b6d3f..cb00a04 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -226,7 +226,7 @@ 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%{/setdistillerparams") then
       return ""
     end
      -- Remove \special lines for DVI .pro files
@@ -541,7 +541,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