diff options
author | Norbert Preining <norbert@preining.info> | 2024-02-21 03:01:35 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-02-21 03:01:35 +0000 |
commit | 2f56d3421e4663856409792eb5b08a2c57b38a8c (patch) | |
tree | e06fab87f70b77ad8d8fef43cfc25293e20127f8 /macros/latex/contrib/l3experimental | |
parent | 203d8df9dde93676afcceb5ace315faeda77d016 (diff) |
CTAN sync 202402210301
Diffstat (limited to 'macros/latex/contrib/l3experimental')
29 files changed, 80 insertions, 35 deletions
diff --git a/macros/latex/contrib/l3experimental/CHANGELOG.md b/macros/latex/contrib/l3experimental/CHANGELOG.md index 449a9889a6..197fa4254d 100644 --- a/macros/latex/contrib/l3experimental/CHANGELOG.md +++ b/macros/latex/contrib/l3experimental/CHANGELOG.md @@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2024-02-20] + +### Fixed +- Normalize `/` in `\sys_shell_split_ls:nN` on Windows: globs may use + ``\``, return values always contain `/` +- Return paths relative to working directory in `\sys_shell_split_ls:nN` on Windows + ## [2024-01-04] ### Changed @@ -302,7 +309,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/2024-01-04...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2024-02-20...HEAD +[2024-02-20]: https://github.com/latex3/latex3/compare/2024-01-04...2024-02-20 [2024-01-04]: https://github.com/latex3/latex3/compare/2023-12-08...2024-01-04 [2023-12-08]: https://github.com/latex3/latex3/compare/2023-11-01...2023-12-08 [2023-11-01]: https://github.com/latex3/latex3/compare/2023-10-10...2023-11-01 diff --git a/macros/latex/contrib/l3experimental/README.md b/macros/latex/contrib/l3experimental/README.md index 1a4d3a4650..dc28bad6ee 100644 --- a/macros/latex/contrib/l3experimental/README.md +++ b/macros/latex/contrib/l3experimental/README.md @@ -1,7 +1,7 @@ Experimental LaTeX3 Concepts ============================ -Release 2024-01-04 +Release 2024-02-20 Overview -------- diff --git a/macros/latex/contrib/l3experimental/l3benchmark.dtx b/macros/latex/contrib/l3experimental/l3benchmark.dtx index 2eb979c660..58d4da8bb7 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.dtx +++ b/macros/latex/contrib/l3experimental/l3benchmark.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -122,7 +122,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3benchmark}{2024-01-04}{} +\ProvidesExplPackage{l3benchmark}{2024-02-20}{} {L3 Experimental benchmarking} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3benchmark.pdf b/macros/latex/contrib/l3experimental/l3benchmark.pdf Binary files differindex 9da3c2ae15..2c8c9d3634 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.pdf +++ b/macros/latex/contrib/l3experimental/l3benchmark.pdf diff --git a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx index 8f481aada9..992acaa05c 100644 --- a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-code.pdf b/macros/latex/contrib/l3experimental/l3draw-code.pdf Binary files differindex db5ed76836..91237671cb 100644 --- a/macros/latex/contrib/l3experimental/l3draw-code.pdf +++ b/macros/latex/contrib/l3experimental/l3draw-code.pdf diff --git a/macros/latex/contrib/l3experimental/l3draw-layers.dtx b/macros/latex/contrib/l3experimental/l3draw-layers.dtx index 6e71f93ade..1244dfa0ec 100644 --- a/macros/latex/contrib/l3experimental/l3draw-layers.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-layers.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-paths.dtx b/macros/latex/contrib/l3experimental/l3draw-paths.dtx index 735db2d23e..e869351f6b 100644 --- a/macros/latex/contrib/l3experimental/l3draw-paths.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-paths.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-points.dtx b/macros/latex/contrib/l3experimental/l3draw-points.dtx index 19e69d4b38..0cb0fd6507 100644 --- a/macros/latex/contrib/l3experimental/l3draw-points.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-points.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx index 7906bc12e9..56ce949b24 100644 --- a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx index 0b8f731ca5..c929e86aa7 100644 --- a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-state.dtx b/macros/latex/contrib/l3experimental/l3draw-state.dtx index e3f6dba452..aef5c2111d 100644 --- a/macros/latex/contrib/l3experimental/l3draw-state.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-state.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx index df9f07af18..8e9143420e 100644 --- a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw.dtx b/macros/latex/contrib/l3experimental/l3draw.dtx index 2fae7afc74..2bfa4e00af 100644 --- a/macros/latex/contrib/l3experimental/l3draw.dtx +++ b/macros/latex/contrib/l3experimental/l3draw.dtx @@ -110,7 +110,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -1181,7 +1181,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3draw}{2024-01-04}{} +\ProvidesExplPackage{l3draw}{2024-02-20}{} {L3 Experimental core drawing support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3draw.pdf b/macros/latex/contrib/l3experimental/l3draw.pdf Binary files differindex 4beda52c98..a0941015ed 100644 --- a/macros/latex/contrib/l3experimental/l3draw.pdf +++ b/macros/latex/contrib/l3experimental/l3draw.pdf diff --git a/macros/latex/contrib/l3experimental/l3galley.dtx b/macros/latex/contrib/l3experimental/l3galley.dtx index 3bafa455b4..724d0d151d 100644 --- a/macros/latex/contrib/l3experimental/l3galley.dtx +++ b/macros/latex/contrib/l3experimental/l3galley.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -686,7 +686,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3galley}{2024-01-04}{} +\ProvidesExplPackage{l3galley}{2024-02-20}{} {L3 Experimental galley code} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3galley.pdf b/macros/latex/contrib/l3experimental/l3galley.pdf Binary files differindex a633e46628..b37d9194e4 100644 --- a/macros/latex/contrib/l3experimental/l3galley.pdf +++ b/macros/latex/contrib/l3experimental/l3galley.pdf diff --git a/macros/latex/contrib/l3experimental/l3graphics.dtx b/macros/latex/contrib/l3experimental/l3graphics.dtx index 9f59b4ec05..ccb6f9669b 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.dtx +++ b/macros/latex/contrib/l3experimental/l3graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -184,7 +184,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3graphics}{2024-01-04}{} +\ProvidesExplPackage{l3graphics}{2024-02-20}{} {L3 Experimental graphics inclusion support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3graphics.pdf b/macros/latex/contrib/l3experimental/l3graphics.pdf Binary files differindex 42212b3f64..dd47e3b10f 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.pdf +++ b/macros/latex/contrib/l3experimental/l3graphics.pdf diff --git a/macros/latex/contrib/l3experimental/l3opacity.dtx b/macros/latex/contrib/l3experimental/l3opacity.dtx index f4abdacd81..ba251f971d 100644 --- a/macros/latex/contrib/l3experimental/l3opacity.dtx +++ b/macros/latex/contrib/l3experimental/l3opacity.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -96,7 +96,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3opacity}{2024-01-04}{} +\ProvidesExplPackage{l3opacity}{2024-02-20}{} {L3 Experimental opacity support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3opacity.pdf b/macros/latex/contrib/l3experimental/l3opacity.pdf Binary files differindex 0898e6463c..7f0af34a48 100644 --- a/macros/latex/contrib/l3experimental/l3opacity.pdf +++ b/macros/latex/contrib/l3experimental/l3opacity.pdf diff --git a/macros/latex/contrib/l3experimental/l3str-format.dtx b/macros/latex/contrib/l3experimental/l3str-format.dtx index 6304ce3ec2..24aad77872 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.dtx +++ b/macros/latex/contrib/l3experimental/l3str-format.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3str-format}{2024-01-04}{} +\ProvidesExplPackage{l3str-format}{2024-02-20}{} {L3 Experimental string formatting} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3str-format.pdf b/macros/latex/contrib/l3experimental/l3str-format.pdf Binary files differindex 367a84e099..45bd5bd4c2 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.pdf +++ b/macros/latex/contrib/l3experimental/l3str-format.pdf diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.dtx b/macros/latex/contrib/l3experimental/l3sys-shell.dtx index ad1733ab77..186a03d87a 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.dtx +++ b/macros/latex/contrib/l3experimental/l3sys-shell.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -126,14 +126,15 @@ % enabled, no action is taken. % \end{function} % -% \begin{function}[added = 2018-07-28]{\sys_shell_split_ls:nN} +% \begin{function}[added = 2018-07-28, updated = 2024-02-20] +% {\sys_shell_split_ls:nN} % \begin{syntax} % \cs{sys_shell_split_ls:N} \Arg{glob} \meta{seq} % \end{syntax} % Sets the \meta{seq var} to contain one entry per directory listing -% (equivalent to |ls -1| or |dir /b|) as specified by the \meta{glob}: the -% entries are strings. If unrestricted shell is not enabled, no action is -% taken. +% (equivalent to |ls -1| or |dir /b /s| with relative paths) as specified by +% the \meta{glob}: the entries are strings. If unrestricted shell is not +% enabled, no action is taken. % \end{function} % % \end{documentation} @@ -151,7 +152,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3sys-shell}{2024-01-04}{} +\ProvidesExplPackage{l3sys-shell}{2024-02-20}{} {L3 Experimental system shell functions} % \end{macrocode} % @@ -328,9 +329,10 @@ % \end{macrocode} % \end{macro} % -% \begin{variable}{\l_@@_tmp_tl} +% \begin{variable}{\l_@@_tmp_seq, \l_@@_tmp_tl} % Scratch space. % \begin{macrocode} +\seq_new:N \l_@@_tmp_seq \tl_new:N \l_@@_tmp_tl % \end{macrocode} % \end{variable} @@ -366,6 +368,8 @@ % \end{macro} % % \begin{macro}{\sys_shell_split_ls:nN} +% \begin{macro}{\@@_shell_split_ls:nN} +% \begin{macro}{\@@_shell_split_ls:w} % Getting a one-per-line listing is easy enough. We need to set % \cs{ExplSyntaxOff} as that deals with the end-of-line character. After that, % just a case of tidying up. The listing always ends in |^^M| so there is an @@ -375,10 +379,11 @@ { \sys_if_shell_unrestricted:T { - \exp_not:N \sys_get_shell:nnN + \exp_not:N \exp_args:Ne \exp_not:N \sys_get_shell:nnN { \sys_if_platform_unix:T { ls~-1~ #1 } - \sys_if_platform_windows:T { dir~/b~ #1 } + \sys_if_platform_windows:T + { dir~/b~/s~ \exp_not:N \@@_path_to_win:n {#1} } } { \ExplSyntaxOff @@ -395,10 +400,42 @@ \seq_pop_right:NN #2 \exp_not:N \l_@@_tmp_tl \exp_not:N \tl_if_blank:eTF { \exp_not:N \seq_item:Nn #2 { 1 } } { \seq_clear:N #2 } + \sys_if_platform_windows:T + { + \sys_get_shell_pwd:N \exp_not:N \l_@@_tmp_tl + \exp_not:N \exp_args:NV \exp_not:N \@@_shell_split_ls:nN + \exp_not:N \l_@@_tmp_tl #2 + } + } + } +% \end{macrocode} +% On Windows, we can either get just file names (|dir /b|) or file names with +% complete paths (|dir /s /b|), but not file names with relative paths in +% a simple way. So we take the full paths and trim off the current working +% directory. Normalization gives the same results as |ls|, hopefully. +% \begin{macrocode} +\sys_if_platform_windows:T + { + \cs_new_protected:Npe \@@_shell_split_ls:nN #1#2 + { + \cs_set:Npn \exp_not:N \@@_shell_split_ls:w #1 \c_backslash_str { } + \seq_set_eq:NN \exp_not:N \l_@@_tmp_seq #2 + \seq_clear:N #2 + \seq_map_inline:Nn \exp_not:N \l_@@_tmp_seq + { + \tl_set:Ne \exp_not:N \l_@@_tmp_tl + { \exp_not:N \@@_shell_split_ls:w ##1 } + \tl_replace_all:Nnn \exp_not:N \l_@@_tmp_tl + { \c_backslash_str } { / } + \seq_put_right:NV #2 \exp_not:N \l_@@_tmp_tl + } } + \cs_new:Npn \@@_shell_split_ls:w { } } % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macrocode} %</package> diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.pdf b/macros/latex/contrib/l3experimental/l3sys-shell.pdf Binary files differindex 1d1c41221a..c35e6f24b6 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.pdf +++ b/macros/latex/contrib/l3experimental/l3sys-shell.pdf diff --git a/macros/latex/contrib/l3experimental/xcoffins.dtx b/macros/latex/contrib/l3experimental/xcoffins.dtx index a18ade7abd..c84f21ae97 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.dtx +++ b/macros/latex/contrib/l3experimental/xcoffins.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -672,7 +672,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xcoffins}{2024-01-04}{} +\ProvidesExplPackage{xcoffins}{2024-02-20}{} {L3 Experimental design level coffins} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/xcoffins.pdf b/macros/latex/contrib/l3experimental/xcoffins.pdf Binary files differindex bee04ded96..a8e4ce7d9e 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.pdf +++ b/macros/latex/contrib/l3experimental/xcoffins.pdf diff --git a/macros/latex/contrib/l3experimental/xgalley.dtx b/macros/latex/contrib/l3experimental/xgalley.dtx index 76e8242f4e..25344df931 100644 --- a/macros/latex/contrib/l3experimental/xgalley.dtx +++ b/macros/latex/contrib/l3experimental/xgalley.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-01-04} +% \date{Released 2024-02-20} % % \maketitle % @@ -731,7 +731,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2024-01-04}{} +\ProvidesExplPackage{xgalley}{2024-02-20}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/xgalley.pdf b/macros/latex/contrib/l3experimental/xgalley.pdf Binary files differindex 50375b414b..d08bc86926 100644 --- a/macros/latex/contrib/l3experimental/xgalley.pdf +++ b/macros/latex/contrib/l3experimental/xgalley.pdf |