[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correct bugs in previous commit (9fc51ee8f)

[Joseph Wright]

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

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

commit 9fc51ee8f775728ee1ffd254df748948b8493847
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Feb 10 17:11:15 2020 +0000

    Correct bugs in previous commit


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

9fc51ee8f775728ee1ffd254df748948b8493847
 l3kernel/l3text.dtx | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/l3kernel/l3text.dtx b/l3kernel/l3text.dtx
index 9da9d8fa4..45b537d77 100644
--- a/l3kernel/l3text.dtx
+++ b/l3kernel/l3text.dtx
@@ -882,22 +882,18 @@
 %<*package>
 \cs_new:Npn \@@_expand_encoding:N #1
   {
-    \exp_after:wN \@@_expand_encoding:Nnnnn \exp_after:wN #1
-      \cdp at elt { \q_recursion_tail } { } { } { } \q_recursion_stop
+    \exp_after:wN \@@_expand_encoding:NNnnnn \exp_after:wN #1
+      \cdp at elt \q_recursion_tail { } { } { } { } \q_recursion_stop
   }
-\cs_new:Npn \@@_expand_encoding:Nnnnn #1#2#3#4#5
+\cs_new:Npn \@@_expand_encoding:NNnnnn #1#2#3#4#5#6
   {
-    \quark_if_recursion_tail_stop_do:nn {#2} { \@@_expand_replace:N #1 }
-    \str_if_eq:eeTF { \exp_not:N #1 } { \exp_not:c { #2 - cmd } }
-      { \@@_expand_loop:w \__text_expand_textcomp:NN #1 }
-      { \@@_expand_encoding:Nnnnn #1 }
-  }
-\cs_new:Npn \@@_expand_encoding:Nn #1#2
-  {
-    \quark_if_recursion_tail_stop_do:nn {#2} { \@@_expand_replace:N #1 }
-    \str_if_eq:eeTF { \exp_not:N #1 } { \exp_not:c { #2 - cmd } }
-      { \@@_expand_loop:w \__text_expand_textcomp:NN #1 }
-      { \@@_expand_encoding:Nnnnn #1 }
+    \quark_if_recursion_tail_stop_do:Nn #2 { \@@_expand_replace:N #1 }
+    \str_if_eq:eeTF { \exp_not:N #1 } { \exp_not:c { #3 - cmd } }
+      {
+        \use_i_delimit_by_q_recursion_stop:nw
+          { \@@_expand_loop:w \@@_expand_textcomp:NN #1 }
+      }
+      { \@@_expand_encoding:NNnnnn #1 }
   }
 \AtBeginDocument
   {