[latex3-commits] [l3svn] 01/02: \current at color may not be a pure string

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 7f3226eb6d1dd78d4fe9cf55aff7f44d3880c6cf
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Jul 24 09:20:56 2017 +0100

    \current at color may not be a pure string
    
    The xcolor package sets it to be instructions to generate a colour, for
    example.
---
 l3kernel/l3drivers.dtx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index ff1503c..4ac9799 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -519,7 +519,7 @@
     \@ifpackageloaded { color }
       {
         \cs_new_protected:Npn \@@_color_pickup:
-          { \tl_set_eq:NN \l__color_current_tl \current at color }
+          { \tl_set:Nx \l__color_current_tl { \current at color } }
       }
       { \cs_new_protected:Npn \@@_color_pickup: { } }
   }
@@ -567,11 +567,12 @@
       {
         \cs_new_protected:Npn \@@_color_pickup:
           {
+            \tl_set:Nx \l__color_current_tl { \current at color }
             \tl_set:Nx \l__color_current_tl
               {
-                \exp_after:wN \exp_after:wN\exp_after:wN
+                \exp_after:wN \exp_after:wN \exp_after:wN
                   \@@_color_pickup_aux:w \exp_after:wN
-                  \current at color \c_space_tl 0 ~ 0 ~ 0 \q_stop
+                  \l__color_current_tl \c_space_tl 0 ~ 0 ~ 0 \q_stop
               }
           }
         \cs_new:Npn \@@_color_pickup_aux:w #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.