summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3str-convert.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-11 03:02:59 +0000
committerNorbert Preining <norbert@preining.info>2023-10-11 03:02:59 +0000
commit366cf31a771ded1f10860be3212058d48020398d (patch)
tree99ee483a9fd05dfd4ec908582abb44028bdffbd1 /macros/latex/contrib/l3kernel/l3str-convert.dtx
parent48eedda2cb4d2644886b862409b24a1d8e9a136f (diff)
CTAN sync 202310110302
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3str-convert.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3str-convert.dtx94
1 files changed, 47 insertions, 47 deletions
diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx
index 6c0b2145e2..f4bfaf2c2c 100644
--- a/macros/latex/contrib/l3kernel/l3str-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2023-08-29}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -468,12 +468,12 @@
% an empty result for the input $-1$.
% \begin{macrocode}
\group_begin:
- \__kernel_tl_set:Nx \l_@@_internal_tl { \tl_to_str:n { 0123456789ABCDEF } }
+ \__kernel_tl_set:Ne \l_@@_internal_tl { \tl_to_str:n { 0123456789ABCDEF } }
\tl_map_inline:Nn \l_@@_internal_tl
{
\tl_map_inline:Nn \l_@@_internal_tl
{
- \tl_const:cx { c_@@_byte_ \int_eval:n {"#1##1} _tl }
+ \tl_const:ce { c_@@_byte_ \int_eval:n {"#1##1} _tl }
{ \char_generate:nn { "#1##1 } { 12 } #1 ##1 }
}
}
@@ -554,7 +554,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_convert_gmap:N #1
{
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_convert_gmap_loop:NN
\exp_after:wN #1
@@ -579,7 +579,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_convert_gmap_internal:N #1
{
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_convert_gmap_internal_loop:Nww
\exp_after:wN #1
@@ -599,8 +599,8 @@
%
% \subsubsection{Error-reporting during conversion}
%
-% \begin{macro}{\@@_if_flag_error:nnx}
-% \begin{macro}{\@@_if_flag_no_error:nnx}
+% \begin{macro}{\@@_if_flag_error:nne}
+% \begin{macro}{\@@_if_flag_no_error:nne}
% When converting using the function \cs{str_set_convert:Nnnn}, errors
% should be reported to the user after each step in the
% conversion. Errors are signalled by raising some flag (typically
@@ -608,16 +608,16 @@
% give the user an error, otherwise remove the arguments. On the other
% hand, in the conditional functions \cs{str_set_convert:NnnnTF},
% errors should be suppressed. This is done by changing
-% \cs{@@_if_flag_error:nnx} into \cs{@@_if_flag_no_error:nnx}
+% \cs{@@_if_flag_error:nne} into \cs{@@_if_flag_no_error:nne}
% locally.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_if_flag_error:nnx #1
+\cs_new_protected:Npn \@@_if_flag_error:nne #1
{
\flag_if_raised:nTF {#1}
- { \msg_error:nnx { str } }
+ { \msg_error:nne { str } }
{ \use_none:nn }
}
-\cs_new_protected:Npn \@@_if_flag_no_error:nnx #1#2#3
+\cs_new_protected:Npn \@@_if_flag_no_error:nne #1#2#3
{ \flag_if_raised:nT {#1} { \bool_gset_true:N \g_@@_error_bool } }
% \end{macrocode}
% \end{macro}
@@ -675,7 +675,7 @@
% unescape and decode; encode and escape; exit the group and store the
% result in the user's variable. The various conversion functions all
% act on \cs{g_@@_result_tl}. Errors are silenced for the conditional
-% functions by redefining \cs{@@_if_flag_error:nnx} locally.
+% functions by redefining \cs{@@_if_flag_error:nne} locally.
% \begin{macrocode}
\cs_new_protected:Npn \str_set_convert:Nnnn
{ \@@_convert:nNNnnn { } \tl_set_eq:NN }
@@ -686,7 +686,7 @@
{
\bool_gset_false:N \g_@@_error_bool
\@@_convert:nNNnnn
- { \cs_set_eq:NN \@@_if_flag_error:nnx \@@_if_flag_no_error:nnx }
+ { \cs_set_eq:NN \@@_if_flag_error:nne \@@_if_flag_no_error:nne }
\tl_set_eq:NN #1 {#2} {#3} {#4}
\bool_if:NTF \g_@@_error_bool \prg_return_false: \prg_return_true:
}
@@ -695,7 +695,7 @@
{
\bool_gset_false:N \g_@@_error_bool
\@@_convert:nNNnnn
- { \cs_set_eq:NN \@@_if_flag_error:nnx \@@_if_flag_no_error:nnx }
+ { \cs_set_eq:NN \@@_if_flag_error:nne \@@_if_flag_no_error:nne }
\tl_gset_eq:NN #1 {#2} {#3} {#4}
\bool_if:NTF \g_@@_error_bool \prg_return_false: \prg_return_true:
}
@@ -703,7 +703,7 @@
{
\group_begin:
#1
- \__kernel_tl_gset:Nx \g_@@_result_tl { \__kernel_str_to_other_fast:n {#4} }
+ \__kernel_tl_gset:Ne \g_@@_result_tl { \__kernel_str_to_other_fast:n {#4} }
\exp_after:wN \@@_convert:wwwnn
\tl_to_str:n {#5} /// \s_@@_stop
{ decode } { unescape }
@@ -758,7 +758,7 @@
{
\if_meaning:w #1 #5
\tl_if_empty:nF {#3}
- { \msg_error:nnx { str } { native-escaping } {#3} }
+ { \msg_error:nne { str } { native-escaping } {#3} }
#1
\else:
#4 #2 #1
@@ -808,7 +808,7 @@
{
\cs_if_exist:cF { @@_convert_#2_#3: }
{
- \exp_args:Nx \@@_convert:nnnn
+ \exp_args:Ne \@@_convert:nnnn
{ \@@_convert_lowercase_alphanum:n {#3} }
{#1} {#2} {#3}
}
@@ -830,7 +830,7 @@
}
{
\tl_clear:N \l_@@_internal_tl
- \msg_error:nnxx { str } { unknown-#2 } {#4} {#1}
+ \msg_error:nnee { str } { unknown-#2 } {#4} {#1}
}
}
\cs_if_exist:cF { @@_convert_#3_#1: }
@@ -936,9 +936,9 @@
\cs_new_protected:Npn \@@_convert_unescape_:
{
\flag_clear:n { str_byte }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{ \exp_args:No \@@_filter_bytes:n \g_@@_result_tl }
- \@@_if_flag_error:nnx { str_byte } { non-byte } { bytes }
+ \@@_if_flag_error:nne { str_byte } { non-byte } { bytes }
}
}
{ \cs_new_protected:Npn \@@_convert_unescape_: { } }
@@ -997,7 +997,7 @@
{
\flag_clear:n { str_error }
\@@_convert_gmap_internal:N \@@_encode_native_char:n
- \@@_if_flag_error:nnx { str_error }
+ \@@_if_flag_error:nne { str_error }
{ native-overflow } { }
}
\cs_new:Npn \@@_encode_native_char:n #1
@@ -1032,7 +1032,7 @@
\cs_new_protected:Npn \@@_convert_decode_clist:
{
\clist_gset:No \g_@@_result_tl \g_@@_result_tl
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_args:No \clist_map_function:nN
\g_@@_result_tl \@@_decode_clist_char:n
@@ -1055,7 +1055,7 @@
\cs_new_protected:Npn \@@_convert_encode_clist:
{
\@@_convert_gmap_internal:N \@@_encode_clist_char:n
- \__kernel_tl_gset:Nx \g_@@_result_tl { \tl_tail:N \g_@@_result_tl }
+ \__kernel_tl_gset:Ne \g_@@_result_tl { \tl_tail:N \g_@@_result_tl }
}
\cs_new:Npn \@@_encode_clist_char:n #1 { , #1 }
% \end{macrocode}
@@ -1179,14 +1179,14 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_convert_decode_eight_bit:n #1
{
- \cs_set:Npx \@@_tmp:w
+ \cs_set:Npe \@@_tmp:w
{
\exp_not:N \@@_decode_eight_bit_aux:Nn
\exp_not:c { g_@@_decode_#1_intarray }
}
\flag_clear:n { str_error }
\@@_convert_gmap:N \@@_tmp:w
- \@@_if_flag_error:nnx { str_error } { decode-8-bit } {#1}
+ \@@_if_flag_error:nne { str_error } { decode-8-bit } {#1}
}
\cs_new:Npn \@@_decode_eight_bit_aux:Nn #1#2
{
@@ -1222,7 +1222,7 @@
\int_new:N \l_@@_modulo_int
\cs_new_protected:Npn \@@_convert_encode_eight_bit:n #1
{
- \cs_set:Npx \@@_tmp:w
+ \cs_set:Npe \@@_tmp:w
{
\exp_not:N \@@_encode_eight_bit_aux:NNn
\exp_not:c { g_@@_encode_#1_intarray }
@@ -1230,7 +1230,7 @@
}
\flag_clear:n { str_error }
\@@_convert_gmap_internal:N \@@_tmp:w
- \@@_if_flag_error:nnx { str_error } { encode-8-bit } {#1}
+ \@@_if_flag_error:nne { str_error } { encode-8-bit } {#1}
}
\cs_new:Npn \@@_encode_eight_bit_aux:NNn #1#2#3
{
@@ -1349,7 +1349,7 @@
\group_begin:
\flag_clear:n { str_error }
\int_set:Nn \tex_escapechar:D { 92 }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\@@_output_byte:w "
\exp_last_unbraced:Nf \@@_unescape_hex_auxi:N
@@ -1358,7 +1358,7 @@
\prg_break_point:
\@@_output_end:
}
- \@@_if_flag_error:nnx { str_error } { unescape-hex } { }
+ \@@_if_flag_error:nne { str_error } { unescape-hex } { }
\group_end:
}
\cs_new:Npn \@@_unescape_hex_auxi:N #1
@@ -1428,14 +1428,14 @@
\flag_clear:n { str_byte }
\flag_clear:n { str_error }
\int_set:Nn \tex_escapechar:D { 92 }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN #3 \g_@@_result_tl
#1 ? { ? \prg_break: }
\prg_break_point:
}
- \@@_if_flag_error:nnx { str_byte } { non-byte } { #2 }
- \@@_if_flag_error:nnx { str_error } { unescape-#2 } { }
+ \@@_if_flag_error:nne { str_byte } { non-byte } { #2 }
+ \@@_if_flag_error:nne { str_error } { unescape-#2 } { }
\group_end:
}
\cs_new:Npn #3 ##1#1##2##3
@@ -1514,20 +1514,20 @@
\flag_clear:n { str_byte }
\flag_clear:n { str_error }
\int_set:Nn \tex_escapechar:D { 92 }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_unescape_string_newlines:wN
\g_@@_result_tl \prg_break: ^^M ?
\prg_break_point:
}
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_unescape_string_loop:wNNN
\g_@@_result_tl #1 ?? { ? \prg_break: }
\prg_break_point:
}
- \@@_if_flag_error:nnx { str_byte } { non-byte } { string }
- \@@_if_flag_error:nnx { str_error } { unescape-string } { }
+ \@@_if_flag_error:nne { str_byte } { non-byte } { string }
+ \@@_if_flag_error:nne { str_error } { unescape-string } { }
\group_end:
}
}
@@ -1664,7 +1664,7 @@
% (and including) \texttt{del}, are converted to octal. One backslash
% is added before each parenthesis and backslash.
% \begin{macrocode}
-\str_const:Nx \c_@@_escape_string_str
+\str_const:Ne \c_@@_escape_string_str
{ \c_backslash_str ( ) }
\cs_new_protected:Npn \@@_convert_escape_string:
{ \@@_convert_gmap:N \@@_escape_string_char:N }
@@ -1973,13 +1973,13 @@
\flag_clear:n { str_extra }
\flag_clear:n { str_overlong }
\flag_clear:n { str_overflow }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_decode_utf_viii_start:N \g_@@_result_tl
{ \prg_break: \@@_decode_utf_viii_end: }
\prg_break_point:
}
- \@@_if_flag_error:nnx { str_error } { utf8-decode } { }
+ \@@_if_flag_error:nne { str_error } { utf8-decode } { }
}
\cs_new:Npn \@@_decode_utf_viii_start:N #1
{
@@ -2109,7 +2109,7 @@
\cs_new_protected:cpn { @@_convert_encode_utf16: }
{
\@@_encode_utf_xvi_aux:N \@@_output_byte_pair_be:n
- \tl_gput_left:Nx \g_@@_result_tl { ^^fe ^^ff }
+ \tl_gput_left:Ne \g_@@_result_tl { ^^fe ^^ff }
}
\cs_new_protected:cpn { @@_convert_encode_utf16be: }
{ \@@_encode_utf_xvi_aux:N \@@_output_byte_pair_be:n }
@@ -2120,7 +2120,7 @@
\flag_clear:n { str_error }
\cs_set_eq:NN \@@_tmp:w #1
\@@_convert_gmap_internal:N \@@_encode_utf_xvi_char:n
- \@@_if_flag_error:nnx { str_error } { utf16-encode } { }
+ \@@_if_flag_error:nne { str_error } { utf16-encode } { }
}
\cs_new:Npn \@@_encode_utf_xvi_char:n #1
{
@@ -2263,13 +2263,13 @@
\flag_clear:n { str_extra }
\flag_clear:n { str_end }
\cs_set:Npn \@@_tmp:w ##1 ##2 { ` ## #1 }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_decode_utf_xvi_pair:NN
#2 \q_@@_nil \q_@@_nil
\prg_break_point:
}
- \@@_if_flag_error:nnx { str_error } { utf16-decode } { }
+ \@@_if_flag_error:nne { str_error } { utf16-decode } { }
}
% \end{macrocode}
% \end{macro}
@@ -2422,7 +2422,7 @@
\cs_new_protected:cpn { @@_convert_encode_utf32: }
{
\@@_convert_gmap_internal:N \@@_encode_utf_xxxii_be:n
- \tl_gput_left:Nx \g_@@_result_tl { ^^00 ^^00 ^^fe ^^ff }
+ \tl_gput_left:Ne \g_@@_result_tl { ^^00 ^^00 ^^fe ^^ff }
}
\cs_new_protected:cpn { @@_convert_encode_utf32be: }
{ \@@_convert_gmap_internal:N \@@_encode_utf_xxxii_be:n }
@@ -2551,13 +2551,13 @@
\flag_clear:n { str_end }
\flag_clear:n { str_error }
\cs_set:Npn \@@_tmp:w ##1 ##2 { ` ## #1 }
- \__kernel_tl_gset:Nx \g_@@_result_tl
+ \__kernel_tl_gset:Ne \g_@@_result_tl
{
\exp_after:wN \@@_decode_utf_xxxii_loop:NNNN
#2 \s_@@_stop \s_@@_stop \s_@@_stop \s_@@_stop
\prg_break_point:
}
- \@@_if_flag_error:nnx { str_error } { utf32-decode } { }
+ \@@_if_flag_error:nne { str_error } { utf32-decode } { }
}
\cs_new:Npn \@@_decode_utf_xxxii_loop:NNNN #1#2#3#4
{
@@ -2639,7 +2639,7 @@
}
\cs_new:Npn \@@_convert_pdfname_bytes_aux:n #1
{ \@@_convert_pdfname_bytes_aux:nnnn #1 }
- \cs_new:Npx \@@_convert_pdfname_bytes_aux:nnnn #1#2#3#4
+ \cs_new:Npe \@@_convert_pdfname_bytes_aux:nnnn #1#2#3#4
{
\c_hash_str \exp_not:N \@@_output_hexadecimal:n {#1}
\c_hash_str \exp_not:N \@@_output_hexadecimal:n {#2}