[latex3-commits] [git/LaTeX3-latex3-latex3] peek-refactor: Move deprecated functions to correct location (c47ac4aa7)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : peek-refactor
Link       : https://github.com/latex3/latex3/commit/c47ac4aa794db68eee672c017aca98e85e556144

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

commit c47ac4aa794db68eee672c017aca98e85e556144
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jan 11 14:10:25 2022 +0000

    Move deprecated functions to correct location


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

c47ac4aa794db68eee672c017aca98e85e556144
 l3kernel/l3deprecation.dtx | 40 ++++++++++++++++++++++++++++++++++++++++
 l3kernel/l3token.dtx       | 35 -----------------------------------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index b05724fa3..ef050eb09 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -734,6 +734,46 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}[deprecated = 2024-07-01, TF]
+%   {
+%     \peek_catcode_ignore_spaces:N, \peek_catcode_remove_ignore_spaces:N,
+%     \peek_charcode_ignore_spaces:N, \peek_charcode_remove_ignore_spaces:N,
+%     \peek_meaning_ignore_spaces:N, \peek_meaning_remove_ignore_spaces:N
+%   }
+%    A little extra fun here to deal with the expansion.
+%    \begin{macrocode}
+\tl_map_inline:nn
+  {
+    { catcode } { catcode_remove }
+    { charcode } { charcode_remove }
+    { meaning } { meaning_remove }
+  }
+  {
+    \use:x
+      {
+        \__kernel_patch_deprecation:nnNNpn { 2024-01-01 } { \peek_remove_spaces:n }
+        \cs_gset_protected:Npn \exp_not:c { peek_ ##1 _ignore_spaces:NTF } ####1####2####3
+          {
+            \peek_remove_spaces:n
+              { \exp_not:c { peek_ ##1 :NTF } ####1 {####2} {####3} }
+          }
+        \__kernel_patch_deprecation:nnNNpn { 2024-01-01 } { \peek_remove_spaces:n }
+        \cs_gset_protected:Npn \exp_not:c { peek_ #1 _ignore_spaces:NT } ####1####2
+          {
+            \peek_remove_spaces:n
+              { \exp_not:c { peek_ ##1 :NT } ####1 {####2} }
+          }
+        \__kernel_patch_deprecation:nnNNpn { 2024-01-01 } { \peek_remove_spaces:n }
+        \cs_gset_protected:Npn \exp_not:c { peek_ ##1 _ignore_spaces:NF } ####1####2
+          {
+            \peek_remove_spaces:n
+              { \exp_not:c { peek_ ##1 :NF } ####1 {####2} }
+          }
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</patches>
 %    \end{macrocode}
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 644a01d8c..2e373518c 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -3161,41 +3161,6 @@ end
 % \end{macro}
 % \end{macro}
 %
-% \subsection{Deprecated functions}
-%
-% \begin{macro}[deprecated = 2023-12-31, TF]
-%   {
-%     \peek_catcode_ignore_spaces:N, \peek_catcode_remove_ignore_spaces:N,
-%     \peek_charcode_ignore_spaces:N, \peek_charcode_remove_ignore_spaces:N,
-%     \peek_meaning_ignore_spaces:N, \peek_meaning_remove_ignore_spaces:N
-%   }
-%    \begin{macrocode}
-\tl_map_inline:nn
-  {
-    { catcode } { catcode_remove }
-    { charcode } { charcode_remove }
-    { meaning } { meaning_remove }
-  }
-  {
-    \cs_new_protected:cpx { peek_#1_ignore_spaces:NTF } ##1##2##3
-      {
-        \peek_remove_spaces:n
-          { \exp_not:c { peek_#1:NTF } ##1 {##2} {##3} }
-      }
-    \cs_new_protected:cpx { peek_#1_ignore_spaces:NT } ##1##2
-      {
-        \peek_remove_spaces:n
-          { \exp_not:c { peek_#1:NT } ##1 {##2} }
-      }
-    \cs_new_protected:cpx { peek_#1_ignore_spaces:NF } ##1##2
-      {
-        \peek_remove_spaces:n
-          { \exp_not:c { peek_#1:NF } ##1 {##2} }
-      }
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 %    \begin{macrocode}
 %</tex>
 %    \end{macrocode}