[latex3-commits] [l3svn] branch master updated: Define colour pick function at load time
noreply at latex-project.org
noreply at latex-project.org
Tue Oct 10 21:19:16 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 c8024e4 Define colour pick function at load time
c8024e4 is described below
commit c8024e4d387da4c7173788ee18a9f777e2b4f40c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Oct 10 20:18:35 2017 +0100
Define colour pick function at load time
This avoids an issue with packages that combine documents.
---
l3kernel/l3drivers.dtx | 10 ++++++----
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 +
11 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 6f94b49..5407d0a 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -516,11 +516,12 @@
% spot ones (here we need a model and a tint).
% \begin{macrocode}
%<*package>
+\cs_new_protected:Npn \@@_color_pickup: { }
\AtBeginDocument
{
\@ifpackageloaded { color }
{
- \cs_new_protected:Npn \@@_color_pickup:
+ \cs_set_protected:Npn \@@_color_pickup:
{
\exp_args:NV \tl_if_head_is_space:nTF \current at color
{
@@ -535,7 +536,7 @@
\cs_new_protected:Npn \@@_color_pickup_aux:w #1 ~ #2 \q_stop
{ \tl_set:Nn \l__color_current_tl { #1 ~ #2 } }
}
- { \cs_new_protected:Npn \@@_color_pickup: { } }
+ { }
}
%</package>
% \end{macrocode}
@@ -599,11 +600,12 @@
% \pkg{xcolor} sets it to be instructions to generate a colour
% \begin{macrocode}
%<*package>
+\cs_new_protected:Npn \@@_color_pickup: { }
\AtBeginDocument
{
\@ifpackageloaded { color }
{
- \cs_new_protected:Npn \@@_color_pickup:
+ \cs_set_protected:Npn \@@_color_pickup:
{
\exp_last_unbraced:Nx \@@_color_pickup_aux:w
{ \current at color } ~ 0 ~ 0 ~ 0 \q_stop
@@ -636,7 +638,7 @@
}
}
}
- { \cs_new_protected:Npn \@@_color_pickup: { } }
+ { }
}
%</package>
% \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index aeb6979..ee59b3a 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5741,6 +5741,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
+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 ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 14d1df0..b080151 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5732,6 +5732,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
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_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 80be404..428d35f 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5933,6 +5933,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
+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 ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index b93eda1..278b1f3 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5931,6 +5931,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
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_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index a3ef8cd..78e8e5e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5715,6 +5715,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
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_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index aeb6979..ee59b3a 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5741,6 +5741,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
+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 ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 14d1df0..b080151 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5732,6 +5732,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
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_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 80be404..428d35f 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5933,6 +5933,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
Defining \c__expl_def_ext_tl on line ...
(l3pdfmode.def
+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 ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index b93eda1..278b1f3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5931,6 +5931,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
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_convert_model:w on line ...
Defining \__driver_color_convert_spot: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index a3ef8cd..78e8e5e 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5715,6 +5715,7 @@ Defining key expl/log-functions/true on line ...
Defining key expl/log-functions/false on line ...
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_convert_model:w on line ...
Defining \__driver_color_convert_spot: 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