[latex3-commits] [git/LaTeX3-latex3-latex3] main: Do not force catcode of "&" (a88e124c1)

[Joseph Wright]

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

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

commit a88e124c10cae77c97a1c5253757391a988df79b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Jan 21 21:50:20 2023 +0000

    Do not force catcode of "&"
    
    This will allow it to be either 4 or 13 in documents.


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

a88e124c10cae77c97a1c5253757391a988df79b
 l3kernel/CHANGELOG.md    | 3 +++
 l3kernel/l3bootstrap.dtx | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 4c283b82b..9f6dfb0fe 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Leave catcode of `&` unchanged in code environment
+
 ## [2023-01-16]
 
 ### Added
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index 2af707dfc..a872c84c7 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -336,7 +336,6 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
     \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
@@ -353,7 +352,6 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
 \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
@@ -386,7 +384,6 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
             \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 } }
@@ -401,7 +398,6 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
     \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