add dflt as alias for utf8/native to str-convert

latex3 · Feb 3, 2021 · b61162b · b61162b
1 parent b7c6bbc
commit b61162b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 0 deletions.
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Added
+- `dflt` alias to str_convert
+
 ## [2021-02-02]
 
 ### Added

diff --git a/l3kernel/l3str-convert.dtx b/l3kernel/l3str-convert.dtx
@@ -106,6 +106,8 @@
 %     \midrule
 %     \texttt{clist}                       & comma-list of integers \\
 %     \meta{empty}                         & native (Unicode) string \\
+%     \texttt{dflt}                        & like \texttt{utf8} with 8-bit engines,
+%                                            and like native with unicode-engines \\
 %     \bottomrule
 %   \end{tabular}
 % \end{table}
@@ -317,6 +319,17 @@
 \prop_gput:Nnn \g_@@_alias_prop { utf32le } { utf32 }
 \prop_gput:Nnn \g_@@_alias_prop { utf32be } { utf32 }
 \prop_gput:Nnn \g_@@_alias_prop { hexadecimal } { hex }
+\bool_lazy_any:nTF
+  {
+    \sys_if_engine_luatex_p:
+    \sys_if_engine_xetex_p:
+  }
+  {
+    \prop_gput:Nnn \g__str_alias_prop { dflt } {  }
+  }
+  {
+    \prop_gput:Nnn \g__str_alias_prop { dflt } { utf8 }
+  }
 %    \end{macrocode}
 % \end{variable}
 %

diff --git a/l3kernel/testfiles/m3str-convert002.luatex.tlg b/l3kernel/testfiles/m3str-convert002.luatex.tlg
@@ -183,3 +183,8 @@ TRUE
 TRUE
 TRUE
 ============================================================
+============================================================
+TEST 10: dflt
+============================================================
+TRUE
+============================================================
diff --git a/l3kernel/testfiles/m3str-convert002.lvt b/l3kernel/testfiles/m3str-convert002.lvt
@@ -119,4 +119,12 @@
       { \TRUE } { \ERROR }
   }
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\TEST { dflt }
+  {
+    \str_set_convert:Nnnn \l_tmpa_tl { Grüße }
+      { dflt } { utf16/hex }
+    \str_if_eq:onTF { \l_tmpa_tl } { FEFF0047007200FC00DF0065 }
+      { \TRUE } { \ERROR }
+  }    
 \END
diff --git a/l3kernel/testfiles/m3str-convert002.tlg b/l3kernel/testfiles/m3str-convert002.tlg
@@ -189,3 +189,8 @@ TRUE
 TRUE
 TRUE
 ============================================================
+============================================================
+TEST 10: dflt
+============================================================
+TRUE
+============================================================
diff --git a/l3kernel/testfiles/m3str-convert002.xetex.tlg b/l3kernel/testfiles/m3str-convert002.xetex.tlg
@@ -183,3 +183,8 @@ TRUE
 TRUE
 TRUE
 ============================================================
+============================================================
+TEST 10: dflt
+============================================================
+TRUE
+============================================================