1 files changed, 60 insertions, 60 deletions

diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx
index a95aff4070..8d942551bb 100644
--- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2023-04-19}
+% \date{Released 2023-10-10}
 %
 % \maketitle
 %
@@ -91,12 +91,12 @@
 %<*dvips>
 %    \end{macrocode}
 %
-% \begin{macro}{\@@_backend_pdfmark:n, \@@_backend_pdfmark:x}
+% \begin{macro}{\@@_backend_pdfmark:n, \@@_backend_pdfmark:e}
 %   Used often enough it should be a separate function.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_pdfmark:n #1
   { \__kernel_backend_postscript:n { mark #1 ~ pdfmark } }
-\cs_generate_variant:Nn \@@_backend_pdfmark:n { x }
+\cs_generate_variant:Nn \@@_backend_pdfmark:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -138,7 +138,7 @@
 %
 % \begin{macro}
 %   {
-%     \@@_backend_object_write:nnn, \@@_backend_object_write:nnx,
+%     \@@_backend_object_write:nnn, \@@_backend_object_write:nne,
 %     \@@_backend_object_write_aux:nnn
 %   }
 % \begin{macro}
@@ -159,10 +159,10 @@
       { \@@_backend_object_ref:n {#1} }
       {#2} {#3}
   }
-\cs_generate_variant:Nn \@@_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \@@_backend_object_write:nnn { nne }
 \cs_new_protected:Npn \@@_backend_object_write_aux:nnn #1#2#3
   {
-    \@@_backend_pdfmark:x
+    \@@_backend_pdfmark:e
       {
         /_objdef ~ #1
         /type
@@ -179,17 +179,17 @@
   }
 \cs_new_protected:Npn \@@_backend_object_write_array:nn #1#2
   {
-    \@@_backend_pdfmark:x
+    \@@_backend_pdfmark:e
       { #1 ~0~ [ ~ \exp_not:n {#2} ~ ] ~ /PUTINTERVAL }
   }
 \cs_new_protected:Npn \@@_backend_object_write_dict:nn #1#2
   {
-    \@@_backend_pdfmark:x
+    \@@_backend_pdfmark:e
       { #1 << \exp_not:n {#2} >> /PUT }
   }
 \cs_new_protected:Npn \@@_backend_object_write_fstream:nn #1#2
   {
-    \exp_args:Nx
+    \exp_args:Ne
       \@@_backend_object_write_fstream:nnn {#1} #2
   }
 \cs_new_protected:Npn \@@_backend_object_write_fstream:nnn #1#2#3
@@ -204,7 +204,7 @@
   }
 \cs_new_protected:Npn \@@_backend_object_write_stream:nn #1#2
   {
-    \exp_args:Nx
+    \exp_args:Ne
       \@@_backend_object_write_stream:nnn {#1} #2
   }
 \cs_new_protected:Npn \@@_backend_object_write_stream:nnn #1#2#3
@@ -220,7 +220,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_object_now:nn, \@@_backend_object_now:nx}
+% \begin{macro}{\@@_backend_object_now:nn, \@@_backend_object_now:ne}
 %   No anonymous objects, so things are done manually.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_object_now:nn #1#2
@@ -230,7 +230,7 @@
       { { pdf.obj \int_use:N \g_@@_backend_object_int } }
       {#1} {#2}
   }
-\cs_generate_variant:Nn \@@_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \@@_backend_object_now:nn { ne }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -304,7 +304,7 @@
       }
     \int_gincr:N \g_@@_backend_object_int
     \int_gset_eq:NN \g_@@_backend_annotation_int \g_@@_backend_object_int
-    \@@_backend_pdfmark:x
+    \@@_backend_pdfmark:e
       {
         /_objdef { pdf.obj \int_use:N \g_@@_backend_object_int }
         pdf.rect
@@ -468,7 +468,7 @@
     \hbox_set_end:
     \@@_backend_link_minima:
     \hbox_set:Nn \l_@@_backend_model_box { Gg }
-    \exp_args:Nx \@@_backend_link_outerbox:n
+    \exp_args:Ne \@@_backend_link_outerbox:n
       {
          \int_if_odd:nTF { \value { page } }
            { \oddsidemargin }
@@ -486,7 +486,7 @@
       }
     \int_gincr:N \g_@@_backend_object_int
     \int_gset_eq:NN \g_@@_backend_link_int \g_@@_backend_object_int
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         mark
         /_objdef { pdf.obj \int_use:N \g_@@_backend_link_int }
@@ -500,7 +500,7 @@
 \cs_new_protected:Npn \@@_backend_link_minima:
   {
     \hbox_set:Nn \l_@@_backend_model_box { Gg }
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         /pdf.linkdp.pad ~
           \dim_to_decimal:n
@@ -528,7 +528,7 @@
   }
 \cs_new_protected:Npn \@@_backend_link_outerbox:n #1
   {
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         /pdf.outerbox
           [
@@ -583,9 +583,9 @@
       {
         \tl_put_right:Nn \@makecol@hook
           {
-            \box_if_empty:NF \@cclv
+            \box_if_empty:NF \l_shipout_box
               {
-                \vbox_set:Nn \@cclv
+                \vbox_set:Nn \l_shipout_box
                   {
                     \__kernel_backend_postscript:n
                       {
@@ -593,7 +593,7 @@
                           { pdf.bordertracking.continue }
                         if
                       }
-                    \vbox_unpack_drop:N \@cclv
+                    \vbox_unpack_drop:N \l_shipout_box
                     \__kernel_backend_postscript:n
                       { pdf.bordertracking.endpage }
                   }
@@ -620,7 +620,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_link_margin:n #1
   {
-    \__kernel_backend_postscript:x
+    \__kernel_backend_postscript:e
       {
         /pdf.linkmargin { \dim_to_decimal:n {#1} ~ pdf.pt.dvi } def
       }
@@ -638,7 +638,7 @@
 \cs_new_protected:Npn \@@_backend_destination:nn #1#2
   {
     \__kernel_backend_postscript:n { pdf.dest.anchor }
-    \@@_backend_pdfmark:x
+    \@@_backend_pdfmark:e
       {
         /View
         [
@@ -737,11 +737,11 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_version_major_gset:n #1
   {
-    \cs_gset:Npx \@@_backend_version_major: { \int_eval:n {#1} }
+    \cs_gset:Npe \@@_backend_version_major: { \int_eval:n {#1} }
   }
 \cs_new_protected:Npn \@@_backend_version_minor_gset:n #1
   {
-    \cs_gset:Npx \@@_backend_version_minor: { \int_eval:n {#1} }
+    \cs_gset:Npe \@@_backend_version_minor: { \int_eval:n {#1} }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -805,7 +805,7 @@
 %   space in the \LuaTeX{} version is \emph{required} as it is consumed in
 %   finding the end of the keyword.
 %    \begin{macrocode}
-\cs_new:Npx \@@_backend_annotation_last:
+\cs_new:Npe \@@_backend_annotation_last:
   {
     \exp_not:N \int_value:w
 %<*luatex>
@@ -857,7 +857,7 @@
 % \begin{macro}{\@@_backend_link_last:}
 %   Formatted for direct use.
 %    \begin{macrocode}
-\cs_new:Npx \@@_backend_link_last:
+\cs_new:Npe \@@_backend_link_last:
   {
     \exp_not:N \int_value:w
 %<*luatex>
@@ -1000,7 +1000,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_object_write:nnn, \@@_backend_object_write:nnx}
+% \begin{macro}{\@@_backend_object_write:nnn, \@@_backend_object_write:nne}
 % \begin{macro}[EXP]{\@@_backend_object_write:nn}
 % \begin{macro}[EXP]{\@@_exp_not_i:nn, \@@_exp_not_ii:nn}
 %   Writing the data needs a little information about the structure of the
@@ -1037,7 +1037,7 @@
             }
         }
   }
-\cs_generate_variant:Nn \@@_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \@@_backend_object_write:nnn { nne }
 \cs_new:Npn \@@_exp_not_i:nn #1#2 { \exp_not:n {#1} }
 \cs_new:Npn \@@_exp_not_ii:nn #1#2 { \exp_not:n {#2} }
 %    \end{macrocode}
@@ -1045,7 +1045,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_object_now:nn, \@@_backend_object_now:nx}
+% \begin{macro}{\@@_backend_object_now:nn, \@@_backend_object_now:ne}
 %   Much like writing, but direct creation.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_object_now:nn #1#2
@@ -1058,14 +1058,14 @@
 %</pdftex>
       \@@_backend_object_write:nn {#1} {#2}
   }
-\cs_generate_variant:Nn \@@_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \@@_backend_object_now:nn { ne }
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}[EXP]{\@@_backend_object_last:}
 %   Much like annotation.
 %    \begin{macrocode}
-\cs_new:Npx \@@_backend_object_last:
+\cs_new:Npe \@@_backend_object_last:
   {
     \exp_not:N \int_value:w
 %<*luatex>
@@ -1082,7 +1082,7 @@
 % \begin{macro}[EXP]{\@@_backend_pageobject_ref:n}
 %   The usual wrapper situation; the three spaces here are essential.
 %    \begin{macrocode}
-\cs_new:Npx \@@_backend_pageobject_ref:n #1
+\cs_new:Npe \@@_backend_pageobject_ref:n #1
   {
     \exp_not:N \int_value:w
 %<*luatex>
@@ -1141,7 +1141,7 @@
 %   The availability of the primitive is not universal, so we have to test
 %   at load time.
 %    \begin{macrocode}
-\cs_new_protected:Npx \@@_backend_version_major_gset:n #1
+\cs_new_protected:Npe \@@_backend_version_major_gset:n #1
   {
 %<*luatex>
     \int_compare:nNnT \tex_luatexversion:D > { 106 }
@@ -1175,7 +1175,7 @@
 % \begin{macro}[EXP]{\@@_backend_version_major:, \@@_backend_version_minor:}
 %   As above.
 %    \begin{macrocode}
-\cs_new:Npx \@@_backend_version_major:
+\cs_new:Npe \@@_backend_version_major:
   {
 %<*luatex>
     \int_compare:nNnTF \tex_luatexversion:D > { 106 }
@@ -1226,12 +1226,12 @@
 %<*dvipdfmx|xetex>
 %    \end{macrocode}
 %
-% \begin{macro}{\@@_backend:n, \@@_backend:x}
+% \begin{macro}{\@@_backend:n, \@@_backend:e}
 %   A generic function for the backend PDF specials: used where we can.
 %    \begin{macrocode}
-\cs_new_protected:Npx \@@_backend:n #1
+\cs_new_protected:Npe \@@_backend:n #1
   { \__kernel_backend_literal:n { pdf: #1 } }
-\cs_generate_variant:Nn \@@_backend:n { x }
+\cs_generate_variant:Nn \@@_backend:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1274,7 +1274,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_object_write:nnn, \@@_backend_object_write:nnx}
+% \begin{macro}{\@@_backend_object_write:nnn, \@@_backend_object_write:nne}
 % \begin{macro}
 %   {
 %     \@@_backend_object_write_array:nn   ,
@@ -1290,15 +1290,15 @@
     \use:c { @@_backend_object_write_ #2 :nn }
       { \@@_backend_object_ref:n {#1} } {#3}
   }
-\cs_generate_variant:Nn \@@_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \@@_backend_object_write:nnn { nne }
 \cs_new_protected:Npn \@@_backend_object_write_array:nn #1#2
   {
-    \@@_backend:x
+    \@@_backend:e
       { obj ~ #1 ~ [ ~ \exp_not:n {#2} ~ ] }
   }
 \cs_new_protected:Npn \@@_backend_object_write_dict:nn #1#2
   {
-    \@@_backend:x
+    \@@_backend:e
       { obj ~ #1 ~ << ~ \exp_not:n {#2} ~ >> }
   }
 \cs_new_protected:Npn \@@_backend_object_write_fstream:nn #1#2
@@ -1307,7 +1307,7 @@
   { \@@_backend_object_write_stream:nnnn { } {#1} #2 }
 \cs_new_protected:Npn \@@_backend_object_write_stream:nnnn #1#2#3#4
   {
-    \@@_backend:x
+    \@@_backend:e
       {
         #1 stream ~ #2 ~
           ( \exp_not:n {#4} ) ~ << \exp_not:n {#3} >>
@@ -1318,18 +1318,18 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_object_now:nn, \@@_backend_object_now:nx}
+% \begin{macro}{\@@_backend_object_now:nn, \@@_backend_object_now:ne}
 %   No anonymous objects with \texttt{dvipdfmx} so we have to give an
 %   object name.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_object_now:nn #1#2
   {
     \int_gincr:N \g_@@_backend_object_int
-    \exp_args:Nnx \use:c { @@_backend_object_write_ #1 :nn }
+    \exp_args:Nne \use:c { @@_backend_object_write_ #1 :nn }
       { @pdf.obj \int_use:N \g_@@_backend_object_int }
       {#2}
   }
-\cs_generate_variant:Nn \@@_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \@@_backend_object_now:nn { ne }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1364,7 +1364,7 @@
   {
     \int_gincr:N \g_@@_backend_object_int
     \int_gset_eq:NN \g_@@_backend_annotation_int \g_@@_backend_object_int
-    \@@_backend:x
+    \@@_backend:e
       {
         ann ~ @pdf.obj \int_use:N \g_@@_backend_object_int \c_space_tl
         width  ~ \dim_eval:n {#1} ~
@@ -1400,10 +1400,10 @@
   { \@@_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } }
 \cs_new_protected:Npn \@@_backend_link_begin_user:nnw #1#2
   { \@@_backend_link_begin:n {#1#2} }
-\cs_new_protected:Npx \@@_backend_link_begin:n #1
+\cs_new_protected:Npe \@@_backend_link_begin:n #1
   {
     \exp_not:N \int_gincr:N \exp_not:N  \g_@@_backend_link_int
-    \@@_backend:x
+    \@@_backend:e
       {
          bann ~
          @pdf.lnk
@@ -1435,7 +1435,7 @@
 %   Pass to \texttt{dvipdfmx}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_link_margin:n #1
-  { \__kernel_backend_literal:x { dvipdfmx:config~g~ \dim_eval:n {#1} } }
+  { \__kernel_backend_literal:e { dvipdfmx:config~g~ \dim_eval:n {#1} } }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1449,7 +1449,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_destination:nn #1#2
   {
-    \@@_backend:x
+    \@@_backend:e
       {
         dest ~ ( \exp_not:n {#1} )
         [
@@ -1518,7 +1518,7 @@
 %   Pass data to the backend: these are a one-shot.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_compresslevel:n #1
-  { \__kernel_backend_literal:x { dvipdfmx:config~z~ \int_eval:n {#1} } }
+  { \__kernel_backend_literal:e { dvipdfmx:config~z~ \int_eval:n {#1} } }
 \cs_new_protected:Npn \@@_backend_compress_objects:n #1
   {
     \bool_if:nF {#1}
@@ -1534,13 +1534,13 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_version_major_gset:n #1
   {
-    \cs_gset:Npx \@@_backend_version_major: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:majorversion~ \@@_backend_version_major: }
+    \cs_gset:Npe \@@_backend_version_major: { \int_eval:n {#1} }
+    \__kernel_backend_literal:e { pdf:majorversion~ \@@_backend_version_major: }
   }
 \cs_new_protected:Npn \@@_backend_version_minor_gset:n #1
   {
-    \cs_gset:Npx \@@_backend_version_minor: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:minorversion~ \@@_backend_version_minor: }
+    \cs_gset:Npe \@@_backend_version_minor: { \int_eval:n {#1} }
+    \__kernel_backend_literal:e { pdf:minorversion~ \@@_backend_version_minor: }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1608,7 +1608,7 @@
 %
 % \begin{macro}{\@@_backend_link_last:}
 %    \begin{macrocode}
-\cs_new:Npx \@@_backend_link_last: { }
+\cs_new:Npe \@@_backend_link_last: { }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1642,8 +1642,8 @@
 %
 % \begin{macro}{\@@_backend_object_new:n}
 % \begin{macro}[EXP]{\@@_backend_object_ref:n}
-% \begin{macro}{\@@_backend_object_write:nnn, \@@_backend_object_write:nx}
-% \begin{macro}{\@@_backend_object_now:nn, , \@@_backend_object_now:nx}
+% \begin{macro}{\@@_backend_object_write:nnn, \@@_backend_object_write:ne}
+% \begin{macro}{\@@_backend_object_now:nn, , \@@_backend_object_now:ne}
 % \begin{macro}{\@@_backend_object_last:}
 % \begin{macro}[EXP]{\@@_backend_pageobject_ref:n}
 %   All no-ops here.
@@ -1651,9 +1651,9 @@
 \cs_new_protected:Npn \@@_backend_object_new:nn #1 { }
 \cs_new:Npn \@@_backend_object_ref:n #1 { }
 \cs_new_protected:Npn \@@_backend_object_write:nnn #1#2#3 { }
-\cs_new_protected:Npn \@@_backend_object_write:nnx #1#2#3 { }
+\cs_new_protected:Npn \@@_backend_object_write:nne #1#2#3 { }
 \cs_new_protected:Npn \@@_backend_object_now:nn #1#2 { }
-\cs_new_protected:Npn \@@_backend_object_now:nx #1#2 { }
+\cs_new_protected:Npn \@@_backend_object_now:ne #1#2 { }
 \cs_new:Npn \@@_backend_object_last: { }
 \cs_new:Npn \@@_backend_pageobject_ref:n #1 { }
 %    \end{macrocode}