[latex3-commits] [l3svn] 01/02: l3build: Normalise out ^^@

noreply at latex-project.org noreply at latex-project.org
Thu Mar 30 22:57:13 CEST 2017


This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 1d52c0098844a4de6547bedea3cda80c59abac62
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Mar 30 21:15:57 2017 +0100

    l3build: Normalise out ^^@
    
    This is required as LuaTeX v1.04+ no longer allows us to read
    these back easily.
---
 contrib/testfiles/ctex002.tlg                 |    3 +-
 contrib/testfiles/mhchem001.tlg               |   12 +++----
 contrib/testfiles/siunitx001.tlg              |   24 +++++---------
 l3build/l3build.dtx                           |    3 +-
 l3build/l3build.lua                           |   10 +++++-
 l3experimental/l3str/testfiles/m3regex001.tlg |   15 +++------
 l3experimental/l3str/testfiles/m3regex006.tlg |   32 +++++--------------
 l3experimental/l3str/testfiles/m3regex010.tlg |    3 +-
 l3kernel/testfiles/m3char001.luatex.tlg       |   42 +++++++++----------------
 l3kernel/testfiles/m3char001.tlg              |   42 +++++++++----------------
 l3kernel/testfiles/m3char001.xetex.tlg        |   42 +++++++++----------------
 l3kernel/testfiles/m3expl001.ptex.tlg         |    3 +-
 l3kernel/testfiles/m3expl001.tlg              |    3 +-
 l3kernel/testfiles/m3expl001.uptex.tlg        |    3 +-
 l3kernel/testfiles/m3expl001.xetex.tlg        |    3 +-
 l3kernel/testfiles/m3expl003.ptex.tlg         |    3 +-
 l3kernel/testfiles/m3expl003.tlg              |    3 +-
 l3kernel/testfiles/m3expl003.uptex.tlg        |    3 +-
 l3kernel/testfiles/m3expl003.xetex.tlg        |    3 +-
 19 files changed, 88 insertions(+), 164 deletions(-)

diff --git a/contrib/testfiles/ctex002.tlg b/contrib/testfiles/ctex002.tlg
index 410e294..88f6647 100644
--- a/contrib/testfiles/ctex002.tlg
+++ b/contrib/testfiles/ctex002.tlg
@@ -72,8 +72,7 @@ Completed box being shipped out [1]
 ...\glue(\baselineskip) 6.95602
 ...\hbox(8.43149+1.05394)x345.0, glue set 269.32143fil
 ....\hbox(0.0+0.0)x21.07874
-....\C70/rm/m/n/10.53937/4e ^^@
-....\kern -0.00002
+....\C70/rm/m/n/10.53937/4e ....\kern -0.00002
 ....\kern 0.00002
 ....\glue 0.0 plus 0.60931
 ....\C70/rm/m/n/10.53937/4e ^^8c
diff --git a/contrib/testfiles/mhchem001.tlg b/contrib/testfiles/mhchem001.tlg
index c946cc6..ed6e81d 100644
--- a/contrib/testfiles/mhchem001.tlg
+++ b/contrib/testfiles/mhchem001.tlg
@@ -61,8 +61,7 @@ Completed box being shipped out [1]
 ........\hbox(0.0+0.0)x7.7778
 .........\mathon
 .........\hbox(5.83333+0.83333)x7.7778
-..........\OMS/cmsy/m/n/10 ^^@
-.........\mathoff
+..........\OMS/cmsy/m/n/10 .........\mathoff
 .......\kern -3.8888
 .......\cleaders 0.0 plus 1.0fill
 ........\hbox(0.0+0.0)x5.55563
@@ -72,8 +71,7 @@ Completed box being shipped out [1]
 ..........\hbox(0.0+0.0)x7.7778
 ...........\mathon
 ...........\hbox(5.83333+0.83333)x7.7778
-............\OMS/cmsy/m/n/10 ^^@
-...........\mathoff
+............\OMS/cmsy/m/n/10 ...........\mathoff
 .........\kern -1.11108
 .........\mathoff
 .......\kern -3.8888
@@ -176,8 +174,7 @@ Completed box being shipped out [1]
 ........\hbox(0.0+0.0)x7.7778
 .........\mathon
 .........\hbox(5.83333+0.83333)x7.7778
-..........\OMS/cmsy/m/n/10 ^^@
-.........\mathoff
+..........\OMS/cmsy/m/n/10 .........\mathoff
 .......\kern -3.8888
 .......\cleaders 0.0 plus 1.0fill
 ........\hbox(0.0+0.0)x5.55563
@@ -187,8 +184,7 @@ Completed box being shipped out [1]
 ..........\hbox(0.0+0.0)x7.7778
 ...........\mathon
 ...........\hbox(5.83333+0.83333)x7.7778
-............\OMS/cmsy/m/n/10 ^^@
-...........\mathoff
+............\OMS/cmsy/m/n/10 ...........\mathoff
 .........\kern -1.11108
 .........\mathoff
 .......\kern -3.8888
diff --git a/contrib/testfiles/siunitx001.tlg b/contrib/testfiles/siunitx001.tlg
index 87e3b9a..ef73a7e 100644
--- a/contrib/testfiles/siunitx001.tlg
+++ b/contrib/testfiles/siunitx001.tlg
@@ -34,16 +34,14 @@ Completed box being shipped out [1]
 ......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 .......\mathon
 .......\hbox(4.51111+0.83334)x10.23615
-........\OMS/cmsy/m/n/7 ^^@
-........\OT1/cmr/m/n/7 1
+........\OMS/cmsy/m/n/7 ........\OT1/cmr/m/n/7 1
 .......\mathoff
 ......\glue 1.66663
 ......\OT1/cmr/m/n/10 K
 ......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 .......\mathon
 .......\hbox(4.51111+0.83334)x10.23615
-........\OMS/cmsy/m/n/7 ^^@
-........\OT1/cmr/m/n/7 1
+........\OMS/cmsy/m/n/7 ........\OT1/cmr/m/n/7 1
 .......\mathoff
 .....\mathoff
 ....\penalty 10000
@@ -72,16 +70,14 @@ Completed box being shipped out [1]
 ......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 .......\mathon
 .......\hbox(4.51111+0.83334)x10.23615
-........\OMS/cmsy/m/n/7 ^^@
-........\OT1/cmr/m/n/7 1
+........\OMS/cmsy/m/n/7 ........\OT1/cmr/m/n/7 1
 .......\mathoff
 ......\glue 1.66663
 ......\OT1/cmr/m/n/10 K
 ......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 .......\mathon
 .......\hbox(4.51111+0.83334)x10.23615
-........\OMS/cmsy/m/n/7 ^^@
-........\OT1/cmr/m/n/7 1
+........\OMS/cmsy/m/n/7 ........\OT1/cmr/m/n/7 1
 .......\mathoff
 .....\mathoff
 ....\glue 3.33333 plus 1.66666 minus 1.11111
@@ -107,16 +103,14 @@ Completed box being shipped out [1]
 .......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 ........\mathon
 ........\hbox(4.51111+0.83334)x10.23615
-.........\OMS/cmsy/m/n/7 ^^@
-.........\OT1/cmr/m/n/7 1
+.........\OMS/cmsy/m/n/7 .........\OT1/cmr/m/n/7 1
 ........\mathoff
 .......\glue 1.66663
 .......\OT1/cmr/m/n/10 K
 .......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 ........\mathon
 ........\hbox(4.51111+0.83334)x10.23615
-.........\OMS/cmsy/m/n/7 ^^@
-.........\OT1/cmr/m/n/7 1
+.........\OMS/cmsy/m/n/7 .........\OT1/cmr/m/n/7 1
 ........\mathoff
 ......\mathoff
 ....\mathoff
@@ -143,16 +137,14 @@ Completed box being shipped out [1]
 .......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 ........\mathon
 ........\hbox(4.51111+0.83334)x10.23615
-.........\OMS/cmsy/m/n/7 ^^@
-.........\OT1/cmr/m/n/7 1
+.........\OMS/cmsy/m/n/7 .........\OT1/cmr/m/n/7 1
 ........\mathoff
 .......\glue 1.66663
 .......\OT1/cmr/m/n/10 k
 .......\hbox(4.51111+0.83334)x10.73615, shifted -3.62892
 ........\mathon
 ........\hbox(4.51111+0.83334)x10.23615
-.........\OMS/cmsy/m/n/7 ^^@
-.........\OT1/cmr/m/n/7 1
+.........\OMS/cmsy/m/n/7 .........\OT1/cmr/m/n/7 1
 ........\mathoff
 ......\mathoff
 ....\mathoff
diff --git a/l3build/l3build.dtx b/l3build/l3build.dtx
index 2be947d..e1fe76a 100644
--- a/l3build/l3build.dtx
+++ b/l3build/l3build.dtx
@@ -682,6 +682,7 @@
 %     years due to a \TeX{} bug).
 %   \item Conversion of \texttt{on line \meta{number}} to \texttt{on line ...}
 %     to allow flexibility in changes to test files.
+%   \item Omission of |^^@| (null) characters (for technical reasons).
 % \end{itemize}
 %
 % \LuaTeX{} makes several additional changes to the log file. As normalising
@@ -701,7 +702,7 @@
 %     (|\localinterlinepenalty|, \emph{etc.}).
 %   \item Rounding of glue set to four decimal places (glue set may be
 %     slightly different in \LuaTeX{} compared to other engines).
-%   \item Conversion of low chars ($0$ to $31$) to |^^| notation.
+%   \item Conversion of low chars ($1$ to $31$) to |^^| notation.
 % \end{itemize}
 %
 % When making comparisons between 8-bit and Unicode engines it is useful to
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index dbab2b4..7d7fe1b 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -825,8 +825,16 @@ function formatlog(logfile, newfile, engine)
     -- Two similar cases, Lua patterns mean we need to do them separately
     line = string.gsub(line, "on line %d*", "on line ...")
     line = string.gsub(line, "on input line %d*", "on input line ...")
+    -- LuaTeX v1.04+ follows Lua and drops line content after ^@:
+    -- Normalise so that we get the same results with all engines
+    if string.match(line, string.char(0)) then -- Older LuaTeX
+      return "", string.gsub(line, string.char(0) .. "*", "")
+    end
+    if string.match(line, "%^%^@") then -- pdfTeX, etc.
+      return "", string.gsub(line, "%^%^@" .. "*", "")
+    end
     -- Tidy up to ^^ notation
-    for i = 0, 31 do
+    for i = 1, 31 do
       line = string.gsub(line, string.char(i), "^^" .. string.char(64 + i))
     end
     -- Remove 'normal' direction information on boxes with (u)pTeX
diff --git a/l3experimental/l3str/testfiles/m3regex001.tlg b/l3experimental/l3str/testfiles/m3regex001.tlg
index 6e4c653..ee546bc 100644
--- a/l3experimental/l3str/testfiles/m3regex001.tlg
+++ b/l3experimental/l3str/testfiles/m3regex001.tlg
@@ -64,8 +64,7 @@ TRUE
 TEST 5: Character types
 ============================================================
 TRUE
-{.^^@.^^?. } {. } 
-TRUE
+{..?. } {. } TRUE
 {d0d1d2d3d4d5d6d7d8d9} {d9} 
 TRUE
 {h^^Ih h } {h } 
@@ -78,15 +77,13 @@ v^^Kv^^Lv^^M} {v^^M}
 TRUE
 {wawbwcwdwywzwAwBwZw_w0w9} {w9} 
 TRUE
-{NaNbN*N#N^^?N^^@} {N^^@} {NN} {NN} 
-TRUE
+{NaNbN*N#N?N} {N} {NN} {NN} TRUE
 {D/D:} {D:} 
 TRUE
 {H
 HaH*H^^M} {H^^M} 
 TRUE
-{SaS#S at S^^KS^^@} {S^^@} 
-TRUE
+{SaS#S at SKS} {S} TRUE
 {V^^IV VaV^^?} {V^^?} 
 TRUE
 {W?W*W/W:W{W}W at W[W]W^W`W?} {W?} 
@@ -100,10 +97,8 @@ TEST 6: Special characters
 * Braced quantifier `{' may not be followed by `x'.
 *************************************************
 TRUE
-{*+^^@{x}^^@^^@*b} {*b} 
-TRUE
-{^^@{x}^^@} {} 
-FALSE
+{*+{x}*b} {*b} TRUE
+{{x}} {} FALSE
 TRUE
 {*+,-./*+,-./*+,-./*+,-./} 
 TRUE
diff --git a/l3experimental/l3str/testfiles/m3regex006.tlg b/l3experimental/l3str/testfiles/m3regex006.tlg
index 32acbac..dd16fd0 100644
--- a/l3experimental/l3str/testfiles/m3regex006.tlg
+++ b/l3experimental/l3str/testfiles/m3regex006.tlg
@@ -654,30 +654,14 @@ macro:->ab\{de
 macro:->ab\{de
 macro:->ab{c}ade
 TRUE
-macro:->ab{^^@^^B}ade
-TRUE
-macro:->ab{^^@^^B}ade
-macro:->ab{^^@^^B}ade
-macro:->ab{^^@^^B}ade
-TRUE
-macro:->ab{^^@^^B}ade
-TRUE
-macro:->ab{^^@^^B}ade
-macro:->ab{^^@^^B}ade
-macro:->ab{^^@^^B}ade
-TRUE
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-TRUE
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-TRUE
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-TRUE
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-macro:->ab{^^@^^B}a^^@^^B^^@^^B
-macro:->ab{c}ade
+macro:->ab{B}adeTRUE
+macro:->ab{B}ademacro:->ab{B}ademacro:->ab{B}adeTRUE
+macro:->ab{B}adeTRUE
+macro:->ab{B}ademacro:->ab{B}ademacro:->ab{B}adeTRUE
+macro:->ab{B}aBBTRUE
+macro:->ab{B}aBBmacro:->ab{B}aBBmacro:->ab{B}aBBTRUE
+macro:->ab{B}aBBTRUE
+macro:->ab{B}aBBmacro:->ab{B}aBBmacro:->ab{B}aBBmacro:->ab{c}ade
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "regex/result-unbalanced"
diff --git a/l3experimental/l3str/testfiles/m3regex010.tlg b/l3experimental/l3str/testfiles/m3regex010.tlg
index 8b1ca91..14ded03 100644
--- a/l3experimental/l3str/testfiles/m3regex010.tlg
+++ b/l3experimental/l3str/testfiles/m3regex010.tlg
@@ -4,8 +4,7 @@ Author: Bruno Le Floch
 ============================================================
 TEST 1: LuaTeX bug which leads to an l3regex bug
 ============================================================
-> Compiled regex {\^^@\^^A}:
-+-branch
+> Compiled regex {\\A}:+-branch
   char code 0
   char code 1.
 <recently read> }
diff --git a/l3kernel/testfiles/m3char001.luatex.tlg b/l3kernel/testfiles/m3char001.luatex.tlg
index 8e492d9..10309bb 100644
--- a/l3kernel/testfiles/m3char001.luatex.tlg
+++ b/l3kernel/testfiles/m3char001.luatex.tlg
@@ -4,11 +4,9 @@ Author: Joseph Wright
 ============================================================
 TEST 1: Generate 7-bit letters and other chars
 ============================================================
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> the letter ^^@.
-\l_tmpa_tl ->^^@
+> the letter .\l_tmpa_tl ->              
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -40,11 +38,9 @@ l. ...  }
 > the letter ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> the character ^^@.
-\l_tmpa_tl ->^^@
+> the character .\l_tmpa_tl ->              
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -80,11 +76,9 @@ l. ...  }
 ============================================================
 TEST 2: Generate 7-bit alignment and math tokens
 ============================================================
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> math shift character ^^@.
-\l_tmpa_tl ->^^@
+> math shift character .\l_tmpa_tl ->              
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -116,11 +110,9 @@ l. ...  }
 > math shift character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> alignment tab character ^^@.
-\l_tmpa_tl ->^^@
+> alignment tab character .\l_tmpa_tl ->              
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -152,11 +144,9 @@ l. ...  }
 > alignment tab character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> superscript character ^^@.
-\l_tmpa_tl ->^^@
+> superscript character .\l_tmpa_tl ->              
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -188,11 +178,9 @@ l. ...  }
 > superscript character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> subscript character ^^@.
-\l_tmpa_tl ->^^@
+> subscript character .\l_tmpa_tl ->              
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -228,8 +216,7 @@ l. ...  }
 ============================================================
 TEST 3: Generate 7-bit awkward
 ============================================================
-> \l_tmpa_tl=^^@^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
 > \l_tmpa_tl=^^L^^L.
 <recently read> }
@@ -253,8 +240,7 @@ l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
 are all screwed up? I'm going to assume that you meant ##.
-> \temp=\long macro:->^^@^^@.
-<recently read> }
+> \temp=\long macro:->.<recently read> }
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
diff --git a/l3kernel/testfiles/m3char001.tlg b/l3kernel/testfiles/m3char001.tlg
index c494ea9..3dd99e8 100644
--- a/l3kernel/testfiles/m3char001.tlg
+++ b/l3kernel/testfiles/m3char001.tlg
@@ -4,11 +4,9 @@ Author: Joseph Wright
 ============================================================
 TEST 1: Generate 7-bit letters and other chars
 ============================================================
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> the letter ^^@.
-\l_tmpa_tl ->^^@
+> the letter .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -40,11 +38,9 @@ l. ...  }
 > the letter ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> the character ^^@.
-\l_tmpa_tl ->^^@
+> the character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -80,11 +76,9 @@ l. ...  }
 ============================================================
 TEST 2: Generate 7-bit alignment and math tokens
 ============================================================
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> math shift character ^^@.
-\l_tmpa_tl ->^^@
+> math shift character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -116,11 +110,9 @@ l. ...  }
 > math shift character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> alignment tab character ^^@.
-\l_tmpa_tl ->^^@
+> alignment tab character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -152,11 +144,9 @@ l. ...  }
 > alignment tab character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> superscript character ^^@.
-\l_tmpa_tl ->^^@
+> superscript character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -188,11 +178,9 @@ l. ...  }
 > superscript character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> subscript character ^^@.
-\l_tmpa_tl ->^^@
+> subscript character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -228,8 +216,7 @@ l. ...  }
 ============================================================
 TEST 3: Generate 7-bit awkward
 ============================================================
-> \l_tmpa_tl=^^@^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
 > \l_tmpa_tl=^^L^^L.
 <recently read> }
@@ -253,8 +240,7 @@ l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
 are all screwed up? I'm going to assume that you meant ##.
-> \temp=\long macro:->^^@^^@.
-<recently read> }
+> \temp=\long macro:->.<recently read> }
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
diff --git a/l3kernel/testfiles/m3char001.xetex.tlg b/l3kernel/testfiles/m3char001.xetex.tlg
index 7129e2e..83dea2a 100644
--- a/l3kernel/testfiles/m3char001.xetex.tlg
+++ b/l3kernel/testfiles/m3char001.xetex.tlg
@@ -4,11 +4,9 @@ Author: Joseph Wright
 ============================================================
 TEST 1: Generate 7-bit letters and other chars
 ============================================================
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> the letter ^^@.
-\l_tmpa_tl ->^^@
+> the letter .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -40,11 +38,9 @@ l. ...  }
 > the letter ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> the character ^^@.
-\l_tmpa_tl ->^^@
+> the character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -80,11 +76,9 @@ l. ...  }
 ============================================================
 TEST 2: Generate 7-bit alignment and math tokens
 ============================================================
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> math shift character ^^@.
-\l_tmpa_tl ->^^@
+> math shift character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -116,11 +110,9 @@ l. ...  }
 > math shift character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> alignment tab character ^^@.
-\l_tmpa_tl ->^^@
+> alignment tab character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -152,11 +144,9 @@ l. ...  }
 > alignment tab character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> superscript character ^^@.
-\l_tmpa_tl ->^^@
+> superscript character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -188,11 +178,9 @@ l. ...  }
 > superscript character ^^?.
 \l_tmpa_tl ->^^?
 l. ...  }
-> \l_tmpa_tl=^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
-> subscript character ^^@.
-\l_tmpa_tl ->^^@
+> subscript character .\l_tmpa_tl ->                
 l. ...  }
 > \l_tmpa_tl=^^L.
 <recently read> }
@@ -228,8 +216,7 @@ l. ...  }
 ============================================================
 TEST 3: Generate 7-bit awkward
 ============================================================
-> \l_tmpa_tl=^^@^^@.
-<recently read> }
+> \l_tmpa_tl=.<recently read> }
 l. ...  }
 > \l_tmpa_tl=^^L^^L.
 <recently read> }
@@ -253,8 +240,7 @@ l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
 are all screwed up? I'm going to assume that you meant ##.
-> \temp=\long macro:->^^@^^@.
-<recently read> }
+> \temp=\long macro:->.<recently read> }
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 2396c39..42fd50a 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index b33d1bb..745d773 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index a7ee4a6..5457df4 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 28c86af..0a0f052 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 81e9bbe..86134bc 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 731845b..60c3d01 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index f7794e1..0fa695e 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 81650df..94e7db6 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -221,8 +221,7 @@ Defining \exp_not:f on line ...
 Defining \exp_not:V on line ...
 Defining \exp_not:v on line ...
 Defining \exp_end_continue_f:w on line ...
-Defining ^^@ on line ...
-Defining \exp_end_continue_f:nw on line ...
+Defining  on line ......Defining \exp_end_continue_f:nw on line ...
 Defining \cs_generate_variant:Nn on line ...
 Defining \__cs_generate_variant:N on line ...
 Defining \__cs_generate_variant:ww on line ...

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the latex3-commits mailing list