[latex3-commits] [git/LaTeX3-latex3-latex3] text-map: Exclude tests starting LF or CR (cf17204c1)

Joseph Wright joseph.wright at morningstar2.co.uk
Fri Aug 5 19:29:13 CEST 2022


Repository : https://github.com/latex3/latex3
On branch  : text-map
Link       : https://github.com/latex3/latex3/commit/cf17204c19b969612f7987f9ceffbef43b7ab381

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

commit cf17204c19b969612f7987f9ceffbef43b7ab381
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Aug 5 18:29:13 2022 +0100

    Exclude tests starting LF or CR
    
    These will not work properly in a mapping,
    so are not meaningful to us.


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

cf17204c19b969612f7987f9ceffbef43b7ab381
 l3kernel/testfiles/m3text006.luatex.tlg | 69 ---------------------------------
 l3kernel/testfiles/m3text006.lvt        | 38 +++++++++++-------
 l3kernel/testfiles/m3text006.ptex.tlg   | 69 ---------------------------------
 l3kernel/testfiles/m3text006.tlg        | 69 ---------------------------------
 l3kernel/testfiles/m3text006.xetex.tlg  | 69 ---------------------------------
 5 files changed, 23 insertions(+), 291 deletions(-)

diff --git a/l3kernel/testfiles/m3text006.luatex.tlg b/l3kernel/testfiles/m3text006.luatex.tlg
index e41127d44..59e17d910 100644
--- a/l3kernel/testfiles/m3text006.luatex.tlg
+++ b/l3kernel/testfiles/m3text006.luatex.tlg
@@ -38,74 +38,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] SPACE (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] SPACE (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <reserved-0378> (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] <reserved-0378> (Other) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] SPACE (Other) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] <reserved-0378> (Other) ^^f7 [0.3]
 TRUE
 TRUE
 TRUE
@@ -582,7 +514,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^d7 [3.0] <LINE FEED (LF)> (LF) ^^f7 [4.0] LATIN SMALL LETTER A (Other) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [0.3]
 TRUE
 TRUE
 TRUE
diff --git a/l3kernel/testfiles/m3text006.lvt b/l3kernel/testfiles/m3text006.lvt
index d0aa06521..1fb841ab8 100644
--- a/l3kernel/testfiles/m3text006.lvt
+++ b/l3kernel/testfiles/m3text006.lvt
@@ -22,54 +22,62 @@
     \TIMO
     \use:x
       {
-        \cs_set_protected:Npx \exp_not:N \test_auxi:w
+        \cs_set_protected:Npn \exp_not:N \test_auxi:w
           \tl_to_str:n { ÷ } ##1 \char_generate:nn { `\^^I } { 12 }
           \c_hash_str ##2 \exp_not:N \q_stop
       }
+      { \test_auxii:nNNNNw {#2} #1 \q_stop }
+    \cs_set_protected:Npx \test_auxii:nNNNNw #1#2#3#4#5#6 \q_stop
       {
-        \exp_not:N \test_auxii:nnnw {#2} { } { } #1
-          \exp_not:N \q_recursion_tail
-          \tl_to_str:n { ÷ } \exp_not:N \q_recursion_stop
+        % We skip tests where the first token is LF or CR
+        \exp_not:N \bool_lazy_or:nnF
+          { \exp_not:N \str_if_eq_p:nn {#2#3#4#5} { 000A } }
+          { \exp_not:N \str_if_eq_p:nn {#2#3#4#5} { 000D } }
+          {
+            \exp_not:N \test_auxiii:nnnw {#1} { } { } #2#3#4#5#6
+              \exp_not:N \q_recursion_tail
+              \tl_to_str:n { ÷ } \exp_not:N \q_recursion_stop
+          }
       }
     \use:x
       {
-        \cs_set_protected:Npn \exp_not:N \test_auxii:nnnw
+        \cs_set_protected:Npn \exp_not:N \test_auxiii:nnnw
           ##1##2##3##4 \tl_to_str:n { ÷ }
       }
       {
         \quark_if_recursion_tail_stop_do:nn {#4}
-          { \test_auxv:nnn {#1} {#2} {#3} }
-        \test_auxii:nnnn {#1} {#2} {#3} {#4}
+          { \test_auxvi:nnn {#1} {#2} {#3} }
+        \test_auxiv:nnnn {#1} {#2} {#3} {#4}
       }
-    \cs_set_protected:Npx \test_auxii:nnnn #1#2#3#4
+    \cs_set_protected:Npx \test_auxiv:nnnn #1#2#3#4
       {
-        \exp_not:N \test_auxiv:nnnnw {#1} {#2} {#3} { } #4
+        \exp_not:N \test_auxv:nnnnw {#1} {#2} {#3} { } #4
           \tl_to_str:n { × } \exp_not:N \q_recursion_tail
           \tl_to_str:n { × } \exp_not:N \q_recursion_stop
       }
     \use:x
       {
-        \cs_set_protected:Npn \exp_not:N \test_auxiv:nnnnw
+        \cs_set_protected:Npn \exp_not:N \test_auxv:nnnnw
           ##1##2##3##4##5 \tl_to_str:n { × }
       }
       {
         \quark_if_recursion_tail_stop_do:nn {#5}
-          { \test_auxii:nnnw {#1} {#2#4} { #3 (#4) } }
+          { \test_auxiii:nnnw {#1} {#2#4} { #3 (#4) } }
         \use:e
           {
-            \test_auxiv:nnnnw {#1} {#2} {#3}
+            \test_auxv:nnnnw {#1} {#2} {#3}
               { #4 \test_generate:n {#5} }
           }
       }
-    \cs_set_protected:Npn \test_auxv:nnn #1#2#3
+    \cs_set_protected:Npn \test_auxvi:nnn #1#2#3
       {
         \str_if_eq:eeTF
-          { \text_map_function:nN {#2} \test_auxvi:n }
+          { \text_map_function:nN {#2} \test_auxvii:n }
           {#3}
           { \TRUE }
           { \LONGTYPEOUT {#1} }
       }
-    \cs_set:Npn \test_auxvi:n #1 { (#1) }
+    \cs_set:Npn \test_auxvii:n #1 { (#1) }
     \bool_lazy_or:nnTF
       { \sys_if_engine_luatex_p: }
       { \sys_if_engine_xetex_p: }
diff --git a/l3kernel/testfiles/m3text006.ptex.tlg b/l3kernel/testfiles/m3text006.ptex.tlg
index e41127d44..59e17d910 100644
--- a/l3kernel/testfiles/m3text006.ptex.tlg
+++ b/l3kernel/testfiles/m3text006.ptex.tlg
@@ -38,74 +38,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] SPACE (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] SPACE (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <reserved-0378> (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] <reserved-0378> (Other) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] SPACE (Other) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] <reserved-0378> (Other) ^^f7 [0.3]
 TRUE
 TRUE
 TRUE
@@ -582,7 +514,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^d7 [3.0] <LINE FEED (LF)> (LF) ^^f7 [4.0] LATIN SMALL LETTER A (Other) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [0.3]
 TRUE
 TRUE
 TRUE
diff --git a/l3kernel/testfiles/m3text006.tlg b/l3kernel/testfiles/m3text006.tlg
index b9efde909..de4203442 100644
--- a/l3kernel/testfiles/m3text006.tlg
+++ b/l3kernel/testfiles/m3text006.tlg
@@ -38,74 +38,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] SPACE (Other) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] SPACE (Other) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [5.0] <LINE FEED (LF)> (LF) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] <START OF HEADING> (Control) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [5.0] <START OF HEADING> (Control) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] ARABIC NUMBER SIGN (Prepend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] HANGUL CHOSEONG KIYEOK (L) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] HANGUL JUNGSEONG FILLER (V) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] HANGUL JONGSEONG KIYEOK (T) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] HANGUL SYLLABLE GA (LV) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL SYLLABLE GA (LV) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] HANGUL SYLLABLE GAG (LVT) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] WATCH (ExtPict) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] WATCH (ExtPict) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] <reserved-0378> (Other) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] <reserved-0378> (Other) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] SPACE (Other) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [5.0] <LINE FEED (LF)> (LF) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [5.0] <START OF HEADING> (Control) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL SYLLABLE GA (LV) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] WATCH (ExtPict) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^b7 [0.3]
-TRUE
-  ^^c3^^b7 [0.2] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [999.0] <reserved-0378> (Other) ^^c3^^b7 [0.3]
 TRUE
 TRUE
 TRUE
@@ -582,7 +514,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^c3^^b7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^c3^^97 [3.0] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] LATIN SMALL LETTER A (Other) ^^c3^^b7 [5.0] <LINE FEED (LF)> (LF) ^^c3^^b7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^b7 [0.3]
 TRUE
 TRUE
 TRUE
diff --git a/l3kernel/testfiles/m3text006.xetex.tlg b/l3kernel/testfiles/m3text006.xetex.tlg
index e41127d44..59e17d910 100644
--- a/l3kernel/testfiles/m3text006.xetex.tlg
+++ b/l3kernel/testfiles/m3text006.xetex.tlg
@@ -38,74 +38,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] SPACE (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] SPACE (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] <reserved-0378> (Other) ^^f7 [0.3]
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] <reserved-0378> (Other) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] SPACE (Other) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <CARRIAGE RETURN (CR)> (CR) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [5.0] <START OF HEADING> (Control) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAPHEME JOINER (Extend) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] ARABIC NUMBER SIGN (Prepend) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL CHOSEONG KIYEOK (L) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JUNGSEONG FILLER (V) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL JONGSEONG KIYEOK (T) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GA (LV) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] HANGUL SYLLABLE GAG (LVT) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] WATCH (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^f7 [0.3]
-TRUE
-  ^^f7 [0.2] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [999.0] <reserved-0378> (Other) ^^f7 [0.3]
 TRUE
 TRUE
 TRUE
@@ -582,7 +514,6 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] <CARRIAGE RETURN (CR)> (CR) ^^d7 [3.0] <LINE FEED (LF)> (LF) ^^f7 [4.0] LATIN SMALL LETTER A (Other) ^^f7 [5.0] <LINE FEED (LF)> (LF) ^^f7 [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^f7 [0.3]
 TRUE
 TRUE
 TRUE





More information about the latex3-commits mailing list.