[latex3-commits] [l3svn] 03/03: Split driver color functions into '"ensure" and "select"
noreply at latex-project.org
noreply at latex-project.org
Thu Oct 12 11:03:33 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit b68f4e670c08c20d67dc31f7219548d005aa8951
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Oct 12 09:49:14 2017 +0100
Split driver color functions into '"ensure" and "select"
---
l3kernel/l3drivers.dtx | 16 ++++++++++++++--
l3kernel/testfiles/m3expl001.luatex.tlg | 1 +
l3kernel/testfiles/m3expl001.ptex.tlg | 1 +
l3kernel/testfiles/m3expl001.tlg | 1 +
l3kernel/testfiles/m3expl001.uptex.tlg | 1 +
l3kernel/testfiles/m3expl001.xetex.tlg | 1 +
l3kernel/testfiles/m3expl003.luatex.tlg | 1 +
l3kernel/testfiles/m3expl003.ptex.tlg | 1 +
l3kernel/testfiles/m3expl003.tlg | 1 +
l3kernel/testfiles/m3expl003.uptex.tlg | 1 +
l3kernel/testfiles/m3expl003.xetex.tlg | 1 +
l3trial/l3color-extra/l3color-extra.dtx | 2 +-
12 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 78723e6..70a0127 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -543,6 +543,7 @@
% \end{macro}
%
% \begin{macro}[int]{\@@_color_ensure_current:}
+% \begin{macro}[int]{\@@_color_select:}
% \begin{macro}[aux, EXP]{\@@_convert_model:w}
% \begin{macro}[aux, EXP]{\@@_color_convert_spot:}
% \begin{macro}[aux, EXP]{\@@_color_convert_spot:w}
@@ -558,6 +559,10 @@
%<*package>
\@@_color_pickup:
%</package>
+ \@@_color_select:
+ }
+\cs_new_protected:Npn \@@_color_select:
+ {
\tex_special:D
{
color~push~
@@ -579,6 +584,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macrocode}
%</dvisvgm|dvipdfmx|dvips|xdvipdfmx>
@@ -654,6 +660,7 @@
% \end{variable}
%
% \begin{macro}[int]{\@@_color_ensure_current:}
+% \begin{macro}[int]{\@@_color_select:}
% \begin{macro}[aux, EXP]{\@@_color_convert:w}
% \begin{macro}[aux, EXP]
% {
@@ -668,11 +675,15 @@
% Most of the conversions are trivial but the need to cover spot colors
% makes life slightly more interesting.
% \begin{macrocode}
-\cs_new_protected:Npx \@@_color_ensure_current:
+\cs_new_protected:Npn \@@_color_ensure_current:
{
%<*package>
- \exp_not:N \@@_color_pickup:
+ \@@_color_pickup:
%</package>
+ \@@_color_select:
+ }
+\cs_new_protected:Npx \@@_color_select:
+ {
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D colorstack }
{ \pdftex_pdfcolorstack:D }
@@ -708,6 +719,7 @@
% \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 ee59b3a..ce7c1d4 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5745,6 +5745,7 @@ Defining \__driver_color_pickup: 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_select: 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 ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index b080151..13108d0 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5734,6 +5734,7 @@ Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_pickup: on line ...
Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_select: on line ...
Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 428d35f..311b943 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5937,6 +5937,7 @@ Defining \__driver_color_pickup: 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_select: 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 ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 278b1f3..4f439e5 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5933,6 +5933,7 @@ Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_pickup: on line ...
Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_select: on line ...
Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 78e8e5e..949f6a4 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5717,6 +5717,7 @@ Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
Defining \__driver_color_pickup: on line ...
Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_select: on line ...
Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index ee59b3a..ce7c1d4 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5745,6 +5745,7 @@ Defining \__driver_color_pickup: 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_select: 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 ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index b080151..13108d0 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5734,6 +5734,7 @@ Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_pickup: on line ...
Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_select: on line ...
Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 428d35f..311b943 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5937,6 +5937,7 @@ Defining \__driver_color_pickup: 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_select: 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 ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 278b1f3..4f439e5 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5933,6 +5933,7 @@ Defining \c__expl_def_ext_tl on line ...
(l3dvipdfmx.def
Defining \__driver_color_pickup: on line ...
Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_select: on line ...
Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 78e8e5e..949f6a4 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5717,6 +5717,7 @@ Defining \c__expl_def_ext_tl on line ...
(l3xdvipdfmx.def
Defining \__driver_color_pickup: on line ...
Defining \__driver_color_ensure_current: on line ...
+Defining \__driver_color_select: on line ...
Defining \__driver_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
Defining \__driver_color_convert_spot:w on line ...
diff --git a/l3trial/l3color-extra/l3color-extra.dtx b/l3trial/l3color-extra/l3color-extra.dtx
index 0671d1f..ea264da 100644
--- a/l3trial/l3color-extra/l3color-extra.dtx
+++ b/l3trial/l3color-extra/l3color-extra.dtx
@@ -496,7 +496,7 @@
\cs_new_protected:Npn \@@_select:
{
\tl_set_eq:cN { l_@@_named_ . _tl } \l__color_current_tl
-% \__driver_color_select:
+ \__driver_color_select:
}
% \end{macrocode}
% \end{macro}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list