[latex3-commits] [git/LaTeX3-latex3-latex3] master: Enable \char_generate:nn for active tokens/XeTeX (379da45)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/379da45dea46e09b22efe10f84f28ac59eea6132

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

commit 379da45dea46e09b22efe10f84f28ac59eea6132
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Dec 10 12:03:55 2018 +0000

    Enable \char_generate:nn for active tokens/XeTeX
    
    To follow \Ucharcat changes.


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

379da45dea46e09b22efe10f84f28ac59eea6132
 l3kernel/l3token.dtx |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index e53585a..bf8c620 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1417,7 +1417,8 @@
 %   out here using a primitive-based boolean expression for speed.
 %   The final level is the basic definition at the engine level: the arguments
 %   here are integers so there is no need to worry about them too much.
-%   At present \XeTeX{} cannot generate active characters so we filter that:
+%   Older versions of  \XeTeX{} cannot generate active characters so we filter
+%   that:
 %   at some future stage that may change: the slightly odd ordering of
 %   auxiliaries reflects that.
 %    \begin{macrocode}
@@ -1446,16 +1447,19 @@
             \exp_after:wN \exp_end:
             \tex_Ucharcat:D #1 \exp_stop_f: #2 \exp_stop_f:
           }
-        \cs_new_eq:NN \@@_generate_auxii:nnw \@@_generate_aux:nnw
-        \cs_gset:Npn \@@_generate_aux:nnw #1#2#3 \exp_end:
+        \cs_if_exist:NF \tex_expanded:D
           {
-            #3
-            \if_int_compare:w #2 = 13 \exp_stop_f:
-              \__kernel_msg_expandable_error:nn { kernel } { char-active }
-            \else:
-              \@@_generate_auxii:nnw {#1} {#2}
-            \fi:
-            \exp_end:
+            \cs_new_eq:NN \@@_generate_auxii:nnw \@@_generate_aux:nnw
+            \cs_gset:Npn \@@_generate_aux:nnw #1#2#3 \exp_end:
+              {
+                #3
+                \if_int_compare:w #2 = 13 \exp_stop_f:
+                  \__kernel_msg_expandable_error:nn { kernel } { char-active }
+                \else:
+                  \@@_generate_auxii:nnw {#1} {#2}
+                \fi:
+                \exp_end:
+              }
           }
       }
   \else: