From 84dbb829f577b1dcfedf9482ffd6f74398a2b439 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 7 Jun 2022 20:24:31 +0000 Subject: l3packages (7jun22) git-svn-id: svn://tug.org/texlive/trunk@63505 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/l3packages/CHANGELOG.md | 9 ++++++++- Master/texmf-dist/doc/latex/l3packages/README.md | 2 +- .../doc/latex/l3packages/l3keys2e/l3keys2e.pdf | Bin 369421 -> 369332 bytes Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf | Bin 332174 -> 332067 bytes .../doc/latex/l3packages/xfrac/xfrac.pdf | Bin 484979 -> 484863 bytes .../doc/latex/l3packages/xparse/xparse.pdf | Bin 534402 -> 534282 bytes .../doc/latex/l3packages/xtemplate/xtemplate.pdf | Bin 450240 -> 450127 bytes .../source/latex/l3packages/l3keys2e/l3keys2e.dtx | 4 ++-- .../texmf-dist/source/latex/l3packages/xfp/xfp.dtx | 4 ++-- .../source/latex/l3packages/xfrac/xfrac.dtx | 4 ++-- .../source/latex/l3packages/xparse/xparse.dtx | 7 ++++--- .../latex/l3packages/xtemplate/xtemplate.dtx | 17 +++++++++++------ .../tex/latex/l3packages/l3keys2e/l3keys2e.sty | 2 +- Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty | 2 +- .../tex/latex/l3packages/xfrac/xfrac.sty | 2 +- .../tex/latex/l3packages/xparse/xparse.sty | 5 +++-- .../tex/latex/l3packages/xtemplate/xtemplate.sty | 15 ++++++++++----- 17 files changed, 46 insertions(+), 27 deletions(-) diff --git a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md index 0205576bb54..60b6838010d 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] +## [2022-06-07] + +### Fixed +- Space stripping from `xtemplate` key types +- Fix `log-declarations=true` (gh/1095) + ## [2022-05-30] ## Added @@ -181,7 +187,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/2022-05-30...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2022-06-07...HEAD +[2022-06-07]: https://github.com/latex3/latex3/compare/2022-05-30...2022-06-07 [2022-05-30]: https://github.com/latex3/latex3/compare/2022-01-12...2022-05-30 [2022-01-12]: https://github.com/latex3/latex3/compare/2021-11-12...2022-01-12 [2021-11-12]: https://github.com/latex3/latex3/compare/2021-08-27...2021-11-12 diff --git a/Master/texmf-dist/doc/latex/l3packages/README.md b/Master/texmf-dist/doc/latex/l3packages/README.md index d683ea95ec4..1d9dd586cc1 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 2022-05-30 +Release 2022-06-07 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf index 9d92531a646..9645d3d9ad5 100644 Binary files a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf and b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf index 80bc16fe6cd..b0cc8eef6f5 100644 Binary files a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf and b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf index 11d1d7d44ef..e4434eea51a 100644 Binary files a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf and b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf index f2a4e2c48df..bac6d5b747f 100644 Binary files a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf and b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf index 94192df3448..a00ca496f9d 100644 Binary files a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf and b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf differ diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index 8ff82d96bf9..c1c56bb8030 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 2022-05-30} +% \date{Released 2022-06-07} % % \maketitle % @@ -139,7 +139,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3keys2e}{2022-05-30}{} +\ProvidesExplPackage{l3keys2e}{2022-06-07}{} {LaTeX2e option processing using LaTeX3 keys} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx index 631c3976b58..fb1de340393 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 2022-05-30} +% \date{Released 2022-06-07} % % \maketitle % @@ -171,7 +171,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfp}{2022-05-30}{} +\ProvidesExplPackage{xfp}{2022-06-07}{} {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 9694a1abb46..6646a0718c4 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 2022-05-30} +% \date{Released 2022-06-07} % % \maketitle % @@ -535,7 +535,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfrac}{2022-05-30}{} +\ProvidesExplPackage{xfrac}{2022-06-07}{} {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 d1a8872fd79..ee75f37f4dd 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 2022-05-30} +% \date{Released 2022-06-07} % % \maketitle % @@ -1064,7 +1064,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xparse}{2022-05-30}{} +\ProvidesExplPackage{xparse}{2022-06-07}{} {L3 Experimental document command parser} % \end{macrocode} % @@ -1086,7 +1086,8 @@ log-declarations .initial:n = false } \keys_set:nV {#1} \l_@@_options_clist - \bool_if:NF \l_@@_log_bool + \bool_if:NTF \l_@@_log_bool + { \msg_redirect_module:nnn {#1} { info } { } } { \msg_redirect_module:nnn {#1} { info } { none } } \cs_new_protected:Npn \@@_unknown_argument_type_error:n ##1 { diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 6dd4e2edfdd..e329169bb34 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 2022-05-30} +% \date{Released 2022-06-07} % % \maketitle % @@ -706,7 +706,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xtemplate}{2022-05-30}{} +\ProvidesExplPackage{xtemplate}{2022-06-07}{} {L3 Experimental prototype document functions} % \end{macrocode} % @@ -1390,7 +1390,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_split_keytype_arg:n #1 { - \tl_set:Nn \l_@@_keytype_tl {#1} + \tl_set:Nx \l_@@_keytype_tl { \tl_trim_spaces:n {#1} } \tl_clear:N \l_@@_keytype_arg_tl \cs_set_protected:Npn \@@_split_keytype_arg_aux:n ##1 { @@ -1399,10 +1399,15 @@ \cs_set:Npn \@@_split_keytype_arg_aux:w ####1 ##1 ####2 \s_@@_stop { - \tl_if_empty:nT {####1} + \tl_if_blank:nT {####1} { - \tl_set:Nn \l_@@_keytype_tl {##1} - \tl_set:Nn \l_@@_keytype_arg_tl {####2} + \tl_set:Nx \l_@@_keytype_tl + { \tl_trim_spaces:n {##1} } + \tl_if_blank:nF {####2} + { + \tl_set:Nx \l_@@_keytype_arg_tl + { \use:n ####2 } + } \seq_map_break: } } diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 31567e5d648..5c5d83a4ce8 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{l3keys2e}{2022-05-30}{} +\ProvidesExplPackage{l3keys2e}{2022-06-07}{} {LaTeX2e option processing using LaTeX3 keys} \cs_if_exist:NT \ProcessKeysOptions { \file_input_stop: } diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty index 38bf65a5434..2862e841200 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}{2022-05-30}{} +\ProvidesExplPackage{xfp}{2022-06-07}{} {L3 Floating point unit} \ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} } \ProvideExpandableDocumentCommand \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 5d477450e87..2b8b2563f78 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}{2022-05-30}{} +\ProvidesExplPackage{xfrac}{2022-06-07}{} {L3 Experimental split-level fractions} \keys_define:nn { xfrac } { diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index b57a85d5d27..9f964f2b619 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}{2022-05-30}{} +\ProvidesExplPackage{xparse}{2022-06-07}{} {L3 Experimental document command parser} \clist_new:N \l__cmd_options_clist \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption } @@ -73,7 +73,8 @@ log-declarations .initial:n = false } \keys_set:nV {#1} \l__cmd_options_clist - \bool_if:NF \l__cmd_log_bool + \bool_if:NTF \l__cmd_log_bool + { \msg_redirect_module:nnn {#1} { info } { } } { \msg_redirect_module:nnn {#1} { info } { none } } \cs_new_protected:Npn \__cmd_unknown_argument_type_error:n ##1 { diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index 5350f7b32cd..3d237efdb9d 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}{2022-05-30}{} +\ProvidesExplPackage{xtemplate}{2022-06-07}{} {L3 Experimental prototype document functions} \cs_generate_variant:Nn \keys_define:nn { nx } \cs_generate_variant:Nn \tl_trim_spaces:n { e } @@ -365,7 +365,7 @@ } \cs_new_protected:Npn \__xtemplate_split_keytype_arg:n #1 { - \tl_set:Nn \l__xtemplate_keytype_tl {#1} + \tl_set:Nx \l__xtemplate_keytype_tl { \tl_trim_spaces:n {#1} } \tl_clear:N \l__xtemplate_keytype_arg_tl \cs_set_protected:Npn \__xtemplate_split_keytype_arg_aux:n ##1 { @@ -374,10 +374,15 @@ \cs_set:Npn \__xtemplate_split_keytype_arg_aux:w ####1 ##1 ####2 \s__xtemplate_stop { - \tl_if_empty:nT {####1} + \tl_if_blank:nT {####1} { - \tl_set:Nn \l__xtemplate_keytype_tl {##1} - \tl_set:Nn \l__xtemplate_keytype_arg_tl {####2} + \tl_set:Nx \l__xtemplate_keytype_tl + { \tl_trim_spaces:n {##1} } + \tl_if_blank:nF {####2} + { + \tl_set:Nx \l__xtemplate_keytype_arg_tl + { \use:n ####2 } + } \seq_map_break: } } -- cgit v1.2.3