[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fully expand \current at color in all cases (fixes #510) (0103987)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/010398709f6f3065bfc6e138d8566cf36410f96e

>---------------------------------------------------------------

commit 010398709f6f3065bfc6e138d8566cf36410f96e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jan 1 08:36:15 2019 +0000

    Fully expand \current at color in all cases (fixes #510)


>---------------------------------------------------------------

010398709f6f3065bfc6e138d8566cf36410f96e
 l3kernel/CHANGELOG.md  |    1 +
 l3kernel/l3drivers.dtx |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index ebaa600..9a42156 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -14,6 +14,7 @@ this project uses date-based 'snapshot' version identifiers.
 ### Fixed
 
 - Correct fp randint with zero argument (see #507)
+- Handling of `\current at color` with (x)dvipdfmx` (see #510)
 
 ### Removed
 
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 535714e..d0a5423 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2019 The LaTeX3 Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -638,8 +638,8 @@
                    }
               }
               {
-                \exp_after:wN \@@_color_pickup:w
-                  \current at color \q_stop #1
+                \exp_last_unbraced:Nx \@@_color_pickup:w
+                  { \current at color } \q_stop #1
               }
           }
         \cs_new_protected:Npn \@@_color_pickup:w #1 ~ #2 \q_stop #3