[latex3-commits] [git/LaTeX3-latex3-latex3] main: Disable CJK tokens on a per-test basis (29a0bc04c)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/29a0bc04c338362b89b380bdcafff3ae2a4d929b

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

commit 29a0bc04c338362b89b380bdcafff3ae2a4d929b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Feb 12 23:17:22 2023 +0000

    Disable CJK tokens on a per-test basis
    
    To allow adjustment one test at a time.


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

29a0bc04c338362b89b380bdcafff3ae2a4d929b
 l3kernel/testfiles/m3str-convert005.lvt | 4 ++--
 l3kernel/testfiles/m3str002.lvt         | 4 ++--
 l3kernel/testfiles/m3text002.lvt        | 2 +-
 l3kernel/testfiles/m3text005.lvt        | 4 ++--
 support/regression-test.cfg             | 5 -----
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/l3kernel/testfiles/m3str-convert005.lvt b/l3kernel/testfiles/m3str-convert005.lvt
index 836c601dc..cb718a17d 100644
--- a/l3kernel/testfiles/m3str-convert005.lvt
+++ b/l3kernel/testfiles/m3str-convert005.lvt
@@ -1,5 +1,5 @@
 %
-% Copyright (C) 2020,2021 The LaTeX Project
+% Copyright (C) 2020,2021,2023 The LaTeX Project
 %
 
 \documentclass{minimal}
@@ -11,7 +11,7 @@
 \ExplSyntaxOff
 
 \begin{document}
-
+\ifdefined\disablecjktoken\disablecjktoken\fi
 \START
 \AUTHOR{Joseph Wright}
 \ExplSyntaxOn
diff --git a/l3kernel/testfiles/m3str002.lvt b/l3kernel/testfiles/m3str002.lvt
index 3de71b8b2..2a2dd4ca1 100644
--- a/l3kernel/testfiles/m3str002.lvt
+++ b/l3kernel/testfiles/m3str002.lvt
@@ -1,12 +1,12 @@
 %
-% Copyright (C) 2014,2015,2018,2020,2021 The LaTeX Project
+% Copyright (C) 2014,2015,2018,2020,2021,2023 The LaTeX Project
 %
 \input{regression-test}
 \RequirePackage[enable-debug]{expl3}
 \ExplSyntaxOn
 \debug_on:n { check-declarations , deprecation , log-functions }
 \ExplSyntaxOff
-
+\ifdefined\disablecjktoken\disablecjktoken\fi
 \START
 \AUTHOR{Joseph Wright}
 \ExplSyntaxOn
diff --git a/l3kernel/testfiles/m3text002.lvt b/l3kernel/testfiles/m3text002.lvt
index 05c7c2938..9cb826919 100644
--- a/l3kernel/testfiles/m3text002.lvt
+++ b/l3kernel/testfiles/m3text002.lvt
@@ -7,7 +7,7 @@
 \ExplSyntaxOn
 \debug_on:n { check-declarations , deprecation , log-functions }
 \ExplSyntaxOff
-
+\ifdefined\disablecjktoken\disablecjktoken\fi
 \START
 \AUTHOR{Joseph Wright}
 \ExplSyntaxOn
diff --git a/l3kernel/testfiles/m3text005.lvt b/l3kernel/testfiles/m3text005.lvt
index 83033cd15..61520e9a3 100644
--- a/l3kernel/testfiles/m3text005.lvt
+++ b/l3kernel/testfiles/m3text005.lvt
@@ -1,5 +1,5 @@
 %
-% Copyright (C) 2022 The LaTeX Project
+% Copyright (C) 2022,2023 The LaTeX Project
 %
 \input{regression-test}
 
@@ -7,7 +7,7 @@
 \ExplSyntaxOn
 \debug_on:n { check-declarations , deprecation , log-functions }
 \ExplSyntaxOff
-
+\ifdefined\disablecjktoken\disablecjktoken\fi
 \documentclass{minimal}
 
 \usepackage[T2A]{fontenc}
diff --git a/support/regression-test.cfg b/support/regression-test.cfg
index 9a4f98768..321f762e9 100644
--- a/support/regression-test.cfg
+++ b/support/regression-test.cfg
@@ -43,11 +43,6 @@
 \regression at test@alloc {30} \newskip
 \regression at test@alloc {30} \newtoks
 
-% Tell upTeX to leave UTF-8 material alone
-\ifdefined\disablecjktoken
-  \expandafter\disablecjktoken
-\fi
-
 % Force OT1 CMR for all engines
 \ifx\RequirePackage\@undefined\else
   \RequirePackage[OT1]{fontenc}