[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Update expl3 version check file (ae1c307e)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/ae1c307e4579674534774f20f662cf8d2da41bce

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

commit ae1c307e4579674534774f20f662cf8d2da41bce
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Sep 1 13:25:48 2020 +0100

    Update expl3 version check file
    
    The error shown has changed as the right mechanism
    is now in expl3 itself.


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

ae1c307e4579674534774f20f662cf8d2da41bce
 base/testfiles/m3expl009.luatex.tlg | 46 +++++++++++++++++++++++++++++++++++++
 base/testfiles/m3expl009.tlg        | 46 ++++++++++++++++++++++++++-----------
 2 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/base/testfiles/m3expl009.luatex.tlg b/base/testfiles/m3expl009.luatex.tlg
new file mode 100644
index 00000000..5b4cb718
--- /dev/null
+++ b/base/testfiles/m3expl009.luatex.tlg
@@ -0,0 +1,46 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+\cnta=\count...
+(../expl3.
+sty
+Package: expl3 ....-..-.. L3 programming layer (loader) 
+! LaTeX Error: Mismatched LaTeX support files detected.
+               Loading 'expl3.sty' aborted!
+               The L3 programming layer in the LaTeX format
+               is dated ....-..-.., but in your TeX tree the files require
+               at least ....-..-...
+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.
+)
+(../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.
+)
diff --git a/base/testfiles/m3expl009.tlg b/base/testfiles/m3expl009.tlg
index ba9ed017..833eba97 100644
--- a/base/testfiles/m3expl009.tlg
+++ b/base/testfiles/m3expl009.tlg
@@ -3,23 +3,41 @@ Don't change this file in any respect.
 \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)                 ....-..-.., 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 in the LaTeX format
+               is dated ....-..-.., but in your TeX tree the files require
+               at least ....-..-...
+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
+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.
 )