[latex3-commits] [latex3/latex3] e-type: Switch from x- to e-type in l3pdf (88ade805c)
github at latex-project.org
github at latex-project.org
Tue Sep 26 15:07:28 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : e-type
Link : https://github.com/latex3/latex3/commit/88ade805ce4eeaf2c04c7db529d39e67ba9d4d56
>---------------------------------------------------------------
commit 88ade805ce4eeaf2c04c7db529d39e67ba9d4d56
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Sep 26 06:58:18 2023 +0100
Switch from x- to e-type in l3pdf
>---------------------------------------------------------------
88ade805ce4eeaf2c04c7db529d39e67ba9d4d56
l3backend/l3backend-color.dtx | 12 +++---
l3backend/l3backend-pdf.dtx | 70 ++++++++++++++++-----------------
l3kernel/l3pdf.dtx | 22 +++++++----
l3kernel/testfiles/m3expl001.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 6 +--
l3kernel/testfiles/m3expl001.tlg | 4 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 6 +--
l3kernel/testfiles/m3expl001.xetex.tlg | 6 +--
l3kernel/testfiles/m3expl003.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 6 +--
l3kernel/testfiles/m3expl003.tlg | 4 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 6 +--
l3kernel/testfiles/m3expl003.xetex.tlg | 10 ++---
13 files changed, 84 insertions(+), 76 deletions(-)
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 40699ce15..ddf4b465e 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -759,7 +759,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5
{
- \pdf_object_unnamed_write:nx { dict }
+ \pdf_object_unnamed_write:ne { dict }
{
/FunctionType ~ 2
/Domain ~ [0 ~ 1]
@@ -791,7 +791,7 @@
\pdf_object_if_exist:nF { @@_illuminant_CIELAB_ #1 }
{
\pdf_object_new:n { @@_illuminant_CIELAB_ #1 }
- \pdf_object_write:nnx { @@_illuminant_CIELAB_ #1 } { array }
+ \pdf_object_write:nne { @@_illuminant_CIELAB_ #1 } { array }
{
/Lab ~
<<
@@ -820,7 +820,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_devicen_init:nnn #1#2#3
{
- \pdf_object_unnamed_write:nx { stream }
+ \pdf_object_unnamed_write:ne { stream }
{
{
/FunctionType ~ 4 ~
@@ -875,7 +875,7 @@
\pdf_object_if_exist:nF { @@_icc_ #1 }
{
\pdf_object_new:n { @@_icc_ #1 }
- \pdf_object_write:nnx { @@_icc_ #1 } { fstream }
+ \pdf_object_write:nne { @@_icc_ #1 } { fstream }
{
{
/N ~ \exp_not:n { #2 } ~
@@ -884,7 +884,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { @@_icc_ #1 } }
\@@_backend_init_resource:n { color \int_use:N \g_@@_model_int }
}
@@ -906,7 +906,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { @@_icc_ #1 } }
\@@_backend_init_resource:n { Default #2 }
}
diff --git a/l3backend/l3backend-pdf.dtx b/l3backend/l3backend-pdf.dtx
index d99b100b8..6217c49cc 100644
--- a/l3backend/l3backend-pdf.dtx
+++ b/l3backend/l3backend-pdf.dtx
@@ -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 }
@@ -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
[
@@ -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,7 +1058,7 @@
%</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}
%
@@ -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
{ \__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} ~
@@ -1403,7 +1403,7 @@
\cs_new_protected:Npx \@@_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
@@ -1449,7 +1449,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_destination:nn #1#2
{
- \@@_backend:x
+ \@@_backend:e
{
dest ~ ( \exp_not:n {#1} )
[
@@ -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}
diff --git a/l3kernel/l3pdf.dtx b/l3kernel/l3pdf.dtx
index ebfdc9115..d298e5f41 100644
--- a/l3kernel/l3pdf.dtx
+++ b/l3kernel/l3pdf.dtx
@@ -60,7 +60,7 @@
% \end{function}
%
% \begin{function}[added = 2022-08-23]
-% {\pdf_object_write:nnn, \pdf_object_write:nnx}
+% {\pdf_object_write:nnn, \pdf_object_write:nne, \pdf_object_write:nnx}
% \begin{syntax}
% \cs{pdf_object_write:nn} \Arg{object} \Arg{type} \Arg{content}
% \end{syntax}
@@ -87,7 +87,10 @@
% \end{function}
%
% \begin{function}[added = 2021-02-10]
-% {\pdf_object_unnamed_write:nn, \pdf_object_unnamed_write:nx}
+% {
+% \pdf_object_unnamed_write:nn, \pdf_object_unnamed_write:ne,
+% \pdf_object_unnamed_write:nx
+% }
% \begin{syntax}
% \cs{pdf_object_unnamed_write:nn} \Arg{type} \Arg{content}
% \end{syntax}
@@ -312,9 +315,14 @@
% \subsection{Objects}
%
% \begin{macro}{\pdf_object_new:n}
-% \begin{macro}{\pdf_object_write:nnn, \pdf_object_write:nnx}
+% \begin{macro}
+% {\pdf_object_write:nnn, \pdf_object_write:nne, \pdf_object_write:nnx}
% \begin{macro}{\pdf_object_ref:n}
-% \begin{macro}{\pdf_object_unnamed_write:nn, \pdf_object_unnamed_write:nx}
+% \begin{macro}
+% {
+% \pdf_object_unnamed_write:nn, \pdf_object_unnamed_write:ne,
+% \pdf_object_unnamed_write:nx
+% }
% \begin{macro}{\pdf_object_ref_last:}
% \begin{macro}[pTF]{\pdf_object_if_exist:n}
% Simple to do: all objects create a constant |int| so it is not a
@@ -332,14 +340,14 @@
\@@_backend_object_write:nnn {#1} {#2} {#3}
\bool_gset_true:N \g_@@_init_bool
}
-\cs_generate_variant:Nn \pdf_object_write:nnn { nnx }
+\cs_generate_variant:Nn \pdf_object_write:nnn { nne , nnx }
\cs_new:Npn \pdf_object_ref:n #1 { \@@_backend_object_ref:n {#1} }
\cs_new_protected:Npn \pdf_object_unnamed_write:nn #1#2
{
\@@_backend_object_now:nn {#1} {#2}
\bool_gset_true:N \g_@@_init_bool
}
-\cs_generate_variant:Nn \pdf_object_unnamed_write:nn { nx }
+\cs_generate_variant:Nn \pdf_object_unnamed_write:nn { ne , nx }
\cs_new:Npn \pdf_object_ref_last: { \@@_backend_object_last: }
\prg_new_conditional:Npnn \pdf_object_if_exist:n #1 { p , T , F , TF }
{
@@ -536,7 +544,7 @@
}
\cs_new_protected:Npn \pdf_object_write:nn #1#2
{
- \exp_args:Nnx \@@_backend_object_write:nnn
+ \exp_args:Nne \@@_backend_object_write:nnn
{#1} { \prop_item:Nn \g_@@_object_prop {#1} } {#2}
\bool_gset_true:N \g_@@_init_bool
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index c2a3364d8..a2c5f927f 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -154,11 +154,11 @@ Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_exp_not_i:nn on line ...
Defining \__pdf_exp_not_ii:nn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \__pdf_backend_compresslevel:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index ef4f01570..ad00c7411 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -121,7 +121,7 @@ Defining \__graphics_backend_include_ps:n on line ...
Defining \l__pdf_internal_box on line ...
\l__pdf_internal_box=\box...
Defining \__pdf_backend_pdfmark:n on line ...
-Defining \__pdf_backend_pdfmark:x on line ...
+Defining \__pdf_backend_pdfmark:e on line ...
Defining \__pdf_backend_catalog_gput:nn on line ...
Defining \__pdf_backend_info_gput:nn on line ...
Defining \g__pdf_backend_object_int on line ...
@@ -129,7 +129,7 @@ Defining \g__pdf_backend_object_int on line ...
Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_backend_object_write_aux:nnn on line ...
Defining \__pdf_backend_object_write_array:nn on line ...
Defining \__pdf_backend_object_write_dict:nn on line ...
@@ -138,7 +138,7 @@ Defining \__pdf_backend_object_write_fstream:nnn on line ...
Defining \__pdf_backend_object_write_stream:nn on line ...
Defining \__pdf_backend_object_write_stream:nnn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \l__pdf_backend_content_box on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 7f99c0e3e..7c769d3bf 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -154,11 +154,11 @@ Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_exp_not_i:nn on line ...
Defining \__pdf_exp_not_ii:nn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \__pdf_backend_compresslevel:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index ef4f01570..ad00c7411 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -121,7 +121,7 @@ Defining \__graphics_backend_include_ps:n on line ...
Defining \l__pdf_internal_box on line ...
\l__pdf_internal_box=\box...
Defining \__pdf_backend_pdfmark:n on line ...
-Defining \__pdf_backend_pdfmark:x on line ...
+Defining \__pdf_backend_pdfmark:e on line ...
Defining \__pdf_backend_catalog_gput:nn on line ...
Defining \__pdf_backend_info_gput:nn on line ...
Defining \g__pdf_backend_object_int on line ...
@@ -129,7 +129,7 @@ Defining \g__pdf_backend_object_int on line ...
Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_backend_object_write_aux:nnn on line ...
Defining \__pdf_backend_object_write_array:nn on line ...
Defining \__pdf_backend_object_write_dict:nn on line ...
@@ -138,7 +138,7 @@ Defining \__pdf_backend_object_write_fstream:nnn on line ...
Defining \__pdf_backend_object_write_stream:nn on line ...
Defining \__pdf_backend_object_write_stream:nnn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \l__pdf_backend_content_box on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 6d4216dd0..b1115310e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -140,7 +140,7 @@ Defining \__graphics_backend_get_pagecount:n on line ...
Defining \l__pdf_internal_box on line ...
\l__pdf_internal_box=\box...
Defining \__pdf_backend:n on line ...
-Defining \__pdf_backend:x on line ...
+Defining \__pdf_backend:e on line ...
Defining \__pdf_backend_catalog_gput:nn on line ...
Defining \__pdf_backend_info_gput:nn on line ...
Defining \g__pdf_backend_object_int on line ...
@@ -149,14 +149,14 @@ Defining \g__pdf_backend_object_prop on line ...
Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_backend_object_write_array:nn on line ...
Defining \__pdf_backend_object_write_dict:nn on line ...
Defining \__pdf_backend_object_write_fstream:nn on line ...
Defining \__pdf_backend_object_write_stream:nn on line ...
Defining \__pdf_backend_object_write_stream:nnnn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \g__pdf_backend_annotation_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index c2a3364d8..a2c5f927f 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -154,11 +154,11 @@ Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_exp_not_i:nn on line ...
Defining \__pdf_exp_not_ii:nn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \__pdf_backend_compresslevel:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index ef4f01570..ad00c7411 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -121,7 +121,7 @@ Defining \__graphics_backend_include_ps:n on line ...
Defining \l__pdf_internal_box on line ...
\l__pdf_internal_box=\box...
Defining \__pdf_backend_pdfmark:n on line ...
-Defining \__pdf_backend_pdfmark:x on line ...
+Defining \__pdf_backend_pdfmark:e on line ...
Defining \__pdf_backend_catalog_gput:nn on line ...
Defining \__pdf_backend_info_gput:nn on line ...
Defining \g__pdf_backend_object_int on line ...
@@ -129,7 +129,7 @@ Defining \g__pdf_backend_object_int on line ...
Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_backend_object_write_aux:nnn on line ...
Defining \__pdf_backend_object_write_array:nn on line ...
Defining \__pdf_backend_object_write_dict:nn on line ...
@@ -138,7 +138,7 @@ Defining \__pdf_backend_object_write_fstream:nnn on line ...
Defining \__pdf_backend_object_write_stream:nn on line ...
Defining \__pdf_backend_object_write_stream:nnn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \l__pdf_backend_content_box on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 7f99c0e3e..7c769d3bf 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -154,11 +154,11 @@ Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_exp_not_i:nn on line ...
Defining \__pdf_exp_not_ii:nn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \__pdf_backend_compresslevel:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index ef4f01570..ad00c7411 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -121,7 +121,7 @@ Defining \__graphics_backend_include_ps:n on line ...
Defining \l__pdf_internal_box on line ...
\l__pdf_internal_box=\box...
Defining \__pdf_backend_pdfmark:n on line ...
-Defining \__pdf_backend_pdfmark:x on line ...
+Defining \__pdf_backend_pdfmark:e on line ...
Defining \__pdf_backend_catalog_gput:nn on line ...
Defining \__pdf_backend_info_gput:nn on line ...
Defining \g__pdf_backend_object_int on line ...
@@ -129,7 +129,7 @@ Defining \g__pdf_backend_object_int on line ...
Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_backend_object_write_aux:nnn on line ...
Defining \__pdf_backend_object_write_array:nn on line ...
Defining \__pdf_backend_object_write_dict:nn on line ...
@@ -138,7 +138,7 @@ Defining \__pdf_backend_object_write_fstream:nnn on line ...
Defining \__pdf_backend_object_write_stream:nn on line ...
Defining \__pdf_backend_object_write_stream:nnn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \l__pdf_backend_content_box on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 6d4216dd0..c70437264 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -119,7 +119,7 @@ Defining \__graphics_backend_include_png:n on line ...
Defining \__graphics_backend_include_bmp:n on line ...
Defining \__graphics_backend_include_auxi:nn on line ...
Defining \__graphics_backend_include_auxii:nnn on line ...
-Defining \__graphics_backend_include_auxii:xnn on line ...
+Defining \__graphics_backend_include_auxii:enn on line ...
Defining \__graphics_backend_include_auxiii:nnn on line ...
Defining \__graphics_backend_getbb_jpg:n on line ...
Defining \__graphics_backend_getbb_jpeg:n on line ...
@@ -140,7 +140,7 @@ Defining \__graphics_backend_get_pagecount:n on line ...
Defining \l__pdf_internal_box on line ...
\l__pdf_internal_box=\box...
Defining \__pdf_backend:n on line ...
-Defining \__pdf_backend:x on line ...
+Defining \__pdf_backend:e on line ...
Defining \__pdf_backend_catalog_gput:nn on line ...
Defining \__pdf_backend_info_gput:nn on line ...
Defining \g__pdf_backend_object_int on line ...
@@ -149,14 +149,14 @@ Defining \g__pdf_backend_object_prop on line ...
Defining \__pdf_backend_object_new:n on line ...
Defining \__pdf_backend_object_ref:n on line ...
Defining \__pdf_backend_object_write:nnn on line ...
-Defining \__pdf_backend_object_write:nnx on line ...
+Defining \__pdf_backend_object_write:nne on line ...
Defining \__pdf_backend_object_write_array:nn on line ...
Defining \__pdf_backend_object_write_dict:nn on line ...
Defining \__pdf_backend_object_write_fstream:nn on line ...
Defining \__pdf_backend_object_write_stream:nn on line ...
Defining \__pdf_backend_object_write_stream:nnnn on line ...
Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_now:ne on line ...
Defining \__pdf_backend_object_last: on line ...
Defining \__pdf_backend_pageobject_ref:n on line ...
Defining \g__pdf_backend_annotation_int on line ...
@@ -191,6 +191,6 @@ Defining \__opacity_backend_reset: on line ...
Defining \__opacity_backend_fill:n on line ...
Defining \__opacity_backend_stroke:n on line ...
Defining \__opacity_backend_fill_stroke:nn on line ...
-Defining \__opacity_backend_fill_stroke:xx on line ...
+Defining \__opacity_backend_fill_stroke:ee on line ...
))
Defining \g__hook_package/expl3/after_code_prop on line ...
More information about the latex3-commits
mailing list.