summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3color-base.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-06-19 03:03:14 +0000
committerNorbert Preining <norbert@preining.info>2020-06-19 03:03:14 +0000
commitfa4840ca74917d6402885b9b77c26e51b61fc68a (patch)
treeefd50c9a9a8eddb4154175ae575aa5f435582a06 /macros/latex/contrib/l3kernel/l3color-base.dtx
parent7a78c3b8b21b6842d27bb48f37197f8c380ccc5e (diff)
CTAN sync 202006190303
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3color-base.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3color-base.dtx30
1 files changed, 13 insertions, 17 deletions
diff --git a/macros/latex/contrib/l3kernel/l3color-base.dtx b/macros/latex/contrib/l3kernel/l3color-base.dtx
index a042985a33..178cd98b19 100644
--- a/macros/latex/contrib/l3kernel/l3color-base.dtx
+++ b/macros/latex/contrib/l3kernel/l3color-base.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2020-06-03}
+% \date{Released 2020-06-18}
%
% \maketitle
%
@@ -116,10 +116,9 @@
% number of data entries these require will depend on the number of
% colors to be mixed.
% \begin{texnote}
-% The content of \cs{l_@@_current_tl} is space-separated as
-% this allows it to be used directly in specials in many common cases.
-% This internal representation is close to that used by the \texttt{dvips}
-% program.
+% The content of \cs{l_@@_current_tl} comprises two brace groups, the
+% first containing the color model and the second containing the value(s)
+% applicable in that model.
% \end{texnote}
% \end{variable}
%
@@ -142,7 +141,7 @@
%<*package>
\@@_backend_pickup:N \l_@@_current_tl
%</package>
- \@@_select:V \l_@@_current_tl
+ \@@_select:N \l_@@_current_tl
}
% \end{macrocode}
% \end{macro}
@@ -154,28 +153,25 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_select:n, \@@_select:V}
-% \begin{macro}{\@@_select:w}
+% \begin{macro}{\@@_select:N}
+% \begin{macro}{\@@_select:nn}
% Take an internal color specification and pass it to the driver. This code
% is needed to ensure the current color but will also be used by the
% higher-level experimental material.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_select:n #1
- { \@@_select:w #1 \s_@@_stop }
-\cs_generate_variant:Nn \@@_select:n { V }
-\cs_new_protected:Npn \@@_select:w #1 ~ #2 \s_@@_stop
- { \use:c { @@_backend_ #1 :w } #2 \s_@@_stop }
+\cs_new_protected:Npn \@@_select:N #1
+ { \exp_after:wN \@@_select:nn #1 }
+\cs_new_protected:Npn \@@_select:nn #1#2
+ { \use:c { @@_backend_ #1 :n } {#2} }
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{variable}{\l_@@_current_tl}
-% As the setting data is used only
-% for specials, and those are always space-separated, it makes most sense to
-% hold the internal information in that form.
+% The current color, with the model and
% \begin{macrocode}
\tl_new:N \l_@@_current_tl
-\tl_set:Nn \l_@@_current_tl { gray~0 }
+\tl_set:Nn \l_@@_current_tl { { gray } { 0 } }
% \end{macrocode}
% \end{variable}
%