diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-14 20:24:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-14 20:24:49 +0000 |
commit | 7bad9b14c550da9ae08669e681e2d94c11bddd9e (patch) | |
tree | ed81b7a7d34eb2da325026d3977131cdb8044c00 /Master/texmf-dist/tex/latex/l3backend | |
parent | 2bb8d5e07c328b2737d7e4ba46365bffa060b64f (diff) |
l3 (14mar24)
git-svn-id: svn://tug.org/texlive/trunk@70637 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3backend')
6 files changed, 92 insertions, 106 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 128c0026999..667093f3174 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}{2024-02-20}{} + {l3backend-dvipdfmx.def}{2024-03-14}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -798,20 +798,17 @@ %% File: l3backend-opacity.dtx \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity 1 } { << /ca ~ 1 /CA ~ 1 >> } } \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl +\tl_set:Nn \l__opacity_backend_fill_tl { 1 } +\tl_set:Nn \l__opacity_backend_stroke_tl { 1 } \cs_new_protected:Npn \__opacity_backend_select:n #1 { - \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 - { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#1} \pdfmanagement_add:nnn { Page / Resources / ExtGState } @@ -821,12 +818,6 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\bool_lazy_and:nnF - { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} - { - \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } - } \cs_new_protected:Npn \__opacity_backend_reset: { \__kernel_backend_literal_pdf:n @@ -834,20 +825,20 @@ } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { - \__opacity_backend_fill_stroke:ee - { \fp_eval:n { min(max(0,#1),1) } } - \l__opacity_backend_stroke_tl + \exp_args:Nno \__opacity_backend_fill_stroke:nn + { #1 } + { \l__opacity_backend_stroke_tl } } \cs_new_protected:Npn \__opacity_backend_stroke:n #1 { - \__opacity_backend_fill_stroke:ee - \l__opacity_backend_fill_tl - { \fp_eval:n { min(max(0,#1),1) } } + \exp_args:No \__opacity_backend_fill_stroke:nn + { \l__opacity_backend_fill_tl } + { #1 } } \cs_new_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { \str_if_eq:nnTF {#1} {#2} - { \__opacity_backend_select_aux:n {#1} } + { \__opacity_backend_select:n {#1} } { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#2} @@ -855,14 +846,20 @@ { opacity.fill #1 } { << /ca ~ #1 >> } \pdfmanagement_add:nnn { Page / Resources / ExtGState } - { opacity.stroke #1 } + { opacity.stroke #2 } { << /CA ~ #2 >> } \__kernel_backend_literal_pdf:n { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } -\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee } +\bool_lazy_and:nnF + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p: } + { + \cs_gset_protected:Npn \__opacity_backend_select:n #1 { } + \cs_gset_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { } + } %% %% %% 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 b808ec8c6de..d5bd655a922 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}{2024-02-20}{} + {l3backend-dvips.def}{2024-03-14}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -388,13 +388,14 @@ \cs_generate_variant:Nn \__draw_backend_literal:n { e } \cs_new_protected:Npn \__draw_backend_begin: { - \__kernel_backend_literal:n { ps::[begin] } + \__draw_backend_literal:n { [begin] } + \__draw_backend_literal:n { /draw.x~currentpoint~/draw.y~exch~def~def } \__draw_backend_literal:n { @beginspecial } } \cs_new_protected:Npn \__draw_backend_end: { \__draw_backend_literal:n { @endspecial } - \__kernel_backend_literal:n { ps::[end] } + \__draw_backend_literal:n { [end] } } \cs_new_protected:Npn \__draw_backend_scope_begin: { \__draw_backend_literal:n { save } } @@ -559,7 +560,10 @@ } \cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5 { - \__draw_backend_literal:n { @endspecial } + \__draw_backend_literal:n { save } + \__draw_backend_literal:n { 72~Resolution~div~72~VResolution~div~neg~scale } + \__draw_backend_literal:n { magscale { 1~DVImag~div~dup~scale } if } + \__draw_backend_literal:n { draw.x~neg~draw.y~neg~translate } \__draw_backend_literal:n { [end] } \__draw_backend_literal:n { [begin] } \__draw_backend_literal:n { save } @@ -575,7 +579,7 @@ \__draw_backend_literal:n { restore } \__draw_backend_literal:n { [end] } \__draw_backend_literal:n { [begin] } - \__draw_backend_literal:n { @beginspecial } + \__draw_backend_literal:n { restore } } %% File: l3backend-graphics.dtx \cs_new_protected:Npn \__graphics_backend_loaded:n #1 @@ -1025,25 +1029,20 @@ %% File: l3backend-opacity.dtx \cs_new_protected:Npn \__opacity_backend_select:n #1 { - \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 - { \__opacity_backend:nnn {#1} { fill } { ca } \__opacity_backend:nnn {#1} { stroke } { CA } } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { - \__opacity_backend:enn - { \fp_eval:n { min(max(0,#1),1) } } + \__opacity_backend:nnn + { #1 } { fill } { ca } } \cs_new_protected:Npn \__opacity_backend_stroke:n #1 { - \__opacity_backend:enn - { \fp_eval:n { min(max(0,#1),1) } } + \__opacity_backend:nnn + { #1 } { stroke } { CA } } @@ -1066,7 +1065,6 @@ ifelse } } -\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 a51db469052..2e3c3cacb44 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}{2024-02-20}{} + {l3backend-dvisvgm.def}{2024-03-14}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -663,9 +663,9 @@ \cs_new_protected:Npn \__opacity_backend_fill:n #1 { \__opacity_backend:nn {#1} { fill- } } \cs_new_protected:Npn \__opacity_backend_stroke:n #1 - { \__opacity_backend:nn { {#1} } { stroke- } } + { \__opacity_backend:nn {#1} { stroke- } } \cs_new_protected:Npn \__opacity_backend:nn #1#2 - { \__kernel_backend_scope:e { #2 opacity = " \fp_eval:n { min(max(0,#1),1) } " } } + { \__kernel_backend_scope:e { #2 opacity = " #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 e4369908111..aaa8312d5d8 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}{2024-02-20}{} + {l3backend-luatex.def}{2024-03-14}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -838,7 +838,7 @@ %% File: l3backend-opacity.dtx \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -847,13 +847,10 @@ } \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl +\tl_set:Nn \l__opacity_backend_fill_tl { 1 } +\tl_set:Nn \l__opacity_backend_stroke_tl { 1 } \cs_new_protected:Npn \__opacity_backend_select:n #1 { - \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 - { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#1} \pdfmanagement_add:nnn { Page / Resources / ExtGState } @@ -863,32 +860,26 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\bool_lazy_and:nnF - { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} - { - \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } - } \cs_new_protected:Npn \__opacity_backend_reset: { \__kernel_color_backend_stack_pop:n \c__opacity_backend_stack_int } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { - \__opacity_backend_fill_stroke:ee - { \fp_eval:n { min(max(0,#1),1) } } - \l__opacity_backend_stroke_tl + \exp_args:Nno \__opacity_backend_fill_stroke:nn + { #1 } + { \l__opacity_backend_stroke_tl } } \cs_new_protected:Npn \__opacity_backend_stroke:n #1 { - \__opacity_backend_fill_stroke:ee - \l__opacity_backend_fill_tl - { \fp_eval:n { min(max(0,#1),1) } } + \exp_args:No \__opacity_backend_fill_stroke:nn + { \l__opacity_backend_fill_tl } + { #1 } } \cs_new_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { \str_if_eq:nnTF {#1} {#2} - { \__opacity_backend_select_aux:n {#1} } + { \__opacity_backend_select:n {#1} } { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#2} @@ -896,14 +887,20 @@ { opacity.fill #1 } { << /ca ~ #1 >> } \pdfmanagement_add:nnn { Page / Resources / ExtGState } - { opacity.stroke #1 } + { opacity.stroke #2 } { << /CA ~ #2 >> } \__kernel_color_backend_stack_push:nn \c__opacity_backend_stack_int { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } -\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee } +\bool_lazy_and:nnF + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p: } + { + \cs_gset_protected:Npn \__opacity_backend_select:n #1 { } + \cs_gset_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { } + } %% %% %% 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 0258ebe3284..2ef1d26d116 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}{2024-02-20}{} + {l3backend-pdftex.def}{2024-03-14}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -837,7 +837,7 @@ %% File: l3backend-opacity.dtx \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -846,13 +846,10 @@ } \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl +\tl_set:Nn \l__opacity_backend_fill_tl { 1 } +\tl_set:Nn \l__opacity_backend_stroke_tl { 1 } \cs_new_protected:Npn \__opacity_backend_select:n #1 { - \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 - { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#1} \pdfmanagement_add:nnn { Page / Resources / ExtGState } @@ -862,32 +859,26 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\bool_lazy_and:nnF - { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} - { - \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } - } \cs_new_protected:Npn \__opacity_backend_reset: { \__kernel_color_backend_stack_pop:n \c__opacity_backend_stack_int } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { - \__opacity_backend_fill_stroke:ee - { \fp_eval:n { min(max(0,#1),1) } } - \l__opacity_backend_stroke_tl + \exp_args:Nno \__opacity_backend_fill_stroke:nn + { #1 } + { \l__opacity_backend_stroke_tl } } \cs_new_protected:Npn \__opacity_backend_stroke:n #1 { - \__opacity_backend_fill_stroke:ee - \l__opacity_backend_fill_tl - { \fp_eval:n { min(max(0,#1),1) } } + \exp_args:No \__opacity_backend_fill_stroke:nn + { \l__opacity_backend_fill_tl } + { #1 } } \cs_new_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { \str_if_eq:nnTF {#1} {#2} - { \__opacity_backend_select_aux:n {#1} } + { \__opacity_backend_select:n {#1} } { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#2} @@ -895,14 +886,20 @@ { opacity.fill #1 } { << /ca ~ #1 >> } \pdfmanagement_add:nnn { Page / Resources / ExtGState } - { opacity.stroke #1 } + { opacity.stroke #2 } { << /CA ~ #2 >> } \__kernel_color_backend_stack_push:nn \c__opacity_backend_stack_int { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } -\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee } +\bool_lazy_and:nnF + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p: } + { + \cs_gset_protected:Npn \__opacity_backend_select:n #1 { } + \cs_gset_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { } + } %% %% %% 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 bab5a7d20ce..798bd686f2a 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}{2024-02-20}{} + {l3backend-xetex.def}{2024-03-14}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -845,20 +845,17 @@ %% File: l3backend-opacity.dtx \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity 1 } { << /ca ~ 1 /CA ~ 1 >> } } \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl +\tl_set:Nn \l__opacity_backend_fill_tl { 1 } +\tl_set:Nn \l__opacity_backend_stroke_tl { 1 } \cs_new_protected:Npn \__opacity_backend_select:n #1 { - \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 - { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#1} \pdfmanagement_add:nnn { Page / Resources / ExtGState } @@ -868,12 +865,6 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\bool_lazy_and:nnF - { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} - { - \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } - } \cs_new_protected:Npn \__opacity_backend_reset: { \__kernel_backend_literal_pdf:n @@ -881,20 +872,20 @@ } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { - \__opacity_backend_fill_stroke:ee - { \fp_eval:n { min(max(0,#1),1) } } - \l__opacity_backend_stroke_tl + \exp_args:Nno \__opacity_backend_fill_stroke:nn + { #1 } + { \l__opacity_backend_stroke_tl } } \cs_new_protected:Npn \__opacity_backend_stroke:n #1 { - \__opacity_backend_fill_stroke:ee - \l__opacity_backend_fill_tl - { \fp_eval:n { min(max(0,#1),1) } } + \exp_args:No \__opacity_backend_fill_stroke:nn + { \l__opacity_backend_fill_tl } + { #1 } } \cs_new_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { \str_if_eq:nnTF {#1} {#2} - { \__opacity_backend_select_aux:n {#1} } + { \__opacity_backend_select:n {#1} } { \tl_set:Nn \l__opacity_backend_fill_tl {#1} \tl_set:Nn \l__opacity_backend_stroke_tl {#2} @@ -902,14 +893,20 @@ { opacity.fill #1 } { << /ca ~ #1 >> } \pdfmanagement_add:nnn { Page / Resources / ExtGState } - { opacity.stroke #1 } + { opacity.stroke #2 } { << /CA ~ #2 >> } \__kernel_backend_literal_pdf:n { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } -\cs_generate_variant:Nn \__opacity_backend_fill_stroke:nn { ee } +\bool_lazy_and:nnF + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p: } + { + \cs_gset_protected:Npn \__opacity_backend_select:n #1 { } + \cs_gset_protected:Npn \__opacity_backend_fill_stroke:nn #1#2 { } + } %% %% %% End of file `l3backend-xetex.def'. |