l3backend (23jun20)

git-svn-id: svn://tug.org/texlive/trunk@55638 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 38 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
index 8f5e5c407e6..f7ab8e125a0 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
@@ -25,7 +25,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvipdfmx.def}{2020-06-18}{}
+  {l3backend-dvipdfmx.def}{2020-06-23}{}
   {L3 backend support: dvipdfmx}
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index bf161ed1b35..44893f6288a 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
@@ -25,7 +25,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvips.def}{2020-06-18}{}
+  {l3backend-dvips.def}{2020-06-23}{}
   {L3 backend support: dvips}
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
index a8c31ce3c10..1b437d41f33 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -25,7 +25,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvisvgm.def}{2020-06-18}{}
+  {l3backend-dvisvgm.def}{2020-06-23}{}
   {L3 backend support: dvisvgm}
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
@@ -356,59 +356,67 @@
 \cs_new_protected:Npn \__draw_backend_join_bevel:
   { \__draw_backend_scope:n { stroke-linejoin="bevel" } }
 \cs_new_protected:Npn \__draw_backend_color_fill_cmyk:n #1
-  { \__draw_backend_color_fill_cmyk:w #1 \s__draw_stop }
-\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:w
-  #1 ~ #2 ~ #3 ~ #4 \s__draw_stop
+  { \__draw_backend_color_cmyk:nw { fill } #1 \s__draw_stop }
+\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:n #1
+  { \__draw_backend_color_cmyk:nw { stroke } #1 \s__draw_stop }
+\cs_new_protected:Npn \__draw_backend_color_cmyk:nw
+  #1#2 ~ #3 ~ #4 ~ #5 \s__draw_stop
   {
     \use:x
       {
-        \__draw_backend_color_fill:nnn
-          { \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } }
-          { \fp_eval:n { -100 * ( 1 - min ( 1 , #2 + #4 ) ) } }
-          { \fp_eval:n { -100 * ( 1 - min ( 1 , #3 + #4 ) ) } }
+        \__draw_backend_color:nnnn
+          {#1}
+          { \fp_eval:n { -100 * ( 1 - min ( 1 , #2 + #5 ) ) } }
+          { \fp_eval:n { -100 * ( 1 - min ( 1 , #3 + #5 ) ) } }
+          { \fp_eval:n { -100 * ( 1 - min ( 1 , #4 + #5 ) ) } }
       }
   }
-\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:n #1
-  { \__draw_backend_select:n { cmyk ~ #1 } }
 \cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1
+  { \__draw_backend_color_grab:nn { fill } {#1} }
+\cs_new_protected:Npn \__draw_backend_color_stroke_gray:n #1
+  { \__draw_backend_color_grab:nn { stroke } {#1} }
+\cs_new_protected:Npn \__draw_backend_color_gray:nn #1#2
   {
     \use:x
       {
-        \__draw_backend_color_gray_aux:n
-          { \fp_eval:n { 100 * (#1) } }
+        \__draw_backend_color_gray_aux:nn
+          {#1}
+          { \fp_eval:n { 100 * (#2) } }
       }
   }
-\cs_new_protected:Npn \__draw_backend_color_gray_aux:n #1
-  { \__draw_backend_color_fill:nnn {#1} {#1} {#1} }
-\cs_new_protected:Npn \__draw_backend_color_stroke_gray:n #1
-  { \__draw_backend_select:x { gray~ \fp_eval:n {#1} } }
-\cs_new_protected:Npn \__draw_backend_color_fill_rgb:n #1
+\cs_new_protected:Npn \__draw_backend_color_gray_aux:nn #1#2
+  { \__draw_backend_color:nnn {#1} {#2} {#2} {#2} }
+\cs_new_protected:Npn \__draw_backend_color_rgb_cmyk:n #1
+  { \__draw_backend_color_rgb:nw { fill } #1 \s__draw_stop }
+\cs_new_protected:Npn \__draw_backend_color_rgb_cmyk:n #1
+  { \__draw_backend_color_rgb:nw { stroke } #1 \s__draw_stop }
+\cs_new_protected:Npn \__draw_backend_color_rgb:nw
+  #1#2 ~ #3 ~ #4\s__draw_stop
   {
     \use:x
       {
-        \__draw_backend_color_fill:nnn
-          { \fp_eval:n { 100 * (#1) } }
+        \__draw_backend_color:nnnn
+          { fill }
           { \fp_eval:n { 100 * (#2) } }
           { \fp_eval:n { 100 * (#3) } }
+          { \fp_eval:n { 100 * (#4) } }
       }
   }
-\cs_new_protected:Npn \__draw_backend_color_fill:nnn #1#2#3
+\cs_new_protected:Npx \__draw_backend_color:nnnn #1#2#3#4
   {
-    \__draw_backend_scope:x
+    \__draw_backend_scope:n
       {
-        fill =
+        #1 =
          "
            rgb
              (
-               #1 \c_percent_str ,
                #2 \c_percent_str ,
-               #3 \c_percent_str
+               #3 \c_percent_str ,
+               #4 \c_percent_str
              )
          "
       }
   }
-\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:n #1
-  { \__draw_backend_select:n { rgb ~ #1 } }
 \cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4
   {
     \__draw_backend_scope:n
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def
index 688d84b9c79..a9f15616f07 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def
@@ -25,7 +25,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-pdfmode.def}{2020-06-18}{}
+  {l3backend-pdfmode.def}{2020-06-23}{}
   {L3 backend support: PDF mode}
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def
index 2a093aae8dc..b4d1c91f336 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def
@@ -25,7 +25,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-xdvipdfmx.def}{2020-06-18}{}
+  {l3backend-xdvipdfmx.def}{2020-06-23}{}
   {L3 backend support: xdvipdfmx}
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1