[latex3-commits] [git/LaTeX3-latex3-latex3] master: Split opacity backend code into a dedicated file (b860e79ce)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Jan 20 09:34:47 CET 2021
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/b860e79ce2447f2103c10a72cef0f6037e235f6b
>---------------------------------------------------------------
commit b860e79ce2447f2103c10a72cef0f6037e235f6b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Jan 20 08:34:47 2021 +0000
Split opacity backend code into a dedicated file
>---------------------------------------------------------------
b860e79ce2447f2103c10a72cef0f6037e235f6b
l3backend/l3backend-color.dtx | 175 +-----------------------
l3backend/l3backend-opacity.dtx | 230 ++++++++++++++++++++++++++++++++
l3backend/l3backend.ins | 6 +
l3kernel/testfiles/m3expl001.luatex.tlg | 16 +--
l3kernel/testfiles/m3expl001.ptex.tlg | 10 +-
l3kernel/testfiles/m3expl001.tlg | 16 +--
l3kernel/testfiles/m3expl001.uptex.tlg | 10 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 16 +--
l3kernel/testfiles/m3expl003.luatex.tlg | 16 +--
l3kernel/testfiles/m3expl003.ptex.tlg | 10 +-
l3kernel/testfiles/m3expl003.tlg | 16 +--
l3kernel/testfiles/m3expl003.uptex.tlg | 10 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 16 +--
13 files changed, 310 insertions(+), 237 deletions(-)
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index f7cdd602a..e29a7b02a 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -197,17 +197,17 @@
%<*dvipdfmx|xetex>
% \end{macrocode}
%
-% \begin{macro}{\@@_backend_stack_init:Nnn}
+% \begin{macro}{\__kernel_color_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.
% \begin{macrocode}
\int_compare:nNnTF \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
- { \cs_new_protected:Npn \@@_backend_stack_init:Nnn #1#2#3 { } }
+ { \cs_new_protected:Npn \__kernel_color_backend_stack_init:Nnn #1#2#3 { } }
{
\int_new:N \g_@@_backend_stack_int
- \cs_new_protected:Npx \@@_backend_stack_init:Nnn #1#2#3
+ \cs_new_protected:Npx \__kernel_color_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 }
@@ -231,7 +231,7 @@
{ \int_use:c { main at pdfcolorstack } }
}
{
- \@@_backend_stack_init:Nnn \c_@@_backend_main_stack_int
+ \__kernel_color_backend_stack_init:Nnn \c_@@_backend_main_stack_int
{ page ~ direct } { 0 ~ g ~ 0 ~ G }
\int_set_eq:NN \l_@@_backend_stack_int
\c_@@_backend_main_stack_int
@@ -281,9 +281,9 @@
%<*luatex|pdftex>
% \end{macrocode}
%
-% \begin{macro}{\@@_backend_stack_init:Nnn}
+% \begin{macro}{\__kernel_color_backend_stack_init:Nnn}
% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_stack_init:Nnn #1#2#3
+\cs_new_protected:Npn \__kernel_color_backend_stack_init:Nnn #1#2#3
{
\int_const:Nn #1
{
@@ -1238,169 +1238,6 @@
%</dvisvgm>
% \end{macrocode}
%
-% \subsection{Opacity (transparency)}
-%
-% Although opacity is not color, it needs to be managed in a somewhat
-% similar way: using a dedicated stack if possible. Depending on the backend,
-% that may not be possible. There is also the need to cover fill/stroke setting
-% as well as more general running opacity. It is easiest to describe the value
-% used in terms of opacity, although commonly this is referred to as
-% transparency.
-%
-% \begin{macrocode}
-%<*dvips>
-% \end{macrocode}
-%
-% \begin{macro}{\@@_backend_opacity_select:n}
-% No stack support.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_opacity_select:n #1 { }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_backend_fill_opacity:n, \@@_backend_stroke_opacity:n}
-% \begin{macro}{\@@_backend_opacity:nn, \@@_backend_opacity:xn}
-% Similar to the above but with no stack and only adding to one or other of
-% the entries.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_fill_opacity:n #1
- { \@@_backend_opacity:nn { \fp_eval:n { min(max(0,#1),1) } } { fill } }
-\cs_new_protected:Npn \@@_backend_stroke_opacity:n #1
- { \@@_backend_opacity:nn { \fp_eval:n { min(max(0,#1),1) } } { stroke } }
-\cs_new_protected:Npn \@@_backend_opacity:nn #1#2
- {
- \__kernel_backend_postscript:n { #1 ~ .set #2 constantalpha }
- }
-\cs_generate_variant:Nn \@@_backend_opacity:nn { x }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macrocode}
-%</dvips>
-% \end{macrocode}
-%
-% \begin{macrocode}
-%<*dvipdfmx|luatex|pdftex|xetex>
-% \end{macrocode}
-%
-% \begin{variable}{\c_@@_backend_opacity_stack_int}
-% Set up a stack.
-% \begin{macrocode}
-\cs_if_exist:NT \pdfmanagement_add:nnn
- {
- \@@_backend_stack_init:Nnn \c_@@_backend_opacity_stack_int
- { page ~ direct } { /color.opa 1 ~ gs }
- \pdfmanagement_add:nnn { Page / Resources / ExtGState }
- { color.opa 1 } { << /ca ~ 1 /CA ~ 1 >> }
- }
-% \end{macrocode}
-% \end{variable}
-%
-% \begin{macro}{\@@_backend_opacity_select:n, \@@_backend_opacity_select_aux:n}
-% \begin{macro}{\@@_backend_opacity_reset:}
-% Other than the need to evaluate the opacity as an \texttt{fp}, much the
-% same as color.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_opacity_select:n #1
- {
- \exp_args:Nx \@@_backend_opacity_select_aux:n
- { \fp_eval:n { min(max(0,#1),1) } }
- \group_insert_after:N \@@_backend_opacity_reset:
- }
-\cs_new_protected:Npn \@@_backend_opacity_select_aux:n #1
- {
- \pdfmanagement_add:nnn { Page / Resources / ExtGState }
- { color.opa #1 }
- { << /ca ~ #1 /CA ~ #1 >> }
- \@@_backend_stack_push:nn \c_@@_backend_opacity_stack_int
- { /color.opa #1 ~ gs }
- }
-\cs_if_exist:NF \pdfmanagement_add:nnn
- {
- \cs_gset_protected:Npn \@@_backend_opacity_select_aux:n #1 { }
- }
-\cs_new_protected:Npn \@@_backend_opacity_reset:
- { \@@_backend_stack_pop:n \c_@@_backend_opacity_stack_int }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@@_backend_fill_opacity:n, \@@_backend_stroke_opacity:n}
-% \begin{macro}{\@@_backend_opacity:nn, \@@_backend_opacity:xn}
-% Similar to the above but with no stack and only adding to one or other of
-% the entries.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_fill_opacity:n #1
- { \@@_backend_opacity:nn { \fp_eval:n { min(max(0,#1),1) } } { ca } }
-\cs_new_protected:Npn \@@_backend_stroke_opacity:n #1
- { \@@_backend_opacity:nn { \fp_eval:n { min(max(0,#1),1) } } { CA } }
-\cs_new_protected:Npn \@@_backend_opacity:nn #1#2
- {
- \pdfmanagement_add:nnn { Page / Resources / ExtGState }
- { color.opa #1 }
- { << /#2 ~ #1 >> }
- \@@_backend_stack_push:nn \c_@@_backend_opacity_stack_int
- { /color.opa #1 ~ gs }
- }
-\cs_generate_variant:Nn \@@_backend_opacity:nn { x }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macrocode}
-%</dvipdfmx|luatex|pdftex|xetex>
-% \end{macrocode}
-%
-% \begin{macrocode}
-%<*dvipdfmx|xdvipdfmx>
-% \end{macrocode}
-%
-% \begin{macro}{\@@_backend_opacity_select:n}
-% Older backends have no stack support.
-% \begin{macrocode}
-\int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
- {
- \cs_gset_protected:Npn \@@_backend_opacity_select:n #1 { }
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
-%</dvipdfmx|xdvipdfmx>
-% \end{macrocode}
-%
-% \begin{macrocode}
-%<*dvisvgm>
-% \end{macrocode}
-%
-% \begin{macro}{\@@_backend_opacity_select:n}
-% No stack support.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_opacity_select:n #1 { }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_backend_fill_opacity:n, \@@_backend_stroke_opacity:n}
-% \begin{macro}{\@@_backend_opacity:nn, \@@_backend_opacity:xn}
-% Once again, we use a scope here. There is a general opacity function for
-% SVG, but that is of course not set up using the stack.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_fill_opacity:n #1
- { \@@_backend_opacity:nn { \fp_eval:n { min(max(0,#1),1) } } { fill } }
-\cs_new_protected:Npn \@@_backend_stroke_opacity:n #1
- { \@@_backend_opacity:nn { \fp_eval:n { min(max(0,#1),1) } } { stroke } }
-\cs_new_protected:Npn \@@_backend_opacity:nn #1#2
- { \__kernel_backend_scope:n { #2 -opacity = "#1" } }
-\cs_generate_variant:Nn \@@_backend_opacity:nn { x }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macrocode}
-%</dvisvgm>
-% \end{macrocode}
-%
% \begin{macrocode}
%</package>
% \end{macrocode}
diff --git a/l3backend/l3backend-opacity.dtx b/l3backend/l3backend-opacity.dtx
new file mode 100644
index 000000000..a5bd179bf
--- /dev/null
+++ b/l3backend/l3backend-opacity.dtx
@@ -0,0 +1,230 @@
+% \iffalse meta-comment
+%
+%% File: l3backend-opacity.dtx
+%
+% Copyright (C) 2021 The LaTeX Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% https://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3backend bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
+%<*driver>
+\documentclass[full,kernel]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \textsf{l3backend-opacity} package\\ Backend opacity support^^A
+% }
+%
+% \author{^^A
+% The \LaTeX{} Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2021-01-09}
+%
+% \maketitle
+%
+% \begin{documentation}
+%
+% \end{documentation}
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3backend-opacity} Implementation}
+%
+% \begin{macrocode}
+%<*package>
+%<@@=opacity>
+% \end{macrocode}
+%
+% Although opacity is not color, it needs to be managed in a somewhat
+% similar way: using a dedicated stack if possible. Depending on the backend,
+% that may not be possible. There is also the need to cover fill/stroke setting
+% as well as more general running opacity. It is easiest to describe the value
+% used in terms of opacity, although commonly this is referred to as
+% transparency.
+%
+% \begin{macrocode}
+%<*dvips>
+% \end{macrocode}
+%
+% \begin{macro}{\@@_backend_select:n}
+% No stack support.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_backend_select:n #1 { }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_backend_fill:n, \@@_backend_stroke:n}
+% \begin{macro}{\@@_backend:nn, \@@_backend:xn}
+% Similar to the above but with no stack and only adding to one or other of
+% the entries.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_backend_fill:n #1
+ { \@@_backend:nn { \fp_eval:n { min(max(0,#1),1) } } { fill } }
+\cs_new_protected:Npn \@@_backend_stroke:n #1
+ { \@@_backend:nn { \fp_eval:n { min(max(0,#1),1) } } { stroke } }
+\cs_new_protected:Npn \@@_backend:nn #1#2
+ {
+ \__kernel_backend_postscript:n { #1 ~ .set #2 constantalpha }
+ }
+\cs_generate_variant:Nn \@@_backend:nn { x }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macrocode}
+%</dvips>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*dvipdfmx|luatex|pdftex|xetex>
+% \end{macrocode}
+%
+% \begin{variable}{\c_@@_backend_stack_int}
+% Set up a stack.
+% \begin{macrocode}
+\cs_if_exist:NT \pdfmanagement_add:nnn
+ {
+ \__kernel_color_backend_stack_init:Nnn \c_@@_backend_stack_int
+ { page ~ direct } { /opacity 1 ~ gs }
+ \pdfmanagement_add:nnn { Page / Resources / ExtGState }
+ { opacity 1 } { << /ca ~ 1 /CA ~ 1 >> }
+ }
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}{\@@_backend_select:n, \@@_backend_select_aux:n}
+% \begin{macro}{\@@_backend_reset:}
+% Other than the need to evaluate the opacity as an \texttt{fp}, much the
+% same as color.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_backend_select:n #1
+ {
+ \exp_args:Nx \@@_backend_select_aux:n
+ { \fp_eval:n { min(max(0,#1),1) } }
+ \group_insert_after:N \@@_backend_reset:
+ }
+\cs_new_protected:Npn \@@_backend_select_aux:n #1
+ {
+ \pdfmanagement_add:nnn { Page / Resources / ExtGState }
+ { opacity #1 }
+ { << /ca ~ #1 /CA ~ #1 >> }
+ \@@_backend_stack_push:nn \c_@@_backend_stack_int
+ { /opacity #1 ~ gs }
+ }
+\cs_if_exist:NF \pdfmanagement_add:nnn
+ {
+ \cs_gset_protected:Npn \@@_backend_select_aux:n #1 { }
+ }
+\cs_new_protected:Npn \@@_backend_reset:
+ { \@@_backend_stack_pop:n \c_@@_backend_stack_int }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@@_backend_fill:n, \@@_backend_stroke:n}
+% \begin{macro}{\@@_backend:nn, \@@_backend:xn}
+% Similar to the above but with no stack and only adding to one or other of
+% the entries.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_backend_fill:n #1
+ { \@@_backend:nn { \fp_eval:n { min(max(0,#1),1) } } { ca } }
+\cs_new_protected:Npn \@@_backend_stroke:n #1
+ { \@@_backend:nn { \fp_eval:n { min(max(0,#1),1) } } { CA } }
+\cs_new_protected:Npn \@@_backend:nn #1#2
+ {
+ \pdfmanagement_add:nnn { Page / Resources / ExtGState }
+ { opacity #1 }
+ { << /#2 ~ #1 >> }
+ \@@_backend_stack_push:nn \c_@@_backend_stack_int
+ { /opacity #1 ~ gs }
+ }
+\cs_generate_variant:Nn \@@_backend:nn { x }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macrocode}
+%</dvipdfmx|luatex|pdftex|xetex>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*dvipdfmx|xdvipdfmx>
+% \end{macrocode}
+%
+% \begin{macro}{\@@_backend_select:n}
+% Older backends have no stack support.
+% \begin{macrocode}
+\int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
+ {
+ \cs_gset_protected:Npn \@@_backend_select:n #1 { }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+%</dvipdfmx|xdvipdfmx>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*dvisvgm>
+% \end{macrocode}
+%
+% \begin{macro}{\@@_backend_select:n}
+% No stack support.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_backend_select:n #1 { }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_backend_fill:n, \@@_backend_stroke:n}
+% \begin{macro}{\@@_backend:nn, \@@_backend:xn}
+% Once again, we use a scope here. There is a general opacity function for
+% SVG, but that is of course not set up using the stack.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_backend_fill:n #1
+ { \@@_backend:nn { \fp_eval:n { min(max(0,#1),1) } } { fill } }
+\cs_new_protected:Npn \@@_backend_stroke:n #1
+ { \@@_backend:nn { \fp_eval:n { min(max(0,#1),1) } } { stroke } }
+\cs_new_protected:Npn \@@_backend:nn #1#2
+ { \__kernel_backend_scope:n { #2 -opacity = "#1" } }
+\cs_generate_variant:Nn \@@_backend:nn { x }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macrocode}
+%</dvisvgm>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3backend/l3backend.ins b/l3backend/l3backend.ins
index 4da6290d4..7fced393b 100644
--- a/l3backend/l3backend.ins
+++ b/l3backend/l3backend.ins
@@ -64,6 +64,7 @@ and all files in that bundle must be distributed together.
\from{l3backend-draw.dtx} {package,dvipdfmx}
\from{l3backend-graphics.dtx}{package,dvipdfmx}
\from{l3backend-pdf.dtx} {package,dvipdfmx}
+ \from{l3backend-opacity.dtx} {package,dvipdfmx}
}
}
\generate
@@ -76,6 +77,7 @@ and all files in that bundle must be distributed together.
\from{l3backend-draw.dtx} {package,dvips}
\from{l3backend-graphics.dtx}{package,dvips}
\from{l3backend-pdf.dtx} {package,dvips}
+ \from{l3backend-opacity.dtx} {package,dvips}
}
\file{l3backend-dvips.pro}
{
@@ -92,6 +94,7 @@ and all files in that bundle must be distributed together.
\from{l3backend-draw.dtx} {package,dvisvgm}
\from{l3backend-graphics.dtx}{package,dvisvgm}
\from{l3backend-pdf.dtx} {package,dvisvgm}
+ \from{l3backend-opacity.dtx} {package,dvisvgm}
}
}
\generate
@@ -104,6 +107,7 @@ and all files in that bundle must be distributed together.
\from{l3backend-draw.dtx} {package,luatex}
\from{l3backend-graphics.dtx}{package,luatex}
\from{l3backend-pdf.dtx} {package,luatex}
+ \from{l3backend-opacity.dtx} {package,luatex}
}
}
\generate
@@ -116,6 +120,7 @@ and all files in that bundle must be distributed together.
\from{l3backend-draw.dtx} {package,pdftex}
\from{l3backend-graphics.dtx}{package,pdftex}
\from{l3backend-pdf.dtx} {package,pdftex}
+ \from{l3backend-opacity.dtx} {package,pdftex}
}
}
\generate
@@ -128,6 +133,7 @@ and all files in that bundle must be distributed together.
\from{l3backend-draw.dtx} {package,xetex}
\from{l3backend-graphics.dtx}{package,xetex}
\from{l3backend-pdf.dtx} {package,xetex}
+ \from{l3backend-opacity.dtx} {package,xetex}
}
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index f484b0484..9c2fc3c44 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -30,7 +30,7 @@ Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
Defining \l__color_backend_stack_int on line ...
\l__color_backend_stack_int=\count...
-Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__kernel_color_backend_stack_init:Nnn on line ...
Defining \__color_backend_stack_push:nn on line ...
Defining \__color_backend_stack_push:nx on line ...
Defining \__color_backend_stack_pop:n on line ...
@@ -61,13 +61,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_opacity_select_aux:n on line ...
-Defining \__color_backend_opacity_reset: on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -155,4 +148,11 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_select_aux:n on line ...
+Defining \__opacity_backend_reset: on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index ca03b3ba0..8ca7e978e 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -64,11 +64,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -172,4 +167,9 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 985871a2c..4b68d6958 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -30,7 +30,7 @@ Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
Defining \l__color_backend_stack_int on line ...
\l__color_backend_stack_int=\count...
-Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__kernel_color_backend_stack_init:Nnn on line ...
Defining \__color_backend_stack_push:nn on line ...
Defining \__color_backend_stack_push:nx on line ...
Defining \__color_backend_stack_pop:n on line ...
@@ -61,13 +61,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_opacity_select_aux:n on line ...
-Defining \__color_backend_opacity_reset: on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -155,4 +148,11 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_select_aux:n on line ...
+Defining \__opacity_backend_reset: on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index ca03b3ba0..8ca7e978e 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -64,11 +64,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -172,4 +167,9 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index f23170bc9..88b35c195 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -31,7 +31,7 @@ Defining \c__kernel_sys_dvipdfmx_version_int on line ...
Defining \__color_backend_pickup:N on line ...
Defining \l__color_backend_stack_int on line ...
\l__color_backend_stack_int=\count...
-Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__kernel_color_backend_stack_init:Nnn on line ...
Defining \l__color_backend_fill_tl on line ...
Defining \l__color_backend_stroke_tl on line ...
Defining \__color_backend_select_cmyk:n on line ...
@@ -59,13 +59,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_opacity_select_aux:n on line ...
-Defining \__color_backend_opacity_reset: on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -178,4 +171,11 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_select_aux:n on line ...
+Defining \__opacity_backend_reset: on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index f484b0484..9c2fc3c44 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -30,7 +30,7 @@ Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
Defining \l__color_backend_stack_int on line ...
\l__color_backend_stack_int=\count...
-Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__kernel_color_backend_stack_init:Nnn on line ...
Defining \__color_backend_stack_push:nn on line ...
Defining \__color_backend_stack_push:nx on line ...
Defining \__color_backend_stack_pop:n on line ...
@@ -61,13 +61,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_opacity_select_aux:n on line ...
-Defining \__color_backend_opacity_reset: on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -155,4 +148,11 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_select_aux:n on line ...
+Defining \__opacity_backend_reset: on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index ca03b3ba0..8ca7e978e 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -64,11 +64,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -172,4 +167,9 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 985871a2c..4b68d6958 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -30,7 +30,7 @@ Defining \__kernel_backend_matrix:x on line ...
Defining \__color_backend_pickup:N on line ...
Defining \l__color_backend_stack_int on line ...
\l__color_backend_stack_int=\count...
-Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__kernel_color_backend_stack_init:Nnn on line ...
Defining \__color_backend_stack_push:nn on line ...
Defining \__color_backend_stack_push:nx on line ...
Defining \__color_backend_stack_pop:n on line ...
@@ -61,13 +61,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_opacity_select_aux:n on line ...
-Defining \__color_backend_opacity_reset: on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -155,4 +148,11 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_select_aux:n on line ...
+Defining \__opacity_backend_reset: on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index ca03b3ba0..8ca7e978e 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -64,11 +64,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -172,4 +167,9 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index f23170bc9..88b35c195 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -31,7 +31,7 @@ Defining \c__kernel_sys_dvipdfmx_version_int on line ...
Defining \__color_backend_pickup:N on line ...
Defining \l__color_backend_stack_int on line ...
\l__color_backend_stack_int=\count...
-Defining \__color_backend_stack_init:Nnn on line ...
+Defining \__kernel_color_backend_stack_init:Nnn on line ...
Defining \l__color_backend_fill_tl on line ...
Defining \l__color_backend_stroke_tl on line ...
Defining \__color_backend_select_cmyk:n on line ...
@@ -59,13 +59,6 @@ Defining \__color_backend_fill_separation:nn on line ...
Defining \__color_backend_stroke_separation:nn on line ...
Defining \__color_backend_fill_devicen:nn on line ...
Defining \__color_backend_stroke_devicen:nn on line ...
-Defining \__color_backend_opacity_select:n on line ...
-Defining \__color_backend_opacity_select_aux:n on line ...
-Defining \__color_backend_opacity_reset: on line ...
-Defining \__color_backend_fill_opacity:n on line ...
-Defining \__color_backend_stroke_opacity:n on line ...
-Defining \__color_backend_opacity:nn on line ...
-Defining \__color_backend_opacity:xn on line ...
Defining \__box_backend_clip:N on line ...
Defining \__box_backend_rotate:Nn on line ...
Defining \__box_backend_rotate_aux:Nn on line ...
@@ -178,4 +171,11 @@ Defining \__pdf_backend_version_major: on line ...
Defining \__pdf_backend_version_minor: on line ...
Defining \__pdf_backend_bdc:nn on line ...
Defining \__pdf_backend_emc: on line ...
+Defining \__opacity_backend_select:n on line ...
+Defining \__opacity_backend_select_aux:n on line ...
+Defining \__opacity_backend_reset: on line ...
+Defining \__opacity_backend_fill:n on line ...
+Defining \__opacity_backend_stroke:n on line ...
+Defining \__opacity_backend:nn on line ...
+Defining \__opacity_backend:xn on line ...
))
More information about the latex3-commits
mailing list.