[latex3-commits] [git/LaTeX3-latex3-latex3] backend: Color needs more work (83eb60d)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Jun 2 10:10:30 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : backend
Link : https://github.com/latex3/latex3/commit/83eb60d8c4b04a082389dbc2b87fd4d036179ef0
>---------------------------------------------------------------
commit 83eb60d8c4b04a082389dbc2b87fd4d036179ef0
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Jun 2 08:59:54 2019 +0100
Color needs more work
>---------------------------------------------------------------
83eb60d8c4b04a082389dbc2b87fd4d036179ef0
l3experimental/l3draw/testfiles/m3draw004.ptex.tlg | 9 ++---
.../l3draw/testfiles/m3draw004.uptex.tlg | 9 ++---
.../l3draw/testfiles/m3draw004.xetex.tlg | 9 ++---
l3kernel/l3backend-color.dtx | 8 ++--
l3kernel/l3backend-draw.dtx | 39 ++++++++++++--------
l3kernel/testfiles/m3expl001.luatex.tlg | 9 +++--
l3kernel/testfiles/m3expl001.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.tlg | 9 +++--
l3kernel/testfiles/m3expl001.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 4 +-
l3kernel/testfiles/m3expl002.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl002.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 9 +++--
l3kernel/testfiles/m3expl003.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.tlg | 9 +++--
l3kernel/testfiles/m3expl003.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 4 +-
l3kernel/testfiles/m3expl004.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl004.tlg | 2 +-
l3kernel/testfiles/m3expl006.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl006.tlg | 2 +-
21 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
index ec8a785..d310d98 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
@@ -476,20 +476,17 @@ TEST 9: \draw_color_stroke:n
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal f}
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal B}
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
....\special{pdf:literal S}
-....\special{color pop}
-....\special{color pop}
-....\special{color pop}
...\special{x:grestore}
...\special{color pop}
! OK.
diff --git a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
index ec8a785..d310d98 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
@@ -476,20 +476,17 @@ TEST 9: \draw_color_stroke:n
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal f}
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal B}
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
....\special{pdf:literal S}
-....\special{color pop}
-....\special{color pop}
-....\special{color pop}
...\special{x:grestore}
...\special{color pop}
! OK.
diff --git a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
index ec8a785..d310d98 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
@@ -476,20 +476,17 @@ TEST 9: \draw_color_stroke:n
...\special{pdf:literal 10 M}
...\special{pdf:literal [] 0 d}
...\hbox(0.0+0.0)x0.0
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal f}
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 28.34647 28.34647 re}
....\special{pdf:literal B}
-....\special{color push 1 0 0 RG}
+....\special{pdf:literal 1 0 0 RG}
....\special{pdf:literal 0 0 m}
....\special{pdf:literal 28.34647 283.46457 l}
....\special{pdf:literal 56.69292 0 l}
....\special{pdf:literal S}
-....\special{color pop}
-....\special{color pop}
-....\special{color pop}
...\special{x:grestore}
...\special{color pop}
! OK.
diff --git a/l3kernel/l3backend-color.dtx b/l3kernel/l3backend-color.dtx
index 56edd52..63e1f66 100644
--- a/l3kernel/l3backend-color.dtx
+++ b/l3kernel/l3backend-color.dtx
@@ -220,11 +220,11 @@
% \end{macro}
% \end{macro}
%
-% \begin{variable}{\l_@@_stack_int}
+% \begin{variable}{\l__kernel_color_stack_int}
% \pdfTeX{} and \LuaTeX{} have multiple stacks available, and to track
% which one is in use a variable is required.
% \begin{macrocode}
-\int_new:N \l_@@_stack_int
+\int_new:N \l__kernel_color_stack_int
% \end{macrocode}
% \end{variable}
%
@@ -275,7 +275,7 @@
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D colorstack }
{ \tex_pdfcolorstack:D }
- \exp_not:N \l_@@_stack_int push {#1}
+ \exp_not:N \l__kernel_color_stack_int push {#1}
\group_insert_after:N \exp_not:N \@@_backend_reset:
}
\cs_generate_variant:Nn \@@_backend_select:n { x }
@@ -284,7 +284,7 @@
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D colorstack }
{ \tex_pdfcolorstack:D }
- \exp_not:N \l_@@_stack_int pop \scan_stop:
+ \exp_not:N \l__kernel_color_stack_int pop \scan_stop:
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3backend-draw.dtx b/l3kernel/l3backend-draw.dtx
index 99b9860..fd66e5b 100644
--- a/l3kernel/l3backend-draw.dtx
+++ b/l3kernel/l3backend-draw.dtx
@@ -668,15 +668,14 @@
% \@@_backend_color_fill_rgb:nnn ,
% \@@_backend_color_stroke_rgb:nnn
% }
-% \begin{macro}{\@@_backend_color_fill_select:n, \@@_backend_color_fill_select:x}
-% For the stroke color, all engines here can use the color stack to handle
-% the setting. However, that is not the case for fill color: the stack in
-% \texttt{(x)dvipdfmx} only covers one type of color. So we have to use
-% different approaches for the two sets of engines.
+% \begin{macro}{\@@_backend_color_select:n, \@@_backend_color_select:x}
+% \begin{macro}{\@@_backend_color_reset:}
+% Color has to be split between \texttt{(x)dvipdfmx} and the PDF engines
+% as there is no color stack for fill/stroke separation in the former.
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4
{
- \@@_color_fill_select:x
+ \@@_backend_color_select:x
{
\fp_eval:n {#1} ~ \fp_eval:n {#2} ~
\fp_eval:n {#3} ~ \fp_eval:n {#4} ~
@@ -685,7 +684,7 @@
}
\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4
{
- \@@_color_select:x
+ \@@_backend_color_select:x
{
\fp_eval:n {#1} ~ \fp_eval:n {#2} ~
\fp_eval:n {#3} ~ \fp_eval:n {#4} ~
@@ -693,38 +692,46 @@
}
}
\cs_new_protected:Npn \@@_backend_color_fill_gray:n #1
- { \@@_color_fill_select:x { \fp_eval:n {#1} ~ g } }
+ { \@@_backend_color_select:x { \fp_eval:n {#1} ~ g } }
\cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1
- { \@@_color_select:x { \fp_eval:n {#1} ~ G } }
+ { \@@_backend_color_select:x { \fp_eval:n {#1} ~ G } }
\cs_new_protected:Npn \@@_backend_color_fill_rgb:nnn #1#2#3
{
- \@@_color_fill_select:x
+ \@@_backend_color_select:x
{ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ rg }
}
\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3
{
- \@@_color_select:x
+ \@@_backend_color_select:x
{ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ RG }
}
%<*pdfmode>
-\cs_new_protected:Npx \@@_color_fill_select:n #1
+\cs_new_protected:Npx \@@_backend_color_select:n #1
{
\cs_if_exist:NTF \tex_pdfextension:D
{ \tex_pdfextension:D colorstack }
{ \tex_pdfcolorstack:D }
- \exp_not:N \l_@@_stack_int push {#1}
- \group_insert_after:N \exp_not:N \@@_backend_reset:
+ \exp_not:N \l__kernel_color_stack_int push {#1}
+ \group_insert_after:N \exp_not:N \@@_backend_color_reset:
+ }
+\cs_new_protected:Npx \@@_backend_color_reset:
+ {
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D colorstack }
+ { \tex_pdfcolorstack:D }
+ \exp_not:N \l__kernel_color_stack_int pop \scan_stop:
}
%</pdfmode>
%<*dvipdfmx|xdvipdfmx>
-\cs_new_eq:NN \@@_color_fill_select:n \__kernel_backend_literal:n
+\cs_new_eq:NN \@@_backend_color_select:n \__kernel_backend_literal_pdf:n
%</dvipdfmx|xdvipdfmx>
-\cs_generate_variant:Nn \@@_color_fill_select:n { x }
+\cs_generate_variant:Nn \@@_backend_color_select:n { x }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@@_backend_cm:nnnn}
% \begin{macro}{\@@_backend_cm_aux:nnnn}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 6af4355..451e9c1 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -6430,8 +6430,8 @@ 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 \l__color_stack_int on line ...
-\l__color_stack_int=\count...
+Defining \l__kernel_color_stack_int on line ...
+\l__kernel_color_stack_int=\count...
Defining \__color_backend_cmyk:nnnn on line ...
Defining \__color_backend_cmyk_aux:nnnn on line ...
Defining \__color_backend_gray:n on line ...
@@ -6484,8 +6484,9 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_reset: on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_box_use:Nnnnn on line ...
Defining \l__graphics_graphics_attr_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 968e5c9..189a179 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6472,8 +6472,8 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_cm_aux:nnnn on line ...
Defining \__draw_backend_cm_decompose:nnnnN on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 9a627ab..5b2f702 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6727,8 +6727,8 @@ 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 \l__color_stack_int on line ...
-\l__color_stack_int=\count...
+Defining \l__kernel_color_stack_int on line ...
+\l__kernel_color_stack_int=\count...
Defining \__color_backend_cmyk:nnnn on line ...
Defining \__color_backend_cmyk_aux:nnnn on line ...
Defining \__color_backend_gray:n on line ...
@@ -6781,8 +6781,9 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_reset: on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_box_use:Nnnnn on line ...
Defining \l__graphics_graphics_attr_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 2c5ba97..3c62e59 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6769,8 +6769,8 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_cm_aux:nnnn on line ...
Defining \__draw_backend_cm_decompose:nnnnN on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index bad1152..660f27c 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6473,8 +6473,8 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_cm_aux:nnnn on line ...
Defining \__draw_backend_cm_decompose:nnnnN on line ...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index cf619df..00f45d1 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -153,6 +153,6 @@ Package: expl3 ....-..-.. L3 programming layer (code)
\c__deprecation_minus_one=\count...
) (l3pdfmode.def
File: l3pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
-\l__color_stack_int=\count...
+\l__kernel_color_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index 21fa749..767dc93 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -155,6 +155,6 @@ Package: expl3 ....-..-.. L3 programming layer (code)
\c__deprecation_minus_one=\count...
) (l3pdfmode.def
File: l3pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
-\l__color_stack_int=\count...
+\l__kernel_color_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 6af4355..451e9c1 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -6430,8 +6430,8 @@ 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 \l__color_stack_int on line ...
-\l__color_stack_int=\count...
+Defining \l__kernel_color_stack_int on line ...
+\l__kernel_color_stack_int=\count...
Defining \__color_backend_cmyk:nnnn on line ...
Defining \__color_backend_cmyk_aux:nnnn on line ...
Defining \__color_backend_gray:n on line ...
@@ -6484,8 +6484,9 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_reset: on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_box_use:Nnnnn on line ...
Defining \l__graphics_graphics_attr_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 968e5c9..189a179 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6472,8 +6472,8 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_cm_aux:nnnn on line ...
Defining \__draw_backend_cm_decompose:nnnnN on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 9a627ab..5b2f702 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6727,8 +6727,8 @@ 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 \l__color_stack_int on line ...
-\l__color_stack_int=\count...
+Defining \l__kernel_color_stack_int on line ...
+\l__kernel_color_stack_int=\count...
Defining \__color_backend_cmyk:nnnn on line ...
Defining \__color_backend_cmyk_aux:nnnn on line ...
Defining \__color_backend_gray:n on line ...
@@ -6781,8 +6781,9 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_reset: on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_box_use:Nnnnn on line ...
Defining \l__graphics_graphics_attr_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 2c5ba97..3c62e59 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6769,8 +6769,8 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_cm_aux:nnnn on line ...
Defining \__draw_backend_cm_decompose:nnnnN on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index bad1152..660f27c 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6473,8 +6473,8 @@ Defining \__draw_backend_color_fill_gray:n on line ...
Defining \__draw_backend_color_stroke_gray:n on line ...
Defining \__draw_backend_color_fill_rgb:nnn on line ...
Defining \__draw_backend_color_stroke_rgb:nnn on line ...
-Defining \__draw_color_fill_select:n on line ...
-Defining \__draw_color_fill_select:x on line ...
+Defining \__draw_backend_color_select:n on line ...
+Defining \__draw_backend_color_select:x on line ...
Defining \__draw_backend_cm:nnnn on line ...
Defining \__draw_backend_cm_aux:nnnn on line ...
Defining \__draw_backend_cm_decompose:nnnnN on line ...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index cf619df..00f45d1 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -153,6 +153,6 @@ Package: expl3 ....-..-.. L3 programming layer (code)
\c__deprecation_minus_one=\count...
) (l3pdfmode.def
File: l3pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
-\l__color_stack_int=\count...
+\l__kernel_color_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl004.tlg b/l3kernel/testfiles/m3expl004.tlg
index 21fa749..767dc93 100644
--- a/l3kernel/testfiles/m3expl004.tlg
+++ b/l3kernel/testfiles/m3expl004.tlg
@@ -155,6 +155,6 @@ Package: expl3 ....-..-.. L3 programming layer (code)
\c__deprecation_minus_one=\count...
) (l3pdfmode.def
File: l3pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
-\l__color_stack_int=\count...
+\l__kernel_color_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index 548ee6d..97bd05f 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -154,6 +154,6 @@ Package: expl3 ....-..-.. L3 programming layer (code)
\c__deprecation_minus_one=\count...
) (l3pdfmode.def
File: l3pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
-\l__color_stack_int=\count...
+\l__kernel_color_stack_int=\count...
\l__pdf_internal_box=\box...
))
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index fe5b21a..862af20 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -156,6 +156,6 @@ Package: expl3 ....-..-.. L3 programming layer (code)
\c__deprecation_minus_one=\count...
) (l3pdfmode.def
File: l3pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
-\l__color_stack_int=\count...
+\l__kernel_color_stack_int=\count...
\l__pdf_internal_box=\box...
))
More information about the latex3-commits
mailing list