Extend PDF-based tests to dvips

.github/tl_packages

@@ -12,7 +12,11 @@ tex
 xetex
 # Requirements for the tests
 amsfonts
+dvips
 etex-pkg
+l3experimental
+latex-lab
+pdfmanagement-testphase
 #
 # Support for typesetting the docs
 #

.github/workflows/main.yaml

@@ -23,3 +23,10 @@ jobs:
           package_file: .github/tl_packages
       - name: Run l3build
         run: texlua l3build.lua ctan -H --show-log-on-error
+      - name: Archive failed tests
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: l3build-test-diff
+          path: |
+            build/test*/*.diff

CHANGELOG.md

@@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Added
+- Force non-Windows diff program to consider all files to be text files
+- Extend PDF-based tests to `dvips`
+- Normalize a new pattern of PDF stream
+
 ### Fixed
 - Restore epoch settings for `dvitopdf()`
 - Use plural form of variable `ps2pdfopts` consistently in code and doc, and 

build.lua

@@ -7,6 +7,16 @@ bundle = ""
 -- Non-standard settings
 checkconfigs = {"build", "config-pdf", "config-plain"}
 checkdeps    = { }
+--[[ FIXME:
+  - setting specialformats in config-pdf.lua results in "binary" set to "latexdvips" (should be "latex")
+  - setting specialformats in build.lua disables specifying engine
+      l3build save -c config-pdf -e latexdvips 00-test-2
+]]
+specialformats = specialformats or {}
+specialformats["latex"] = specialformats["latex"] or
+  {
+    latexdvips = {binary = "latex", format = ""}
+  }
 checkengines = {"pdftex", "xetex", "luatex", "ptex", "uptex"}
 cleanfiles   = {"*.pdf", "*.tex", "*.zip"}
 exefiles     = {"l3build.lua"}

config-pdf.lua

@@ -1,2 +1,4 @@
-checkengines = {"pdftex", "xetex"}
-testfiledir  = "testfiles-pdf"
+checkengines = {"pdftex", "xetex", "latexdvips"}
+testfiledir  = "testfiles-pdf"
+
+ps2pdfopts   = " -dCompressStreams=false "

l3build-check.lua

@@ -551,6 +551,11 @@ local function normalize_pdf(content)
       binary = false
       stream = true
       stream_content = "stream" .. os_newline
+    elseif match(line, "/Length %d+>>stream$") then
+      binary = false
+      stream = true
+      stream_content = "stream" .. os_newline
+      new_content = new_content .. gsub(line, "stream$", "") .. os_newline
     elseif not match(line, "^ *$") and
       not match(line,"^%%%%Invocation") and
       not match(line,"^%%%%%+") then

l3build-file-functions.lua

@@ -133,7 +133,9 @@ os_ascii   = "echo \"\""
 os_cmpexe  = getenv("cmpexe") or "cmp"
 os_cmpext  = getenv("cmpext") or ".cmp"
 os_diffext = getenv("diffext") or ".diff"
-os_diffexe = getenv("diffexe") or "diff -c --strip-trailing-cr"
+-- "-a, --text": force diff to consider all files to be text files
+-- https://www.gnu.org/software/diffutils/manual/html_node/Binary.html
+os_diffexe = getenv("diffexe") or "diff -ac --strip-trailing-cr"
 os_grepexe = "grep"
 os_newline = "\n"
 

l3build-typesetting.lua

@@ -57,6 +57,7 @@ end
 
 function dvitopdf(name, dir, engine, hide)
   runcmd(
+    -- dvips respects epoch settings, but ps2pdf (ghostscript) doesn't
     set_epoch_cmd(epoch, forcecheckepoch) ..
     "dvips " .. name .. dviext
       .. (hide and (" > " .. os_null) or "")