l3backend (23aug22)

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

6 files changed, 82 insertions, 122 deletions

diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
index 3f0a4e3c5d4..7146ee10cdc 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvipdfmx.def}{2022-08-05}{}
+  {l3backend-dvipdfmx.def}{2022-08-23}{}
   {L3 backend support: dvipdfmx}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -66,27 +66,21 @@
 \cs_new_protected:Npn \__kernel_backend_scope_end:
   { \__kernel_backend_literal:n { x:grestore } }
 %% File: l3backend-color.dtx
-\cs_new_protected:Npn \__color_backend_pickup:N #1 { }
-\cs_if_exist:cT { ver@color.sty }
+\cs_new_protected:Npn \__color_backend_pickup:N #1
   {
-    \cs_set_protected:Npn \__color_backend_pickup:N #1
+    \exp_args:NV \tl_if_head_is_space:nTF \current@color
       {
-        \exp_args:NV \tl_if_head_is_space:nTF \current@color
-          {
-            \tl_set:Nx #1
-               {
-                 { named }
-                 { \exp_after:wN \use:n \current@color }
-               }
-          }
-          {
-            \exp_last_unbraced:Nx \__color_backend_pickup:w
-              { \current@color } \s__color_stop #1
-          }
+        \tl_set:Nn #1 { { gray } { 0 } }
+        \msg_warning:nnx { color } { unhandled }
+          { \current@color }
+      }
+      {
+        \exp_last_unbraced:Nx \__color_backend_pickup:w
+          { \current@color } \s__color_stop #1
       }
-    \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
-      { \tl_set:Nn #3 { {#1} {#2} } }
   }
+\cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
+  { \tl_set:Nn #3 { {#1} {#2} } }
 \cs_new_protected:Npn \__color_backend_select:n #1
   { \__kernel_backend_literal:n { pdf : bc ~ [ #1 ] } }
 \cs_new_eq:NN \__color_backend_select_cmyk:n \__color_backend_select:n
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index 4d561e6b4f3..b7efe7a693e 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvips.def}{2022-08-05}{}
+  {l3backend-dvips.def}{2022-08-23}{}
   {L3 backend support: dvips}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -83,27 +83,21 @@
 \cs_new_protected:Npn \__kernel_backend_scope_end:
   { \__kernel_backend_literal:n { ps:grestore } }
 %% File: l3backend-color.dtx
-\cs_new_protected:Npn \__color_backend_pickup:N #1 { }
-\cs_if_exist:cT { ver@color.sty }
+\cs_new_protected:Npn \__color_backend_pickup:N #1
   {
-    \cs_set_protected:Npn \__color_backend_pickup:N #1
+    \exp_args:NV \tl_if_head_is_space:nTF \current@color
       {
-        \exp_args:NV \tl_if_head_is_space:nTF \current@color
-          {
-            \tl_set:Nx #1
-               {
-                 { named }
-                 { \exp_after:wN \use:n \current@color }
-               }
-          }
-          {
-            \exp_last_unbraced:Nx \__color_backend_pickup:w
-              { \current@color } \s__color_stop #1
-          }
+        \tl_set:Nn #1 { { gray } { 0 } }
+        \msg_warning:nnx { color } { unhandled }
+          { \current@color }
+      }
+      {
+        \exp_last_unbraced:Nx \__color_backend_pickup:w
+          { \current@color } \s__color_stop #1
       }
-    \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
-      { \tl_set:Nn #3 { {#1} {#2} } }
   }
+\cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
+  { \tl_set:Nn #3 { {#1} {#2} } }
 \cs_new_protected:Npn \__color_backend_select_cmyk:n #1
   { \__color_backend_select:n { cmyk ~ #1 } }
 \cs_new_protected:Npn \__color_backend_select_gray: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 b9a97cca0e7..3f20aef6ff2 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-dvisvgm.def}{2022-08-05}{}
+  {l3backend-dvisvgm.def}{2022-08-23}{}
   {L3 backend support: dvisvgm}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -97,27 +97,21 @@
   }
 \cs_generate_variant:Nn \__kernel_backend_scope:n { x }
 %% File: l3backend-color.dtx
-\cs_new_protected:Npn \__color_backend_pickup:N #1 { }
-\cs_if_exist:cT { ver@color.sty }
+\cs_new_protected:Npn \__color_backend_pickup:N #1
   {
-    \cs_set_protected:Npn \__color_backend_pickup:N #1
+    \exp_args:NV \tl_if_head_is_space:nTF \current@color
       {
-        \exp_args:NV \tl_if_head_is_space:nTF \current@color
-          {
-            \tl_set:Nx #1
-               {
-                 { named }
-                 { \exp_after:wN \use:n \current@color }
-               }
-          }
-          {
-            \exp_last_unbraced:Nx \__color_backend_pickup:w
-              { \current@color } \s__color_stop #1
-          }
+        \tl_set:Nn #1 { { gray } { 0 } }
+        \msg_warning:nnx { color } { unhandled }
+          { \current@color }
+      }
+      {
+        \exp_last_unbraced:Nx \__color_backend_pickup:w
+          { \current@color } \s__color_stop #1
       }
-    \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
-      { \tl_set:Nn #3 { {#1} {#2} } }
   }
+\cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
+  { \tl_set:Nn #3 { {#1} {#2} } }
 \cs_new_protected:Npn \__color_backend_select_cmyk:n #1
   { \__color_backend_select:n { cmyk ~ #1 } }
 \cs_new_protected:Npn \__color_backend_select_gray:n #1
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
index 8b056a250a3..9be080803a7 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-luatex.def}{2022-08-05}{}
+  {l3backend-luatex.def}{2022-08-23}{}
   {L3 backend support: PDF output (LuaTeX)}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -82,34 +82,26 @@
   }
 \cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
 %% File: l3backend-color.dtx
-\cs_new_protected:Npn \__color_backend_pickup:N #1 { }
-\cs_if_exist:cT { ver@color.sty }
+\cs_new_protected:Npn \__color_backend_pickup:N #1
   {
-    \cs_set_protected:Npn \__color_backend_pickup:N #1
-      {
-        \exp_last_unbraced:Nx \__color_backend_pickup:w
-          { \current@color } ~ 0 ~ 0 ~ 0 \s__color_stop #1
-      }
-    \cs_new_protected:Npn \__color_backend_pickup:w
-      #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s__color_stop #7
+    \exp_last_unbraced:Nx \__color_backend_pickup:w
+      { \current@color } ~ 0 ~ 0 ~ 0 \s__color_stop #1
+  }
+\cs_new_protected:Npn \__color_backend_pickup:w
+  #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s__color_stop #7
+  {
+    \str_if_eq:nnTF {#2} { g }
+      { \tl_set:Nn #7 { { gray } {#1} } }
       {
-        \str_if_eq:nnTF {#2} { g }
-          { \tl_set:Nn #7 { { gray } {#1} } }
+        \str_if_eq:nnTF {#4} { rg }
+          { \tl_set:Nn #7 { { rgb } { #1 ~ #2 ~ #3 } } }
           {
-            \str_if_eq:nnTF {#4} { rg }
-              { \tl_set:Nn #7 { { rgb } { #1 ~ #2 ~ #3 } } }
+            \str_if_eq:nnTF {#5} { k }
+              { \tl_set:Nn #7 { { cmyk } { #1 ~ #2 ~ #3 ~ #4 } } }
               {
-                 \str_if_eq:nnTF {#5} { k }
-                   { \tl_set:Nn #7 { { cmyk } { #1 ~ #2 ~ #3 ~ #4 } } }
-                   {
-                     \str_if_eq:nnTF {#2} { cs }
-                       {
-                         \tl_set:Nx #7 { { \use:n #1 } { #5 } }
-                       }
-                       {
-                         \tl_set:Nn #7 { { gray } { 0 } }
-                       }
-                   }
+                \tl_set:Nn #1 { { gray } { 0 } }
+                \msg_warning:nnx { color } { unhandled }
+                  { \current@color }
               }
           }
       }
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
index 2bcf56a29b7..4d5b03c068b 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-pdftex.def}{2022-08-05}{}
+  {l3backend-pdftex.def}{2022-08-23}{}
   {L3 backend support: PDF output (pdfTeX)}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -82,34 +82,26 @@
   }
 \cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
 %% File: l3backend-color.dtx
-\cs_new_protected:Npn \__color_backend_pickup:N #1 { }
-\cs_if_exist:cT { ver@color.sty }
+\cs_new_protected:Npn \__color_backend_pickup:N #1
   {
-    \cs_set_protected:Npn \__color_backend_pickup:N #1
-      {
-        \exp_last_unbraced:Nx \__color_backend_pickup:w
-          { \current@color } ~ 0 ~ 0 ~ 0 \s__color_stop #1
-      }
-    \cs_new_protected:Npn \__color_backend_pickup:w
-      #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s__color_stop #7
+    \exp_last_unbraced:Nx \__color_backend_pickup:w
+      { \current@color } ~ 0 ~ 0 ~ 0 \s__color_stop #1
+  }
+\cs_new_protected:Npn \__color_backend_pickup:w
+  #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s__color_stop #7
+  {
+    \str_if_eq:nnTF {#2} { g }
+      { \tl_set:Nn #7 { { gray } {#1} } }
       {
-        \str_if_eq:nnTF {#2} { g }
-          { \tl_set:Nn #7 { { gray } {#1} } }
+        \str_if_eq:nnTF {#4} { rg }
+          { \tl_set:Nn #7 { { rgb } { #1 ~ #2 ~ #3 } } }
           {
-            \str_if_eq:nnTF {#4} { rg }
-              { \tl_set:Nn #7 { { rgb } { #1 ~ #2 ~ #3 } } }
+            \str_if_eq:nnTF {#5} { k }
+              { \tl_set:Nn #7 { { cmyk } { #1 ~ #2 ~ #3 ~ #4 } } }
               {
-                 \str_if_eq:nnTF {#5} { k }
-                   { \tl_set:Nn #7 { { cmyk } { #1 ~ #2 ~ #3 ~ #4 } } }
-                   {
-                     \str_if_eq:nnTF {#2} { cs }
-                       {
-                         \tl_set:Nx #7 { { \use:n #1 } { #5 } }
-                       }
-                       {
-                         \tl_set:Nn #7 { { gray } { 0 } }
-                       }
-                   }
+                \tl_set:Nn #1 { { gray } { 0 } }
+                \msg_warning:nnx { color } { unhandled }
+                  { \current@color }
               }
           }
       }
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
index 2fa8d2ce066..29e2cc7c183 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
@@ -26,7 +26,7 @@
 %% 
 %% File: l3backend-basics.dtx
 \ProvidesExplFile
-  {l3backend-xetex.def}{2022-08-05}{}
+  {l3backend-xetex.def}{2022-08-23}{}
   {L3 backend support: XeTeX}
 \cs_if_exist:NTF \__kernel_dependency_version_check:nn
   {
@@ -66,27 +66,21 @@
 \cs_new_protected:Npn \__kernel_backend_scope_end:
   { \__kernel_backend_literal:n { x:grestore } }
 %% File: l3backend-color.dtx
-\cs_new_protected:Npn \__color_backend_pickup:N #1 { }
-\cs_if_exist:cT { ver@color.sty }
+\cs_new_protected:Npn \__color_backend_pickup:N #1
   {
-    \cs_set_protected:Npn \__color_backend_pickup:N #1
+    \exp_args:NV \tl_if_head_is_space:nTF \current@color
       {
-        \exp_args:NV \tl_if_head_is_space:nTF \current@color
-          {
-            \tl_set:Nx #1
-               {
-                 { named }
-                 { \exp_after:wN \use:n \current@color }
-               }
-          }
-          {
-            \exp_last_unbraced:Nx \__color_backend_pickup:w
-              { \current@color } \s__color_stop #1
-          }
+        \tl_set:Nn #1 { { gray } { 0 } }
+        \msg_warning:nnx { color } { unhandled }
+          { \current@color }
+      }
+      {
+        \exp_last_unbraced:Nx \__color_backend_pickup:w
+          { \current@color } \s__color_stop #1
       }
-    \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
-      { \tl_set:Nn #3 { {#1} {#2} } }
   }
+\cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3
+  { \tl_set:Nn #3 { {#1} {#2} } }
 \cs_new_protected:Npn \__color_backend_select:n #1
   { \__kernel_backend_literal:n { pdf : bc ~ [ #1 ] } }
 \cs_new_eq:NN \__color_backend_select_cmyk:n \__color_backend_select:n