Gen. cat. for unassigned codepoints is Cn

latex3 · Jun 20, 2023 · a7d12b6 · a7d12b6
1 parent d2f776a
commit a7d12b6
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/l3kernel/l3unicode.dtx b/l3kernel/l3unicode.dtx
@@ -622,19 +622,22 @@
     }
 %    \end{macrocode}
 %  Distinguish between a range and a gap, and pass on the appropriate value(s).
+%  The general category for unassigned characters is \texttt{Cn}, so we
+%  find the correct value once and then use that.
 %    \begin{macrocode}
-  \cs_set_protected:Npn \@@_data_auxv:nnnnw #1#2#3#4#5 Last> #6 \q_stop
+  \cs_set_protected:Npx \@@_data_auxv:nnnnw #1#2#3#4#5 Last> #6 \q_stop
     {
-       \tl_if_blank:nTF {#6}
+       \exp_not:N \tl_if_blank:nTF {#6}
          {
-           \@@_range:nnn {#1} { category } { 0 }
-           \@@_range:nnn {#1} { uppercase } { 0 }
-           \@@_range:nnn {#1} { lowercase } { 0 }
+           \exp_not:N \@@_range:nnn {#1} { category }
+             \exp_not:V \l_@@_category_Cn_tl
+           \exp_not:N \@@_range:nnn {#1} { uppercase } { 0 }
+           \exp_not:N \@@_range:nnn {#1} { lowercase } { 0 }
          }
          {
-           \@@_range:nnn {#1} { category } {#2}
-           \@@_range:nnn {#1} { uppercase } {#3}
-           \@@_range:nnn {#1} { lowercase } {#4}
+           \exp_not:N \@@_range:nnn {#1} { category } {#2}
+           \exp_not:N \@@_range:nnn {#1} { uppercase } {#3}
+           \exp_not:N \@@_range:nnn {#1} { lowercase } {#4}
          }      
     }
 %    \end{macrocode}