[latex3-commits] [git/LaTeX3-latex3-latex3] main: Revert "Prep step for active char plan" (fixes #1142) (723a51c16)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/723a51c16d1303779aa565667b1c1cd77d2b6c5c

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

commit 723a51c16d1303779aa565667b1c1cd77d2b6c5c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Oct 26 20:57:20 2022 +0100

    Revert "Prep step for active char plan" (fixes #1142)
    
    This reverts commit db34b7c75baad76884c4bd87bc7b6380b785c523.
    
    Before proceeding here, we likely need to examine
    how best to cover cases such as ConTeXt: there
    are methods but we need to be clear on the overall plan.


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

723a51c16d1303779aa565667b1c1cd77d2b6c5c
 l3kernel/CHANGELOG.md    |  4 ++++
 l3kernel/l3bootstrap.dtx | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 9ee6d0516..c96c96669 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Loading of `expl3` with ConTeXt MkIV (issue
+  [\#1142](https://github.com/latex3/latex3/issues/1142))
+
 ## [2022-10-26]
 
 ### Changed
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index cc920a7ec..873a0ebb0 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -335,8 +335,12 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
     \protected\def\noexpand\ExplSyntaxOff{}%
     \catcode   9 = \the\catcode   9\relax
     \catcode  32 = \the\catcode  32\relax
+    \catcode  34 = \the\catcode  34\relax
+    \catcode  38 = \the\catcode  38\relax
     \catcode  58 = \the\catcode  58\relax
+    \catcode  94 = \the\catcode  94\relax
     \catcode  95 = \the\catcode  95\relax
+    \catcode 124 = \the\catcode 124\relax
     \catcode 126 = \the\catcode 126\relax
     \endlinechar = \the\endlinechar\relax
     \chardef\csname\detokenize{l_@@_expl_bool}\endcsname = 0\relax
@@ -346,10 +350,14 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
 %
 % The code environment is now set up.
 %    \begin{macrocode}
-\catcode   9 = 9\relax
-\catcode  32 = 9\relax
-\catcode  58 = 11\relax
-\catcode  95 = 11\relax
+\catcode 9   = 9\relax
+\catcode 32  = 9\relax
+\catcode 34  = 12\relax
+\catcode 38 =  4\relax
+\catcode 58  = 11\relax
+\catcode 94  = 7\relax
+\catcode 95  = 11\relax
+\catcode 124 = 12\relax
 \catcode 126 = 10\relax
 \endlinechar = 32\relax
 %    \end{macrocode}
@@ -375,10 +383,14 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
       {
         \cs_set_protected:Npx \ExplSyntaxOff
           {
-            \char_set_catcode:nn {   9 } { \char_value_catcode:n {   9 } }
-            \char_set_catcode:nn {  32 } { \char_value_catcode:n {  32 } }
-            \char_set_catcode:nn {  58 } { \char_value_catcode:n {  58 } }
-            \char_set_catcode:nn {  95 } { \char_value_catcode:n {  95 } }
+            \char_set_catcode:nn { 9 }   { \char_value_catcode:n { 9 } }
+            \char_set_catcode:nn { 32 }  { \char_value_catcode:n { 32 } }
+            \char_set_catcode:nn { 34 }  { \char_value_catcode:n { 34 } }
+            \char_set_catcode:nn { 38 }  { \char_value_catcode:n { 38 } }
+            \char_set_catcode:nn { 58 }  { \char_value_catcode:n { 58 } }
+            \char_set_catcode:nn { 94 }  { \char_value_catcode:n { 94 } }
+            \char_set_catcode:nn { 95 }  { \char_value_catcode:n { 95 } }
+            \char_set_catcode:nn { 124 } { \char_value_catcode:n { 124 } }
             \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } }
             \tex_endlinechar:D =
               \tex_the:D \tex_endlinechar:D \scan_stop:
@@ -386,10 +398,14 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
             \cs_set_protected:Npn \ExplSyntaxOff { }
           }
       }
-    \char_set_catcode_ignore:n           {   9 } % tab
-    \char_set_catcode_ignore:n           {  32 } % space
-    \char_set_catcode_letter:n           {  58 } % colon
-    \char_set_catcode_letter:n           {  95 } % underscore
+    \char_set_catcode_ignore:n           { 9 }   % tab
+    \char_set_catcode_ignore:n           { 32 }  % space
+    \char_set_catcode_other:n            { 34 }  % double quote
+    \char_set_catcode_alignment:n        { 38 }  % ampersand
+    \char_set_catcode_letter:n           { 58 }  % colon
+    \char_set_catcode_math_superscript:n { 94 }  % circumflex
+    \char_set_catcode_letter:n           { 95 }  % underscore
+    \char_set_catcode_other:n            { 124 } % pipe
     \char_set_catcode_space:n            { 126 } % tilde
     \tex_endlinechar:D = 32 \scan_stop:
     \bool_set_true:N \l_@@_expl_bool