[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move various color internals to backend (81768b019)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Jan 12 16:23:24 CET 2021
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/81768b01935a641f482036cf8bea35866c7c837c
>---------------------------------------------------------------
commit 81768b01935a641f482036cf8bea35866c7c837c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Jan 12 15:03:39 2021 +0000
Move various color internals to backend
The transparency plan now has this inside color, so
we do not need "kernel". At the same time, these should
have been marked "backend" in any case.
>---------------------------------------------------------------
81768b01935a641f482036cf8bea35866c7c837c
l3backend/l3backend-color.dtx | 39 ++++++++++++++++----------------
l3kernel/testfiles/d3dvipdfmx.luatex.tlg | 2 +-
l3kernel/testfiles/d3dvipdfmx.tlg | 2 +-
l3kernel/testfiles/d3dvipdfmx.xetex.tlg | 2 +-
l3kernel/testfiles/d3dvips.xetex.tlg | 2 +-
l3kernel/testfiles/d3pdfmode.luatex.tlg | 2 +-
l3kernel/testfiles/d3pdfmode.tlg | 2 +-
l3kernel/testfiles/d3pdfmode.xetex.tlg | 2 +-
l3kernel/testfiles/d3xetex.luatex.tlg | 2 +-
l3kernel/testfiles/d3xetex.tlg | 2 +-
l3kernel/testfiles/d3xetex.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 10 ++++----
l3kernel/testfiles/m3expl001.tlg | 10 ++++----
l3kernel/testfiles/m3expl001.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl002.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl002.tlg | 2 +-
l3kernel/testfiles/m3expl002.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 10 ++++----
l3kernel/testfiles/m3expl003.tlg | 10 ++++----
l3kernel/testfiles/m3expl003.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl004.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl004.tlg | 2 +-
l3kernel/testfiles/m3expl004.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl006.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl006.tlg | 2 +-
l3kernel/testfiles/m3expl006.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl007.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl007.tlg | 2 +-
l3kernel/testfiles/m3expl007.xetex.tlg | 2 +-
29 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index f37dd14d0..8dd484dc8 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -179,7 +179,7 @@
%<*dvipdfmx|xetex>
% \end{macrocode}
%
-% \begin{macro}{\__kernel_color_stack_init:Nnn}
+% \begin{macro}{\@@_backend_stack_init:Nnn}
% \begin{variable}{\g_@@_backend_stack_int, \c_@@_backend_main_stack_int}
% In \texttt{(x)dvipdfmx}, the base color stack is not set up, so we have to
% force that, as well as providing a mechanism more generally.
@@ -187,7 +187,7 @@
\int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
{
\int_new:N \g_@@_backend_stack_int
- \cs_new_protected:Npx \__kernel_color_stack_init:Nnn #1#2#3
+ \cs_new_protected:Npx \@@_backend_stack_init:Nnn #1#2#3
{
\int_gincr:N \exp_not:N \g_@@_backend_stack_int
\int_const:Nn #1 { \exp_not:N \g_@@_backend_stack_int }
@@ -207,28 +207,27 @@
}
\cs_if_exist:cTF { main at pdfcolorstack }
{
- \int_set:Nn \l__kernel_color_stack_int
+ \int_set:Nn \l_@@_backend_stack_int
{ \int_use:c { main at pdfcolorstack } }
}
{
- \__kernel_color_stack_init:Nnn \c_@@_backend_main_stack_int
+ \@@_backend_stack_init:Nnn \c_@@_backend_main_stack_int
{ page ~ direct } { 0 ~ g ~ 0 ~ G }
- \int_set_eq:NN \l__kernel_color_stack_int
+ \int_set_eq:NN \l_@@_backend_stack_int
\c_@@_backend_main_stack_int
}
-
}
% \end{macrocode}
% \end{variable}
% \end{macro}
%
-% \begin{macro}{\__kernel_color_stack_push:nn}
-% \begin{macro}{\__kernel_color_stack_pop:n}
+% \begin{macro}{\@@_backend_stack_push:nn}
+% \begin{macro}{\@@_backend_stack_pop:n}
% Simple enough but needs a version check.
% \begin{macrocode}
\int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
{
- \cs_new_protected:Npn \__kernel_color_stack_push:nn #1#2
+ \cs_new_protected:Npn \@@_backend_stack_push:nn #1#2
{
\__kernel_backend_literal:x
{
@@ -237,7 +236,7 @@
push ~ (#2)
}
}
- \cs_new_protected:Npn \__kernel_color_stack_pop:n #1
+ \cs_new_protected:Npn \@@_backend_stack_pop:n #1
{
\__kernel_backend_literal:x
{
@@ -261,9 +260,9 @@
%<*luatex|pdftex>
% \end{macrocode}
%
-% \begin{macro}{\__kernel_color_stack_init:Nnn}
+% \begin{macro}{\@@_backend_stack_init:Nnn}
% \begin{macrocode}
-\cs_new_protected:Npn \__kernel_color_stack_init:Nnn #1#2#3
+\cs_new_protected:Npn \@@_backend_stack_init:Nnn #1#2#3
{
\int_const:Nn #1
{
@@ -280,10 +279,10 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\__kernel_color_stack_push:nn}
-% \begin{macro}{\__kernel_color_stack_pop:n}
+% \begin{macro}{\@@_backend_stack_push:nn}
+% \begin{macro}{\@@_backend_stack_pop:n}
% \begin{macrocode}
-\cs_new_protected:Npn \__kernel_color_stack_push:nn #1#2
+\cs_new_protected:Npn \@@_backend_stack_push:nn #1#2
{
%<*luatex>
\tex_pdfextension:D colorstack ~
@@ -293,7 +292,7 @@
%</pdftex>
\int_eval:n {#1} ~ push ~ {#2}
}
-\cs_new_protected:Npn \__kernel_color_stack_pop:n #1
+\cs_new_protected:Npn \@@_backend_stack_pop:n #1
{
%<*luatex>
\tex_pdfextension:D colorstack ~
@@ -363,11 +362,11 @@
%<*dvipdfmx|luatex|pdftex|xetex>
% \end{macrocode}
%
-% \begin{variable}{\l__kernel_color_stack_int}
+% \begin{variable}{\l_@@_backend_stack_int}
% \pdfTeX{}, \LuaTeX{} and recent \texttt{(x)dvipdfmx} have multiple stacks
% available, and to track which one is in use a variable is required.
% \begin{macrocode}
-\int_new:N \l__kernel_color_stack_int
+\int_new:N \l_@@_backend_stack_int
% \end{macrocode}
% \end{variable}
%
@@ -388,11 +387,11 @@
{ \@@_backend_select:n { #1 ~ rg ~ #1 ~ RG } }
\cs_new_protected:Npn \@@_backend_select:n #1
{
- \__kernel_color_stack_push:nn \l__kernel_color_stack_int {#1}
+ \@@_backend_stack_push:nn \l_@@_backend_stack_int {#1}
\group_insert_after:N \@@_backend_reset:
}
\cs_new_protected:Npn \@@_backend_reset:
- { \__kernel_color_stack_pop:n \l__kernel_color_stack_int }
+ { \@@_backend_stack_pop:n \l_@@_backend_stack_int }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/testfiles/d3dvipdfmx.luatex.tlg b/l3kernel/testfiles/d3dvipdfmx.luatex.tlg
index a0d4b0a52..72f9c0de3 100644
--- a/l3kernel/testfiles/d3dvipdfmx.luatex.tlg
+++ b/l3kernel/testfiles/d3dvipdfmx.luatex.tlg
@@ -8,7 +8,7 @@ File: l3debug.def ....-..-.. L3 Debugging support
File: l3backend-dvipdfmx.def ....-..-.. L3 backend support: dvipdfmx
("|extractbb --version")
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3dvipdfmx.tlg b/l3kernel/testfiles/d3dvipdfmx.tlg
index 785ddd42b..01503cfc4 100644
--- a/l3kernel/testfiles/d3dvipdfmx.tlg
+++ b/l3kernel/testfiles/d3dvipdfmx.tlg
@@ -8,7 +8,7 @@ File: l3debug.def ....-..-.. L3 Debugging support
File: l3backend-dvipdfmx.def ....-..-.. L3 backend support: dvipdfmx
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3dvipdfmx.xetex.tlg b/l3kernel/testfiles/d3dvipdfmx.xetex.tlg
index e3b681de2..74751a4e4 100644
--- a/l3kernel/testfiles/d3dvipdfmx.xetex.tlg
+++ b/l3kernel/testfiles/d3dvipdfmx.xetex.tlg
@@ -16,7 +16,7 @@ the active engine. LaTeX3 will use the 'xetex' backend instead.
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3dvips.xetex.tlg b/l3kernel/testfiles/d3dvips.xetex.tlg
index 9ffbad24f..a0dc35c0b 100644
--- a/l3kernel/testfiles/d3dvips.xetex.tlg
+++ b/l3kernel/testfiles/d3dvips.xetex.tlg
@@ -16,7 +16,7 @@ active engine. LaTeX3 will use the 'xetex' backend instead.
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3pdfmode.luatex.tlg b/l3kernel/testfiles/d3pdfmode.luatex.tlg
index 0ee815d53..02fc077bc 100644
--- a/l3kernel/testfiles/d3pdfmode.luatex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.luatex.tlg
@@ -6,7 +6,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3debug.def ....-..-.. L3 Debugging support
) (l3backend-luatex.def
File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
Author: Joseph Wright
diff --git a/l3kernel/testfiles/d3pdfmode.tlg b/l3kernel/testfiles/d3pdfmode.tlg
index 3db3f0bc4..d4ffc9dc6 100644
--- a/l3kernel/testfiles/d3pdfmode.tlg
+++ b/l3kernel/testfiles/d3pdfmode.tlg
@@ -6,7 +6,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3debug.def ....-..-.. L3 Debugging support
) (l3backend-pdftex.def
File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
Author: Joseph Wright
diff --git a/l3kernel/testfiles/d3pdfmode.xetex.tlg b/l3kernel/testfiles/d3pdfmode.xetex.tlg
index 04ee15a70..bb4da50da 100644
--- a/l3kernel/testfiles/d3pdfmode.xetex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.xetex.tlg
@@ -16,7 +16,7 @@ the active engine. LaTeX3 will use the 'xetex' backend instead.
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/d3xetex.luatex.tlg b/l3kernel/testfiles/d3xetex.luatex.tlg
index d21ca98f4..4581ddc55 100644
--- a/l3kernel/testfiles/d3xetex.luatex.tlg
+++ b/l3kernel/testfiles/d3xetex.luatex.tlg
@@ -14,7 +14,7 @@ You have requested backend 'xdvipdfmx', but this is not suitable for use with
the active engine. LaTeX3 will use the 'luatex' backend instead.
(l3backend-luatex.def
File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
Author: Joseph Wright
diff --git a/l3kernel/testfiles/d3xetex.tlg b/l3kernel/testfiles/d3xetex.tlg
index 62a742736..1081fecb9 100644
--- a/l3kernel/testfiles/d3xetex.tlg
+++ b/l3kernel/testfiles/d3xetex.tlg
@@ -14,7 +14,7 @@ You have requested backend 'xdvipdfmx', but this is not suitable for use with
the active engine. LaTeX3 will use the 'pdftex' backend instead.
(l3backend-pdftex.def
File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
Author: Joseph Wright
diff --git a/l3kernel/testfiles/d3xetex.xetex.tlg b/l3kernel/testfiles/d3xetex.xetex.tlg
index 47e15fd90..5f21fbd1b 100644
--- a/l3kernel/testfiles/d3xetex.xetex.tlg
+++ b/l3kernel/testfiles/d3xetex.xetex.tlg
@@ -8,7 +8,7 @@ File: l3debug.def ....-..-.. L3 Debugging support
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 11f55377e..5cb4e9595 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -28,11 +28,11 @@ Defining \__kernel_backend_scope_end: on line ...
Defining \__kernel_backend_matrix:n on line ...
Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
-Defining \__kernel_color_stack_init:Nnn on line ...
-Defining \__kernel_color_stack_push:nn on line ...
-Defining \__kernel_color_stack_pop:n on line ...
-Defining \l__kernel_color_stack_int on line ...
-\l__kernel_color_stack_int=\count...
+Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__color_backend_stack_push:nn on line ...
+Defining \__color_backend_stack_pop:n on line ...
+Defining \l__color_backend_stack_int on line ...
+\l__color_backend_stack_int=\count...
Defining \__color_backend_select_cmyk:n on line ...
Defining \__color_backend_select_gray:n on line ...
Defining \__color_backend_select_rgb:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 764cd2ae4..a16faa5aa 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -28,11 +28,11 @@ Defining \__kernel_backend_scope_end: on line ...
Defining \__kernel_backend_matrix:n on line ...
Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
-Defining \__kernel_color_stack_init:Nnn on line ...
-Defining \__kernel_color_stack_push:nn on line ...
-Defining \__kernel_color_stack_pop:n on line ...
-Defining \l__kernel_color_stack_int on line ...
-\l__kernel_color_stack_int=\count...
+Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__color_backend_stack_push:nn on line ...
+Defining \__color_backend_stack_pop:n on line ...
+Defining \l__color_backend_stack_int on line ...
+\l__color_backend_stack_int=\count...
Defining \__color_backend_select_cmyk:n on line ...
Defining \__color_backend_select_gray:n on line ...
Defining \__color_backend_select_rgb:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index ce0a75368..3ce68d10a 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -29,8 +29,8 @@ Defining \__kernel_backend_scope_end: on line ...
Defining \c__kernel_sys_dvipdfmx_version_int on line ...
\c__kernel_sys_dvipdfmx_version_int=\count...
Defining \__color_backend_pickup:N on line ...
-Defining \l__kernel_color_stack_int on line ...
-\l__kernel_color_stack_int=\count...
+Defining \l__color_backend_stack_int on line ...
+\l__color_backend_stack_int=\count...
Defining \__color_backend_select_cmyk:n on line ...
Defining \__color_backend_select_gray:n on line ...
Defining \__color_backend_select_rgb:n on line ...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index b29a84bdf..7bf1eba50 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -6,6 +6,6 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3debug.def ....-..-.. L3 Debugging support
) (l3backend-luatex.def
File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index fb2b05855..e706bef3e 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -6,6 +6,6 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3debug.def ....-..-.. L3 Debugging support
) (l3backend-pdftex.def
File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index c64be0624..a4ad3797c 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -8,7 +8,7 @@ File: l3debug.def ....-..-.. L3 Debugging support
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 11f55377e..5cb4e9595 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -28,11 +28,11 @@ Defining \__kernel_backend_scope_end: on line ...
Defining \__kernel_backend_matrix:n on line ...
Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
-Defining \__kernel_color_stack_init:Nnn on line ...
-Defining \__kernel_color_stack_push:nn on line ...
-Defining \__kernel_color_stack_pop:n on line ...
-Defining \l__kernel_color_stack_int on line ...
-\l__kernel_color_stack_int=\count...
+Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__color_backend_stack_push:nn on line ...
+Defining \__color_backend_stack_pop:n on line ...
+Defining \l__color_backend_stack_int on line ...
+\l__color_backend_stack_int=\count...
Defining \__color_backend_select_cmyk:n on line ...
Defining \__color_backend_select_gray:n on line ...
Defining \__color_backend_select_rgb:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 764cd2ae4..a16faa5aa 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -28,11 +28,11 @@ Defining \__kernel_backend_scope_end: on line ...
Defining \__kernel_backend_matrix:n on line ...
Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
-Defining \__kernel_color_stack_init:Nnn on line ...
-Defining \__kernel_color_stack_push:nn on line ...
-Defining \__kernel_color_stack_pop:n on line ...
-Defining \l__kernel_color_stack_int on line ...
-\l__kernel_color_stack_int=\count...
+Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__color_backend_stack_push:nn on line ...
+Defining \__color_backend_stack_pop:n on line ...
+Defining \l__color_backend_stack_int on line ...
+\l__color_backend_stack_int=\count...
Defining \__color_backend_select_cmyk:n on line ...
Defining \__color_backend_select_gray:n on line ...
Defining \__color_backend_select_rgb:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index ce0a75368..3ce68d10a 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -29,8 +29,8 @@ Defining \__kernel_backend_scope_end: on line ...
Defining \c__kernel_sys_dvipdfmx_version_int on line ...
\c__kernel_sys_dvipdfmx_version_int=\count...
Defining \__color_backend_pickup:N on line ...
-Defining \l__kernel_color_stack_int on line ...
-\l__kernel_color_stack_int=\count...
+Defining \l__color_backend_stack_int on line ...
+\l__color_backend_stack_int=\count...
Defining \__color_backend_select_cmyk:n on line ...
Defining \__color_backend_select_gray:n on line ...
Defining \__color_backend_select_rgb:n on line ...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index bdd52ae82..71fe2bd7e 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -4,6 +4,6 @@ Don't change this file in any respect.
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3backend-luatex.def
File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl004.tlg b/l3kernel/testfiles/m3expl004.tlg
index d2c6f56bb..b9e32b9ef 100644
--- a/l3kernel/testfiles/m3expl004.tlg
+++ b/l3kernel/testfiles/m3expl004.tlg
@@ -4,6 +4,6 @@ Don't change this file in any respect.
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3backend-pdftex.def
File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl004.xetex.tlg b/l3kernel/testfiles/m3expl004.xetex.tlg
index 676268850..4f3071aba 100644
--- a/l3kernel/testfiles/m3expl004.xetex.tlg
+++ b/l3kernel/testfiles/m3expl004.xetex.tlg
@@ -6,7 +6,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index e335be6b4..4eb2a498e 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -5,6 +5,6 @@ Author: Bruno Le Floch and Joseph Wright
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3backend-luatex.def
File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index defbddcaf..4877fbdda 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -5,6 +5,6 @@ Author: Bruno Le Floch and Joseph Wright
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3backend-pdftex.def
File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl006.xetex.tlg b/l3kernel/testfiles/m3expl006.xetex.tlg
index 3ca66867f..93d03c55d 100644
--- a/l3kernel/testfiles/m3expl006.xetex.tlg
+++ b/l3kernel/testfiles/m3expl006.xetex.tlg
@@ -7,7 +7,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
diff --git a/l3kernel/testfiles/m3expl007.luatex.tlg b/l3kernel/testfiles/m3expl007.luatex.tlg
index db8b458b4..ea289d274 100644
--- a/l3kernel/testfiles/m3expl007.luatex.tlg
+++ b/l3kernel/testfiles/m3expl007.luatex.tlg
@@ -5,7 +5,7 @@ Author: Phelype Oleinik
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3backend-luatex.def
File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
)) (expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
diff --git a/l3kernel/testfiles/m3expl007.tlg b/l3kernel/testfiles/m3expl007.tlg
index 9cf4336ce..4c7fc3972 100644
--- a/l3kernel/testfiles/m3expl007.tlg
+++ b/l3kernel/testfiles/m3expl007.tlg
@@ -5,7 +5,7 @@ Author: Phelype Oleinik
Package: expl3 ....-..-.. L3 programming layer (loader)
(l3backend-pdftex.def
File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\l__pdf_internal_box=\box...
)) (expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
diff --git a/l3kernel/testfiles/m3expl007.xetex.tlg b/l3kernel/testfiles/m3expl007.xetex.tlg
index d615906cc..533c70ffb 100644
--- a/l3kernel/testfiles/m3expl007.xetex.tlg
+++ b/l3kernel/testfiles/m3expl007.xetex.tlg
@@ -7,7 +7,7 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
(|extractbb --version)
\c__kernel_sys_dvipdfmx_version_int=\count...
-\l__kernel_color_stack_int=\count...
+\l__color_backend_stack_int=\count...
\g__graphics_track_int=\count...
\l__pdf_internal_box=\box...
\g__pdf_backend_object_int=\count...
More information about the latex3-commits
mailing list.