summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3color.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3color.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3color.dtx102
1 files changed, 51 insertions, 51 deletions
diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx
index 1453001a2a..3d225b2d22 100644
--- a/macros/latex/contrib/l3kernel/l3color.dtx
+++ b/macros/latex/contrib/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-08-29}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -720,7 +720,7 @@
\cs_generate_variant:Nn \exp_last_unbraced:Nf { c }
\cs_new_protected:Npn \@@_convert:nnnN #1#2#3#4
{
- \tl_set:Nx #4
+ \tl_set:Ne #4
{
\cs_if_exist_use:cTF { @@_convert_ #1 _ #2 :w }
{ #3 \s_@@_stop }
@@ -850,11 +850,11 @@
% otherwise expands, then starts working through the expression itself.
% At the end, we apply the payload.
% \begin{macrocode}
-\cs_new_protected:Npx \@@_parse:nN #1#2
+\cs_new_protected:Npe \@@_parse:nN #1#2
{
- \tl_set:Nx \exp_not:c { l_@@_named_ . _tl }
+ \tl_set:Ne \exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_model:N \exp_not:N \l_@@_current_tl }
- \prop_put:NVx \exp_not:c { l_@@_named_ . _prop }
+ \prop_put:NVe \exp_not:c { l_@@_named_ . _prop }
\exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_values:N \exp_not:N \l_@@_current_tl }
\exp_not:N \exp_args:Ne \exp_not:N \@@_parse_aux:nN
@@ -889,14 +889,14 @@
\prop_get:cnNTF
{ l_@@_named_ #3 _prop } {#1}
\l_@@_value_tl
- { \tl_set:Nx #2 { {#1} { \l_@@_value_tl } } }
+ { \tl_set:Ne #2 { {#1} { \l_@@_value_tl } } }
{
\tl_set_eq:Nc \l_@@_model_tl { l_@@_named_ #3 _tl }
\prop_get:cVN { l_@@_named_ #3 _prop } \l_@@_model_tl
\l_@@_value_tl
\@@_convert:nnN
\l_@@_model_tl {#1} \l_@@_value_tl
- \tl_set:Nx #2
+ \tl_set:Ne #2
{
{#1}
{ \l_@@_value_tl }
@@ -926,7 +926,7 @@
\group_begin:
\@@_extract:nNN {#2} \l_@@_model_tl \l_@@_value_tl
\@@_parse_loop:w #3 ! ! ! ! \s_@@_stop
- \tl_set:Nx \l_@@_internal_tl
+ \tl_set:Ne \l_@@_internal_tl
{ { \l_@@_model_tl } { \l_@@_value_tl } }
\exp_args:NNNV \group_end:
\tl_set:Nn #1 \l_@@_internal_tl
@@ -951,7 +951,7 @@
{ \fp_compare_p:nNn {#1} > { 0 } }
{ \fp_compare_p:nNn {#1} < { 100 } }
{
- \use:x
+ \use:e
{
\@@_parse_loop:nn {#1}
{ \tl_if_blank:nTF {#2} { white } {#2} }
@@ -1004,7 +1004,7 @@
{ \@@_parse_gray:n {#2} }
{ \@@_parse_std:n {#2} }
}
- \tl_set:Nx \l_@@_value_tl
+ \tl_set:Ne \l_@@_value_tl
{
\@@_parse_mix:NVVn
\l_@@_model_tl \l_@@_value_tl \l_@@_next_value_tl {#1}
@@ -1400,7 +1400,7 @@
\@@_convert:VVN \l_@@_model_tl \l_color_fixed_model_tl
\l_@@_value_tl
}
- \tl_set:Nx #1
+ \tl_set:Ne #1
{ { \l_color_fixed_model_tl } { \l_@@_value_tl } }
}
}
@@ -1419,12 +1419,12 @@
% will therefore always be available. The finalisation is separate from the
% main function so it can also be applied to \emph{e.g.}~page color.
% \begin{macrocode}
-\cs_new_protected:Npx \@@_finalise_current:
+\cs_new_protected:Npe \@@_finalise_current:
{
- \tl_set:Nx \exp_not:c { l_@@_named_ . _tl }
+ \tl_set:Ne \exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_model:N \exp_not:N \l_@@_current_tl }
\prop_clear:N \exp_not:c { l_@@_named_ . _prop }
- \prop_put:NVx \exp_not:c { l_@@_named_ . _prop }
+ \prop_put:NVe \exp_not:c { l_@@_named_ . _prop }
\exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_values:N \exp_not:N \l_@@_current_tl }
}
@@ -1488,7 +1488,7 @@
{
\cs_if_exist:cTF { @@_parse_model_ #1 :w }
{
- \tl_set:Nx #3
+ \tl_set:Ne #3
{ \use:c { @@_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s_@@_stop }
}
{ \msg_error:nnn { color } { unknown-model } {#1} }
@@ -1496,7 +1496,7 @@
\cs_new_protected:Npn \@@_select_swap:Nnn #1#2#3
{
\@@_convert:nVnN {#2} \l_color_fixed_model_tl {#3} \l_@@_value_tl
- \tl_set:Nx #1
+ \tl_set:Ne #1
{ { \l_color_fixed_model_tl } { \l_@@_value_tl } }
}
% \end{macrocode}
@@ -1781,10 +1781,10 @@
{
\@@_parse:nN {#2} \l_@@_named_tl
\tl_clear_new:c { l_@@_named_ #1 _tl }
- \tl_set:cx { l_@@_named_ #1 _tl }
+ \tl_set:ce { l_@@_named_ #1 _tl }
{ \@@_model:N \l_@@_named_tl }
\prop_clear_new:c { l_@@_named_ #1 _prop }
- \prop_put:cvx { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
+ \prop_put:cve { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
{ \@@_values:N \l_@@_named_tl }
\@@_set:nnw {#1} {#2} #2 ! \s_@@_stop
}
@@ -1811,7 +1811,7 @@
\@@_parse:nN {#2} \l_@@_internal_tl
\exp_args:NNNV \group_end:
\tl_set:Nn \l_@@_internal_tl \l_@@_internal_tl
- \prop_put:cxx { l_@@_named_ #1 _prop }
+ \prop_put:cee { l_@@_named_ #1 _prop }
{ \@@_model:N \l_@@_internal_tl }
{ \@@_values:N \l_@@_internal_tl }
}
@@ -1828,16 +1828,16 @@
{#1} {#3}
}
}
-\cs_new_protected:Npx \@@_set_aux:nnn #1#2#3
+\cs_new_protected:Npe \@@_set_aux:nnn #1#2#3
{
\exp_not:N \@@_set_colon:nnw {#2} {#3}
#1 \c_colon_str \c_colon_str \exp_not:N \s_@@_stop
}
-\use:x
+\use:e
{
\cs_new_protected:Npn \exp_not:N \@@_set_colon:nnw
- ##1##2 ##3 \c_colon_str ##4 \c_colon_str
- ##5 \exp_not:N \s_@@_stop
+ #1#2 #3 \c_colon_str #4 \c_colon_str
+ #5 \exp_not:N \s_@@_stop
}
{
\tl_if_blank:nTF {#4}
@@ -1851,10 +1851,10 @@
\tl_if_blank:nF {#2}
{
\@@_select:nnN {#2} {#4} \l_@@_named_tl
- \tl_set:Nx \l_@@_internal_tl { \@@_model:N \l_@@_named_tl }
+ \tl_set:Ne \l_@@_internal_tl { \@@_model:N \l_@@_named_tl }
\tl_if_empty:cT { l_@@_named_ #1 _tl }
{ \tl_set_eq:cN { l_@@_named_ #1 _tl } \l_@@_internal_tl }
- \prop_put:cVx { l_@@_named_ #1 _prop } \l_@@_internal_tl
+ \prop_put:cVe { l_@@_named_ #1 _prop } \l_@@_internal_tl
{ \@@_values:N \l_@@_named_tl }
\@@_set_loop:nw {#1} #3 \s_@@_mark #5 \s_@@_stop
}
@@ -1867,9 +1867,9 @@
\prop_clear_new:c { l_@@_named_ #1 _prop }
\str_if_eq:nnTF {#2} { . }
{
- \tl_set:cx { l_@@_named_ #1 _tl }
+ \tl_set:ce { l_@@_named_ #1 _tl }
{ \@@_model:N \l_@@_current_tl }
- \prop_put:cvx { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
+ \prop_put:cve { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
{ \@@_values:N \l_@@_current_tl }
}
{
@@ -1909,7 +1909,7 @@
% \begin{macrocode}
\prop_new:c { l_@@_named_._prop }
\tl_new:c { l_@@_named_._tl }
-\tl_set:cx { l_@@_named_._tl } { \@@_model:N \l_@@_current_tl }
+\tl_set:ce { l_@@_named_._tl } { \@@_model:N \l_@@_current_tl }
% \end{macrocode}
% \end{variable}
%
@@ -2005,7 +2005,7 @@
\group_begin:
\cs_set_protected:Npn \@@_tmp:w #1#2
{
- \cs_new_protected:cpx { @@_export_format_ #1 :nnN } ##1##2##3
+ \cs_new_protected:cpe { @@_export_format_ #1 :nnN } ##1##2##3
{
\exp_not:N \@@_export:nnnNN {#2} {##1} {##2} ##3
\exp_not:c { @@_export_ #1 :Nw }
@@ -2042,10 +2042,10 @@
% required, then do some simple maths.
% \begin{macrocode}
\cs_new_protected:cpn { @@_export_comma-sep-rgb:Nw } #1#2 ~ #3 ~ #4 \s_@@_stop
- { \tl_set:Nx #1 { #2 , #3 , #4 } }
+ { \tl_set:Ne #1 { #2 , #3 , #4 } }
\cs_new_protected:Npn \@@_export_HTML:Nw #1#2 ~ #3 ~ #4 \s_@@_stop
{
- \tl_set:Nx #1
+ \tl_set:Ne #1
{
\@@_export_HTML:n {#2}
\@@_export_HTML:n {#3}
@@ -2195,7 +2195,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_model_init:nnn, \@@_model_init:nnx}
+% \begin{macro}{\@@_model_init:nnn, \@@_model_init:nne}
% A shared auxiliary to do the basics of setting up a new model: reserve a
% number, create a white-equivalent, set up links to the backend.
% \begin{macrocode}
@@ -2204,13 +2204,13 @@
\int_gincr:N \g_@@_model_int
\clist_map_inline:nn { fill , stroke , select }
{
- \cs_new_protected:cpx { @@_backend_ ##1 _ #1 :n } ####1
+ \cs_new_protected:cpe { @@_backend_ ##1 _ #1 :n } ####1
{
\exp_not:c { @@_backend_ ##1 _ #2 :nn }
{ color \int_use:N \g_@@_model_int } {####1}
}
}
- \cs_new_protected:cpx { @@_model_ #1 _white: }
+ \cs_new_protected:cpe { @@_model_ #1 _white: }
{
\prop_put:Nnn \exp_not:N \l_@@_named_white_prop {#1}
{ \exp_not:n {#3} }
@@ -2219,7 +2219,7 @@
}
\use:c { @@_model_ #1 _white: }
}
-\cs_generate_variant:Nn \@@_model_init:nnn { nnx }
+\cs_generate_variant:Nn \@@_model_init:nnn { nne }
% \end{macrocode}
% \end{macro}
%
@@ -2309,7 +2309,7 @@
\use:c { @@_model_separation_ #8 :nnnnnn }
{#6} {#7} {#1} {#2} {#3} {#4}
\prop_gput:Nnn \g_@@_alternative_model_prop {#6} {#8}
- \prop_gput:Nnx \g_@@_colorants_prop {#6}
+ \prop_gput:Nne \g_@@_colorants_prop {#6}
{ \str_convert_pdfname:n {#7} }
}
\cs_new_protected:Npn \@@_model_separation_cmyk:nnnnnn #1#2#3#4#5#6
@@ -2355,7 +2355,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_model_convert:nnn #1#2#3
{
- \cs_new:cpx { @@_convert_ #1 _ #3 :w } ##1 \s_@@_stop
+ \cs_new:cpe { @@_convert_ #1 _ #3 :w } ##1 \s_@@_stop
{
\exp_not:N \exp_args:NNe \exp_not:N \use:nn
\exp_not:c { @@_convert_ #2 _ #3 :w }
@@ -2520,7 +2520,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_model_devicen:nnn #1#2#3
{
- \exp_args:Nx \@@_model_devicen:nnnn
+ \exp_args:Ne \@@_model_devicen:nnnn
{ \clist_count:n {#2} } {#1} {#2} {#3}
}
% \end{macrocode}
@@ -2531,7 +2531,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_model_devicen:nnnn #1#2#3#4
{
- \@@_model_init:nnx {#4} { devicen }
+ \@@_model_init:nne {#4} { devicen }
{
0 \prg_replicate:nn { #1 - 1 } { ~ 0 }
}
@@ -2539,7 +2539,7 @@
{ \@@_model_devicen_parse_generic:nn }
{#4} {#1}
\@@_model_devicen_init:nnn {#1} {#2} {#3}
- \@@_model_devicen_convert:nnnx {#4} {#2} {#3}
+ \@@_model_devicen_convert:nnne {#4} {#2} {#3}
{
1 \prg_replicate:nn { #1 - 1 } { ~ 1 }
}
@@ -2602,7 +2602,7 @@
{#1}
{ \@@_model_devicen_parse:nw {#2} ##1 , ##2 , \q_nil , \s_@@_stop }
}
- \cs_new:cpx { @@_parse_mix_ #1 :nw }
+ \cs_new:cpe { @@_parse_mix_ #1 :nw }
##1 ##2 \s_@@_mark ##3 \s_@@_stop
{
\exp_not:N \@@_model_devicen_mix:nw {##1}
@@ -2680,7 +2680,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_model_devicen_init:nnnn #1#2#3#4
{
- \tl_set:Nx \l_@@_internal_tl
+ \tl_set:Ne \l_@@_internal_tl
{ \prg_replicate:nn {#1} { 1.0 ~ } }
\int_zero:N \l_@@_internal_int
\clist_map_inline:nn {#4}
@@ -2691,7 +2691,7 @@
\exp_after:wN \@@_model_devicen_transform:w
\l_@@_value_tl , 0 , 0 , 0 , \s_@@_stop {#1} {#2}
}
- \tl_put_right:Nx \l_@@_internal_tl
+ \tl_put_right:Ne \l_@@_internal_tl
{
\prg_replicate:nn {#1}
{ neg ~ 1.0 ~ add ~ #1 ~ -1 ~ roll ~ }
@@ -2699,7 +2699,7 @@
\prg_replicate:nn {#2} { ~ pop } ~
#1 ~ 1 ~ roll
}
- \use:x
+ \use:e
{
\@@_backend_devicen_init:nnn
{
@@ -2737,7 +2737,7 @@
}
\cs_new_protected:Npn \@@_model_devicen_transform:nnn #1#2#3
{
- \tl_put_right:Nx \l_@@_internal_tl
+ \tl_put_right:Ne \l_@@_internal_tl
{
\fp_compare:nNnF {#3} = \c_zero_fp
{
@@ -2761,7 +2761,7 @@
{
\use:c { @@_model_devicen_convert_ #2 :nnn } {#1} {#3}
}
-\cs_generate_variant:Nn \@@_model_devicen_convert:nnnn { nnnx }
+\cs_generate_variant:Nn \@@_model_devicen_convert:nnnn { nnne }
\cs_new_protected:Npn \@@_model_devicen_convert_cmyk:nnn #1#2
{
\tl_const:cn { c_@@_fallback_ #1 _tl } { cmyk }
@@ -2780,7 +2780,7 @@
\cs_new_protected:Npn \@@_model_devicen_convert:nnnnn #1#2#3#4#5
{
\cs_new:cpn { @@_convert_ #2 _ #1 :w } ##1 \s_@@_stop {#5}
- \cs_new:cpx { @@_convert_ #1 _ #2 :w } ##1 \s_@@_stop
+ \cs_new:cpe { @@_convert_ #1 _ #2 :w } ##1 \s_@@_stop
{
\exp_not:c { @@_convert_devicen_ #2 : \prg_replicate:nn {#3} { n } w }
\prg_replicate:nn {#3} { { 1 } }
@@ -2963,7 +2963,7 @@
}
\cs_new_protected:Npn \@@_model_iccbased:nn #1#2
{
- \exp_args:NNx \prop_get:NnNTF \c_@@_icc_colorspace_signatures_prop
+ \prop_get:NeNTF \c_@@_icc_colorspace_signatures_prop
{ \file_hex_dump:nnn { #1 } { 17 } { 20 } } \l_@@_internal_tl
{
\exp_last_unbraced:NV \@@_model_iccbased_aux:nnnnnn
@@ -2986,7 +2986,7 @@
\cs_new:cpn { @@_convert_ #5 _gray:w } ##1 \s_@@_stop { 0 }
\cs_new:cpn { @@_convert_gray_ #5 :w } ##1 \s_@@_stop { #2 }
\use:c { @@_model_devicen_parse_ #1 :nn } {#5} {#1}
- \exp_args:Nx \@@_backend_iccbased_init:nnn
+ \exp_args:Ne \@@_backend_iccbased_init:nnn
{ \file_full_name:n {#6} } {#1} {#4}
}
% \end{macrocode}
@@ -3047,9 +3047,9 @@
% is similar to the keys module here.
% \begin{macrocode}
\cs_new_protected:Npn \color_show:n
- { \@@_show:Nn \msg_show:nnxxxx }
+ { \@@_show:Nn \msg_show:nneeee }
\cs_new_protected:Npn \color_log:n
- { \@@_show:Nn \msg_log:nnxxxx }
+ { \@@_show:Nn \msg_log:nneeee }
\cs_new_protected:Npn \@@_show:Nn #1#2
{
#1 { color } { show }