[latex3-commits] [latex3/latex3] main: Switch from x- to e-type in l3backend (d1cc4f486)

github at latex-project.org github at latex-project.org
Tue Oct 10 12:59:28 CEST 2023


Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/d1cc4f486eca053092ba6bd9de7f1854107f6501

>---------------------------------------------------------------

commit d1cc4f486eca053092ba6bd9de7f1854107f6501
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Sep 26 06:57:34 2023 +0100

    Switch from x- to e-type in l3backend
    
    Technically all internal but cut across files, etc.


>---------------------------------------------------------------

d1cc4f486eca053092ba6bd9de7f1854107f6501
 l3backend/l3backend-basics.dtx          | 36 ++++++++++++++++-----------------
 l3backend/l3backend-box.dtx             | 28 ++++++++++++-------------
 l3backend/l3backend-color.dtx           |  8 ++++----
 l3backend/l3backend-draw.dtx            | 10 ++++-----
 l3backend/l3backend-graphics.dtx        | 12 +++++------
 l3backend/l3backend-opacity.dtx         |  2 +-
 l3backend/l3backend-pdf.dtx             | 16 +++++++--------
 l3kernel/l3kernel-functions.dtx         | 12 +++++------
 l3kernel/testfiles/m3expl001.luatex.tlg |  5 ++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |  5 ++---
 l3kernel/testfiles/m3expl001.tlg        |  5 ++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |  5 ++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |  3 +--
 l3kernel/testfiles/m3expl003.luatex.tlg |  5 ++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |  5 ++---
 l3kernel/testfiles/m3expl003.tlg        |  5 ++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |  5 ++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |  3 +--
 18 files changed, 79 insertions(+), 91 deletions(-)

diff --git a/l3backend/l3backend-basics.dtx b/l3backend/l3backend-basics.dtx
index cf4ad444b..089793b7f 100644
--- a/l3backend/l3backend-basics.dtx
+++ b/l3backend/l3backend-basics.dtx
@@ -137,8 +137,7 @@
 % \begin{macro}
 %   {
 %     \__kernel_backend_literal:e,
-%     \__kernel_backend_literal:n,
-%     \__kernel_backend_literal:x
+%     \__kernel_backend_literal:n
 %   }
 %  The one shared function for all backends is access to the basic
 %  \tn{special} primitive: it has slightly odd expansion behaviour
@@ -147,7 +146,6 @@
 \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D
 \cs_new_protected:Npn \__kernel_backend_literal:n #1
   { \__kernel_backend_literal:e { \exp_not:n {#1} } }
-\cs_generate_variant:Nn \__kernel_backend_literal:n { x }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -175,7 +173,7 @@
 %    \end{macrocode}
 %
 % \begin{macro}
-%   {\__kernel_backend_literal_postscript:n, \__kernel_backend_literal_postscript:x}
+%   {\__kernel_backend_literal_postscript:n, \__kernel_backend_literal_postscript:e}
 %   Literal PostScript can be included using a few low-level formats. Here,
 %   we use the form with no positioning: this is overall more convenient as
 %   a wrapper. Note that this does require that where position is important,
@@ -183,18 +181,18 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \__kernel_backend_literal_postscript:n #1
   { \__kernel_backend_literal:n { ps:: #1 } }
-\cs_generate_variant:Nn \__kernel_backend_literal_postscript:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_postscript:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\__kernel_backend_postscript:n, \__kernel_backend_postscript:x}
+% \begin{macro}{\__kernel_backend_postscript:n, \__kernel_backend_postscript:e}
 %   PostScript data that does have positioning, and also applying
 %   a shift to |SDict| (which is not done automatically by
 %   |ps:| or |ps::|, in contrast to |!| or |"|).
 %    \begin{macrocode}
 \cs_new_protected:Npn \__kernel_backend_postscript:n #1
   { \__kernel_backend_literal:n { ps: SDict ~ begin ~ #1 ~ end } }
-\cs_generate_variant:Nn \__kernel_backend_postscript:n { x }
+\cs_generate_variant:Nn \__kernel_backend_postscript:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -265,7 +263,7 @@
 % to have more code in Lua means we create two independent files using
 % shared DocStrip code.
 %
-% \begin{macro}{\__kernel_backend_literal_pdf:n, \__kernel_backend_literal_pdf:x}
+% \begin{macro}{\__kernel_backend_literal_pdf:n, \__kernel_backend_literal_pdf:e}
 %   This is equivalent to \verb|\special{pdf:}| but the engine can
 %   track it. Without the \texttt{direct} keyword everything is kept in
 %   sync: the transformation matrix is set to the current point automatically.
@@ -282,7 +280,7 @@
 %</pdftex>
       { \exp_not:n {#1} }
   }
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -327,7 +325,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\__kernel_backend_matrix:n, \__kernel_backend_matrix:x}
+% \begin{macro}{\__kernel_backend_matrix:n, \__kernel_backend_matrix:e}
 %   Here the appropriate function is set up to insert an affine matrix
 %   into the PDF. With \pdfTeX{} and \LuaTeX{} in direct PDF output mode there
 %   is a primitive for this, which only needs the rotation/scaling/skew part.
@@ -342,7 +340,7 @@
 %</pdftex>
         { \exp_not:n {#1} }
   }
-\cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
+\cs_generate_variant:Nn \__kernel_backend_matrix:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -362,14 +360,14 @@
 % for both backends, with some \texttt{clean up} for \XeTeX{} as
 % required.
 %
-% \begin{macro}{\__kernel_backend_literal_pdf:n, \__kernel_backend_literal_pdf:x}
+% \begin{macro}{\__kernel_backend_literal_pdf:n, \__kernel_backend_literal_pdf:e}
 %   Undocumented but equivalent to \pdfTeX{}'s |literal| keyword. It's similar to
 %   be not the same as the documented |contents| keyword as that adds a |q|/|Q|
 %   pair.
 %    \begin{macrocode}
 \cs_new_protected:Npn \__kernel_backend_literal_pdf:n #1
   { \__kernel_backend_literal:n { pdf:literal~ #1 } }
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -404,7 +402,7 @@
 %<*dvisvgm>
 %    \end{macrocode}
 %
-% \begin{macro}{\__kernel_backend_literal_svg:n, \__kernel_backend_literal_svg:x}
+% \begin{macro}{\__kernel_backend_literal_svg:n, \__kernel_backend_literal_svg:e}
 %   Unlike the other backends, the requirements for making SVG files mean
 %   that we can't conveniently transform all operations to the current point.
 %   That makes life a bit more tricky later as that needs to be accounted for.
@@ -413,7 +411,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \__kernel_backend_literal_svg:n #1
   { \__kernel_backend_literal:n { dvisvgm:raw~ #1 { ?nl } } }
-\cs_generate_variant:Nn \__kernel_backend_literal_svg:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_svg:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -427,8 +425,8 @@
 % \end{variable}
 %
 % \begin{macro}{\__kernel_backend_scope_begin:, \__kernel_backend_scope_end:}
-% \begin{macro}{\__kernel_backend_scope_begin:n, \__kernel_backend_scope_begin:x}
-% \begin{macro}{\__kernel_backend_scope:n, \__kernel_backend_scope:x}
+% \begin{macro}{\__kernel_backend_scope_begin:n, \__kernel_backend_scope_begin:e}
+% \begin{macro}{\__kernel_backend_scope:n, \__kernel_backend_scope:e}
 %   In SVG, the need to attach concepts to a scope means we need to be sure we
 %   will close all of the open scopes. That is easiest done if we only need
 %   an outer \enquote{wrapper} \texttt{begin}/\texttt{end} pair, and within
@@ -464,13 +462,13 @@
     \group_begin:
       \int_gset:Nn \g__kernel_backend_scope_int { 1 }
   }
-\cs_generate_variant:Nn \__kernel_backend_scope_begin:n { x }
+\cs_generate_variant:Nn \__kernel_backend_scope_begin:n { e }
 \cs_new_protected:Npn \__kernel_backend_scope:n #1
   {
     \__kernel_backend_literal_svg:n { <g ~ #1 > }
     \int_gincr:N \g__kernel_backend_scope_int
   }
-\cs_generate_variant:Nn \__kernel_backend_scope:n { x }
+\cs_generate_variant:Nn \__kernel_backend_scope:n { e }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3backend/l3backend-box.dtx b/l3backend/l3backend-box.dtx
index 6d8d4ede0..6045dbbe4 100644
--- a/l3backend/l3backend-box.dtx
+++ b/l3backend/l3backend-box.dtx
@@ -82,7 +82,7 @@
     \__kernel_backend_literal_postscript:n
       { Resolution~72~div~VResolution~72~div~scale }
     \__kernel_backend_literal_postscript:n { DVImag~dup~scale }
-    \__kernel_backend_literal_postscript:x
+    \__kernel_backend_literal_postscript:e
       {
         0 ~
         \dim_to_decimal_in_bp:n { \box_dp:N #1 } ~
@@ -111,7 +111,7 @@
   {
     \__kernel_backend_scope_begin:
     \__kernel_backend_align_begin:
-    \__kernel_backend_literal_postscript:x
+    \__kernel_backend_literal_postscript:e
       {
         \fp_compare:nNnTF {#2} = \c_zero_fp
           { 0 }
@@ -134,7 +134,7 @@
   {
     \__kernel_backend_scope_begin:
     \__kernel_backend_align_begin:
-    \__kernel_backend_literal_postscript:x
+    \__kernel_backend_literal_postscript:e
       {
         \fp_eval:n { round ( #2 , 5 ) } ~
         \fp_eval:n { round ( #3 , 5 ) } ~
@@ -169,7 +169,7 @@
 \cs_new_protected:Npn \@@_backend_clip:N #1
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal_pdf:x
+    \__kernel_backend_literal_pdf:e
       {
         0~
         \dim_to_decimal_in_bp:n { -\box_dp:N #1 } ~
@@ -204,7 +204,7 @@
     \fp_compare:nNnT \l_@@_backend_cos_fp = \c_zero_fp
       { \fp_zero:N \l_@@_backend_cos_fp }
     \fp_set:Nn \l_@@_backend_sin_fp { round ( sind ( #2 ) , 5 ) }
-    \__kernel_backend_matrix:x
+    \__kernel_backend_matrix:e
       {
         \fp_use:N \l_@@_backend_cos_fp \c_space_tl
         \fp_compare:nNnTF \l_@@_backend_sin_fp = \c_zero_fp
@@ -234,7 +234,7 @@
 \cs_new_protected:Npn \@@_backend_scale:Nnn #1#2#3
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_matrix:x
+    \__kernel_backend_matrix:e
       {
         \fp_eval:n { round ( #2 , 5 ) } ~
         0~0~
@@ -263,7 +263,7 @@
 \cs_new_protected:Npn \@@_backend_clip:N #1
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal_pdf:x
+    \__kernel_backend_literal_pdf:e
       {
         0~
         \dim_to_decimal_in_bp:n { -\box_dp:N #1 } ~
@@ -293,7 +293,7 @@
 \cs_new_protected:Npn \@@_backend_rotate_aux:Nn #1#2
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:rotate~
         \fp_compare:nNnTF {#2} = \c_zero_fp
@@ -314,7 +314,7 @@
 \cs_new_protected:Npn \@@_backend_scale:Nnn #1#2#3
   {
     \__kernel_backend_scope_begin:
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         x:scale~
         \fp_eval:n { round ( #2 , 5 ) } ~
@@ -350,9 +350,9 @@
 \cs_new_protected:Npn \@@_backend_clip:N #1
   {
     \int_gincr:N \g__kernel_clip_path_int
-    \__kernel_backend_literal_svg:x
+    \__kernel_backend_literal_svg:e
       { < clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " > }
-    \__kernel_backend_literal_svg:x
+    \__kernel_backend_literal_svg:e
       {
         <
           path ~ d =
@@ -387,7 +387,7 @@
             scale ( 1 , -1 )
           "
       }
-    \__kernel_backend_scope:x
+    \__kernel_backend_scope:e
       {
         clip-path =
           "url ( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int ) "
@@ -416,7 +416,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_rotate:Nn #1#2
   {
-    \__kernel_backend_scope_begin:x
+    \__kernel_backend_scope_begin:e
       {
         transform =
           "
@@ -437,7 +437,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_scale:Nnn #1#2#3
   {
-    \__kernel_backend_scope_begin:x
+    \__kernel_backend_scope_begin:e
       {
         transform =
           "
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 7d55e8d0c..f1add034e 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -678,7 +678,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_select_iccbased:nn #1#2
   {
-    \__kernel_backend_literal_svg:x
+    \__kernel_backend_literal_svg:e
       {
         <style>
           @color-profile ~
@@ -712,7 +712,7 @@
 %    \begin{macrocode}
 %<*dvipdfmx|xetex>
 \cs_new_protected:Npn \@@_backend_select_separation:nn #1#2
-  { \__kernel_backend_literal:x { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } }
+  { \__kernel_backend_literal:e { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } }
 %</dvipdfmx|xetex>
 %<*luatex|pdftex>
 \cs_new_protected:Npn \@@_backend_select_separation:nn #1#2
@@ -965,12 +965,12 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_fill_separation:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       { pdf : bc ~ fill ~ \pdf_object_ref:n {#1} ~ [ #2 ] }
   }
 \cs_new_protected:Npn \@@_backend_stroke_separation:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       { pdf : bc ~ stroke ~ \pdf_object_ref:n {#1} ~ [ #2 ] }
   }
 \cs_new_eq:NN \@@_backend_fill_devicen:nn \@@_backend_fill_separation:nn
diff --git a/l3backend/l3backend-draw.dtx b/l3backend/l3backend-draw.dtx
index 36844e7cd..0d8b4b94b 100644
--- a/l3backend/l3backend-draw.dtx
+++ b/l3backend/l3backend-draw.dtx
@@ -897,7 +897,7 @@
                 #1
             />
           }
-        \__kernel_backend_scope:x
+        \__kernel_backend_scope:e
           {
             clip-path =
               "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
@@ -937,7 +937,7 @@
             <path~d=" \g_@@_backend_path_tl "/> { ?nl }
             < /clipPath >
           }
-        \__kernel_backend_scope:x
+        \__kernel_backend_scope:e
           {
             clip-path =
               "url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
@@ -979,7 +979,7 @@
   { , \dim_to_decimal_in_bp:n {#1} }
 \cs_new_protected:Npn \@@_backend_dash_aux:nn #1#2
   {
-    \__kernel_backend_scope:x
+    \__kernel_backend_scope:e
       {
         stroke-dasharray =
           "
@@ -991,9 +991,9 @@
       }
   }
 \cs_new_protected:Npn \@@_backend_linewidth:n #1
-  { \__kernel_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } }
+  { \__kernel_backend_scope:e { stroke-width=" \dim_to_decimal:n {#1} " } }
 \cs_new_protected:Npn \@@_backend_miterlimit:n #1
-  { \__kernel_backend_scope:x { stroke-miterlimit=" #1 " } }
+  { \__kernel_backend_scope:e { stroke-miterlimit=" #1 " } }
 \cs_new_protected:Npn \@@_backend_cap_butt:
   { \__kernel_backend_scope:n { stroke-linecap="butt" } }
 \cs_new_protected:Npn \@@_backend_cap_round:
diff --git a/l3backend/l3backend-graphics.dtx b/l3backend/l3backend-graphics.dtx
index ae19f0265..cec6af01d 100644
--- a/l3backend/l3backend-graphics.dtx
+++ b/l3backend/l3backend-graphics.dtx
@@ -107,7 +107,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_include_eps:n #1
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         PSfile = #1 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l_@@_llx_dim \c_space_tl
@@ -445,7 +445,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_include_eps:n #1
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         PSfile = #1 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l_@@_llx_dim \c_space_tl
@@ -489,7 +489,7 @@
   {
     \int_if_exist:cTF { c_@@_ #2#1 _int }
       {
-        \__kernel_backend_literal:x
+        \__kernel_backend_literal:e
           { pdf:usexobj~@graphic \int_use:c { c_@@_ #2#1 _int } }
       }
       { \@@_backend_include_auxiii:nnn {#2} {#1} {#3} }
@@ -505,7 +505,7 @@
   {
     \int_gincr:N \g_@@_track_int
     \int_const:cn { c_@@_ #1#2 _int } { \g_@@_track_int }
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         pdf:#3~
         @graphic \int_use:c { c_@@_ #1#2 _int } ~
@@ -855,7 +855,7 @@
   { \@@_backend_include:nn { pdffile } {#1} }
 \cs_new_protected:Npn \@@_backend_include:nn #1#2
   {
-    \__kernel_backend_literal:x
+    \__kernel_backend_literal:e
       {
         #1 = #2 \c_space_tl
         llx = \dim_to_decimal_in_bp:n \l_@@_llx_dim \c_space_tl
@@ -892,7 +892,7 @@
       {
         \hbox:n
           {
-            \__kernel_backend_literal:x
+            \__kernel_backend_literal:e
               {
                 dvisvgm:img~
                 \dim_to_decimal:n { \l_@@_urx_dim } ~
diff --git a/l3backend/l3backend-opacity.dtx b/l3backend/l3backend-opacity.dtx
index 119c08ecd..98a4ec70b 100644
--- a/l3backend/l3backend-opacity.dtx
+++ b/l3backend/l3backend-opacity.dtx
@@ -274,7 +274,7 @@
 \cs_new_protected:Npn \@@_backend_stroke:n #1
   { \@@_backend:nn { {#1} } { stroke- } }
 \cs_new_protected:Npn \@@_backend:nn #1#2
-  { \__kernel_backend_scope:x { #2 opacity = " \fp_eval:n { min(max(0,#1),1) } " } }
+  { \__kernel_backend_scope:e { #2 opacity = " \fp_eval:n { min(max(0,#1),1) } " } }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3backend/l3backend-pdf.dtx b/l3backend/l3backend-pdf.dtx
index db3b8dd80..cf0c5f4ca 100644
--- a/l3backend/l3backend-pdf.dtx
+++ b/l3backend/l3backend-pdf.dtx
@@ -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
           [
@@ -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
       }
@@ -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}
 %
@@ -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}
@@ -1535,12 +1535,12 @@
 \cs_new_protected:Npn \@@_backend_version_major_gset:n #1
   {
     \cs_gset:Npe \@@_backend_version_major: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:majorversion~ \@@_backend_version_major: }
+    \__kernel_backend_literal:e { pdf:majorversion~ \@@_backend_version_major: }
   }
 \cs_new_protected:Npn \@@_backend_version_minor_gset:n #1
   {
     \cs_gset:Npe \@@_backend_version_minor: { \int_eval:n {#1} }
-    \__kernel_backend_literal:x { pdf:minorversion~ \@@_backend_version_minor: }
+    \__kernel_backend_literal:e { pdf:minorversion~ \@@_backend_version_minor: }
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/l3kernel-functions.dtx b/l3kernel/l3kernel-functions.dtx
index c2d442f18..427267735 100644
--- a/l3kernel/l3kernel-functions.dtx
+++ b/l3kernel/l3kernel-functions.dtx
@@ -545,7 +545,7 @@
 %  {
 %    \__kernel_backend_literal:n,
 %    \__kernel_backend_literal:e,
-%    \__kernel_backend_literal:x
+%    \__kernel_backend_literal:e
 %  }
 %   \begin{syntax}
 %     \cs{__kernel_backend_literal:n} \Arg{content}
@@ -558,7 +558,7 @@
 % \begin{function}
 %  {
 %    \__kernel_backend_literal_postscript:n,
-%    \__kernel_backend_literal_postscript:x
+%    \__kernel_backend_literal_postscript:e
 %  }
 %   \begin{syntax}
 %     \cs{__kernel_backend_literal_postscript:n} \Arg{PostScript}
@@ -570,7 +570,7 @@
 % \begin{function}
 %  {
 %    \__kernel_backend_literal_pdf:n,
-%    \__kernel_backend_literal_pdf:x
+%    \__kernel_backend_literal_pdf:e
 %  }
 %   \begin{syntax}
 %     \cs{__kernel_backend_literal_pdf:n} \Arg{PDF instructions}
@@ -582,7 +582,7 @@
 % \begin{function}
 %  {
 %    \__kernel_backend_literal_svg:n,
-%    \__kernel_backend_literal_svg:x
+%    \__kernel_backend_literal_svg:e
 %  }
 %   \begin{syntax}
 %     \cs{__kernel_backend_literal_svg:n} \Arg{SVG instructions}
@@ -594,7 +594,7 @@
 % \begin{function}
 %  {
 %    \__kernel_backend_postscript:n,
-%    \__kernel_backend_postscript:x
+%    \__kernel_backend_postscript:e
 %  }
 %   \begin{syntax}
 %     \cs{__kernel_backend_postscript:n} \Arg{PostScript}
@@ -626,7 +626,7 @@
 % \begin{function}
 %  {
 %    \__kernel_backend_matrix:n,
-%    \__kernel_backend_matrix:x
+%    \__kernel_backend_matrix:e
 %  }
 %   \begin{syntax}
 %     \cs{__kernel_backend_matrix:n} \Arg{matrix}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 43f91b5ae..384ed6fb0 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -19,15 +19,14 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_pdf:n on line ...
-Defining \__kernel_backend_literal_pdf:x on line ...
+Defining \__kernel_backend_literal_pdf:e on line ...
 Defining \__kernel_backend_literal_page:n on line ...
 Defining \__kernel_backend_scope_begin: on line ...
 Defining \__kernel_backend_scope_end: on line ...
 Defining \__kernel_backend_matrix:n on line ...
-Defining \__kernel_backend_matrix:x on line ...
+Defining \__kernel_backend_matrix:e on line ...
 Defining \l__color_backend_stack_int on line ...
 \l__color_backend_stack_int=\count...
 Defining \__kernel_color_backend_stack_init:Nnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 3cdf03722..abbe426df 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -19,12 +19,11 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_postscript:n on line ...
-Defining \__kernel_backend_literal_postscript:x on line ...
+Defining \__kernel_backend_literal_postscript:e on line ...
 Defining \__kernel_backend_postscript:n on line ...
-Defining \__kernel_backend_postscript:x on line ...
+Defining \__kernel_backend_postscript:e on line ...
 Defining \__kernel_backend_align_begin: on line ...
 Defining \__kernel_backend_align_end: on line ...
 Defining \__kernel_backend_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index d13717599..fdffde7a4 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -19,15 +19,14 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_pdf:n on line ...
-Defining \__kernel_backend_literal_pdf:x on line ...
+Defining \__kernel_backend_literal_pdf:e on line ...
 Defining \__kernel_backend_literal_page:n on line ...
 Defining \__kernel_backend_scope_begin: on line ...
 Defining \__kernel_backend_scope_end: on line ...
 Defining \__kernel_backend_matrix:n on line ...
-Defining \__kernel_backend_matrix:x on line ...
+Defining \__kernel_backend_matrix:e on line ...
 Defining \l__color_backend_stack_int on line ...
 \l__color_backend_stack_int=\count...
 Defining \__kernel_color_backend_stack_init:Nnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 3cdf03722..abbe426df 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -19,12 +19,11 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_postscript:n on line ...
-Defining \__kernel_backend_literal_postscript:x on line ...
+Defining \__kernel_backend_literal_postscript:e on line ...
 Defining \__kernel_backend_postscript:n on line ...
-Defining \__kernel_backend_postscript:x on line ...
+Defining \__kernel_backend_postscript:e on line ...
 Defining \__kernel_backend_align_begin: on line ...
 Defining \__kernel_backend_align_end: on line ...
 Defining \__kernel_backend_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 8c71fe9ca..4a3a70f69 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -19,10 +19,9 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_pdf:n on line ...
-Defining \__kernel_backend_literal_pdf:x on line ...
+Defining \__kernel_backend_literal_pdf:e on line ...
 Defining \__kernel_backend_literal_page:n on line ...
 Defining \__kernel_backend_scope_begin: on line ...
 Defining \__kernel_backend_scope_end: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 43f91b5ae..384ed6fb0 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -19,15 +19,14 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-luatex.def ....-..-.. L3 backend support: PDF output (LuaTeX)
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_pdf:n on line ...
-Defining \__kernel_backend_literal_pdf:x on line ...
+Defining \__kernel_backend_literal_pdf:e on line ...
 Defining \__kernel_backend_literal_page:n on line ...
 Defining \__kernel_backend_scope_begin: on line ...
 Defining \__kernel_backend_scope_end: on line ...
 Defining \__kernel_backend_matrix:n on line ...
-Defining \__kernel_backend_matrix:x on line ...
+Defining \__kernel_backend_matrix:e on line ...
 Defining \l__color_backend_stack_int on line ...
 \l__color_backend_stack_int=\count...
 Defining \__kernel_color_backend_stack_init:Nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 3cdf03722..abbe426df 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -19,12 +19,11 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_postscript:n on line ...
-Defining \__kernel_backend_literal_postscript:x on line ...
+Defining \__kernel_backend_literal_postscript:e on line ...
 Defining \__kernel_backend_postscript:n on line ...
-Defining \__kernel_backend_postscript:x on line ...
+Defining \__kernel_backend_postscript:e on line ...
 Defining \__kernel_backend_align_begin: on line ...
 Defining \__kernel_backend_align_end: on line ...
 Defining \__kernel_backend_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index d13717599..fdffde7a4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -19,15 +19,14 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX)
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_pdf:n on line ...
-Defining \__kernel_backend_literal_pdf:x on line ...
+Defining \__kernel_backend_literal_pdf:e on line ...
 Defining \__kernel_backend_literal_page:n on line ...
 Defining \__kernel_backend_scope_begin: on line ...
 Defining \__kernel_backend_scope_end: on line ...
 Defining \__kernel_backend_matrix:n on line ...
-Defining \__kernel_backend_matrix:x on line ...
+Defining \__kernel_backend_matrix:e on line ...
 Defining \l__color_backend_stack_int on line ...
 \l__color_backend_stack_int=\count...
 Defining \__kernel_color_backend_stack_init:Nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 3cdf03722..abbe426df 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -19,12 +19,11 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-dvips.def ....-..-.. L3 backend support: dvips
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_postscript:n on line ...
-Defining \__kernel_backend_literal_postscript:x on line ...
+Defining \__kernel_backend_literal_postscript:e on line ...
 Defining \__kernel_backend_postscript:n on line ...
-Defining \__kernel_backend_postscript:x on line ...
+Defining \__kernel_backend_postscript:e on line ...
 Defining \__kernel_backend_align_begin: on line ...
 Defining \__kernel_backend_align_end: on line ...
 Defining \__kernel_backend_scope_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 8c71fe9ca..4a3a70f69 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -19,10 +19,9 @@ Defining \c_sys_backend_str on line ...
 File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
 Defining \__kernel_backend_literal:e on line ...
 Defining \__kernel_backend_literal:n on line ...
-Defining \__kernel_backend_literal:x on line ...
 Defining \__kernel_backend_first_shipout:n on line ...
 Defining \__kernel_backend_literal_pdf:n on line ...
-Defining \__kernel_backend_literal_pdf:x on line ...
+Defining \__kernel_backend_literal_pdf:e on line ...
 Defining \__kernel_backend_literal_page:n on line ...
 Defining \__kernel_backend_scope_begin: on line ...
 Defining \__kernel_backend_scope_end: on line ...





More information about the latex3-commits mailing list.