diff options
author | Karl Berry <karl@freefriends.org> | 2023-10-10 20:27:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-10-10 20:27:00 +0000 |
commit | 1045e3f70340d9f7540d9c9328a282ee84f88a51 (patch) | |
tree | ab54e08e01a041bf9bfd650d8981c1f63214a169 /Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def | |
parent | f92a7f650889a8bbbd6ff151a911a35c25fa2901 (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/l3backend-luatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def | 100 |
1 files changed, 52 insertions, 48 deletions
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'. |