From fa4840ca74917d6402885b9b77c26e51b61fc68a Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Fri, 19 Jun 2020 03:03:14 +0000
Subject: CTAN sync 202006190303

---
 .../latex/contrib/l3experimental/l3draw-state.dtx  | 31 +++++-----------------
 1 file changed, 6 insertions(+), 25 deletions(-)

(limited to 'macros/latex/contrib/l3experimental/l3draw-state.dtx')

diff --git a/macros/latex/contrib/l3experimental/l3draw-state.dtx b/macros/latex/contrib/l3experimental/l3draw-state.dtx
index 42adda47ce..4f434d924b 100644
--- a/macros/latex/contrib/l3experimental/l3draw-state.dtx
+++ b/macros/latex/contrib/l3experimental/l3draw-state.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-06-03}
+% \date{Released 2020-06-18}
 %
 % \maketitle
 %
@@ -124,7 +124,7 @@
 %   Pass through to the driver layer.
 %    \begin{macrocode}
 \cs_new_protected:Npn \draw_miterlimit:n #1
-  { \@@_backend_miterlimit:n { \fp_eval:n {#1} } }
+  { \exp_args:Nx \@@_backend_miterlimit:n { \fp_eval:n {#1} } }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -156,13 +156,7 @@
 %
 % \begin{macro}{\draw_color:n, \draw_color_fill:n, \draw_color_stroke:n}
 % \begin{macro}{\@@_color:nn}
-% \begin{macro}{\@@_color_aux:nn, \@@_color_aux:Vn}
-% \begin{macro}{\@@_color:nw}
-% \begin{macro}
-%   {
-%     \@@_select_cmyk:nw, \@@_select_gray:nw,
-%     \@@_select_rgb:nw, \@@_split_select:nw
-%   }
+% \begin{macro}{\@@_color:nnn}
 %   Much the same as for core color support but calling the relevant
 %   driver-level function.
 %    \begin{macrocode}
@@ -174,27 +168,14 @@
 \cs_new_protected:Npn \@@_color:nn #1#2
   {
     \color_parse:nN {#2} \l_@@_color_tmp_tl
-    \@@_color_aux:Vn \l_@@_color_tmp_tl {#1}
+    \exp_after:wN \@@_color:nnn \l_@@_color_tmp_tl {#1}
   }
-\cs_new_protected:Npn \@@_color_aux:nn #1#2
-  { \@@_color:nw {#2} #1 \s_@@_stop }
-\cs_generate_variant:Nn \@@_color_aux:nn { V }
-\cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \s_@@_stop
-  { \use:c { @@_color_ #2 :nw } {#1} #3 \s_@@_stop }
-\cs_new_protected:Npn \@@_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \s_@@_stop
-  { \use:c { @@_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} }
-\cs_new_protected:Npn \@@_color_gray:nw #1#2 \s_@@_stop
-  { \use:c { @@_backend_color_ #1 _gray:n } {#2} }
-\cs_new_protected:Npn \@@_color_rgb:nw #1#2 ~ #3 ~ #4 \s_@@_stop
-  { \use:c { @@_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} }
-\cs_new_protected:Npn \@@_color_spot:nw #1#2 ~ #3 \s_@@_stop
-  { \use:c { @@_backend_color_ #1 _spot:nn } {#2} {#3} }
+\cs_new_protected:Npn \@@_color:nnn #1#2#3
+  { \use:c { @@_backend_color_ #3 _ #1 :n } {#2} }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
-% \end{macro}
 %
 %    \begin{macrocode}
 %</initex|package>
-- 
cgit v1.2.3

