[latex3-commits] [git/LaTeX3-latex3-latex3] l3text: Retain spaces in Unicode data reading (bd944371a)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : l3text
Link       : https://github.com/latex3/latex3/commit/bd944371a7a58096c7acccb1fa247f6e20edf281

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

commit bd944371a7a58096c7acccb1fa247f6e20edf281
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Dec 2 14:15:16 2019 +0000

    Retain spaces in Unicode data reading
    
    Needed to collect NFD information.


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

bd944371a7a58096c7acccb1fa247f6e20edf281
 l3kernel/l3unicode.dtx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/l3kernel/l3unicode.dtx b/l3kernel/l3unicode.dtx
index 892bc2a3e..31f51b812 100644
--- a/l3kernel/l3unicode.dtx
+++ b/l3kernel/l3unicode.dtx
@@ -126,7 +126,7 @@
         #1 ; #2 ; #3 ; #4 ; #5 ; #6 ; #7 ; #8 ; #9 ;
         { \@@_data_auxii:w #1 ; }
       \cs_set_protected:Npn \@@_data_auxii:w
-        #1 ; #2 ; #3 ; #4 ; #5 ; #6 ; #7 \q_stop
+        #1 ; #2 ; #3 ; #4 ; #5 ; #6 ; #7 ~ \q_stop
         {
           \cs_set_nopar:Npn \l_@@_tmpa_tl {#7}
           \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_empty_tl
@@ -138,13 +138,16 @@
             \fi:
           \fi:
         }
-      \ior_map_variable:NNn \g_@@_data_ior \l_@@_tmpa_tl
-        {
-          \if_meaning:w \l_@@_tmpa_tl \c_space_tl
-            \exp_after:wN \ior_map_break:
-          \fi:
-          \exp_after:wN \@@_data_auxi:w \l_@@_tmpa_tl \q_stop
-        }
+      \group_begin:
+        \char_set_catcode_space:n { `\  }%
+        \ior_map_variable:NNn \g_@@_data_ior \l_@@_tmpa_tl
+          {%
+            \if_meaning:w \l_@@_tmpa_tl \c_space_tl
+              \exp_after:wN \ior_map_break:
+            \fi:
+            \exp_after:wN \@@_data_auxi:w \l_@@_tmpa_tl \q_stop
+          }%
+      \group_end:
       \ior_close:N \g_@@_data_ior
 %    \end{macrocode}
 % The other data files all use C-style comments so we have to worry about