diff options
author | Norbert Preining <norbert@preining.info> | 2022-06-22 03:01:02 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-06-22 03:01:02 +0000 |
commit | d6888fdb49e3ac954c2d436951f364d3a4a4b17d (patch) | |
tree | 6afde4b28d9150c5e111b3319fc5c475b8fd502c /macros/latex/base | |
parent | 884ebedeec6018feff488351eff936cf5b56c030 (diff) |
CTAN sync 202206220301
Diffstat (limited to 'macros/latex/base')
-rw-r--r-- | macros/latex/base/README.md | 2 | ||||
-rw-r--r-- | macros/latex/base/alltt.pdf | bin | 223831 -> 223831 bytes | |||
-rw-r--r-- | macros/latex/base/cfgguide.pdf | bin | 242888 -> 242888 bytes | |||
-rw-r--r-- | macros/latex/base/changes.txt | 20 | ||||
-rw-r--r-- | macros/latex/base/classes.pdf | bin | 560350 -> 560350 bytes | |||
-rw-r--r-- | macros/latex/base/clsguide.pdf | bin | 402780 -> 402780 bytes | |||
-rw-r--r-- | macros/latex/base/cmfonts.pdf | bin | 292376 -> 292376 bytes | |||
-rw-r--r-- | macros/latex/base/cyrguide.pdf | bin | 239689 -> 239689 bytes | |||
-rw-r--r-- | macros/latex/base/doc-code.pdf | bin | 1081761 -> 1081448 bytes | |||
-rw-r--r-- | macros/latex/base/doc.pdf | bin | 755188 -> 754888 bytes | |||
-rw-r--r-- | macros/latex/base/docstrip.pdf | bin | 503774 -> 503446 bytes | |||
-rw-r--r-- | macros/latex/base/encguide.pdf | bin | 1318126 -> 1318126 bytes | |||
-rw-r--r-- | macros/latex/base/exscale.pdf | bin | 204711 -> 204711 bytes | |||
-rw-r--r-- | macros/latex/base/fix-cm.pdf | bin | 288328 -> 288328 bytes | |||
-rw-r--r-- | macros/latex/base/fntguide.pdf | bin | 502880 -> 502880 bytes | |||
-rw-r--r-- | macros/latex/base/graphpap.pdf | bin | 161713 -> 161713 bytes | |||
-rw-r--r-- | macros/latex/base/ifthen.pdf | bin | 221211 -> 221211 bytes | |||
-rw-r--r-- | macros/latex/base/inputenc.pdf | bin | 318204 -> 318204 bytes | |||
-rw-r--r-- | macros/latex/base/lamport-manual.pdf | bin | 170878 -> 170878 bytes | |||
-rw-r--r-- | macros/latex/base/latexrelease.pdf | bin | 281906 -> 281906 bytes | |||
-rw-r--r-- | macros/latex/base/latexsym.pdf | bin | 200760 -> 200760 bytes | |||
-rw-r--r-- | macros/latex/base/lb2.pdf | bin | 252140 -> 252140 bytes | |||
-rw-r--r-- | macros/latex/base/letter.pdf | bin | 337706 -> 337382 bytes | |||
-rw-r--r-- | macros/latex/base/lgc2.pdf | bin | 215684 -> 215684 bytes | |||
-rw-r--r-- | macros/latex/base/lppl.pdf | bin | 132382 -> 132382 bytes | |||
-rw-r--r-- | macros/latex/base/ltclass.dtx | 9 | ||||
-rw-r--r-- | macros/latex/base/ltcmdhooks-code.pdf | bin | 720249 -> 719776 bytes | |||
-rw-r--r-- | macros/latex/base/ltcmdhooks-doc.pdf | bin | 479100 -> 478626 bytes | |||
-rw-r--r-- | macros/latex/base/ltfilehook-code.pdf | bin | 803034 -> 802638 bytes | |||
-rw-r--r-- | macros/latex/base/ltfilehook-doc.pdf | bin | 548731 -> 548313 bytes | |||
-rw-r--r-- | macros/latex/base/lthooks-code.pdf | bin | 1096874 -> 1096471 bytes | |||
-rw-r--r-- | macros/latex/base/lthooks-doc.pdf | bin | 703775 -> 703370 bytes | |||
-rw-r--r-- | macros/latex/base/ltkeys.dtx | 53 | ||||
-rw-r--r-- | macros/latex/base/ltluatex.pdf | bin | 317700 -> 317700 bytes | |||
-rw-r--r-- | macros/latex/base/ltmarks-code.pdf | bin | 715660 -> 715258 bytes | |||
-rw-r--r-- | macros/latex/base/ltmarks-doc.pdf | bin | 587106 -> 586703 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews.pdf | bin | 1180993 -> 1180993 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews01.pdf | bin | 161518 -> 161518 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews02.pdf | bin | 159792 -> 159792 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews03.pdf | bin | 159332 -> 159332 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews04.pdf | bin | 152525 -> 152525 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews05.pdf | bin | 174494 -> 174494 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews06.pdf | bin | 142849 -> 142849 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews07.pdf | bin | 137811 -> 137811 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews08.pdf | bin | 155053 -> 155053 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews09.pdf | bin | 129570 -> 129570 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews10.pdf | bin | 169416 -> 169416 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews11.pdf | bin | 111948 -> 111948 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews12.pdf | bin | 156551 -> 156551 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews13.pdf | bin | 182225 -> 182225 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews14.pdf | bin | 170473 -> 170473 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews15.pdf | bin | 130309 -> 130309 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews16.pdf | bin | 138073 -> 138073 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews17.pdf | bin | 166228 -> 166228 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews18.pdf | bin | 38033 -> 38033 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews19.pdf | bin | 230028 -> 230028 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews20.pdf | bin | 318548 -> 318548 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews21.pdf | bin | 244867 -> 244867 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews22.pdf | bin | 317773 -> 317773 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews23.pdf | bin | 286591 -> 286591 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews24.pdf | bin | 265279 -> 265279 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews25.pdf | bin | 204935 -> 204935 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews26.pdf | bin | 379462 -> 379462 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews27.pdf | bin | 250592 -> 250592 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews28.pdf | bin | 376643 -> 376643 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews29.pdf | bin | 455107 -> 455107 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews30.pdf | bin | 511909 -> 511909 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews31.pdf | bin | 526323 -> 526323 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews32.pdf | bin | 546160 -> 546160 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews33.pdf | bin | 522412 -> 522412 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews34.pdf | bin | 508044 -> 508044 bytes | |||
-rw-r--r-- | macros/latex/base/ltnews35.pdf | bin | 563513 -> 563513 bytes | |||
-rw-r--r-- | macros/latex/base/ltpara-code.pdf | bin | 667130 -> 666711 bytes | |||
-rw-r--r-- | macros/latex/base/ltpara-doc.pdf | bin | 560603 -> 560195 bytes | |||
-rw-r--r-- | macros/latex/base/ltshipout-code.pdf | bin | 820873 -> 820502 bytes | |||
-rw-r--r-- | macros/latex/base/ltshipout-doc.pdf | bin | 565171 -> 564800 bytes | |||
-rw-r--r-- | macros/latex/base/ltvers.dtx | 2 | ||||
-rw-r--r-- | macros/latex/base/ltx3info.pdf | bin | 219349 -> 219349 bytes | |||
-rw-r--r-- | macros/latex/base/ltxdoc.pdf | bin | 243273 -> 243273 bytes | |||
-rw-r--r-- | macros/latex/base/makeindx.pdf | bin | 165821 -> 165821 bytes | |||
-rw-r--r-- | macros/latex/base/modguide.pdf | bin | 243605 -> 243605 bytes | |||
-rw-r--r-- | macros/latex/base/nfssfont.pdf | bin | 211180 -> 211180 bytes | |||
-rw-r--r-- | macros/latex/base/proc.pdf | bin | 227059 -> 227059 bytes | |||
-rw-r--r-- | macros/latex/base/slides.pdf | bin | 375518 -> 375518 bytes | |||
-rw-r--r-- | macros/latex/base/slifonts.pdf | bin | 234191 -> 234191 bytes | |||
-rw-r--r-- | macros/latex/base/source2e.pdf | bin | 5761626 -> 5763795 bytes | |||
-rw-r--r-- | macros/latex/base/syntonly.pdf | bin | 189789 -> 189463 bytes | |||
-rw-r--r-- | macros/latex/base/tlc2.pdf | bin | 290615 -> 290615 bytes | |||
-rw-r--r-- | macros/latex/base/tulm.pdf | bin | 162772 -> 162772 bytes | |||
-rw-r--r-- | macros/latex/base/usrguide.pdf | bin | 430994 -> 430994 bytes | |||
-rw-r--r-- | macros/latex/base/usrguide3.pdf | bin | 403394 -> 403394 bytes | |||
-rw-r--r-- | macros/latex/base/utf8ienc.pdf | bin | 353405 -> 353405 bytes | |||
-rw-r--r-- | macros/latex/base/webcomp.pdf | bin | 146198 -> 146198 bytes |
93 files changed, 64 insertions, 22 deletions
diff --git a/macros/latex/base/README.md b/macros/latex/base/README.md index 302fb3d4ad..099f5f7cd7 100644 --- a/macros/latex/base/README.md +++ b/macros/latex/base/README.md @@ -1,7 +1,7 @@ The LaTeX kernel ================ -Release 2022-06-01 patch level 1 +Release 2022-06-01 patch level 2 Overview -------- diff --git a/macros/latex/base/alltt.pdf b/macros/latex/base/alltt.pdf Binary files differindex b68240407e..805b27ed9a 100644 --- a/macros/latex/base/alltt.pdf +++ b/macros/latex/base/alltt.pdf diff --git a/macros/latex/base/cfgguide.pdf b/macros/latex/base/cfgguide.pdf Binary files differindex 3340e6d405..733bda5c20 100644 --- a/macros/latex/base/cfgguide.pdf +++ b/macros/latex/base/cfgguide.pdf diff --git a/macros/latex/base/changes.txt b/macros/latex/base/changes.txt index ce72312d3d..061d7282e7 100644 --- a/macros/latex/base/changes.txt +++ b/macros/latex/base/changes.txt @@ -10,7 +10,25 @@ are not part of the distribution. All changes above are only part of the development branch for the next release. ================================================================================ -2022-06-16 Joseph Wright <Joseph.Wright@latex-proejct.org> +######################### +# 2022-06-01 PL2 Release +######################### + +2022-06-20 Joseph Wright <Joseph.Wright@latex-project.org> + + * ltkeys.dtx (subsection{Main mechanism}) + Use raw options data for keyval handling + +2022-06-19 Joseph Wright <Joseph.Wright@latex-proejct.org> + + * ltkeys.dtx (subsection{Main mechanism}) + Correct approach to removing keys from \@unusedoptionlist + +######################### +# 2022-06-01 PL1 Release +######################### + +2022-06-16 Joseph Wright <Joseph.Wright@latex-project.org> * ltkeys.dtx (subsection{Main mechanism}) Remove key name but avoid touching key value in \@unusedoptionlist diff --git a/macros/latex/base/classes.pdf b/macros/latex/base/classes.pdf Binary files differindex 7d1b9e8453..2a96c80c4c 100644 --- a/macros/latex/base/classes.pdf +++ b/macros/latex/base/classes.pdf diff --git a/macros/latex/base/clsguide.pdf b/macros/latex/base/clsguide.pdf Binary files differindex f5f716adf9..fa1e75ba69 100644 --- a/macros/latex/base/clsguide.pdf +++ b/macros/latex/base/clsguide.pdf diff --git a/macros/latex/base/cmfonts.pdf b/macros/latex/base/cmfonts.pdf Binary files differindex ab94f922d4..8a5a7021f8 100644 --- a/macros/latex/base/cmfonts.pdf +++ b/macros/latex/base/cmfonts.pdf diff --git a/macros/latex/base/cyrguide.pdf b/macros/latex/base/cyrguide.pdf Binary files differindex f46472597d..95dba9a899 100644 --- a/macros/latex/base/cyrguide.pdf +++ b/macros/latex/base/cyrguide.pdf diff --git a/macros/latex/base/doc-code.pdf b/macros/latex/base/doc-code.pdf Binary files differindex 38d4f82330..e36d030699 100644 --- a/macros/latex/base/doc-code.pdf +++ b/macros/latex/base/doc-code.pdf diff --git a/macros/latex/base/doc.pdf b/macros/latex/base/doc.pdf Binary files differindex 6796c27a54..1f59aefdf2 100644 --- a/macros/latex/base/doc.pdf +++ b/macros/latex/base/doc.pdf diff --git a/macros/latex/base/docstrip.pdf b/macros/latex/base/docstrip.pdf Binary files differindex 47ad57079c..46caaa90a4 100644 --- a/macros/latex/base/docstrip.pdf +++ b/macros/latex/base/docstrip.pdf diff --git a/macros/latex/base/encguide.pdf b/macros/latex/base/encguide.pdf Binary files differindex 196ccc9edd..fa4d1cd4ac 100644 --- a/macros/latex/base/encguide.pdf +++ b/macros/latex/base/encguide.pdf diff --git a/macros/latex/base/exscale.pdf b/macros/latex/base/exscale.pdf Binary files differindex 94ad97b2fc..8375b3505d 100644 --- a/macros/latex/base/exscale.pdf +++ b/macros/latex/base/exscale.pdf diff --git a/macros/latex/base/fix-cm.pdf b/macros/latex/base/fix-cm.pdf Binary files differindex 8aac40d3bd..075f79c3a6 100644 --- a/macros/latex/base/fix-cm.pdf +++ b/macros/latex/base/fix-cm.pdf diff --git a/macros/latex/base/fntguide.pdf b/macros/latex/base/fntguide.pdf Binary files differindex 5e46ecc713..816986a0bc 100644 --- a/macros/latex/base/fntguide.pdf +++ b/macros/latex/base/fntguide.pdf diff --git a/macros/latex/base/graphpap.pdf b/macros/latex/base/graphpap.pdf Binary files differindex 1ed2f69711..b02cc053b0 100644 --- a/macros/latex/base/graphpap.pdf +++ b/macros/latex/base/graphpap.pdf diff --git a/macros/latex/base/ifthen.pdf b/macros/latex/base/ifthen.pdf Binary files differindex e0aac52ba3..03f4561ea5 100644 --- a/macros/latex/base/ifthen.pdf +++ b/macros/latex/base/ifthen.pdf diff --git a/macros/latex/base/inputenc.pdf b/macros/latex/base/inputenc.pdf Binary files differindex 5b80585b56..830cb4ee3d 100644 --- a/macros/latex/base/inputenc.pdf +++ b/macros/latex/base/inputenc.pdf diff --git a/macros/latex/base/lamport-manual.pdf b/macros/latex/base/lamport-manual.pdf Binary files differindex 8a7a7cf083..669833f2e9 100644 --- a/macros/latex/base/lamport-manual.pdf +++ b/macros/latex/base/lamport-manual.pdf diff --git a/macros/latex/base/latexrelease.pdf b/macros/latex/base/latexrelease.pdf Binary files differindex 12f09cd026..d6f8b20329 100644 --- a/macros/latex/base/latexrelease.pdf +++ b/macros/latex/base/latexrelease.pdf diff --git a/macros/latex/base/latexsym.pdf b/macros/latex/base/latexsym.pdf Binary files differindex 8ba858063c..ae26a21ad8 100644 --- a/macros/latex/base/latexsym.pdf +++ b/macros/latex/base/latexsym.pdf diff --git a/macros/latex/base/lb2.pdf b/macros/latex/base/lb2.pdf Binary files differindex 64053ba56c..817e5b1dcf 100644 --- a/macros/latex/base/lb2.pdf +++ b/macros/latex/base/lb2.pdf diff --git a/macros/latex/base/letter.pdf b/macros/latex/base/letter.pdf Binary files differindex 21e1df4f36..23b2175137 100644 --- a/macros/latex/base/letter.pdf +++ b/macros/latex/base/letter.pdf diff --git a/macros/latex/base/lgc2.pdf b/macros/latex/base/lgc2.pdf Binary files differindex 8c0459b7ab..8cbf115a78 100644 --- a/macros/latex/base/lgc2.pdf +++ b/macros/latex/base/lgc2.pdf diff --git a/macros/latex/base/lppl.pdf b/macros/latex/base/lppl.pdf Binary files differindex 916caca462..91a8beaaff 100644 --- a/macros/latex/base/lppl.pdf +++ b/macros/latex/base/lppl.pdf diff --git a/macros/latex/base/ltclass.dtx b/macros/latex/base/ltclass.dtx index 20e59353ec..35c4251fce 100644 --- a/macros/latex/base/ltclass.dtx +++ b/macros/latex/base/ltclass.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltclass.dtx} - [2022/04/16 v1.5b LaTeX Kernel (Class & Package Interface)] + [2022/06/20 v1.5c LaTeX Kernel (Class & Package Interface)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltclass.dtx} @@ -2150,7 +2150,7 @@ % actions prepend \cs{@currpath} to \cs{@currname} (namely loading, % as we have to respect the given path). % -% A file substituiton isn't followed just yet because at this point +% A file substitution isn't followed just yet because at this point % we are parsing user input, so the file is still what the user % asked for, and not the file actually loaded. % \begin{macrocode} @@ -2176,6 +2176,7 @@ \@ifl@aded\@currext\@currname % \end{macrocode} % \changes{v1.5b}{2022/03/18}{Switch to \cs{ProcessKeyOptions}} +% \changes{v1.5c}{2022/06/20}{Pass raw options to \cs{ProcessKeyOptions}} % In the current preferred approach, a key family name will exist for % processing using \pkg{ltkeys}. In that case, we replace the previous % package options with the new ones, then call the key handler. @@ -2185,7 +2186,9 @@ \@ifundefined{opt@fam@\@currname.\@currext} {\@onefilewithoptions@clashchk{#2}} {% - \@namedef{opt@\@currname.\@currext}{#2}% + \expandafter\edef\csname opt@\@currname.\@currext\endcsname + {\zap@space#2 \@empty}% + \@namedef{@raw@opt@\@currname.\@currext}{#2}% \expandafter\expandafter\expandafter\ProcessKeyOptions \expandafter\expandafter\expandafter [\csname opt@fam@\@currname.\@currext\endcsname]% diff --git a/macros/latex/base/ltcmdhooks-code.pdf b/macros/latex/base/ltcmdhooks-code.pdf Binary files differindex 9f11b67c39..54cfa08682 100644 --- a/macros/latex/base/ltcmdhooks-code.pdf +++ b/macros/latex/base/ltcmdhooks-code.pdf diff --git a/macros/latex/base/ltcmdhooks-doc.pdf b/macros/latex/base/ltcmdhooks-doc.pdf Binary files differindex 3a2d5d871b..9da6815147 100644 --- a/macros/latex/base/ltcmdhooks-doc.pdf +++ b/macros/latex/base/ltcmdhooks-doc.pdf diff --git a/macros/latex/base/ltfilehook-code.pdf b/macros/latex/base/ltfilehook-code.pdf Binary files differindex 3e1f2c268c..5250d38893 100644 --- a/macros/latex/base/ltfilehook-code.pdf +++ b/macros/latex/base/ltfilehook-code.pdf diff --git a/macros/latex/base/ltfilehook-doc.pdf b/macros/latex/base/ltfilehook-doc.pdf Binary files differindex 36fce9e03a..b12c3b4f77 100644 --- a/macros/latex/base/ltfilehook-doc.pdf +++ b/macros/latex/base/ltfilehook-doc.pdf diff --git a/macros/latex/base/lthooks-code.pdf b/macros/latex/base/lthooks-code.pdf Binary files differindex 86a0c63692..7e9d75bb85 100644 --- a/macros/latex/base/lthooks-code.pdf +++ b/macros/latex/base/lthooks-code.pdf diff --git a/macros/latex/base/lthooks-doc.pdf b/macros/latex/base/lthooks-doc.pdf Binary files differindex cf90a3a98a..65d5c50781 100644 --- a/macros/latex/base/lthooks-doc.pdf +++ b/macros/latex/base/lthooks-doc.pdf diff --git a/macros/latex/base/ltkeys.dtx b/macros/latex/base/ltkeys.dtx index c6dfa5f6dd..fbd5ce302a 100644 --- a/macros/latex/base/ltkeys.dtx +++ b/macros/latex/base/ltkeys.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltkeys.dtx} - [2022/06/16 v1.0g LaTeX Kernel (Kevyal options)] + [2022/06/20 v1.0h LaTeX Kernel (Kevyal options)] % \iffalse \documentclass{l3doc} \GetFileInfo{ltkeys.dtx} @@ -258,6 +258,7 @@ % % \begin{macro}{\@@_options_global:n} % \changes{v1.0f}{2022/03/18}{Simplify to always cover global options} +% \changes{v1.0h}{2022/06/20}{Use raw options data} % Global (class) options are handled differently for \LaTeXe{} packages % and classes. Hence this function is essentially a check on the current % file type. The initial test is needed as \LaTeXe{} allows variables to @@ -266,7 +267,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_options_global:n #1 { - \cs_if_eq:NNF \@classoptionslist \scan_stop: + \cs_if_eq:NNF \@raw@classoptionslist \scan_stop: { \cs_if_eq:NNTF \@currext \@clsextension { \@@_options_class:n {#1} } @@ -278,8 +279,10 @@ % % \begin{macro}{\@@_options_class:n} % \changes{v1.0g}{2022/06/16}{Better handling of option removal} -% \begin{macro}{\@@_options_remove:nnn} -% \changes{v1.0g}{2022/06/16}{New function} +% \changes{v1.0h}{2022/06/19}{Further work on handling of option removal} +% \changes{v1.0h}{2022/06/20}{Use raw options data} +% \begin{macro}{\@@_options_class:nnn} +% \changes{v1.0h}{2022/06/20}{New function} % 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 @@ -289,36 +292,44 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_options_class:n #1 { - \cs_if_free:cF { opt@ \@currname . \@currext } + \cs_if_free:cF { @raw@opt@ \@currname . \@currext } { \keys_if_exist:nnTF {#1} { unknown } { \clist_put_right:Nv \l_@@_options_clist - { opt@ \@currname . \@currext } + { @raw@opt@ \@currname . \@currext } } { - \clist_map_inline:cn { opt@ \@currname . \@currext } + \clist_map_inline:cn { @raw@opt@ \@currname . \@currext } { - \@@_options_remove:enn + \exp_args:Ne \@@_options_class:nnn { \@@_remove_equals:n {##1} } {##1} {#1} } } } } -\cs_new_protected:Npn \@@_options_remove:nnn #1#2#3 +\cs_new_protected:Npn \@@_options_class:nnn #1#2#3 { \keys_if_exist:nnTF {#3} {#1} { \clist_put_right:Nn \l_@@_options_clist {#2} } - { \clist_put_right:Nn \@unusedoptionlist {#1} } + { + \str_if_eq:eeF + { \exp_not:v { @raw@opt@ \@currname . \@currext } } + { \exp_not:V \@raw@classoption } + { \clist_put_right:Nn \@unusedoptionlist {#1} } + } } -\cs_generate_variant:Nn \@@_options_remove:nnn { e } % \end{macrocode} % \end{macro} % \end{macro} % % \begin{macro}{\@@_options_package:n} % \changes{v1.0g}{2022/06/16}{Better handling of option removal} +% \changes{v1.0h}{2022/06/19}{Further work on handling of option removal} +% \changes{v1.0h}{2022/06/20}{Use raw options data} +% \begin{macro}{\@@_options_package:nnn} +% \changes{v1.0h}{2022/06/19}{New function} % For global options when processing a package, the tasks are slightly % different from those for a class. The check is the same, but here % there is nothing to do if the option is not applicable. Each valid @@ -326,18 +337,28 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_options_package:n #1 { - \clist_map_inline:Nn \@classoptionslist + \clist_map_inline:Nn \@raw@classoptionslist { - \@@_options_remove:enn + \exp_args:Ne \@@_options_package:nnn { \@@_remove_equals:n {##1} } {##1} {#1} } } +\cs_new_protected:Npn \@@_options_package:nnn #1#2#3 + { + \keys_if_exist:nnT {#3} {#1} + { + \clist_put_right:Nn \l_@@_options_clist {#2} + \clist_remove_all:Nn \@unusedoptionlist {#1} + } + } % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\@@_options_local:} -% If local options are found, the are added to the processing list. +% \changes{v1.0h}{2022/06/20}{Use raw options data} +% If local options are found, they are added to the processing list. % \LaTeXe{} stores options for each file in a macro which may or may not % exist, hence the need to use \cs{cs_if_exist:c}. % \begin{macrocode} @@ -345,10 +366,10 @@ { \cs_if_eq:NNF \@currext \@clsextension { - \cs_if_exist:cT { opt@ \@currname . \@currext } + \cs_if_exist:cT { @raw@opt@ \@currname . \@currext } { \clist_put_right:Nv \l_@@_options_clist - { opt@ \@currname . \@currext } + { @raw@opt@ \@currname . \@currext } } } } diff --git a/macros/latex/base/ltluatex.pdf b/macros/latex/base/ltluatex.pdf Binary files differindex 715cccdc7a..71557fac17 100644 --- a/macros/latex/base/ltluatex.pdf +++ b/macros/latex/base/ltluatex.pdf diff --git a/macros/latex/base/ltmarks-code.pdf b/macros/latex/base/ltmarks-code.pdf Binary files differindex 2ebc5271db..48e7996f06 100644 --- a/macros/latex/base/ltmarks-code.pdf +++ b/macros/latex/base/ltmarks-code.pdf diff --git a/macros/latex/base/ltmarks-doc.pdf b/macros/latex/base/ltmarks-doc.pdf Binary files differindex 705938d156..ebaf75aa77 100644 --- a/macros/latex/base/ltmarks-doc.pdf +++ b/macros/latex/base/ltmarks-doc.pdf diff --git a/macros/latex/base/ltnews.pdf b/macros/latex/base/ltnews.pdf Binary files differindex 20e8dea9a4..3387dff525 100644 --- a/macros/latex/base/ltnews.pdf +++ b/macros/latex/base/ltnews.pdf diff --git a/macros/latex/base/ltnews01.pdf b/macros/latex/base/ltnews01.pdf Binary files differindex f77a5b28d9..e8e22df85e 100644 --- a/macros/latex/base/ltnews01.pdf +++ b/macros/latex/base/ltnews01.pdf diff --git a/macros/latex/base/ltnews02.pdf b/macros/latex/base/ltnews02.pdf Binary files differindex 0a33f62e06..6acaf138d7 100644 --- a/macros/latex/base/ltnews02.pdf +++ b/macros/latex/base/ltnews02.pdf diff --git a/macros/latex/base/ltnews03.pdf b/macros/latex/base/ltnews03.pdf Binary files differindex 53c96235c7..410d6331b1 100644 --- a/macros/latex/base/ltnews03.pdf +++ b/macros/latex/base/ltnews03.pdf diff --git a/macros/latex/base/ltnews04.pdf b/macros/latex/base/ltnews04.pdf Binary files differindex 5547952ef6..5592c44adf 100644 --- a/macros/latex/base/ltnews04.pdf +++ b/macros/latex/base/ltnews04.pdf diff --git a/macros/latex/base/ltnews05.pdf b/macros/latex/base/ltnews05.pdf Binary files differindex ff24fd0a87..52d924ca14 100644 --- a/macros/latex/base/ltnews05.pdf +++ b/macros/latex/base/ltnews05.pdf diff --git a/macros/latex/base/ltnews06.pdf b/macros/latex/base/ltnews06.pdf Binary files differindex 6f78782136..f5ba66cd4d 100644 --- a/macros/latex/base/ltnews06.pdf +++ b/macros/latex/base/ltnews06.pdf diff --git a/macros/latex/base/ltnews07.pdf b/macros/latex/base/ltnews07.pdf Binary files differindex e20380a79b..19c4d5961a 100644 --- a/macros/latex/base/ltnews07.pdf +++ b/macros/latex/base/ltnews07.pdf diff --git a/macros/latex/base/ltnews08.pdf b/macros/latex/base/ltnews08.pdf Binary files differindex 30bab4f8af..60d2674f6d 100644 --- a/macros/latex/base/ltnews08.pdf +++ b/macros/latex/base/ltnews08.pdf diff --git a/macros/latex/base/ltnews09.pdf b/macros/latex/base/ltnews09.pdf Binary files differindex 574b47fa54..40388aa82e 100644 --- a/macros/latex/base/ltnews09.pdf +++ b/macros/latex/base/ltnews09.pdf diff --git a/macros/latex/base/ltnews10.pdf b/macros/latex/base/ltnews10.pdf Binary files differindex 9ea06f76ca..d4c9871ac6 100644 --- a/macros/latex/base/ltnews10.pdf +++ b/macros/latex/base/ltnews10.pdf diff --git a/macros/latex/base/ltnews11.pdf b/macros/latex/base/ltnews11.pdf Binary files differindex ebe4532b73..aa049f39f1 100644 --- a/macros/latex/base/ltnews11.pdf +++ b/macros/latex/base/ltnews11.pdf diff --git a/macros/latex/base/ltnews12.pdf b/macros/latex/base/ltnews12.pdf Binary files differindex 7e6032f020..69f668a45b 100644 --- a/macros/latex/base/ltnews12.pdf +++ b/macros/latex/base/ltnews12.pdf diff --git a/macros/latex/base/ltnews13.pdf b/macros/latex/base/ltnews13.pdf Binary files differindex f2083e9019..d165372af6 100644 --- a/macros/latex/base/ltnews13.pdf +++ b/macros/latex/base/ltnews13.pdf diff --git a/macros/latex/base/ltnews14.pdf b/macros/latex/base/ltnews14.pdf Binary files differindex 3721424d0c..2a24206818 100644 --- a/macros/latex/base/ltnews14.pdf +++ b/macros/latex/base/ltnews14.pdf diff --git a/macros/latex/base/ltnews15.pdf b/macros/latex/base/ltnews15.pdf Binary files differindex 9ba1dbc6b7..382655f485 100644 --- a/macros/latex/base/ltnews15.pdf +++ b/macros/latex/base/ltnews15.pdf diff --git a/macros/latex/base/ltnews16.pdf b/macros/latex/base/ltnews16.pdf Binary files differindex 1d2b17732e..6e7c57d74a 100644 --- a/macros/latex/base/ltnews16.pdf +++ b/macros/latex/base/ltnews16.pdf diff --git a/macros/latex/base/ltnews17.pdf b/macros/latex/base/ltnews17.pdf Binary files differindex 2468e25ad4..81f328b77f 100644 --- a/macros/latex/base/ltnews17.pdf +++ b/macros/latex/base/ltnews17.pdf diff --git a/macros/latex/base/ltnews18.pdf b/macros/latex/base/ltnews18.pdf Binary files differindex 3dbf4ee348..f87a5852d6 100644 --- a/macros/latex/base/ltnews18.pdf +++ b/macros/latex/base/ltnews18.pdf diff --git a/macros/latex/base/ltnews19.pdf b/macros/latex/base/ltnews19.pdf Binary files differindex 3cf318808c..c3a3426abb 100644 --- a/macros/latex/base/ltnews19.pdf +++ b/macros/latex/base/ltnews19.pdf diff --git a/macros/latex/base/ltnews20.pdf b/macros/latex/base/ltnews20.pdf Binary files differindex f3ecf75d70..83273b77fb 100644 --- a/macros/latex/base/ltnews20.pdf +++ b/macros/latex/base/ltnews20.pdf diff --git a/macros/latex/base/ltnews21.pdf b/macros/latex/base/ltnews21.pdf Binary files differindex df01d98c08..d2a3268a39 100644 --- a/macros/latex/base/ltnews21.pdf +++ b/macros/latex/base/ltnews21.pdf diff --git a/macros/latex/base/ltnews22.pdf b/macros/latex/base/ltnews22.pdf Binary files differindex 7af667be54..31b8dbbe72 100644 --- a/macros/latex/base/ltnews22.pdf +++ b/macros/latex/base/ltnews22.pdf diff --git a/macros/latex/base/ltnews23.pdf b/macros/latex/base/ltnews23.pdf Binary files differindex ce5a6d101e..1604787140 100644 --- a/macros/latex/base/ltnews23.pdf +++ b/macros/latex/base/ltnews23.pdf diff --git a/macros/latex/base/ltnews24.pdf b/macros/latex/base/ltnews24.pdf Binary files differindex a19bae372c..ff2175eb35 100644 --- a/macros/latex/base/ltnews24.pdf +++ b/macros/latex/base/ltnews24.pdf diff --git a/macros/latex/base/ltnews25.pdf b/macros/latex/base/ltnews25.pdf Binary files differindex 0d7669ddc2..e37e5ea0cd 100644 --- a/macros/latex/base/ltnews25.pdf +++ b/macros/latex/base/ltnews25.pdf diff --git a/macros/latex/base/ltnews26.pdf b/macros/latex/base/ltnews26.pdf Binary files differindex 13dc3d26d5..28d7db3a71 100644 --- a/macros/latex/base/ltnews26.pdf +++ b/macros/latex/base/ltnews26.pdf diff --git a/macros/latex/base/ltnews27.pdf b/macros/latex/base/ltnews27.pdf Binary files differindex 5d8e665fb8..7f8dde1f56 100644 --- a/macros/latex/base/ltnews27.pdf +++ b/macros/latex/base/ltnews27.pdf diff --git a/macros/latex/base/ltnews28.pdf b/macros/latex/base/ltnews28.pdf Binary files differindex 328c065c53..99f52713e3 100644 --- a/macros/latex/base/ltnews28.pdf +++ b/macros/latex/base/ltnews28.pdf diff --git a/macros/latex/base/ltnews29.pdf b/macros/latex/base/ltnews29.pdf Binary files differindex 52445cc420..1b69ee7795 100644 --- a/macros/latex/base/ltnews29.pdf +++ b/macros/latex/base/ltnews29.pdf diff --git a/macros/latex/base/ltnews30.pdf b/macros/latex/base/ltnews30.pdf Binary files differindex f9caf97816..b2693bd19d 100644 --- a/macros/latex/base/ltnews30.pdf +++ b/macros/latex/base/ltnews30.pdf diff --git a/macros/latex/base/ltnews31.pdf b/macros/latex/base/ltnews31.pdf Binary files differindex 242feb7d2c..6692ae1768 100644 --- a/macros/latex/base/ltnews31.pdf +++ b/macros/latex/base/ltnews31.pdf diff --git a/macros/latex/base/ltnews32.pdf b/macros/latex/base/ltnews32.pdf Binary files differindex 363250860b..52d35e5928 100644 --- a/macros/latex/base/ltnews32.pdf +++ b/macros/latex/base/ltnews32.pdf diff --git a/macros/latex/base/ltnews33.pdf b/macros/latex/base/ltnews33.pdf Binary files differindex cbd0f2b46c..6b2439cc0b 100644 --- a/macros/latex/base/ltnews33.pdf +++ b/macros/latex/base/ltnews33.pdf diff --git a/macros/latex/base/ltnews34.pdf b/macros/latex/base/ltnews34.pdf Binary files differindex 9919a56abe..cf03dba842 100644 --- a/macros/latex/base/ltnews34.pdf +++ b/macros/latex/base/ltnews34.pdf diff --git a/macros/latex/base/ltnews35.pdf b/macros/latex/base/ltnews35.pdf Binary files differindex 857e259bec..4f855f2466 100644 --- a/macros/latex/base/ltnews35.pdf +++ b/macros/latex/base/ltnews35.pdf diff --git a/macros/latex/base/ltpara-code.pdf b/macros/latex/base/ltpara-code.pdf Binary files differindex f6de8902d2..1fda8edf58 100644 --- a/macros/latex/base/ltpara-code.pdf +++ b/macros/latex/base/ltpara-code.pdf diff --git a/macros/latex/base/ltpara-doc.pdf b/macros/latex/base/ltpara-doc.pdf Binary files differindex 7d3886667d..fb713ae12d 100644 --- a/macros/latex/base/ltpara-doc.pdf +++ b/macros/latex/base/ltpara-doc.pdf diff --git a/macros/latex/base/ltshipout-code.pdf b/macros/latex/base/ltshipout-code.pdf Binary files differindex 96f65484fd..a5695040ca 100644 --- a/macros/latex/base/ltshipout-code.pdf +++ b/macros/latex/base/ltshipout-code.pdf diff --git a/macros/latex/base/ltshipout-doc.pdf b/macros/latex/base/ltshipout-doc.pdf Binary files differindex 7114777340..66efc21ce6 100644 --- a/macros/latex/base/ltshipout-doc.pdf +++ b/macros/latex/base/ltshipout-doc.pdf diff --git a/macros/latex/base/ltvers.dtx b/macros/latex/base/ltvers.dtx index 021bb5038f..92cd1f4e5d 100644 --- a/macros/latex/base/ltvers.dtx +++ b/macros/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2022-06-01} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{1} +\def\patch@level{2} % \end{macrocode} % % \begin{macro}{\development@branch@name} diff --git a/macros/latex/base/ltx3info.pdf b/macros/latex/base/ltx3info.pdf Binary files differindex b1df70669e..cd1444506d 100644 --- a/macros/latex/base/ltx3info.pdf +++ b/macros/latex/base/ltx3info.pdf diff --git a/macros/latex/base/ltxdoc.pdf b/macros/latex/base/ltxdoc.pdf Binary files differindex b5777b7254..2be49f9048 100644 --- a/macros/latex/base/ltxdoc.pdf +++ b/macros/latex/base/ltxdoc.pdf diff --git a/macros/latex/base/makeindx.pdf b/macros/latex/base/makeindx.pdf Binary files differindex 2689599099..ba96438573 100644 --- a/macros/latex/base/makeindx.pdf +++ b/macros/latex/base/makeindx.pdf diff --git a/macros/latex/base/modguide.pdf b/macros/latex/base/modguide.pdf Binary files differindex d49b2d3885..dc70acb086 100644 --- a/macros/latex/base/modguide.pdf +++ b/macros/latex/base/modguide.pdf diff --git a/macros/latex/base/nfssfont.pdf b/macros/latex/base/nfssfont.pdf Binary files differindex 4550a82fe6..894ab53d0b 100644 --- a/macros/latex/base/nfssfont.pdf +++ b/macros/latex/base/nfssfont.pdf diff --git a/macros/latex/base/proc.pdf b/macros/latex/base/proc.pdf Binary files differindex 240143af6d..c3938114f3 100644 --- a/macros/latex/base/proc.pdf +++ b/macros/latex/base/proc.pdf diff --git a/macros/latex/base/slides.pdf b/macros/latex/base/slides.pdf Binary files differindex 197dc1d51a..45e76e0909 100644 --- a/macros/latex/base/slides.pdf +++ b/macros/latex/base/slides.pdf diff --git a/macros/latex/base/slifonts.pdf b/macros/latex/base/slifonts.pdf Binary files differindex 52b9da8326..93f1470416 100644 --- a/macros/latex/base/slifonts.pdf +++ b/macros/latex/base/slifonts.pdf diff --git a/macros/latex/base/source2e.pdf b/macros/latex/base/source2e.pdf Binary files differindex 70e084f6e8..0d0541b35b 100644 --- a/macros/latex/base/source2e.pdf +++ b/macros/latex/base/source2e.pdf diff --git a/macros/latex/base/syntonly.pdf b/macros/latex/base/syntonly.pdf Binary files differindex ef6ff5857b..0730685de9 100644 --- a/macros/latex/base/syntonly.pdf +++ b/macros/latex/base/syntonly.pdf diff --git a/macros/latex/base/tlc2.pdf b/macros/latex/base/tlc2.pdf Binary files differindex 54b6f037af..5d8214fc35 100644 --- a/macros/latex/base/tlc2.pdf +++ b/macros/latex/base/tlc2.pdf diff --git a/macros/latex/base/tulm.pdf b/macros/latex/base/tulm.pdf Binary files differindex 993243e50b..f3059c903e 100644 --- a/macros/latex/base/tulm.pdf +++ b/macros/latex/base/tulm.pdf diff --git a/macros/latex/base/usrguide.pdf b/macros/latex/base/usrguide.pdf Binary files differindex 1c8e6fdf84..36b100810f 100644 --- a/macros/latex/base/usrguide.pdf +++ b/macros/latex/base/usrguide.pdf diff --git a/macros/latex/base/usrguide3.pdf b/macros/latex/base/usrguide3.pdf Binary files differindex ce002ec1ef..c0b20f83dc 100644 --- a/macros/latex/base/usrguide3.pdf +++ b/macros/latex/base/usrguide3.pdf diff --git a/macros/latex/base/utf8ienc.pdf b/macros/latex/base/utf8ienc.pdf Binary files differindex 282ed4d197..6cab68e0db 100644 --- a/macros/latex/base/utf8ienc.pdf +++ b/macros/latex/base/utf8ienc.pdf diff --git a/macros/latex/base/webcomp.pdf b/macros/latex/base/webcomp.pdf Binary files differindex 456c8e33a5..d98c02c8fd 100644 --- a/macros/latex/base/webcomp.pdf +++ b/macros/latex/base/webcomp.pdf |