summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3backend
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-10 20:27:00 +0000
committerKarl Berry <karl@freefriends.org>2023-10-10 20:27:00 +0000
commit1045e3f70340d9f7540d9c9328a282ee84f88a51 (patch)
treeab54e08e01a041bf9bfd650d8981c1f63214a169 /Master/texmf-dist/tex/latex/l3backend
parentf92a7f650889a8bbbd6ff151a911a35c25fa2901 (diff)
l3 (10oct23)
git-svn-id: svn://tug.org/texlive/trunk@68507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3backend')
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def127
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def101
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def69
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def100
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def100
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def129
6 files changed, 315 insertions, 311 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
index 4f3eb45eb97..62fb5d14cfe 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}{2023-04-19}{}
+ {l3backend-dvipdfmx.def}{2023-10-10}{}
{L3 backend support: dvipdfmx}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -45,7 +45,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 }
\cs_if_exist:NTF \@ifl@t@r
{
\@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,7 +57,7 @@
{ \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
\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 }
\cs_new_protected:Npn \__kernel_backend_literal_page:n #1
{ \__kernel_backend_literal:n { pdf:literal~direct~ #1 } }
\cs_new_protected:Npn \__kernel_backend_scope_begin:
@@ -82,7 +81,7 @@
\msg_new:nnn { color } { unknown-named-color }
{ Named~color~'#1'~is~not~known. }
\prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
{
\exp_not:N \tl_if_blank:nF {#1}
{
@@ -108,7 +107,7 @@
\__color_backend_devicen_colorants:w
}
\cs_new_protected:Npn \__color_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 ] } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
\cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn
\cs_new_protected:Npn \__color_backend_init_resource:n #1
@@ -116,7 +115,7 @@
}
\cs_new_protected:Npn \__color_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]
@@ -124,19 +123,19 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \exp_args:Nx \__color_backend_separation_init:nn
+ \exp_args:Ne \__color_backend_separation_init:nn
{ \str_convert_pdfname:n {#1} } {#2}
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
{ /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
}
- \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
{ \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -144,7 +143,7 @@
\pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
{
\pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
- \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+ \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
{
/Lab ~
<<
@@ -163,7 +162,7 @@
}
\cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
{
- \pdf_object_unnamed_write:nx { stream }
+ \pdf_object_unnamed_write:ne { stream }
{
{
/FunctionType ~ 4 ~
@@ -185,7 +184,7 @@
}
{ {#3} }
}
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -210,7 +209,7 @@
\pdf_object_if_exist:nF { __color_icc_ #1 }
{
\pdf_object_new:n { __color_icc_ #1 }
- \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+ \pdf_object_write:nne { __color_icc_ #1 } { fstream }
{
{
/N ~ \exp_not:n { #2 } ~
@@ -219,7 +218,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
@@ -234,7 +233,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { Default #2 }
}
@@ -250,12 +249,12 @@
\cs_new_eq:NN \__color_backend_stroke_rgb:n \__color_backend_stroke:n
\cs_new_protected:Npn \__color_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 \__color_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 \__color_backend_fill_devicen:nn \__color_backend_fill_separation:nn
@@ -266,7 +265,7 @@
\cs_new_protected:Npn \__box_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 } ~
@@ -283,7 +282,7 @@
\cs_new_protected:Npn \__box_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
@@ -296,7 +295,7 @@
\cs_new_protected:Npn \__box_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 ) } ~
@@ -307,7 +306,7 @@
}
%% File: l3backend-draw.dtx
\cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
\cs_new_protected:Npn \__draw_backend_begin:
{ \__draw_backend_scope_begin: }
\cs_new_protected:Npn \__draw_backend_end:
@@ -316,17 +315,17 @@
\cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
\cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
}
\cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
}
\cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -336,7 +335,7 @@
}
\cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -356,24 +355,24 @@
{ \__draw_backend_literal:n { s } }
\cs_new_protected:Npn \__draw_backend_fill:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ f \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_fillstroke:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ B \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_clip:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ W \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_discardpath:
{ \__draw_backend_literal:n { n } }
\cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
[
\exp_args:Nf \use:n
@@ -386,11 +385,11 @@
{ ~ \dim_to_decimal_in_bp:n {#1} }
\cs_new_protected:Npn \__draw_backend_linewidth:n #1
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ w }
}
\cs_new_protected:Npn \__draw_backend_miterlimit:n #1
- { \__draw_backend_literal:x { #1 ~ M } }
+ { \__draw_backend_literal:e { #1 ~ M } }
\cs_new_protected:Npn \__draw_backend_cap_butt:
{ \__draw_backend_literal:n { 0 ~ J } }
\cs_new_protected:Npn \__draw_backend_cap_round:
@@ -410,20 +409,20 @@
}
\cs_new_protected:Npn \__draw_backend_cm_aux:nnnn #1#2#3#4
{
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
x:rotate~
\fp_compare:nNnTF {#1} = \c_zero_fp
{ 0 }
{ \fp_eval:n { round ( -#1 , 5 ) } }
}
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
x:scale~
\fp_eval:n { round ( #2 , 5 ) } ~
\fp_eval:n { round ( #3 , 5 ) }
}
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
x:rotate~
\fp_compare:nNnTF {#4} = \c_zero_fp
@@ -433,7 +432,7 @@
}
\cs_new_protected:Npn \__draw_backend_cm_decompose:nnnnN #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__draw_backend_cm_decompose_auxi:nnnnN
{ \fp_eval:n { (#1 + #4) / 2 } }
@@ -445,7 +444,7 @@
}
\cs_new_protected:Npn \__draw_backend_cm_decompose_auxi:nnnnN #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__draw_backend_cm_decompose_auxii:nnnnN
{ \fp_eval:n { 2 * sqrt ( #1 * #1 + #4 * #4 ) } }
@@ -457,7 +456,7 @@
}
\cs_new_protected:Npn \__draw_backend_cm_decompose_auxii:nnnnN #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__draw_backend_cm_decompose_auxiii:nnnnN
{ \fp_eval:n { ( #4 - #3 ) / 2 } }
@@ -522,7 +521,7 @@
\int_new:N \g__graphics_track_int
\cs_new_protected:Npn \__graphics_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__graphics_llx_dim \c_space_tl
@@ -541,7 +540,7 @@
{ \__graphics_backend_include_auxi:nn {#1} { epdf } }
\cs_new_protected:Npn \__graphics_backend_include_auxi:nn #1#2
{
- \__graphics_backend_include_auxii:xnn
+ \__graphics_backend_include_auxii:enn
{
\tl_if_empty:NF \l__graphics_pagebox_tl
{ : \l__graphics_pagebox_tl }
@@ -558,17 +557,17 @@
{
\int_if_exist:cTF { c__graphics_ #2#1 _int }
{
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{ pdf:usexobj~@graphic \int_use:c { c__graphics_ #2#1 _int } }
}
{ \__graphics_backend_include_auxiii:nnn {#2} {#1} {#3} }
}
-\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { x }
+\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { e }
\cs_new_protected:Npn \__graphics_backend_include_auxiii:nnn #1#2#3
{
\int_gincr:N \g__graphics_track_int
\int_const:cn { c__graphics_ #1#2 _int } { \g__graphics_track_int }
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
pdf:#3~
@graphic \int_use:c { c__graphics_ #1#2 _int } ~
@@ -601,9 +600,9 @@
{ \cs_new_eq:NN \__graphics_backend_get_pagecount:n \__graphics_get_pagecount:n }
%% File: l3backend-pdf.dtx
\box_new:N \l__pdf_internal_box
-\cs_new_protected:Npx \__pdf_backend:n #1
+\cs_new_protected:Npe \__pdf_backend:n #1
{ \__kernel_backend_literal:n { pdf: #1 } }
-\cs_generate_variant:Nn \__pdf_backend:n { x }
+\cs_generate_variant:Nn \__pdf_backend:n { e }
\cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2
{ \__pdf_backend:n { put ~ @catalog << /#1 ~ #2 >> } }
\cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2
@@ -624,15 +623,15 @@
\use:c { __pdf_backend_object_write_ #2 :nn }
{ \__pdf_backend_object_ref:n {#1} } {#3}
}
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
\cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2
{
- \__pdf_backend:x
+ \__pdf_backend:e
{ obj ~ #1 ~ [ ~ \exp_not:n {#2} ~ ] }
}
\cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
{
- \__pdf_backend:x
+ \__pdf_backend:e
{ obj ~ #1 ~ << ~ \exp_not:n {#2} ~ >> }
}
\cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2
@@ -641,7 +640,7 @@
{ \__pdf_backend_object_write_stream:nnnn { } {#1} #2 }
\cs_new_protected:Npn \__pdf_backend_object_write_stream:nnnn #1#2#3#4
{
- \__pdf_backend:x
+ \__pdf_backend:e
{
#1 stream ~ #2 ~
( \exp_not:n {#4} ) ~ << \exp_not:n {#3} >>
@@ -650,11 +649,11 @@
\cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
{
\int_gincr:N \g__pdf_backend_object_int
- \exp_args:Nnx \use:c { __pdf_backend_object_write_ #1 :nn }
+ \exp_args:Nne \use:c { __pdf_backend_object_write_ #1 :nn }
{ @pdf.obj \int_use:N \g__pdf_backend_object_int }
{#2}
}
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
\cs_new:Npn \__pdf_backend_object_last:
{ @pdf.obj \int_use:N \g__pdf_backend_object_int }
\cs_new:Npn \__pdf_backend_pageobject_ref:n #1
@@ -664,7 +663,7 @@
{
\int_gincr:N \g__pdf_backend_object_int
\int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
- \__pdf_backend:x
+ \__pdf_backend:e
{
ann ~ @pdf.obj \int_use:N \g__pdf_backend_object_int \c_space_tl
width ~ \dim_eval:n {#1} ~
@@ -680,10 +679,10 @@
{ \__pdf_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } }
\cs_new_protected:Npn \__pdf_backend_link_begin_user:nnw #1#2
{ \__pdf_backend_link_begin:n {#1#2} }
-\cs_new_protected:Npx \__pdf_backend_link_begin:n #1
+\cs_new_protected:Npe \__pdf_backend_link_begin:n #1
{
\exp_not:N \int_gincr:N \exp_not:N \g__pdf_backend_link_int
- \__pdf_backend:x
+ \__pdf_backend:e
{
bann ~
@pdf.lnk
@@ -700,10 +699,10 @@
\cs_new:Npn \__pdf_backend_link_last:
{ @pdf.lnk \int_use:N \g__pdf_backend_link_int }
\cs_new_protected:Npn \__pdf_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} } }
\cs_new_protected:Npn \__pdf_backend_destination:nn #1#2
{
- \__pdf_backend:x
+ \__pdf_backend:e
{
dest ~ ( \exp_not:n {#1} )
[
@@ -762,7 +761,7 @@
\__kernel_kern:n { -#1 }
}
\cs_new_protected:Npn \__pdf_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 \__pdf_backend_compress_objects:n #1
{
\bool_if:nF {#1}
@@ -770,13 +769,13 @@
}
\cs_new_protected:Npn \__pdf_backend_version_major_gset:n #1
{
- \cs_gset:Npx \__pdf_backend_version_major: { \int_eval:n {#1} }
- \__kernel_backend_literal:x { pdf:majorversion~ \__pdf_backend_version_major: }
+ \cs_gset:Npe \__pdf_backend_version_major: { \int_eval:n {#1} }
+ \__kernel_backend_literal:e { pdf:majorversion~ \__pdf_backend_version_major: }
}
\cs_new_protected:Npn \__pdf_backend_version_minor_gset:n #1
{
- \cs_gset:Npx \__pdf_backend_version_minor: { \int_eval:n {#1} }
- \__kernel_backend_literal:x { pdf:minorversion~ \__pdf_backend_version_minor: }
+ \cs_gset:Npe \__pdf_backend_version_minor: { \int_eval:n {#1} }
+ \__kernel_backend_literal:e { pdf:minorversion~ \__pdf_backend_version_minor: }
}
\cs_new:Npn \__pdf_backend_version_major: { 1 }
\cs_new:Npn \__pdf_backend_version_minor: { 5 }
@@ -808,7 +807,7 @@
\tl_new:N \l__opacity_backend_stroke_tl
\cs_new_protected:Npn \__opacity_backend_select:n #1
{
- \exp_args:Nx \__opacity_backend_select_aux:n
+ \exp_args:Ne \__opacity_backend_select_aux:n
{ \fp_eval:n { min(max(0,#1),1) } }
}
\cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -835,13 +834,13 @@
}
\cs_new_protected:Npn \__opacity_backend_fill:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
{ \fp_eval:n { min(max(0,#1),1) } }
\l__opacity_backend_stroke_tl
}
\cs_new_protected:Npn \__opacity_backend_stroke:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
\l__opacity_backend_fill_tl
{ \fp_eval:n { min(max(0,#1),1) } }
}
@@ -863,7 +862,7 @@
\group_insert_after:N \__opacity_backend_reset:
}
}
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
%%
%%
%% End of file `l3backend-dvipdfmx.def'.
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index 62287189df8..ede18214153 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}{2023-04-19}{}
+ {l3backend-dvips.def}{2023-10-10}{}
{L3 backend support: dvips}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -45,7 +45,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 }
\cs_if_exist:NTF \@ifl@t@r
{
\@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,10 +57,10 @@
{ \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
\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 }
\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 }
\bool_if:NT \g__kernel_backend_header_bool
{
\__kernel_backend_first_shipout:n
@@ -99,7 +98,7 @@
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_backend_literal:n { color~pop } }
\prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
{
\exp_not:N \tl_if_blank:nF {#1}
{
@@ -128,17 +127,17 @@
{ \__color_backend_select:n { separation ~ #1 ~ #2 } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
\cs_new_protected:Npn \__color_backend_select_iccbased:nn #1#2 { }
-\cs_new_protected:Npx \__color_backend_separation_init:nnnnn #1#2#3#4#5
+\cs_new_protected:Npe \__color_backend_separation_init:nnnnn #1#2#3#4#5
{
\bool_if:NT \g__kernel_backend_header_bool
{
- \exp_args:Nx \__kernel_backend_first_shipout:n
+ \exp_not:N \exp_args:Ne \__kernel_backend_first_shipout:n
{
\exp_not:N \__color_backend_separation_init_aux:nnnnnn
{ \exp_not:N \int_use:N \g__color_model_int }
{#1} {#2} {#3} {#4} {#5}
}
- \prop_gput:Nxx \exp_not:N \g__color_backend_colorant_prop
+ \prop_gput:Nee \exp_not:N \g__color_backend_colorant_prop
{ / \exp_not:N \str_convert_pdfname:n {#1} }
{
<< ~
@@ -149,7 +148,7 @@
}
}
}
-\cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nxx }
+\cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nee }
\cs_new_protected:Npn \__color_backend_separation_init_aux:nnnnnn #1#2#3#4#5#6
{
\__kernel_backend_literal:e
@@ -242,7 +241,7 @@
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
{
- \__color_backend_separation_init:nxxnn
+ \__color_backend_separation_init:neenn
{#2}
{
/CIEBasedABC ~
@@ -339,7 +338,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 } ~
@@ -359,7 +358,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 }
@@ -374,7 +373,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 ) } ~
@@ -386,7 +385,7 @@
}
%% File: l3backend-draw.dtx
\cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_postscript:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
\cs_new_protected:Npn \__draw_backend_begin:
{
\__kernel_backend_literal:n { ps::[begin] }
@@ -403,7 +402,7 @@
{ \__draw_backend_literal:n { restore } }
\cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~
\dim_to_decimal_in_bp:n {#2} ~ moveto
@@ -411,7 +410,7 @@
}
\cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~
\dim_to_decimal_in_bp:n {#2} ~ lineto
@@ -419,7 +418,7 @@
}
\cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#4} ~ \dim_to_decimal_in_bp:n {#3} ~
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
@@ -428,7 +427,7 @@
}
\cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -451,7 +450,7 @@
\__draw_backend_literal:n { grestore }
\bool_if:NT \g__draw_draw_clip_bool
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\bool_if:NT \g__draw_draw_eor_bool { eo }
clip
@@ -467,14 +466,14 @@
}
\cs_new_protected:Npn \__draw_backend_fill:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\bool_if:NT \g__draw_draw_eor_bool { eo }
fill
}
\bool_if:NT \g__draw_draw_clip_bool
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\bool_if:NT \g__draw_draw_eor_bool { eo }
clip
@@ -485,7 +484,7 @@
}
\cs_new_protected:Npn \__draw_backend_fillstroke:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\bool_if:NT \g__draw_draw_eor_bool { eo }
fill
@@ -496,7 +495,7 @@
\__draw_backend_literal:n { grestore }
\bool_if:NT \g__draw_draw_clip_bool
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\bool_if:NT \g__draw_draw_eor_bool { eo }
clip
@@ -512,7 +511,7 @@
{
\bool_if:NT \g__draw_draw_clip_bool
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\bool_if:NT \g__draw_draw_eor_bool { eo }
clip
@@ -523,7 +522,7 @@
}
\cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
[
\exp_args:Nf \use:n
@@ -536,7 +535,7 @@
{ ~ \dim_to_decimal_in_bp:n {#1} }
\cs_new_protected:Npn \__draw_backend_linewidth:n #1
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ setlinewidth }
}
\cs_new_protected:Npn \__draw_backend_miterlimit:n #1
@@ -599,7 +598,7 @@
}
\cs_new_protected:Npn \__graphics_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__graphics_llx_dim \c_space_tl
@@ -615,7 +614,7 @@
\box_new:N \l__pdf_internal_box
\cs_new_protected:Npn \__pdf_backend_pdfmark:n #1
{ \__kernel_backend_postscript:n { mark #1 ~ pdfmark } }
-\cs_generate_variant:Nn \__pdf_backend_pdfmark:n { x }
+\cs_generate_variant:Nn \__pdf_backend_pdfmark:n { e }
\cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2
{ \__pdf_backend_pdfmark:n { { Catalog } << /#1 ~ #2 >> /PUT } }
\cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2
@@ -636,10 +635,10 @@
{ \__pdf_backend_object_ref:n {#1} }
{#2} {#3}
}
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
\cs_new_protected:Npn \__pdf_backend_object_write_aux:nnn #1#2#3
{
- \__pdf_backend_pdfmark:x
+ \__pdf_backend_pdfmark:e
{
/_objdef ~ #1
/type
@@ -656,17 +655,17 @@
}
\cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2
{
- \__pdf_backend_pdfmark:x
+ \__pdf_backend_pdfmark:e
{ #1 ~0~ [ ~ \exp_not:n {#2} ~ ] ~ /PUTINTERVAL }
}
\cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
{
- \__pdf_backend_pdfmark:x
+ \__pdf_backend_pdfmark:e
{ #1 << \exp_not:n {#2} >> /PUT }
}
\cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2
{
- \exp_args:Nx
+ \exp_args:Ne
\__pdf_backend_object_write_fstream:nnn {#1} #2
}
\cs_new_protected:Npn \__pdf_backend_object_write_fstream:nnn #1#2#3
@@ -681,7 +680,7 @@
}
\cs_new_protected:Npn \__pdf_backend_object_write_stream:nn #1#2
{
- \exp_args:Nx
+ \exp_args:Ne
\__pdf_backend_object_write_stream:nnn {#1} #2
}
\cs_new_protected:Npn \__pdf_backend_object_write_stream:nnn #1#2#3
@@ -699,7 +698,7 @@
{ { pdf.obj \int_use:N \g__pdf_backend_object_int } }
{#1} {#2}
}
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
\cs_new:Npn \__pdf_backend_object_last:
{ { pdf.obj \int_use:N \g__pdf_backend_object_int } }
\cs_new:Npn \__pdf_backend_pageobject_ref:n #1
@@ -727,7 +726,7 @@
}
\int_gincr:N \g__pdf_backend_object_int
\int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
- \__pdf_backend_pdfmark:x
+ \__pdf_backend_pdfmark:e
{
/_objdef { pdf.obj \int_use:N \g__pdf_backend_object_int }
pdf.rect
@@ -786,7 +785,7 @@
\hbox_set_end:
\__pdf_backend_link_minima:
\hbox_set:Nn \l__pdf_backend_model_box { Gg }
- \exp_args:Nx \__pdf_backend_link_outerbox:n
+ \exp_args:Ne \__pdf_backend_link_outerbox:n
{
\int_if_odd:nTF { \value { page } }
{ \oddsidemargin }
@@ -804,7 +803,7 @@
}
\int_gincr:N \g__pdf_backend_object_int
\int_gset_eq:NN \g__pdf_backend_link_int \g__pdf_backend_object_int
- \__kernel_backend_postscript:x
+ \__kernel_backend_postscript:e
{
mark
/_objdef { pdf.obj \int_use:N \g__pdf_backend_link_int }
@@ -818,7 +817,7 @@
\cs_new_protected:Npn \__pdf_backend_link_minima:
{
\hbox_set:Nn \l__pdf_backend_model_box { Gg }
- \__kernel_backend_postscript:x
+ \__kernel_backend_postscript:e
{
/pdf.linkdp.pad ~
\dim_to_decimal:n
@@ -846,7 +845,7 @@
}
\cs_new_protected:Npn \__pdf_backend_link_outerbox:n #1
{
- \__kernel_backend_postscript:x
+ \__kernel_backend_postscript:e
{
/pdf.outerbox
[
@@ -886,9 +885,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
{
@@ -896,7 +895,7 @@
{ pdf.bordertracking.continue }
if
}
- \vbox_unpack_drop:N \@cclv
+ \vbox_unpack_drop:N \l_shipout_box
\__kernel_backend_postscript:n
{ pdf.bordertracking.endpage }
}
@@ -911,7 +910,7 @@
{ { pdf.obj \int_use:N \g__pdf_backend_link_int } }
\cs_new_protected:Npn \__pdf_backend_link_margin:n #1
{
- \__kernel_backend_postscript:x
+ \__kernel_backend_postscript:e
{
/pdf.linkmargin { \dim_to_decimal:n {#1} ~ pdf.pt.dvi } def
}
@@ -919,7 +918,7 @@
\cs_new_protected:Npn \__pdf_backend_destination:nn #1#2
{
\__kernel_backend_postscript:n { pdf.dest.anchor }
- \__pdf_backend_pdfmark:x
+ \__pdf_backend_pdfmark:e
{
/View
[
@@ -1001,11 +1000,11 @@
}
\cs_new_protected:Npn \__pdf_backend_version_major_gset:n #1
{
- \cs_gset:Npx \__pdf_backend_version_major: { \int_eval:n {#1} }
+ \cs_gset:Npe \__pdf_backend_version_major: { \int_eval:n {#1} }
}
\cs_new_protected:Npn \__pdf_backend_version_minor_gset:n #1
{
- \cs_gset:Npx \__pdf_backend_version_minor: { \int_eval:n {#1} }
+ \cs_gset:Npe \__pdf_backend_version_minor: { \int_eval:n {#1} }
}
\cs_new:Npn \__pdf_backend_version_major: { -1 }
\cs_new:Npn \__pdf_backend_version_minor: { -1 }
@@ -1026,7 +1025,7 @@
%% File: l3backend-opacity.dtx
\cs_new_protected:Npn \__opacity_backend_select:n #1
{
- \exp_args:Nx \__opacity_backend_select_aux:n
+ \exp_args:Ne \__opacity_backend_select_aux:n
{ \fp_eval:n { min(max(0,#1),1) } }
}
\cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -1036,14 +1035,14 @@
}
\cs_new_protected:Npn \__opacity_backend_fill:n #1
{
- \__opacity_backend:xnn
+ \__opacity_backend:enn
{ \fp_eval:n { min(max(0,#1),1) } }
{ fill }
{ ca }
}
\cs_new_protected:Npn \__opacity_backend_stroke:n #1
{
- \__opacity_backend:xnn
+ \__opacity_backend:enn
{ \fp_eval:n { min(max(0,#1),1) } }
{ stroke }
{ CA }
@@ -1067,7 +1066,7 @@
ifelse
}
}
-\cs_generate_variant:Nn \__opacity_backend:nnn { x }
+\cs_generate_variant:Nn \__opacity_backend:nnn { e }
%%
%%
%% End of file `l3backend-dvips.def'.
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
index def201f4e9d..3f087c52655 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}{2023-04-19}{}
+ {l3backend-dvisvgm.def}{2023-10-10}{}
{L3 backend support: dvisvgm}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -45,7 +45,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 }
\cs_if_exist:NTF \@ifl@t@r
{
\@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,7 +57,7 @@
{ \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
\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 }
\int_new:N \g__kernel_backend_scope_int
\int_new:N \l__kernel_backend_scope_int
\cs_new_protected:Npn \__kernel_backend_scope_begin:
@@ -89,13 +88,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 }
%% File: l3backend-color.dtx
\cs_new_protected:Npn \__color_backend_select_cmyk:n #1
{ \__color_backend_select:n { cmyk ~ #1 } }
@@ -117,7 +116,7 @@
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnnnnn #1#2#3 { }
\cs_new_protected:Npn \__color_backend_select_iccbased:nn #1#2
{
- \__kernel_backend_literal_svg:x
+ \__kernel_backend_literal_svg:e
{
<style>
@color-profile ~
@@ -146,7 +145,7 @@
\cs_new_protected:Npn \__color_backend_stroke_cmyk:w
#1 ~ #2 ~ #3 ~ #4 \s__color_stop
{
- \use:x
+ \use:e
{
\__color_backend:nnn
{ \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } }
@@ -156,7 +155,7 @@
}
\cs_new_protected:Npn \__color_backend_stroke_gray:n #1
{
- \use:x
+ \use:e
{
\__color_backend_stroke_gray_aux:n
{ \fp_eval:n { 100 * (#1) } }
@@ -169,7 +168,7 @@
\cs_new_protected:Npn \__color_backend_stroke_rgb:w
#1 ~ #2 ~ #3 \s__color_stop
{
- \use:x
+ \use:e
{
\__color_backend:nnn
{ \fp_eval:n { 100 * (#1) } }
@@ -177,7 +176,7 @@
{ \fp_eval:n { 100 * (#3) } }
}
}
-\cs_new_protected:Npx \__color_backend:nnn #1#2#3
+\cs_new_protected:Npe \__color_backend:nnn #1#2#3
{
\__kernel_backend_scope:n
{
@@ -204,9 +203,9 @@
\cs_new_protected:Npn \__box_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 =
@@ -233,7 +232,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 ) "
@@ -253,7 +252,7 @@
\int_new:N \g__kernel_clip_path_int
\cs_new_protected:Npn \__box_backend_rotate:Nn #1#2
{
- \__kernel_backend_scope_begin:x
+ \__kernel_backend_scope_begin:e
{
transform =
"
@@ -266,7 +265,7 @@
}
\cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3
{
- \__kernel_backend_scope_begin:x
+ \__kernel_backend_scope_begin:e
{
transform =
"
@@ -285,7 +284,7 @@
}
%% File: l3backend-draw.dtx
\cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_svg:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
\cs_new_eq:NN \__draw_backend_scope_begin: \__kernel_backend_scope_begin:
\cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
\cs_new_protected:Npn \__draw_backend_begin:
@@ -327,7 +326,7 @@
}
\cs_new_protected:Npn \__draw_backend_add_to_path:n #1
{
- \tl_gset:Nx \g__draw_backend_path_tl
+ \tl_gset:Ne \g__draw_backend_path_tl
{
\g__draw_backend_path_tl
\tl_if_empty:NF \g__draw_backend_path_tl { \c_space_tl }
@@ -346,7 +345,7 @@
\bool_if:NTF \g__draw_draw_clip_bool
{
\int_gincr:N \g__kernel_clip_path_int
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
< clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " >
{ ?nl }
@@ -358,14 +357,14 @@
#1
/>
}
- \__kernel_backend_scope:x
+ \__kernel_backend_scope:e
{
clip-path =
"url( \c_hash_str l3cp \int_use:N \g__kernel_clip_path_int)"
}
}
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ <path ~ d=" \g__draw_backend_path_tl " ~ #1 /> }
}
\tl_gclear:N \g__draw_backend_path_tl
@@ -391,14 +390,14 @@
\bool_if:NT \g__draw_draw_clip_bool
{
\int_gincr:N \g__kernel_clip_path_int
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
< clipPath~id = " l3cp \int_use:N \g__kernel_clip_path_int " >
{ ?nl }
<path~d=" \g__draw_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)"
@@ -409,7 +408,7 @@
}
\cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
{
- \use:x
+ \use:e
{
\__draw_backend_dash_aux:nn
{ \clist_map_function:nN {#1} \__draw_backend_dash:n }
@@ -420,7 +419,7 @@
{ , \dim_to_decimal_in_bp:n {#1} }
\cs_new_protected:Npn \__draw_backend_dash_aux:nn #1#2
{
- \__kernel_backend_scope:x
+ \__kernel_backend_scope:e
{
stroke-dasharray =
"
@@ -432,9 +431,9 @@
}
}
\cs_new_protected:Npn \__draw_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 \__draw_backend_miterlimit:n #1
- { \__kernel_backend_scope:x { stroke-miterlimit=" #1 " } }
+ { \__kernel_backend_scope:e { stroke-miterlimit=" #1 " } }
\cs_new_protected:Npn \__draw_backend_cap_butt:
{ \__kernel_backend_scope:n { stroke-linecap="butt" } }
\cs_new_protected:Npn \__draw_backend_cap_round:
@@ -527,10 +526,10 @@
}
\cs_new_protected:Npn \__graphics_backend_getbb_svg_auxi:nNn #1#2#3
{
- \use:x
+ \use:e
{
\cs_set_protected:Npn \__graphics_backend_getbb_svg_auxii:w
- ####1 \tl_to_str:n {#1} = ####2 \tl_to_str:n {#1} = ####3
+ ##1 \tl_to_str:n {#1} = ##2 \tl_to_str:n {#1} = ##3
\s__graphics_stop
}
{
@@ -549,7 +548,7 @@
##2 \s__graphics_stop
}
}
- \use:x
+ \use:e
{
\__graphics_backend_getbb_svg_auxii:w #3
\tl_to_str:n {#1} = \tl_to_str:n {#1} =
@@ -596,7 +595,7 @@
{ \__graphics_backend_include:nn { pdffile } {#1} }
\cs_new_protected:Npn \__graphics_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__graphics_llx_dim \c_space_tl
@@ -611,7 +610,7 @@
{
\hbox:n
{
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
dvisvgm:img~
\dim_to_decimal:n { \l__graphics_urx_dim } ~
@@ -635,7 +634,7 @@
\cs_new_protected:Npn \__pdf_backend_link_begin_user:nnw #1#2 { }
\cs_new_protected:Npn \__pdf_backend_link_begin:nnnw #1#2#3 { }
\cs_new_protected:Npn \__pdf_backend_link_end: { }
-\cs_new:Npx \__pdf_backend_link_last: { }
+\cs_new:Npe \__pdf_backend_link_last: { }
\cs_new_protected:Npn \__pdf_backend_link_margin:n #1 { }
\cs_new_protected:Npn \__pdf_backend_destination:nn #1#2 { }
\cs_new_protected:Npn \__pdf_backend_destination:nnnn #1#2#3#4 { }
@@ -644,9 +643,9 @@
\cs_new_protected:Npn \__pdf_backend_object_new:nn #1 { }
\cs_new:Npn \__pdf_backend_object_ref:n #1 { }
\cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { }
-\cs_new_protected:Npn \__pdf_backend_object_write:nnx #1#2#3 { }
+\cs_new_protected:Npn \__pdf_backend_object_write:nne #1#2#3 { }
\cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2 { }
-\cs_new_protected:Npn \__pdf_backend_object_now:nx #1#2 { }
+\cs_new_protected:Npn \__pdf_backend_object_now:ne #1#2 { }
\cs_new:Npn \__pdf_backend_object_last: { }
\cs_new:Npn \__pdf_backend_pageobject_ref:n #1 { }
\cs_new_protected:Npn \__pdf_backend_compresslevel:n #1 { }
@@ -666,7 +665,7 @@
\cs_new_protected:Npn \__opacity_backend_stroke:n #1
{ \__opacity_backend:nn { {#1} } { stroke- } }
\cs_new_protected:Npn \__opacity_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 of file `l3backend-dvisvgm.def'.
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
index 040c5415daf..4207e02855e 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}{2023-04-19}{}
+ {l3backend-luatex.def}{2023-10-10}{}
{L3 backend support: PDF output (LuaTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -45,7 +45,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 }
\cs_if_exist:NTF \@ifl@t@r
{
\@ifl@t@r \fmtversion { 2020-10-01 }
@@ -61,12 +60,17 @@
\tex_pdfextension:D literal
{ \exp_not:n {#1} }
}
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
\cs_new_protected:Npn \__kernel_backend_literal_page:n #1
{
\tex_pdfextension:D literal ~
page { \exp_not:n {#1} }
}
+\cs_new_protected:Npn \__kernel_backend_literal_page:e #1
+ {
+ \tex_pdfextension:D literal ~
+ page {#1}
+ }
\cs_new_protected:Npn \__kernel_backend_scope_begin:
{
\tex_pdfextension:D save \scan_stop:
@@ -80,7 +84,7 @@
\tex_pdfextension:D setmatrix
{ \exp_not:n {#1} }
}
-\cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
+\cs_generate_variant:Nn \__kernel_backend_matrix:n { e }
%% File: l3backend-color.dtx
\int_new:N \l__color_backend_stack_int
\cs_new_protected:Npn \__kernel_color_backend_stack_init:Nnn #1#2#3
@@ -121,7 +125,7 @@
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_color_backend_stack_pop:n \l__color_backend_stack_int }
\prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
{
\exp_not:N \tl_if_blank:nF {#1}
{
@@ -156,7 +160,7 @@
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
{ \pdfmanagement_if_active_p: }
{
- \use:x
+ \use:e
{
\pdfmanagement_add:nnn
{ Page / Resources / ColorSpace }
@@ -167,7 +171,7 @@
}
\cs_new_protected:Npn \__color_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]
@@ -175,19 +179,19 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \exp_args:Nx \__color_backend_separation_init:nn
+ \exp_args:Ne \__color_backend_separation_init:nn
{ \str_convert_pdfname:n {#1} } {#2}
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
{ /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
}
- \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
{ \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -195,7 +199,7 @@
\pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
{
\pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
- \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+ \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
{
/Lab ~
<<
@@ -214,7 +218,7 @@
}
\cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
{
- \pdf_object_unnamed_write:nx { stream }
+ \pdf_object_unnamed_write:ne { stream }
{
{
/FunctionType ~ 4 ~
@@ -236,7 +240,7 @@
}
{ {#3} }
}
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -261,7 +265,7 @@
\pdf_object_if_exist:nF { __color_icc_ #1 }
{
\pdf_object_new:n { __color_icc_ #1 }
- \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+ \pdf_object_write:nne { __color_icc_ #1 } { fstream }
{
{
/N ~ \exp_not:n { #2 } ~
@@ -270,7 +274,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
@@ -285,7 +289,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { Default #2 }
}
@@ -326,7 +330,7 @@
\cs_new_protected:Npn \__box_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 } ~
@@ -348,7 +352,7 @@
\fp_compare:nNnT \l__box_backend_cos_fp = \c_zero_fp
{ \fp_zero:N \l__box_backend_cos_fp }
\fp_set:Nn \l__box_backend_sin_fp { round ( sind ( #2 ) , 5 ) }
- \__kernel_backend_matrix:x
+ \__kernel_backend_matrix:e
{
\fp_use:N \l__box_backend_cos_fp \c_space_tl
\fp_compare:nNnTF \l__box_backend_sin_fp = \c_zero_fp
@@ -369,7 +373,7 @@
\cs_new_protected:Npn \__box_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~
@@ -380,7 +384,7 @@
}
%% File: l3backend-draw.dtx
\cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
\cs_new_protected:Npn \__draw_backend_begin:
{ \__draw_backend_scope_begin: }
\cs_new_protected:Npn \__draw_backend_end:
@@ -389,17 +393,17 @@
\cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
\cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
}
\cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
}
\cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -409,7 +413,7 @@
}
\cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -429,24 +433,24 @@
{ \__draw_backend_literal:n { s } }
\cs_new_protected:Npn \__draw_backend_fill:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ f \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_fillstroke:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ B \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_clip:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ W \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_discardpath:
{ \__draw_backend_literal:n { n } }
\cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
[
\exp_args:Nf \use:n
@@ -459,11 +463,11 @@
{ ~ \dim_to_decimal_in_bp:n {#1} }
\cs_new_protected:Npn \__draw_backend_linewidth:n #1
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ w }
}
\cs_new_protected:Npn \__draw_backend_miterlimit:n #1
- { \__draw_backend_literal:x { #1 ~ M } }
+ { \__draw_backend_literal:e { #1 ~ M } }
\cs_new_protected:Npn \__draw_backend_cap_butt:
{ \__draw_backend_literal:n { 0 ~ J } }
\cs_new_protected:Npn \__draw_backend_cap_round:
@@ -510,7 +514,7 @@
{
\int_zero:N \l__graphics_page_int
\tl_clear:N \l__graphics_pagebox_tl
- \tl_set:Nx \l__graphics_attr_tl
+ \tl_set:Ne \l__graphics_attr_tl
{
\tl_if_empty:NF \l__graphics_decodearray_str
{ :D \l__graphics_decodearray_str }
@@ -527,7 +531,7 @@
{
\tl_clear:N \l__graphics_decodearray_str
\bool_set_false:N \l__graphics_interpolate_bool
- \tl_set:Nx \l__graphics_attr_tl
+ \tl_set:Ne \l__graphics_attr_tl
{
: \l__graphics_pagebox_tl
\int_compare:nNnT \l__graphics_page_int > 1
@@ -539,7 +543,7 @@
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxi:n #1
{
- \__graphics_bb_restore:xF { #1 \l__graphics_attr_tl }
+ \__graphics_bb_restore:eF { #1 \l__graphics_attr_tl }
{ \__graphics_backend_getbb_auxii:n {#1} }
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxii:n #1
@@ -548,7 +552,7 @@
{ \__graphics_backend_dequote:w #1 " #1 " \s__graphics_stop }
\int_const:cn { c__graphics_ #1 \l__graphics_attr_tl _int }
{ \tex_the:D \tex_pdflastximage:D }
- \__graphics_bb_save:x { #1 \l__graphics_attr_tl }
+ \__graphics_bb_save:e { #1 \l__graphics_attr_tl }
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxiii:n #1
{
@@ -599,7 +603,7 @@
\l__graphics_backend_dir_str
\l__graphics_backend_name_str
\l__graphics_backend_ext_str
- \exp_args:Nx \__graphics_backend_getbb_eps:nn
+ \exp_args:Ne \__graphics_backend_getbb_eps:nn
{
\exp_args:Ne \__kernel_file_name_quote:n
{
@@ -625,7 +629,7 @@
{
\file_parse_full_name:nNNN {#1}
\l__graphics_backend_dir_str \l__graphics_backend_name_str \l__graphics_backend_ext_str
- \exp_args:Nx \__graphics_backend_include_pdf:n
+ \exp_args:Ne \__graphics_backend_include_pdf:n
{
\exp_args:Ne \__kernel_file_name_quote:n
{
@@ -653,7 +657,7 @@
depth ~ \dim_eval:n {#3} ~
{#4}
}
-\cs_new:Npx \__pdf_backend_annotation_last:
+\cs_new:Npe \__pdf_backend_annotation_last:
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdffeedback:D lastannot ~
@@ -673,7 +677,7 @@
{
\tex_pdfextension:D endlink \scan_stop:
}
-\cs_new:Npx \__pdf_backend_link_last:
+\cs_new:Npe \__pdf_backend_link_last:
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdffeedback:D lastlink ~
@@ -758,7 +762,7 @@
}
}
}
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
\cs_new:Npn \__pdf_exp_not_i:nn #1#2 { \exp_not:n {#1} }
\cs_new:Npn \__pdf_exp_not_ii:nn #1#2 { \exp_not:n {#2} }
\cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
@@ -766,14 +770,14 @@
\tex_immediate:D \tex_pdfextension:D obj ~
\__pdf_backend_object_write:nn {#1} {#2}
}
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
-\cs_new:Npx \__pdf_backend_object_last:
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
+\cs_new:Npe \__pdf_backend_object_last:
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdffeedback:D lastobj ~
\c_space_tl 0 ~ R
}
-\cs_new:Npx \__pdf_backend_pageobject_ref:n #1
+\cs_new:Npe \__pdf_backend_pageobject_ref:n #1
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdffeedback:D pageref
@@ -797,7 +801,7 @@
\tex_pdfvariable:D objcompresslevel
#1 \scan_stop:
}
-\cs_new_protected:Npx \__pdf_backend_version_major_gset:n #1
+\cs_new_protected:Npe \__pdf_backend_version_major_gset:n #1
{
\int_compare:nNnT \tex_luatexversion:D > { 106 }
{
@@ -811,7 +815,7 @@
\tex_pdfvariable:D minorversion
\int_eval:n {#1} \scan_stop:
}
-\cs_new:Npx \__pdf_backend_version_major:
+\cs_new:Npe \__pdf_backend_version_major:
{
\int_compare:nNnTF \tex_luatexversion:D > { 106 }
{ \exp_not:N \tex_the:D \tex_pdfvariable:D majorversion }
@@ -845,7 +849,7 @@
\tl_new:N \l__opacity_backend_stroke_tl
\cs_new_protected:Npn \__opacity_backend_select:n #1
{
- \exp_args:Nx \__opacity_backend_select_aux:n
+ \exp_args:Ne \__opacity_backend_select_aux:n
{ \fp_eval:n { min(max(0,#1),1) } }
}
\cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -871,13 +875,13 @@
}
\cs_new_protected:Npn \__opacity_backend_fill:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
{ \fp_eval:n { min(max(0,#1),1) } }
\l__opacity_backend_stroke_tl
}
\cs_new_protected:Npn \__opacity_backend_stroke:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
\l__opacity_backend_fill_tl
{ \fp_eval:n { min(max(0,#1),1) } }
}
@@ -899,7 +903,7 @@
\group_insert_after:N \__opacity_backend_reset:
}
}
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
%%
%%
%% End of file `l3backend-luatex.def'.
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
index 1592155c3c0..d5c64bc74a4 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}{2023-04-19}{}
+ {l3backend-pdftex.def}{2023-10-10}{}
{L3 backend support: PDF output (pdfTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -45,7 +45,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 }
\cs_if_exist:NTF \@ifl@t@r
{
\@ifl@t@r \fmtversion { 2020-10-01 }
@@ -61,12 +60,17 @@
\tex_pdfliteral:D
{ \exp_not:n {#1} }
}
-\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { x }
+\cs_generate_variant:Nn \__kernel_backend_literal_pdf:n { e }
\cs_new_protected:Npn \__kernel_backend_literal_page:n #1
{
\tex_pdfliteral:D
page { \exp_not:n {#1} }
}
+\cs_new_protected:Npn \__kernel_backend_literal_page:e #1
+ {
+ \tex_pdfliteral:D
+ page {#1}
+ }
\cs_new_protected:Npn \__kernel_backend_scope_begin:
{
\tex_pdfsave:D
@@ -80,7 +84,7 @@
\tex_pdfsetmatrix:D
{ \exp_not:n {#1} }
}
-\cs_generate_variant:Nn \__kernel_backend_matrix:n { x }
+\cs_generate_variant:Nn \__kernel_backend_matrix:n { e }
%% File: l3backend-color.dtx
\int_new:N \l__color_backend_stack_int
\cs_new_protected:Npn \__kernel_color_backend_stack_init:Nnn #1#2#3
@@ -121,7 +125,7 @@
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_color_backend_stack_pop:n \l__color_backend_stack_int }
\prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
{
\exp_not:N \tl_if_blank:nF {#1}
{
@@ -156,7 +160,7 @@
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
{ \pdfmanagement_if_active_p: }
{
- \use:x
+ \use:e
{
\pdfmanagement_add:nnn
{ Page / Resources / ColorSpace }
@@ -167,7 +171,7 @@
}
\cs_new_protected:Npn \__color_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]
@@ -175,19 +179,19 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \exp_args:Nx \__color_backend_separation_init:nn
+ \exp_args:Ne \__color_backend_separation_init:nn
{ \str_convert_pdfname:n {#1} } {#2}
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
{ /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
}
- \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
{ \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -195,7 +199,7 @@
\pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
{
\pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
- \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+ \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
{
/Lab ~
<<
@@ -214,7 +218,7 @@
}
\cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
{
- \pdf_object_unnamed_write:nx { stream }
+ \pdf_object_unnamed_write:ne { stream }
{
{
/FunctionType ~ 4 ~
@@ -236,7 +240,7 @@
}
{ {#3} }
}
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -261,7 +265,7 @@
\pdf_object_if_exist:nF { __color_icc_ #1 }
{
\pdf_object_new:n { __color_icc_ #1 }
- \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+ \pdf_object_write:nne { __color_icc_ #1 } { fstream }
{
{
/N ~ \exp_not:n { #2 } ~
@@ -270,7 +274,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
@@ -285,7 +289,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { Default #2 }
}
@@ -325,7 +329,7 @@
\cs_new_protected:Npn \__box_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 } ~
@@ -347,7 +351,7 @@
\fp_compare:nNnT \l__box_backend_cos_fp = \c_zero_fp
{ \fp_zero:N \l__box_backend_cos_fp }
\fp_set:Nn \l__box_backend_sin_fp { round ( sind ( #2 ) , 5 ) }
- \__kernel_backend_matrix:x
+ \__kernel_backend_matrix:e
{
\fp_use:N \l__box_backend_cos_fp \c_space_tl
\fp_compare:nNnTF \l__box_backend_sin_fp = \c_zero_fp
@@ -368,7 +372,7 @@
\cs_new_protected:Npn \__box_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~
@@ -379,7 +383,7 @@
}
%% File: l3backend-draw.dtx
\cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
\cs_new_protected:Npn \__draw_backend_begin:
{ \__draw_backend_scope_begin: }
\cs_new_protected:Npn \__draw_backend_end:
@@ -388,17 +392,17 @@
\cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
\cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
}
\cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
}
\cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -408,7 +412,7 @@
}
\cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -428,24 +432,24 @@
{ \__draw_backend_literal:n { s } }
\cs_new_protected:Npn \__draw_backend_fill:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ f \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_fillstroke:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ B \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_clip:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ W \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_discardpath:
{ \__draw_backend_literal:n { n } }
\cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
[
\exp_args:Nf \use:n
@@ -458,11 +462,11 @@
{ ~ \dim_to_decimal_in_bp:n {#1} }
\cs_new_protected:Npn \__draw_backend_linewidth:n #1
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ w }
}
\cs_new_protected:Npn \__draw_backend_miterlimit:n #1
- { \__draw_backend_literal:x { #1 ~ M } }
+ { \__draw_backend_literal:e { #1 ~ M } }
\cs_new_protected:Npn \__draw_backend_cap_butt:
{ \__draw_backend_literal:n { 0 ~ J } }
\cs_new_protected:Npn \__draw_backend_cap_round:
@@ -509,7 +513,7 @@
{
\int_zero:N \l__graphics_page_int
\tl_clear:N \l__graphics_pagebox_tl
- \tl_set:Nx \l__graphics_attr_tl
+ \tl_set:Ne \l__graphics_attr_tl
{
\tl_if_empty:NF \l__graphics_decodearray_str
{ :D \l__graphics_decodearray_str }
@@ -526,7 +530,7 @@
{
\tl_clear:N \l__graphics_decodearray_str
\bool_set_false:N \l__graphics_interpolate_bool
- \tl_set:Nx \l__graphics_attr_tl
+ \tl_set:Ne \l__graphics_attr_tl
{
: \l__graphics_pagebox_tl
\int_compare:nNnT \l__graphics_page_int > 1
@@ -538,7 +542,7 @@
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxi:n #1
{
- \__graphics_bb_restore:xF { #1 \l__graphics_attr_tl }
+ \__graphics_bb_restore:eF { #1 \l__graphics_attr_tl }
{ \__graphics_backend_getbb_auxii:n {#1} }
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxii:n #1
@@ -547,7 +551,7 @@
{ \__graphics_backend_dequote:w #1 " #1 " \s__graphics_stop }
\int_const:cn { c__graphics_ #1 \l__graphics_attr_tl _int }
{ \tex_the:D \tex_pdflastximage:D }
- \__graphics_bb_save:x { #1 \l__graphics_attr_tl }
+ \__graphics_bb_save:e { #1 \l__graphics_attr_tl }
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxiii:n #1
{
@@ -598,7 +602,7 @@
\l__graphics_backend_dir_str
\l__graphics_backend_name_str
\l__graphics_backend_ext_str
- \exp_args:Nx \__graphics_backend_getbb_eps:nn
+ \exp_args:Ne \__graphics_backend_getbb_eps:nn
{
\exp_args:Ne \__kernel_file_name_quote:n
{
@@ -624,7 +628,7 @@
{
\file_parse_full_name:nNNN {#1}
\l__graphics_backend_dir_str \l__graphics_backend_name_str \l__graphics_backend_ext_str
- \exp_args:Nx \__graphics_backend_include_pdf:n
+ \exp_args:Ne \__graphics_backend_include_pdf:n
{
\exp_args:Ne \__kernel_file_name_quote:n
{
@@ -652,7 +656,7 @@
depth ~ \dim_eval:n {#3} ~
{#4}
}
-\cs_new:Npx \__pdf_backend_annotation_last:
+\cs_new:Npe \__pdf_backend_annotation_last:
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdflastannot:D
@@ -672,7 +676,7 @@
{
\tex_pdfendlink:D
}
-\cs_new:Npx \__pdf_backend_link_last:
+\cs_new:Npe \__pdf_backend_link_last:
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdflastlink:D
@@ -757,7 +761,7 @@
}
}
}
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
\cs_new:Npn \__pdf_exp_not_i:nn #1#2 { \exp_not:n {#1} }
\cs_new:Npn \__pdf_exp_not_ii:nn #1#2 { \exp_not:n {#2} }
\cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
@@ -765,14 +769,14 @@
\tex_immediate:D \tex_pdfobj:D
\__pdf_backend_object_write:nn {#1} {#2}
}
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
-\cs_new:Npx \__pdf_backend_object_last:
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
+\cs_new:Npe \__pdf_backend_object_last:
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdflastobj:D
\c_space_tl 0 ~ R
}
-\cs_new:Npx \__pdf_backend_pageobject_ref:n #1
+\cs_new:Npe \__pdf_backend_pageobject_ref:n #1
{
\exp_not:N \int_value:w
\exp_not:N \tex_pdfpageref:D
@@ -796,7 +800,7 @@
\tex_pdfobjcompresslevel:D
#1 \scan_stop:
}
-\cs_new_protected:Npx \__pdf_backend_version_major_gset:n #1
+\cs_new_protected:Npe \__pdf_backend_version_major_gset:n #1
{
\cs_if_exist:NT \tex_pdfmajorversion:D
{
@@ -810,7 +814,7 @@
\tex_pdfminorversion:D
\int_eval:n {#1} \scan_stop:
}
-\cs_new:Npx \__pdf_backend_version_major:
+\cs_new:Npe \__pdf_backend_version_major:
{
\cs_if_exist:NTF \tex_pdfmajorversion:D
{ \exp_not:N \tex_the:D \tex_pdfmajorversion:D }
@@ -844,7 +848,7 @@
\tl_new:N \l__opacity_backend_stroke_tl
\cs_new_protected:Npn \__opacity_backend_select:n #1
{
- \exp_args:Nx \__opacity_backend_select_aux:n
+ \exp_args:Ne \__opacity_backend_select_aux:n
{ \fp_eval:n { min(max(0,#1),1) } }
}
\cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -870,13 +874,13 @@
}
\cs_new_protected:Npn \__opacity_backend_fill:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
{ \fp_eval:n { min(max(0,#1),1) } }
\l__opacity_backend_stroke_tl
}
\cs_new_protected:Npn \__opacity_backend_stroke:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
\l__opacity_backend_fill_tl
{ \fp_eval:n { min(max(0,#1),1) } }
}
@@ -898,7 +902,7 @@
\group_insert_after:N \__opacity_backend_reset:
}
}
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
%%
%%
%% End of file `l3backend-pdftex.def'.
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
index 1f9966125c4..acdc2e7942f 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}{2023-04-19}{}
+ {l3backend-xetex.def}{2023-10-10}{}
{L3 backend support: XeTeX}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -45,7 +45,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 }
\cs_if_exist:NTF \@ifl@t@r
{
\@ifl@t@r \fmtversion { 2020-10-01 }
@@ -58,7 +57,7 @@
{ \cs_new_eq:NN \__kernel_backend_first_shipout:n \use:n }
\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 }
\cs_new_protected:Npn \__kernel_backend_literal_page:n #1
{ \__kernel_backend_literal:n { pdf:literal~direct~ #1 } }
\cs_new_protected:Npn \__kernel_backend_scope_begin:
@@ -82,7 +81,7 @@
\msg_new:nnn { color } { unknown-named-color }
{ Named~color~'#1'~is~not~known. }
\prop_new:N \g__color_backend_colorant_prop
-\cs_new:Npx \__color_backend_devicen_colorants:n #1
+\cs_new:Npe \__color_backend_devicen_colorants:n #1
{
\exp_not:N \tl_if_blank:nF {#1}
{
@@ -108,7 +107,7 @@
\__color_backend_devicen_colorants:w
}
\cs_new_protected:Npn \__color_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 ] } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
\cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn
\cs_new_protected:Npn \__color_backend_init_resource:n #1
@@ -116,7 +115,7 @@
}
\cs_new_protected:Npn \__color_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]
@@ -124,19 +123,19 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \exp_args:Nx \__color_backend_separation_init:nn
+ \exp_args:Ne \__color_backend_separation_init:nn
{ \str_convert_pdfname:n {#1} } {#2}
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
{ /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
}
- \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ \prop_gput:Nne \g__color_backend_colorant_prop { /#1 }
{ \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
@@ -144,7 +143,7 @@
\pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 }
{
\pdf_object_new:n { __color_illuminant_CIELAB_ #1 }
- \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array }
+ \pdf_object_write:nne { __color_illuminant_CIELAB_ #1 } { array }
{
/Lab ~
<<
@@ -163,7 +162,7 @@
}
\cs_new_protected:Npn \__color_backend_devicen_init:nnn #1#2#3
{
- \pdf_object_unnamed_write:nx { stream }
+ \pdf_object_unnamed_write:ne { stream }
{
{
/FunctionType ~ 4 ~
@@ -185,7 +184,7 @@
}
{ {#3} }
}
- \use:x
+ \use:e
{
\pdf_object_new:n { color \int_use:N \g__color_model_int }
\pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array }
@@ -210,7 +209,7 @@
\pdf_object_if_exist:nF { __color_icc_ #1 }
{
\pdf_object_new:n { __color_icc_ #1 }
- \pdf_object_write:nnx { __color_icc_ #1 } { fstream }
+ \pdf_object_write:nne { __color_icc_ #1 } { fstream }
{
{
/N ~ \exp_not:n { #2 } ~
@@ -219,7 +218,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { color \int_use:N \g__color_model_int }
}
@@ -234,7 +233,7 @@
{#1}
}
}
- \pdf_object_unnamed_write:nx { array }
+ \pdf_object_unnamed_write:ne { array }
{ /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } }
\__color_backend_init_resource:n { Default #2 }
}
@@ -250,12 +249,12 @@
\cs_new_eq:NN \__color_backend_stroke_rgb:n \__color_backend_stroke:n
\cs_new_protected:Npn \__color_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 \__color_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 \__color_backend_fill_devicen:nn \__color_backend_fill_separation:nn
@@ -266,7 +265,7 @@
\cs_new_protected:Npn \__box_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 } ~
@@ -283,7 +282,7 @@
\cs_new_protected:Npn \__box_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
@@ -296,7 +295,7 @@
\cs_new_protected:Npn \__box_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 ) } ~
@@ -307,7 +306,7 @@
}
%% File: l3backend-draw.dtx
\cs_new_eq:NN \__draw_backend_literal:n \__kernel_backend_literal_pdf:n
-\cs_generate_variant:Nn \__draw_backend_literal:n { x }
+\cs_generate_variant:Nn \__draw_backend_literal:n { e }
\cs_new_protected:Npn \__draw_backend_begin:
{ \__draw_backend_scope_begin: }
\cs_new_protected:Npn \__draw_backend_end:
@@ -316,17 +315,17 @@
\cs_new_eq:NN \__draw_backend_scope_end: \__kernel_backend_scope_end:
\cs_new_protected:Npn \__draw_backend_moveto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m }
}
\cs_new_protected:Npn \__draw_backend_lineto:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l }
}
\cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -336,7 +335,7 @@
}
\cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
\dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~
\dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~
@@ -356,24 +355,24 @@
{ \__draw_backend_literal:n { s } }
\cs_new_protected:Npn \__draw_backend_fill:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ f \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_fillstroke:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ B \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_clip:
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ W \bool_if:NT \g__draw_draw_eor_bool * }
}
\cs_new_protected:Npn \__draw_backend_discardpath:
{ \__draw_backend_literal:n { n } }
\cs_new_protected:Npn \__draw_backend_dash_pattern:nn #1#2
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{
[
\exp_args:Nf \use:n
@@ -386,11 +385,11 @@
{ ~ \dim_to_decimal_in_bp:n {#1} }
\cs_new_protected:Npn \__draw_backend_linewidth:n #1
{
- \__draw_backend_literal:x
+ \__draw_backend_literal:e
{ \dim_to_decimal_in_bp:n {#1} ~ w }
}
\cs_new_protected:Npn \__draw_backend_miterlimit:n #1
- { \__draw_backend_literal:x { #1 ~ M } }
+ { \__draw_backend_literal:e { #1 ~ M } }
\cs_new_protected:Npn \__draw_backend_cap_butt:
{ \__draw_backend_literal:n { 0 ~ J } }
\cs_new_protected:Npn \__draw_backend_cap_round:
@@ -410,20 +409,20 @@
}
\cs_new_protected:Npn \__draw_backend_cm_aux:nnnn #1#2#3#4
{
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
x:rotate~
\fp_compare:nNnTF {#1} = \c_zero_fp
{ 0 }
{ \fp_eval:n { round ( -#1 , 5 ) } }
}
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
x:scale~
\fp_eval:n { round ( #2 , 5 ) } ~
\fp_eval:n { round ( #3 , 5 ) }
}
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
x:rotate~
\fp_compare:nNnTF {#4} = \c_zero_fp
@@ -433,7 +432,7 @@
}
\cs_new_protected:Npn \__draw_backend_cm_decompose:nnnnN #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__draw_backend_cm_decompose_auxi:nnnnN
{ \fp_eval:n { (#1 + #4) / 2 } }
@@ -445,7 +444,7 @@
}
\cs_new_protected:Npn \__draw_backend_cm_decompose_auxi:nnnnN #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__draw_backend_cm_decompose_auxii:nnnnN
{ \fp_eval:n { 2 * sqrt ( #1 * #1 + #4 * #4 ) } }
@@ -457,7 +456,7 @@
}
\cs_new_protected:Npn \__draw_backend_cm_decompose_auxii:nnnnN #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__draw_backend_cm_decompose_auxiii:nnnnN
{ \fp_eval:n { ( #4 - #3 ) / 2 } }
@@ -507,7 +506,7 @@
\int_new:N \g__graphics_track_int
\cs_new_protected:Npn \__graphics_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__graphics_llx_dim \c_space_tl
@@ -524,7 +523,7 @@
\cs_new_eq:NN \__graphics_backend_include_bmp:n \__graphics_backend_include_jpg:n
\cs_new_protected:Npn \__graphics_backend_include_auxi:nn #1#2
{
- \__graphics_backend_include_auxii:xnn
+ \__graphics_backend_include_auxii:enn
{
\tl_if_empty:NF \l__graphics_pagebox_tl
{ : \l__graphics_pagebox_tl }
@@ -541,17 +540,17 @@
{
\int_if_exist:cTF { c__graphics_ #2#1 _int }
{
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{ pdf:usexobj~@graphic \int_use:c { c__graphics_ #2#1 _int } }
}
{ \__graphics_backend_include_auxiii:nnn {#2} {#1} {#3} }
}
-\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { x }
+\cs_generate_variant:Nn \__graphics_backend_include_auxii:nnn { e }
\cs_new_protected:Npn \__graphics_backend_include_auxiii:nnn #1#2#3
{
\int_gincr:N \g__graphics_track_int
\int_const:cn { c__graphics_ #1#2 _int } { \g__graphics_track_int }
- \__kernel_backend_literal:x
+ \__kernel_backend_literal:e
{
pdf:#3~
@graphic \int_use:c { c__graphics_ #1#2 _int } ~
@@ -613,7 +612,7 @@
}
\cs_new_protected:Npn \__graphics_backend_getbb_auxiv:nnNnn #1#2#3#4#5
{
- \use:x
+ \use:e
{
\__graphics_backend_getbb_auxv:nNnn {#2} #3 { : #1 #4 }
{
@@ -655,9 +654,9 @@
}
%% File: l3backend-pdf.dtx
\box_new:N \l__pdf_internal_box
-\cs_new_protected:Npx \__pdf_backend:n #1
+\cs_new_protected:Npe \__pdf_backend:n #1
{ \__kernel_backend_literal:n { pdf: #1 } }
-\cs_generate_variant:Nn \__pdf_backend:n { x }
+\cs_generate_variant:Nn \__pdf_backend:n { e }
\cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2
{ \__pdf_backend:n { put ~ @catalog << /#1 ~ #2 >> } }
\cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2
@@ -678,15 +677,15 @@
\use:c { __pdf_backend_object_write_ #2 :nn }
{ \__pdf_backend_object_ref:n {#1} } {#3}
}
-\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx }
+\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nne }
\cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2
{
- \__pdf_backend:x
+ \__pdf_backend:e
{ obj ~ #1 ~ [ ~ \exp_not:n {#2} ~ ] }
}
\cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
{
- \__pdf_backend:x
+ \__pdf_backend:e
{ obj ~ #1 ~ << ~ \exp_not:n {#2} ~ >> }
}
\cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2
@@ -695,7 +694,7 @@
{ \__pdf_backend_object_write_stream:nnnn { } {#1} #2 }
\cs_new_protected:Npn \__pdf_backend_object_write_stream:nnnn #1#2#3#4
{
- \__pdf_backend:x
+ \__pdf_backend:e
{
#1 stream ~ #2 ~
( \exp_not:n {#4} ) ~ << \exp_not:n {#3} >>
@@ -704,11 +703,11 @@
\cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2
{
\int_gincr:N \g__pdf_backend_object_int
- \exp_args:Nnx \use:c { __pdf_backend_object_write_ #1 :nn }
+ \exp_args:Nne \use:c { __pdf_backend_object_write_ #1 :nn }
{ @pdf.obj \int_use:N \g__pdf_backend_object_int }
{#2}
}
-\cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx }
+\cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne }
\cs_new:Npn \__pdf_backend_object_last:
{ @pdf.obj \int_use:N \g__pdf_backend_object_int }
\cs_new:Npn \__pdf_backend_pageobject_ref:n #1
@@ -718,7 +717,7 @@
{
\int_gincr:N \g__pdf_backend_object_int
\int_gset_eq:NN \g__pdf_backend_annotation_int \g__pdf_backend_object_int
- \__pdf_backend:x
+ \__pdf_backend:e
{
ann ~ @pdf.obj \int_use:N \g__pdf_backend_object_int \c_space_tl
width ~ \dim_eval:n {#1} ~
@@ -734,10 +733,10 @@
{ \__pdf_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } }
\cs_new_protected:Npn \__pdf_backend_link_begin_user:nnw #1#2
{ \__pdf_backend_link_begin:n {#1#2} }
-\cs_new_protected:Npx \__pdf_backend_link_begin:n #1
+\cs_new_protected:Npe \__pdf_backend_link_begin:n #1
{
\exp_not:N \int_gincr:N \exp_not:N \g__pdf_backend_link_int
- \__pdf_backend:x
+ \__pdf_backend:e
{
bann ~
@pdf.lnk
@@ -754,10 +753,10 @@
\cs_new:Npn \__pdf_backend_link_last:
{ @pdf.lnk \int_use:N \g__pdf_backend_link_int }
\cs_new_protected:Npn \__pdf_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} } }
\cs_new_protected:Npn \__pdf_backend_destination:nn #1#2
{
- \__pdf_backend:x
+ \__pdf_backend:e
{
dest ~ ( \exp_not:n {#1} )
[
@@ -816,7 +815,7 @@
\__kernel_kern:n { -#1 }
}
\cs_new_protected:Npn \__pdf_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 \__pdf_backend_compress_objects:n #1
{
\bool_if:nF {#1}
@@ -824,13 +823,13 @@
}
\cs_new_protected:Npn \__pdf_backend_version_major_gset:n #1
{
- \cs_gset:Npx \__pdf_backend_version_major: { \int_eval:n {#1} }
- \__kernel_backend_literal:x { pdf:majorversion~ \__pdf_backend_version_major: }
+ \cs_gset:Npe \__pdf_backend_version_major: { \int_eval:n {#1} }
+ \__kernel_backend_literal:e { pdf:majorversion~ \__pdf_backend_version_major: }
}
\cs_new_protected:Npn \__pdf_backend_version_minor_gset:n #1
{
- \cs_gset:Npx \__pdf_backend_version_minor: { \int_eval:n {#1} }
- \__kernel_backend_literal:x { pdf:minorversion~ \__pdf_backend_version_minor: }
+ \cs_gset:Npe \__pdf_backend_version_minor: { \int_eval:n {#1} }
+ \__kernel_backend_literal:e { pdf:minorversion~ \__pdf_backend_version_minor: }
}
\cs_new:Npn \__pdf_backend_version_major: { 1 }
\cs_new:Npn \__pdf_backend_version_minor: { 5 }
@@ -855,7 +854,7 @@
\tl_new:N \l__opacity_backend_stroke_tl
\cs_new_protected:Npn \__opacity_backend_select:n #1
{
- \exp_args:Nx \__opacity_backend_select_aux:n
+ \exp_args:Ne \__opacity_backend_select_aux:n
{ \fp_eval:n { min(max(0,#1),1) } }
}
\cs_new_protected:Npn \__opacity_backend_select_aux:n #1
@@ -882,13 +881,13 @@
}
\cs_new_protected:Npn \__opacity_backend_fill:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
{ \fp_eval:n { min(max(0,#1),1) } }
\l__opacity_backend_stroke_tl
}
\cs_new_protected:Npn \__opacity_backend_stroke:n #1
{
- \__opacity_backend_fill_stroke:xx
+ \__opacity_backend_fill_stroke:ee
\l__opacity_backend_fill_tl
{ \fp_eval:n { min(max(0,#1),1) } }
}
@@ -910,7 +909,7 @@
\group_insert_after:N \__opacity_backend_reset:
}
}
-\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { xx }
+\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee }
%%
%%
%% End of file `l3backend-xetex.def'.