diff options
author | Karl Berry <karl@freefriends.org> | 2020-06-03 21:26:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-06-03 21:26:23 +0000 |
commit | 810785e2302cd260eb73f01e897c5e5978963cb8 (patch) | |
tree | a832daf8f6a5bc8c0d1dc54758abb5561e93cdb9 /Master/texmf-dist/tex/latex/l3backend | |
parent | 27b8d6a6263cb4e808d7f6ad452462f9f455e97c (diff) |
l3 (3jun20)
git-svn-id: svn://tug.org/texlive/trunk@55406 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3backend')
5 files changed, 60 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 2e4d20ed039..a82491c6aaa 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2020-05-05}{} + {l3backend-dvipdfmx.def}{2020-06-03}{} {L3 backend support: dvipdfmx} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -58,14 +58,14 @@ } { \exp_last_unbraced:Nx \__color_backend_pickup:w - { \current@color } \q_stop #1 + { \current@color } \s__color_stop #1 } } - \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \q_stop #3 + \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3 { \tl_set:Nn #3 { #1 ~ #2 } } } } -\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop { \__color_backend_select:x { @@ -74,14 +74,14 @@ \fp_eval:n {#3} ~ \fp_eval:n {#4} } } -\cs_new_protected:Npn \__color_backend_gray:n #1 +\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop { \__color_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 +\cs_new_protected:Npn \__color_backend_rgb:w #1 ~ #2 ~ #3 \s__color_stop { \__color_backend_select:x { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } } -\cs_new_protected:Npn \__color_backend_spot:nn #1#2 +\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop { \__color_backend_select:n { #1 } } \cs_new_protected:Npn \__color_backend_select:n #1 { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index bc6e7ba30f7..4c768d9628a 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2020-05-05}{} + {l3backend-dvips.def}{2020-06-03}{} {L3 backend support: dvips} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -79,14 +79,14 @@ } { \exp_last_unbraced:Nx \__color_backend_pickup:w - { \current@color } \q_stop #1 + { \current@color } \s__color_stop #1 } } - \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \q_stop #3 + \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3 { \tl_set:Nn #3 { #1 ~ #2 } } } } -\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop { \__color_backend_select:x { @@ -95,14 +95,14 @@ \fp_eval:n {#3} ~ \fp_eval:n {#4} } } -\cs_new_protected:Npn \__color_backend_gray:n #1 +\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop { \__color_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 +\cs_new_protected:Npn \__color_backend_rgb:w #1 ~ #2 ~ #3 \s__color_stop { \__color_backend_select:x { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } } -\cs_new_protected:Npn \__color_backend_spot:nn #1#2 +\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop { \__color_backend_select:n { #1 } } \cs_new_protected:Npn \__color_backend_select:n #1 { @@ -472,13 +472,28 @@ \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2 { \__pdf_backend_pdfmark:x - { #1 [ ~ \exp_not:n {#2} ~ ] ~ /PUTINTERVAL } + { #1 ~0~ [ ~ \exp_not:n {#2} ~ ] ~ /PUTINTERVAL } } \cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2 { \__pdf_backend_pdfmark:x { #1 << \exp_not:n {#2} >> /PUT } } +\cs_new_protected:Npn \__pdf_backend_object_write_fstream:nn #1#2 + { + \exp_args:Nx + \__pdf_backend_object_write_fstream:nnn {#1} #2 + } +\cs_new_protected:Npn \__pdf_backend_object_write_fstream:nnn #1#2#3 + { + \__kernel_backend_postscript:n + { + SDict ~ begin ~ + mark ~ #1 ~ << #2 >> /PUT ~ pdfmark ~ + mark ~ #1 ~ ( #3 )~ ( r )~ file ~ /PUT ~ pdfmark ~ + end + } + } \cs_new_protected:Npn \__pdf_backend_object_write_stream:nn #1#2 { \exp_args:Nx @@ -488,7 +503,6 @@ { \__kernel_backend_postscript:n { - [nobreak] mark ~ #1 ~ ( #3 ) /PUT ~ pdfmark ~ mark ~ #1 ~ << #2 >> /PUT ~ pdfmark } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index c548b96c3aa..06d084a246d 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2020-05-05}{} + {l3backend-dvisvgm.def}{2020-06-03}{} {L3 backend support: dvisvgm} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -59,14 +59,14 @@ } { \exp_last_unbraced:Nx \__color_backend_pickup:w - { \current@color } \q_stop #1 + { \current@color } \s__color_stop #1 } } - \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \q_stop #3 + \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3 { \tl_set:Nn #3 { #1 ~ #2 } } } } -\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop { \__color_backend_select:x { @@ -75,14 +75,14 @@ \fp_eval:n {#3} ~ \fp_eval:n {#4} } } -\cs_new_protected:Npn \__color_backend_gray:n #1 +\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop { \__color_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 +\cs_new_protected:Npn \__color_backend_rgb:w #1 ~ #2 ~ #3 \s__color_stop { \__color_backend_select:x { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } } -\cs_new_protected:Npn \__color_backend_spot:nn #1#2 +\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop { \__color_backend_select:n { #1 } } \cs_new_protected:Npn \__color_backend_select:n #1 { @@ -498,11 +498,11 @@ dvisvgm:img~ \dim_to_decimal:n { \l_graphics_ury_dim } ~ \dim_to_decimal:n { \l_graphics_ury_dim } ~ - \__graphics_backend_include_bitmap_quote:w #1 " #1 " \q_stop + \__graphics_backend_include_bitmap_quote:w #1 " #1 " \s__graphics_stop } } \cs_new_eq:NN \__graphics_backend_include_jpg:n \__graphics_backend_include_png:n -\cs_new:Npn \__graphics_backend_include_bitmap_quote:w #1 " #2 " #3 \q_stop +\cs_new:Npn \__graphics_backend_include_bitmap_quote:w #1 " #2 " #3 \s__graphics_stop { " #2 " } %% File: l3backend-pdf.dtx \box_new:N \l__pdf_internal_box diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def index 17ebeeafbdd..1e89dc857e6 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdfmode.def}{2020-05-05}{} + {l3backend-pdfmode.def}{2020-06-03}{} {L3 backend support: PDF mode} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -76,10 +76,10 @@ \cs_set_protected:Npn \__color_backend_pickup:N #1 { \exp_last_unbraced:Nx \__color_backend_pickup:w - { \current@color } ~ 0 ~ 0 ~ 0 \q_stop #1 + { \current@color } ~ 0 ~ 0 ~ 0 \s__color_stop #1 } \cs_new_protected:Npn \__color_backend_pickup:w - #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop #7 + #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s__color_stop #7 { \str_if_eq:nnTF {#2} { g } { \tl_set:Nn #7 { gray ~ #1 } } @@ -104,39 +104,39 @@ } } \int_new:N \l__kernel_color_stack_int -\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop { \use:x { - \__color_backend_cmyk_aux:nnnn + \__color_backend_cmyk:nnnn { \fp_eval:n {#1} } { \fp_eval:n {#2} } { \fp_eval:n {#3} } { \fp_eval:n {#4} } } } -\cs_new_protected:Npn \__color_backend_cmyk_aux:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 { \__color_backend_select:n { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K } } +\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop + { \exp_args:Nx \__color_backend_gray:n { \fp_eval:n {#1} } } \cs_new_protected:Npn \__color_backend_gray:n #1 - { \exp_args:Nx \__color_backend_gray_aux:n { \fp_eval:n {#1} } } -\cs_new_protected:Npn \__color_backend_gray_aux:n #1 { \__color_backend_select:n { #1 ~ g ~ #1 ~ G } } -\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 +\cs_new_protected:Npn \__color_backend_rgb:w #1~ #2 ~ #3 \s__color_stop { \use:x { - \__color_backend_rgb_aux:nnn + \__color_backend_rgb:nnn { \fp_eval:n {#1} } { \fp_eval:n {#2} } { \fp_eval:n {#3} } } } -\cs_new_protected:Npn \__color_backend_rgb_aux:nnn #1#2#3 +\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 { \__color_backend_select:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } } -\cs_new_protected:Npn \__color_backend_spot:nn #1#2 +\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop { \__color_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC } } \cs_new_protected:Npx \__color_backend_select:n #1 { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def index 8065a5ce5ca..e385c1bcf80 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xdvipdfmx.def}{2020-05-05}{} + {l3backend-xdvipdfmx.def}{2020-06-03}{} {L3 backend support: xdvipdfmx} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -58,14 +58,14 @@ } { \exp_last_unbraced:Nx \__color_backend_pickup:w - { \current@color } \q_stop #1 + { \current@color } \s__color_stop #1 } } - \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \q_stop #3 + \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3 { \tl_set:Nn #3 { #1 ~ #2 } } } } -\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop { \__color_backend_select:x { @@ -74,14 +74,14 @@ \fp_eval:n {#3} ~ \fp_eval:n {#4} } } -\cs_new_protected:Npn \__color_backend_gray:n #1 +\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop { \__color_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 +\cs_new_protected:Npn \__color_backend_rgb:w #1 ~ #2 ~ #3 \s__color_stop { \__color_backend_select:x { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } } -\cs_new_protected:Npn \__color_backend_spot:nn #1#2 +\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop { \__color_backend_select:n { #1 } } \cs_new_protected:Npn \__color_backend_select:n #1 { @@ -480,12 +480,12 @@ \cs_new_protected:Npn \__graphics_backend_include_pdf:n #1 { \tex_XeTeXpdffile:D - \__graphics_backend_include_pdf_quote:w #1 "#1" \q_stop \c_space_tl + \__graphics_backend_include_pdf_quote:w #1 "#1" \s__graphics_stop \c_space_tl \int_compare:nNnT \l_graphics_page_int > 0 { page ~ \int_use:N \l_graphics_page_int \c_space_tl } \exp_after:wN \__graphics_backend_getbb_pagebox:w \l_graphics_pagebox_tl } -\cs_new:Npn \__graphics_backend_include_pdf_quote:w #1 " #2 " #3 \q_stop +\cs_new:Npn \__graphics_backend_include_pdf_quote:w #1 " #2 " #3 \s__graphics_stop { " #2 " } %% File: l3backend-pdf.dtx \box_new:N \l__pdf_internal_box |