[latex3-commits] [git/LaTeX3-latex3-latex3] master: Update test files (b8e638b67)

[Joseph Wright]

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

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

commit b8e638b67f28e7b02bc6c9687a5e68e574e30186
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Fri Jul 31 22:32:56 2020 -0300

    Update test files


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

b8e638b67f28e7b02bc6c9687a5e68e574e30186
 l3kernel/testfiles/m3expl009.lvt | 37 +++++----------------------------
 l3kernel/testfiles/m3expl009.tlg | 45 ++++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/l3kernel/testfiles/m3expl009.lvt b/l3kernel/testfiles/m3expl009.lvt
index edfdf7a73..a0de07a53 100644
--- a/l3kernel/testfiles/m3expl009.lvt
+++ b/l3kernel/testfiles/m3expl009.lvt
@@ -28,50 +28,23 @@
   }
 \ExplSyntaxOff
 
-% The conditionals in parentheses refer to the outcome of the
-% \ifcsname and \ifx/\ifodd tests on lines 1272 onwards of
-% expl3.dtx in the commit that introduced this file.
-% Tested adding \typeouts to each branch, but they can't
-% really stay in the code :-)
-
-
 % If the version of expl3 preloaded in the kernel differs
 % from the one in expl3.sty we have a critical error:
 \RELOAD
   { \tl_set:Nn \c__kernel_expl_date_tl { WRONG-DATE } }
-% (TRUE, FALSE)
-
 
 % If they are equal, though, nothing bad happens. This should
 % be the most common scenario.
 \RELOAD
   { }
-% (TRUE, TRUE)
 
-
-% If, however, this token list is not defined:
-\ExplSyntaxOn
-\cs_gset_eq:NN \c__kernel_expl_date_tl \tex_undefined:D
-\ExplSyntaxOff
-% then we're on a version of expl3 prior to the one that
-% introduced this commit, so we can't check for the version
-% and have to guess (kind of) if we're in package mode or
-% just reloading expl3.sty with the kernel code in the
-% format.  This emulates a somewhat recent version
-% (2020-06-18 or later):
+% If this token list is not defined then we're on an earlier
+% version of expl3 anyway, so it's another critical error,
+% but no date is showed:
 \RELOAD
-  { }
-% (FALSE, FALSE)
-
-
-% And this one emulates an older version, but still
-% post-expl3-in-format:
-\RELOAD
-  { \cs_set_eq:NN \g__expl_reload_bool \tex_undefined:D }
-% (FALSE, FALSE, plus defining the reload boolean)
-
+  { \cs_set_eq:NN \c__kernel_expl_date_tl \tex_undefined:D }
 
-% Package mode (FALSE, TRUE) can't be easily emulated in
+% Package mode can't be easily emulated in
 % this test file (and it's a bit pointless), but it works
 % when loading this version of expl3 in a 2018 TL LaTeX.
 % Yours truly,
diff --git a/l3kernel/testfiles/m3expl009.tlg b/l3kernel/testfiles/m3expl009.tlg
index f41671ce0..b9f82dd2d 100644
--- a/l3kernel/testfiles/m3expl009.tlg
+++ b/l3kernel/testfiles/m3expl009.tlg
@@ -4,24 +4,39 @@ Author: Phelype Oleinik
 \cnta=\count...
 (expl3.sty
 Package: expl3 ....-..-.. L3 programming layer (loader) 
-! Critical LaTeX3 Error: Mismatched expl3 detected! Loading expl3 will abort.
-(LaTeX3)                 
-(LaTeX3)                 The version of expl3 preloaded in LaTeX is
-(LaTeX3)                 WRONG-DATE, but the version of expl3 you are trying
-(LaTeX3)                 to load is dated ....-..-... This is most likely
-(LaTeX3)                 due to a stray format file in the user tree. Please
-(LaTeX3)                 make sure that your LaTeX format is updated.
-Type <return> to continue.
+! LaTeX Error: Mismatched LaTeX support files detected.
+               Loading 'expl3.sty' aborted!
+               The L3 programming layer inside the LaTeX format
+               are dated WRONG-DATE, but in your TeX tree the files
+               are dated ....-..-...
+See the LaTeX manual or LaTeX Companion for explanation.
+Type  H <return>  for immediate help.
  ...                                              
-l. ...      }
-LaTeX does not know anything more about this error, sorry.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-Reading the current file 'expl3' will stop.
-) (expl3.sty
-Package: expl3 ....-..-.. L3 programming layer (loader) 
+l. ...     \ExplLoaderFileDate{expl3.sty}}
+                                         %
+The most likely causes are:
+ - A recent format generation failed;
+ - A stray format file in the user tree which needs to be removed or rebuilt;
+ - You are running a manually installed version of expl3.sty
+   which is incompatible with the version in LaTeX.
+LaTeX will abort loading the incompatible support files but this may lead to
+later errors. Please ensure that your LaTeX format is correctly regenerated.
 ) (expl3.sty
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 ) (expl3.sty
 Package: expl3 ....-..-.. L3 programming layer (loader) 
+! LaTeX Error: Mismatched LaTeX support files detected.
+               Loading 'expl3.sty' aborted!
+See the LaTeX manual or LaTeX Companion for explanation.
+Type  H <return>  for immediate help.
+ ...                                              
+l. ...     \ExplLoaderFileDate{expl3.sty}}
+                                         %
+The most likely causes are:
+ - A recent format generation failed;
+ - A stray format file in the user tree which needs to be removed or rebuilt;
+ - You are running a manually installed version of expl3.sty
+   which is incompatible with the version in LaTeX.
+LaTeX will abort loading the incompatible support files but this may lead to
+later errors. Please ensure that your LaTeX format is correctly regenerated.
 )