summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3packages
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-08 03:01:09 +0000
committerNorbert Preining <norbert@preining.info>2021-05-08 03:01:09 +0000
commit0f8acc6eb1940c147de1fb17b307dad849cb3915 (patch)
tree396fc6150b43761431485f4e19ee22d376b72922 /macros/latex/contrib/l3packages
parentc92d9953347e3bdebc5243c67cf012a2f7a60fb6 (diff)
CTAN sync 202105080301
Diffstat (limited to 'macros/latex/contrib/l3packages')
-rw-r--r--macros/latex/contrib/l3packages/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/l3packages/README.md2
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.dtx4
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.pdfbin369105 -> 369414 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfp.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xfp.pdfbin331452 -> 331827 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfrac.dtx10
-rw-r--r--macros/latex/contrib/l3packages/xfrac.pdfbin481703 -> 484972 bytes
-rw-r--r--macros/latex/contrib/l3packages/xparse.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xparse.pdfbin531458 -> 534372 bytes
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.dtx17
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.pdfbin438506 -> 440188 bytes
12 files changed, 30 insertions, 20 deletions
diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md
index cf52f56e8f..052e070b7d 100644
--- a/macros/latex/contrib/l3packages/CHANGELOG.md
+++ b/macros/latex/contrib/l3packages/CHANGELOG.md
@@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2021-05-07]
+
+### Fixed
+- Implmentation of `\DeclareRestrictedTemplate`
+- Incorrect use of restricted template in `xfrac`
+
## [2021-03-12]
### Fixed
@@ -124,7 +130,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-03-12...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-05-07...HEAD
+[2021-05-07]: https://github.com/latex3/latex3/compare/2021-03-12...2021-05-07
[2021-03-12]: https://github.com/latex3/latex3/compare/2021-02-02...2021-03-12
[2021-02-02]: https://github.com/latex3/latex3/compare/2020-10-27...2021-02-02
[2020-10-27]: https://github.com/latex3/latex3/compare/2020-10-05...2020-10-27
diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md
index 8319851b85..e55e7476dd 100644
--- a/macros/latex/contrib/l3packages/README.md
+++ b/macros/latex/contrib/l3packages/README.md
@@ -1,7 +1,7 @@
LaTeX3 High-Level Concepts
==========================
-Release 2021-03-12
+Release 2021-05-07
Overview
--------
diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx
index 501e4c5aaa..7904c7c237 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.dtx
+++ b/macros/latex/contrib/l3packages/l3keys2e.dtx
@@ -62,7 +62,7 @@
% }^^A
% }
%
-% \date{Released 2021-03-12}
+% \date{Released 2021-05-07}
%
% \maketitle
%
@@ -139,7 +139,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2021-03-12}{}
+\ProvidesExplPackage{l3keys2e}{2021-05-07}{}
{LaTeX2e option processing using LaTeX3 keys}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf
index e55211ccf9..1d3a6d758a 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 0093447c2e..ac82c7c430 100644
--- a/macros/latex/contrib/l3packages/xfp.dtx
+++ b/macros/latex/contrib/l3packages/xfp.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2021-03-12}
+% \date{Released 2021-05-07}
%
% \maketitle
%
@@ -166,7 +166,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfp}{2021-03-12}{}
+\ProvidesExplPackage{xfp}{2021-05-07}{}
{L3 Floating point unit}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf
index d91a5561bb..64eccb34b7 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 dbbdeaf65a..f6c01be750 100644
--- a/macros/latex/contrib/l3packages/xfrac.dtx
+++ b/macros/latex/contrib/l3packages/xfrac.dtx
@@ -65,7 +65,7 @@
% }^^A
% }
%
-% \date{Released 2021-03-12}
+% \date{Released 2021-05-07}
%
% \maketitle
%
@@ -535,7 +535,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2021-03-12}{}
+\ProvidesExplPackage{xfrac}{2021-05-07}{}
{L3 Experimental split-level fractions}
% \end{macrocode}
%
@@ -979,7 +979,6 @@
scale-factor = 0.7 ,
scale-relative = false ,
scaling = true ,
- numerator-top-sep = 0 pt ,
denominator-bot-sep = 0 pt ,
math-mode = true ,
phantom = ( % )
@@ -1004,7 +1003,6 @@
% \begin{macrocode}
\DeclareCollectionInstance { plainmath } { xfrac } { mathdefault } { math }
{
- denominator-bot-sep = 0 pt ,
numerator-bot-sep = 0 pt ,
numerator-top-sep = \c_max_dim ,
scale-factor = 1 ,
@@ -1128,8 +1126,8 @@
% Just the one.
% \begin{macrocode}
\msg_new:nnnn { xfrac } { over-specified-numerator-sep }
- { You have specified both numerator-top-sep and numerator-bot-sep}
- {I will pretend that you didn't specify either of them}
+ { You~have~specified~both~"numerator-top-sep"~and~"numerator-bot-sep". }
+ { I~will~pretend~that~you~didn't~specify~either~of~them. }
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf
index ec7de16964..e4b7e58e3a 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 b612ed6d23..30f39c1971 100644
--- a/macros/latex/contrib/l3packages/xparse.dtx
+++ b/macros/latex/contrib/l3packages/xparse.dtx
@@ -67,7 +67,7 @@
% }^^A
% }
%
-% \date{Released 2021-03-12}
+% \date{Released 2021-05-07}
%
% \maketitle
%
@@ -1064,7 +1064,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xparse}{2021-03-12}{}
+\ProvidesExplPackage{xparse}{2021-05-07}{}
{L3 Experimental document command parser}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf
index 0722a7b93c..8c939583fc 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 d80d348070..3344621dc5 100644
--- a/macros/latex/contrib/l3packages/xtemplate.dtx
+++ b/macros/latex/contrib/l3packages/xtemplate.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2021-03-12}
+% \date{Released 2021-05-07}
%
% \maketitle
%
@@ -682,7 +682,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2021-03-12}{}
+\ProvidesExplPackage{xtemplate}{2021-05-07}{}
{L3 Experimental prototype document functions}
% \end{macrocode}
%
@@ -1574,12 +1574,12 @@
\cs_new_protected:Npn \@@_store_key_implementation:nnn #1#2#3
{
\@@_recover_defaults:n { #1 / #2 }
+ \@@_recover_restrictions:n { #1 / #2 }
\@@_recover_keytypes:n { #1 / #2 }
\prop_clear:N \l_@@_vars_prop
\keyval_parse:NNn
\@@_parse_vars_elt:n \@@_parse_vars_elt:nn {#3}
\@@_store_vars:n { #1 / #2 }
- \clist_clear:N \l_@@_restrict_clist
\@@_store_restrictions:n { #1 / #2 }
\prop_map_inline:Nn \l_@@_keytypes_prop
{
@@ -1855,15 +1855,19 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_parse_values:nn}
+% \begin{macro}{\@@_parse_values:nn, \@@_parse_values_aux:nn}
% The routine to parse values is the same for both editing a
% template and setting up an instance. So the code here does only the
% minimum necessary for reading the values.
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_values:nn #1#2
{
- \@@_recover_keytypes:n {#1}
\clist_clear:N \l_@@_restrict_clist
+ \@@_parse_values_aux:nn {#1} {#2}
+ }
+\cs_new_protected:Npn \@@_parse_values_aux:nn #1#2
+ {
+ \@@_recover_keytypes:n {#1}
\keyval_parse:NNn
\@@_parse_values_elt:n \@@_parse_values_elt:nn {#2}
}
@@ -1954,6 +1958,7 @@
\@@_execute_if_code_exist:nnT {#1} {#2}
{
\@@_recover_defaults:n { #1 / #2 }
+ \@@_recover_restrictions:n { #1 / #2 }
\@@_recover_vars:n { #1 / #2 }
\@@_declare_instance_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
}
@@ -1961,7 +1966,7 @@
\cs_new_protected:Npn \@@_declare_instance_aux:nnnnn #1#2#3#4#5
{
\bool_set_false:N \l_@@_error_bool
- \@@_parse_values:nn { #1 / #2 } {#5}
+ \@@_parse_values_aux:nn { #1 / #2 } {#5}
\bool_if:NF \l_@@_error_bool
{
\prop_put:Nnn \l_@@_values_prop { from~template } {#2}
diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf
index c4b96d62d2..ecf1261faa 100644
--- a/macros/latex/contrib/l3packages/xtemplate.pdf
+++ b/macros/latex/contrib/l3packages/xtemplate.pdf
Binary files differ