summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3packages
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-01-17 03:01:49 +0000
committerNorbert Preining <norbert@preining.info>2023-01-17 03:01:49 +0000
commit3ee7e859ef35ea92821f3be74a8d758f5f653fbe (patch)
treef503263ff511ad2c0c03e8eb907091efa072baba /macros/latex/contrib/l3packages
parent6f9e1680085e7bb4d258f6f8116369d122e196e1 (diff)
CTAN sync 202301170301
Diffstat (limited to 'macros/latex/contrib/l3packages')
-rw-r--r--macros/latex/contrib/l3packages/CHANGELOG.md11
-rw-r--r--macros/latex/contrib/l3packages/README.md4
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.dtx6
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.ins4
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.pdfbin412149 -> 412658 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfp.dtx6
-rw-r--r--macros/latex/contrib/l3packages/xfp.ins4
-rw-r--r--macros/latex/contrib/l3packages/xfp.pdfbin331870 -> 332357 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfrac.dtx6
-rw-r--r--macros/latex/contrib/l3packages/xfrac.ins4
-rw-r--r--macros/latex/contrib/l3packages/xfrac.pdfbin482443 -> 482935 bytes
-rw-r--r--macros/latex/contrib/l3packages/xparse.dtx6
-rw-r--r--macros/latex/contrib/l3packages/xparse.ins4
-rw-r--r--macros/latex/contrib/l3packages/xparse.pdfbin534088 -> 534579 bytes
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.dtx60
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.ins4
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.pdfbin449934 -> 450100 bytes
17 files changed, 48 insertions, 71 deletions
diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md
index 06ebdc8c0c..6ad508a7f3 100644
--- a/macros/latex/contrib/l3packages/CHANGELOG.md
+++ b/macros/latex/contrib/l3packages/CHANGELOG.md
@@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2023-01-16]
+
+### Fixed
+- Ad hoc adjustment of template `function` keys
+
+### Removed
+- Template key type `code`
+
## [2022-12-17]
### Fixed
@@ -206,7 +214,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-12-17...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2023-01-16...HEAD
+[2023-01-16]: https://github.com/latex3/latex3/compare/2022-12-17...2023-01-16
[2022-12-17]: https://github.com/latex3/latex3/compare/2022-06-22...2022-12-17
[2022-06-22]: https://github.com/latex3/latex3/compare/2022-06-16...2022-06-22
[2022-06-16]: https://github.com/latex3/latex3/compare/2022-06-07...2022-06-16
diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md
index e85056ab5b..bd73e2a0be 100644
--- a/macros/latex/contrib/l3packages/README.md
+++ b/macros/latex/contrib/l3packages/README.md
@@ -1,7 +1,7 @@
LaTeX3 High-Level Concepts
==========================
-Release 2022-12-17
+Release 2023-01-16
Overview
--------
@@ -109,6 +109,6 @@ the [LaTeX-L list](#Discussion) should be used.
-----
-<p>Copyright (C) 1998-2012,2015-2022 The LaTeX Project <br />
+<p>Copyright (C) 1998-2012,2015-2023 The LaTeX Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx
index 880bc42c92..e72854c2f1 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.dtx
+++ b/macros/latex/contrib/l3packages/l3keys2e.dtx
@@ -2,7 +2,7 @@
%
%% File: l3keys2e.dtx
%
-% Copyright (C) 2009,2011-2022 The LaTeX Project
+% Copyright (C) 2009,2011-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -62,7 +62,7 @@
% }^^A
% }
%
-% \date{Released 2022-12-17}
+% \date{Released 2023-01-16}
%
% \maketitle
%
@@ -154,7 +154,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2022-12-17}{}
+\ProvidesExplPackage{l3keys2e}{2023-01-16}{}
{LaTeX2e option processing using LaTeX3 keys}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/l3keys2e.ins b/macros/latex/contrib/l3packages/l3keys2e.ins
index b475045073..667debde59 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.ins
+++ b/macros/latex/contrib/l3packages/l3keys2e.ins
@@ -2,7 +2,7 @@
File: l3keys2e.ins
-Copyright (C) 2009,2011,2012,2016,2017,2019-2022 The LaTeX Project
+Copyright (C) 2009,2011,2012,2016,2017,2019-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -23,7 +23,7 @@ The released version of this bundle is available from CTAN.
\preamble
-Copyright (C) 2009-2022 The LaTeX Project
+Copyright (C) 2009-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf
index 735bcf8231..9455410190 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.pdf
+++ b/macros/latex/contrib/l3packages/l3keys2e.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx
index e25de010aa..836c5e3b55 100644
--- a/macros/latex/contrib/l3packages/xfp.dtx
+++ b/macros/latex/contrib/l3packages/xfp.dtx
@@ -2,7 +2,7 @@
%
%% File: xfp.dtx
%
-% Copyright (C) 2017-2022 The LaTeX Project
+% Copyright (C) 2017-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2022-12-17}
+% \date{Released 2023-01-16}
%
% \maketitle
%
@@ -171,7 +171,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfp}{2022-12-17}{}
+\ProvidesExplPackage{xfp}{2023-01-16}{}
{L3 Floating point unit}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xfp.ins b/macros/latex/contrib/l3packages/xfp.ins
index b91fbaa6b6..266bfa1661 100644
--- a/macros/latex/contrib/l3packages/xfp.ins
+++ b/macros/latex/contrib/l3packages/xfp.ins
@@ -2,7 +2,7 @@
File: xfp.ins
-Copyright (C) 2017,2019-2022 The LaTeX Project
+Copyright (C) 2017,2019-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -23,7 +23,7 @@ The released version of this bundle is available from CTAN.
\preamble
-Copyright (C) 2017-2022 The LaTeX Project
+Copyright (C) 2017-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf
index e8523ffd3a..f33457d2d9 100644
--- a/macros/latex/contrib/l3packages/xfp.pdf
+++ b/macros/latex/contrib/l3packages/xfp.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx
index 99b45ad337..596d639f4c 100644
--- a/macros/latex/contrib/l3packages/xfrac.dtx
+++ b/macros/latex/contrib/l3packages/xfrac.dtx
@@ -3,7 +3,7 @@
%% File: xfrac.dtx
%
% Copyright (C) 2004,2008-2010 Morten Hoegholm
-% (C) 2011,2012,2014-2022 The LaTeX Project
+% (C) 2011,2012,2014-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -65,7 +65,7 @@
% }^^A
% }
%
-% \date{Released 2022-12-17}
+% \date{Released 2023-01-16}
%
% \maketitle
%
@@ -535,7 +535,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2022-12-17}{}
+\ProvidesExplPackage{xfrac}{2023-01-16}{}
{L3 Experimental split-level fractions}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xfrac.ins b/macros/latex/contrib/l3packages/xfrac.ins
index aee872b588..511e68c3c3 100644
--- a/macros/latex/contrib/l3packages/xfrac.ins
+++ b/macros/latex/contrib/l3packages/xfrac.ins
@@ -3,7 +3,7 @@
File: xfrac.ins
Copyright (C) 2004,2008-2010 Morten Hoegholm
- (C) 2011,2012,2016,2017,2019-2022 The LaTeX Project
+ (C) 2011,2012,2016,2017,2019-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -25,7 +25,7 @@ The released version of this bundle is available from CTAN.
\preamble
Copyright (C) 2004,2008-2010 Morten Hoegholm
- (C) 2011-2022 The LaTeX Project
+ (C) 2011-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf
index 97f5e08f86..b61304d37e 100644
--- a/macros/latex/contrib/l3packages/xfrac.pdf
+++ b/macros/latex/contrib/l3packages/xfrac.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx
index d0d70d2740..97dd2f8fd9 100644
--- a/macros/latex/contrib/l3packages/xparse.dtx
+++ b/macros/latex/contrib/l3packages/xparse.dtx
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 Frank Mittelbach, Chris Rowley, David Carlisle
% (C) 2004-2008 Frank Mittelbach, The LaTeX Project
-% (C) 2009-2022 The LaTeX Project
+% (C) 2009-2023 The LaTeX Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -67,7 +67,7 @@
% }^^A
% }
%
-% \date{Released 2022-12-17}
+% \date{Released 2023-01-16}
%
% \maketitle
%
@@ -1064,7 +1064,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xparse}{2022-12-17}{}
+\ProvidesExplPackage{xparse}{2023-01-16}{}
{L3 Experimental document command parser}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xparse.ins b/macros/latex/contrib/l3packages/xparse.ins
index c69d316de7..d7973d49f7 100644
--- a/macros/latex/contrib/l3packages/xparse.ins
+++ b/macros/latex/contrib/l3packages/xparse.ins
@@ -2,7 +2,7 @@
File: xparse.ins
-Copyright (C) 2000-2012,2016,2017,2019-2022 The LaTeX Project
+Copyright (C) 2000-2012,2016,2017,2019-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -23,7 +23,7 @@ The released version of this bundle is available from CTAN.
\preamble
-Copyright (C) 2009-2022 The LaTeX Project
+Copyright (C) 2009-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf
index e597824008..f0cf92604c 100644
--- a/macros/latex/contrib/l3packages/xparse.pdf
+++ b/macros/latex/contrib/l3packages/xparse.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx
index 75f8e78ee4..eb9ae86e94 100644
--- a/macros/latex/contrib/l3packages/xtemplate.dtx
+++ b/macros/latex/contrib/l3packages/xtemplate.dtx
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 Frank Mittelbach, Chris Rowley, David Carlisle
% (C) 2004-2010 Frank Mittelbach, The LaTeX Project
-% (C) 2011-2022 The LaTeX Project
+% (C) 2011-2023 The LaTeX Project
%\
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2022-12-17}
+% \date{Released 2023-01-16}
%
% \maketitle
%
@@ -244,8 +244,6 @@
% boolean & \texttt{true} or \texttt{false} \\
% choice\Arg{choices}
% & A list of pre-defined \meta{choices} \\
-% code
-% & Generalised key type: use |#1| as the input to the key \\
% commalist & A comma-separated list \\
% function\Arg{$N$}
% & A function definition with $N$ arguments
@@ -331,8 +329,6 @@
% choice
% & List of choice implementations
% (see Section~\ref{sec:choices-key}) \\
-% code
-% & \meta{code} using |#1| as input to the key \\
% commalist & Comma list, \emph{e.g}.~\cs{l_tmpa_clist} \\
% function
% & Function taking $N$ arguments, \emph{e.g}.~\cs{use_i:nn} \\
@@ -706,7 +702,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2022-12-17}{}
+\ProvidesExplPackage{xtemplate}{2023-01-16}{}
{L3 Experimental prototype document functions}
% \end{macrocode}
%
@@ -1448,16 +1444,16 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_store_value_code:n, \@@_store_value_choice:n,
+% \begin{macro}{\@@_store_value:n, \@@_store_value_choice:n,
% \@@_store_value_function:n, \@@_store_value_instance:n}
% With no need to worry about delayed evaluation, these keytypes all
% just store the input directly.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_store_value_code:n #1
+\cs_new_protected:Npn \@@_store_value:n #1
{ \prop_put:Non \l_@@_values_prop \l_@@_key_name_tl {#1} }
-\cs_new_eq:NN \@@_store_value_choice:n \@@_store_value_code:n
-\cs_new_eq:NN \@@_store_value_function:n \@@_store_value_code:n
-\cs_new_eq:NN \@@_store_value_instance:n \@@_store_value_code:n
+\cs_new_eq:NN \@@_store_value_choice:n \@@_store_value:n
+\cs_new_eq:NN \@@_store_value_function:n \@@_store_value:n
+\cs_new_eq:NN \@@_store_value_instance:n \@@_store_value:n
% \end{macrocode}
% \end{macro}
%
@@ -1612,16 +1608,6 @@
\str_case:VnF \l_@@_keytype_tl
{
{ choice } { \@@_implement_choices:nn {#1} {#3} }
- { code }
- {
- \@@_parse_vars_elt_key:nn {#1}
- {
- .cs_ \str_if_eq:nnT {#1} { global } { g }
- set_protected:Np = \exp_not:N #3
- }
- \prop_put:Non \l_@@_vars_prop
- \l_@@_key_name_tl {#2#3}
- }
{ function }
{
\cs_if_exist:NF #3
@@ -1630,9 +1616,12 @@
{
.code:n =
{
- \exp_not:c
- { cs_ \str_if_eq:nnT {#1} { global } { g } seq_eq:NN }
- \exp_not:N #3 ####1
+ \cs_generate_from_arg_count:NNnn
+ \exp_not:N #3
+ \exp_not:c
+ { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn }
+ { \exp_not:o \l_@@_keytype_arg_tl }
+ {####1}
}
}
\prop_put:Non \l_@@_vars_prop
@@ -2206,26 +2195,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_assign_code:}
-% \begin{macro}{\@@_assign_code:n}
-% Assigning general code to a key needs a scratch function to be created
-% and run when \cs{AssignTemplateKeys} is called. So the appropriate
-% definition then use is created in the token list variable.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_assign_code:
- {
- \tl_put_right:Nx \l_@@_assignments_tl
- {
- \cs_set_protected:Npn \@@_assign_code:n \exp_not:n {##1}
- { \exp_not:o \l_@@_var_tl }
- \@@_assign_code:n { \exp_not:o \l_@@_value_tl }
- }
- }
-\cs_new_protected:Npn \@@_assign_code:n #1 { }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \begin{macro}{\@@_assign_function:}
% \begin{macro}{\@@_assign_function_aux:N}
% This looks a bit messy but is only actually one function.
@@ -2751,7 +2720,6 @@
Valid~key-types~are:\\
-~boolean;\\
-~choice;\\
- -~code;\\
-~commalist;\\
-~function;\\
-~instance;\\
diff --git a/macros/latex/contrib/l3packages/xtemplate.ins b/macros/latex/contrib/l3packages/xtemplate.ins
index 48eea78c7f..72bf777194 100644
--- a/macros/latex/contrib/l3packages/xtemplate.ins
+++ b/macros/latex/contrib/l3packages/xtemplate.ins
@@ -2,7 +2,7 @@
File: xtemplate.ins
-Copyright (C) 2000-2012,2016,2017,2019-2022 The LaTeX Project
+Copyright (C) 2000-2012,2016,2017,2019-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -34,7 +34,7 @@ license information is placed in the derived files.
\preamble
-Copyright (C) 2011-2022 The LaTeX Project
+Copyright (C) 2011-2023 The LaTeX Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf
index f15040a73a..ce2f8a6227 100644
--- a/macros/latex/contrib/l3packages/xtemplate.pdf
+++ b/macros/latex/contrib/l3packages/xtemplate.pdf
Binary files differ