[latex3-commits] [git/LaTeX3-latex3-latex3] master: ConTeXt's \newread now does a 'new' test (543149c)

[Joseph Wright]

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

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

commit 543149cbdc4cdabbe7e425f033ebd0be53d45750
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Dec 11 18:04:11 2018 +0000

    ConTeXt's \newread now does a 'new' test


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

543149cbdc4cdabbe7e425f033ebd0be53d45750
 l3kernel/CHANGELOG.md |    4 ++++
 l3kernel/l3file.dtx   |   13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index c52aba1..caf0382 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+## Fixed
+
+- Loading in ConTeXt MkIV
+
 ## [2018-12-11]
 
 - Enable `\char_generate:nn` to create active tokens with XeTeX
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 09ef15f..01dc7c0 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -797,11 +797,22 @@
 %   third-party package \pkg{morewrites}), this macro is saved here
 %   under a private name.  The complicated code ensures that
 %   \cs{@@_new:N} is not \tn{outer} despite plain \TeX{}'s \tn{newread}
-%   being \tn{outer}.
+%   being \tn{outer}. For \ConTeXt{}, we have to deal with the fact
+%   that \tn{newread} works like our own: it actually checks before
+%   altering definition.
 %    \begin{macrocode}
 %<*package>
 \exp_args:NNf \cs_new_protected:Npn \@@_new:N
   { \exp_args:NNc \exp_after:wN \exp_stop_f: { newread } }
+\cs_if_exist:NT \normalend
+  {
+    \cs_new_eq:NN \@@_new_aux:N \@@_new:N
+    \cs_set_protected:Npn \@@_new:N #1
+      {
+        \cs_undefine:N #1
+        \@@_new_aux:N #1
+      }
+  }
 %</package>
 %    \end{macrocode}
 % \end{macro}