diff options
author | Norbert Preining <norbert@preining.info> | 2023-04-20 03:01:20 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-04-20 03:01:20 +0000 |
commit | 4753a39245d0925a73cb20409999377eb9d2fd66 (patch) | |
tree | 2e19e9f381b805bc9ab96da2f6c3e733d7689e09 /macros/latex/contrib/l3backend | |
parent | 10bb4d468226c290e5e87e3fa367dc6fd2dcb84b (diff) |
CTAN sync 202304200301
Diffstat (limited to 'macros/latex/contrib/l3backend')
-rw-r--r-- | macros/latex/contrib/l3backend/CHANGELOG.md | 15 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/README.md | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-basics.dtx | 14 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-box.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-code.pdf | bin | 933580 -> 934066 bytes | |||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-color.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-draw.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-graphics.dtx | 37 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-header.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-opacity.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/l3backend/l3backend-pdf.dtx | 12 |
11 files changed, 57 insertions, 33 deletions
diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md index 82228400e2..5877ce53d3 100644 --- a/macros/latex/contrib/l3backend/CHANGELOG.md +++ b/macros/latex/contrib/l3backend/CHANGELOG.md @@ -6,11 +6,19 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-04-19] + +### Changed +- Pass additional attributes when loading graphics in PDF mode + +### Fixed +- Remove a stray `>` from graphics inclusion code for `dvipdfmx` + ## [2023-03-30] ### Changed -- Integrate l3color and l3opacity with luaotfload to ensure that - opacity specifications don't conflict. +- Integrate `l3color` and `l3opacity` with `luaotfload` to ensure that + opacity specifications don't conflict ## [2023-01-16] @@ -288,7 +296,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/2023-03-30...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2023-04-19...HEAD +[2023-04-19]: https://github.com/latex3/latex3/compare/2023-03-30...2023-04-19 [2023-03-30]: https://github.com/latex3/latex3/compare/2023-01-16...2023-03-30 [2023-01-16]: https://github.com/latex3/latex3/compare/2022-10-26...2023-01-16 [2022-10-26]: https://github.com/latex3/latex3/compare/2022-09-28...2022-10-26 diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md index 02fab16f9f..0aa2b14b5f 100644 --- a/macros/latex/contrib/l3backend/README.md +++ b/macros/latex/contrib/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2023-03-30 +Release 2023-04-19 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/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx index 1f821aff25..cf4ad444ba 100644 --- a/macros/latex/contrib/l3backend/l3backend-basics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2023-03-30}{} + {l3backend-dvipdfmx.def}{2023-04-19}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2023-03-30}{} + {l3backend-dvips.def}{2023-04-19}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2023-03-30}{} + {l3backend-dvisvgm.def}{2023-04-19}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-luatex.def}{2023-03-30}{} + {l3backend-luatex.def}{2023-04-19}{} {L3 backend support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-pdftex.def}{2023-03-30}{} + {l3backend-pdftex.def}{2023-04-19}{} {L3 backend support: PDF output (pdfTeX)} %</pdftex> %<*xetex> - {l3backend-xetex.def}{2023-03-30}{} + {l3backend-xetex.def}{2023-04-19}{} {L3 backend support: XeTeX} %</xetex> % \end{macrocode} diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx index ae7e2281fc..6d8d4ede02 100644 --- a/macros/latex/contrib/l3backend/l3backend-box.dtx +++ b/macros/latex/contrib/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-code.pdf b/macros/latex/contrib/l3backend/l3backend-code.pdf Binary files differindex 1ce7f2d3a8..6f9ea9a52e 100644 --- a/macros/latex/contrib/l3backend/l3backend-code.pdf +++ b/macros/latex/contrib/l3backend/l3backend-code.pdf diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx index 786282333e..5049aae5f9 100644 --- a/macros/latex/contrib/l3backend/l3backend-color.dtx +++ b/macros/latex/contrib/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx index 6577bc3008..170f4090cd 100644 --- a/macros/latex/contrib/l3backend/l3backend-draw.dtx +++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx index b042bd04e5..da7dc7516e 100644 --- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % @@ -68,7 +68,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } @@ -148,7 +148,7 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}{\l_@@_graphics_attr_tl} +% \begin{variable}{\l_@@_attr_tl} % In PDF mode, additional attributes of an graphic (such as page number) are % needed both to obtain the bounding box and when inserting the graphic: this % occurs as the graphic dictionary approach means they are read as part of @@ -156,7 +156,7 @@ % attributes using a dedicated |tl| rather than build up the same data % twice. % \begin{macrocode} -\tl_new:N \l_@@_graphics_attr_tl +\tl_new:N \l_@@_attr_tl % \end{macrocode} % \end{variable} % @@ -185,14 +185,15 @@ { \int_zero:N \l_@@_page_int \tl_clear:N \l_@@_pagebox_tl - \tl_set:Nx \l_@@_graphics_attr_tl + \tl_set:Nx \l_@@_attr_tl { \tl_if_empty:NF \l_@@_decodearray_str { :D \l_@@_decodearray_str } \bool_if:NT \l_@@_interpolate_bool { :I } + \str_if_empty:NF \l_@@_pdf_str + { :X \l_@@_pdf_str } } - \tl_clear:N \l_@@_graphics_attr_tl \@@_backend_getbb_auxi:n {#1} } \cs_new_eq:NN \@@_backend_getbb_jpeg:n \@@_backend_getbb_jpg:n @@ -201,17 +202,19 @@ { \tl_clear:N \l_@@_decodearray_str \bool_set_false:N \l_@@_interpolate_bool - \tl_set:Nx \l_@@_graphics_attr_tl + \tl_set:Nx \l_@@_attr_tl { : \l_@@_pagebox_tl \int_compare:nNnT \l_@@_page_int > 1 { :P \int_use:N \l_@@_page_int } + \str_if_empty:NF \l_@@_pdf_str + { :X \l_@@_pdf_str } } \@@_backend_getbb_auxi:n {#1} } \cs_new_protected:Npn \@@_backend_getbb_auxi:n #1 { - \@@_bb_restore:xF { #1 \l_@@_graphics_attr_tl } + \@@_bb_restore:xF { #1 \l_@@_attr_tl } { \@@_backend_getbb_auxii:n {#1} } } % \end{macrocode} @@ -225,16 +228,19 @@ { \exp_args:Ne \@@_backend_getbb_auxiii:n { \@@_backend_dequote:w #1 " #1 " \s_@@_stop } - \int_const:cn { c_@@_ #1 \l_@@_graphics_attr_tl _int } + \int_const:cn { c_@@_ #1 \l_@@_attr_tl _int } { \tex_the:D \tex_pdflastximage:D } - \@@_bb_save:x { #1 \l_@@_graphics_attr_tl } + \@@_bb_save:x { #1 \l_@@_attr_tl } } \cs_new_protected:Npn \@@_backend_getbb_auxiii:n #1 { \tex_immediate:D \tex_pdfximage:D - \bool_lazy_or:nnT - { \l_@@_interpolate_bool } - { ! \tl_if_empty_p:N \l_@@_decodearray_str } + \bool_lazy_any:nT + { + { \l_@@_interpolate_bool } + { ! \tl_if_empty_p:N \l_@@_decodearray_str } + { ! \str_if_empty_p:N \l_@@_pdf_str } + } { attr ~ { @@ -242,6 +248,7 @@ { /Decode~[ \l_@@_decodearray_str ] } \bool_if:NT \l_@@_interpolate_bool { /Interpolate~true } + \l_@@_pdf_str } } \int_compare:nNnT \l_@@_page_int > 0 @@ -274,7 +281,7 @@ \cs_new_protected:Npn \@@_backend_include_jpg:n #1 { \tex_pdfrefximage:D - \int_use:c { c_@@_ #1 \l_@@_graphics_attr_tl _int } + \int_use:c { c_@@_ #1 \l_@@_attr_tl _int } } \cs_new_eq:NN \@@_backend_include_jpeg:n \@@_backend_include_jpg:n \cs_new_eq:NN \@@_backend_include_pdf:n \@@_backend_include_jpg:n @@ -522,7 +529,7 @@ \tl_if_empty:NF \l_@@_decodearray_str { /Decode~[ \l_@@_decodearray_str ] } \bool_if:NT \l_@@_interpolate_bool - { /Interpolate~true> } + { /Interpolate~true } >> } } diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx index 595e6a2924..0cb6767908 100644 --- a/macros/latex/contrib/l3backend/l3backend-header.dtx +++ b/macros/latex/contrib/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-opacity.dtx b/macros/latex/contrib/l3backend/l3backend-opacity.dtx index 3f3dd1c84a..033ab150f0 100644 --- a/macros/latex/contrib/l3backend/l3backend-opacity.dtx +++ b/macros/latex/contrib/l3backend/l3backend-opacity.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx index bb80237d4d..a95aff4070 100644 --- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx +++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-03-30} +% \date{Released 2023-04-19} % % \maketitle % @@ -69,7 +69,11 @@ % \subsection{Shared code} % % A very small number of items that belong at the backend level but which -% are common to all backends. +% are common to most backends. +% +% \begin{macrocode} +%<*!dvisvgm> +% \end{macrocode} % % \begin{variable}{\l_@@_internal_box} % \begin{macrocode} @@ -77,6 +81,10 @@ % \end{macrocode} % \end{variable} % +% \begin{macrocode} +%</!dvisvgm> +% \end{macrocode} +% % \subsection{\texttt{dvips} backend} % % \begin{macrocode} |