[latex3-commits] [git/LaTeX3-latex3-l3build] master: Normalise new (u)pTeX units (ad371a0)

[Joseph Wright]

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

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

commit ad371a0a310f41e61743ded5d36d66b770b0eccc
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Mar 7 10:24:41 2018 +0000

    Normalise new (u)pTeX units


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

ad371a0a310f41e61743ded5d36d66b770b0eccc
 l3build-check.lua |   14 ++++++++++----
 l3build.dtx       |    3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/l3build-check.lua b/l3build-check.lua
index 4dce34d..319dcd3 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -142,10 +142,16 @@ local function formatlog(logfile, newfile, engine, errlevels)
       return "", (lastline or "") .. line
     end
     -- TeX90/XeTeX knows only the smaller set of dimension units
-    line = gsub(
-      line,
-      "cm, mm, dd, cc, bp, or sp", "cm, mm, dd, cc, nd, nc, bp, or sp"
-    )
+    line = gsub(line,
+      "cm, mm, dd, cc, bp, or sp",
+      "cm, mm, dd, cc, nd, nc, bp, or sp")
+    -- On the other hand, (u)pTeX has some new units!
+    line = gsub(line,
+      "em, ex, zw, zh, in, pt, pc,",
+      "em, ex, in, pt, pc,")
+    line = gsub(line,
+      "cm, mm, dd, cc, bp, H, Q, or sp;",
+      "cm, mm, dd, cc, nd, nc, bp, or sp;")
     -- Normalise a case where fixing a TeX bug changes the message text
     line = gsub(line, "\\csname\\endcsname ", "\\csname\\endcsname")
     -- Zap "on line <num>" and replace with "on line ..."
diff --git a/l3build.dtx b/l3build.dtx
index 7d22cef..07f6739 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -737,7 +737,8 @@
 %   \item Removal of |./| at start of file names.
 %   \item Standardisation of the list of units known to \TeX{} (\pdfTeX{}
 %     and \LuaTeX{} add a small number of additional units which are not
-%     known to \TeX90 or \XeTeX{}).
+%     known to \TeX90 or \XeTeX{}, (u)p\TeX{} adds some additoonal non-standard
+%     ones)
 %   \item Standardisation of \verb*|\csname\endcsname | to |\csname\endcsname|
 %     (the former is formally correct, but the latter was produced for many
 %     years due to a \TeX{} bug).