From 6c90555ebb89f41cc4dfb6cf3ee6bfaa8107650e Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Thu, 4 Jun 2020 03:02:40 +0000
Subject: CTAN sync 202006040302

---
 macros/latex/contrib/l3backend/l3backend-color.dtx | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'macros/latex/contrib/l3backend/l3backend-color.dtx')

diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx
index faadeb83ad..2b3e4d3708 100644
--- a/macros/latex/contrib/l3backend/l3backend-color.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-color.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-05}
+% \date{Released 2020-06-03}
 %
 % \maketitle
 %
@@ -98,10 +98,10 @@
               }
               {
                 \exp_last_unbraced:Nx \@@_backend_pickup:w
-                  { \current@color } \q_stop #1
+                  { \current@color } \s_@@_stop #1
               }
           }
-        \cs_new_protected:Npn \@@_backend_pickup:w #1 ~ #2 \q_stop #3
+        \cs_new_protected:Npn \@@_backend_pickup:w #1 ~ #2 \s_@@_stop #3
           { \tl_set:Nn #3 { #1 ~ #2 } }
       }
   }
@@ -110,17 +110,17 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_cmyk:nnnn}
-% \begin{macro}{\@@_backend_gray:n}
-% \begin{macro}{\@@_backend_rgb:nnn}
-% \begin{macro}{\@@_backend_spot:nn}
+% \begin{macro}{\@@_backend_cmyk:w}
+% \begin{macro}{\@@_backend_gray:w}
+% \begin{macro}{\@@_backend_rgb:w}
+% \begin{macro}{\@@_backend_spot:w}
 % \begin{macro}{\@@_backend_select:n, \@@_backend_select:x}
 % \begin{macro}{\@@_backend_reset:}
 % \begin{macro}{color.fc}
 %    Push the data to the stack. In the case of \texttt{dvips} also reset the
 %    drawing fill color in raw PostScript.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_cmyk:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s_@@_stop
   {
     \@@_backend_select:x
       {
@@ -129,14 +129,14 @@
         \fp_eval:n {#3} ~ \fp_eval:n {#4}
       }
   }
-\cs_new_protected:Npn \@@_backend_gray:n #1
+\cs_new_protected:Npn \@@_backend_gray:w #1 \s_@@_stop
   { \@@_backend_select:x { gray~ \fp_eval:n {#1} } }
-\cs_new_protected:Npn \@@_backend_rgb:nnn #1#2#3
+\cs_new_protected:Npn \@@_backend_rgb:w #1 ~ #2 ~ #3 \s_@@_stop
   {
     \@@_backend_select:x
       { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} }
   }
-\cs_new_protected:Npn \@@_backend_spot:nn #1#2
+\cs_new_protected:Npn \@@_backend_spot:w #1 ~ #2 \s_@@_stop
   { \@@_backend_select:n { #1 } }
 \cs_new_protected:Npn \@@_backend_select:n #1
   {
@@ -186,10 +186,10 @@
         \cs_set_protected:Npn \@@_backend_pickup:N #1
           {
             \exp_last_unbraced:Nx \@@_backend_pickup:w
-              { \current@color } ~ 0 ~ 0 ~ 0 \q_stop #1
+              { \current@color } ~ 0 ~ 0 ~ 0 \s_@@_stop #1
           }
         \cs_new_protected:Npn \@@_backend_pickup:w
-          #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop #7
+          #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s_@@_stop #7
           {
             \str_if_eq:nnTF {#2} { g }
               { \tl_set:Nn #7 { gray ~ #1 } }
@@ -226,47 +226,47 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\@@_backend_cmyk:nnnn, \@@_backend_cmyk_aux:nnnn}
-% \begin{macro}{\@@_backend_gray:n, \@@_backend_gray_aux:n}
-% \begin{macro}{\@@_backend_rgb:nnn, \@@_backend_rgb_aux:nnn}
-% \begin{macro}{\@@_backend_spot:nn}
+% \begin{macro}{\@@_backend_cmyk:w, \@@_backend_cmyk:nnnn}
+% \begin{macro}{\@@_backend_gray:w, \@@_backend_gray:n}
+% \begin{macro}{\@@_backend_rgb:w, \@@_backend_rgb:nnn}
+% \begin{macro}{\@@_backend_spot:w}
 % \begin{macro}{\@@_backend_select:n, \@@_backend_select:x}
 % \begin{macro}{\@@_backend_reset:}
 %   Simply dump the data, but allowing for \LuaTeX{}.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_cmyk:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s_@@_stop
   {
      \use:x
        {
-         \@@_backend_cmyk_aux:nnnn
+         \@@_backend_cmyk:nnnn
            { \fp_eval:n {#1} }
            { \fp_eval:n {#2} }
            { \fp_eval:n {#3} }
            { \fp_eval:n {#4} }
        } 
   }
-\cs_new_protected:Npn \@@_backend_cmyk_aux:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_backend_cmyk:nnnn #1#2#3#4
   {
     \@@_backend_select:n
       { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K }
   }
+\cs_new_protected:Npn \@@_backend_gray:w #1 \s_@@_stop
+  { \exp_args:Nx \@@_backend_gray:n { \fp_eval:n {#1} } }
 \cs_new_protected:Npn \@@_backend_gray:n #1
-  { \exp_args:Nx \@@_backend_gray_aux:n { \fp_eval:n {#1} } }
-\cs_new_protected:Npn \@@_backend_gray_aux:n #1
   { \@@_backend_select:n { #1 ~ g ~ #1 ~ G } }
-\cs_new_protected:Npn \@@_backend_rgb:nnn #1#2#3
+\cs_new_protected:Npn \@@_backend_rgb:w #1~ #2 ~ #3 \s_@@_stop
   {
      \use:x
        {
-         \@@_backend_rgb_aux:nnn
+         \@@_backend_rgb:nnn
            { \fp_eval:n {#1} }
            { \fp_eval:n {#2} }
            { \fp_eval:n {#3} }
        } 
   }
-\cs_new_protected:Npn \@@_backend_rgb_aux:nnn #1#2#3
+\cs_new_protected:Npn \@@_backend_rgb:nnn #1#2#3
   { \@@_backend_select:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } }
-\cs_new_protected:Npn \@@_backend_spot:nn #1#2
+\cs_new_protected:Npn \@@_backend_spot:w #1 ~ #2 \s_@@_stop
   { \@@_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC } }
 \cs_new_protected:Npx \@@_backend_select:n #1
   {
-- 
cgit v1.2.3

