From 9b9af3f98ce453fa388221fbb39b765facc75146 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Oct 2021 20:07:20 +0000 Subject: l3 (12oct21) git-svn-id: svn://tug.org/texlive/trunk@60743 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3backend/l3backend-dvipdfmx.def | 8 ++++---- .../tex/latex/l3backend/l3backend-dvips.def | 19 ++++++++++--------- .../tex/latex/l3backend/l3backend-dvisvgm.def | 2 +- .../tex/latex/l3backend/l3backend-luatex.def | 8 ++++---- .../tex/latex/l3backend/l3backend-pdftex.def | 8 ++++---- .../tex/latex/l3backend/l3backend-xetex.def | 8 ++++---- Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 15 ++++++++------- .../texmf-dist/tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- 10 files changed, 38 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 4c9e8978870..dd6d5746f88 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}{2021-08-04}{} + {l3backend-dvipdfmx.def}{2021-10-12}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -263,7 +263,7 @@ [ ~ \prg_replicate:nn { 0 \__color_backend_devicen_init:w #1 ~ \s__color_stop } - { 0 ~ 1 ~ } ~ + { 0 ~ 1 ~ } ] ~ /Range ~ [ ~ @@ -275,7 +275,7 @@ } ~ ] } - {#3} + { {#3} } } \__color_backend_separation_init:n { @@ -286,7 +286,7 @@ } \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \use:x { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index cac3f268f18..7491d90db83 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}{2021-08-04}{} + {l3backend-dvips.def}{2021-10-12}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -125,29 +125,30 @@ { \bool_if:NT \g__kernel_backend_header_bool { - \__kernel_backend_first_shipout:n + \exp_args:Nx \__kernel_backend_first_shipout:n { - \exp_not:N \__color_backend_separation_init_aux:nnnnn + \exp_not:N \__color_backend_separation_init_aux:nnnnnn + { \exp_not:N \int_use:N \g__color_model_int } {#1} {#2} {#3} {#4} {#5} } } } \cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nxx } -\cs_new_protected:Npn \__color_backend_separation_init_aux:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \__color_backend_separation_init_aux:nnnnnn #1#2#3#4#5#6 { \__kernel_backend_literal:e { ! TeXDict ~ begin ~ - /color \int_use:N \g__color_model_int + /color #1 { [ ~ - /Separation ~ ( \str_convert_pdfname:n {#1} ) ~ - [ ~ #2 ~ ] ~ + /Separation ~ ( \str_convert_pdfname:n {#2} ) ~ + [ ~ #3 ~ ] ~ { - \cs_if_exist_use:cF { __color_backend_separation_init_ #2 :nnn } + \cs_if_exist_use:cF { __color_backend_separation_init_ #3 :nnn } { \__color_backend_separation_init:nnn } - {#3} {#4} {#5} + {#4} {#5} {#6} } ] ~ setcolorspace } ~ def ~ diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index 1cfcc6bff02..8d63f229e7d 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}{2021-08-04}{} + {l3backend-dvisvgm.def}{2021-10-12}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index 5de17be96e8..f14297306b7 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}{2021-08-04}{} + {l3backend-luatex.def}{2021-10-12}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -220,7 +220,7 @@ [ ~ \prg_replicate:nn { 0 \__color_backend_devicen_init:w #1 ~ \s__color_stop } - { 0 ~ 1 ~ } ~ + { 0 ~ 1 ~ } ] ~ /Range ~ [ ~ @@ -232,7 +232,7 @@ } ~ ] } - {#3} + { {#3} } } \__color_backend_separation_init:n { @@ -243,7 +243,7 @@ } \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \use:x { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 23bffda8d6d..dfa6d971e4c 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}{2021-08-04}{} + {l3backend-pdftex.def}{2021-10-12}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -220,7 +220,7 @@ [ ~ \prg_replicate:nn { 0 \__color_backend_devicen_init:w #1 ~ \s__color_stop } - { 0 ~ 1 ~ } ~ + { 0 ~ 1 ~ } ] ~ /Range ~ [ ~ @@ -232,7 +232,7 @@ } ~ ] } - {#3} + { {#3} } } \__color_backend_separation_init:n { @@ -243,7 +243,7 @@ } \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \use:x { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 7a63f5c33c3..9f74df6ce76 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}{2021-08-04}{} + {l3backend-xetex.def}{2021-10-12}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -263,7 +263,7 @@ [ ~ \prg_replicate:nn { 0 \__color_backend_devicen_init:w #1 ~ \s__color_stop } - { 0 ~ 1 ~ } ~ + { 0 ~ 1 ~ } ] ~ /Range ~ [ ~ @@ -275,7 +275,7 @@ } ~ ] } - {#3} + { {#3} } } \__color_backend_separation_init:n { @@ -286,7 +286,7 @@ } \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \use:x { diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 2af1e909340..f3d22616748 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -70,7 +70,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2021-08-27}% +\def\ExplFileDate{2021-10-12}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -27786,7 +27786,7 @@ \cs_generate_variant:Nn \box_gresize_to_ht_plus_dp:Nn { c } \cs_new_protected:Npn \__box_resize_to_ht_plus_dp:NnN #1#2#3 { - \hbox_set:Nn #1 + #3 #1 { \__box_resize_set_corners:N #1 \fp_set:Nn \l__box_scale_y_fp @@ -29043,8 +29043,9 @@ { \prg_replicate:nn {#1} { neg ~ 1.0 ~ add ~ #1 ~ -1 ~ roll ~ } - \int_eval:n { #2 + 4 } ~ 4 ~ roll - \prg_replicate:nn {#2} { ~ pop } + \int_eval:n { #2 + #1 } ~ #1 ~ roll + \prg_replicate:nn {#2} { ~ pop } ~ + #1 ~ 1 ~ roll } \use:x { @@ -29061,7 +29062,7 @@ { rgb } { /DeviceRGB } } } - { \exp_not:V \l__color_internal_tl } + { { \exp_not:V \l__color_internal_tl } } } } \cs_new_protected:Npn \__color_model_devicen_transform:w @@ -29089,7 +29090,7 @@ \fp_compare:nNnF {#3} = \c_zero_fp { \int_eval:n { #1 - \l__color_internal_int + #2 } ~ index ~ - #3 ~ neg ~ mul ~ 1.0 ~ add ~ mul ~ + -#3 ~ mul ~ 1.0 ~ add ~ mul ~ } #2 ~ -1 ~ roll ~ } @@ -30362,7 +30363,7 @@ \__coffin_offset_poles:Nnn #4 { \l__coffin_offset_x_dim } { \l__coffin_offset_y_dim } \__coffin_update_vertical_poles:NNN #1 #4 \l__coffin_aligned_coffin - \coffin_set_eq:NN #1 \l__coffin_aligned_coffin + #9 #1 \l__coffin_aligned_coffin } \cs_new_protected:Npn \__coffin_attach_mark:NnnNnnnn #1#2#3#4#5#6#7#8 { diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index f534d2671ec..8a048e4cfad 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2021-08-27}% +\def\ExplFileDate{2021-10-12}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index 2da98e415b6..fefcf804b74 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2021-08-27}% +\def\ExplFileDate{2021-10-12}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index dc9e3d70287..0d435382326 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2021-08-27}% +\def\ExplFileDate{2021-10-12}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% -- cgit v1.2.3