[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move color model selection to l3color-(base) (9de68b7)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Feb 21 00:03:40 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/9de68b70d239ae7bf6b3fb1087b3ebe14a4e12d8
>---------------------------------------------------------------
commit 9de68b70d239ae7bf6b3fb1087b3ebe14a4e12d8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Feb 20 22:00:50 2018 +0000
Move color model selection to l3color-(base)
This alsigns with the approach for the drawing code, and also with the
idea that the driver source does only what is required to make
everything work.
Aligning the two color paths will be required to make color selection
work properly in drawings.
>---------------------------------------------------------------
9de68b70d239ae7bf6b3fb1087b3ebe14a4e12d8
l3experimental/l3color/l3color.dtx | 2 +-
l3kernel/l3color-base.dtx | 32 +++++-
l3kernel/l3drivers.dtx | 176 ++++++++++++++++---------------
l3kernel/testfiles/m3expl001.luatex.tlg | 21 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 19 ++--
l3kernel/testfiles/m3expl001.tlg | 21 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 19 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 19 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 21 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 19 ++--
l3kernel/testfiles/m3expl003.tlg | 21 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 19 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 19 ++--
13 files changed, 252 insertions(+), 156 deletions(-)
diff --git a/l3experimental/l3color/l3color.dtx b/l3experimental/l3color/l3color.dtx
index ca777f2..ae3f7c6 100644
--- a/l3experimental/l3color/l3color.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@ -635,7 +635,7 @@
{
\@@_finalise:N \l_@@_current_tl
\tl_set_eq:cN { l_@@_named_ . _tl } \l_@@_current_tl
- \__driver_color_select:V \l_@@_current_tl
+ \@@_select:V \l_@@_current_tl
}
\cs_new_protected:Npn \@@_finalise:N #1
{
diff --git a/l3kernel/l3color-base.dtx b/l3kernel/l3color-base.dtx
index 869c106..3ef7080 100644
--- a/l3kernel/l3color-base.dtx
+++ b/l3kernel/l3color-base.dtx
@@ -144,14 +144,40 @@
\cs_new_protected:Npn \color_ensure_current:
{
%<*package>
- \__driver_color_pickup:N \l_@@_current_tl
+ \driver_color_pickup:N \l_@@_current_tl
%</package>
- \__driver_color_select:V \l_@@_current_tl
- \group_insert_after:N \__driver_color_reset:
+ \@@_select:V \l_@@_current_tl
+ \group_insert_after:N \driver_color_reset:
}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_select:n, \@@_select:V}
+% \begin{macro}{\@@_select:w}
+% \begin{macro}
+% {\@@_split_cmyk:w, \@@_split_gray:w, \@@_split_rgb:w, \@@_split_spot:w}
+% 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 \q_stop }
+\cs_generate_variant:Nn \@@_select:n { V }
+\cs_new_protected:Npn \@@_select:w #1 ~ #2 \q_stop
+ { \use:c { @@_select_ #1 :w } #2 \q_stop }
+\cs_new_protected:Npn \@@_select_cmyk:w #1 ~ #2 ~ #3 ~ #4 \q_stop
+ { \driver_color_cmyk:nnnn {#1} {#2} {#3} {#4} }
+\cs_new_protected:Npn \@@_select_gray:w #1 \q_stop
+ { \driver_color_gray:n {#1} }
+\cs_new_protected:Npn \@@_select_rgb:w #1 ~ #2 ~ #3 \q_stop
+ { \driver_color_rgb:nnn {#1} {#2} {#3} }
+\cs_new_protected:Npn \@@_select_spot:w #1 ~ #2 \q_stop
+ { \driver_color_spot:nn {#1} {#2} }
+% \end{macrocode}
+% \end{macro}
+% \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
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index cb01613..8166639 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -122,20 +122,50 @@
%
% \section{Color support}
%
-% \begin{function}[added = 2017-10-25]
-% {\__driver_color_select:n, \__driver_color_select:V}
+% \begin{function}[added = 2018-02-20]{\driver_color_cmyk:nnnn}
% \begin{syntax}
-% \cs{__driver_color_select:n} \Arg{color}
+% \cs{driver_color_cmyk:nnnn} \Arg{cyan} \Arg{magenta} \Arg{yellow}
+% \Arg{black}
+% \end{syntax}
+% Sets the color to the CMYK values specified, all of which are
+% fp denotations in the range $0$ and $1$. For drawing colors, see
+% \cs{driver_draw_color_cmyk:nnnn}, \emph{etc.}
+% \end{function}
+%
+% \begin{function}[added = 2018-02-20]{\driver_color_gray:n}
+% \begin{syntax}
+% \cs{driver_color_gray:n} \Arg{gray}
% \end{syntax}
-% Selects the \meta{color} (which is given in low-level format: a
-% \meta{model} followed by a space and one or more space-separated
-% axes).
+% Sets the color to the grayscale value specified, which is
+% fp denotations in the range $0$ and $1$. For drawing colors, see
+% \cs{driver_draw_color_gray:n}, \emph{etc.}
% \end{function}
%
-% \begin{function}[added = 2017-10-25]
-% {\__driver_color_pickup:N}
+% \begin{function}[added = 2018-02-20]{\driver_color_rgb:nnn}
% \begin{syntax}
-% \cs{__driver_color_pickup:N} \meta{tl}
+% \cs{driver_color_rgb:nnn} \Arg{red} \Arg{green} \Arg{blue}
+% \end{syntax}
+% Sets the color to the RGB values specified, all of which are
+% fp denotations in the range $0$ and $1$. For drawing colors, see
+% \cs{driver_draw_color_rgb:nnn}, \emph{etc.}
+% \end{function}
+%
+% \begin{function}[added = 2018-02-20]{\driver_color_reset:}
+% \begin{syntax}
+% \cs{driver_color_reset:}
+% \end{syntax}
+% Resets the active color to that before a call to
+% \cs{driver_color_\meta{model}:n(nnn)}. This function should be inserted
+% after the \TeX{} group setting a color, \emph{i.e.}~normally
+% \begin{verbatim}
+% % Use of \driver_color_rgb:nnn, etc.
+% \group_insert_after:N \driver_color_reset:
+% \end{verbatim}
+% \end{function}
+%
+% \begin{function}[added = 2018-02-20]{\driver_color_pickup:N}
+% \begin{syntax}
+% \cs{driver_color_pickup:N} \meta{tl}
% \end{syntax}
% In \LaTeXe{} package mode, collects data on the current color from
% \tn{current at color} and stores it in the low-level format used by \pkg{expl3}
@@ -399,7 +429,7 @@
% \cs{driver_draw_color_gray:n} \Arg{gray}
% \end{syntax}
% Sets the color for drawing to the grayscale value specified, which is
-% fp denotations in the range $0$ and $1$. The
+% fp denotations in the range $0$ and $1$. The
% \texttt{fill} and \texttt{stroke} versions set only the color for those
% operations. Note that the general setting is more efficient with some
% drivers so should in most cases be preferred.
@@ -517,18 +547,19 @@
%<*dvisvgm|dvipdfmx|dvips|xdvipdfmx>
% \end{macrocode}
%
-% \begin{macro}{\@@_color_pickup:N}
+% \begin{macro}{\driver_color_pickup:N}
+% \begin{macro}{\@@_color_pickup:w}
% Allow for \LaTeXe{} color. Here, the possible input values are limited:
% \texttt{dvips}-style colors can mainly be taken as-is with the exception
% spot ones (here we need a model and a tint).
% \begin{macrocode}
%<*package>
-\cs_new_protected:Npn \@@_color_pickup:N #1 { }
+\cs_new_protected:Npn \driver_color_pickup:N #1 { }
\AtBeginDocument
{
\@ifpackageloaded { color }
{
- \cs_set_protected:Npn \@@_color_pickup:N #1
+ \cs_set_protected:Npn \driver_color_pickup:N #1
{
\exp_args:NV \tl_if_head_is_space:nTF \current at color
{
@@ -538,9 +569,9 @@
\exp_after:wN \use:n \current at color \c_space_tl 1
}
}
- { \exp_after:wN \@@_color_pickup_aux:w \current at color \q_stop #1 }
+ { \exp_after:wN \@@_color_pickup:w \current at color \q_stop #1 }
}
- \cs_new_protected:Npn \@@_color_pickup_aux:w #1 ~ #2 \q_stop #3
+ \cs_new_protected:Npn \@@_color_pickup:w #1 ~ #2 \q_stop #3
{ \tl_set:Nn #3 { #1 ~ #2 } }
}
{ }
@@ -548,36 +579,27 @@
%</package>
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\@@_color_select:n, \@@_color_select:V}
-% \begin{macro}[EXP]{\@@_convert_model:w}
-% \begin{macro}[EXP]{\@@_color_convert_spot:}
-% \begin{macro}[EXP]{\@@_color_convert_spot:w}
-% \begin{macro}{\@@_color_reset:}
-% Mainly no conversation but a little work with \texttt{spot} colors as they
-% can't have a tint level here! The easy route of just picking up
-% \texttt{spot} as a model won't work as there could be additional models
-% created for mixing named colors. (They would not be supported at the moment,
-% but still need to be handled.)
+% \begin{macro}{\driver_color_cmyk:nnnn}
+% \begin{macro}{\driver_color_gray:n}
+% \begin{macro}{\driver_color_rgb:nnn}
+% \begin{macro}{\driver_color_spot:nn}
+% \begin{macro}{\@@_color_select:n}
+% \begin{macro}{\driver_color_reset:}
+% Simply dump the data.
% \begin{macrocode}
+\cs_new_protected:Npn \driver_color_cmyk:nnnn #1#2#3#4
+ { \@@_color_select:n { cmyk~ #1 ~ #2 ~ #3 ~ #4 } }
+\cs_new_protected:Npn \driver_color_gray:n #1
+ { \@@_color_select:n { gray~ #1 } }
+\cs_new_protected:Npn \driver_color_rgb:nnn #1#2#3
+ { \@@_color_select:n { rgb~ #1 ~ #2 ~ #3 } }
+\cs_new_protected:Npn \driver_color_spot:nn #1#2
+ { \@@_color_select:n { color~push~\c_space_tl #1 } }
\cs_new_protected:Npn \@@_color_select:n #1
- {
- \tex_special:D
- {
- color~push~
- \cs_if_exist_use:cF
- { @@_color_convert_ \@@_convert_model:w #1 \q_stop :n }
- { \use:n }
- {#1}
- }
- }
-\cs_generate_variant:Nn \@@_color_select:n { V }
-\cs_new:Npn \@@_convert_model:w #1 ~ #2 \q_stop {#1}
-\cs_new:Npn \@@_color_convert_spot:n #1
- { \@@_color_convert_spot:w #1 \q_stop }
-\cs_new:Npn \@@_color_convert_spot:w #1 ~ #2 ~ #3 \q_stop
- { \c_space_tl #2 }
-\cs_new_protected:Npn \@@_color_reset:
+ { \tex_special:D { color~push~ #1 } }
+\cs_new_protected:Npn \driver_color_reset:
{ \tex_special:D { color~pop } }
% \end{macrocode}
% \end{macro}
@@ -585,6 +607,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macrocode}
%</dvisvgm|dvipdfmx|dvips|xdvipdfmx>
@@ -596,27 +619,27 @@
%<*pdfmode>
% \end{macrocode}
%
-% \begin{macro}{\@@_color_pickup:N}
-% \begin{macro}{\@@_color_pickup_aux:w}
+% \begin{macro}{\driver_color_pickup:N}
+% \begin{macro}{\@@_color_pickup:w}
% The current color in driver-dependent format: pick up the package-mode
% data if available. We end up converting back and forward in this route as
% we store our color data in \texttt{dvips} format.
% The \tn{current at color} needs to be \texttt{x}-expanded before
-% \cs{@@_color_pickup_aux:w} breaks it apart, because for instance
+% \cs{@@_color_pickup:w} breaks it apart, because for instance
% \pkg{xcolor} sets it to be instructions to generate a colour
% \begin{macrocode}
%<*package>
-\cs_new_protected:Npn \@@_color_pickup:N #1 { }
+\cs_new_protected:Npn \driver_color_pickup:N #1 { }
\AtBeginDocument
{
\@ifpackageloaded { color }
{
- \cs_set_protected:Npn \@@_color_pickup:N #1
+ \cs_set_protected:Npn \driver_color_pickup:N #1
{
- \exp_last_unbraced:Nx \@@_color_pickup_aux:w
+ \exp_last_unbraced:Nx \@@_color_pickup:w
{ \current at color } ~ 0 ~ 0 ~ 0 \q_stop #1
}
- \cs_new_protected:Npn \@@_color_pickup_aux:w
+ \cs_new_protected:Npn \@@_color_pickup:w
#1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop #7
{
\str_if_eq:nnTF {#2} { g }
@@ -655,47 +678,30 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_color_select:n, \@@_color_select:V}
-% \begin{macro}[EXP]{\@@_color_convert:w}
-% \begin{macro}[EXP]
-% {
-% \@@_color_convert_gray:w ,
-% \@@_color_convert_cmyk:w ,
-% \@@_color_convert_rgb:w ,
-% \@@_color_convert_spot:w
-% }
-% \begin{macro}{\@@_color_reset:}
-% There is a dedicated primitive/primitive interface for setting colors.
-% As with scoping, this approach is not suitable for cached operations.
-% Most of the conversions are trivial but the need to cover spot colors
-% makes life slightly more interesting.
-% \begin{macrocode}
+% \begin{macro}{\driver_color_cmyk:nnnn}
+% \begin{macro}{\driver_color_gray:n}
+% \begin{macro}{\driver_color_rgb:nnn}
+% \begin{macro}{\driver_color_spot:nn}
+% \begin{macro}{\@@_color_select:n}
+% \begin{macro}{\driver_color_reset:}
+% Simply dump the data, but allowing for \LuaTeX{}.
+% \begin{macrocode}
+\cs_new_protected:Npn \driver_color_cmyk:nnnn #1#2#3#4
+ { \@@_color_select:n { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K } }
+\cs_new_protected:Npn \driver_color_gray:n #1
+ { \@@_color_select:n { #1 ~ g ~ #1 ~ G } }
+\cs_new_protected:Npn \driver_color_rgb:nnn #1#2#3
+ { \@@_color_select:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } }
+\cs_new_protected:Npn \driver_color_spot:nn #1#2
+ { \@@_color_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC } }
\cs_new_protected:Npx \@@_color_select:n #1
{
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D colorstack }
{ \pdftex_pdfcolorstack:D }
- \exp_not:N \l_@@_color_stack_int push
- {
- \exp_not:N \@@_color_convert:w
- #1
- \exp_not:N \q_stop
- }
+ \exp_not:N \l_@@_color_stack_int push {#1}
}
-\cs_generate_variant:Nn \@@_color_select:n { V }
-\cs_new:Npn \@@_color_convert:w #1 ~ #2 \q_stop
- { \use:c { @@_color_convert_ #1 :w } #2 \q_stop }
-\cs_new:Npn \@@_color_convert_gray:w #1 \q_stop
- { #1 ~ g ~ #1 ~ G }
-\cs_new:Npn \@@_color_convert_cmyk:w #1 \q_stop
- { #1 ~ k ~ #1 ~ K }
-\cs_new:Npn \@@_color_convert_rgb:w #1 \q_stop
- { #1 ~ rg ~ #1 ~ RG }
-\cs_new:Npn \@@_color_convert_spot:w #1 ~ #2 \q_stop
- {
- /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC
- }
-\cs_new_protected:Npx \@@_color_reset:
+\cs_new_protected:Npx \driver_color_reset:
{
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D colorstack }
@@ -707,6 +713,8 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macrocode}
%</pdfmode>
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 4b1c328..b80430b 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5500,6 +5500,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -5890,17 +5897,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_color_convert:w on line ...
-Defining \__driver_color_convert_gray:w on line ...
-Defining \__driver_color_convert_cmyk:w on line ...
-Defining \__driver_color_convert_rgb:w on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 63311a9..db96d11 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5490,6 +5490,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -5881,13 +5888,13 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_convert_model:w on line ...
-Defining \__driver_color_convert_spot:n on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 1a453f1..ed28c87 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5490,6 +5490,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -6082,17 +6089,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_color_convert:w on line ...
-Defining \__driver_color_convert_gray:w on line ...
-Defining \__driver_color_convert_cmyk:w on line ...
-Defining \__driver_color_convert_rgb:w on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 2ba396c..bb61100 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5488,6 +5488,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -6080,13 +6087,13 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_convert_model:w on line ...
-Defining \__driver_color_convert_spot:n on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 12a9aaa..7a5ae0c 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5477,6 +5477,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -5863,13 +5870,13 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_convert_model:w on line ...
-Defining \__driver_color_convert_spot:n on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 4b1c328..b80430b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5500,6 +5500,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -5890,17 +5897,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_color_convert:w on line ...
-Defining \__driver_color_convert_gray:w on line ...
-Defining \__driver_color_convert_cmyk:w on line ...
-Defining \__driver_color_convert_rgb:w on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 63311a9..db96d11 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5490,6 +5490,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -5881,13 +5888,13 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_convert_model:w on line ...
-Defining \__driver_color_convert_spot:n on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 1a453f1..ed28c87 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5490,6 +5490,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -6082,17 +6089,15 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_color_convert:w on line ...
-Defining \__driver_color_convert_gray:w on line ...
-Defining \__driver_color_convert_cmyk:w on line ...
-Defining \__driver_color_convert_rgb:w on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 2ba396c..bb61100 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5488,6 +5488,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -6080,13 +6087,13 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_convert_model:w on line ...
-Defining \__driver_color_convert_spot:n on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 12a9aaa..7a5ae0c 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5477,6 +5477,13 @@ Defining message LaTeX/kernel/show-coffin on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
@@ -5863,13 +5870,13 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
-Defining \__driver_color_pickup:N on line ...
+Defining \driver_color_pickup:N on line ...
+Defining \driver_color_cmyk:nnnn on line ...
+Defining \driver_color_gray:n on line ...
+Defining \driver_color_rgb:nnn on line ...
+Defining \driver_color_spot:nn on line ...
Defining \__driver_color_select:n on line ...
-Defining \__driver_color_select:V on line ...
-Defining \__driver_convert_model:w on line ...
-Defining \__driver_color_convert_spot:n on line ...
-Defining \__driver_color_convert_spot:w on line ...
-Defining \__driver_color_reset: on line ...
+Defining \driver_color_reset: on line ...
Defining \__driver_literal:n on line ...
Defining \__driver_scope_begin: on line ...
Defining \__driver_scope_end: on line ...
More information about the latex3-commits
mailing list