diff options
| author | Karl Berry <karl@freefriends.org> | 2021-08-04 21:17:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-08-04 21:17:45 +0000 |
| commit | 42388637db7fca0a4e2bba28a8b379058a7d8fd7 (patch) | |
| tree | ff9b1e4bfd4a63811a00ea2b7bf42b0fc5899569 /Master/texmf-dist | |
| parent | df99444446cab6bc30e0f88bae9f3d6dc01c56ab (diff) | |
l3 (4aug21)
git-svn-id: svn://tug.org/texlive/trunk@60167 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
76 files changed, 436 insertions, 204 deletions
diff --git a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md index fae21bb66fa..4a734764750 100644 --- a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md @@ -6,6 +6,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-08-04] + +## Changed +- Only use `pdfmanagement` module if active + ## [2021-07-12] ### Fixed @@ -186,7 +191,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/2021-07-12...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2021-08-04...HEAD +[2021-08-04]: https://github.com/latex3/latex3/compare/2021-07-12...2021-08-04 [2021-07-12]: https://github.com/latex3/latex3/compare/2021-05-07...2021-07-12 [2021-05-07]: https://github.com/latex3/latex3/compare/2021-03-18...2021-05-07 [2021-03-18]: https://github.com/latex3/latex3/compare/2021-03-02...2021-03-18 diff --git a/Master/texmf-dist/doc/latex/l3backend/README.md b/Master/texmf-dist/doc/latex/l3backend/README.md index fa022b27e60..68b63c31895 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 2021-07-12 +Release 2021-08-04 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 Binary files differindex e86f472ae4c..ad22595ef8d 100644 --- a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf +++ b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3experimental/CHANGELOG.md index 5ad7f3d1831..f9604428a3e 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3experimental/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-08-04] + +### Added +- `\draw_baseline:n` +- `\draw_point:n` + ## [2021-07-12] ### Added @@ -215,7 +221,8 @@ this project uses date-based 'snapshot' version identifiers. - New `l3color` module using `xcolor`-like expression syntax - New `l3draw` module, based on `pgf` layer of the TikZ system -[Unreleased]: https://github.com/latex3/latex3/compare/2021-07-12...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2021-08-04...HEAD +[2021-08-04]: https://github.com/latex3/latex3/compare/2021-07-12...2021-08-04 [2021-07-12]: https://github.com/latex3/latex3/compare/2021-05-27...2021-07-12 [2021-05-27]: https://github.com/latex3/latex3/compare/2021-02-18...2021-05-27 [2021-02-18]: https://github.com/latex3/latex3/compare/2021-02-06...2021-02-18 diff --git a/Master/texmf-dist/doc/latex/l3experimental/README.md b/Master/texmf-dist/doc/latex/l3experimental/README.md index ebb812c17d7..d08213bef51 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/README.md +++ b/Master/texmf-dist/doc/latex/l3experimental/README.md @@ -1,7 +1,7 @@ Experimental LaTeX3 Concepts ============================ -Release 2021-07-12 +Release 2021-08-04 Overview -------- @@ -16,12 +16,13 @@ are under active development and the interfaces may change. All of the material in the collection requires the LaTeX3 base layer package [`l3kernel`](http://ctan.org/pkg/l3kernel). The two packages must be installed -in matching versions: if you update `l3experimental`, make sure that `l3kernel` is -updated at the same time. +in matching versions: if you update `l3experimental`, make sure that `l3kernel` +is updated at the same time. Currently included in the CTAN release of l3experimental are the following bundles: * `l3benchmark` +* `l3bitset` * `l3draw` * `l3graphics` * `l3opacity` @@ -35,6 +36,14 @@ bundles: This module provides support for benchmarking the performance of code. +`l3bitset` +------------- + +This module provides a `bitset` data type, a vector of bits, which can be set +and unset using their individual index in the vector, or using names assigned to +each position in the vector. The bitset can be returned as a string of bits or +as a decimal integer. + `l3draw` -------- diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf Binary files differindex e7b04df65ea..e7f7c794fa7 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3bitset/l3bitset.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3bitset/l3bitset.pdf Binary files differindex 04e300fe465..6fe6ea444ab 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3bitset/l3bitset.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3bitset/l3bitset.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw-code.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw-code.pdf Binary files differindex 68c04905804..aabbe3ed243 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw-code.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw-code.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw.pdf Binary files differindex d63d7037916..ce3f4c31f81 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3draw/l3draw.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3graphics/l3graphics.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3graphics/l3graphics.pdf Binary files differindex a59d1f86e36..6f50943ec49 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3graphics/l3graphics.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3graphics/l3graphics.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3opacity/l3opacity.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3opacity/l3opacity.pdf Binary files differindex afde835c297..74fa174c316 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3opacity/l3opacity.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3opacity/l3opacity.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf Binary files differindex d070a93856c..991475502ba 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf Binary files differindex f7db627adf2..cc1493963cf 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf Binary files differindex 4847b73a25f..f4d7fa4ea62 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf Binary files differindex 2b407e61d9e..3d80c5565d6 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf Binary files differindex 52cb0160462..49a84225b16 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md index e20b40ad1e3..8b9928d6488 100644 --- a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-08-04] + +### Changed +- Adjust `l3keys2e` to allow for future kernel provision of + same ideas + ## [2021-06-18] ### Fixed @@ -148,7 +154,8 @@ this project uses date-based 'snapshot' version identifiers. - Switch to ISO date format - Improve cross-module use of internal functions -[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-18...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2021-08-04...HEAD +[2021-08-04]: https://github.com/latex3/latex3/compare/2021-06-18...2021-08-04 [2021-06-18]: https://github.com/latex3/latex3/compare/2021-06-01...2021-06-18 [2021-06-01]: https://github.com/latex3/latex3/compare/2021-05-27...2021-06-01 [2021-05-27]: https://github.com/latex3/latex3/compare/2021-05-07...2021-05-27 diff --git a/Master/texmf-dist/doc/latex/l3packages/README.md b/Master/texmf-dist/doc/latex/l3packages/README.md index 8a4377894c2..316526984bf 100644 --- a/Master/texmf-dist/doc/latex/l3packages/README.md +++ b/Master/texmf-dist/doc/latex/l3packages/README.md @@ -1,7 +1,7 @@ LaTeX3 High-Level Concepts ========================== -Release 2021-06-18 +Release 2021-08-04 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf Binary files differindex 98a6021eab1..6cba692ad10 100644 --- a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf Binary files differindex f5503a57175..293ba0ff0ee 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf Binary files differindex 83fe8b02839..c0ec5bd0488 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf Binary files differindex cbfa8c84522..551520d0231 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf Binary files differindex 8e8e58b2af8..2fc25bc8ba3 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx index ef02b741e08..6f21c964c29 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2021-07-12}{} + {l3backend-dvipdfmx.def}{2021-08-04}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2021-07-12}{} + {l3backend-dvips.def}{2021-08-04}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2021-07-12}{} + {l3backend-dvisvgm.def}{2021-08-04}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-luatex.def}{2021-07-12}{} + {l3backend-luatex.def}{2021-08-04}{} {L3 backend support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-pdftex.def}{2021-07-12}{} + {l3backend-pdftex.def}{2021-08-04}{} {L3 backend support: PDF output (pdfTeX)} %</pdftex> %<*xetex> - {l3backend-xetex.def}{2021-07-12}{} + {l3backend-xetex.def}{2021-08-04}{} {L3 backend support: XeTeX} %</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 7724aa7104f..810deb7bb76 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx index ad3075dff53..2d33f8ed4e0 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -813,7 +813,9 @@ / \str_convert_pdfname:n {#1} ~ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -896,7 +898,9 @@ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx index 5a896469bd6..79c790daa05 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx index e1bd1e0921a..a82ca742d87 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx index b5ab577892b..d741a5eb775 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx index 6017403ea06..e8159fc6519 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -141,7 +141,9 @@ % \begin{variable}{\c_@@_backend_stack_int} % Set up a stack. % \begin{macrocode} -\cs_if_exist:NT \pdfmanagement_add:nnn +\bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \__kernel_color_backend_stack_init:Nnn \c_@@_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -180,7 +182,9 @@ { /opacity #1 ~ gs } \group_insert_after:N \@@_backend_reset: } -\cs_if_exist:NF \pdfmanagement_add:nnn +\bool_lazy_and:nnF + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \cs_gset_protected:Npn \@@_backend_select_aux:n #1 { } } diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx index 5c7fa3b5654..4943ee7f221 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 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx b/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx index 71c12d8920c..d3c3fce57c8 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -122,7 +122,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3benchmark}{2021-07-12}{} +\ProvidesExplPackage{l3benchmark}{2021-08-04}{} {L3 Experimental benchmarking} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx b/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx index 0021241628f..4a6fba442ec 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % \begin{documentation} @@ -264,7 +264,7 @@ %<@@=bitset> % \end{macrocode} % \begin{macrocode} -\ProvidesExplPackage{l3bitset}{2021-07-12}{} +\ProvidesExplPackage{l3bitset}{2021-08-04}{} {L3 Experimental bitset support} % \end{macrocode} % A bitset is a string variable. diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx index 45c6b0a16a3..fc1b6074003 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx index 57238ab2f1c..e31961dab96 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx index 043f9a59266..77fba0c5bbe 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx index 527194b8ee4..8672d77a786 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -112,7 +112,7 @@ \cs_new:Npn \@@_point_process:nn #1#2 { \exp_args:Nf \@@_point_process_auxi:nn - { \@@_point_to_dim:n {#2} } + { \draw_point:n {#2} } {#1} } \cs_new:Npn \@@_point_process_auxi:nn #1#2 @@ -122,8 +122,8 @@ \cs_new:Npn \@@_point_process:nnn #1#2#3 { \exp_args:Nff \@@_point_process_auxiii:nnn - { \@@_point_to_dim:n {#2} } - { \@@_point_to_dim:n {#3} } + { \draw_point:n {#2} } + { \draw_point:n {#3} } {#1} } \cs_new:Npn \@@_point_process_auxiii:nnn #1#2#3 @@ -133,9 +133,9 @@ \cs_new:Npn \@@_point_process:nnnn #1#2#3#4 { \exp_args:Nfff \@@_point_process_auxv:nnnn - { \@@_point_to_dim:n {#2} } - { \@@_point_to_dim:n {#3} } - { \@@_point_to_dim:n {#4} } + { \draw_point:n {#2} } + { \draw_point:n {#3} } + { \draw_point:n {#4} } {#1} } \cs_new:Npn \@@_point_process_auxv:nnnn #1#2#3#4 @@ -146,10 +146,10 @@ \cs_new:Npn \@@_point_process:nnnnn #1#2#3#4#5 { \exp_args:Nffff \@@_point_process_auxvii:nnnnn - { \@@_point_to_dim:n {#2} } - { \@@_point_to_dim:n {#3} } - { \@@_point_to_dim:n {#4} } - { \@@_point_to_dim:n {#5} } + { \draw_point:n {#2} } + { \draw_point:n {#3} } + { \draw_point:n {#4} } + { \draw_point:n {#5} } {#1} } \cs_new:Npn \@@_point_process_auxvii:nnnnn #1#2#3#4#5 @@ -174,17 +174,19 @@ % \end{macro} % \end{macro} % -% \begin{macro}[EXP]{\@@_point_to_dim:n} -% \begin{macro}[EXP]{\@@_point_to_dim_aux:n, \@@_point_to_dim_aux:f} -% \begin{macro}[EXP]{\@@_point_to_dim_aux:w} +% \subsection{Basic points} +% +% \begin{macro}[EXP]{\draw_point:n} +% \begin{macro}[EXP]{\@@_point_to_dim:n, \@@_point_to_dim:f} +% \begin{macro}[EXP]{\@@_point_to_dim:w} % Co-ordinates are always returned as two dimensions. % \begin{macrocode} +\cs_new:Npn \draw_point:n #1 + { \@@_point_to_dim:f { \fp_eval:n {#1} } } \cs_new:Npn \@@_point_to_dim:n #1 - { \@@_point_to_dim_aux:f { \fp_eval:n {#1} } } -\cs_new:Npn \@@_point_to_dim_aux:n #1 - { \@@_point_to_dim_aux:w #1 } -\cs_generate_variant:Nn \@@_point_to_dim_aux:n { f } -\cs_new:Npn \@@_point_to_dim_aux:w ( #1 , ~ #2 ) { #1pt , #2pt } + { \@@_point_to_dim:w #1 } +\cs_generate_variant:Nn \@@_point_to_dim:n { f } +\cs_new:Npn \@@_point_to_dim:w ( #1 , ~ #2 ) { #1pt , #2pt } % \end{macrocode} % \end{macro} % \end{macro} @@ -203,7 +205,7 @@ \cs_new:Npn \draw_point_polar:nnn #1#2#3 { \@@_draw_polar:fnn { \fp_eval:n {#3} } {#1} {#2} } \cs_new:Npn \@@_draw_polar:nnn #1#2#3 - { \@@_point_to_dim:n { cosd(#1) * (#2) , sind(#1) * (#3) } } + { \draw_point:n { cosd(#1) * (#2) , sind(#1) * (#3) } } \cs_generate_variant:Nn \@@_draw_polar:nnn { f } % \end{macrocode} % \end{macro} @@ -239,7 +241,7 @@ \fp_compare:nNnTF {#1} = \c_zero_fp { 0pt, 1pt } { - \@@_point_to_dim:n + \draw_point:n { ( #2 , #3 ) / #1 } } } @@ -308,7 +310,7 @@ } \cs_new:Npn \@@_point_intersect_lines_aux:nnnnnn #1#2#3#4#5#6 { - \@@_point_to_dim:n + \draw_point:n { ( #2 * #3 - #1 * #4 , #2 * #5 - #1 * #6 ) / ( #4 * #5 - #6 * #3 ) @@ -462,7 +464,7 @@ \cs_generate_variant:Nn \@@_point_intersect_circles_auxvi:nnnnnnnn { f } \cs_new:Npn \@@_point_intersect_circles_auxvii:nnnnnnn #1#2#3#4#5#6#7 { - \@@_point_to_dim:n + \draw_point:n { #6 + #4 * #1 + #2 * #3 * #5 , #7 + #5 * #1 + -1 * #2 * #3 * #4 } } \cs_generate_variant:Nn \@@_point_intersect_circles_auxvii:nnnnnnn { fff } @@ -503,7 +505,7 @@ } \cs_generate_variant:Nn \@@_point_interpolate_line_aux:nnnnn { f } \cs_new:Npn \@@_point_interpolate_line_aux:nnnnnn #1#2#3#4#5#6 - { \@@_point_to_dim:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } } + { \draw_point:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } } \cs_generate_variant:Nn \@@_point_interpolate_line_aux:nnnnnn { f } % \end{macrocode} % \end{macro} @@ -537,7 +539,7 @@ { \draw_point_unit_vector:n { ( #2 ) - ( #3 , #4 ) } } } \cs_new:Npn \@@_point_interpolate_distance:nnnnn #1#2#3#4#5 - { \@@_point_to_dim:n { #2 + #1 * #4 , #3 + #1 * #5 } } + { \draw_point:n { #2 + #1 * #4 , #3 + #1 * #5 } } \cs_generate_variant:Nn \@@_point_interpolate_distance:nnnnn { f } % \end{macrocode} % \end{macro} @@ -612,7 +614,7 @@ \cs_generate_variant:Nn \@@_point_interpolate_arcaxes_auxiii:nnnnnnn { f } \cs_new:Npn \@@_point_interpolate_arcaxes_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8 { - \@@_point_to_dim:n + \draw_point:n { #3 + #1 * #5 + #2 * #7 , #4 + #1 * #6 + #2 * #8 } } \cs_generate_variant:Nn \@@_point_interpolate_arcaxes_auxiv:nnnnnnnn { ff } @@ -749,7 +751,7 @@ } \cs_new:Npn \@@_point_interpolate_curve_auxviii:nnnnnn #1#2#3#4#5#6 { - \@@_point_to_dim:n + \draw_point:n { #5 * #3 + #6 * #1 , #5 * #4 + #6 * #2 } } \cs_generate_variant:Nn \@@_point_interpolate_curve_auxviii:nnnnnn { ffff } @@ -831,7 +833,7 @@ { \@@_point_vec:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } } \cs_new:Npn \@@_point_vec:nn #1#2 { - \@@_point_to_dim:n + \draw_point:n { #1 * \l_@@_xvec_x_dim + #2 * \l_@@_yvec_x_dim , #1 * \l_@@_xvec_y_dim + #2 * \l_@@_yvec_y_dim @@ -845,7 +847,7 @@ } \cs_new:Npn \@@_point_vec:nnn #1#2#3 { - \@@_point_to_dim:n + \draw_point:n { #1 * \l_@@_xvec_x_dim + #2 * \l_@@_yvec_x_dim @@ -874,7 +876,7 @@ { \@@_draw_vec_polar:fnn { \fp_eval:n {#3} } {#1} {#2} } \cs_new:Npn \@@_draw_vec_polar:nnn #1#2#3 { - \@@_point_to_dim:n + \draw_point:n { cosd(#1) * (#2) * \l_@@_xvec_x_dim , sind(#1) * (#3) * \l_@@_yvec_y_dim @@ -903,7 +905,7 @@ { \bool_if:NTF \l_@@_matrix_active_bool { - \@@_point_to_dim:n + \draw_point:n { ( \l_@@_matrix_a_fp * #1 @@ -919,7 +921,7 @@ } } { - \@@_point_to_dim:n + \draw_point:n { (#1, #2) + ( \l_@@_xshift_dim , \l_@@_yshift_dim ) @@ -943,7 +945,7 @@ { \bool_if:NTF \l_@@_matrix_active_bool { - \@@_point_to_dim:n + \draw_point:n { ( \l_@@_matrix_a_fp * #1 @@ -956,7 +958,7 @@ ) } } - { \@@_point_to_dim:n { (#1, #2) } } + { \draw_point:n { (#1, #2) } } } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx index 7065afd2672..baa2239e9f7 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -60,6 +60,14 @@ %<@@=draw> % \end{macrocode} % +% This sub-module covers more-or-less the same ideas as +% \texttt{pgfcorescopes.code.tex}. At present, equivalents of the +% following are currently absent: +% \begin{itemize} +% \item \cs{pgftext}: This is covered at this level by the coffin-based +% interface \cs{draw_coffin_use:Nnn} +% \end{itemize} +% % \subsection{Drawing environment} % % \begin{variable} @@ -142,6 +150,7 @@ } \cs_new_protected:Npn \draw_end: { + \@@_baseline_finalise:w \exp_args:NNNV \hbox_set_end: \clist_set:Nn \l_draw_layers_clist \l_draw_layers_clist \@@_layers_insert: @@ -154,15 +163,7 @@ \dim_gzero:N \g_@@_ymax_dim \dim_gzero:N \g_@@_ymin_dim } - \hbox_set:Nn \l_@@_main_box - { - \skip_horizontal:n { -\g_@@_xmin_dim } - \box_move_down:nn { \g_@@_ymin_dim } - { \box_use_drop:N \l_@@_main_box } - } - \box_set_ht:Nn \l_@@_main_box - { \g_@@_ymax_dim - \g_@@_ymin_dim } - \box_set_dp:Nn \l_@@_main_box { 0pt } + \@@_finalise: \box_set_wd:Nn \l_@@_main_box { \g_@@_xmax_dim - \g_@@_xmin_dim } \mode_leave_vertical: @@ -172,6 +173,91 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_finalise:} +% \begin{macro}{\@@_finalise_baseline:n} +% Finalising the (vertical) size of the output depends on whether we have +% an explicit baseline or not. To allow for that, we have two functions, and +% the one that's used depends on whether the user has set a baseline. Notice +% that in contrast to \pkg{pgf} we \emph{do} allow for a non-zero depth if +% the explicit baseline is above the lowest edge of the initial bounding box. +% \begin{macrocode} +\cs_new_protected:Npn \@@_finalise: + { + \hbox_set:Nn \l_@@_main_box + { + \skip_horizontal:n { -\g_@@_xmin_dim } + \box_move_down:nn + { \g_@@_ymin_dim } + { \box_use_drop:N \l_@@_main_box } + } + \box_set_dp:Nn \l_@@_main_box { 0pt } + \box_set_ht:Nn \l_@@_main_box + { \g_@@_ymax_dim - \g_@@_ymin_dim } + } +\cs_new_protected:Npn \@@_finalise_baseline:n #1 + { + \hbox_set:Nn \l_@@_main_box + { + \skip_horizontal:n { -\g_@@_xmin_dim } + \box_move_down:nn + {#1} + { \box_use_drop:N \l_@@_main_box } + } + \box_set_dp:Nn \l_@@_main_box + { + \dim_max:nn + { #1 - \g_@@_ymin_dim } + { 0pt } + } + \box_set_ht:Nn \l_@@_main_box + { \g_@@_ymax_dim + #1 } + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \subsection{Baseline position} +% +% \begin{variable}{\l_@@_baseline_bool, \l_@@_baseline_dim} +% For tracking the explicit baseline and whether it is active. +% \begin{macrocode} +\bool_new:N \l_@@_baseline_bool +\dim_new:N \l_@@_baseline_dim +% \end{macrocode} +% \end{variable} +% +% \begin{macro}{\draw_baseline:n} +% A simple setting of the baseline along with the flag we need to know that +% it is active. +% \begin{macrocode} +\cs_new_protected:Npn \draw_baseline:n #1 + { + \bool_set_true:N \l_@@_baseline_bool + \dim_set:Nn \l_@@_baseline_dim { \fp_to_dim:n {#1} } + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@@_baseline_finalise:w} +% Rather than use a global data structure, we can arrange to put the baseline +% value at the right group level with a small amount of shuffling. That happens +% here. +% \begin{macrocode} +\cs_new_protected:Npn \@@_baseline_finalise:w #1 \@@_finalise: + { + \bool_if:NTF \l_@@_baseline_bool + { + \use:x + { + \exp_not:n {#1} + \@@_finalise_baseline:n { \dim_use:N \l_@@_baseline_dim } + } + } + { #1 \@@_finalise: } + } +% \end{macrocode} +% \end{macro} +% % \subsection{Scopes} % % \begin{variable}{\l_@@_linewidth_dim} diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx index dd4104a6894..4674d56aad5 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx index 81f992f29d5..26379073811 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx index ff23ae4db09..a47fd3184d0 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx index a713774f8c0..cccade70449 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx @@ -110,7 +110,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -185,6 +185,43 @@ % axes at the driver level: this is then \enquote{transparent} to the % \pkg{draw} level, and so should be used only when strictly required.) % +% The bounding box of the drawing is determined by tracking the size of the +% \pkg{draw} commands between the start and end. The bounding box is (roughly) +% the smallest box that contains all of the co-ordinates mentioned within the +% drawing. This can include those automatically generated, for example the +% supporting points needed to construct an arc. +% +% \begin{function}{\draw_baseline:n} +% \begin{syntax} +% \cs{draw_baseline:n} \Arg{length} +% \end{syntax} +% As standard, the baseline of the bounding box of a drawing is calculated +% automatically at the bottom of the drawing. It is possible to adjust this +% using the \cs{draw_baseline:n} function. If the drawing co-ordinates lead +% to lower $y$-axis values than the \meta{length}, then the drawing will have +% a depth as well as a height. +% \begin{demo} +% text +% \draw_begin: +% \draw_path_rectangle:nn { 0 , 0 } { 2ex , 1ex } +% \draw_path_use:n { stroke } +% \draw_end: +% text +% \draw_begin: +% \draw_path_rectangle:nn { 0 , 1ex } { 2ex , 1ex } +% \draw_baseline:n { 0pt } +% \draw_path_use:n { stroke } +% \draw_end: +% text +% \draw_begin: +% \draw_path_rectangle:nn { 0 , -1ex } { 2ex , 1ex } +% \draw_baseline:n { -0.5ex } +% \draw_path_use:n { stroke } +% \draw_end: +% text +% \end{demo} +% \end{function} +% % \begin{function}{\draw_suspend_begin:, \draw_suspend_end:} % \begin{syntax} % \cs{draw_suspend_begin:} @@ -363,21 +400,10 @@ % \subsection{Points} % % Functions supporting the calculation of points (co-ordinates) are expandable -% and may be used outside of the drawing environment. When used in this -% way, they all yield a co-ordinate tuple, for example -% \begin{verbatim} -% \tl_set:Nx \l_tmpa_tl { \draw_point:nn { 1 } { 2 } } -% \tl_show:N \l_tmpa_tl -% \end{verbatim} -% gives -% \begin{verbatim} -% > \l_tmpa_tl=1pt,2pt. -% <recently read> } -% \end{verbatim} -% -% This output form is then suitable as \emph{input} for subsequent point -% calculations, \emph{i.e.}~where a \meta{point} is required it may be -% given as a tuple. This \emph{may} include units and surrounding +% and may be used outside of the drawing environment. The outputs of all of the +% point functions are tuples. This output form is then suitable as \emph{input} +% for subsequent point calculations, \emph{i.e.}~where a \meta{point} is required +% it may be given as a tuple. This \emph{may} include units and surrounding % parentheses, for example % \begin{verbatim} % 1,2 @@ -1136,7 +1162,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3draw}{2021-07-12}{} +\ProvidesExplPackage{l3draw}{2021-08-04}{} {L3 Experimental core drawing support} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx b/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx index 5101c9ae71d..85cc3f556b1 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -240,7 +240,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3graphics}{2021-07-12}{} +\ProvidesExplPackage{l3graphics}{2021-08-04}{} {L3 Experimental graphics inclusion support} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3opacity/l3opacity.dtx b/Master/texmf-dist/source/latex/l3experimental/l3opacity/l3opacity.dtx index 4b1e7ea64f0..8c419c7a4ce 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3opacity/l3opacity.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3opacity/l3opacity.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -97,7 +97,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3opacity}{2021-07-12}{} +\ProvidesExplPackage{l3opacity}{2021-08-04}{} {L3 Experimental opacity support} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx index 669d1987900..2f11898e859 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3str-format}{2021-07-12}{} +\ProvidesExplPackage{l3str-format}{2021-08-04}{} {L3 Experimental string formatting} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx index 56f5ccf6105..c3198c0ee2e 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -151,7 +151,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3sys-shell}{2021-07-12}{} +\ProvidesExplPackage{l3sys-shell}{2021-08-04}{} {L3 Experimental system shell functions} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx index afd086567b7..3fec592ee40 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -672,7 +672,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xcoffins}{2021-07-12}{} +\ProvidesExplPackage{xcoffins}{2021-08-04}{} {L3 Experimental design level coffins} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index ba662b097f2..d1da19f384a 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -686,7 +686,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3galley}{2021-07-12}{} +\ProvidesExplPackage{l3galley}{2021-08-04}{} {L3 Experimental galley code} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx index b75c45ee2de..bdbe9478a21 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-07-12} +% \date{Released 2021-08-04} % % \maketitle % @@ -731,7 +731,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2021-07-12}{} +\ProvidesExplPackage{xgalley}{2021-08-04}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index 183f3a7c01f..52cb416cf23 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -62,7 +62,7 @@ % }^^A % } % -% \date{Released 2021-06-18} +% \date{Released 2021-08-04} % % \maketitle % @@ -139,10 +139,16 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3keys2e}{2021-06-18}{} +\ProvidesExplPackage{l3keys2e}{2021-08-04}{} {LaTeX2e option processing using LaTeX3 keys} % \end{macrocode} % +% Allow for a kernel-based implementation +% \begin{macrocode} +\cs_if_exist:NT \ProcessKeysOptions + { \file_input_stop: } +% \end{macrocode} +% % Non-standard variants. % \begin{macrocode} \cs_generate_variant:Nn \clist_put_right:Nn { Nv } diff --git a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx index 48ecbf7fc0a..ef09bccc367 100644 --- a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2021-06-18} +% \date{Released 2021-08-04} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfp}{2021-06-18}{} +\ProvidesExplPackage{xfp}{2021-08-04}{} {L3 Floating point unit} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx index 07b1e76af34..58d35df80ee 100644 --- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx @@ -65,7 +65,7 @@ % }^^A % } % -% \date{Released 2021-06-18} +% \date{Released 2021-08-04} % % \maketitle % @@ -535,7 +535,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfrac}{2021-06-18}{} +\ProvidesExplPackage{xfrac}{2021-08-04}{} {L3 Experimental split-level fractions} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index ca7b5c12d51..78a73fdddef 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -67,7 +67,7 @@ % }^^A % } % -% \date{Released 2021-06-18} +% \date{Released 2021-08-04} % % \maketitle % @@ -297,7 +297,7 @@ % \end{verbatim} % where \verb*|\foobar{arg1} [arg2]| will not find an optional argument. % -% There is one subtly here due to the difference in handling by \TeX{} +% There is one subtlety here due to the difference in handling by \TeX{} % of \enquote{control symbols}, where the command name is made up of a single % character, such as \enquote{\cmd{\\}}. Spaces are not ignored by \TeX{} % here, and thus it is possible to require an optional argument directly @@ -1064,7 +1064,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xparse}{2021-06-18}{} +\ProvidesExplPackage{xparse}{2021-08-04}{} {L3 Experimental document command parser} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 7a7d682d639..e4e581c6b13 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2021-06-18} +% \date{Released 2021-08-04} % % \maketitle % @@ -682,7 +682,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xtemplate}{2021-06-18}{} +\ProvidesExplPackage{xtemplate}{2021-08-04}{} {L3 Experimental prototype document functions} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 34c8bdbf85b..4c9e8978870 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-07-12}{} + {l3backend-dvipdfmx.def}{2021-08-04}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -214,7 +214,9 @@ / \str_convert_pdfname:n {#1} ~ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -282,7 +284,9 @@ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -873,7 +877,9 @@ \cs_new_protected:Npn \__pdf_backend_emc: { \__kernel_backend_literal_page:n { EMC } } %% File: l3backend-opacity.dtx -\cs_if_exist:NT \pdfmanagement_add:nnn +\bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -898,7 +904,9 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\cs_if_exist:NF \pdfmanagement_add:nnn +\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 { } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 6d5df3b0d5d..cac3f268f18 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-07-12}{} + {l3backend-dvips.def}{2021-08-04}{} {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 fb5daeac366..1cfcc6bff02 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-07-12}{} + {l3backend-dvisvgm.def}{2021-08-04}{} {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 9a08ddb30d0..5de17be96e8 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-07-12}{} + {l3backend-luatex.def}{2021-08-04}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -171,7 +171,9 @@ / \str_convert_pdfname:n {#1} ~ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -239,7 +241,9 @@ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -759,7 +763,9 @@ \cs_new_protected:Npn \__pdf_backend_emc: { \__kernel_backend_literal_page:n { EMC } } %% File: l3backend-opacity.dtx -\cs_if_exist:NT \pdfmanagement_add:nnn +\bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -784,7 +790,9 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\cs_if_exist:NF \pdfmanagement_add:nnn +\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 { } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index e4723892379..23bffda8d6d 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-07-12}{} + {l3backend-pdftex.def}{2021-08-04}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -171,7 +171,9 @@ / \str_convert_pdfname:n {#1} ~ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -239,7 +241,9 @@ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -759,7 +763,9 @@ \cs_new_protected:Npn \__pdf_backend_emc: { \__kernel_backend_literal_page:n { EMC } } %% File: l3backend-opacity.dtx -\cs_if_exist:NT \pdfmanagement_add:nnn +\bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -784,7 +790,9 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\cs_if_exist:NF \pdfmanagement_add:nnn +\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 { } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 639eaa396fc..7a63f5c33c3 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-07-12}{} + {l3backend-xetex.def}{2021-08-04}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -214,7 +214,9 @@ / \str_convert_pdfname:n {#1} ~ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -282,7 +284,9 @@ #2 ~ \pdf_object_ref_last: } - \cs_if_exist:NT \pdfmanagement_add:nnn + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \use:x { @@ -919,7 +923,9 @@ \cs_new_protected:Npn \__pdf_backend_emc: { \__kernel_backend_literal_page:n { EMC } } %% File: l3backend-opacity.dtx -\cs_if_exist:NT \pdfmanagement_add:nnn +\bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p:} { \__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } @@ -944,7 +950,9 @@ { /opacity #1 ~ gs } \group_insert_after:N \__opacity_backend_reset: } -\cs_if_exist:NF \pdfmanagement_add:nnn +\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 { } } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty index 74ed69c9484..d4a3797f3e7 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty @@ -20,7 +20,7 @@ %% %% File: l3benchmark.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3benchmark}{2021-07-12}{} +\ProvidesExplPackage{l3benchmark}{2021-08-04}{} {L3 Experimental benchmarking} \fp_new:N \g_benchmark_duration_target_fp \fp_gset:Nn \g_benchmark_duration_target_fp { 1 } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty b/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty index d5f10c331eb..48a7dd581fa 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3bitset.dtx -\ProvidesExplPackage{l3bitset}{2021-07-12}{} +\ProvidesExplPackage{l3bitset}{2021-08-04}{} {L3 Experimental bitset support} \cs_new_protected:Npn \bitset_new:N #1 { diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index 36bc4bd402d..20decb315e3 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty @@ -28,7 +28,7 @@ %% %% File: l3draw.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3draw}{2021-07-12}{} +\ProvidesExplPackage{l3draw}{2021-08-04}{} {L3 Experimental core drawing support} \scan_new:N \s__draw_mark \scan_new:N \s__draw_stop @@ -804,7 +804,7 @@ \cs_new:Npn \__draw_point_process:nn #1#2 { \exp_args:Nf \__draw_point_process_auxi:nn - { \__draw_point_to_dim:n {#2} } + { \draw_point:n {#2} } {#1} } \cs_new:Npn \__draw_point_process_auxi:nn #1#2 @@ -814,8 +814,8 @@ \cs_new:Npn \__draw_point_process:nnn #1#2#3 { \exp_args:Nff \__draw_point_process_auxiii:nnn - { \__draw_point_to_dim:n {#2} } - { \__draw_point_to_dim:n {#3} } + { \draw_point:n {#2} } + { \draw_point:n {#3} } {#1} } \cs_new:Npn \__draw_point_process_auxiii:nnn #1#2#3 @@ -825,9 +825,9 @@ \cs_new:Npn \__draw_point_process:nnnn #1#2#3#4 { \exp_args:Nfff \__draw_point_process_auxv:nnnn - { \__draw_point_to_dim:n {#2} } - { \__draw_point_to_dim:n {#3} } - { \__draw_point_to_dim:n {#4} } + { \draw_point:n {#2} } + { \draw_point:n {#3} } + { \draw_point:n {#4} } {#1} } \cs_new:Npn \__draw_point_process_auxv:nnnn #1#2#3#4 @@ -838,10 +838,10 @@ \cs_new:Npn \__draw_point_process:nnnnn #1#2#3#4#5 { \exp_args:Nffff \__draw_point_process_auxvii:nnnnn - { \__draw_point_to_dim:n {#2} } - { \__draw_point_to_dim:n {#3} } - { \__draw_point_to_dim:n {#4} } - { \__draw_point_to_dim:n {#5} } + { \draw_point:n {#2} } + { \draw_point:n {#3} } + { \draw_point:n {#4} } + { \draw_point:n {#5} } {#1} } \cs_new:Npn \__draw_point_process_auxvii:nnnnn #1#2#3#4#5 @@ -852,18 +852,18 @@ \cs_new:Npn \__draw_point_process_auxviii:nw #1 #2 , #3 \s__draw_mark #4 , #5 \s__draw_mark #6 , #7 \s__draw_mark #8 , #9 \s__draw_stop { #1 {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} } +\cs_new:Npn \draw_point:n #1 + { \__draw_point_to_dim:f { \fp_eval:n {#1} } } \cs_new:Npn \__draw_point_to_dim:n #1 - { \__draw_point_to_dim_aux:f { \fp_eval:n {#1} } } -\cs_new:Npn \__draw_point_to_dim_aux:n #1 - { \__draw_point_to_dim_aux:w #1 } -\cs_generate_variant:Nn \__draw_point_to_dim_aux:n { f } -\cs_new:Npn \__draw_point_to_dim_aux:w ( #1 , ~ #2 ) { #1pt , #2pt } + { \__draw_point_to_dim:w #1 } +\cs_generate_variant:Nn \__draw_point_to_dim:n { f } +\cs_new:Npn \__draw_point_to_dim:w ( #1 , ~ #2 ) { #1pt , #2pt } \cs_new:Npn \draw_point_polar:nn #1#2 { \draw_point_polar:nnn {#1} {#1} {#2} } \cs_new:Npn \draw_point_polar:nnn #1#2#3 { \__draw_draw_polar:fnn { \fp_eval:n {#3} } {#1} {#2} } \cs_new:Npn \__draw_draw_polar:nnn #1#2#3 - { \__draw_point_to_dim:n { cosd(#1) * (#2) , sind(#1) * (#3) } } + { \draw_point:n { cosd(#1) * (#2) , sind(#1) * (#3) } } \cs_generate_variant:Nn \__draw_draw_polar:nnn { f } \cs_new:Npn \draw_point_unit_vector:n #1 { \__draw_point_process:nn { \__draw_point_unit_vector:nn } {#1} } @@ -878,7 +878,7 @@ \fp_compare:nNnTF {#1} = \c_zero_fp { 0pt, 1pt } { - \__draw_point_to_dim:n + \draw_point:n { ( #2 , #3 ) / #1 } } } @@ -900,7 +900,7 @@ } \cs_new:Npn \__draw_point_intersect_lines_aux:nnnnnn #1#2#3#4#5#6 { - \__draw_point_to_dim:n + \draw_point:n { ( #2 * #3 - #1 * #4 , #2 * #5 - #1 * #6 ) / ( #4 * #5 - #6 * #3 ) @@ -959,7 +959,7 @@ \cs_generate_variant:Nn \__draw_point_intersect_circles_auxvi:nnnnnnnn { f } \cs_new:Npn \__draw_point_intersect_circles_auxvii:nnnnnnn #1#2#3#4#5#6#7 { - \__draw_point_to_dim:n + \draw_point:n { #6 + #4 * #1 + #2 * #3 * #5 , #7 + #5 * #1 + -1 * #2 * #3 * #4 } } \cs_generate_variant:Nn \__draw_point_intersect_circles_auxvii:nnnnnnn { fff } @@ -976,7 +976,7 @@ } \cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnn { f } \cs_new:Npn \__draw_point_interpolate_line_aux:nnnnnn #1#2#3#4#5#6 - { \__draw_point_to_dim:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } } + { \draw_point:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } } \cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnnn { f } \cs_new:Npn \draw_point_interpolate_distance:nnn #1#2#3 { @@ -994,7 +994,7 @@ { \draw_point_unit_vector:n { ( #2 ) - ( #3 , #4 ) } } } \cs_new:Npn \__draw_point_interpolate_distance:nnnnn #1#2#3#4#5 - { \__draw_point_to_dim:n { #2 + #1 * #4 , #3 + #1 * #5 } } + { \draw_point:n { #2 + #1 * #4 , #3 + #1 * #5 } } \cs_generate_variant:Nn \__draw_point_interpolate_distance:nnnnn { f } \cs_new:Npn \draw_point_interpolate_arcaxes:nnnnnn #1#2#3#4#5#6 { @@ -1024,7 +1024,7 @@ \cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiii:nnnnnnn { f } \cs_new:Npn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_to_dim:n + \draw_point:n { #3 + #1 * #5 + #2 * #7 , #4 + #1 * #6 + #2 * #8 } } \cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn { ff } @@ -1085,7 +1085,7 @@ } \cs_new:Npn \__draw_point_interpolate_curve_auxviii:nnnnnn #1#2#3#4#5#6 { - \__draw_point_to_dim:n + \draw_point:n { #5 * #3 + #6 * #1 , #5 * #4 + #6 * #2 } } \cs_generate_variant:Nn \__draw_point_interpolate_curve_auxviii:nnnnnn { ffff } @@ -1117,7 +1117,7 @@ { \__draw_point_vec:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } } \cs_new:Npn \__draw_point_vec:nn #1#2 { - \__draw_point_to_dim:n + \draw_point:n { #1 * \l__draw_xvec_x_dim + #2 * \l__draw_yvec_x_dim , #1 * \l__draw_xvec_y_dim + #2 * \l__draw_yvec_y_dim @@ -1131,7 +1131,7 @@ } \cs_new:Npn \__draw_point_vec:nnn #1#2#3 { - \__draw_point_to_dim:n + \draw_point:n { #1 * \l__draw_xvec_x_dim + #2 * \l__draw_yvec_x_dim @@ -1149,7 +1149,7 @@ { \__draw_draw_vec_polar:fnn { \fp_eval:n {#3} } {#1} {#2} } \cs_new:Npn \__draw_draw_vec_polar:nnn #1#2#3 { - \__draw_point_to_dim:n + \draw_point:n { cosd(#1) * (#2) * \l__draw_xvec_x_dim , sind(#1) * (#3) * \l__draw_yvec_y_dim @@ -1165,7 +1165,7 @@ { \bool_if:NTF \l__draw_matrix_active_bool { - \__draw_point_to_dim:n + \draw_point:n { ( \l__draw_matrix_a_fp * #1 @@ -1181,7 +1181,7 @@ } } { - \__draw_point_to_dim:n + \draw_point:n { (#1, #2) + ( \l__draw_xshift_dim , \l__draw_yshift_dim ) @@ -1197,7 +1197,7 @@ { \bool_if:NTF \l__draw_matrix_active_bool { - \__draw_point_to_dim:n + \draw_point:n { ( \l__draw_matrix_a_fp * #1 @@ -1210,7 +1210,7 @@ ) } } - { \__draw_point_to_dim:n { (#1, #2) } } + { \draw_point:n { (#1, #2) } } } %% File: l3draw-scopes.dtx \dim_new:N \g__draw_xmax_dim @@ -1251,6 +1251,7 @@ } \cs_new_protected:Npn \draw_end: { + \__draw_baseline_finalise:w \exp_args:NNNV \hbox_set_end: \clist_set:Nn \l_draw_layers_clist \l_draw_layers_clist \__draw_layers_insert: @@ -1263,21 +1264,63 @@ \dim_gzero:N \g__draw_ymax_dim \dim_gzero:N \g__draw_ymin_dim } - \hbox_set:Nn \l__draw_main_box - { - \skip_horizontal:n { -\g__draw_xmin_dim } - \box_move_down:nn { \g__draw_ymin_dim } - { \box_use_drop:N \l__draw_main_box } - } - \box_set_ht:Nn \l__draw_main_box - { \g__draw_ymax_dim - \g__draw_ymin_dim } - \box_set_dp:Nn \l__draw_main_box { 0pt } + \__draw_finalise: \box_set_wd:Nn \l__draw_main_box { \g__draw_xmax_dim - \g__draw_xmin_dim } \mode_leave_vertical: \box_use_drop:N \l__draw_main_box \group_end: } +\cs_new_protected:Npn \__draw_finalise: + { + \hbox_set:Nn \l__draw_main_box + { + \skip_horizontal:n { -\g__draw_xmin_dim } + \box_move_down:nn + { \g__draw_ymin_dim } + { \box_use_drop:N \l__draw_main_box } + } + \box_set_dp:Nn \l__draw_main_box { 0pt } + \box_set_ht:Nn \l__draw_main_box + { \g__draw_ymax_dim - \g__draw_ymin_dim } + } +\cs_new_protected:Npn \__draw_finalise_baseline:n #1 + { + \hbox_set:Nn \l__draw_main_box + { + \skip_horizontal:n { -\g__draw_xmin_dim } + \box_move_down:nn + {#1} + { \box_use_drop:N \l__draw_main_box } + } + \box_set_dp:Nn \l__draw_main_box + { + \dim_max:nn + { #1 - \g__draw_ymin_dim } + { 0pt } + } + \box_set_ht:Nn \l__draw_main_box + { \g__draw_ymax_dim + #1 } + } +\bool_new:N \l__draw_baseline_bool +\dim_new:N \l__draw_baseline_dim +\cs_new_protected:Npn \draw_baseline:n #1 + { + \bool_set_true:N \l__draw_baseline_bool + \dim_set:Nn \l__draw_baseline_dim { \fp_to_dim:n {#1} } + } +\cs_new_protected:Npn \__draw_baseline_finalise:w #1 \__draw_finalise: + { + \bool_if:NTF \l__draw_baseline_bool + { + \use:x + { + \exp_not:n {#1} + \__draw_finalise_baseline:n { \dim_use:N \l__draw_baseline_dim } + } + } + { #1 \__draw_finalise: } + } \dim_new:N \l__draw_linewidth_dim \tl_new:N \l__draw_fill_color_tl \tl_new:N \l__draw_stroke_color_tl diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty index 604c67894e9..f99089d60d9 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty @@ -20,7 +20,7 @@ %% %% File: l3graphics.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3graphics}{2021-07-12}{} +\ProvidesExplPackage{l3graphics}{2021-08-04}{} {L3 Experimental graphics inclusion support} \ior_new:N \l__graphics_tmp_ior \tl_new:N \l__graphics_tmp_tl diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty index 589808bd034..3451a2a7c1b 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty @@ -20,7 +20,7 @@ %% %% File: l3opacity.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3opacity}{2021-07-12}{} +\ProvidesExplPackage{l3opacity}{2021-08-04}{} {L3 Experimental opacity support} \cs_new_protected:Npn \opacity_select:n #1 { \__opacity_select:nN {#1} \__opacity_backend_select:n } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty index 5c109269cf4..6c7a8c79cf9 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty @@ -20,7 +20,7 @@ %% %% File: l3str-format.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3str-format}{2021-07-12}{} +\ProvidesExplPackage{l3str-format}{2021-08-04}{} {L3 Experimental string formatting} \cs_generate_variant:Nn \use:nn { nf } \cs_generate_variant:Nn \use:nnn { fnf } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty index 30030b40495..b9f4c39fa9c 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty @@ -20,7 +20,7 @@ %% %% File: l3sys-shell.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3sys-shell}{2021-07-12}{} +\ProvidesExplPackage{l3sys-shell}{2021-08-04}{} {L3 Experimental system shell functions} \scan_new:N \s__sys_stop \quark_new:N \q__sys_nil diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty index b32682f96c6..1a161dfaaca 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: xcoffins.dtx -\ProvidesExplPackage{xcoffins}{2021-07-12}{} +\ProvidesExplPackage{xcoffins}{2021-08-04}{} {L3 Experimental design level coffins} \keys_define:nn { coffin } { diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 8a0769c6cce..c1a9892a368 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{l3galley}{2021-07-12}{} +\ProvidesExplPackage{l3galley}{2021-08-04}{} {L3 Experimental galley code} \int_new:N \l__galley_tmp_int \seq_new:N \g__galley_tmpa_seq diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty index b084017809e..844b38fb9a1 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: xgalley.dtx -\ProvidesExplPackage{xgalley}{2021-07-12}{} +\ProvidesExplPackage{xgalley}{2021-08-04}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} \clist_new:N \l__galley_tmpa_clist diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 0be9d56c5d3..2437f0e3238 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -32,8 +32,10 @@ }% \endinput } -\ProvidesExplPackage{l3keys2e}{2021-06-18}{} +\ProvidesExplPackage{l3keys2e}{2021-08-04}{} {LaTeX2e option processing using LaTeX3 keys} +\cs_if_exist:NT \ProcessKeysOptions + { \file_input_stop: } \cs_generate_variant:Nn \clist_put_right:Nn { Nv } \cs_generate_variant:Nn \keys_if_exist:nnT { nx } \cs_generate_variant:Nn \keys_if_exist:nnTF { nx } diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty index 995d576709f..b9e1e85465a 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xfp}{2021-06-18}{} +\ProvidesExplPackage{xfp}{2021-08-04}{} {L3 Floating point unit} \NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} } \NewExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} } diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty index 20ca20f2472..c95f7688ef3 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty @@ -34,7 +34,7 @@ \endinput } \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate} -\ProvidesExplPackage{xfrac}{2021-06-18}{} +\ProvidesExplPackage{xfrac}{2021-08-04}{} {L3 Experimental split-level fractions} \keys_define:nn { xfrac } { diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex index 7263475814c..70895e12ede 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex @@ -1,11 +1,9 @@ %% -%% This is file `xparse-generic.tex', -%% generated with the docstrip utility. +%% This is file `xparse-generic.tex', generated from +%% xparse.dtx (with options: `core', on 2021-01-20) +%% then adapted and frozen for compatibility. Development of +%% xparse.dtx will continue in the LaTeX2e kernel as ltcmd.dtx. %% -%% The original source files were: -%% -%% xparse.dtx (with options: `core') -%% %% Copyright (C) 2009-2021 The LaTeX Project %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index b11af04ad95..040742244de 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -60,7 +60,7 @@ } } \ExplSyntaxOff -\ProvidesExplPackage{xparse}{2021-06-18}{} +\ProvidesExplPackage{xparse}{2021-08-04}{} {L3 Experimental document command parser} \clist_new:N \l__cmd_options_clist \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption } diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index 84cf0b86dd7..db8f7a40b7e 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xtemplate}{2021-06-18}{} +\ProvidesExplPackage{xtemplate}{2021-08-04}{} {L3 Experimental prototype document functions} \tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ } \tl_const:Nn \c__xtemplate_defaults_root_tl { template~defaults~>~ } |