From 30015ed56b95dd3a90998697dbf10ba53b6332d6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Jun 2022 20:23:29 +0000 Subject: latex-base (21jun22) git-svn-id: svn://tug.org/texlive/trunk@63683 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/base/README.md | 2 +- Master/texmf-dist/doc/latex/base/alltt.pdf | Bin 223831 -> 223831 bytes Master/texmf-dist/doc/latex/base/cfgguide.pdf | Bin 242888 -> 242888 bytes Master/texmf-dist/doc/latex/base/changes.txt | 20 +++++++- Master/texmf-dist/doc/latex/base/classes.pdf | Bin 560350 -> 560350 bytes Master/texmf-dist/doc/latex/base/clsguide.pdf | Bin 402780 -> 402780 bytes Master/texmf-dist/doc/latex/base/cmfonts.pdf | Bin 292376 -> 292376 bytes Master/texmf-dist/doc/latex/base/cyrguide.pdf | Bin 239689 -> 239689 bytes Master/texmf-dist/doc/latex/base/doc-code.pdf | Bin 1081761 -> 1081448 bytes Master/texmf-dist/doc/latex/base/doc.pdf | Bin 755188 -> 754888 bytes Master/texmf-dist/doc/latex/base/docstrip.pdf | Bin 503774 -> 503446 bytes Master/texmf-dist/doc/latex/base/encguide.pdf | Bin 1318126 -> 1318126 bytes Master/texmf-dist/doc/latex/base/exscale.pdf | Bin 204711 -> 204711 bytes Master/texmf-dist/doc/latex/base/fix-cm.pdf | Bin 288328 -> 288328 bytes Master/texmf-dist/doc/latex/base/fntguide.pdf | Bin 502880 -> 502880 bytes Master/texmf-dist/doc/latex/base/graphpap.pdf | Bin 161713 -> 161713 bytes Master/texmf-dist/doc/latex/base/ifthen.pdf | Bin 221211 -> 221211 bytes Master/texmf-dist/doc/latex/base/inputenc.pdf | Bin 318204 -> 318204 bytes .../texmf-dist/doc/latex/base/lamport-manual.pdf | Bin 170878 -> 170878 bytes Master/texmf-dist/doc/latex/base/latexrelease.pdf | Bin 281906 -> 281906 bytes Master/texmf-dist/doc/latex/base/latexsym.pdf | Bin 200760 -> 200760 bytes Master/texmf-dist/doc/latex/base/lb2.pdf | Bin 252140 -> 252140 bytes Master/texmf-dist/doc/latex/base/letter.pdf | Bin 337706 -> 337382 bytes Master/texmf-dist/doc/latex/base/lgc2.pdf | Bin 215684 -> 215684 bytes Master/texmf-dist/doc/latex/base/lppl.pdf | Bin 132382 -> 132382 bytes .../texmf-dist/doc/latex/base/ltcmdhooks-code.pdf | Bin 720249 -> 719776 bytes .../texmf-dist/doc/latex/base/ltcmdhooks-doc.pdf | Bin 479100 -> 478626 bytes .../texmf-dist/doc/latex/base/ltfilehook-code.pdf | Bin 803034 -> 802638 bytes .../texmf-dist/doc/latex/base/ltfilehook-doc.pdf | Bin 548731 -> 548313 bytes Master/texmf-dist/doc/latex/base/lthooks-code.pdf | Bin 1096874 -> 1096471 bytes Master/texmf-dist/doc/latex/base/lthooks-doc.pdf | Bin 703775 -> 703370 bytes Master/texmf-dist/doc/latex/base/ltluatex.pdf | Bin 317700 -> 317700 bytes Master/texmf-dist/doc/latex/base/ltmarks-code.pdf | Bin 715660 -> 715258 bytes Master/texmf-dist/doc/latex/base/ltmarks-doc.pdf | Bin 587106 -> 586703 bytes Master/texmf-dist/doc/latex/base/ltnews.pdf | Bin 1180993 -> 1180993 bytes Master/texmf-dist/doc/latex/base/ltnews01.pdf | Bin 161518 -> 161518 bytes Master/texmf-dist/doc/latex/base/ltnews02.pdf | Bin 159792 -> 159792 bytes Master/texmf-dist/doc/latex/base/ltnews03.pdf | Bin 159332 -> 159332 bytes Master/texmf-dist/doc/latex/base/ltnews04.pdf | Bin 152525 -> 152525 bytes Master/texmf-dist/doc/latex/base/ltnews05.pdf | Bin 174494 -> 174494 bytes Master/texmf-dist/doc/latex/base/ltnews06.pdf | Bin 142849 -> 142849 bytes Master/texmf-dist/doc/latex/base/ltnews07.pdf | Bin 137811 -> 137811 bytes Master/texmf-dist/doc/latex/base/ltnews08.pdf | Bin 155053 -> 155053 bytes Master/texmf-dist/doc/latex/base/ltnews09.pdf | Bin 129570 -> 129570 bytes Master/texmf-dist/doc/latex/base/ltnews10.pdf | Bin 169416 -> 169416 bytes Master/texmf-dist/doc/latex/base/ltnews11.pdf | Bin 111948 -> 111948 bytes Master/texmf-dist/doc/latex/base/ltnews12.pdf | Bin 156551 -> 156551 bytes Master/texmf-dist/doc/latex/base/ltnews13.pdf | Bin 182225 -> 182225 bytes Master/texmf-dist/doc/latex/base/ltnews14.pdf | Bin 170473 -> 170473 bytes Master/texmf-dist/doc/latex/base/ltnews15.pdf | Bin 130309 -> 130309 bytes Master/texmf-dist/doc/latex/base/ltnews16.pdf | Bin 138073 -> 138073 bytes Master/texmf-dist/doc/latex/base/ltnews17.pdf | Bin 166228 -> 166228 bytes Master/texmf-dist/doc/latex/base/ltnews18.pdf | Bin 38033 -> 38033 bytes Master/texmf-dist/doc/latex/base/ltnews19.pdf | Bin 230028 -> 230028 bytes Master/texmf-dist/doc/latex/base/ltnews20.pdf | Bin 318548 -> 318548 bytes Master/texmf-dist/doc/latex/base/ltnews21.pdf | Bin 244867 -> 244867 bytes Master/texmf-dist/doc/latex/base/ltnews22.pdf | Bin 317773 -> 317773 bytes Master/texmf-dist/doc/latex/base/ltnews23.pdf | Bin 286591 -> 286591 bytes Master/texmf-dist/doc/latex/base/ltnews24.pdf | Bin 265279 -> 265279 bytes Master/texmf-dist/doc/latex/base/ltnews25.pdf | Bin 204935 -> 204935 bytes Master/texmf-dist/doc/latex/base/ltnews26.pdf | Bin 379462 -> 379462 bytes Master/texmf-dist/doc/latex/base/ltnews27.pdf | Bin 250592 -> 250592 bytes Master/texmf-dist/doc/latex/base/ltnews28.pdf | Bin 376643 -> 376643 bytes Master/texmf-dist/doc/latex/base/ltnews29.pdf | Bin 455107 -> 455107 bytes Master/texmf-dist/doc/latex/base/ltnews30.pdf | Bin 511909 -> 511909 bytes Master/texmf-dist/doc/latex/base/ltnews31.pdf | Bin 526323 -> 526323 bytes Master/texmf-dist/doc/latex/base/ltnews32.pdf | Bin 546160 -> 546160 bytes Master/texmf-dist/doc/latex/base/ltnews33.pdf | Bin 522412 -> 522412 bytes Master/texmf-dist/doc/latex/base/ltnews34.pdf | Bin 508044 -> 508044 bytes Master/texmf-dist/doc/latex/base/ltnews35.pdf | Bin 563513 -> 563513 bytes Master/texmf-dist/doc/latex/base/ltpara-code.pdf | Bin 667130 -> 666711 bytes Master/texmf-dist/doc/latex/base/ltpara-doc.pdf | Bin 560603 -> 560195 bytes .../texmf-dist/doc/latex/base/ltshipout-code.pdf | Bin 820873 -> 820502 bytes Master/texmf-dist/doc/latex/base/ltshipout-doc.pdf | Bin 565171 -> 564800 bytes Master/texmf-dist/doc/latex/base/ltx3info.pdf | Bin 219349 -> 219349 bytes Master/texmf-dist/doc/latex/base/ltxdoc.pdf | Bin 243273 -> 243273 bytes Master/texmf-dist/doc/latex/base/makeindx.pdf | Bin 165821 -> 165821 bytes Master/texmf-dist/doc/latex/base/modguide.pdf | Bin 243605 -> 243605 bytes Master/texmf-dist/doc/latex/base/nfssfont.pdf | Bin 211180 -> 211180 bytes Master/texmf-dist/doc/latex/base/proc.pdf | Bin 227059 -> 227059 bytes Master/texmf-dist/doc/latex/base/slides.pdf | Bin 375518 -> 375518 bytes Master/texmf-dist/doc/latex/base/slifonts.pdf | Bin 234191 -> 234191 bytes Master/texmf-dist/doc/latex/base/source2e.pdf | Bin 5761626 -> 5763795 bytes Master/texmf-dist/doc/latex/base/syntonly.pdf | Bin 189789 -> 189463 bytes Master/texmf-dist/doc/latex/base/tlc2.pdf | Bin 290615 -> 290615 bytes Master/texmf-dist/doc/latex/base/tulm.pdf | Bin 162772 -> 162772 bytes Master/texmf-dist/doc/latex/base/usrguide.pdf | Bin 430994 -> 430994 bytes Master/texmf-dist/doc/latex/base/usrguide3.pdf | Bin 403394 -> 403394 bytes Master/texmf-dist/doc/latex/base/utf8ienc.pdf | Bin 353405 -> 353405 bytes Master/texmf-dist/doc/latex/base/webcomp.pdf | Bin 146198 -> 146198 bytes Master/texmf-dist/source/latex/base/ltclass.dtx | 9 ++-- Master/texmf-dist/source/latex/base/ltkeys.dtx | 53 ++++++++++++++------- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- Master/texmf-dist/tex/latex/base/latex.ltx | 42 ++++++++++------ Master/texmf-dist/tex/latex/base/latexrelease.sty | 4 +- 95 files changed, 95 insertions(+), 37 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/base/README.md b/Master/texmf-dist/doc/latex/base/README.md index 302fb3d4ad0..099f5f7cd7b 100644 --- a/Master/texmf-dist/doc/latex/base/README.md +++ b/Master/texmf-dist/doc/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/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf index b68240407ef..805b27ed9ac 100644 Binary files a/Master/texmf-dist/doc/latex/base/alltt.pdf and b/Master/texmf-dist/doc/latex/base/alltt.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cfgguide.pdf b/Master/texmf-dist/doc/latex/base/cfgguide.pdf index 3340e6d4050..733bda5c202 100644 Binary files a/Master/texmf-dist/doc/latex/base/cfgguide.pdf and b/Master/texmf-dist/doc/latex/base/cfgguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt index ce72312d3d4..061d7282e7c 100644 --- a/Master/texmf-dist/doc/latex/base/changes.txt +++ b/Master/texmf-dist/doc/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 +######################### +# 2022-06-01 PL2 Release +######################### + +2022-06-20 Joseph Wright + + * ltkeys.dtx (subsection{Main mechanism}) + Use raw options data for keyval handling + +2022-06-19 Joseph Wright + + * ltkeys.dtx (subsection{Main mechanism}) + Correct approach to removing keys from \@unusedoptionlist + +######################### +# 2022-06-01 PL1 Release +######################### + +2022-06-16 Joseph Wright * ltkeys.dtx (subsection{Main mechanism}) Remove key name but avoid touching key value in \@unusedoptionlist diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf index 7d1b9e84535..2a96c80c4c8 100644 Binary files a/Master/texmf-dist/doc/latex/base/classes.pdf and b/Master/texmf-dist/doc/latex/base/classes.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/clsguide.pdf b/Master/texmf-dist/doc/latex/base/clsguide.pdf index f5f716adf9e..fa1e75ba692 100644 Binary files a/Master/texmf-dist/doc/latex/base/clsguide.pdf and b/Master/texmf-dist/doc/latex/base/clsguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf index ab94f922d42..8a5a7021f8a 100644 Binary files a/Master/texmf-dist/doc/latex/base/cmfonts.pdf and b/Master/texmf-dist/doc/latex/base/cmfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cyrguide.pdf b/Master/texmf-dist/doc/latex/base/cyrguide.pdf index f46472597d5..95dba9a8990 100644 Binary files a/Master/texmf-dist/doc/latex/base/cyrguide.pdf and b/Master/texmf-dist/doc/latex/base/cyrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/doc-code.pdf b/Master/texmf-dist/doc/latex/base/doc-code.pdf index 38d4f823305..e36d030699a 100644 Binary files a/Master/texmf-dist/doc/latex/base/doc-code.pdf and b/Master/texmf-dist/doc/latex/base/doc-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf index 6796c27a548..1f59aefdf2c 100644 Binary files a/Master/texmf-dist/doc/latex/base/doc.pdf and b/Master/texmf-dist/doc/latex/base/doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf index 47ad57079c5..46caaa90a40 100644 Binary files a/Master/texmf-dist/doc/latex/base/docstrip.pdf and b/Master/texmf-dist/doc/latex/base/docstrip.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/encguide.pdf b/Master/texmf-dist/doc/latex/base/encguide.pdf index 196ccc9eddc..fa4d1cd4ac4 100644 Binary files a/Master/texmf-dist/doc/latex/base/encguide.pdf and b/Master/texmf-dist/doc/latex/base/encguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf index 94ad97b2fc6..8375b3505d3 100644 Binary files a/Master/texmf-dist/doc/latex/base/exscale.pdf and b/Master/texmf-dist/doc/latex/base/exscale.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf index 8aac40d3bdf..075f79c3a69 100644 Binary files a/Master/texmf-dist/doc/latex/base/fix-cm.pdf and b/Master/texmf-dist/doc/latex/base/fix-cm.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/fntguide.pdf b/Master/texmf-dist/doc/latex/base/fntguide.pdf index 5e46ecc713c..816986a0bc4 100644 Binary files a/Master/texmf-dist/doc/latex/base/fntguide.pdf and b/Master/texmf-dist/doc/latex/base/fntguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf index 1ed2f697117..b02cc053b00 100644 Binary files a/Master/texmf-dist/doc/latex/base/graphpap.pdf and b/Master/texmf-dist/doc/latex/base/graphpap.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf index e0aac52ba37..03f4561ea5d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ifthen.pdf and b/Master/texmf-dist/doc/latex/base/ifthen.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf index 5b80585b565..830cb4ee3d5 100644 Binary files a/Master/texmf-dist/doc/latex/base/inputenc.pdf and b/Master/texmf-dist/doc/latex/base/inputenc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lamport-manual.pdf b/Master/texmf-dist/doc/latex/base/lamport-manual.pdf index 8a7a7cf0830..669833f2e98 100644 Binary files a/Master/texmf-dist/doc/latex/base/lamport-manual.pdf and b/Master/texmf-dist/doc/latex/base/lamport-manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf index 12f09cd0262..d6f8b203296 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexrelease.pdf and b/Master/texmf-dist/doc/latex/base/latexrelease.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf index 8ba858063c7..ae26a21ad80 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexsym.pdf and b/Master/texmf-dist/doc/latex/base/latexsym.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf index 64053ba56c2..817e5b1dcfc 100644 Binary files a/Master/texmf-dist/doc/latex/base/lb2.pdf and b/Master/texmf-dist/doc/latex/base/lb2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf index 21e1df4f361..23b21751372 100644 Binary files a/Master/texmf-dist/doc/latex/base/letter.pdf and b/Master/texmf-dist/doc/latex/base/letter.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf index 8c0459b7ab9..8cbf115a782 100644 Binary files a/Master/texmf-dist/doc/latex/base/lgc2.pdf and b/Master/texmf-dist/doc/latex/base/lgc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf index 916caca4626..91a8beaaff6 100644 Binary files a/Master/texmf-dist/doc/latex/base/lppl.pdf and b/Master/texmf-dist/doc/latex/base/lppl.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltcmdhooks-code.pdf b/Master/texmf-dist/doc/latex/base/ltcmdhooks-code.pdf index 9f11b67c39d..54cfa08682e 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltcmdhooks-code.pdf and b/Master/texmf-dist/doc/latex/base/ltcmdhooks-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltcmdhooks-doc.pdf b/Master/texmf-dist/doc/latex/base/ltcmdhooks-doc.pdf index 3a2d5d871b8..9da68151476 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltcmdhooks-doc.pdf and b/Master/texmf-dist/doc/latex/base/ltcmdhooks-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltfilehook-code.pdf b/Master/texmf-dist/doc/latex/base/ltfilehook-code.pdf index 3e1f2c268c9..5250d38893d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltfilehook-code.pdf and b/Master/texmf-dist/doc/latex/base/ltfilehook-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltfilehook-doc.pdf b/Master/texmf-dist/doc/latex/base/ltfilehook-doc.pdf index 36fce9e03a1..b12c3b4f773 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltfilehook-doc.pdf and b/Master/texmf-dist/doc/latex/base/ltfilehook-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lthooks-code.pdf b/Master/texmf-dist/doc/latex/base/lthooks-code.pdf index 86a0c636926..7e9d75bb853 100644 Binary files a/Master/texmf-dist/doc/latex/base/lthooks-code.pdf and b/Master/texmf-dist/doc/latex/base/lthooks-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lthooks-doc.pdf b/Master/texmf-dist/doc/latex/base/lthooks-doc.pdf index cf90a3a98a3..65d5c50781e 100644 Binary files a/Master/texmf-dist/doc/latex/base/lthooks-doc.pdf and b/Master/texmf-dist/doc/latex/base/lthooks-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltluatex.pdf b/Master/texmf-dist/doc/latex/base/ltluatex.pdf index 715cccdc7a0..71557fac17a 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltluatex.pdf and b/Master/texmf-dist/doc/latex/base/ltluatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltmarks-code.pdf b/Master/texmf-dist/doc/latex/base/ltmarks-code.pdf index 2ebc5271dba..48e7996f06f 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltmarks-code.pdf and b/Master/texmf-dist/doc/latex/base/ltmarks-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltmarks-doc.pdf b/Master/texmf-dist/doc/latex/base/ltmarks-doc.pdf index 705938d156c..ebaf75aa779 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltmarks-doc.pdf and b/Master/texmf-dist/doc/latex/base/ltmarks-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews.pdf b/Master/texmf-dist/doc/latex/base/ltnews.pdf index 20e8dea9a43..3387dff5256 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews.pdf and b/Master/texmf-dist/doc/latex/base/ltnews.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews01.pdf b/Master/texmf-dist/doc/latex/base/ltnews01.pdf index f77a5b28d98..e8e22df85e3 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews01.pdf and b/Master/texmf-dist/doc/latex/base/ltnews01.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews02.pdf b/Master/texmf-dist/doc/latex/base/ltnews02.pdf index 0a33f62e063..6acaf138d79 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews02.pdf and b/Master/texmf-dist/doc/latex/base/ltnews02.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews03.pdf b/Master/texmf-dist/doc/latex/base/ltnews03.pdf index 53c96235c71..410d6331b17 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews03.pdf and b/Master/texmf-dist/doc/latex/base/ltnews03.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews04.pdf b/Master/texmf-dist/doc/latex/base/ltnews04.pdf index 5547952ef6a..5592c44adf5 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews04.pdf and b/Master/texmf-dist/doc/latex/base/ltnews04.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews05.pdf b/Master/texmf-dist/doc/latex/base/ltnews05.pdf index ff24fd0a87d..52d924ca14e 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews05.pdf and b/Master/texmf-dist/doc/latex/base/ltnews05.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews06.pdf b/Master/texmf-dist/doc/latex/base/ltnews06.pdf index 6f787821362..f5ba66cd4dc 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews06.pdf and b/Master/texmf-dist/doc/latex/base/ltnews06.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews07.pdf b/Master/texmf-dist/doc/latex/base/ltnews07.pdf index e20380a79b2..19c4d5961ae 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews07.pdf and b/Master/texmf-dist/doc/latex/base/ltnews07.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews08.pdf b/Master/texmf-dist/doc/latex/base/ltnews08.pdf index 30bab4f8afa..60d2674f6df 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews08.pdf and b/Master/texmf-dist/doc/latex/base/ltnews08.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews09.pdf b/Master/texmf-dist/doc/latex/base/ltnews09.pdf index 574b47fa549..40388aa82ee 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews09.pdf and b/Master/texmf-dist/doc/latex/base/ltnews09.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews10.pdf b/Master/texmf-dist/doc/latex/base/ltnews10.pdf index 9ea06f76caf..d4c9871ac63 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews10.pdf and b/Master/texmf-dist/doc/latex/base/ltnews10.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews11.pdf b/Master/texmf-dist/doc/latex/base/ltnews11.pdf index ebe4532b733..aa049f39f1d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews11.pdf and b/Master/texmf-dist/doc/latex/base/ltnews11.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews12.pdf b/Master/texmf-dist/doc/latex/base/ltnews12.pdf index 7e6032f0207..69f668a45b7 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews12.pdf and b/Master/texmf-dist/doc/latex/base/ltnews12.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews13.pdf b/Master/texmf-dist/doc/latex/base/ltnews13.pdf index f2083e9019e..d165372af6d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews13.pdf and b/Master/texmf-dist/doc/latex/base/ltnews13.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews14.pdf b/Master/texmf-dist/doc/latex/base/ltnews14.pdf index 3721424d0c4..2a242068186 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews14.pdf and b/Master/texmf-dist/doc/latex/base/ltnews14.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews15.pdf b/Master/texmf-dist/doc/latex/base/ltnews15.pdf index 9ba1dbc6b7a..382655f485f 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews15.pdf and b/Master/texmf-dist/doc/latex/base/ltnews15.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews16.pdf b/Master/texmf-dist/doc/latex/base/ltnews16.pdf index 1d2b17732e9..6e7c57d74ae 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews16.pdf and b/Master/texmf-dist/doc/latex/base/ltnews16.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews17.pdf b/Master/texmf-dist/doc/latex/base/ltnews17.pdf index 2468e25ad41..81f328b77f6 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews17.pdf and b/Master/texmf-dist/doc/latex/base/ltnews17.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews18.pdf b/Master/texmf-dist/doc/latex/base/ltnews18.pdf index 3dbf4ee348c..f87a5852d6b 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews18.pdf and b/Master/texmf-dist/doc/latex/base/ltnews18.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews19.pdf b/Master/texmf-dist/doc/latex/base/ltnews19.pdf index 3cf318808c8..c3a3426abbf 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews19.pdf and b/Master/texmf-dist/doc/latex/base/ltnews19.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews20.pdf b/Master/texmf-dist/doc/latex/base/ltnews20.pdf index f3ecf75d701..83273b77fb1 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews20.pdf and b/Master/texmf-dist/doc/latex/base/ltnews20.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews21.pdf b/Master/texmf-dist/doc/latex/base/ltnews21.pdf index df01d98c087..d2a3268a39d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews21.pdf and b/Master/texmf-dist/doc/latex/base/ltnews21.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews22.pdf b/Master/texmf-dist/doc/latex/base/ltnews22.pdf index 7af667be543..31b8dbbe724 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews22.pdf and b/Master/texmf-dist/doc/latex/base/ltnews22.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews23.pdf b/Master/texmf-dist/doc/latex/base/ltnews23.pdf index ce5a6d101e9..16047871402 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews23.pdf and b/Master/texmf-dist/doc/latex/base/ltnews23.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews24.pdf b/Master/texmf-dist/doc/latex/base/ltnews24.pdf index a19bae372c5..ff2175eb351 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews24.pdf and b/Master/texmf-dist/doc/latex/base/ltnews24.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews25.pdf b/Master/texmf-dist/doc/latex/base/ltnews25.pdf index 0d7669ddc26..e37e5ea0cd1 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews25.pdf and b/Master/texmf-dist/doc/latex/base/ltnews25.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews26.pdf b/Master/texmf-dist/doc/latex/base/ltnews26.pdf index 13dc3d26d53..28d7db3a715 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews26.pdf and b/Master/texmf-dist/doc/latex/base/ltnews26.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews27.pdf b/Master/texmf-dist/doc/latex/base/ltnews27.pdf index 5d8e665fb89..7f8dde1f569 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews27.pdf and b/Master/texmf-dist/doc/latex/base/ltnews27.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews28.pdf b/Master/texmf-dist/doc/latex/base/ltnews28.pdf index 328c065c537..99f52713e3e 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews28.pdf and b/Master/texmf-dist/doc/latex/base/ltnews28.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews29.pdf b/Master/texmf-dist/doc/latex/base/ltnews29.pdf index 52445cc420a..1b69ee77959 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews29.pdf and b/Master/texmf-dist/doc/latex/base/ltnews29.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews30.pdf b/Master/texmf-dist/doc/latex/base/ltnews30.pdf index f9caf97816e..b2693bd19df 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews30.pdf and b/Master/texmf-dist/doc/latex/base/ltnews30.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews31.pdf b/Master/texmf-dist/doc/latex/base/ltnews31.pdf index 242feb7d2c7..6692ae17682 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews31.pdf and b/Master/texmf-dist/doc/latex/base/ltnews31.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews32.pdf b/Master/texmf-dist/doc/latex/base/ltnews32.pdf index 363250860bc..52d35e5928f 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews32.pdf and b/Master/texmf-dist/doc/latex/base/ltnews32.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews33.pdf b/Master/texmf-dist/doc/latex/base/ltnews33.pdf index cbd0f2b46cb..6b2439cc0bd 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews33.pdf and b/Master/texmf-dist/doc/latex/base/ltnews33.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews34.pdf b/Master/texmf-dist/doc/latex/base/ltnews34.pdf index 9919a56abe9..cf03dba8427 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews34.pdf and b/Master/texmf-dist/doc/latex/base/ltnews34.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews35.pdf b/Master/texmf-dist/doc/latex/base/ltnews35.pdf index 857e259bec8..4f855f2466b 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews35.pdf and b/Master/texmf-dist/doc/latex/base/ltnews35.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltpara-code.pdf b/Master/texmf-dist/doc/latex/base/ltpara-code.pdf index f6de8902d2b..1fda8edf58a 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltpara-code.pdf and b/Master/texmf-dist/doc/latex/base/ltpara-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltpara-doc.pdf b/Master/texmf-dist/doc/latex/base/ltpara-doc.pdf index 7d3886667dc..fb713ae12d3 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltpara-doc.pdf and b/Master/texmf-dist/doc/latex/base/ltpara-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltshipout-code.pdf b/Master/texmf-dist/doc/latex/base/ltshipout-code.pdf index 96f65484fde..a5695040ca3 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltshipout-code.pdf and b/Master/texmf-dist/doc/latex/base/ltshipout-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltshipout-doc.pdf b/Master/texmf-dist/doc/latex/base/ltshipout-doc.pdf index 71147773406..66efc21ce66 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltshipout-doc.pdf and b/Master/texmf-dist/doc/latex/base/ltshipout-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltx3info.pdf b/Master/texmf-dist/doc/latex/base/ltx3info.pdf index b1df70669e8..cd1444506de 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltx3info.pdf and b/Master/texmf-dist/doc/latex/base/ltx3info.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf index b5777b7254a..2be49f90481 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf and b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf index 2689599099b..ba96438573f 100644 Binary files a/Master/texmf-dist/doc/latex/base/makeindx.pdf and b/Master/texmf-dist/doc/latex/base/makeindx.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/modguide.pdf b/Master/texmf-dist/doc/latex/base/modguide.pdf index d49b2d38859..dc70acb0866 100644 Binary files a/Master/texmf-dist/doc/latex/base/modguide.pdf and b/Master/texmf-dist/doc/latex/base/modguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf index 4550a82fe66..894ab53d0b3 100644 Binary files a/Master/texmf-dist/doc/latex/base/nfssfont.pdf and b/Master/texmf-dist/doc/latex/base/nfssfont.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf index 240143af6dc..c3938114f31 100644 Binary files a/Master/texmf-dist/doc/latex/base/proc.pdf and b/Master/texmf-dist/doc/latex/base/proc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf index 197dc1d51a8..45e76e09098 100644 Binary files a/Master/texmf-dist/doc/latex/base/slides.pdf and b/Master/texmf-dist/doc/latex/base/slides.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf index 52b9da83268..93f1470416e 100644 Binary files a/Master/texmf-dist/doc/latex/base/slifonts.pdf and b/Master/texmf-dist/doc/latex/base/slifonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf index 70e084f6e89..0d0541b35bf 100644 Binary files a/Master/texmf-dist/doc/latex/base/source2e.pdf and b/Master/texmf-dist/doc/latex/base/source2e.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf index ef6ff5857b3..0730685de9e 100644 Binary files a/Master/texmf-dist/doc/latex/base/syntonly.pdf and b/Master/texmf-dist/doc/latex/base/syntonly.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf index 54b6f037af9..5d8214fc351 100644 Binary files a/Master/texmf-dist/doc/latex/base/tlc2.pdf and b/Master/texmf-dist/doc/latex/base/tlc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/tulm.pdf b/Master/texmf-dist/doc/latex/base/tulm.pdf index 993243e50b8..f3059c903ea 100644 Binary files a/Master/texmf-dist/doc/latex/base/tulm.pdf and b/Master/texmf-dist/doc/latex/base/tulm.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/usrguide.pdf b/Master/texmf-dist/doc/latex/base/usrguide.pdf index 1c8e6fdf846..36b100810f5 100644 Binary files a/Master/texmf-dist/doc/latex/base/usrguide.pdf and b/Master/texmf-dist/doc/latex/base/usrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/usrguide3.pdf b/Master/texmf-dist/doc/latex/base/usrguide3.pdf index ce002ec1ef8..c0b20f83dcc 100644 Binary files a/Master/texmf-dist/doc/latex/base/usrguide3.pdf and b/Master/texmf-dist/doc/latex/base/usrguide3.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf index 282ed4d197a..6cab68e0db0 100644 Binary files a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf and b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf index 456c8e33a5c..d98c02c8fd5 100644 Binary files a/Master/texmf-dist/doc/latex/base/webcomp.pdf and b/Master/texmf-dist/doc/latex/base/webcomp.pdf differ diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx index 20e59353ec0..35c4251fcea 100644 --- a/Master/texmf-dist/source/latex/base/ltclass.dtx +++ b/Master/texmf-dist/source/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/Master/texmf-dist/source/latex/base/ltkeys.dtx b/Master/texmf-dist/source/latex/base/ltkeys.dtx index c6dfa5f6ddb..fbd5ce302af 100644 --- a/Master/texmf-dist/source/latex/base/ltkeys.dtx +++ b/Master/texmf-dist/source/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/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 021bb5038f7..92cd1f4e5d1 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2022-06-01} % %<*2ekernel> -\def\patch@level{1} +\def\patch@level{2} % \end{macrocode} % % \begin{macro}{\development@branch@name} diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 945ad0d79b9..2986263abe5 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -706,7 +706,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2022-06-01} -\def\patch@level{1} +\def\patch@level{2} \edef\development@branch@name{} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -14274,7 +14274,9 @@ Type H for immediate help.}% \@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]% @@ -14852,7 +14854,7 @@ Type H for immediate help.}% } \cs_new_protected:Npn \__keys_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 { \__keys_options_class:n {#1} } @@ -14861,47 +14863,59 @@ Type H for immediate help.}% } \cs_new_protected:Npn \__keys_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__keys_options_clist - { opt@ \@currname . \@currext } + { @raw@opt@ \@currname . \@currext } } { - \clist_map_inline:cn { opt@ \@currname . \@currext } + \clist_map_inline:cn { @raw@opt@ \@currname . \@currext } { - \__keys_options_remove:enn + \exp_args:Ne \__keys_options_class:nnn { \__keys_remove_equals:n {##1} } {##1} {#1} } } } } -\cs_new_protected:Npn \__keys_options_remove:nnn #1#2#3 +\cs_new_protected:Npn \__keys_options_class:nnn #1#2#3 { \keys_if_exist:nnTF {#3} {#1} { \clist_put_right:Nn \l__keys_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 \__keys_options_remove:nnn { e } \cs_new_protected:Npn \__keys_options_package:n #1 { - \clist_map_inline:Nn \@classoptionslist + \clist_map_inline:Nn \@raw@classoptionslist { - \__keys_options_remove:enn + \exp_args:Ne \__keys_options_package:nnn { \__keys_remove_equals:n {##1} } {##1} {#1} } } +\cs_new_protected:Npn \__keys_options_package:nnn #1#2#3 + { + \keys_if_exist:nnT {#3} {#1} + { + \clist_put_right:Nn \l__keys_options_clist {#2} + \clist_remove_all:Nn \@unusedoptionlist {#1} + } + } \cs_new_protected:Npn \__keys_options_local: { \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__keys_options_clist - { opt@ \@currname . \@currext } + { @raw@opt@ \@currname . \@currext } } } } diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 3979ee773b4..ed02bee3775 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -13966,7 +13966,9 @@ of this package available from CTAN} \@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]% -- cgit v1.2.3