Update l3backend and l3kernel to 2022-08-23

latex3 · Aug 23, 2022 · 0ef3f9e · 0ef3f9e
1 parent 42bb123
commit 0ef3f9e
Show file tree

Hide file tree

Showing 16 changed files with 234 additions and 181 deletions.
diff --git a/base/testfiles-ltmarks/xmarks-001.tlg b/base/testfiles-ltmarks/xmarks-001.tlg
@@ -156,7 +156,7 @@ marks does not exist.
 !second foo!
 ! Use of \??? doesn't match its definition.
 <argument> \???  
-                 ! LaTeX3 Error: Erroneous variable \g__mark_mistake_top_foo...
+                 ! LaTeX Error: Erroneous variable \g__mark_mistake_top_foo_...
 l. ...\TopMark[mistake]{foo}
 If you say, e.g., `\def\a1{...}', then you must always
 put `1' after `\a', since control sequence names are

diff --git a/base/testfiles-ltmarks/xmarks-004.tlg b/base/testfiles-ltmarks/xmarks-004.tlg
@@ -146,7 +146,7 @@ Marks: baz in OR (twoside-even first column):
     column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}|
 ! Use of \??? doesn't match its definition.
 <argument> \???  
-                 ! LaTeX3 Error: Erroneous variable \g__mark_page_top_foobar...
+                 ! LaTeX Error: Erroneous variable \g__mark_page_top_foobar_...
 l. ...\TopMark{foobar}
                         % does not exist
 If you say, e.g., `\def\a1{...}', then you must always
@@ -155,7 +155,7 @@ made up of letters only. The macro here has not been
 followed by the required stuff, so I'm ignoring it.
 ! Use of \??? doesn't match its definition.
 <argument> \???  
-                 ! LaTeX3 Error: Erroneous variable \g__mark_page_first_foob...
+                 ! LaTeX Error: Erroneous variable \g__mark_page_first_fooba...
 l. ...\FirstMark{foobar}
                           % does not exist
 If you say, e.g., `\def\a1{...}', then you must always

diff --git a/base/testfiles/github-0710.tlg b/base/testfiles/github-0710.tlg
@@ -7,15 +7,15 @@ Author: Joseph Wright
 \mypkgtest ...my@A :\my@B :\my@C :\my@D }\show \x 
                                                   \endgroup 
 l. ...\mypkgtest
-LaTeX3 Warning: Package "mypkg" has already been loaded: ignoring load-time
-(LaTeX3)        option "load-option-A".
+LaTeX Warning: Package "mypkg" has already been loaded: ignoring load-time
+(LaTeX)        option "load-option-A".
 > \x=macro:
 ->111:::.
 \mypkgtest ...my@A :\my@B :\my@C :\my@D }\show \x 
                                                   \endgroup 
 l. ...\mypkgtest
-LaTeX3 Warning: Package "mypkg" has already been loaded: ignoring load-time
-(LaTeX3)        option "load-option-A".
+LaTeX Warning: Package "mypkg" has already been loaded: ignoring load-time
+(LaTeX)        option "load-option-A".
 > \x=macro:
 ->111::333:.
 \mypkgtest ...my@A :\my@B :\my@C :\my@D }\show \x 
@@ -26,15 +26,15 @@ l. ...\mypkgtest
 \mypkgtest ...my@A :\my@B :\my@C :\my@D }\show \x 
                                                   \endgroup 
 l. ...\mypkgtest
-LaTeX3 Warning: Package "mypkg" has already been loaded: ignoring load-time
-(LaTeX3)        option "load-option-B".
+LaTeX Warning: Package "mypkg" has already been loaded: ignoring load-time
+(LaTeX)        option "load-option-B".
 > \x=macro:
 ->111::333:.
 \mypkgtest ...my@A :\my@B :\my@C :\my@D }\show \x 
                                                   \endgroup 
 l. ...\mypkgtest
-! LaTeX3 Error: Key "load-option-A" may only be used during loading of package
-(LaTeX3)        "mypkg".
+! LaTeX Error: Key "load-option-A" may only be used during loading of package
+(LaTeX)        "mypkg".
 For immediate help type H <return>.
  ...                                              
 l. ...\SetKeys[mypkg]{load-option-A = 666}
@@ -56,7 +56,7 @@ l. ...\mypkgtest
 \mypkgtest ...my@A :\my@B :\my@C :\my@D }\show \x 
                                                   \endgroup 
 l. ...\mypkgtest
-! LaTeX3 Error: Key "preamble-option-D" may only be used in the preamble.
+! LaTeX Error: Key "preamble-option-D" may only be used in the preamble.
 For immediate help type H <return>.
  ...                                              
 l. ...  preamble-option-D = 999}

diff --git a/base/testfiles/github-0735.tlg b/base/testfiles/github-0735.tlg
@@ -44,7 +44,7 @@ TEST 3:  Unknown variant
 ============================================================
 ! Use of \??? doesn't match its definition.
 <argument> \???  
-                 ! LaTeX3 Error: Unknown arg expansion "XX"
+                 ! LaTeX Error: Unknown arg expansion "XX"
 l. ...  }
 If you say, e.g., `\def\a1{...}', then you must always
 put `1' after `\a', since control sequence names are

diff --git a/base/testfiles/github-0892.tlg b/base/testfiles/github-0892.tlg
@@ -28,7 +28,7 @@ Package: l3keys2e-package ....-..-.. v... test
 You gave `check' for option1 (again)
 You gave `more stuff' for option2
 You gave `extra stuff' for option4
-! LaTeX3 Error: Unknown option 'option5' for package l3keys2e-package.
+! LaTeX Error: Unknown option 'option5' for package l3keys2e-package.
 For immediate help type H <return>.
  ...                                              
 l. ...^^M

diff --git a/base/testfiles/m3expl009.tlg b/base/testfiles/m3expl009.tlg
@@ -3,12 +3,12 @@ Don't change this file in any respect.
 \cnta=\count...
 (../expl3.sty
 Package: expl3 ....-..-.. L3 programming layer (loader) 
-! LaTeX3 Error: Mismatched LaTeX support files detected.
-(LaTeX3)        Loading 'expl3.sty' aborted!
-(LaTeX3)        
-(LaTeX3)        The L3 programming layer in the LaTeX format
-(LaTeX3)        is dated ....-..-.., but in your TeX tree the files require
-(LaTeX3)        at least ....-..-...
+! LaTeX Error: Mismatched LaTeX support files detected.
+(LaTeX)        Loading 'expl3.sty' aborted!
+(LaTeX)        
+(LaTeX)        The L3 programming layer in the LaTeX format
+(LaTeX)        is dated ....-..-.., but in your TeX tree the files require
+(LaTeX)        at least ....-..-...
 For immediate help type H <return>.
  ...                                              
 l. ...     \ExplLoaderFileDate{expl3.sty}}
@@ -24,8 +24,8 @@ later errors. Please ensure that your LaTeX format is correctly regenerated.
 Package: expl3 ....-..-.. L3 programming layer (loader) 
 ) (../expl3.sty
 Package: expl3 ....-..-.. L3 programming layer (loader) 
-! LaTeX3 Error: Mismatched LaTeX support files detected.
-(LaTeX3)        Loading 'expl3.sty' aborted!
+! LaTeX Error: Mismatched LaTeX support files detected.
+(LaTeX)        Loading 'expl3.sty' aborted!
 For immediate help type H <return>.
  ...                                              
 l. ...     \ExplLoaderFileDate{expl3.sty}}

diff --git a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def b/texmf/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/texmf/tex/latex/l3backend/l3backend-dvips.def b/texmf/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/texmf/tex/latex/l3backend/l3backend-dvisvgm.def b/texmf/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/texmf/tex/latex/l3backend/l3backend-luatex.def b/texmf/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/texmf/tex/latex/l3backend/l3backend-pdftex.def b/texmf/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 }
               }
           }
       }