[latex3-commits] [git/LaTeX3-latex3-latex3] master: Set up case changer internals using \fmtname (e1103f720)

[Joseph Wright]

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

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

commit e1103f720e4663e2e809dbe56ac790c0d9fc8155
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Oct 5 08:30:21 2020 +0100

    Set up case changer internals using \fmtname
    
    Needed as pre-loading means we cannot test now
    for \@current at cmd.


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

e1103f720e4663e2e809dbe56ac790c0d9fc8155
 l3kernel/CHANGELOG.md | 4 ++++
 l3kernel/l3text.dtx   | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 178b24085..3e416742d 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Correctly detect LaTeX when pre-loading expl3 and setting up
+  case changer
+
 ## [2020-10-05]
 
 ### Fixed
diff --git a/l3kernel/l3text.dtx b/l3kernel/l3text.dtx
index b86576f3a..4de92d0e8 100644
--- a/l3kernel/l3text.dtx
+++ b/l3kernel/l3text.dtx
@@ -923,7 +923,9 @@
     \exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect }
       { \exp_not:N \@@_expand_protect:N }
       {
-        \cs_if_exist:cTF { @current at cmd }
+        \bool_lazy_and:nnTF
+          { \cs_if_exist_p:N \fmtname }
+          { \str_if_eq_p:Vn \fmtname { LaTeX2e } }
           { \exp_not:N \@@_expand_encoding:N #1 }
           { \exp_not:N \@@_expand_replace:N #1 }
       }