[latex3-commits] [git/LaTeX3-latex3-latex3] gh590: Correct test file outputs after git merge (e556c9d14)

Bruno Le Floch blflatex at gmail.com
Tue Apr 27 12:42:27 CEST 2021


Repository : https://github.com/latex3/latex3
On branch  : gh590
Link       : https://github.com/latex3/latex3/commit/e556c9d143f6da0413f1e38dfea01d25dd68aceb

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

commit e556c9d143f6da0413f1e38dfea01d25dd68aceb
Author: Bruno Le Floch <blflatex at gmail.com>
Date:   Tue Apr 27 12:42:27 2021 +0200

    Correct test file outputs after git merge


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

e556c9d143f6da0413f1e38dfea01d25dd68aceb
 l3kernel/testfiles/m3regex005.luatex.tlg | 7 +++++++
 l3kernel/testfiles/m3regex005.tlg        | 7 +++++++
 l3kernel/testfiles/m3regex005.xetex.tlg  | 6 ++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/l3kernel/testfiles/m3regex005.luatex.tlg b/l3kernel/testfiles/m3regex005.luatex.tlg
index 67aa90647..4a73235d6 100644
--- a/l3kernel/testfiles/m3regex005.luatex.tlg
+++ b/l3kernel/testfiles/m3regex005.luatex.tlg
@@ -287,6 +287,11 @@ l. ...  }
 Constructions such as '\u{...{...}' are not allowed and should be replaced by
 '\u{...\{...}'.
 |\csname\endcsname}|
+The token list \l_tmpa_tl contains the tokens:
+>  \csname\endcsname(control sequence=undefined)
+>  } (the letter }).
+<recently read> }
+l. ...  }
 ! LaTeX3 Error: Missing right brace inserted in replacement text.
 For immediate help type H <return>.
  ...                                              
@@ -502,6 +507,8 @@ The token list \l_tmpa_tl contains the tokens:
 >  f (the letter f)
 >  o (the letter o)
 >  o (the letter o).
+<recently read> }
+l. ...  }
 ============================================================
 ============================================================
 TEST 17: Catcode used by default
diff --git a/l3kernel/testfiles/m3regex005.tlg b/l3kernel/testfiles/m3regex005.tlg
index f658e05a4..c4e03280e 100644
--- a/l3kernel/testfiles/m3regex005.tlg
+++ b/l3kernel/testfiles/m3regex005.tlg
@@ -287,6 +287,11 @@ l. ...  }
 Constructions such as '\u{...{...}' are not allowed and should be replaced by
 '\u{...\{...}'.
 |\csname\endcsname}|
+The token list \l_tmpa_tl contains the tokens:
+>  \csname\endcsname(control sequence=undefined)
+>  } (the letter }).
+<recently read> }
+l. ...  }
 ! LaTeX3 Error: Missing right brace inserted in replacement text.
 For immediate help type H <return>.
  ...                                              
@@ -502,6 +507,8 @@ The token list \l_tmpa_tl contains the tokens:
 >  f (the letter f)
 >  o (the letter o)
 >  o (the letter o).
+<recently read> }
+l. ...  }
 ============================================================
 ============================================================
 TEST 17: Catcode used by default
diff --git a/l3kernel/testfiles/m3regex005.xetex.tlg b/l3kernel/testfiles/m3regex005.xetex.tlg
index c4375ffb7..28989f3aa 100644
--- a/l3kernel/testfiles/m3regex005.xetex.tlg
+++ b/l3kernel/testfiles/m3regex005.xetex.tlg
@@ -288,7 +288,7 @@ Constructions such as '\u{...{...}' are not allowed and should be replaced by
 '\u{...\{...}'.
 |\csname\endcsname}|
 The token list \l_tmpa_tl contains the tokens:
->  \{ (control sequence=\protected macro:->\ifmmode \lbrace \else \textb\ETC.)
+>  \csname\endcsname(control sequence=undefined)
 >  } (the letter }).
 <recently read> }
 l. ...  }
@@ -507,9 +507,11 @@ The token list \l_tmpa_tl contains the tokens:
 >  f (the letter f)
 >  o (the letter o)
 >  o (the letter o).
+<recently read> }
+l. ...  }
 ============================================================
 ============================================================
-TEST 15: Catcode used by default
+TEST 17: Catcode used by default
 ============================================================
 Defining \g__cctab_1_cctab on line ...
 The token list \l_tmpa_tl contains the tokens:





More information about the latex3-commits mailing list.