summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-06-23 20:56:07 +0000
committerKarl Berry <karl@freefriends.org>2022-06-23 20:56:07 +0000
commit61330fe2693b3f32d9aaa430c79353c5d4bd568f (patch)
tree05fa604441d2cf8f0b6001db6a0b7568cbdfb3d2 /Master/texmf-dist
parent9ceaa67f544de7896b043e5ea753b0a9a3a2eda2 (diff)
l3packages (23jun22)
git-svn-id: svn://tug.org/texlive/trunk@63705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md11
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdfbin369309 -> 412205 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdfbin332062 -> 331915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdfbin484867 -> 484718 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdfbin534285 -> 534143 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdfbin450124 -> 449973 bytes
-rw-r--r--Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx42
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty23
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty2
17 files changed, 57 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md
index add1cb90103..c94596cd96b 100644
--- a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md
@@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2022-06-22]
+
+### Changed
+- Revert alterations to `l3keys2e`
+
+### Deprecated
+- Package `l3keys2e`
+
## [2022-06-16]
### Changed
@@ -192,7 +200,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-06-16...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2022-06-22...HEAD
+[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
[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
diff --git a/Master/texmf-dist/doc/latex/l3packages/README.md b/Master/texmf-dist/doc/latex/l3packages/README.md
index a6598c36e24..d1d8a46ad24 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-06-16
+Release 2022-06-22
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
index f52ddea71a4..5ce8f8ae43e 100644
--- a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf
index db779fc990c..541e32926b7 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
index a2e401c94c3..a576f51ba22 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
index 404cd0a5fcf..c94d4cbaea1 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
index 738e80d25bb..2c4fff1dd32 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index 052c0717519..17ce0522619 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -62,12 +62,27 @@
% }^^A
% }
%
-% \date{Released 2022-06-16}
+% \date{Released 2022-06-22}
%
% \maketitle
%
% \begin{documentation}
%
+% \section{Introduction}
+%
+% \begin{center}
+% \bfseries This package is obsolete with the June 2022 \LaTeX{} release.
+% \end{center}
+%
+% With new formats, \cs{ProcessKeyOptions} is available as a more powerful
+% version of \cs{ProcessKeysOptions}. In particular, it is built directly
+% into the \LaTeX{} kernel, uses `raw' options (and therefore does not
+% suffer from space stripping and expansion issues), and can avoid
+% option clash warnings. Package authors should transition their
+% code to the new approach.
+%
+% \section{Old introduction}
+%
% The key--value method for optional arguments is very popular, as it
% allows the class or package author to define a large number of
% options with a simple interface. The \pkg{expl3} bundle of \LaTeX3
@@ -139,7 +154,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2022-06-16}{}
+\ProvidesExplPackage{l3keys2e}{2022-06-22}{}
{LaTeX2e option processing using LaTeX3 keys}
% \end{macrocode}
%
@@ -230,7 +245,6 @@
% \end{macro}
%
% \begin{macro}{\@@_latexe_options_class:n}
-% \begin{macro}{\@@_latexe_options_remove:nnn, \@@_latexe_options_remove:enn}
% For classes, each option (stripped of any content after |=|)
% is checked for existence as a key. If found, the option is added to
% the combined list for processing. On the other hand, unused options
@@ -250,23 +264,15 @@
{
\clist_map_inline:cn { opt@ \@currname . \@currext }
{
- \@@_latexe_options_remove:enn
- { \@@_latexe_remove_equals:n {##1} }
- {##1} {#1}
+ \keys_if_exist:nxTF {#1} { \@@_latexe_remove_equals:n {##1} }
+ { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} }
+ { \clist_put_right:Nn \@unusedoptionlist {##1} }
}
}
}
}
-\cs_new_protected:Npn \@@_latexe_options_remove:nnn #1#2#3
- {
- \keys_if_exist:nnTF {#3} {#1}
- { \clist_put_right:Nn \l_@@_latexe_options_clist {#2} }
- { \clist_put_right:Nn \@unusedoptionlist {#1} }
- }
-\cs_generate_variant:Nn \@@_latexe_options_remove:nnn { e }
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\@@_latexe_options_package:n}
% For global options when processing a package, the tasks are slightly
@@ -278,9 +284,11 @@
{
\clist_map_inline:Nn \@classoptionslist
{
- \@@_latexe_options_remove:enn
- { \@@_latexe_remove_equals:n {##1} }
- {##1} {#1}
+ \keys_if_exist:nxT {#1} { \@@_latexe_remove_equals:n {##1} }
+ {
+ \clist_put_right:Nn \l_@@_latexe_options_clist {##1}
+ \clist_remove_all:Nn \@unusedoptionlist {##1}
+ }
}
}
% \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 eff39501de0..8020d390fc9 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-06-16}
+% \date{Released 2022-06-22}
%
% \maketitle
%
@@ -171,7 +171,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfp}{2022-06-16}{}
+\ProvidesExplPackage{xfp}{2022-06-22}{}
{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 67cc2e0e591..5376dd40856 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-06-16}
+% \date{Released 2022-06-22}
%
% \maketitle
%
@@ -535,7 +535,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2022-06-16}{}
+\ProvidesExplPackage{xfrac}{2022-06-22}{}
{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 8c4146c1103..c70bf08cf56 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-06-16}
+% \date{Released 2022-06-22}
%
% \maketitle
%
@@ -1064,7 +1064,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xparse}{2022-06-16}{}
+\ProvidesExplPackage{xparse}{2022-06-22}{}
{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 7f215e8c81d..afd33bf3809 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-06-16}
+% \date{Released 2022-06-22}
%
% \maketitle
%
@@ -706,7 +706,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2022-06-16}{}
+\ProvidesExplPackage{xtemplate}{2022-06-22}{}
{L3 Experimental prototype document functions}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 0801f7516ad..32bd085a846 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-06-16}{}
+\ProvidesExplPackage{l3keys2e}{2022-06-22}{}
{LaTeX2e option processing using LaTeX3 keys}
\cs_if_exist:NT \ProcessKeysOptions
{ \file_input_stop: }
@@ -90,27 +90,22 @@
{
\clist_map_inline:cn { opt@ \@currname . \@currext }
{
- \__keys_latexe_options_remove:enn
- { \__keys_latexe_remove_equals:n {##1} }
- {##1} {#1}
+ \keys_if_exist:nxTF {#1} { \__keys_latexe_remove_equals:n {##1} }
+ { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
+ { \clist_put_right:Nn \@unusedoptionlist {##1} }
}
}
}
}
-\cs_new_protected:Npn \__keys_latexe_options_remove:nnn #1#2#3
- {
- \keys_if_exist:nnTF {#3} {#1}
- { \clist_put_right:Nn \l__keys_latexe_options_clist {#2} }
- { \clist_put_right:Nn \@unusedoptionlist {#1} }
- }
-\cs_generate_variant:Nn \__keys_latexe_options_remove:nnn { e }
\cs_new_protected:Npn \__keys_latexe_options_package:n #1
{
\clist_map_inline:Nn \@classoptionslist
{
- \__keys_latexe_options_remove:enn
- { \__keys_latexe_remove_equals:n {##1} }
- {##1} {#1}
+ \keys_if_exist:nxT {#1} { \__keys_latexe_remove_equals:n {##1} }
+ {
+ \clist_put_right:Nn \l__keys_latexe_options_clist {##1}
+ \clist_remove_all:Nn \@unusedoptionlist {##1}
+ }
}
}
\cs_new_protected:Npn \__keys_latexe_options_local:
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index 9ea75822201..213c63c67f3 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-06-16}{}
+\ProvidesExplPackage{xfp}{2022-06-22}{}
{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 223a37dfe15..af712c60a32 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-06-16}{}
+\ProvidesExplPackage{xfrac}{2022-06-22}{}
{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 d58f8b77b30..846a1486c46 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-06-16}{}
+\ProvidesExplPackage{xparse}{2022-06-22}{}
{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 65818826a02..365b14451eb 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-06-16}{}
+\ProvidesExplPackage{xtemplate}{2022-06-22}{}
{L3 Experimental prototype document functions}
\cs_generate_variant:Nn \keys_define:nn { nx }
\cs_generate_variant:Nn \tl_trim_spaces:n { e }