[latex3-commits] [l3svn] branch master updated: Switch back to one-tl model for colour
noreply at latex-project.org
noreply at latex-project.org
Mon Oct 2 15:23:21 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new 5dbe483 Switch back to one-tl model for colour
5dbe483 is described below
commit 5dbe483aa58be4d87ad66378bbefe06c7cef23ff
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Oct 2 14:22:01 2017 +0100
Switch back to one-tl model for colour
Whilst the two-part approach is attractive, as the data is entirely
inter-dependent it doesn't really work that well.
Since the data store never vanished in a release version, keep the
added date the same as the older commits.
---
l3kernel/l3color.dtx | 51 ++++++-------
l3kernel/l3drivers.dtx | 126 ++++++++++++-------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 11 ++-
l3kernel/testfiles/m3expl001.ptex.tlg | 7 +-
l3kernel/testfiles/m3expl001.tlg | 11 ++-
l3kernel/testfiles/m3expl001.uptex.tlg | 7 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 7 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 11 ++-
l3kernel/testfiles/m3expl003.ptex.tlg | 7 +-
l3kernel/testfiles/m3expl003.tlg | 11 ++-
l3kernel/testfiles/m3expl003.uptex.tlg | 7 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 7 +-
12 files changed, 103 insertions(+), 160 deletions(-)
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index d99a027..404df77 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -78,35 +78,34 @@
%
% \subsection{Internal functions}
%
-% \begin{variable}[added = 2017-09-26]
-% {\l__color_current_model_tl, \l__color_current_setting_tl}
+% \begin{variable}[added = 2017-06-15, updated = 2017-10-02]
+% {\l__color_current_tl}
% The color currently active for foreground (text, \emph{etc.}) material.
-% This information is stored in two parts: the model in use and
-% \meta{setting}: the latter is a \emph{space} separated list of one or more
-% values, with the required number depending on the model in use.
-%
-% There are four pre-defined color models which have meaning and data
-% requirements as follows:
+% This is stored in the form of a color model followed by one or more
+% values. There are four pre-defined models, three of which take numerical
+% values in the range $[0,1]$:
+% \begin{itemize}
+% \item \texttt{gray \meta{gray}} Grayscale color with the \meta{gray}
+% value running from $0$ (fully black) to $1$ (fully white)
+% \item \texttt{cmyk \meta{cyan} \meta{magenta} \meta{yellow} \meta{black}}
+% \item \texttt{rgb \meta{red} \meta{green} \meta{blue}}
+% \end{itemize}
+% Notice that the value are separated by spaces. There is a fourth pre-defined
+% model using a string value and a numerical one:
% \begin{itemize}
-% \item \texttt{gray} Grayscale color requiring a single \meta{settings}
-% value in the range~$[0,1]$ ($0$ is fully black, $1$ is fully white)
-% \item \texttt{cmyk} CMYK color requiring four entries in the
-% \meta{settings}, one for each of cyan, magenta, yellow and black,
-% each in the range~$[0,1]$
-% \item \texttt{rgb} RGB color requiring three entries in the
-% \meta{settings}, one for each of red, green and blue, each in the
-% range~$[0,1]$
-% \item \texttt{spot} A pre-defined spot color, with one two
-% entries in the setting, the name itself and the loading (tint);
-% the latter should be in the range~$[0,1]$
+% \item \texttt{spot \meta{name} \meta{tint}} A pre-defined spot color,
+% where the \meta{name} should be a pre-defined string color name and the
+% \meta{tint} should be in the range $[0,1]$.
% \end{itemize}
%
% Additional models may be created to allow mixing of spot colors. The
-% number of \meta{settings} these require will depend on the number of
+% number of data entries these require will depend on the number of
% colors to be mixed.
% \begin{texnote}
-% The content of \cs{l__color_current_setting_tl} is space-separated as
+% The content of \cs{l__color_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.
% \end{texnote}
% \end{variable}
%
@@ -146,17 +145,15 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\l__color_current_model_tl, \l__color_current_setting_tl}
-% The current color in two distinct parts. As the setting data is used only
+% \begin{variable}{\l__color_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. Any splitting is done by a
% delimited function but often the entire \texttt{tl} can be used as-is:
% see \texttt{l3drivers.dtx}.
% \begin{macrocode}
-\tl_new:N \l__color_current_model_tl
-\tl_set:Nn \l__color_current_model_tl { gray }
-\tl_new:N \l__color_current_setting_tl
-\tl_set:Nn \l__color_current_setting_tl { 0 }
+\tl_new:N \l__color_current_tl
+\tl_set:Nn \l__color_current_tl { gray~0 }
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index d979eb7..6f94b49 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -524,17 +524,16 @@
{
\exp_args:NV \tl_if_head_is_space:nTF \current at color
{
- \tl_set:Nn \l__color_current_model_tl { spot }
- \tl_set:Nx \l__color_current_setting_tl
- { \exp_args:wN \use:n \current at color \c_space_tl 1 }
+ \tl_set:Nx \l__color_current_tl
+ {
+ spot ~
+ \exp_args:wN \use:n \current at color \c_space_tl 1
+ }
}
{ \exp_args:wN \@@_color_pickup_aux:w \current at color \q_stop }
}
\cs_new_protected:Npn \@@_color_pickup_aux:w #1 ~ #2 \q_stop
- {
- \tl_set:Nn \l__color_current_model_tl {#1}
- \tl_set:Nn \l__color_current_setting_tl {#2}
- }
+ { \tl_set:Nn \l__color_current_tl { #1 ~ #2 } }
}
{ \cs_new_protected:Npn \@@_color_pickup: { } }
}
@@ -543,20 +542,15 @@
% \end{macro}
%
% \begin{macro}[int]{\@@_color_ensure_current:}
-% \begin{macro}[aux, EXP]
-% {
-% \@@_color_convert_gray: ,
-% \@@_color_convert_cmyk: ,
-% \@@_color_convert_rgb: ,
-% \@@_color_convert_spot:
-% }
-% \begin{macro}[aux, EXP]{\@@_color_convert_spotw}
+% \begin{macro}[aux, EXP]{\@@_convert_model:w}
+% \begin{macro}[aux, EXP]{\@@_color_convert_spot:}
+% \begin{macro}[aux, EXP]{\@@_color_convert_spot:w}
% \begin{macro}[aux]{\@@_color_reset:}
-% Convert the color data to the appropriate form: \texttt{spot} colors can't
-% have a tint level here! The easy route of just picking up \texttt{named}
-% 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.)
+% 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{macrocode}
\cs_new_protected:Npn \@@_color_ensure_current:
{
@@ -566,22 +560,16 @@
\tex_special:D
{
color~push~
- \use:c { @@_color_convert_ \l__color_current_model_tl : }
+ \cs_if_exist_use:cF
+ { \exp_after:wN \@@_convert_model:w \l__color_current_tl \q_stop }
+ { \tl_use:N \l__color_current_tl }
}
}
-\cs_new:Npn \@@_color_convert_gray:
- { gray ~ \l__color_current_setting_tl }
-\cs_new:Npn \@@_color_convert_cmyk:
- { cmyk ~ \l__color_current_setting_tl }
-\cs_new:Npn \@@_color_convert_rgb:
- { rgb ~ \l__color_current_setting_tl }
+\cs_new:Npn \@@_convert_model:w #1 ~ #2 \q_stop {#1}
\cs_new:Npn \@@_color_convert_spot:
- {
- \exp_after:wN \@@_color_convert_spot:w
- \l__color_current_setting_tl
- }
-\cs_new:Npn \@@_color_convert_spot:w #1 ~ #2
- { \c_space_tl #1 }
+ { \exp_after:wN \@@_color_convert_spot:w \l__color_current_tl \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~pop } }
% \end{macrocode}
@@ -589,6 +577,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macrocode}
%</dvisvgm|dvipdfmx|dvips|xdvipdfmx>
@@ -623,34 +612,24 @@
#1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop
{
\str_if_eq:nnTF {#2} { g }
- {
- \tl_set:Nn \l__color_current_model_tl { gray }
- \tl_set:Nn \l__color_current_setting_tl {#1}
- }
+ { \tl_set:Nn \l__color_current_tl { gray ~ #1 } }
{
\str_if_eq:nnTF {#4} { rg }
- {
- \tl_set:Nn \l__color_current_model_tl { rgb }
- \tl_set:Nn \l__color_current_setting_tl
- { #1 ~ #2 ~ #3 }
- }
+ { \tl_set:Nn \l__color_current_tl { rgb ~ #1 ~ #2 ~ #3 } }
{
\str_if_eq:nnTF {#5} { k }
{
- \tl_set:Nn \l__color_current_model_tl { cmyk }
- \tl_set:Nn \l__color_current_setting_tl
- { #1 ~ #2 ~ #3 ~ #4 }
+ \tl_set:Nn \l__color_current_tl
+ { cmyk ~ #1 ~ #2 ~ #3 ~ #4 }
}
{
\str_if_eq:nnTF {#2} { cs }
{
- \tl_set:Nn \l__color_current_model_tl { spot }
- \tl_set:Nx \l__color_current_setting_tl
- { \use_none:n #1 ~ #5 }
+ \tl_set:Nx \l__color_current_tl
+ { spot ~ \use_none:n #1 ~ #5 }
}
{
- \tl_set:Nn \l__color_current_model_tl { gray }
- \clist_set:Nn \l__color_current_setting_tl { 0 }
+ \tl_set:Nn \l__color_current_tl { gray ~ 0 }
}
}
}
@@ -673,14 +652,14 @@
% \end{variable}
%
% \begin{macro}[int]{\@@_color_ensure_current:}
+% \begin{macro}[aux, EXP]{\@@_color_convert:w}
% \begin{macro}[aux, EXP]
% {
-% \@@_color_convert_gray: ,
-% \@@_color_convert_cmyk: ,
-% \@@_color_convert_rgb: ,
-% \@@_color_convert_spot:
+% \@@_color_convert_gray:w ,
+% \@@_color_convert_cmyk:w ,
+% \@@_color_convert_rgb:w ,
+% \@@_color_convert_spot:w
% }
-% \begin{macro}[aux, EXP]{\@@_color_convert_spot:w}
% \begin{macro}[aux]{\@@_color_reset:}
% There is a dedicated primitive/primitive interface for setting colors.
% As with scoping, this approach is not suitable for cached operations.
@@ -697,31 +676,21 @@
{ \pdftex_pdfcolorstack:D }
\exp_not:N \l_@@_color_stack_int push
{
- \exp_not:N \use:c
- { @@_color_convert_ \exp_not:N \l__color_current_model_tl : }
+ \exp_not:N \exp_after:wN
+ \exp_not:N \@@_color_convert:w
+ \exp_not:N \l__color_current_tl
+ \exp_not:N \q_stop
}
}
-\cs_new:Npn \@@_color_convert_gray:
- {
- \l__color_current_setting_tl \c_space_tl g ~
- \l__color_current_setting_tl \c_space_tl G
- }
-\cs_new:Npn \@@_color_convert_cmyk:
- {
- \l__color_current_setting_tl \c_space_tl k ~
- \l__color_current_setting_tl \c_space_tl K
- }
-\cs_new:Npn \@@_color_convert_rgb:
- {
- \l__color_current_setting_tl \c_space_tl rg ~
- \l__color_current_setting_tl \c_space_tl RG
- }
-\cs_new:Npn \@@_color_convert_spot:
- {
- \exp_after:wN \@@_color_convert_spot:w
- \l__color_current_setting_tl
- }
-\cs_new:Npn \@@_color_convert_spot:w #1 ~ #2
+\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
}
@@ -736,7 +705,6 @@
% \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 1a3aa6f..6838a66 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5323,8 +5323,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5706,10 +5705,10 @@ Defining \c__expl_def_ext_tl on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count193
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_spot: 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_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index cc9c398..b9560d7 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5313,8 +5313,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5695,9 +5694,7 @@ Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
+Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index eb12bf2..94d7f18 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5313,8 +5313,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5898,10 +5897,10 @@ Defining \c__expl_def_ext_tl on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count195
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_spot: 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_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 17a56ac..f767192 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5311,8 +5311,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5894,9 +5893,7 @@ Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
+Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 31f521b..0006026 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5301,8 +5301,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5678,9 +5677,7 @@ Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
+Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 1a3aa6f..6838a66 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5323,8 +5323,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5706,10 +5705,10 @@ Defining \c__expl_def_ext_tl on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count193
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_spot: 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_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index cc9c398..b9560d7 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5313,8 +5313,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5695,9 +5694,7 @@ Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
+Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index eb12bf2..94d7f18 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5313,8 +5313,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5898,10 +5897,10 @@ Defining \c__expl_def_ext_tl on line ...
Defining \l__driver_color_stack_int on line ...
\l__driver_color_stack_int=\count195
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
-Defining \__driver_color_convert_spot: 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_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 17a56ac..f767192 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5311,8 +5311,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5894,9 +5893,7 @@ Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
+Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 31f521b..0006026 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5301,8 +5301,7 @@ 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 \l__color_current_model_tl on line ...
-Defining \l__color_current_setting_tl on line ...
+Defining \l__color_current_tl on line ...
Defining \c_sys_jobname_str on line ...
Defining \c_sys_minute_int on line ...
Defining \c_sys_hour_int on line ...
@@ -5678,9 +5677,7 @@ Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
Defining \__driver_color_ensure_current: on line ...
-Defining \__driver_color_convert_gray: on line ...
-Defining \__driver_color_convert_cmyk: on line ...
-Defining \__driver_color_convert_rgb: on line ...
+Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
Defining \__driver_color_reset: on line ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list