From ef57fc77f3c939d55d51322d428e40a5a3c9ed8e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 10 Jan 2021 03:01:42 +0000 Subject: CTAN sync 202101100301 --- macros/latex/contrib/l3kernel/CHANGELOG.md | 14 +- macros/latex/contrib/l3kernel/README.md | 4 +- macros/latex/contrib/l3kernel/expl3.dtx | 6 +- macros/latex/contrib/l3kernel/expl3.pdf | Bin 590307 -> 590320 bytes macros/latex/contrib/l3kernel/interface3.pdf | Bin 1571265 -> 1573631 bytes macros/latex/contrib/l3kernel/interface3.tex | 4 +- macros/latex/contrib/l3kernel/l3.ins | 6 +- macros/latex/contrib/l3kernel/l3basics.dtx | 4 +- macros/latex/contrib/l3kernel/l3bootstrap.dtx | 4 +- macros/latex/contrib/l3kernel/l3box.dtx | 4 +- macros/latex/contrib/l3kernel/l3candidates.dtx | 4 +- macros/latex/contrib/l3kernel/l3cctab.dtx | 4 +- macros/latex/contrib/l3kernel/l3clist.dtx | 4 +- macros/latex/contrib/l3kernel/l3coffins.dtx | 4 +- macros/latex/contrib/l3kernel/l3color-base.dtx | 4 +- macros/latex/contrib/l3kernel/l3debug.dtx | 4 +- macros/latex/contrib/l3kernel/l3deprecation.dtx | 4 +- macros/latex/contrib/l3kernel/l3doc.dtx | 6 +- macros/latex/contrib/l3kernel/l3docstrip.dtx | 4 +- macros/latex/contrib/l3kernel/l3docstrip.pdf | Bin 263181 -> 263275 bytes macros/latex/contrib/l3kernel/l3expan.dtx | 4 +- macros/latex/contrib/l3kernel/l3file.dtx | 4 +- macros/latex/contrib/l3kernel/l3flag.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-assign.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-aux.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-basics.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-convert.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-expo.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-extended.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-logic.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-parse.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-random.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-round.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-traps.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp-trig.dtx | 4 +- macros/latex/contrib/l3kernel/l3fp.dtx | 4 +- macros/latex/contrib/l3kernel/l3fparray.dtx | 4 +- macros/latex/contrib/l3kernel/l3int.dtx | 4 +- macros/latex/contrib/l3kernel/l3intarray.dtx | 4 +- .../latex/contrib/l3kernel/l3kernel-functions.dtx | 4 +- macros/latex/contrib/l3kernel/l3keys.dtx | 161 ++++++++++++++------- macros/latex/contrib/l3kernel/l3legacy.dtx | 4 +- macros/latex/contrib/l3kernel/l3luatex.dtx | 4 +- macros/latex/contrib/l3kernel/l3msg.dtx | 4 +- macros/latex/contrib/l3kernel/l3names.dtx | 4 +- macros/latex/contrib/l3kernel/l3news.pdf | Bin 384459 -> 384459 bytes macros/latex/contrib/l3kernel/l3news01.pdf | Bin 113533 -> 113533 bytes macros/latex/contrib/l3kernel/l3news02.pdf | Bin 140873 -> 140873 bytes macros/latex/contrib/l3kernel/l3news03.pdf | Bin 143207 -> 143207 bytes macros/latex/contrib/l3kernel/l3news04.pdf | Bin 107122 -> 107122 bytes macros/latex/contrib/l3kernel/l3news05.pdf | Bin 105090 -> 105090 bytes macros/latex/contrib/l3kernel/l3news06.pdf | Bin 140905 -> 140905 bytes macros/latex/contrib/l3kernel/l3news07.pdf | Bin 119094 -> 119094 bytes macros/latex/contrib/l3kernel/l3news08.pdf | Bin 152504 -> 152504 bytes macros/latex/contrib/l3kernel/l3news09.pdf | Bin 241016 -> 241016 bytes macros/latex/contrib/l3kernel/l3news10.pdf | Bin 145548 -> 145548 bytes macros/latex/contrib/l3kernel/l3news11.pdf | Bin 164409 -> 164409 bytes macros/latex/contrib/l3kernel/l3news12.pdf | Bin 197648 -> 197648 bytes macros/latex/contrib/l3kernel/l3prefixes.csv | 2 + macros/latex/contrib/l3kernel/l3prefixes.pdf | Bin 76183 -> 76251 bytes macros/latex/contrib/l3kernel/l3prg.dtx | 4 +- macros/latex/contrib/l3kernel/l3prop.dtx | 4 +- macros/latex/contrib/l3kernel/l3quark.dtx | 4 +- macros/latex/contrib/l3kernel/l3regex.dtx | 4 +- macros/latex/contrib/l3kernel/l3seq.dtx | 4 +- macros/latex/contrib/l3kernel/l3skip.dtx | 4 +- macros/latex/contrib/l3kernel/l3sort.dtx | 4 +- macros/latex/contrib/l3kernel/l3str-convert.dtx | 4 +- macros/latex/contrib/l3kernel/l3str.dtx | 4 +- macros/latex/contrib/l3kernel/l3styleguide.pdf | Bin 279953 -> 279972 bytes macros/latex/contrib/l3kernel/l3styleguide.tex | 4 +- macros/latex/contrib/l3kernel/l3syntax-changes.pdf | Bin 228253 -> 228269 bytes macros/latex/contrib/l3kernel/l3syntax-changes.tex | 4 +- macros/latex/contrib/l3kernel/l3sys.dtx | 12 +- macros/latex/contrib/l3kernel/l3term-glossary.pdf | Bin 217624 -> 217632 bytes macros/latex/contrib/l3kernel/l3term-glossary.tex | 4 +- macros/latex/contrib/l3kernel/l3text-case.dtx | 4 +- macros/latex/contrib/l3kernel/l3text-purify.dtx | 28 +++- macros/latex/contrib/l3kernel/l3text.dtx | 4 +- macros/latex/contrib/l3kernel/l3tl-analysis.dtx | 4 +- macros/latex/contrib/l3kernel/l3tl.dtx | 4 +- macros/latex/contrib/l3kernel/l3token.dtx | 4 +- macros/latex/contrib/l3kernel/l3unicode.dtx | 4 +- macros/latex/contrib/l3kernel/source3.pdf | Bin 5990023 -> 5995281 bytes macros/latex/contrib/l3kernel/source3.tex | 4 +- 85 files changed, 272 insertions(+), 187 deletions(-) (limited to 'macros/latex/contrib/l3kernel') diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index 10e0520081..ce020127f4 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,17 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2021-01-09] + +### Added +- `\keyval_parse:nnn` + +### Changed +- `\keyval_parse:NNn` is set equal to `\keyval_parse:nnn` + +### Fixed +- Handling of encoding-specfic commands in `\text_purify:n` + ## [2020-12-07] ### Fixed @@ -815,7 +826,8 @@ this project uses date-based 'snapshot' version identifiers. - Step func­tions have been added for dim vari­ables, e.g. `\dim_step_in­line:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2020-12-07...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2021-01-09...HEAD +[2021-01-09]: https://github.com/latex3/latex3/compare/2020-12-07...2021-01-09 [2020-12-07]: https://github.com/latex3/latex3/compare/2020-12-05...2020-12-07 [2020-12-05]: https://github.com/latex3/latex3/compare/2020-12-03...2020-12-05 [2020-12-03]: https://github.com/latex3/latex3/compare/2020-10-27...2020-12-03 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index b4146044e6..00087c46d8 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2020-12-07 +Release 2021-01-09 Overview -------- @@ -80,6 +80,6 @@ the [LaTeX-L list](#Discussion) should be used. ----- -

Copyright (C) 1998-2012,2015-2020 The LaTeX3 Project
+

Copyright (C) 1998-2012,2015-2021 The LaTeX3 Project
http://latex-project.org/
All rights reserved.

diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index 1f96c8298d..b684859b76 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -2,7 +2,7 @@ % %% File: expl3.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> % -\def\ExplFileDate{2020-12-07}% +\def\ExplFileDate{2021-01-09}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf index d8f391aa0e..f87cfdb041 100644 Binary files a/macros/latex/contrib/l3kernel/expl3.pdf and b/macros/latex/contrib/l3kernel/expl3.pdf differ diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf index d4129e66fd..7d756df461 100644 Binary files a/macros/latex/contrib/l3kernel/interface3.pdf and b/macros/latex/contrib/l3kernel/interface3.pdf differ diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 2940d49147..bc2c61ff38 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -2,7 +2,7 @@ File: interfaces3.tex -Copyright (C) 1990-2011,2017-2020 The LaTeX3 Project +Copyright (C) 1990-2011,2017-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2020-12-07} +\date{Released 2021-01-09} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3.ins b/macros/latex/contrib/l3kernel/l3.ins index ad3b5267dd..f567f2a8c6 100644 --- a/macros/latex/contrib/l3kernel/l3.ins +++ b/macros/latex/contrib/l3kernel/l3.ins @@ -2,7 +2,7 @@ File l3.ins -Copyright (C) 2011,2012,2014-2020 The LaTeX3 Project +Copyright (C) 2011,2012,2014-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -35,7 +35,7 @@ license information is placed in the derived files. \preamble -Copyright (C) 1990-2020 The LaTeX3 Project +Copyright (C) 1990-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of @@ -151,7 +151,7 @@ and all files in that bundle must be distributed together. \def\MetaPrefix{--} \preamble -Copyright (C) 1990-2020 The LaTeX3 Project +Copyright (C) 1990-2021 The LaTeX3 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/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 82f1a25c02..dd95416e5a 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -2,7 +2,7 @@ % %% File: l3basics.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 6643fb36be..65397d5286 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -2,7 +2,7 @@ % %% File: l3bootstrap.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index 572cb9b5a6..eade06c734 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -2,7 +2,7 @@ % %% File: l3box.dtx % -% Copyright (C) 2005-2020 The LaTeX3 Project +% Copyright (C) 2005-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index d5cefd0946..1a3d67c01e 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -2,7 +2,7 @@ % %% File: l3candidates.dtx % -% Copyright (C) 2012-2020 The LaTeX3 Project +% Copyright (C) 2012-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index 5084481a35..1d393df1d4 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -2,7 +2,7 @@ % %% File: l3cctab.dtx % -% Copyright (C) 2018-2020 The LaTeX3 Project +% Copyright (C) 2018-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 3c8d9149c0..f88dd61968 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -3,7 +3,7 @@ %% File: l3clist.dtx % % Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project -% (C) 2012-2020 The LaTeX3 Project +% (C) 2012-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index c37a6d7c04..4c7784cdba 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -2,7 +2,7 @@ % %% File: l3coffins.dtx % -% Copyright (C) 2010-2020 The LaTeX3 Project +% Copyright (C) 2010-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color-base.dtx b/macros/latex/contrib/l3kernel/l3color-base.dtx index 6796bbafa6..8612fb9361 100644 --- a/macros/latex/contrib/l3kernel/l3color-base.dtx +++ b/macros/latex/contrib/l3kernel/l3color-base.dtx @@ -2,7 +2,7 @@ % %% File: l3color-base.dtx % -% Copyright (C) 2011,2012,2014,2016-2020 The LaTeX3 Project +% Copyright (C) 2011,2012,2014,2016-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index 802ce32441..bd46449673 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -2,7 +2,7 @@ % %% File: l3debug.dtx % -% Copyright (C) 2019,2020 The LaTeX3 Project +% Copyright (C) 2019-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index b112eb89ae..77183e8c73 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -2,7 +2,7 @@ % %% File: l3deprecation.dtx % -% Copyright (C) 2017-2020 The LaTeX3 Project +% Copyright (C) 2017-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 76bbdfd341..b0411437b3 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -2,7 +2,7 @@ % %% File: l3doc.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -31,7 +31,7 @@ \askforoverwritefalse \preamble -Copyright (C) 1990-2020 The LaTeX3 Project +Copyright (C) 1990-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of @@ -79,7 +79,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index f41250c05e..4f5122da27 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -2,7 +2,7 @@ % %% File l3dosctrip.dtx % -% Copyright (C) 2012,2014-2020 The LaTeX3 Project +% Copyright (C) 2012,2014-2021 The LaTeX3 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 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf index a55d29b254..7cac6864c4 100644 Binary files a/macros/latex/contrib/l3kernel/l3docstrip.pdf and b/macros/latex/contrib/l3kernel/l3docstrip.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index a516c83742..b842b242ab 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -2,7 +2,7 @@ % %% File: l3expan.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index cb523d6e46..a97a7a9a76 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -2,7 +2,7 @@ % %% File: l3file.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 4de5934170..7a7546f27c 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -2,7 +2,7 @@ % %% File: l3flag.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index eb424f6907..12eb397190 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-assign.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index 2d8e315ba8..149ccb46f9 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-aux.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index 1c6bfe0fe3..b040ac3e96 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-basics.dtx % -% Copyright (C) 2011-2014,2016-2020 The LaTeX3 Project +% Copyright (C) 2011-2014,2016-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index c334df2d46..8c4e5270f6 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-convert.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index 3f4f5cd07c..3f7b065f05 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-expo.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index 9927e0b9cb..dcccbe502a 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-extended.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index 4e28c73487..0b220209a3 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-logic.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index 1cde3d1e99..4d72f67104 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-parse.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index f171d02bf2..b5d9012689 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-random.dtx % -% Copyright (C) 2016-2020 The LaTeX3 Project +% Copyright (C) 2016-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index 66628c9d8c..9a9ff30a58 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-round.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 3a8eedaade..456999ed1b 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-traps.dtx % -% Copyright (C) 2011-2014,2016-2020 The LaTeX3 Project +% Copyright (C) 2011-2014,2016-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index c65aa762de..57ff263e7d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -2,7 +2,7 @@ % %% File: l3fp-trig.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index 898fca2a0a..2319504a4a 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -2,7 +2,7 @@ % %% File: l3fp.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index e98ceb52b4..6847cb1e0c 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -2,7 +2,7 @@ % %% File: l3fparray.dtx % -% Copyright (C) 2018-2020 The LaTeX3 Project +% Copyright (C) 2018-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index cb1ab5db50..d5bfaf26b6 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -2,7 +2,7 @@ % %% File: l3int.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index c261fa5c84..1dacedc38b 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -2,7 +2,7 @@ % %% File: l3intarray.dtx % -% Copyright (C) 2017-2020 The LaTeX3 Project +% Copyright (C) 2017-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index 22f33e1d41..68771e076a 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -2,7 +2,7 @@ % %% File: l3kernel-functions.dtx % -% Copyright (C) 2018-2020 The LaTeX3 Project +% Copyright (C) 2018-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index d1f9f19268..860854cc77 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -2,7 +2,7 @@ % %% File: l3keys.dtx % -% Copyright (C) 2006-2020 The LaTeX3 Project +% Copyright (C) 2006-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % @@ -891,7 +891,45 @@ % \end{verbatim} % are treated identically. % -% \begin{function}[EXP,updated = 2020-02-20]{\keyval_parse:NNn} +% \begin{function}[rEXP, added=2020-12-19]{\keyval_parse:nnn} +% \begin{syntax} +% \cs{keyval_parse:nnn} \Arg{code_1} \Arg{code_2} \Arg{key--value list} +% \end{syntax} +% Parses the \meta{key--value list} into a series of \meta{keys} and +% associated \meta{values}, or keys alone (if no \meta{value} was +% given). \meta{code_1} receives each \meta{key} (with no \meta{value}) as a +% trailing brace group, whereas \meta{code_2} is appended by two brace groups, +% the \meta{key} and \meta{value}. +% The order of the \meta{keys} in the \meta{key--value list} +% is preserved. Thus +% \begin{verbatim} +% \keyval_parse:nnn +% { \use_none:nn { code 1 } } +% { \use_none:nnn { code 2 } } +% { key1 = value1 , key2 = value2, key3 = , key4 } +% \end{verbatim} +% is converted into an input stream +% \begin{verbatim} +% \use_none:nnn { code 2 } { key1 } { value1 } +% \use_none:nnn { code 2 } { key2 } { value2 } +% \use_none:nnn { code 2 } { key3 } { } +% \use_none:nn { code 1 } { key4 } +% \end{verbatim} +% Note that there is a difference between an empty value (an equals +% sign followed by nothing) and a missing value (no equals sign at +% all). Spaces are trimmed from the ends of the \meta{key} and \meta{value}, +% then one \emph{outer} set of braces is removed from the \meta{key} +% and \meta{value} as part of the processing. If you need exactly the output +% shown above, you'll need to either \texttt{x}-type or \texttt{e}-type expand +% the function. +% \begin{texnote} +% The result of each list element is returned within \cs{exp_not:n}, which +% means that the converted input stream does not expand further when +% appearing in an \texttt{x}-type or \texttt{e}-type argument expansion. +% \end{texnote} +% \end{function} +% +% \begin{function}[rEXP,updated = 2020-12-19]{\keyval_parse:NNn} % \begin{syntax} % \cs{keyval_parse:NNn} \meta{function_1} \meta{function_2} \Arg{key--value list} % \end{syntax} @@ -920,6 +958,9 @@ % all). Spaces are trimmed from the ends of the \meta{key} and \meta{value}, % then one \emph{outer} set of braces is removed from the \meta{key} % and \meta{value} as part of the processing. +% +% This shares the implementation of \cs{keyval_parse:nnn}, the difference is +% only semantically. % \begin{texnote} % The result is returned within \cs{exp_not:n}, which means that the % converted input stream does not expand further when appearing in an @@ -969,30 +1010,31 @@ { % \end{macrocode} % -% \begin{macro}[EXP]{\keyval_parse:NNn} +% \begin{macro}[EXP]{\keyval_parse:nnn, \keyval_parse:NNn} % The main function starts the first of two loops. The outer loop splits the % key--value list at active commas, the inner loop will do so at other commas. % The use of \cs{s_@@_mark} here prevents loss of braces from the key % argument. % \begin{macrocode} - \cs_new:Npn \keyval_parse:NNn ##1 ##2 ##3 - { \@@_loop_active:NNw ##1 ##2 \s_@@_mark ##3 #1 \s_@@_tail #1 } + \cs_new:Npn \keyval_parse:nnn ##1 ##2 ##3 + { \@@_loop_active:nnw {##1} {##2} \s_@@_mark ##3 #1 \s_@@_tail #1 } + \cs_new_eq:NN \keyval_parse:NNn \keyval_parse:nnn % \end{macrocode} % \end{macro} % -% \begin{macro}[EXP]{\@@_loop_active:NNw} +% \begin{macro}[EXP]{\@@_loop_active:nnw} % First a fast test for the end of the loop is done, it'll gobble everything % up to a \cs{s_@@_tail}. The loop ending macro will gobble everything to the -% last \cs{s_@@_mark} in this definition. +% last comma in this definition. % If the end isn't reached yet, start the second loop splitting at other -% commas, and after that one iterate the current loop. +% commas, the next iteration of this first loop will be inserted by the end of +% \cs{@@_loop_other:nnw}. % \begin{macrocode} - \cs_new:Npn \@@_loop_active:NNw ##1 ##2 ##3 #1 + \cs_new:Npn \@@_loop_active:nnw ##1 ##2 ##3 #1 { \@@_if_recursion_tail:w ##3 \@@_end_loop_active:w \s_@@_tail - \@@_loop_other:NNw ##1 ##2 ##3 , \s_@@_tail , - \@@_loop_active:NNw ##1 ##2 \s_@@_mark + \@@_loop_other:nnw {##1} {##2} ##3 , \s_@@_tail , } % \end{macrocode} % \end{macro} @@ -1003,14 +1045,14 @@ % token following \cs{s_@@_mark} that followed the equals sign. Hence they % also test for the presence of such an equals sign simultaneously. % \begin{macrocode} - \cs_new:Npn \@@_split_other:w ##1 = ##2 \s_@@_mark ##3 ##4 \s_@@_stop + \cs_new:Npn \@@_split_other:w ##1 = ##2 \s_@@_mark ##3 { ##3 ##1 \s_@@_stop \s_@@_mark ##2 } - \cs_new:Npn \@@_split_active:w ##1 #2 ##2 \s_@@_mark ##3 ##4 \s_@@_stop + \cs_new:Npn \@@_split_active:w ##1 #2 ##2 \s_@@_mark ##3 { ##3 ##1 \s_@@_stop \s_@@_mark ##2 } % \end{macrocode} % \end{macro} % -% \begin{macro}[EXP]{\@@_loop_other:NNw} +% \begin{macro}[EXP]{\@@_loop_other:nnw} % The second loop uses the same test for its end as the first loop, next it % splits at the first active equals sign using \cs{@@_split_active:w}. The % \cs{s_@@_nil} prevents accidental brace stripping and acts as a delimiter in @@ -1018,16 +1060,15 @@ % number of necessary expansion steps for the expected average use case of % other equals signs and hence perform better on average. % \begin{macrocode} - \cs_new:Npn \@@_loop_other:NNw ##1 ##2 ##3 , + \cs_new:Npn \@@_loop_other:nnw ##1 ##2 ##3 , { \@@_if_recursion_tail:w ##3 \@@_end_loop_other:w \s_@@_tail \@@_split_active:w ##3 \s_@@_nil \s_@@_mark \@@_split_active_auxi:w #2 \s_@@_mark \@@_clean_up_active:w - \s_@@_stop - ##1 ##2 - \@@_loop_other:NNw ##1 ##2 \s_@@_mark + {##1} {##2} + \s_@@_mark } % \end{macrocode} % \end{macro} @@ -1050,7 +1091,6 @@ \@@_split_other:w ##1 \s_@@_nil \s_@@_mark \@@_misplaced_equal_after_active_error:w = \s_@@_mark \@@_split_active_auxii:w - \s_@@_stop } % \end{macrocode} % \cs{@@_split_active_auxii:w} gets the correct key name with a leading @@ -1061,7 +1101,8 @@ \cs_new:Npn \@@_split_active_auxii:w ##1 \s_@@_nil \s_@@_mark \@@_misplaced_equal_after_active_error:w \s_@@_stop \s_@@_mark - { \@@_trim:nN { ##1 } \@@_split_active_auxiii:w } + ##2 \s_@@_nil #2 \s_@@_mark \@@_clean_up_active:w + { \@@_trim:nN {##1} \@@_split_active_auxiii:w ##2 \s_@@_nil } % \end{macrocode} % Next we test for a misplaced active equals sign in the value, if none is % found \cs{@@_split_active_auxiv:w} will be called. @@ -1071,8 +1112,7 @@ \@@_split_active:w ##2 \s_@@_nil \s_@@_mark \@@_misplaced_equal_in_split_error:w #2 \s_@@_mark \@@_split_active_auxiv:w - \s_@@_stop - { ##1 } + {##1} } % \end{macrocode} % This runs the last test after sanitising the remainder of the previous one. @@ -1086,16 +1126,15 @@ \@@_split_other:w ##1 \s_@@_nil \s_@@_mark \@@_misplaced_equal_in_split_error:w = \s_@@_mark \@@_split_active_auxv:w - \s_@@_stop } % \end{macrocode} % This last macro in this execution branch sanitises the last test, trims the -% value and passes it to \cs{@@_pair:nnNN}. +% value and passes it to \cs{@@_pair:nnnn}. % \begin{macrocode} \cs_new:Npn \@@_split_active_auxv:w ##1 \s_@@_nil \s_@@_mark \@@_misplaced_equal_in_split_error:w \s_@@_stop \s_@@_mark - { \@@_trim:nN { ##1 } \@@_pair:nnNN } + { \@@_trim:nN { ##1 } \@@_pair:nnnn } % \end{macrocode} % \end{macro} % \end{macro} @@ -1115,7 +1154,6 @@ \@@_split_other:w ##1 \s_@@_nil \s_@@_mark \@@_split_other_auxi:w = \s_@@_mark \@@_clean_up_other:w - \s_@@_stop } % \end{macrocode} % \end{macro} @@ -1132,24 +1170,25 @@ { \@@_trim:nN { ##1 } \@@_split_other_auxii:w } % \end{macrocode} % We know that the value doesn't contain misplaced active equals signs but we -% have to test for others. +% have to test for others. Also we need to sanitise the previous test, which +% is done here and not earlier to avoid superfluous argument grabbing. % \begin{macrocode} - \cs_new:Npn \@@_split_other_auxii:w ##1 ##2 \s_@@_nil + \cs_new:Npn \@@_split_other_auxii:w + ##1 ##2 \s_@@_nil = \s_@@_mark \@@_clean_up_other:w { \@@_split_other:w ##2 \s_@@_nil \s_@@_mark \@@_misplaced_equal_in_split_error:w = \s_@@_mark \@@_split_other_auxiii:w - \s_@@_stop { ##1 } } % \end{macrocode} % \cs{@@_split_other_auxiii:w} sanitises the test for other equals signs, -% trims the value and forwards it to \cs{@@_pair:nnNN}. +% trims the value and forwards it to \cs{@@_pair:nnnn}. % \begin{macrocode} \cs_new:Npn \@@_split_other_auxiii:w ##1 \s_@@_nil \s_@@_mark \@@_misplaced_equal_in_split_error:w \s_@@_stop \s_@@_mark - { \@@_trim:nN { ##1 } \@@_pair:nnNN } + { \@@_trim:nN { ##1 } \@@_pair:nnnn } % \end{macrocode} % \end{macro} % \end{macro} @@ -1159,14 +1198,14 @@ % \cs{@@_clean_up_other:w} is the last branch that might exist. It is called % if no equals sign was found, hence the only possibilities left are a blank % list element, which is to be skipped, or a lonely key. If it's no empty list -% element this will trim the key name and forward it to \cs{@@_key:nNN}. +% element this will trim the key name and forward it to \cs{@@_key:nn}. % \begin{macrocode} \cs_new:Npn \@@_clean_up_other:w ##1 \s_@@_nil \s_@@_mark \@@_split_other_auxi:w \s_@@_stop \s_@@_mark { \@@_if_blank:w ##1 \s_@@_nil \s_@@_stop \@@_blank_true:w - \s_@@_mark \s_@@_stop \use:n - { \@@_trim:nN { ##1 } \@@_key:nNN } + \s_@@_mark \s_@@_stop + \@@_trim:nN { ##1 } \@@_key:nn } % \end{macrocode} % \end{macro} @@ -1174,21 +1213,26 @@ % \begin{macro}[EXP]{\@@_misplaced_equal_after_active_error:w} % \begin{macro}[EXP]{\@@_misplaced_equal_in_split_error:w} % All these two macros do is gobble the remainder of the current other loop -% execution and throw an error. +% execution and throw an error. Afterwards they have to insert the next loop +% iteration. % \begin{macrocode} \cs_new:Npn \@@_misplaced_equal_after_active_error:w \s_@@_mark ##1 \s_@@_stop \s_@@_mark ##2 \s_@@_nil - \s_@@_mark ##3 \s_@@_nil ##4 ##5 + = \s_@@_mark \@@_split_active_auxii:w + \s_@@_mark ##3 \s_@@_nil + #2 \s_@@_mark \@@_clean_up_active:w { \__kernel_msg_expandable_error:nn { kernel } { misplaced-equals-sign } + \@@_loop_other:nnw } \cs_new:Npn \@@_misplaced_equal_in_split_error:w \s_@@_mark ##1 \s_@@_stop \s_@@_mark ##2 \s_@@_nil - ##3 ##4 ##5 + ##3 \s_@@_mark ##4 ##5 { \__kernel_msg_expandable_error:nn { kernel } { misplaced-equals-sign } + \@@_loop_other:nnw } % \end{macrocode} % \end{macro} @@ -1197,21 +1241,20 @@ % \begin{macro}[EXP]{\@@_end_loop_other:w, \@@_end_loop_active:w} % All that's left for the parsing loops are the macros which end the % recursion. Both just gobble the remaining tokens of the respective loop -% including the next recursion call. +% including the next recursion call. \cs{@@_end_loop_other:w} also has to +% insert the next iteration of the active loop. % \begin{macrocode} \cs_new:Npn \@@_end_loop_other:w \s_@@_tail - \@@_split_active:w ##1 \s_@@_nil - \s_@@_mark \@@_split_active_auxi:w + \@@_split_active:w + \s_@@_mark \s_@@_tail + \s_@@_nil \s_@@_mark + \@@_split_active_auxi:w #2 \s_@@_mark \@@_clean_up_active:w - \s_@@_stop - ##2 ##3 - \@@_loop_other:NNw ##4 \s_@@_mark - { } + { \@@_loop_active:nnw } \cs_new:Npn \@@_end_loop_active:w \s_@@_tail - \@@_loop_other:NNw ##1 , \s_@@_tail , - \@@_loop_active:NNw ##2 \s_@@_mark + \@@_loop_other:nnw ##1 \s_@@_mark \s_@@_tail , \s_@@_tail , { } % \end{macrocode} % \end{macro} @@ -1226,23 +1269,26 @@ \group_end: % \end{macrocode} % -% \begin{macro}[EXP]{\@@_pair:nnNN, \@@_key:nNN} +% \begin{macro}[EXP]{\@@_pair:nnnn, \@@_key:nn} % These macros will be called on the parsed keys and values of the key--value % list. All arguments are completely trimmed. They test for blank key names -% and call the functions passed to \cs{keyval_parse:NNn} inside of -% \cs{exp_not:n} with the correct arguments. +% and call the functions passed to \cs{keyval_parse:nnn} inside of +% \cs{exp_not:n} with the correct arguments. Afterwards they insert the next +% iteration of the other loop. % \begin{macrocode} -\cs_new:Npn \@@_pair:nnNN #1 #2 #3 #4 +\cs_new:Npn \@@_pair:nnnn #1 #2 #3 #4 { \@@_if_blank:w \s_@@_mark #2 \s_@@_nil \s_@@_stop \@@_blank_key_error:w \s_@@_mark \s_@@_stop \exp_not:n { #4 { #2 } { #1 } } + \@@_loop_other:nnw {#3} {#4} } -\cs_new:Npn \@@_key:nNN #1 #2 #3 +\cs_new:Npn \@@_key:nn #1 #2 { \@@_if_blank:w \s_@@_mark #1 \s_@@_nil \s_@@_stop \@@_blank_key_error:w \s_@@_mark \s_@@_stop \exp_not:n { #2 { #1 } } + \@@_loop_other:nnw {#2} } % \end{macrocode} % \end{macro} @@ -1263,7 +1309,8 @@ % These macros will be called if the tests above didn't gobble them, they % execute the branching. % \begin{macrocode} -\cs_new:Npn \@@_blank_true:w \s_@@_mark \s_@@_stop \use:n #1 #2 #3 { } +\cs_new:Npn \@@_blank_true:w \s_@@_mark \s_@@_stop \@@_trim:nN #1 \@@_key:nn + { \@@_loop_other:nnw } \cs_new:Npn \@@_blank_key_error:w \s_@@_mark \s_@@_stop \exp_not:n #1 { \__kernel_msg_expandable_error:nn @@ -1303,7 +1350,6 @@ \@@_trim_auxiii:w #1 \s_@@_nil \@@_trim_auxiv:w - \s_@@_stop } \cs_new:Npn \@@_trim_auxi:w ##1 \s_@@_mark #1 ##2 \s_@@_mark ##3 { @@ -1327,8 +1373,11 @@ % \end{macrocode} % This is the one macro which differs from the original definition. % \begin{macrocode} - \cs_new:Npn \@@_trim_auxiv:w \s_@@_mark ##1 \s_@@_nil ##2 \s_@@_stop ##3 - { ##3 { ##1 } } + \cs_new:Npn \@@_trim_auxiv:w + \s_@@_mark ##1 \s_@@_nil + \@@_trim_auxiii:w \s_@@_nil \@@_trim_auxiii:w + ##2 + { ##2 { ##1 } } } \@@_tmp:n { ~ } \group_end: diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 257b01f455..6bf78a7c4c 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -2,7 +2,7 @@ % %% File: l3legacy.dtx % -% Copyright (C) 2019,2020 The LaTeX3 Project +% Copyright (C) 2019-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index d8456d8cb0..80b3d85591 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -2,7 +2,7 @@ % %% File: l3luatex.dtx % -% Copyright (C) 2010-2020 The LaTeX3 Project +% Copyright (C) 2010-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index 19a89cf03f..6e2ff77f36 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -2,7 +2,7 @@ % %% File: l3msg.dtx % -% Copyright (C) 2009-2020 The LaTeX3 Project +% Copyright (C) 2009-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index 45e4f74f1c..24a3fad804 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -2,7 +2,7 @@ % %% File: l3names.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf index 5d39e93074..107af7a97d 100644 Binary files a/macros/latex/contrib/l3kernel/l3news.pdf and b/macros/latex/contrib/l3kernel/l3news.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf index 2e8b35dc52..36b8943235 100644 Binary files a/macros/latex/contrib/l3kernel/l3news01.pdf and b/macros/latex/contrib/l3kernel/l3news01.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf index b9d2926fd4..0e39a68409 100644 Binary files a/macros/latex/contrib/l3kernel/l3news02.pdf and b/macros/latex/contrib/l3kernel/l3news02.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf index 068def0bfc..c48bc3a25f 100644 Binary files a/macros/latex/contrib/l3kernel/l3news03.pdf and b/macros/latex/contrib/l3kernel/l3news03.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf index dbc31a5fda..98d34ef070 100644 Binary files a/macros/latex/contrib/l3kernel/l3news04.pdf and b/macros/latex/contrib/l3kernel/l3news04.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf index 8730edbf01..71958e1c4b 100644 Binary files a/macros/latex/contrib/l3kernel/l3news05.pdf and b/macros/latex/contrib/l3kernel/l3news05.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf index d61db5f17f..bdec3b54d4 100644 Binary files a/macros/latex/contrib/l3kernel/l3news06.pdf and b/macros/latex/contrib/l3kernel/l3news06.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf index 226e5aae4f..6d8daca1e3 100644 Binary files a/macros/latex/contrib/l3kernel/l3news07.pdf and b/macros/latex/contrib/l3kernel/l3news07.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf index d44db337be..c17dbd5563 100644 Binary files a/macros/latex/contrib/l3kernel/l3news08.pdf and b/macros/latex/contrib/l3kernel/l3news08.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf index 0d792547fa..2f102b2c54 100644 Binary files a/macros/latex/contrib/l3kernel/l3news09.pdf and b/macros/latex/contrib/l3kernel/l3news09.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf index 26130e3f1f..3697b42045 100644 Binary files a/macros/latex/contrib/l3kernel/l3news10.pdf and b/macros/latex/contrib/l3kernel/l3news10.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf index e9c62ffafb..637c1df8f0 100644 Binary files a/macros/latex/contrib/l3kernel/l3news11.pdf and b/macros/latex/contrib/l3kernel/l3news11.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf index 6ba240b059..7d690fd463 100644 Binary files a/macros/latex/contrib/l3kernel/l3news12.pdf and b/macros/latex/contrib/l3kernel/l3news12.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3prefixes.csv b/macros/latex/contrib/l3kernel/l3prefixes.csv index 46ce3a046b..47a2abf9e0 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.csv +++ b/macros/latex/contrib/l3kernel/l3prefixes.csv @@ -164,6 +164,7 @@ qrbill,qrbill,Marei Peischl,https://github.com/peiTeX/qrbill,https://github.com/ quark,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, randomwalk,randomwalk,Bruno Le Floch,https://github.com/blefloch/latex-randomwalk,https://github.com/blefloch/latex-randomwalk.git,https://github.com/blefloch/latex-randomwalk/issues,2013-03-16,2015-09-22, recursion,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12, +ref,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2020-12-24,2020-12-24, regex,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2018-04-06, reverse,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-28,2012-09-28, right,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12, @@ -175,6 +176,7 @@ sdaps,sdaps,Benjamin Berg,https://sdaps.org,https://github.com/sdaps/sdaps-class seq,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, shipout,ltshipout,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex2e.git,https://github.com/latex3/latex2e/issues,2020-10-01,2020-10-01, siunitx,siunitx,Joseph Wright,https://github.com/josephwright/siunitx,https://github.com/josephwright/siunitx.git,https://github.com/josephwright/siunitx/issues,2012-11-04,2012-11-04, +skel,skeldoc,Magnus Lie Hetland,https://github.com/mlhetland/skeldoc.sty,https://github.com/mlhetland/skeldoc.sty.git,https://github.com/mlhetland/skeldoc.sty/issues,2021-01-04,2021-01-04, skip,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, sort,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2017-02-13, space,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12, diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf index 6bf8a501e9..a71383c327 100644 Binary files a/macros/latex/contrib/l3kernel/l3prefixes.pdf and b/macros/latex/contrib/l3kernel/l3prefixes.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index 88cec672de..539bb5489b 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -2,7 +2,7 @@ % %% File: l3prg.dtx % -% Copyright (C) 2005-2020 The LaTeX3 Project +% Copyright (C) 2005-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index 36a8be3938..ea5d85a3fa 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -2,7 +2,7 @@ % %% File: l3prop.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index 427244ce5d..17348c29ee 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -2,7 +2,7 @@ % %% File: l3quark.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index 85e9cf12b9..9d52a75857 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -2,7 +2,7 @@ % %% File: l3regex.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index 4b9905e3bb..a7c22d7331 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -2,7 +2,7 @@ % %% File: l3seq.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index e6750a998f..13d88972bc 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -3,7 +3,7 @@ %% File: l3skip.dtx % % Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project -% (C) 2012-2020 The LaTeX3 Project +% (C) 2012-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index 47e12e7466..a4fcbcfe6b 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -2,7 +2,7 @@ % %% File l3sort.dtx % -% Copyright (C) 2012-2020 The LaTeX3 Project +% Copyright (C) 2012-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 8c540d7e07..66c23b73ad 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -2,7 +2,7 @@ % %% File: l3str-convert.dtx % -% Copyright (C) 2013-2020 The LaTeX3 Project +% Copyright (C) 2013-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 3152e7dae7..bbe072d2a0 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -2,7 +2,7 @@ % %% File: l3str.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf index 3538053a0b..81ae7f0b4e 100644 Binary files a/macros/latex/contrib/l3kernel/l3styleguide.pdf and b/macros/latex/contrib/l3kernel/l3styleguide.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index ac90e607df..c5013154a3 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -2,7 +2,7 @@ File: l3styleguide.tex -Copyright (C) 2011,2012,2014-2020 The LaTeX3 Project +Copyright (C) 2011,2012,2014-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2020-12-07} +\date{Released 2021-01-09} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf index d19e3d7bb4..9bf1317663 100644 Binary files a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf and b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index 7555222005..3ae6759ea5 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -2,7 +2,7 @@ File: l3syntax-changes.tex -Copyright (C) 2011,2012,2017-2020 The LaTeX3 Project +Copyright (C) 2011,2012,2017-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2020-12-07} +\date{Released 2021-01-09} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 9b50d08962..30a86af7d8 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -2,7 +2,7 @@ % %% File: l3sys.dtx % -% Copyright (C) 2015-2020 The LaTeX3 Project +% Copyright (C) 2015-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % @@ -975,10 +975,14 @@ end \__kernel_tl_gset:Nx \g_@@_backend_tl { \sys_if_engine_xetex:TF - { xdvipdfmx } + { xetex } { \sys_if_output_pdf:TF - { pdfmode } + { + \sys_if_engine_pdftex:TF + { pdftex } + { luatex } + } { dvips } } } diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf index 1e22a89464..8b35fa230c 100644 Binary files a/macros/latex/contrib/l3kernel/l3term-glossary.pdf and b/macros/latex/contrib/l3kernel/l3term-glossary.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index bf2967e713..88f1bc395c 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -2,7 +2,7 @@ File: l3term-glossary.tex -Copyright (C) 2018-2020 The LaTeX3 Project +Copyright (C) 2018-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2020-12-07} +\date{Released 2021-01-09} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index 4d94fb2b78..d1415b5a8c 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -2,7 +2,7 @@ % %% File: l3text-case.dtx % -% Copyright (C) 2020 The LaTeX3 Project +% Copyright (C) 2020,2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index 0166cc20f6..0241a11e60 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -2,7 +2,7 @@ % %% File: l3text-purify.dtx % -% Copyright (C) 2020 The LaTeX3 Project +% Copyright (C) 2020,2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % @@ -94,7 +94,8 @@ % \begin{macro}[EXP]{\@@_purify_math_cmd:Nn} % \begin{macro}[EXP]{\@@_purify_replace:N} % \begin{macro}[EXP]{\@@_purify_replace:n} -% \begin{macro}[EXP]{\@@_purify_expand:N, \@@_purify_protect:N} +% \begin{macro}[EXP]{\@@_purify_expand:N, \@@_purify_protect:N, \@@_purify_encoding:N} +% \begin{macro}[EXP]{\@@_purify_encoding_escape:NN} % As in the other parts of the module, we start off with a standard % \enquote{action} loop, with expansion applied up-front. % \begin{macrocode} @@ -288,15 +289,31 @@ { \str_if_eq:nnTF {#1} { \protect } { \@@_purify_protect:N } + { \@@_purify_encoding:N #1 } + } +\cs_new:Npn \@@_purify_protect:N #1 + { + \@@_if_recursion_tail_stop_do:Nn #1 { \@@_purify_end:w } + \@@_purify_loop:w + } +% \end{macrocode} +% Handle encoding commands, as detailed for expansion. +% \begin{macrocode} +\cs_new:Npn \@@_purify_encoding:N #1 + { + \bool_lazy_or:nnTF + { \cs_if_eq_p:NN #1 \@current@cmd } + { \cs_if_eq_p:NN #1 \@changed@cmd } + { \@@_purify_encoding_escape:NN } { \@@_if_expandable:NTF #1 { \exp_after:wN \@@_purify_loop:w #1 } { \@@_purify_loop:w } } } -\cs_new:Npn \@@_purify_protect:N #1 +\cs_new:Npn \@@_purify_encoding_escape:NN #1#2 { - \@@_if_recursion_tail_stop_do:Nn #1 { \@@_purify_end:w } + \@@_purify_store:n {#1} \@@_purify_loop:w } % \end{macrocode} @@ -323,6 +340,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro} % { diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index 38e52aa9db..7dcf87b3de 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -2,7 +2,7 @@ % %% File: l3text.dtx % -% Copyright (C) 2020 The LaTeX3 Project +% Copyright (C) 2020,2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 69f73aab0c..30ebe4814b 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -2,7 +2,7 @@ % %% File: l3tl-analysis.dtx % -% Copyright (C) 2011-2020 The LaTeX3 Project +% Copyright (C) 2011-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index d335824821..b31fe6e5e9 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -2,7 +2,7 @@ % %% File: l3tl.dtx % -% Copyright (C) 1990-2020 The LaTeX3 Project +% Copyright (C) 1990-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index b28987a858..c01bf675a4 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -2,7 +2,7 @@ % %% File: l3token.dtx % -% Copyright (C) 2005-2020 The LaTeX3 Project +% Copyright (C) 2005-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index dd28393b47..76384b25a6 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -2,7 +2,7 @@ % %% File: l3unicode.dtx % -% Copyright (C) 2018-2020 The LaTeX3 Project +% Copyright (C) 2018-2021 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-12-07} +% \date{Released 2021-01-09} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf index 2437a51678..05f9221ca1 100644 Binary files a/macros/latex/contrib/l3kernel/source3.pdf and b/macros/latex/contrib/l3kernel/source3.pdf differ diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index 00c11e871f..b1349ddcb7 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -2,7 +2,7 @@ File: source3.tex -Copyright (C) 1990-2012,2017-2020 The LaTeX3 Project +Copyright (C) 1990-2012,2017-2021 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2020-12-07} +\date{Released 2021-01-09} \pagenumbering{roman} \maketitle -- cgit v1.2.3