[latex3-commits] [git/LaTeX3-latex3-latex3] text-map: Support for extended pictograms requires loading emoji data (25632b2c9)

Joseph Wright joseph.wright at morningstar2.co.uk
Tue Aug 9 14:47:14 CEST 2022


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

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

commit 25632b2c90616d333681c884f715ae6f8f3326fc
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Aug 9 13:47:14 2022 +0100

    Support for extended pictograms requires loading emoji data
    
    Not ruled out: leave as a to-do.


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

25632b2c90616d333681c884f715ae6f8f3326fc
 l3kernel/l3text.dtx                     |  6 ++++++
 l3kernel/testfiles/m3text006.luatex.tlg |  6 +++---
 l3kernel/testfiles/m3text006.lvt        | 12 +++++++++++-
 l3kernel/testfiles/m3text006.ptex.tlg   |  6 +++---
 l3kernel/testfiles/m3text006.tlg        |  6 +++---
 l3kernel/testfiles/m3text006.xetex.tlg  |  6 +++---
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/l3kernel/l3text.dtx b/l3kernel/l3text.dtx
index 56d54b8f4..ff0bd9109 100644
--- a/l3kernel/l3text.dtx
+++ b/l3kernel/l3text.dtx
@@ -301,6 +301,12 @@
 %
 % \section{Mapping to graphemes}
 %
+% Grapheme splitting is implemented using the algorithm described in Unicode
+% Standard Annex \#29. This includes support for extended grapheme clusters.
+% Text starting with a line feed or carriage return character will drop this
+% due to standard \TeX{} processing. At present extended pictograms are
+% not supported: these may be added in a future release.
+%
 % \begin{function}[rEXP, added = 2022-08-04]{\text_map_function:nN}
 %   \begin{syntax}
 %     \cs{text_map_function:nN} \meta{text} \Arg{function}
diff --git a/l3kernel/testfiles/m3text006.luatex.tlg b/l3kernel/testfiles/m3text006.luatex.tlg
index 4baafac08..fc6518828 100644
--- a/l3kernel/testfiles/m3text006.luatex.tlg
+++ b/l3kernel/testfiles/m3text006.luatex.tlg
@@ -531,9 +531,9 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] LATIN SMALL LETTER A (Other) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^f7 [999.0] BABY (ExtPict) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] OCTAGONAL SIGN (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] BABY (ExtPict) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^d7 [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] BABY (ExtPict) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] OCTAGONAL SIGN (ExtPict) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] OCTAGONAL SIGN (ExtPict) ^^f7 [0.3]
+FALSE
+FALSE
+FALSE
 TRUE
   ^^f7 [0.2] UPPER BLADE SCISSORS (Other) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] UPPER BLADE SCISSORS (Other) ^^f7 [0.3]
 TRUE
diff --git a/l3kernel/testfiles/m3text006.lvt b/l3kernel/testfiles/m3text006.lvt
index 1fb841ab8..4aedd6e25 100644
--- a/l3kernel/testfiles/m3text006.lvt
+++ b/l3kernel/testfiles/m3text006.lvt
@@ -75,7 +75,17 @@
           { \text_map_function:nN {#2} \test_auxvii:n }
           {#3}
           { \TRUE }
-          { \LONGTYPEOUT {#1} }
+          {
+            % At present we do not have extended pictogram data:
+            % this area is therefore currently not supported
+            \str_if_in:nnTF {#1} { ExtPict }
+              {
+                \str_if_in:nnTF {#1} { ZWJ_ExtCccZwj }
+                  { \FALSE }
+                  { \LONGTYPEOUT {#1} }
+              }
+              { \LONGTYPEOUT {#1} }
+          }
       }
     \cs_set:Npn \test_auxvii:n #1 { (#1) }
     \bool_lazy_or:nnTF
diff --git a/l3kernel/testfiles/m3text006.ptex.tlg b/l3kernel/testfiles/m3text006.ptex.tlg
index 4baafac08..fc6518828 100644
--- a/l3kernel/testfiles/m3text006.ptex.tlg
+++ b/l3kernel/testfiles/m3text006.ptex.tlg
@@ -531,9 +531,9 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] LATIN SMALL LETTER A (Other) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^f7 [999.0] BABY (ExtPict) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] OCTAGONAL SIGN (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] BABY (ExtPict) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^d7 [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] BABY (ExtPict) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] OCTAGONAL SIGN (ExtPict) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] OCTAGONAL SIGN (ExtPict) ^^f7 [0.3]
+FALSE
+FALSE
+FALSE
 TRUE
   ^^f7 [0.2] UPPER BLADE SCISSORS (Other) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] UPPER BLADE SCISSORS (Other) ^^f7 [0.3]
 TRUE
diff --git a/l3kernel/testfiles/m3text006.tlg b/l3kernel/testfiles/m3text006.tlg
index 8073379c4..8b171cc26 100644
--- a/l3kernel/testfiles/m3text006.tlg
+++ b/l3kernel/testfiles/m3text006.tlg
@@ -531,9 +531,9 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^c3^^b7 [0.2] LATIN SMALL LETTER A (Other) ^^c3^^97 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^c3^^b7 [999.0] BABY (ExtPict) ^^c3^^97 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^97 [11.0] OCTAGONAL SIGN (ExtPict) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] BABY (ExtPict) ^^c3^^97 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^c3^^97 [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^c3^^97 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^97 [11.0] BABY (ExtPict) ^^c3^^97 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^c3^^b7 [0.3]
-  ^^c3^^b7 [0.2] OCTAGONAL SIGN (ExtPict) ^^c3^^97 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^97 [11.0] OCTAGONAL SIGN (ExtPict) ^^c3^^b7 [0.3]
+FALSE
+FALSE
+FALSE
 TRUE
   ^^c3^^b7 [0.2] UPPER BLADE SCISSORS (Other) ^^c3^^97 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^c3^^97 [11.0] UPPER BLADE SCISSORS (Other) ^^c3^^b7 [0.3]
 TRUE
diff --git a/l3kernel/testfiles/m3text006.xetex.tlg b/l3kernel/testfiles/m3text006.xetex.tlg
index 4baafac08..fc6518828 100644
--- a/l3kernel/testfiles/m3text006.xetex.tlg
+++ b/l3kernel/testfiles/m3text006.xetex.tlg
@@ -531,9 +531,9 @@ TRUE
 TRUE
 TRUE
 TRUE
-  ^^f7 [0.2] LATIN SMALL LETTER A (Other) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^f7 [999.0] BABY (ExtPict) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] OCTAGONAL SIGN (ExtPict) ^^f7 [0.3]
-  ^^f7 [0.2] BABY (ExtPict) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^d7 [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] BABY (ExtPict) ^^d7 [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ^^f7 [0.3]
-  ^^f7 [0.2] OCTAGONAL SIGN (ExtPict) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] OCTAGONAL SIGN (ExtPict) ^^f7 [0.3]
+FALSE
+FALSE
+FALSE
 TRUE
   ^^f7 [0.2] UPPER BLADE SCISSORS (Other) ^^d7 [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ^^d7 [11.0] UPPER BLADE SCISSORS (Other) ^^f7 [0.3]
 TRUE





More information about the latex3-commits mailing list.