From 01fdd082469077807698fe3acf8157da10a1e880 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Jul 2022 20:10:29 +0000 Subject: l3backend (2jul22) git-svn-id: svn://tug.org/texlive/trunk@63794 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md | 18 +++++++++++++----- Master/texmf-dist/doc/latex/l3backend/README.md | 2 +- .../doc/latex/l3backend/l3backend-code.pdf | Bin 908468 -> 931293 bytes .../source/latex/l3backend/l3backend-basics.dtx | 14 +++++++------- .../source/latex/l3backend/l3backend-box.dtx | 2 +- .../source/latex/l3backend/l3backend-color.dtx | 2 +- .../source/latex/l3backend/l3backend-draw.dtx | 2 +- .../source/latex/l3backend/l3backend-graphics.dtx | 4 ++-- .../source/latex/l3backend/l3backend-header.dtx | 2 +- .../source/latex/l3backend/l3backend-opacity.dtx | 10 +++++++--- .../source/latex/l3backend/l3backend-pdf.dtx | 2 +- .../tex/latex/l3backend/l3backend-dvipdfmx.def | 8 +++++--- .../tex/latex/l3backend/l3backend-dvips.def | 2 +- .../tex/latex/l3backend/l3backend-dvisvgm.def | 2 +- .../tex/latex/l3backend/l3backend-luatex.def | 4 ++-- .../tex/latex/l3backend/l3backend-pdftex.def | 4 ++-- .../tex/latex/l3backend/l3backend-xetex.def | 8 +++++--- 17 files changed, 51 insertions(+), 35 deletions(-) diff --git a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md index 48187b02ea5..22b29d28e11 100644 --- a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md @@ -6,6 +6,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2022-07-01] + +#### Fixed +- Do not include PDF file to count pages on pdfTeX +- Opacity creation with `dvipdfmx`/XeTeX (issue [\#1106](https://github.com/latex3/latex3/issues/1106)) +- Reset opacity when no stack is available at the backend (issue [\#1107](https://github.com/latex3/latex3/issues/1107)) + ## [2022-04-20] ### Changed @@ -19,7 +26,7 @@ this project uses date-based 'snapshot' version identifiers. - Support for SVG graphic inclusion by `dvisvgm` ### Fixed -- `\color_ensure_current:` backend with DVI-based routes (issue \#1085) +- `\color_ensure_current:` backend with DVI-based routes (issue [\#1085](https://github.com/latex3/latex3/issues/1085)) ## [2022-04-10] @@ -68,7 +75,7 @@ this project uses date-based 'snapshot' version identifiers. ## [2021-07-12] ### Fixed -- GoTo link formation for Distiller-based workflows (issue #957) +- GoTo link formation for Distiller-based workflows (issue [\#957](https://github.com/latex3/latex3/issues/957)) - Support transparency with Distiller ## [2021-05-07] @@ -178,8 +185,8 @@ this project uses date-based 'snapshot' version identifiers. ## [2020-06-03] ### Fixed -- Unneeded `[nobreak]` in `dvips` driver (issue #709) -- `\__pdf_backend_object_write_fstream:nn` with `dvips` backend (issue #710) +- Unneeded `[nobreak]` in `dvips` driver (issue [\#709](https://github.com/latex3/latex3/issues/709)) +- `\__pdf_backend_object_write_fstream:nn` with `dvips` backend (issue [\#710](https://github.com/latex3/latex3/issues/710)) - Array writing in `dvips` mode ## [2020-05-05] @@ -245,7 +252,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-20...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2022-07-01...HEAD +[2022-07-01]: https://github.com/latex3/latex3/compare/2022-04-20...2022-07-01 [2022-04-20]: https://github.com/latex3/latex3/compare/2022-04-14...2022-04-20 [2022-04-14]: https://github.com/latex3/latex3/compare/2022-04-10...2022-04-14 [2022-04-10]: https://github.com/latex3/latex3/compare/2022-02-07...2022-04-10 diff --git a/Master/texmf-dist/doc/latex/l3backend/README.md b/Master/texmf-dist/doc/latex/l3backend/README.md index 20ec9a84fe1..83d907f5a0e 100644 --- a/Master/texmf-dist/doc/latex/l3backend/README.md +++ b/Master/texmf-dist/doc/latex/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2022-04-20 +Release 2022-07-01 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf index 3d69a13b8e9..1bd1fbaba05 100644 Binary files a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf and b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf differ diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx index 1eb47c105e2..8945ed6f470 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2022-04-20}{} + {l3backend-dvipdfmx.def}{2022-07-01}{} {L3 backend support: dvipdfmx} % %<*dvips> - {l3backend-dvips.def}{2022-04-20}{} + {l3backend-dvips.def}{2022-07-01}{} {L3 backend support: dvips} % %<*dvisvgm> - {l3backend-dvisvgm.def}{2022-04-20}{} + {l3backend-dvisvgm.def}{2022-07-01}{} {L3 backend support: dvisvgm} % %<*luatex> - {l3backend-luatex.def}{2022-04-20}{} + {l3backend-luatex.def}{2022-07-01}{} {L3 backend support: PDF output (LuaTeX)} % %<*pdftex> - {l3backend-pdftex.def}{2022-04-20}{} + {l3backend-pdftex.def}{2022-07-01}{} {L3 backend support: PDF output (pdfTeX)} % %<*xetex> - {l3backend-xetex.def}{2022-04-20}{} + {l3backend-xetex.def}{2022-07-01}{} {L3 backend support: XeTeX} % % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx index 872e2dadcb3..844b23d67ce 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx index 6f766bc88a1..666075840a5 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx index c8029dfca5d..d2174dc7a33 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx index 9d5b31faa98..8691349cf55 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % @@ -352,7 +352,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_backend_get_pagecount:n #1 { - \tex_immediate:D \tex_pdfximage:D {#1} + \tex_pdfximage:D {#1} \int_const:cn { c_@@_ #1 _pages_int } { \int_use:N \tex_pdflastximagepages:D } } diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx index cad715a2004..401f4287afc 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx index 4c5de69fb4a..ae4e93ea3c2 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % @@ -181,7 +181,7 @@ { opacity #1 } { << /ca ~ #1 /CA ~ #1 >> } %<*dvipdfmx|xetex> - \__kernel_backend_literal:n + \__kernel_backend_literal_pdf:n % %<*luatex|pdftex> \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int @@ -197,6 +197,10 @@ } \cs_new_protected:Npn \@@_backend_reset: { +%<*dvipdfmx|xetex> + \__kernel_backend_literal_pdf:n + { /opacity1 ~ gs } +% %<*luatex|pdftex> \__kernel_color_backend_stack_pop:n \c_@@_backend_stack_int % @@ -236,7 +240,7 @@ { opacity.stroke #1 } { << /CA ~ #2 >> } %<*dvipdfmx|xetex> - \__kernel_backend_literal:n + \__kernel_backend_literal_pdf:n % %<*luatex|pdftex> \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx index f8cf0111602..df145f37819 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-20} +% \date{Released 2022-07-01} % % \maketitle % diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index fdf2baaab68..f9e2421b386 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}{2022-04-20}{} + {l3backend-dvipdfmx.def}{2022-07-01}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -833,7 +833,7 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity #1 } { << /ca ~ #1 /CA ~ #1 >> } - \__kernel_backend_literal:n + \__kernel_backend_literal_pdf:n { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } @@ -845,6 +845,8 @@ } \cs_new_protected:Npn \__opacity_backend_reset: { + \__kernel_backend_literal_pdf:n + { /opacity1 ~ gs } } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { @@ -871,7 +873,7 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_backend_literal:n + \__kernel_backend_literal_pdf:n { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 382f862f97d..0e1c5358c99 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}{2022-04-20}{} + {l3backend-dvips.def}{2022-07-01}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index 9aec9f6c630..12c8c2e3683 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}{2022-04-20}{} + {l3backend-dvisvgm.def}{2022-07-01}{} {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 deb03202f5a..1b0525eefc5 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}{2022-04-20}{} + {l3backend-luatex.def}{2022-07-01}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -661,7 +661,7 @@ } \cs_new_protected:Npn \__graphics_backend_get_pagecount:n #1 { - \tex_immediate:D \tex_pdfximage:D {#1} + \tex_pdfximage:D {#1} \int_const:cn { c__graphics_ #1 _pages_int } { \int_use:N \tex_pdflastximagepages:D } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 32cec72b2e3..49fff4e72ea 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}{2022-04-20}{} + {l3backend-pdftex.def}{2022-07-01}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -661,7 +661,7 @@ } \cs_new_protected:Npn \__graphics_backend_get_pagecount:n #1 { - \tex_immediate:D \tex_pdfximage:D {#1} + \tex_pdfximage:D {#1} \int_const:cn { c__graphics_ #1 _pages_int } { \int_use:N \tex_pdflastximagepages:D } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 1e070ebdc30..dfa1bf0605f 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}{2022-04-20}{} + {l3backend-xetex.def}{2022-07-01}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -887,7 +887,7 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity #1 } { << /ca ~ #1 /CA ~ #1 >> } - \__kernel_backend_literal:n + \__kernel_backend_literal_pdf:n { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } @@ -899,6 +899,8 @@ } \cs_new_protected:Npn \__opacity_backend_reset: { + \__kernel_backend_literal_pdf:n + { /opacity1 ~ gs } } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { @@ -925,7 +927,7 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_backend_literal:n + \__kernel_backend_literal_pdf:n { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -- cgit v1.2.3