CTAN sync 202305260302

273 files changed, 9590 insertions, 3008 deletions

diff --git a/FILES.byname b/FILES.byname
index 4892403a35..2bcc71b854 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2056,12 +2056,12 @@
 2023/04/13 |       1675 | biblio/citation-style-language/README.md
 2023/04/13 |      11957 | biblio/citation-style-language/vancouver.csl
 2023/04/13 |    4516625 | biblio/citation-style-language.zip
-2023/05/24 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/05/25 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
 2022/10/08 |        127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/05/24 |    2786426 | biblio/ctan-bibdata/ctan.bib
-2023/05/24 |    3677558 | biblio/ctan-bibdata/ctan.pdf
+2023/05/25 |    2786799 | biblio/ctan-bibdata/ctan.bib
+2023/05/25 |    3676721 | biblio/ctan-bibdata/ctan.pdf
 2023/01/16 |       1489 | biblio/ctan-bibdata/README
-2023/05/24 |    4076562 | biblio/ctan-bibdata.zip
+2023/05/25 |    4075453 | biblio/ctan-bibdata.zip
 2023/02/23 |       3126 | biblio/pbibtex/pbibtex-base/cpp.awk
 2023/02/23 |       1009 | biblio/pbibtex/pbibtex-base/generate.sh
 2023/02/23 |      22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5417,7 +5417,7 @@
 1990/10/02 |       5440 | dviware/vutex/vaxvms.hlp
 1990/10/02 |        812 | dviware/vutex/vaxvms.ins
 1990/10/02 |     127576 | dviware/vutex/vutex.web
-2023/05/24 |     125995 | FILES.last07days
+2023/05/25 |     133224 | FILES.last07days
 2021/07/24 |    1139410 | fonts/aboensis/Aboensis.glyphs
 2021/07/24 |   18907382 | fonts/aboensis/aboensis.pdf
 2021/07/24 |     137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -159438,11 +159438,11 @@
 2020/04/15 |        396 | graphics/pgf/contrib/dpcircling/README.md
 2020/04/15 |      33206 | graphics/pgf/contrib/dpcircling.zip
 2021/06/17 |      19770 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.bib
-2023/05/18 |     891080 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
-2023/05/18 |     153837 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
-2023/05/18 |      66301 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+2023/05/25 |     895333 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+2023/05/25 |     154483 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+2023/05/25 |      66329 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
 2023/05/18 |        342 | graphics/pgf/contrib/dynkin-diagrams/README
-2023/05/18 |     911675 | graphics/pgf/contrib/dynkin-diagrams.zip
+2023/05/25 |     916011 | graphics/pgf/contrib/dynkin-diagrams.zip
 2021/07/17 |      31109 | graphics/pgf/contrib/easing/easing.dtx
 2021/07/17 |       1615 | graphics/pgf/contrib/easing/easing.ins
 2021/07/17 |     313369 | graphics/pgf/contrib/easing/easing.pdf
@@ -192939,9 +192939,9 @@
 1992/09/27 |       8502 | info/tex-for-pictures.txt
 1999/05/31 |        135 | info/texlive/README
 2020/04/01 |        458 | info/tex-nutshell/README
-2022/05/18 |     256523 | info/tex-nutshell/tex-nutshell.pdf
-2022/05/18 |     115713 | info/tex-nutshell/tex-nutshell.tex
-2022/05/18 |     285607 | info/tex-nutshell.zip
+2023/05/25 |     273211 | info/tex-nutshell/tex-nutshell.pdf
+2023/05/25 |     123096 | info/tex-nutshell/tex-nutshell.tex
+2023/05/25 |     304156 | info/tex-nutshell.zip
 2019/04/18 |        360 | info/texonly/README.md
 2019/04/18 |      70552 | info/texonly/texonly2.pdf
 2019/04/18 |      10714 | info/texonly/texonly2.tex
@@ -194564,12 +194564,12 @@
 2020/04/09 |     806385 | install/macros/latex/contrib/zhlipsum.tds.zip
 2022/07/14 |     321454 | install/macros/latex/contrib/zhnumber.tds.zip
 2023/02/21 |    1688405 | install/macros/latex/contrib/zref-clever.tds.zip
-2023/03/09 |   39542215 | install/macros/latex-dev/latex-base-dev.tds.zip
-2022/10/31 |    2795153 | install/macros/latex-dev/required/latex-amsmath-dev.tds.zip
-2022/12/03 |     277960 | install/macros/latex-dev/required/latex-firstaid-dev.tds.zip
+2023/05/25 |   40777591 | install/macros/latex-dev/latex-base-dev.tds.zip
+2023/05/25 |    2796162 | install/macros/latex-dev/required/latex-amsmath-dev.tds.zip
+2023/05/25 |     275474 | install/macros/latex-dev/required/latex-firstaid-dev.tds.zip
 2022/10/31 |    3109665 | install/macros/latex-dev/required/latex-graphics-dev.tds.zip
 2023/03/09 |    8157258 | install/macros/latex-dev/required/latex-lab-dev.tds.zip
-2022/10/31 |    7339002 | install/macros/latex-dev/required/latex-tools-dev.tds.zip
+2023/05/25 |    7340454 | install/macros/latex-dev/required/latex-tools-dev.tds.zip
 2022/11/30 |   39031324 | install/macros/latex/latex-base.tds.zip
 2020/06/01 |    1578753 | install/macros/latex/required/amscls.tds.zip
 2023/05/11 |    3325814 | install/macros/latex/required/babel-base.tds.zip
@@ -214293,15 +214293,15 @@
 2017/11/21 |       1662 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/latex/dbx/fiwi.dbx
 2017/11/21 |       2941 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/README
 2017/11/21 |     793984 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi.zip
-2023/04/24 |    1711489 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
-2022/04/05 |      17207 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
-2023/04/24 |     213084 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+2023/05/25 |    1722838 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+2023/05/25 |      17233 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+2023/05/25 |     221738 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
 2023/04/10 |      33217 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx
 2023/04/24 |       5121 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx
 2023/04/02 |      10735 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.bbx
 2023/04/24 |       5888 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
-2023/04/24 |      26158 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
-2023/04/24 |       6465 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
+2023/04/25 |      27143 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
+2023/04/25 |       6705 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
 2022/04/16 |     132176 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/example.bib
 2021/08/19 |       7077 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx
 2021/08/19 |        780 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx
@@ -214311,14 +214311,14 @@
 2021/08/19 |        520 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx
 2021/12/11 |       3184 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx
 2021/08/19 |        643 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx
-2023/04/24 |     174325 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
-2022/06/26 |      16158 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
-2023/04/24 |     175876 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
-2023/04/03 |      18609 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+2023/05/25 |     175344 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+2023/05/25 |      19645 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+2023/05/25 |     176859 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+2023/05/25 |      20166 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
 2021/08/19 |        924 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
-2022/11/07 |     124583 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+2023/04/27 |     124626 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
 2021/09/11 |        515 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
-2022/11/07 |     145017 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+2023/04/27 |     145060 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
 2022/06/26 |      15816 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
 2022/05/27 |      18353 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-CCNU.bbx
 2022/03/14 |        941 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-CCNU.cbx
@@ -214327,9 +214327,9 @@
 2022/04/03 |      10511 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-SEU.bbx
 2022/03/14 |        415 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-SEU.cbx
 2021/09/11 |      56865 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714texttobib.pl
-2023/04/03 |       5620 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py
-2023/04/24 |      75685 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
-2023/04/24 |    1754813 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
+2023/04/27 |       5660 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py
+2023/05/24 |      75717 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+2023/05/25 |    1769996 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
 2023/02/22 |     167639 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf
 2023/02/22 |      18622 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex
 2023/02/22 |      11374 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx
@@ -228353,11 +228353,11 @@
 2019/12/11 |     302164 | macros/latex/contrib/listingsutf8.zip
 2023/02/27 |    3472403 | macros/latex/contrib/listings.zip
 2010/03/07 |     260381 | macros/latex/contrib/listing.zip
-2014/08/04 |      16189 | macros/latex/contrib/listlbls/listlbls.dtx
-2014/08/04 |      74422 | macros/latex/contrib/listlbls/listlbls.pdf
-2014/08/04 |       1500 | macros/latex/contrib/listlbls/Makefile
-2014/08/04 |        863 | macros/latex/contrib/listlbls/README
-2014/08/04 |      78473 | macros/latex/contrib/listlbls.zip
+2023/05/24 |      17816 | macros/latex/contrib/listlbls/listlbls.dtx
+2023/05/24 |     102919 | macros/latex/contrib/listlbls/listlbls.pdf
+2023/05/24 |       1465 | macros/latex/contrib/listlbls/Makefile
+2023/05/24 |        863 | macros/latex/contrib/listlbls/README
+2023/05/25 |     104582 | macros/latex/contrib/listlbls.zip
 2005/01/09 |      19936 | macros/latex/contrib/listliketab/listliketab.dtx
 2005/01/09 |       1958 | macros/latex/contrib/listliketab/listliketab.ins
 2005/01/09 |     142942 | macros/latex/contrib/listliketab/listliketab.pdf
@@ -230708,15 +230708,15 @@
 1996/03/22 |      18862 | macros/latex/contrib/niceframe/umrandb.mf
 2015/01/17 |       1370 | macros/latex/contrib/niceframe/umrand.mf
 2015/01/17 |     287910 | macros/latex/contrib/niceframe.zip
-2023/05/15 |     550564 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
-2023/05/15 |     909639 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
-2023/05/15 |     577804 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2023/05/15 |     236100 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2023/05/25 |     550098 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/05/25 |     909512 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
+2023/05/25 |     575208 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/05/17 |     236294 | macros/latex/contrib/nicematrix/nicematrix-french.tex
 2023/05/15 |       1428 | macros/latex/contrib/nicematrix/nicematrix.ins
-2023/05/15 |     571224 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2023/05/15 |     245987 | macros/latex/contrib/nicematrix/nicematrix.tex
+2023/05/25 |     592717 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/05/17 |     246137 | macros/latex/contrib/nicematrix/nicematrix.tex
 2023/05/15 |       1028 | macros/latex/contrib/nicematrix/README.md
-2023/05/15 |    2227926 | macros/latex/contrib/nicematrix.zip
+2023/05/25 |    2245559 | macros/latex/contrib/nicematrix.zip
 2015/11/21 |        217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
 2012/03/18 |     254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
 2011/09/14 |         10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -231473,17 +231473,17 @@
 2023/04/04 |       2819 | macros/latex/contrib/osda/README.md
 2023/04/05 |     344168 | macros/latex/contrib/osda.zip
 2022/11/22 |      17926 | macros/latex/contrib/oststud/hsrstud-classes.dtx
-2023/04/18 |     127717 | macros/latex/contrib/oststud/hsrstud-classes.pdf
+2023/05/25 |     127670 | macros/latex/contrib/oststud/hsrstud-classes.pdf
 2022/11/22 |      14749 | macros/latex/contrib/oststud/hsrstud.dtx
 2022/11/18 |       1747 | macros/latex/contrib/oststud/hsrstud.ins
-2023/04/18 |     143177 | macros/latex/contrib/oststud/hsrstud.pdf
+2023/05/25 |     143159 | macros/latex/contrib/oststud/hsrstud.pdf
 2022/11/18 |      20138 | macros/latex/contrib/oststud/LICENSE.txt
 2023/04/18 |       2040 | macros/latex/contrib/oststud/Makefile
-2023/04/18 |      19959 | macros/latex/contrib/oststud/oststud.dtx
+2023/05/21 |      23716 | macros/latex/contrib/oststud/oststud.dtx
 2023/04/18 |       1629 | macros/latex/contrib/oststud/oststud.ins
-2023/04/18 |     145415 | macros/latex/contrib/oststud/oststud.pdf
+2023/05/25 |     159801 | macros/latex/contrib/oststud/oststud.pdf
 2023/04/18 |       1490 | macros/latex/contrib/oststud/README.md
-2023/04/19 |     387482 | macros/latex/contrib/oststud.zip
+2023/05/25 |     402455 | macros/latex/contrib/oststud.zip
 2011/08/20 |      74250 | macros/latex/contrib/othelloboard/example-rose-chps1-2.pdf
 2011/08/20 |      32104 | macros/latex/contrib/othelloboard/example-rose-chps1-2.tex
 2011/08/19 |     156198 | macros/latex/contrib/othelloboard/othelloboard.pdf
@@ -243026,334 +243026,338 @@
 2022/04/18 |     501158 | macros/latex/contrib/zwpagelayout/zwpagelayout.pdf
 2022/04/18 |      36154 | macros/latex/contrib/zwpagelayout/zwpagelayout.sty
 2022/04/18 |      69553 | macros/latex/contrib/zwpagelayout/zwpagelayout.tex
-2023/03/09 |       7104 | macros/latex-dev/base/alltt.dtx
-2023/03/09 |       2890 | macros/latex-dev/base/alltt.ins
-2023/03/09 |     223829 | macros/latex-dev/base/alltt.pdf
-2023/03/09 |       3282 | macros/latex-dev/base/bugs.txt
-2023/03/09 |     264161 | macros/latex-dev/base/cfgguide.pdf
-2023/03/09 |      22723 | macros/latex-dev/base/cfgguide.tex
-2023/03/09 |      42708 | macros/latex-dev/base/changes.old.txt
-2023/03/09 |     395207 | macros/latex-dev/base/changes.txt
-2023/03/09 |     156236 | macros/latex-dev/base/classes.dtx
-2023/03/09 |       4087 | macros/latex-dev/base/classes.ins
-2023/03/09 |     560248 | macros/latex-dev/base/classes.pdf
-2023/03/09 |     414447 | macros/latex-dev/base/clsguide.pdf
-2023/03/09 |      69318 | macros/latex-dev/base/clsguide.tex
-2023/03/09 |       5273 | macros/latex-dev/base/cmextra.ins
-2023/03/09 |      44410 | macros/latex-dev/base/cmfonts.fdd
-2023/03/09 |       4324 | macros/latex-dev/base/cmfonts.ins
-2023/03/09 |     292136 | macros/latex-dev/base/cmfonts.pdf
-2023/03/09 |     257355 | macros/latex-dev/base/cyrguide.pdf
-2023/03/09 |      17782 | macros/latex-dev/base/cyrguide.tex
-2023/03/09 |      29965 | macros/latex-dev/base/doc-2016-02-15.sty
-2023/03/09 |      30499 | macros/latex-dev/base/doc-2021-06-01.sty
-2023/03/09 |    1074767 | macros/latex-dev/base/doc-code.pdf
-2023/03/09 |         96 | macros/latex-dev/base/doc-code.tex
-2023/03/09 |     242468 | macros/latex-dev/base/doc.dtx
-2023/03/09 |     755242 | macros/latex-dev/base/doc.pdf
-2023/03/09 |     170595 | macros/latex-dev/base/docstrip.dtx
-2023/03/09 |       4273 | macros/latex-dev/base/docstrip.ins
-2023/03/09 |     504361 | macros/latex-dev/base/docstrip.pdf
-2023/03/09 |       4390 | macros/latex-dev/base/ec.ins
-2023/03/09 |    1318139 | macros/latex-dev/base/encguide.pdf
-2023/03/09 |      52813 | macros/latex-dev/base/encguide.tex
-2023/03/09 |       7216 | macros/latex-dev/base/exscale.dtx
-2023/03/09 |       3338 | macros/latex-dev/base/exscale.ins
-2023/03/09 |     204709 | macros/latex-dev/base/exscale.pdf
-2023/03/09 |      23516 | macros/latex-dev/base/fix-cm.dtx
-2023/03/09 |       2892 | macros/latex-dev/base/fix-cm.ins
-2023/03/09 |     287724 | macros/latex-dev/base/fix-cm.pdf
-2023/03/09 |     517890 | macros/latex-dev/base/fntguide.pdf
-2023/03/09 |     108234 | macros/latex-dev/base/fntguide.tex
-2023/03/09 |      60321 | macros/latex-dev/base/fontdef.dtx
-2023/03/09 |       9779 | macros/latex-dev/base/format.ins
-2023/03/09 |       5509 | macros/latex-dev/base/graphpap.dtx
-2023/03/09 |       2892 | macros/latex-dev/base/graphpap.ins
-2023/03/09 |     161725 | macros/latex-dev/base/graphpap.pdf
-2023/03/09 |       2705 | macros/latex-dev/base/idx.tex
-2023/03/09 |      18753 | macros/latex-dev/base/ifthen.dtx
-2023/03/09 |       2888 | macros/latex-dev/base/ifthen.ins
-2023/03/09 |     221226 | macros/latex-dev/base/ifthen.pdf
-2023/03/09 |     106904 | macros/latex-dev/base/inputenc.dtx
-2023/03/09 |       5714 | macros/latex-dev/base/inputenc.ins
-2023/03/09 |     318166 | macros/latex-dev/base/inputenc.pdf
-2023/03/09 |       4079 | macros/latex-dev/base/lablst.tex
-2023/03/09 |      13759 | macros/latex-dev/base/lamport-manual.err
-2023/03/09 |     170874 | macros/latex-dev/base/lamport-manual.pdf
-2023/03/09 |      38730 | macros/latex-dev/base/latex209.dtx
-2023/03/09 |       4219 | macros/latex-dev/base/latex209.ins
-2023/03/09 |      45347 | macros/latex-dev/base/latexrelease.dtx
-2023/03/09 |       6047 | macros/latex-dev/base/latexrelease.ins
-2023/03/09 |     282105 | macros/latex-dev/base/latexrelease.pdf
-2023/03/09 |       6709 | macros/latex-dev/base/latexsym.dtx
-2023/03/09 |       5041 | macros/latex-dev/base/latexsym.ins
-2023/03/09 |     200762 | macros/latex-dev/base/latexsym.pdf
-2023/03/09 |      52887 | macros/latex-dev/base/lb2.err
-2023/03/09 |     252313 | macros/latex-dev/base/lb2.pdf
-2023/03/09 |       1279 | macros/latex-dev/base/legal.txt
-2023/03/09 |      63280 | macros/latex-dev/base/letter.dtx
-2023/03/09 |       3372 | macros/latex-dev/base/letter.ins
-2023/03/09 |     337493 | macros/latex-dev/base/letter.pdf
-2023/03/09 |      21229 | macros/latex-dev/base/lgc2.err
-2023/03/09 |     217560 | macros/latex-dev/base/lgc2.pdf
-2023/03/09 |       9068 | macros/latex-dev/base/lppl-1-0.txt
-2023/03/09 |      14341 | macros/latex-dev/base/lppl-1-1.txt
-2023/03/09 |      14421 | macros/latex-dev/base/lppl-1-2.txt
-2023/03/09 |     132384 | macros/latex-dev/base/lppl.pdf
-2023/03/09 |      23386 | macros/latex-dev/base/lppl.tex
-2023/03/09 |      19040 | macros/latex-dev/base/lppl.txt
-2023/03/09 |       4298 | macros/latex-dev/base/ltalloc.dtx
-2023/03/09 |      17389 | macros/latex-dev/base/ltbibl.dtx
-2023/03/09 |      45712 | macros/latex-dev/base/ltboxes.dtx
-2023/03/09 |     144369 | macros/latex-dev/base/ltclass.dtx
-2023/03/09 |     183578 | macros/latex-dev/base/ltcmd.dtx
-2023/03/09 |     719205 | macros/latex-dev/base/ltcmdhooks-code.pdf
-2023/03/09 |        103 | macros/latex-dev/base/ltcmdhooks-code.tex
-2023/03/09 |     478517 | macros/latex-dev/base/ltcmdhooks-doc.pdf
-2023/03/09 |        238 | macros/latex-dev/base/ltcmdhooks-doc.tex
-2023/03/09 |      53025 | macros/latex-dev/base/ltcmdhooks.dtx
-2023/03/09 |       9557 | macros/latex-dev/base/ltcntrl.dtx
-2023/03/09 |      24286 | macros/latex-dev/base/ltcounts.dtx
-2023/03/09 |      92954 | macros/latex-dev/base/ltdefns.dtx
-2023/03/09 |      35984 | macros/latex-dev/base/ltdirchk.dtx
-2023/03/09 |      27069 | macros/latex-dev/base/lterror.dtx
-2023/03/09 |      18711 | macros/latex-dev/base/ltexpl.dtx
-2023/03/09 |     803151 | macros/latex-dev/base/ltfilehook-code.pdf
-2023/03/09 |        105 | macros/latex-dev/base/ltfilehook-code.tex
-2023/03/09 |     547988 | macros/latex-dev/base/ltfilehook-doc.pdf
-2023/03/09 |        241 | macros/latex-dev/base/ltfilehook-doc.tex
-2023/03/09 |      67351 | macros/latex-dev/base/ltfilehook.dtx
-2023/03/09 |      59322 | macros/latex-dev/base/ltfiles.dtx
-2023/03/09 |      50069 | macros/latex-dev/base/ltfinal.dtx
-2023/03/09 |      55687 | macros/latex-dev/base/ltfloat.dtx
-2023/03/09 |      29267 | macros/latex-dev/base/ltfntcmd.dtx
-2023/03/09 |      58551 | macros/latex-dev/base/ltfssaxes.dtx
-2023/03/09 |      82481 | macros/latex-dev/base/ltfssbas.dtx
-2023/03/09 |      10370 | macros/latex-dev/base/ltfsscmp.dtx
-2023/03/09 |      75111 | macros/latex-dev/base/ltfssdcl.dtx
-2023/03/09 |      84215 | macros/latex-dev/base/ltfssini.dtx
-2023/03/09 |      72475 | macros/latex-dev/base/ltfsstrc.dtx
-2023/03/09 |    1091279 | macros/latex-dev/base/lthooks-code.pdf
-2023/03/09 |        102 | macros/latex-dev/base/lthooks-code.tex
-2023/03/09 |     701283 | macros/latex-dev/base/lthooks-doc.pdf
-2023/03/09 |        238 | macros/latex-dev/base/lthooks-doc.tex
-2023/03/09 |     211770 | macros/latex-dev/base/lthooks.dtx
-2023/03/09 |       4945 | macros/latex-dev/base/lthyphen.dtx
-2023/03/09 |       5859 | macros/latex-dev/base/ltidxglo.dtx
-2023/03/09 |      19853 | macros/latex-dev/base/ltkeys.dtx
-2023/03/09 |       4757 | macros/latex-dev/base/ltlength.dtx
-2023/03/09 |      36152 | macros/latex-dev/base/ltlists.dtx
-2023/03/09 |       3725 | macros/latex-dev/base/ltlogos.dtx
-2023/03/09 |      74921 | macros/latex-dev/base/ltluatex.dtx
-2023/03/09 |     325056 | macros/latex-dev/base/ltluatex.pdf
-2023/03/09 |     715474 | macros/latex-dev/base/ltmarks-code.pdf
-2023/03/09 |        102 | macros/latex-dev/base/ltmarks-code.tex
-2023/03/09 |     585862 | macros/latex-dev/base/ltmarks-doc.pdf
-2023/03/09 |        238 | macros/latex-dev/base/ltmarks-doc.tex
-2023/03/09 |      63132 | macros/latex-dev/base/ltmarks.dtx
-2023/03/09 |      41493 | macros/latex-dev/base/ltmath.dtx
-2023/03/09 |       6213 | macros/latex-dev/base/ltmeta.dtx
-2023/03/09 |      59070 | macros/latex-dev/base/ltmiscen.dtx
-2023/03/09 |     161534 | macros/latex-dev/base/ltnews01.pdf
-2023/03/09 |       5246 | macros/latex-dev/base/ltnews01.tex
-2023/03/09 |     159811 | macros/latex-dev/base/ltnews02.pdf
-2023/03/09 |       5462 | macros/latex-dev/base/ltnews02.tex
-2023/03/09 |     159349 | macros/latex-dev/base/ltnews03.pdf
-2023/03/09 |       5369 | macros/latex-dev/base/ltnews03.tex
-2023/03/09 |     152545 | macros/latex-dev/base/ltnews04.pdf
-2023/03/09 |       5678 | macros/latex-dev/base/ltnews04.tex
-2023/03/09 |     174686 | macros/latex-dev/base/ltnews05.pdf
-2023/03/09 |       5699 | macros/latex-dev/base/ltnews05.tex
-2023/03/09 |     142870 | macros/latex-dev/base/ltnews06.pdf
-2023/03/09 |       5544 | macros/latex-dev/base/ltnews06.tex
-2023/03/09 |     138211 | macros/latex-dev/base/ltnews07.pdf
-2023/03/09 |       5576 | macros/latex-dev/base/ltnews07.tex
-2023/03/09 |     155426 | macros/latex-dev/base/ltnews08.pdf
-2023/03/09 |       5732 | macros/latex-dev/base/ltnews08.tex
-2023/03/09 |     129989 | macros/latex-dev/base/ltnews09.pdf
-2023/03/09 |       5451 | macros/latex-dev/base/ltnews09.tex
-2023/03/09 |     169414 | macros/latex-dev/base/ltnews10.pdf
-2023/03/09 |       5825 | macros/latex-dev/base/ltnews10.tex
-2023/03/09 |     112191 | macros/latex-dev/base/ltnews11.pdf
-2023/03/09 |       5529 | macros/latex-dev/base/ltnews11.tex
-2023/03/09 |     156746 | macros/latex-dev/base/ltnews12.pdf
-2023/03/09 |       5574 | macros/latex-dev/base/ltnews12.tex
-2023/03/09 |     182464 | macros/latex-dev/base/ltnews13.pdf
-2023/03/09 |       7029 | macros/latex-dev/base/ltnews13.tex
-2023/03/09 |     170716 | macros/latex-dev/base/ltnews14.pdf
-2023/03/09 |       6424 | macros/latex-dev/base/ltnews14.tex
-2023/03/09 |     130323 | macros/latex-dev/base/ltnews15.pdf
-2023/03/09 |       5986 | macros/latex-dev/base/ltnews15.tex
-2023/03/09 |     138090 | macros/latex-dev/base/ltnews16.pdf
-2023/03/09 |       5775 | macros/latex-dev/base/ltnews16.tex
-2023/03/09 |     166247 | macros/latex-dev/base/ltnews17.pdf
-2023/03/09 |       8970 | macros/latex-dev/base/ltnews17.tex
-2023/03/09 |      38320 | macros/latex-dev/base/ltnews18.pdf
-2023/03/09 |       1341 | macros/latex-dev/base/ltnews18.tex
-2023/03/09 |     230181 | macros/latex-dev/base/ltnews19.pdf
-2023/03/09 |       4190 | macros/latex-dev/base/ltnews19.tex
-2023/03/09 |     318566 | macros/latex-dev/base/ltnews20.pdf
-2023/03/09 |       7241 | macros/latex-dev/base/ltnews20.tex
-2023/03/09 |     244870 | macros/latex-dev/base/ltnews21.pdf
-2023/03/09 |       9926 | macros/latex-dev/base/ltnews21.tex
-2023/03/09 |     317779 | macros/latex-dev/base/ltnews22.pdf
-2023/03/09 |      10792 | macros/latex-dev/base/ltnews22.tex
-2023/03/09 |     286600 | macros/latex-dev/base/ltnews23.pdf
-2023/03/09 |      10791 | macros/latex-dev/base/ltnews23.tex
-2023/03/09 |     265292 | macros/latex-dev/base/ltnews24.pdf
-2023/03/09 |      12334 | macros/latex-dev/base/ltnews24.tex
-2023/03/09 |     204948 | macros/latex-dev/base/ltnews25.pdf
-2023/03/09 |       5588 | macros/latex-dev/base/ltnews25.tex
-2023/03/09 |     379472 | macros/latex-dev/base/ltnews26.pdf
-2023/03/09 |      10798 | macros/latex-dev/base/ltnews26.tex
-2023/03/09 |     251083 | macros/latex-dev/base/ltnews27.pdf
-2023/03/09 |       5691 | macros/latex-dev/base/ltnews27.tex
-2023/03/09 |     376652 | macros/latex-dev/base/ltnews28.pdf
-2023/03/09 |      15047 | macros/latex-dev/base/ltnews28.tex
-2023/03/09 |     455116 | macros/latex-dev/base/ltnews29.pdf
-2023/03/09 |      18944 | macros/latex-dev/base/ltnews29.tex
-2023/03/09 |     511895 | macros/latex-dev/base/ltnews30.pdf
-2023/03/09 |      23637 | macros/latex-dev/base/ltnews30.tex
-2023/03/09 |     526332 | macros/latex-dev/base/ltnews31.pdf
-2023/03/09 |      30448 | macros/latex-dev/base/ltnews31.tex
-2023/03/09 |     546186 | macros/latex-dev/base/ltnews32.pdf
-2023/03/09 |      33239 | macros/latex-dev/base/ltnews32.tex
-2023/03/09 |     522416 | macros/latex-dev/base/ltnews33.pdf
-2023/03/09 |      33907 | macros/latex-dev/base/ltnews33.tex
-2023/03/09 |     508052 | macros/latex-dev/base/ltnews34.pdf
-2023/03/09 |      32327 | macros/latex-dev/base/ltnews34.tex
-2023/03/09 |     563098 | macros/latex-dev/base/ltnews35.pdf
-2023/03/09 |      38793 | macros/latex-dev/base/ltnews35.tex
-2023/03/09 |     517571 | macros/latex-dev/base/ltnews36.pdf
-2023/03/09 |      19329 | macros/latex-dev/base/ltnews36.tex
-2023/03/09 |     456714 | macros/latex-dev/base/ltnews37.pdf
-2023/03/09 |      18056 | macros/latex-dev/base/ltnews37.tex
-2023/03/09 |      21284 | macros/latex-dev/base/ltnews.cls
-2023/03/09 |    1265382 | macros/latex-dev/base/ltnews.pdf
-2023/03/09 |       8051 | macros/latex-dev/base/ltnews.tex
-2023/03/09 |     148294 | macros/latex-dev/base/ltoutenc.dtx
-2023/03/09 |       3367 | macros/latex-dev/base/ltoutenc.ins
-2023/03/09 |     178723 | macros/latex-dev/base/ltoutput.dtx
-2023/03/09 |      14091 | macros/latex-dev/base/ltpage.dtx
-2023/03/09 |       2728 | macros/latex-dev/base/ltpageno.dtx
-2023/03/09 |     671573 | macros/latex-dev/base/ltpara-code.pdf
-2023/03/09 |         99 | macros/latex-dev/base/ltpara-code.tex
-2023/03/09 |     559554 | macros/latex-dev/base/ltpara-doc.pdf
-2023/03/09 |        234 | macros/latex-dev/base/ltpara-doc.tex
-2023/03/09 |      54672 | macros/latex-dev/base/ltpara.dtx
-2023/03/09 |       6155 | macros/latex-dev/base/ltpar.dtx
-2023/03/09 |      69002 | macros/latex-dev/base/ltpictur.dtx
-2023/03/09 |      59499 | macros/latex-dev/base/ltplain.dtx
-2023/03/09 |      33946 | macros/latex-dev/base/ltsect.dtx
-2023/03/09 |     821006 | macros/latex-dev/base/ltshipout-code.pdf
-2023/03/09 |        104 | macros/latex-dev/base/ltshipout-code.tex
-2023/03/09 |     566006 | macros/latex-dev/base/ltshipout-doc.pdf
-2023/03/09 |        240 | macros/latex-dev/base/ltshipout-doc.tex
-2023/03/09 |      81202 | macros/latex-dev/base/ltshipout.dtx
-2023/03/09 |      45754 | macros/latex-dev/base/ltspace.dtx
-2023/03/09 |      47896 | macros/latex-dev/base/lttab.dtx
-2023/03/09 |      90660 | macros/latex-dev/base/lttextcomp.dtx
-2023/03/09 |       8731 | macros/latex-dev/base/ltthm.dtx
-2023/03/09 |      15384 | macros/latex-dev/base/ltvers.dtx
-2023/03/09 |     219354 | macros/latex-dev/base/ltx3info.pdf
-2023/03/09 |      18299 | macros/latex-dev/base/ltx3info.tex
-2023/03/09 |      27122 | macros/latex-dev/base/ltxcheck.tex
-2023/03/09 |      22665 | macros/latex-dev/base/ltxdoc.dtx
-2023/03/09 |     243283 | macros/latex-dev/base/ltxdoc.pdf
-2023/03/09 |       7524 | macros/latex-dev/base/ltxguide.cls
-2023/03/09 |      18363 | macros/latex-dev/base/ltxref.dtx
-2023/03/09 |      10601 | macros/latex-dev/base/makeindx.dtx
-2023/03/09 |       3434 | macros/latex-dev/base/makeindx.ins
-2023/03/09 |     165817 | macros/latex-dev/base/makeindx.pdf
-2023/03/09 |      11124 | macros/latex-dev/base/manifest.txt
-2023/03/09 |       1937 | macros/latex-dev/base/minimal.cls
-2023/03/09 |     257827 | macros/latex-dev/base/modguide.pdf
-2023/03/09 |      16500 | macros/latex-dev/base/modguide.tex
-2023/03/09 |       4254 | macros/latex-dev/base/newdc.ins
-2023/03/09 |       6357 | macros/latex-dev/base/newlfont.dtx
-2023/03/09 |      18399 | macros/latex-dev/base/nfssfont.dtx
-2023/03/09 |       2893 | macros/latex-dev/base/nfssfont.ins
-2023/03/09 |     211180 | macros/latex-dev/base/nfssfont.pdf
-2023/03/09 |       3960 | macros/latex-dev/base/olddc.ins
-2023/03/09 |       8626 | macros/latex-dev/base/oldlfont.dtx
-2023/03/09 |       9345 | macros/latex-dev/base/preload.dtx
-2023/03/09 |      13589 | macros/latex-dev/base/proc.dtx
-2023/03/09 |       3401 | macros/latex-dev/base/proc.ins
-2023/03/09 |     227056 | macros/latex-dev/base/proc.pdf
-2023/03/09 |       3100 | macros/latex-dev/base/README.md
-2023/03/09 |       7200 | macros/latex-dev/base/sample2e.tex
-2023/03/09 |      89727 | macros/latex-dev/base/slides.dtx
-2023/03/09 |       6760 | macros/latex-dev/base/slides.ins
-2023/03/09 |     375514 | macros/latex-dev/base/slides.pdf
-2023/03/09 |      15699 | macros/latex-dev/base/slifonts.fdd
-2023/03/09 |     234188 | macros/latex-dev/base/slifonts.pdf
-2023/03/09 |       1694 | macros/latex-dev/base/small2e.tex
-2023/03/09 |       9401 | macros/latex-dev/base/source2edoc.cls
-2023/03/09 |    5797424 | macros/latex-dev/base/source2e.pdf
-2023/03/09 |      15306 | macros/latex-dev/base/source2e.tex
-2023/03/09 |       9395 | macros/latex-dev/base/syntonly.dtx
-2023/03/09 |       2896 | macros/latex-dev/base/syntonly.ins
-2023/03/09 |     189552 | macros/latex-dev/base/syntonly.pdf
-2023/03/09 |      12520 | macros/latex-dev/base/testpage.tex
-2023/03/09 |     173013 | macros/latex-dev/base/tlc2.err
-2023/03/09 |     291015 | macros/latex-dev/base/tlc2.pdf
-2023/03/09 |      12242 | macros/latex-dev/base/tulm.fdd
-2023/03/09 |       3781 | macros/latex-dev/base/tulm.ins
-2023/03/09 |     162766 | macros/latex-dev/base/tulm.pdf
-2023/03/09 |       3181 | macros/latex-dev/base/unpack.ins
-2023/03/09 |     438570 | macros/latex-dev/base/usrguide-historic.pdf
-2023/03/09 |      68735 | macros/latex-dev/base/usrguide-historic.tex
-2023/03/09 |     474841 | macros/latex-dev/base/usrguide.pdf
-2023/03/09 |      51008 | macros/latex-dev/base/usrguide.tex
-2023/03/09 |      92280 | macros/latex-dev/base/utf8ienc.dtx
-2023/03/09 |     353281 | macros/latex-dev/base/utf8ienc.pdf
-2023/03/09 |      10251 | macros/latex-dev/base/webcomp.err
-2023/03/09 |     146195 | macros/latex-dev/base/webcomp.pdf
-2023/03/09 |   38990293 | macros/latex-dev/base.zip
-2022/10/31 |       8663 | macros/latex-dev/required/amsmath/amsbsy.dtx
-2022/10/31 |       1505 | macros/latex-dev/required/amsmath/amsbsy.ins
-2022/10/31 |     174944 | macros/latex-dev/required/amsmath/amsbsy.pdf
-2022/10/31 |      11284 | macros/latex-dev/required/amsmath/amscd.dtx
-2022/10/31 |       1487 | macros/latex-dev/required/amsmath/amscd.ins
-2022/10/31 |     179945 | macros/latex-dev/required/amsmath/amscd.pdf
-2022/10/31 |       5323 | macros/latex-dev/required/amsmath/ams-external.txt
-2022/10/31 |      13442 | macros/latex-dev/required/amsmath/amsgen.dtx
-2022/10/31 |       1484 | macros/latex-dev/required/amsmath/amsgen.ins
-2022/10/31 |     178187 | macros/latex-dev/required/amsmath/amsgen.pdf
-2022/10/31 |       5860 | macros/latex-dev/required/amsmath/ams-internal.txt
-2022/10/31 |     508210 | macros/latex-dev/required/amsmath/amsldoc.pdf
-2022/10/31 |     104792 | macros/latex-dev/required/amsmath/amsldoc.tex
-2022/10/31 |      85099 | macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty
-2022/10/31 |     230317 | macros/latex-dev/required/amsmath/amsmath.dtx
-2022/10/31 |       1504 | macros/latex-dev/required/amsmath/amsmath.ins
-2022/10/31 |     419913 | macros/latex-dev/required/amsmath/amsmath.pdf
-2022/10/31 |      10199 | macros/latex-dev/required/amsmath/amsopn.dtx
-2022/10/31 |       1490 | macros/latex-dev/required/amsmath/amsopn.ins
-2022/10/31 |     140095 | macros/latex-dev/required/amsmath/amsopn.pdf
-2022/10/31 |      69732 | macros/latex-dev/required/amsmath/amstex.sty
-2022/10/31 |      11398 | macros/latex-dev/required/amsmath/amstext.dtx
-2022/10/31 |       1492 | macros/latex-dev/required/amsmath/amstext.ins
-2022/10/31 |     217498 | macros/latex-dev/required/amsmath/amstext.pdf
-2022/10/31 |       4336 | macros/latex-dev/required/amsmath/amsxtra.dtx
-2022/10/31 |       1492 | macros/latex-dev/required/amsmath/amsxtra.ins
-2022/10/31 |     113561 | macros/latex-dev/required/amsmath/amsxtra.pdf
-2022/10/31 |       8046 | macros/latex-dev/required/amsmath/changes.txt
-2022/10/31 |      22605 | macros/latex-dev/required/amsmath/diffs-m.txt
-2022/10/31 |        369 | macros/latex-dev/required/amsmath/manifest.txt
-2022/10/31 |       2723 | macros/latex-dev/required/amsmath/README.md
-2022/10/31 |     109731 | macros/latex-dev/required/amsmath/subeqn.pdf
-2022/10/31 |       6440 | macros/latex-dev/required/amsmath/subeqn.tex
-2022/10/31 |     147462 | macros/latex-dev/required/amsmath/technote.pdf
-2022/10/31 |      12005 | macros/latex-dev/required/amsmath/technote.tex
-2022/10/31 |     454511 | macros/latex-dev/required/amsmath/testmath.pdf
-2022/10/31 |      82371 | macros/latex-dev/required/amsmath/testmath.tex
-2022/11/02 |    2762700 | macros/latex-dev/required/amsmath.zip
-2022/12/03 |       4607 | macros/latex-dev/required/firstaid/changes.txt
-2022/12/03 |       2740 | macros/latex-dev/required/firstaid/firstaid.ins
-2022/12/03 |      23583 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
-2022/12/03 |     271476 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
-2022/12/03 |        474 | macros/latex-dev/required/firstaid/README.md
-2022/12/03 |     272901 | macros/latex-dev/required/firstaid.zip
+2023/05/25 |       7104 | macros/latex-dev/base/alltt.dtx
+2023/05/25 |       2890 | macros/latex-dev/base/alltt.ins
+2023/05/25 |     223829 | macros/latex-dev/base/alltt.pdf
+2023/05/25 |       3282 | macros/latex-dev/base/bugs.txt
+2023/05/25 |     264161 | macros/latex-dev/base/cfgguide.pdf
+2023/05/25 |      22723 | macros/latex-dev/base/cfgguide.tex
+2023/05/25 |      42708 | macros/latex-dev/base/changes.old.txt
+2023/05/25 |     399778 | macros/latex-dev/base/changes.txt
+2023/05/25 |     156238 | macros/latex-dev/base/classes.dtx
+2023/05/25 |       4087 | macros/latex-dev/base/classes.ins
+2023/05/25 |     560972 | macros/latex-dev/base/classes.pdf
+2023/05/25 |     415568 | macros/latex-dev/base/clsguide-historic.pdf
+2023/05/25 |      69439 | macros/latex-dev/base/clsguide-historic.tex
+2023/05/25 |     451991 | macros/latex-dev/base/clsguide.pdf
+2023/05/25 |      56472 | macros/latex-dev/base/clsguide.tex
+2023/05/25 |       5273 | macros/latex-dev/base/cmextra.ins
+2023/05/25 |      44531 | macros/latex-dev/base/cmfonts.fdd
+2023/05/25 |       4324 | macros/latex-dev/base/cmfonts.ins
+2023/05/25 |     292590 | macros/latex-dev/base/cmfonts.pdf
+2023/05/25 |     257355 | macros/latex-dev/base/cyrguide.pdf
+2023/05/25 |      17782 | macros/latex-dev/base/cyrguide.tex
+2023/05/25 |      29965 | macros/latex-dev/base/doc-2016-02-15.sty
+2023/05/25 |      30499 | macros/latex-dev/base/doc-2021-06-01.sty
+2023/05/25 |    1075457 | macros/latex-dev/base/doc-code.pdf
+2023/05/25 |         96 | macros/latex-dev/base/doc-code.tex
+2023/05/25 |     242471 | macros/latex-dev/base/doc.dtx
+2023/05/25 |     755883 | macros/latex-dev/base/doc.pdf
+2023/05/25 |     170595 | macros/latex-dev/base/docstrip.dtx
+2023/05/25 |       4273 | macros/latex-dev/base/docstrip.ins
+2023/05/25 |     504397 | macros/latex-dev/base/docstrip.pdf
+2023/05/25 |       4390 | macros/latex-dev/base/ec.ins
+2023/05/25 |    1318562 | macros/latex-dev/base/encguide.pdf
+2023/05/25 |      52813 | macros/latex-dev/base/encguide.tex
+2023/05/25 |       7216 | macros/latex-dev/base/exscale.dtx
+2023/05/25 |       3338 | macros/latex-dev/base/exscale.ins
+2023/05/25 |     204709 | macros/latex-dev/base/exscale.pdf
+2023/05/25 |      23516 | macros/latex-dev/base/fix-cm.dtx
+2023/05/25 |       2892 | macros/latex-dev/base/fix-cm.ins
+2023/05/25 |     287724 | macros/latex-dev/base/fix-cm.pdf
+2023/05/25 |     517677 | macros/latex-dev/base/fntguide.pdf
+2023/05/25 |     108223 | macros/latex-dev/base/fntguide.tex
+2023/05/25 |      60321 | macros/latex-dev/base/fontdef.dtx
+2023/05/25 |       9779 | macros/latex-dev/base/format.ins
+2023/05/25 |       5509 | macros/latex-dev/base/graphpap.dtx
+2023/05/25 |       2892 | macros/latex-dev/base/graphpap.ins
+2023/05/25 |     161725 | macros/latex-dev/base/graphpap.pdf
+2023/05/25 |       2705 | macros/latex-dev/base/idx.tex
+2023/05/25 |      18753 | macros/latex-dev/base/ifthen.dtx
+2023/05/25 |       2888 | macros/latex-dev/base/ifthen.ins
+2023/05/25 |     221226 | macros/latex-dev/base/ifthen.pdf
+2023/05/25 |     106904 | macros/latex-dev/base/inputenc.dtx
+2023/05/25 |       5714 | macros/latex-dev/base/inputenc.ins
+2023/05/25 |     318166 | macros/latex-dev/base/inputenc.pdf
+2023/05/25 |       4079 | macros/latex-dev/base/lablst.tex
+2023/05/25 |      13759 | macros/latex-dev/base/lamport-manual.err
+2023/05/25 |     170874 | macros/latex-dev/base/lamport-manual.pdf
+2023/05/25 |      38730 | macros/latex-dev/base/latex209.dtx
+2023/05/25 |       4219 | macros/latex-dev/base/latex209.ins
+2023/05/25 |      45347 | macros/latex-dev/base/latexrelease.dtx
+2023/05/25 |       6047 | macros/latex-dev/base/latexrelease.ins
+2023/05/25 |     282105 | macros/latex-dev/base/latexrelease.pdf
+2023/05/25 |       6709 | macros/latex-dev/base/latexsym.dtx
+2023/05/25 |       5041 | macros/latex-dev/base/latexsym.ins
+2023/05/25 |     200762 | macros/latex-dev/base/latexsym.pdf
+2023/05/25 |      52887 | macros/latex-dev/base/lb2.err
+2023/05/25 |     252510 | macros/latex-dev/base/lb2.pdf
+2023/05/25 |       1279 | macros/latex-dev/base/legal.txt
+2023/05/25 |      63280 | macros/latex-dev/base/letter.dtx
+2023/05/25 |       3372 | macros/latex-dev/base/letter.ins
+2023/05/25 |     337766 | macros/latex-dev/base/letter.pdf
+2023/05/25 |      21229 | macros/latex-dev/base/lgc2.err
+2023/05/25 |     217757 | macros/latex-dev/base/lgc2.pdf
+2023/05/25 |       9068 | macros/latex-dev/base/lppl-1-0.txt
+2023/05/25 |      14341 | macros/latex-dev/base/lppl-1-1.txt
+2023/05/25 |      14421 | macros/latex-dev/base/lppl-1-2.txt
+2023/05/25 |     132384 | macros/latex-dev/base/lppl.pdf
+2023/05/25 |      23386 | macros/latex-dev/base/lppl.tex
+2023/05/25 |      19040 | macros/latex-dev/base/lppl.txt
+2023/05/25 |       4298 | macros/latex-dev/base/ltalloc.dtx
+2023/05/25 |      17389 | macros/latex-dev/base/ltbibl.dtx
+2023/05/25 |      45712 | macros/latex-dev/base/ltboxes.dtx
+2023/05/25 |     145334 | macros/latex-dev/base/ltclass.dtx
+2023/05/25 |     187430 | macros/latex-dev/base/ltcmd.dtx
+2023/05/25 |     755337 | macros/latex-dev/base/ltcmdhooks-code.pdf
+2023/05/25 |        103 | macros/latex-dev/base/ltcmdhooks-code.tex
+2023/05/25 |     498869 | macros/latex-dev/base/ltcmdhooks-doc.pdf
+2023/05/25 |        238 | macros/latex-dev/base/ltcmdhooks-doc.tex
+2023/05/25 |      67588 | macros/latex-dev/base/ltcmdhooks.dtx
+2023/05/25 |       9557 | macros/latex-dev/base/ltcntrl.dtx
+2023/05/25 |      24286 | macros/latex-dev/base/ltcounts.dtx
+2023/05/25 |      92954 | macros/latex-dev/base/ltdefns.dtx
+2023/05/25 |      35984 | macros/latex-dev/base/ltdirchk.dtx
+2023/05/25 |      27069 | macros/latex-dev/base/lterror.dtx
+2023/05/25 |      18711 | macros/latex-dev/base/ltexpl.dtx
+2023/05/25 |     803843 | macros/latex-dev/base/ltfilehook-code.pdf
+2023/05/25 |        105 | macros/latex-dev/base/ltfilehook-code.tex
+2023/05/25 |     548468 | macros/latex-dev/base/ltfilehook-doc.pdf
+2023/05/25 |        241 | macros/latex-dev/base/ltfilehook-doc.tex
+2023/05/25 |      67457 | macros/latex-dev/base/ltfilehook.dtx
+2023/05/25 |      60944 | macros/latex-dev/base/ltfiles.dtx
+2023/05/25 |      51078 | macros/latex-dev/base/ltfinal.dtx
+2023/05/25 |      55687 | macros/latex-dev/base/ltfloat.dtx
+2023/05/25 |      29267 | macros/latex-dev/base/ltfntcmd.dtx
+2023/05/25 |      58551 | macros/latex-dev/base/ltfssaxes.dtx
+2023/05/25 |      82916 | macros/latex-dev/base/ltfssbas.dtx
+2023/05/25 |      10370 | macros/latex-dev/base/ltfsscmp.dtx
+2023/05/25 |      75111 | macros/latex-dev/base/ltfssdcl.dtx
+2023/05/25 |      84215 | macros/latex-dev/base/ltfssini.dtx
+2023/05/25 |      72475 | macros/latex-dev/base/ltfsstrc.dtx
+2023/05/25 |    1242206 | macros/latex-dev/base/lthooks-code.pdf
+2023/05/25 |        102 | macros/latex-dev/base/lthooks-code.tex
+2023/05/25 |     739995 | macros/latex-dev/base/lthooks-doc.pdf
+2023/05/25 |        238 | macros/latex-dev/base/lthooks-doc.tex
+2023/05/25 |     299713 | macros/latex-dev/base/lthooks.dtx
+2023/05/25 |       4945 | macros/latex-dev/base/lthyphen.dtx
+2023/05/25 |       5859 | macros/latex-dev/base/ltidxglo.dtx
+2023/05/25 |      19853 | macros/latex-dev/base/ltkeys.dtx
+2023/05/25 |       4757 | macros/latex-dev/base/ltlength.dtx
+2023/05/25 |      36154 | macros/latex-dev/base/ltlists.dtx
+2023/05/25 |       3725 | macros/latex-dev/base/ltlogos.dtx
+2023/05/25 |      74921 | macros/latex-dev/base/ltluatex.dtx
+2023/05/25 |     325056 | macros/latex-dev/base/ltluatex.pdf
+2023/05/25 |     716217 | macros/latex-dev/base/ltmarks-code.pdf
+2023/05/25 |        102 | macros/latex-dev/base/ltmarks-code.tex
+2023/05/25 |     586545 | macros/latex-dev/base/ltmarks-doc.pdf
+2023/05/25 |        238 | macros/latex-dev/base/ltmarks-doc.tex
+2023/05/25 |      63142 | macros/latex-dev/base/ltmarks.dtx
+2023/05/25 |      42287 | macros/latex-dev/base/ltmath.dtx
+2023/05/25 |       6217 | macros/latex-dev/base/ltmeta.dtx
+2023/05/25 |      59070 | macros/latex-dev/base/ltmiscen.dtx
+2023/05/25 |     161534 | macros/latex-dev/base/ltnews01.pdf
+2023/05/25 |       5246 | macros/latex-dev/base/ltnews01.tex
+2023/05/25 |     159811 | macros/latex-dev/base/ltnews02.pdf
+2023/05/25 |       5462 | macros/latex-dev/base/ltnews02.tex
+2023/05/25 |     159349 | macros/latex-dev/base/ltnews03.pdf
+2023/05/25 |       5369 | macros/latex-dev/base/ltnews03.tex
+2023/05/25 |     152545 | macros/latex-dev/base/ltnews04.pdf
+2023/05/25 |       5678 | macros/latex-dev/base/ltnews04.tex
+2023/05/25 |     174686 | macros/latex-dev/base/ltnews05.pdf
+2023/05/25 |       5699 | macros/latex-dev/base/ltnews05.tex
+2023/05/25 |     142870 | macros/latex-dev/base/ltnews06.pdf
+2023/05/25 |       5544 | macros/latex-dev/base/ltnews06.tex
+2023/05/25 |     138211 | macros/latex-dev/base/ltnews07.pdf
+2023/05/25 |       5576 | macros/latex-dev/base/ltnews07.tex
+2023/05/25 |     155426 | macros/latex-dev/base/ltnews08.pdf
+2023/05/25 |       5732 | macros/latex-dev/base/ltnews08.tex
+2023/05/25 |     129989 | macros/latex-dev/base/ltnews09.pdf
+2023/05/25 |       5451 | macros/latex-dev/base/ltnews09.tex
+2023/05/25 |     169414 | macros/latex-dev/base/ltnews10.pdf
+2023/05/25 |       5825 | macros/latex-dev/base/ltnews10.tex
+2023/05/25 |     112191 | macros/latex-dev/base/ltnews11.pdf
+2023/05/25 |       5529 | macros/latex-dev/base/ltnews11.tex
+2023/05/25 |     156746 | macros/latex-dev/base/ltnews12.pdf
+2023/05/25 |       5574 | macros/latex-dev/base/ltnews12.tex
+2023/05/25 |     182464 | macros/latex-dev/base/ltnews13.pdf
+2023/05/25 |       7029 | macros/latex-dev/base/ltnews13.tex
+2023/05/25 |     170716 | macros/latex-dev/base/ltnews14.pdf
+2023/05/25 |       6424 | macros/latex-dev/base/ltnews14.tex
+2023/05/25 |     130323 | macros/latex-dev/base/ltnews15.pdf
+2023/05/25 |       5986 | macros/latex-dev/base/ltnews15.tex
+2023/05/25 |     138090 | macros/latex-dev/base/ltnews16.pdf
+2023/05/25 |       5775 | macros/latex-dev/base/ltnews16.tex
+2023/05/25 |     166247 | macros/latex-dev/base/ltnews17.pdf
+2023/05/25 |       8970 | macros/latex-dev/base/ltnews17.tex
+2023/05/25 |      38424 | macros/latex-dev/base/ltnews18.pdf
+2023/05/25 |       1341 | macros/latex-dev/base/ltnews18.tex
+2023/05/25 |     230331 | macros/latex-dev/base/ltnews19.pdf
+2023/05/25 |       4190 | macros/latex-dev/base/ltnews19.tex
+2023/05/25 |     318787 | macros/latex-dev/base/ltnews20.pdf
+2023/05/25 |       7244 | macros/latex-dev/base/ltnews20.tex
+2023/05/25 |     245007 | macros/latex-dev/base/ltnews21.pdf
+2023/05/25 |       9935 | macros/latex-dev/base/ltnews21.tex
+2023/05/25 |     318003 | macros/latex-dev/base/ltnews22.pdf
+2023/05/25 |      10792 | macros/latex-dev/base/ltnews22.tex
+2023/05/25 |     286796 | macros/latex-dev/base/ltnews23.pdf
+2023/05/25 |      10791 | macros/latex-dev/base/ltnews23.tex
+2023/05/25 |     265470 | macros/latex-dev/base/ltnews24.pdf
+2023/05/25 |      12334 | macros/latex-dev/base/ltnews24.tex
+2023/05/25 |     205087 | macros/latex-dev/base/ltnews25.pdf
+2023/05/25 |       5588 | macros/latex-dev/base/ltnews25.tex
+2023/05/25 |     379718 | macros/latex-dev/base/ltnews26.pdf
+2023/05/25 |      10798 | macros/latex-dev/base/ltnews26.tex
+2023/05/25 |     251260 | macros/latex-dev/base/ltnews27.pdf
+2023/05/25 |       5691 | macros/latex-dev/base/ltnews27.tex
+2023/05/25 |     376892 | macros/latex-dev/base/ltnews28.pdf
+2023/05/25 |      15047 | macros/latex-dev/base/ltnews28.tex
+2023/05/25 |     455423 | macros/latex-dev/base/ltnews29.pdf
+2023/05/25 |      18944 | macros/latex-dev/base/ltnews29.tex
+2023/05/25 |     512207 | macros/latex-dev/base/ltnews30.pdf
+2023/05/25 |      23646 | macros/latex-dev/base/ltnews30.tex
+2023/05/25 |     526646 | macros/latex-dev/base/ltnews31.pdf
+2023/05/25 |      30452 | macros/latex-dev/base/ltnews31.tex
+2023/05/25 |     546525 | macros/latex-dev/base/ltnews32.pdf
+2023/05/25 |      33243 | macros/latex-dev/base/ltnews32.tex
+2023/05/25 |     522729 | macros/latex-dev/base/ltnews33.pdf
+2023/05/25 |      33911 | macros/latex-dev/base/ltnews33.tex
+2023/05/25 |     508339 | macros/latex-dev/base/ltnews34.pdf
+2023/05/25 |      32331 | macros/latex-dev/base/ltnews34.tex
+2023/05/25 |     563295 | macros/latex-dev/base/ltnews35.pdf
+2023/05/25 |      38226 | macros/latex-dev/base/ltnews35.tex
+2023/05/25 |     517917 | macros/latex-dev/base/ltnews36.pdf
+2023/05/25 |      19333 | macros/latex-dev/base/ltnews36.tex
+2023/05/25 |     500493 | macros/latex-dev/base/ltnews37.pdf
+2023/05/25 |      32833 | macros/latex-dev/base/ltnews37.tex
+2023/05/25 |      21288 | macros/latex-dev/base/ltnews.cls
+2023/05/25 |    1285592 | macros/latex-dev/base/ltnews.pdf
+2023/05/25 |       8051 | macros/latex-dev/base/ltnews.tex
+2023/05/25 |     148294 | macros/latex-dev/base/ltoutenc.dtx
+2023/05/25 |       3367 | macros/latex-dev/base/ltoutenc.ins
+2023/05/25 |     178723 | macros/latex-dev/base/ltoutput.dtx
+2023/05/25 |      14091 | macros/latex-dev/base/ltpage.dtx
+2023/05/25 |       2728 | macros/latex-dev/base/ltpageno.dtx
+2023/05/25 |     672305 | macros/latex-dev/base/ltpara-code.pdf
+2023/05/25 |         99 | macros/latex-dev/base/ltpara-code.tex
+2023/05/25 |     560232 | macros/latex-dev/base/ltpara-doc.pdf
+2023/05/25 |        234 | macros/latex-dev/base/ltpara-doc.tex
+2023/05/25 |      54677 | macros/latex-dev/base/ltpara.dtx
+2023/05/25 |       6155 | macros/latex-dev/base/ltpar.dtx
+2023/05/25 |      69002 | macros/latex-dev/base/ltpictur.dtx
+2023/05/25 |      60154 | macros/latex-dev/base/ltplain.dtx
+2023/05/25 |      33946 | macros/latex-dev/base/ltsect.dtx
+2023/05/25 |     821768 | macros/latex-dev/base/ltshipout-code.pdf
+2023/05/25 |        104 | macros/latex-dev/base/ltshipout-code.tex
+2023/05/25 |     566650 | macros/latex-dev/base/ltshipout-doc.pdf
+2023/05/25 |        240 | macros/latex-dev/base/ltshipout-doc.tex
+2023/05/25 |      81195 | macros/latex-dev/base/ltshipout.dtx
+2023/05/25 |      45855 | macros/latex-dev/base/ltspace.dtx
+2023/05/25 |      47896 | macros/latex-dev/base/lttab.dtx
+2023/05/25 |      90660 | macros/latex-dev/base/lttextcomp.dtx
+2023/05/25 |       8731 | macros/latex-dev/base/ltthm.dtx
+2023/05/25 |      15384 | macros/latex-dev/base/ltvers.dtx
+2023/05/25 |     219354 | macros/latex-dev/base/ltx3info.pdf
+2023/05/25 |      18299 | macros/latex-dev/base/ltx3info.tex
+2023/05/25 |      27122 | macros/latex-dev/base/ltxcheck.tex
+2023/05/25 |      22814 | macros/latex-dev/base/ltxdoc.dtx
+2023/05/25 |     244221 | macros/latex-dev/base/ltxdoc.pdf
+2023/05/25 |       7528 | macros/latex-dev/base/ltxguide.cls
+2023/05/25 |      21882 | macros/latex-dev/base/ltxref.dtx
+2023/05/25 |      10601 | macros/latex-dev/base/makeindx.dtx
+2023/05/25 |       3434 | macros/latex-dev/base/makeindx.ins
+2023/05/25 |     165817 | macros/latex-dev/base/makeindx.pdf
+2023/05/25 |      11412 | macros/latex-dev/base/manifest.txt
+2023/05/25 |       1941 | macros/latex-dev/base/minimal.cls
+2023/05/25 |     257827 | macros/latex-dev/base/modguide.pdf
+2023/05/25 |      16500 | macros/latex-dev/base/modguide.tex
+2023/05/25 |       4254 | macros/latex-dev/base/newdc.ins
+2023/05/25 |       6357 | macros/latex-dev/base/newlfont.dtx
+2023/05/25 |      18399 | macros/latex-dev/base/nfssfont.dtx
+2023/05/25 |       2893 | macros/latex-dev/base/nfssfont.ins
+2023/05/25 |     211180 | macros/latex-dev/base/nfssfont.pdf
+2023/05/25 |       3960 | macros/latex-dev/base/olddc.ins
+2023/05/25 |       8626 | macros/latex-dev/base/oldlfont.dtx
+2023/05/25 |       9345 | macros/latex-dev/base/preload.dtx
+2023/05/25 |      13589 | macros/latex-dev/base/proc.dtx
+2023/05/25 |       3401 | macros/latex-dev/base/proc.ins
+2023/05/25 |     227056 | macros/latex-dev/base/proc.pdf
+2023/05/25 |       3100 | macros/latex-dev/base/README.md
+2023/05/25 |       7200 | macros/latex-dev/base/sample2e.tex
+2023/05/25 |      89727 | macros/latex-dev/base/slides.dtx
+2023/05/25 |       6760 | macros/latex-dev/base/slides.ins
+2023/05/25 |     375514 | macros/latex-dev/base/slides.pdf
+2023/05/25 |      15703 | macros/latex-dev/base/slifonts.fdd
+2023/05/25 |     234188 | macros/latex-dev/base/slifonts.pdf
+2023/05/25 |       1694 | macros/latex-dev/base/small2e.tex
+2023/05/25 |       9401 | macros/latex-dev/base/source2edoc.cls
+2023/05/25 |    6002270 | macros/latex-dev/base/source2e.pdf
+2023/05/25 |      15306 | macros/latex-dev/base/source2e.tex
+2023/05/25 |       9395 | macros/latex-dev/base/syntonly.dtx
+2023/05/25 |       2896 | macros/latex-dev/base/syntonly.ins
+2023/05/25 |     189847 | macros/latex-dev/base/syntonly.pdf
+2023/05/25 |      12520 | macros/latex-dev/base/testpage.tex
+2023/05/25 |     173013 | macros/latex-dev/base/tlc2.err
+2023/05/25 |     291239 | macros/latex-dev/base/tlc2.pdf
+2023/05/25 |      23722 | macros/latex-dev/base/tlc3.err
+2023/05/25 |     249698 | macros/latex-dev/base/tlc3.pdf
+2023/05/25 |      12246 | macros/latex-dev/base/tulm.fdd
+2023/05/25 |       3781 | macros/latex-dev/base/tulm.ins
+2023/05/25 |     162766 | macros/latex-dev/base/tulm.pdf
+2023/05/25 |       3181 | macros/latex-dev/base/unpack.ins
+2023/05/25 |     438586 | macros/latex-dev/base/usrguide-historic.pdf
+2023/05/25 |      68735 | macros/latex-dev/base/usrguide-historic.tex
+2023/05/25 |     479591 | macros/latex-dev/base/usrguide.pdf
+2023/05/25 |      53898 | macros/latex-dev/base/usrguide.tex
+2023/05/25 |      92280 | macros/latex-dev/base/utf8ienc.dtx
+2023/05/25 |     353320 | macros/latex-dev/base/utf8ienc.pdf
+2023/05/25 |      10251 | macros/latex-dev/base/webcomp.err
+2023/05/25 |     146195 | macros/latex-dev/base/webcomp.pdf
+2023/05/25 |   40207661 | macros/latex-dev/base.zip
+2023/05/25 |       8663 | macros/latex-dev/required/amsmath/amsbsy.dtx
+2023/05/25 |       1505 | macros/latex-dev/required/amsmath/amsbsy.ins
+2023/05/25 |     174946 | macros/latex-dev/required/amsmath/amsbsy.pdf
+2023/05/25 |      11284 | macros/latex-dev/required/amsmath/amscd.dtx
+2023/05/25 |       1487 | macros/latex-dev/required/amsmath/amscd.ins
+2023/05/25 |     179953 | macros/latex-dev/required/amsmath/amscd.pdf
+2023/05/25 |       5323 | macros/latex-dev/required/amsmath/ams-external.txt
+2023/05/25 |      13442 | macros/latex-dev/required/amsmath/amsgen.dtx
+2023/05/25 |       1484 | macros/latex-dev/required/amsmath/amsgen.ins
+2023/05/25 |     178185 | macros/latex-dev/required/amsmath/amsgen.pdf
+2023/05/25 |       5860 | macros/latex-dev/required/amsmath/ams-internal.txt
+2023/05/25 |     508225 | macros/latex-dev/required/amsmath/amsldoc.pdf
+2023/05/25 |     104792 | macros/latex-dev/required/amsmath/amsldoc.tex
+2023/05/25 |      85099 | macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty
+2023/05/25 |     230377 | macros/latex-dev/required/amsmath/amsmath.dtx
+2023/05/25 |       1504 | macros/latex-dev/required/amsmath/amsmath.ins
+2023/05/25 |     419994 | macros/latex-dev/required/amsmath/amsmath.pdf
+2023/05/25 |      10199 | macros/latex-dev/required/amsmath/amsopn.dtx
+2023/05/25 |       1490 | macros/latex-dev/required/amsmath/amsopn.ins
+2023/05/25 |     140093 | macros/latex-dev/required/amsmath/amsopn.pdf
+2023/05/25 |      69732 | macros/latex-dev/required/amsmath/amstex.sty
+2023/05/25 |      11398 | macros/latex-dev/required/amsmath/amstext.dtx
+2023/05/25 |       1492 | macros/latex-dev/required/amsmath/amstext.ins
+2023/05/25 |     217497 | macros/latex-dev/required/amsmath/amstext.pdf
+2023/05/25 |       4336 | macros/latex-dev/required/amsmath/amsxtra.dtx
+2023/05/25 |       1492 | macros/latex-dev/required/amsmath/amsxtra.ins
+2023/05/25 |     113557 | macros/latex-dev/required/amsmath/amsxtra.pdf
+2023/05/25 |       8172 | macros/latex-dev/required/amsmath/changes.txt
+2023/05/25 |      22605 | macros/latex-dev/required/amsmath/diffs-m.txt
+2023/05/25 |        369 | macros/latex-dev/required/amsmath/manifest.txt
+2023/05/25 |       2723 | macros/latex-dev/required/amsmath/README.md
+2023/05/25 |     109734 | macros/latex-dev/required/amsmath/subeqn.pdf
+2023/05/25 |       6440 | macros/latex-dev/required/amsmath/subeqn.tex
+2023/05/25 |     147458 | macros/latex-dev/required/amsmath/technote.pdf
+2023/05/25 |      12005 | macros/latex-dev/required/amsmath/technote.tex
+2023/05/25 |     454535 | macros/latex-dev/required/amsmath/testmath.pdf
+2023/05/25 |      82371 | macros/latex-dev/required/amsmath/testmath.tex
+2023/05/25 |    2762922 | macros/latex-dev/required/amsmath.zip
+2023/05/25 |       5081 | macros/latex-dev/required/firstaid/changes.txt
+2023/05/25 |       2740 | macros/latex-dev/required/firstaid/firstaid.ins
+2023/05/25 |      22575 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
+2023/05/25 |     269095 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
+2023/05/25 |        474 | macros/latex-dev/required/firstaid/README.md
+2023/05/25 |     270657 | macros/latex-dev/required/firstaid.zip
 2022/10/31 |      15737 | macros/latex-dev/required/graphics/cat.eps
 2022/10/31 |      35660 | macros/latex-dev/required/graphics/changes.txt
 2022/10/31 |      32194 | macros/latex-dev/required/graphics/color.dtx
@@ -243425,78 +243429,78 @@
 2023/03/09 |     377979 | macros/latex-dev/required/latex-lab/latex-lab-toc-tagging-functions.pdf
 2023/03/09 |       1156 | macros/latex-dev/required/latex-lab/README.md
 2023/03/09 |    8103209 | macros/latex-dev/required/latex-lab.zip
-2022/10/31 |      14072 | macros/latex-dev/required/tools/afterpage.dtx
-2022/10/31 |       2538 | macros/latex-dev/required/tools/afterpage.ins
-2022/10/31 |     197738 | macros/latex-dev/required/tools/afterpage.pdf
-2022/10/31 |      11749 | macros/latex-dev/required/tools/array-2016-10-06.sty
-2022/10/31 |      12559 | macros/latex-dev/required/tools/array-2020-02-10.sty
-2022/10/31 |     128521 | macros/latex-dev/required/tools/array.dtx
-2022/10/31 |     516836 | macros/latex-dev/required/tools/array.pdf
-2022/10/31 |      61565 | macros/latex-dev/required/tools/bm.dtx
-2022/10/31 |       2524 | macros/latex-dev/required/tools/bm.ins
-2022/10/31 |     323432 | macros/latex-dev/required/tools/bm.pdf
-2022/10/31 |      53167 | macros/latex-dev/required/tools/calc.dtx
-2022/10/31 |     370657 | macros/latex-dev/required/tools/calc.pdf
-2022/10/31 |      62462 | macros/latex-dev/required/tools/changes.txt
-2022/10/31 |      12709 | macros/latex-dev/required/tools/dcolumn.dtx
-2022/10/31 |     220834 | macros/latex-dev/required/tools/dcolumn.pdf
-2022/10/31 |       6789 | macros/latex-dev/required/tools/delarray.dtx
-2022/10/31 |     191064 | macros/latex-dev/required/tools/delarray.pdf
-2022/10/31 |      10644 | macros/latex-dev/required/tools/enumerate.dtx
-2022/10/31 |     215498 | macros/latex-dev/required/tools/enumerate.pdf
-2022/10/31 |       4959 | macros/latex-dev/required/tools/fileerr.dtx
-2022/10/31 |     187725 | macros/latex-dev/required/tools/fileerr.pdf
-2022/10/31 |      10771 | macros/latex-dev/required/tools/fontsmpl.dtx
-2022/10/31 |     146446 | macros/latex-dev/required/tools/fontsmpl.pdf
-2022/10/31 |      39696 | macros/latex-dev/required/tools/ftnright.dtx
-2022/10/31 |     387231 | macros/latex-dev/required/tools/ftnright.pdf
-2022/10/31 |      11148 | macros/latex-dev/required/tools/hhline.dtx
-2022/10/31 |     189679 | macros/latex-dev/required/tools/hhline.pdf
-2022/10/31 |       2220 | macros/latex-dev/required/tools/indentfirst.dtx
-2022/10/31 |     157954 | macros/latex-dev/required/tools/indentfirst.pdf
-2022/10/31 |      32029 | macros/latex-dev/required/tools/layout.dtx
-2022/10/31 |     259969 | macros/latex-dev/required/tools/layout.pdf
-2022/10/31 |      12133 | macros/latex-dev/required/tools/longtable-2020-01-07.sty
-2022/10/31 |      76397 | macros/latex-dev/required/tools/longtable.dtx
-2022/10/31 |       2538 | macros/latex-dev/required/tools/longtable.ins
-2022/10/31 |     391313 | macros/latex-dev/required/tools/longtable.pdf
-2022/10/31 |       3284 | macros/latex-dev/required/tools/manifest.txt
-2022/10/31 |      29712 | macros/latex-dev/required/tools/multicol-2017-04-11.sty
-2022/10/31 |      31646 | macros/latex-dev/required/tools/multicol-2019-10-01.sty
-2022/10/31 |     184548 | macros/latex-dev/required/tools/multicol.dtx
-2022/10/31 |       2576 | macros/latex-dev/required/tools/multicol.ins
-2022/10/31 |     521367 | macros/latex-dev/required/tools/multicol.pdf
-2022/10/31 |       8976 | macros/latex-dev/required/tools/rawfonts.dtx
-2022/10/31 |     138963 | macros/latex-dev/required/tools/rawfonts.pdf
-2022/10/31 |       1664 | macros/latex-dev/required/tools/README.md
-2022/10/31 |       9493 | macros/latex-dev/required/tools/shellesc.dtx
-2022/10/31 |     175929 | macros/latex-dev/required/tools/shellesc.pdf
-2022/10/31 |       8632 | macros/latex-dev/required/tools/showkeys-2014-10-28.sty
-2022/10/31 |      30107 | macros/latex-dev/required/tools/showkeys.dtx
-2022/10/31 |     251782 | macros/latex-dev/required/tools/showkeys.pdf
-2022/10/31 |       5791 | macros/latex-dev/required/tools/somedefs.dtx
-2022/10/31 |     167572 | macros/latex-dev/required/tools/somedefs.pdf
-2022/10/31 |      35875 | macros/latex-dev/required/tools/tabularx.dtx
-2022/10/31 |       2535 | macros/latex-dev/required/tools/tabularx.ins
-2022/10/31 |     287073 | macros/latex-dev/required/tools/tabularx.pdf
-2022/10/31 |      43448 | macros/latex-dev/required/tools/theorem.dtx
-2022/10/31 |     351702 | macros/latex-dev/required/tools/theorem.pdf
-2022/10/31 |       5680 | macros/latex-dev/required/tools/tools.ins
-2022/10/31 |      73672 | macros/latex-dev/required/tools/tools-overview.pdf
-2022/10/31 |       5211 | macros/latex-dev/required/tools/tools-overview.tex
-2022/10/31 |      25146 | macros/latex-dev/required/tools/trace.dtx
-2022/10/31 |     222076 | macros/latex-dev/required/tools/trace.pdf
-2022/10/31 |      33863 | macros/latex-dev/required/tools/varioref-2016-02-16.sty
-2022/10/31 |     114350 | macros/latex-dev/required/tools/varioref.dtx
-2022/10/31 |       2531 | macros/latex-dev/required/tools/varioref.ins
-2022/10/31 |     398798 | macros/latex-dev/required/tools/varioref.pdf
-2022/10/31 |      72131 | macros/latex-dev/required/tools/verbatim.dtx
-2022/10/31 |     330746 | macros/latex-dev/required/tools/verbatim.pdf
-2022/10/31 |       6218 | macros/latex-dev/required/tools/xr.dtx
-2022/10/31 |     169986 | macros/latex-dev/required/tools/xr.pdf
-2022/10/31 |      17856 | macros/latex-dev/required/tools/xspace.dtx
-2022/10/31 |     257018 | macros/latex-dev/required/tools/xspace.pdf
-2022/11/02 |    7249753 | macros/latex-dev/required/tools.zip
+2023/05/25 |      14072 | macros/latex-dev/required/tools/afterpage.dtx
+2023/05/25 |       2538 | macros/latex-dev/required/tools/afterpage.ins
+2023/05/25 |     197733 | macros/latex-dev/required/tools/afterpage.pdf
+2023/05/25 |      11749 | macros/latex-dev/required/tools/array-2016-10-06.sty
+2023/05/25 |      12559 | macros/latex-dev/required/tools/array-2020-02-10.sty
+2023/05/25 |     128521 | macros/latex-dev/required/tools/array.dtx
+2023/05/25 |     517094 | macros/latex-dev/required/tools/array.pdf
+2023/05/25 |      61565 | macros/latex-dev/required/tools/bm.dtx
+2023/05/25 |       2524 | macros/latex-dev/required/tools/bm.ins
+2023/05/25 |     323437 | macros/latex-dev/required/tools/bm.pdf
+2023/05/25 |      53167 | macros/latex-dev/required/tools/calc.dtx
+2023/05/25 |     370647 | macros/latex-dev/required/tools/calc.pdf
+2023/05/25 |      63168 | macros/latex-dev/required/tools/changes.txt
+2023/05/25 |      12709 | macros/latex-dev/required/tools/dcolumn.dtx
+2023/05/25 |     220839 | macros/latex-dev/required/tools/dcolumn.pdf
+2023/05/25 |       6789 | macros/latex-dev/required/tools/delarray.dtx
+2023/05/25 |     191066 | macros/latex-dev/required/tools/delarray.pdf
+2023/05/25 |      10644 | macros/latex-dev/required/tools/enumerate.dtx
+2023/05/25 |     215500 | macros/latex-dev/required/tools/enumerate.pdf
+2023/05/25 |       4959 | macros/latex-dev/required/tools/fileerr.dtx
+2023/05/25 |     187723 | macros/latex-dev/required/tools/fileerr.pdf
+2023/05/25 |      10771 | macros/latex-dev/required/tools/fontsmpl.dtx
+2023/05/25 |     146446 | macros/latex-dev/required/tools/fontsmpl.pdf
+2023/05/25 |      39696 | macros/latex-dev/required/tools/ftnright.dtx
+2023/05/25 |     387234 | macros/latex-dev/required/tools/ftnright.pdf
+2023/05/25 |      11148 | macros/latex-dev/required/tools/hhline.dtx
+2023/05/25 |     189674 | macros/latex-dev/required/tools/hhline.pdf
+2023/05/25 |       2220 | macros/latex-dev/required/tools/indentfirst.dtx
+2023/05/25 |     157956 | macros/latex-dev/required/tools/indentfirst.pdf
+2023/05/25 |      32029 | macros/latex-dev/required/tools/layout.dtx
+2023/05/25 |     259966 | macros/latex-dev/required/tools/layout.pdf
+2023/05/25 |      12133 | macros/latex-dev/required/tools/longtable-2020-01-07.sty
+2023/05/25 |      76397 | macros/latex-dev/required/tools/longtable.dtx
+2023/05/25 |       2538 | macros/latex-dev/required/tools/longtable.ins
+2023/05/25 |     391316 | macros/latex-dev/required/tools/longtable.pdf
+2023/05/25 |       3284 | macros/latex-dev/required/tools/manifest.txt
+2023/05/25 |      29712 | macros/latex-dev/required/tools/multicol-2017-04-11.sty
+2023/05/25 |      31646 | macros/latex-dev/required/tools/multicol-2019-10-01.sty
+2023/05/25 |     186367 | macros/latex-dev/required/tools/multicol.dtx
+2023/05/25 |       2576 | macros/latex-dev/required/tools/multicol.ins
+2023/05/25 |     523525 | macros/latex-dev/required/tools/multicol.pdf
+2023/05/25 |       8976 | macros/latex-dev/required/tools/rawfonts.dtx
+2023/05/25 |     138962 | macros/latex-dev/required/tools/rawfonts.pdf
+2023/05/25 |       1664 | macros/latex-dev/required/tools/README.md
+2023/05/25 |       9556 | macros/latex-dev/required/tools/shellesc.dtx
+2023/05/25 |     176209 | macros/latex-dev/required/tools/shellesc.pdf
+2023/05/25 |       8632 | macros/latex-dev/required/tools/showkeys-2014-10-28.sty
+2023/05/25 |      30276 | macros/latex-dev/required/tools/showkeys.dtx
+2023/05/25 |     252911 | macros/latex-dev/required/tools/showkeys.pdf
+2023/05/25 |       5791 | macros/latex-dev/required/tools/somedefs.dtx
+2023/05/25 |     167585 | macros/latex-dev/required/tools/somedefs.pdf
+2023/05/25 |      35875 | macros/latex-dev/required/tools/tabularx.dtx
+2023/05/25 |       2535 | macros/latex-dev/required/tools/tabularx.ins
+2023/05/25 |     287073 | macros/latex-dev/required/tools/tabularx.pdf
+2023/05/25 |      43448 | macros/latex-dev/required/tools/theorem.dtx
+2023/05/25 |     351675 | macros/latex-dev/required/tools/theorem.pdf
+2023/05/25 |       5680 | macros/latex-dev/required/tools/tools.ins
+2023/05/25 |      73672 | macros/latex-dev/required/tools/tools-overview.pdf
+2023/05/25 |       5211 | macros/latex-dev/required/tools/tools-overview.tex
+2023/05/25 |      25146 | macros/latex-dev/required/tools/trace.dtx
+2023/05/25 |     222080 | macros/latex-dev/required/tools/trace.pdf
+2023/05/25 |      33863 | macros/latex-dev/required/tools/varioref-2016-02-16.sty
+2023/05/25 |     114350 | macros/latex-dev/required/tools/varioref.dtx
+2023/05/25 |       2531 | macros/latex-dev/required/tools/varioref.ins
+2023/05/25 |     393151 | macros/latex-dev/required/tools/varioref.pdf
+2023/05/25 |      72131 | macros/latex-dev/required/tools/verbatim.dtx
+2023/05/25 |     330773 | macros/latex-dev/required/tools/verbatim.pdf
+2023/05/25 |       6218 | macros/latex-dev/required/tools/xr.dtx
+2023/05/25 |     169986 | macros/latex-dev/required/tools/xr.pdf
+2023/05/25 |      17856 | macros/latex-dev/required/tools/xspace.dtx
+2023/05/25 |     257019 | macros/latex-dev/required/tools/xspace.pdf
+2023/05/25 |    7249062 | macros/latex-dev/required/tools.zip
 1999/05/03 |       8998 | macros/latex/exptl/delimtxt/delimtxt.dtx
 1999/03/28 |        143 | macros/latex/exptl/delimtxt/delimtxt.ins
 2006/03/21 |      55074 | macros/latex/exptl/delimtxt/delimtxt.pdf
@@ -296434,8 +296438,8 @@
 2021/05/09 |     359576 | systems/texlive/tlnet/archive/lua-physical.r59138.tar.xz
 2020/08/15 |     442728 | systems/texlive/tlnet/archive/luaprogtable.doc.r56113.tar.xz
 2020/08/15 |       7092 | systems/texlive/tlnet/archive/luaprogtable.r56113.tar.xz
-2023/04/16 |       1252 | systems/texlive/tlnet/archive/luapstricks.doc.r66854.tar.xz
-2023/04/16 |      31176 | systems/texlive/tlnet/archive/luapstricks.r66854.tar.xz
+2023/05/25 |       1252 | systems/texlive/tlnet/archive/luapstricks.doc.r67207.tar.xz
+2023/05/25 |      33884 | systems/texlive/tlnet/archive/luapstricks.r67207.tar.xz
 2023/01/28 |      65436 | systems/texlive/tlnet/archive/luaquotes.doc.r65652.tar.xz
 2023/01/28 |       3384 | systems/texlive/tlnet/archive/luaquotes.r65652.tar.xz
 2019/02/28 |      50272 | systems/texlive/tlnet/archive/luarandom.doc.r49419.tar.xz
@@ -297863,12 +297867,12 @@
 2021/07/04 |        340 | systems/texlive/tlnet/archive/optexcount.x86_64-linuxmusl.r59817.tar.xz
 2021/07/04 |        336 | systems/texlive/tlnet/archive/optexcount.x86_64-linux.r59817.tar.xz
 2021/07/04 |        336 | systems/texlive/tlnet/archive/optexcount.x86_64-solaris.r59817.tar.xz
-2023/03/10 |    1545176 | systems/texlive/tlnet/archive/optex.doc.r66513.tar.xz
+2023/05/25 |    1559760 | systems/texlive/tlnet/archive/optex.doc.r67208.tar.xz
 2020/02/16 |        316 | systems/texlive/tlnet/archive/optex.i386-freebsd.r53804.tar.xz
 2020/02/16 |        316 | systems/texlive/tlnet/archive/optex.i386-linux.r53804.tar.xz
 2020/02/16 |        316 | systems/texlive/tlnet/archive/optex.i386-netbsd.r53804.tar.xz
 2020/02/16 |        316 | systems/texlive/tlnet/archive/optex.i386-solaris.r53804.tar.xz
-2023/03/10 |     835108 | systems/texlive/tlnet/archive/optex.r66513.tar.xz
+2023/05/25 |     839320 | systems/texlive/tlnet/archive/optex.r67208.tar.xz
 2021/02/25 |        320 | systems/texlive/tlnet/archive/optex.universal-darwin.r57908.tar.xz
 2023/02/20 |       2336 | systems/texlive/tlnet/archive/optex.windows.r65891.tar.xz
 2020/02/16 |        324 | systems/texlive/tlnet/archive/optex.x86_64-cygwin.r53804.tar.xz
@@ -299367,8 +299371,8 @@
 2019/02/28 |       8156 | systems/texlive/tlnet/archive/qtree.r15878.tar.xz
 2020/03/24 |      26460 | systems/texlive/tlnet/archive/qualitype.doc.r54512.tar.xz
 2020/03/24 |    2404264 | systems/texlive/tlnet/archive/qualitype.r54512.tar.xz
-2023/04/26 |     586980 | systems/texlive/tlnet/archive/quantikz.doc.r66934.tar.xz
-2023/04/26 |      19948 | systems/texlive/tlnet/archive/quantikz.r66934.tar.xz
+2023/05/25 |     589436 | systems/texlive/tlnet/archive/quantikz.doc.r67206.tar.xz
+2023/05/25 |      20232 | systems/texlive/tlnet/archive/quantikz.r67206.tar.xz
 2022/12/12 |    1284404 | systems/texlive/tlnet/archive/quantumarticle.doc.r65242.tar.xz
 2022/12/12 |      24896 | systems/texlive/tlnet/archive/quantumarticle.r65242.tar.xz
 2022/09/14 |     147688 | systems/texlive/tlnet/archive/quattrocento.doc.r64372.tar.xz
@@ -300948,7 +300952,7 @@
 2022/09/13 |        600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2023/05/24 |     426952 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67195.tar.xz
+2023/05/25 |     426948 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67203.tar.xz
 2020/01/27 |        916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
 2020/01/27 |        924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
 2020/01/27 |        916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -300970,7 +300974,7 @@
 2022/09/13 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2023/05/24 |     114072 | systems/texlive/tlnet/archive/texlive-scripts.r67195.tar.xz
+2023/05/25 |     113952 | systems/texlive/tlnet/archive/texlive-scripts.r67203.tar.xz
 2022/09/13 |        580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
 2023/05/14 |      60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -302832,16 +302836,16 @@
 2020/07/18 |      47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
 2020/07/18 |     101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
 2023/03/12 |     125532 | systems/texlive/tlnet/install-tl
-2023/05/24 |    5736712 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/05/24 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/05/24 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/05/25 |    5737693 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/05/25 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/05/25 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2023/05/13 |       5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/05/24 |   21036660 | systems/texlive/tlnet/install-tl-windows.exe
-2023/05/24 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/05/24 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/05/24 |   26025729 | systems/texlive/tlnet/install-tl.zip
-2023/05/24 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/05/24 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/05/25 |   21038011 | systems/texlive/tlnet/install-tl-windows.exe
+2023/05/25 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/05/25 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/05/25 |   26025578 | systems/texlive/tlnet/install-tl.zip
+2023/05/25 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/05/25 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2023/03/19 |       1229 | systems/texlive/tlnet/README.md
 2023/03/19 |          0 | systems/texlive/tlnet/TEXLIVE_2023
 2023/01/17 |       8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -302851,7 +302855,7 @@
 2023/01/17 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2023/01/17 |      49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/05/23 |       7434 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/05/24 |       6823 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2023/01/11 |     216583 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
 2020/04/15 |    2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
 2017/04/16 |       2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -302893,12 +302897,12 @@
 2023/02/21 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/12/21 |       5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2023/04/08 |      28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/05/24 |   18111166 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/05/24 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/05/25 |   18111509 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/05/25 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2023/02/20 |      86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/05/24 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/05/24 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/05/24 |    2451132 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/05/25 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/05/25 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/05/25 |    2450096 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2023/02/20 |      58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2023/02/26 |      42350 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2023/02/21 |      16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -313411,7 +313415,7 @@
 2014/07/05 |        611 | systems/win32/yandy/README
 2014/07/05 |    1004628 | systems/win32/yandy/yandy-src.tar.xz
 2014/07/05 |    1012416 | systems/win32/yandy.zip
-2023/05/25 |        186 | timestamp
+2023/05/26 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2021/11/11 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 1ad089face..f9ccce533a 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index ed4ba5ecea..61f5ae06c5 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,6 +1,466 @@
+2023/05/25 |         99 | macros/latex-dev/base/ltpara-code.tex
+2023/05/25 |       9935 | macros/latex-dev/base/ltnews21.tex
+2023/05/25 |       9779 | macros/latex-dev/base/format.ins
+2023/05/25 |         96 | macros/latex-dev/base/doc-code.tex
+2023/05/25 |       9557 | macros/latex-dev/base/ltcntrl.dtx
+2023/05/25 |       9556 | macros/latex-dev/required/tools/shellesc.dtx
+2023/05/25 |       9401 | macros/latex-dev/base/source2edoc.cls
+2023/05/25 |       9395 | macros/latex-dev/base/syntonly.dtx
+2023/05/25 |       9345 | macros/latex-dev/base/preload.dtx
+2023/05/25 |      92954 | macros/latex-dev/base/ltdefns.dtx
+2023/05/25 |      92280 | macros/latex-dev/base/utf8ienc.dtx
+2023/05/25 |     916011 | graphics/pgf/contrib/dynkin-diagrams.zip
+2023/05/25 |     909512 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
+2023/05/25 |       9068 | macros/latex-dev/base/lppl-1-0.txt
+2023/05/25 |      90660 | macros/latex-dev/base/lttextcomp.dtx
+2023/05/25 |       8976 | macros/latex-dev/required/tools/rawfonts.dtx
+2023/05/25 |      89727 | macros/latex-dev/base/slides.dtx
+2023/05/25 |       8970 | macros/latex-dev/base/ltnews17.tex
+2023/05/25 |     895333 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+2023/05/25 |       8731 | macros/latex-dev/base/ltthm.dtx
+2023/05/25 |       8663 | macros/latex-dev/required/amsmath/amsbsy.dtx
+2023/05/25 |       8632 | macros/latex-dev/required/tools/showkeys-2014-10-28.sty
+2023/05/25 |       8626 | macros/latex-dev/base/oldlfont.dtx
+2023/05/25 |      85099 | macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty
+2023/05/25 |      84215 | macros/latex-dev/base/ltfssini.dtx
+2023/05/25 |     839320 | systems/texlive/tlnet/archive/optex.r67208.tar.xz
+2023/05/25 |      82916 | macros/latex-dev/base/ltfssbas.dtx
+2023/05/25 |      82371 | macros/latex-dev/required/amsmath/testmath.tex
+2023/05/25 |     821768 | macros/latex-dev/base/ltshipout-code.pdf
+2023/05/25 |       8172 | macros/latex-dev/required/amsmath/changes.txt
+2023/05/25 |      81195 | macros/latex-dev/base/ltshipout.dtx
+2023/05/25 |       8051 | macros/latex-dev/base/ltnews.tex
+2023/05/25 |     803843 | macros/latex-dev/base/ltfilehook-code.pdf
+2023/05/25 |      76397 | macros/latex-dev/required/tools/longtable.dtx
+2023/05/25 |     755883 | macros/latex-dev/base/doc.pdf
+2023/05/25 |     755337 | macros/latex-dev/base/ltcmdhooks-code.pdf
+2023/05/25 |       7528 | macros/latex-dev/base/ltxguide.cls
+2023/05/25 |      75111 | macros/latex-dev/base/ltfssdcl.dtx
+2023/05/25 |      74921 | macros/latex-dev/base/ltluatex.dtx
+2023/05/25 |     739995 | macros/latex-dev/base/lthooks-doc.pdf
+2023/05/25 |      73672 | macros/latex-dev/required/tools/tools-overview.pdf
+2023/05/25 |    7340454 | install/macros/latex-dev/required/latex-tools-dev.tds.zip
+2023/05/25 |    7249062 | macros/latex-dev/required/tools.zip
+2023/05/25 |      72475 | macros/latex-dev/base/ltfsstrc.dtx
+2023/05/25 |       7244 | macros/latex-dev/base/ltnews20.tex
+2023/05/25 |       7216 | macros/latex-dev/base/exscale.dtx
+2023/05/25 |      72131 | macros/latex-dev/required/tools/verbatim.dtx
+2023/05/25 |       7200 | macros/latex-dev/base/sample2e.tex
+2023/05/25 |     716217 | macros/latex-dev/base/ltmarks-code.pdf
+2023/05/25 |       7104 | macros/latex-dev/base/alltt.dtx
+2023/05/25 |       7029 | macros/latex-dev/base/ltnews13.tex
+2023/05/25 |      69732 | macros/latex-dev/required/amsmath/amstex.sty
+2023/05/25 |      69439 | macros/latex-dev/base/clsguide-historic.tex
+2023/05/25 |      69002 | macros/latex-dev/base/ltpictur.dtx
+2023/05/25 |      68735 | macros/latex-dev/base/usrguide-historic.tex
+2023/05/25 |       6789 | macros/latex-dev/required/tools/delarray.dtx
+2023/05/25 |       6760 | macros/latex-dev/base/slides.ins
+2023/05/25 |      67588 | macros/latex-dev/base/ltcmdhooks.dtx
+2023/05/25 |      67457 | macros/latex-dev/base/ltfilehook.dtx
+2023/05/25 |     672305 | macros/latex-dev/base/ltpara-code.pdf
+2023/05/25 |       6709 | macros/latex-dev/base/latexsym.dtx
+2023/05/25 |      66329 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+2023/05/25 |       6440 | macros/latex-dev/required/amsmath/subeqn.tex
+2023/05/25 |       6424 | macros/latex-dev/base/ltnews14.tex
+2023/05/25 |       6357 | macros/latex-dev/base/newlfont.dtx
+2023/05/25 |      63280 | macros/latex-dev/base/letter.dtx
+2023/05/25 |      63168 | macros/latex-dev/required/tools/changes.txt
+2023/05/25 |      63142 | macros/latex-dev/base/ltmarks.dtx
+2023/05/25 |       6218 | macros/latex-dev/required/tools/xr.dtx
+2023/05/25 |       6217 | macros/latex-dev/base/ltmeta.dtx
+2023/05/25 |      61565 | macros/latex-dev/required/tools/bm.dtx
+2023/05/25 |       6155 | macros/latex-dev/base/ltpar.dtx
+2023/05/25 |      60944 | macros/latex-dev/base/ltfiles.dtx
+2023/05/25 |       6047 | macros/latex-dev/base/latexrelease.ins
+2023/05/25 |      60321 | macros/latex-dev/base/fontdef.dtx
+2023/05/25 |      60154 | macros/latex-dev/base/ltplain.dtx
+2023/05/25 |    6002270 | macros/latex-dev/base/source2e.pdf
+2023/05/25 |       5986 | macros/latex-dev/base/ltnews15.tex
+2023/05/25 |     592717 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/05/25 |      59070 | macros/latex-dev/base/ltmiscen.dtx
+2023/05/25 |     589436 | systems/texlive/tlnet/archive/quantikz.doc.r67206.tar.xz
+2023/05/25 |     586545 | macros/latex-dev/base/ltmarks-doc.pdf
+2023/05/25 |       5860 | macros/latex-dev/required/amsmath/ams-internal.txt
+2023/05/25 |       5859 | macros/latex-dev/base/ltidxglo.dtx
+2023/05/25 |      58551 | macros/latex-dev/base/ltfssaxes.dtx
+2023/05/25 |       5825 | macros/latex-dev/base/ltnews10.tex
+2023/05/25 |       5791 | macros/latex-dev/required/tools/somedefs.dtx
+2023/05/25 |       5775 | macros/latex-dev/base/ltnews16.tex
+2023/05/25 |     575208 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/05/25 |    5737693 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/05/25 |       5732 | macros/latex-dev/base/ltnews08.tex
+2023/05/25 |       5714 | macros/latex-dev/base/inputenc.ins
+2023/05/25 |       5699 | macros/latex-dev/base/ltnews05.tex
+2023/05/25 |       5691 | macros/latex-dev/base/ltnews27.tex
+2023/05/25 |       5680 | macros/latex-dev/required/tools/tools.ins
+2023/05/25 |       5678 | macros/latex-dev/base/ltnews04.tex
+2023/05/25 |     566650 | macros/latex-dev/base/ltshipout-doc.pdf
+2023/05/25 |      56472 | macros/latex-dev/base/clsguide.tex
+2023/05/25 |     563295 | macros/latex-dev/base/ltnews35.pdf
+2023/05/25 |     560972 | macros/latex-dev/base/classes.pdf
+2023/05/25 |     560232 | macros/latex-dev/base/ltpara-doc.pdf
+2023/05/25 |       5588 | macros/latex-dev/base/ltnews25.tex
+2023/05/25 |       5576 | macros/latex-dev/base/ltnews07.tex
+2023/05/25 |       5574 | macros/latex-dev/base/ltnews12.tex
+2023/05/25 |      55687 | macros/latex-dev/base/ltfloat.dtx
+2023/05/25 |       5544 | macros/latex-dev/base/ltnews06.tex
+2023/05/25 |       5529 | macros/latex-dev/base/ltnews11.tex
+2023/05/25 |       5509 | macros/latex-dev/base/graphpap.dtx
+2023/05/25 |     550098 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/05/25 |     548468 | macros/latex-dev/base/ltfilehook-doc.pdf
+2023/05/25 |      54677 | macros/latex-dev/base/ltpara.dtx
+2023/05/25 |     546525 | macros/latex-dev/base/ltnews32.pdf
+2023/05/25 |       5462 | macros/latex-dev/base/ltnews02.tex
+2023/05/25 |       5451 | macros/latex-dev/base/ltnews09.tex
+2023/05/25 |      53898 | macros/latex-dev/base/usrguide.tex
+2023/05/25 |       5369 | macros/latex-dev/base/ltnews03.tex
+2023/05/25 |       5323 | macros/latex-dev/required/amsmath/ams-external.txt
+2023/05/25 |      53167 | macros/latex-dev/required/tools/calc.dtx
+2023/05/25 |      52887 | macros/latex-dev/base/lb2.err
+2023/05/25 |      52813 | macros/latex-dev/base/encguide.tex
+2023/05/25 |       5273 | macros/latex-dev/base/cmextra.ins
+2023/05/25 |     526646 | macros/latex-dev/base/ltnews31.pdf
+2023/05/25 |       5246 | macros/latex-dev/base/ltnews01.tex
+2023/05/25 |     523525 | macros/latex-dev/required/tools/multicol.pdf
+2023/05/25 |     522729 | macros/latex-dev/base/ltnews33.pdf
+2023/05/25 |       5211 | macros/latex-dev/required/tools/tools-overview.tex
+2023/05/25 |     517917 | macros/latex-dev/base/ltnews36.pdf
+2023/05/25 |     517677 | macros/latex-dev/base/fntguide.pdf
+2023/05/25 |     517094 | macros/latex-dev/required/tools/array.pdf
+2023/05/25 |     512207 | macros/latex-dev/base/ltnews30.pdf
+2023/05/25 |      51078 | macros/latex-dev/base/ltfinal.dtx
+2023/05/25 |     508339 | macros/latex-dev/base/ltnews34.pdf
+2023/05/25 |     508225 | macros/latex-dev/required/amsmath/amsldoc.pdf
+2023/05/25 |       5081 | macros/latex-dev/required/firstaid/changes.txt
+2023/05/25 |     504397 | macros/latex-dev/base/docstrip.pdf
+2023/05/25 |       5041 | macros/latex-dev/base/latexsym.ins
+2023/05/25 |     500493 | macros/latex-dev/base/ltnews37.pdf
+2023/05/25 |     498869 | macros/latex-dev/base/ltcmdhooks-doc.pdf
+2023/05/25 |       4959 | macros/latex-dev/required/tools/fileerr.dtx
+2023/05/25 |       4945 | macros/latex-dev/base/lthyphen.dtx
+2023/05/25 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/05/25 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/05/25 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/05/25 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/05/25 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/05/25 |     479591 | macros/latex-dev/base/usrguide.pdf
+2023/05/25 |      47896 | macros/latex-dev/base/lttab.dtx
+2023/05/25 |       4757 | macros/latex-dev/base/ltlength.dtx
+2023/05/25 |        474 | macros/latex-dev/required/firstaid/README.md
+2023/05/25 |      45855 | macros/latex-dev/base/ltspace.dtx
+2023/05/25 |      45712 | macros/latex-dev/base/ltboxes.dtx
+2023/05/25 |     455423 | macros/latex-dev/base/ltnews29.pdf
+2023/05/25 |     454535 | macros/latex-dev/required/amsmath/testmath.pdf
+2023/05/25 |      45347 | macros/latex-dev/base/latexrelease.dtx
+2023/05/25 |     451991 | macros/latex-dev/base/clsguide.pdf
+2023/05/25 |      44531 | macros/latex-dev/base/cmfonts.fdd
+2023/05/25 |       4390 | macros/latex-dev/base/ec.ins
+2023/05/25 |     438586 | macros/latex-dev/base/usrguide-historic.pdf
+2023/05/25 |      43448 | macros/latex-dev/required/tools/theorem.dtx
+2023/05/25 |       4336 | macros/latex-dev/required/amsmath/amsxtra.dtx
+2023/05/25 |       4324 | macros/latex-dev/base/cmfonts.ins
+2023/05/25 |       4298 | macros/latex-dev/base/ltalloc.dtx
+2023/05/25 |       4273 | macros/latex-dev/base/docstrip.ins
+2023/05/25 |      42708 | macros/latex-dev/base/changes.old.txt
+2023/05/25 |     426948 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67203.tar.xz
+2023/05/25 |       4254 | macros/latex-dev/base/newdc.ins
+2023/05/25 |      42287 | macros/latex-dev/base/ltmath.dtx
+2023/05/25 |       4219 | macros/latex-dev/base/latex209.ins
+2023/05/25 |     419994 | macros/latex-dev/required/amsmath/amsmath.pdf
+2023/05/25 |       4190 | macros/latex-dev/base/ltnews19.tex
+2023/05/25 |     415568 | macros/latex-dev/base/clsguide-historic.pdf
+2023/05/25 |       4087 | macros/latex-dev/base/classes.ins
+2023/05/25 |       4079 | macros/latex-dev/base/lablst.tex
+2023/05/25 |   40777591 | install/macros/latex-dev/latex-base-dev.tds.zip
+2023/05/25 |    4075453 | biblio/ctan-bibdata.zip
+2023/05/25 |     402455 | macros/latex/contrib/oststud.zip
+2023/05/25 |   40207661 | macros/latex-dev/base.zip
+2023/05/25 |     399778 | macros/latex-dev/base/changes.txt
+2023/05/25 |      39696 | macros/latex-dev/required/tools/ftnright.dtx
+2023/05/25 |       3960 | macros/latex-dev/base/olddc.ins
+2023/05/25 |     393151 | macros/latex-dev/required/tools/varioref.pdf
+2023/05/25 |     391316 | macros/latex-dev/required/tools/longtable.pdf
+2023/05/25 |      38730 | macros/latex-dev/base/latex209.dtx
+2023/05/25 |     387234 | macros/latex-dev/required/tools/ftnright.pdf
+2023/05/25 |      38424 | macros/latex-dev/base/ltnews18.pdf
+2023/05/25 |      38226 | macros/latex-dev/base/ltnews35.tex
+2023/05/25 |     379718 | macros/latex-dev/base/ltnews26.pdf
+2023/05/25 |       3781 | macros/latex-dev/base/tulm.ins
+2023/05/25 |     376892 | macros/latex-dev/base/ltnews28.pdf
+2023/05/25 |     375514 | macros/latex-dev/base/slides.pdf
+2023/05/25 |       3725 | macros/latex-dev/base/ltlogos.dtx
+2023/05/25 |     370647 | macros/latex-dev/required/tools/calc.pdf
+2023/05/25 |        369 | macros/latex-dev/required/amsmath/manifest.txt
+2023/05/25 |    3676721 | biblio/ctan-bibdata/ctan.pdf
+2023/05/25 |      36154 | macros/latex-dev/base/ltlists.dtx
+2023/05/25 |      35984 | macros/latex-dev/base/ltdirchk.dtx
+2023/05/25 |      35875 | macros/latex-dev/required/tools/tabularx.dtx
+2023/05/25 |     353320 | macros/latex-dev/base/utf8ienc.pdf
+2023/05/25 |     351675 | macros/latex-dev/required/tools/theorem.pdf
+2023/05/25 |       3434 | macros/latex-dev/base/makeindx.ins
+2023/05/25 |       3401 | macros/latex-dev/base/proc.ins
+2023/05/25 |      33946 | macros/latex-dev/base/ltsect.dtx
+2023/05/25 |      33911 | macros/latex-dev/base/ltnews33.tex
+2023/05/25 |      33884 | systems/texlive/tlnet/archive/luapstricks.r67207.tar.xz
+2023/05/25 |      33863 | macros/latex-dev/required/tools/varioref-2016-02-16.sty
+2023/05/25 |     337766 | macros/latex-dev/base/letter.pdf
+2023/05/25 |       3372 | macros/latex-dev/base/letter.ins
+2023/05/25 |       3367 | macros/latex-dev/base/ltoutenc.ins
+2023/05/25 |       3338 | macros/latex-dev/base/exscale.ins
+2023/05/25 |      33243 | macros/latex-dev/base/ltnews32.tex
+2023/05/25 |     330773 | macros/latex-dev/required/tools/verbatim.pdf
+2023/05/25 |       3284 | macros/latex-dev/required/tools/manifest.txt
+2023/05/25 |      32833 | macros/latex-dev/base/ltnews37.tex
+2023/05/25 |       3282 | macros/latex-dev/base/bugs.txt
+2023/05/25 |     325056 | macros/latex-dev/base/ltluatex.pdf
+2023/05/25 |     323437 | macros/latex-dev/required/tools/bm.pdf
+2023/05/25 |      32331 | macros/latex-dev/base/ltnews34.tex
+2023/05/25 |      32029 | macros/latex-dev/required/tools/layout.dtx
+2023/05/25 |     318787 | macros/latex-dev/base/ltnews20.pdf
+2023/05/25 |       3181 | macros/latex-dev/base/unpack.ins
+2023/05/25 |     318166 | macros/latex-dev/base/inputenc.pdf
+2023/05/25 |     318003 | macros/latex-dev/base/ltnews22.pdf
+2023/05/25 |      31646 | macros/latex-dev/required/tools/multicol-2019-10-01.sty
+2023/05/25 |       3100 | macros/latex-dev/base/README.md
+2023/05/25 |      30499 | macros/latex-dev/base/doc-2021-06-01.sty
+2023/05/25 |      30452 | macros/latex-dev/base/ltnews31.tex
+2023/05/25 |     304156 | info/tex-nutshell.zip
+2023/05/25 |      30276 | macros/latex-dev/required/tools/showkeys.dtx
+2023/05/25 |     299713 | macros/latex-dev/base/lthooks.dtx
+2023/05/25 |      29965 | macros/latex-dev/base/doc-2016-02-15.sty
+2023/05/25 |      29712 | macros/latex-dev/required/tools/multicol-2017-04-11.sty
+2023/05/25 |      29267 | macros/latex-dev/base/ltfntcmd.dtx
+2023/05/25 |     292590 | macros/latex-dev/base/cmfonts.pdf
+2023/05/25 |     291239 | macros/latex-dev/base/tlc2.pdf
+2023/05/25 |       2896 | macros/latex-dev/base/syntonly.ins
+2023/05/25 |       2893 | macros/latex-dev/base/nfssfont.ins
+2023/05/25 |       2892 | macros/latex-dev/base/graphpap.ins
+2023/05/25 |       2892 | macros/latex-dev/base/fix-cm.ins
+2023/05/25 |       2890 | macros/latex-dev/base/alltt.ins
+2023/05/25 |       2888 | macros/latex-dev/base/ifthen.ins
+2023/05/25 |     287724 | macros/latex-dev/base/fix-cm.pdf
+2023/05/25 |     287073 | macros/latex-dev/required/tools/tabularx.pdf
+2023/05/25 |     286796 | macros/latex-dev/base/ltnews23.pdf
+2023/05/25 |     282105 | macros/latex-dev/base/latexrelease.pdf
+2023/05/25 |    2796162 | install/macros/latex-dev/required/latex-amsmath-dev.tds.zip
+2023/05/25 |    2786799 | biblio/ctan-bibdata/ctan.bib
+2023/05/25 |    2762922 | macros/latex-dev/required/amsmath.zip
+2023/05/25 |     275474 | install/macros/latex-dev/required/latex-firstaid-dev.tds.zip
+2023/05/25 |       2740 | macros/latex-dev/required/firstaid/firstaid.ins
+2023/05/25 |     273211 | info/tex-nutshell/tex-nutshell.pdf
+2023/05/25 |       2728 | macros/latex-dev/base/ltpageno.dtx
+2023/05/25 |       2723 | macros/latex-dev/required/amsmath/README.md
+2023/05/25 |      27122 | macros/latex-dev/base/ltxcheck.tex
+2023/05/25 |      27069 | macros/latex-dev/base/lterror.dtx
+2023/05/25 |     270657 | macros/latex-dev/required/firstaid.zip
+2023/05/25 |       2705 | macros/latex-dev/base/idx.tex
+2023/05/25 |     269095 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
+2023/05/25 |     265470 | macros/latex-dev/base/ltnews24.pdf
+2023/05/25 |     264161 | macros/latex-dev/base/cfgguide.pdf
+2023/05/25 |   26025578 | systems/texlive/tlnet/install-tl.zip
+2023/05/25 |     259966 | macros/latex-dev/required/tools/layout.pdf
+2023/05/25 |     257827 | macros/latex-dev/base/modguide.pdf
+2023/05/25 |       2576 | macros/latex-dev/required/tools/multicol.ins
+2023/05/25 |     257355 | macros/latex-dev/base/cyrguide.pdf
+2023/05/25 |     257019 | macros/latex-dev/required/tools/xspace.pdf
+2023/05/25 |       2538 | macros/latex-dev/required/tools/longtable.ins
+2023/05/25 |       2538 | macros/latex-dev/required/tools/afterpage.ins
+2023/05/25 |       2535 | macros/latex-dev/required/tools/tabularx.ins
+2023/05/25 |       2531 | macros/latex-dev/required/tools/varioref.ins
+2023/05/25 |     252911 | macros/latex-dev/required/tools/showkeys.pdf
+2023/05/25 |     252510 | macros/latex-dev/base/lb2.pdf
+2023/05/25 |       2524 | macros/latex-dev/required/tools/bm.ins
+2023/05/25 |      25146 | macros/latex-dev/required/tools/trace.dtx
+2023/05/25 |     251260 | macros/latex-dev/base/ltnews27.pdf
+2023/05/25 |     249698 | macros/latex-dev/base/tlc3.pdf
+2023/05/25 |    2450096 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/05/25 |     245007 | macros/latex-dev/base/ltnews21.pdf
+2023/05/25 |     244221 | macros/latex-dev/base/ltxdoc.pdf
+2023/05/25 |      24286 | macros/latex-dev/base/ltcounts.dtx
+2023/05/25 |     242471 | macros/latex-dev/base/doc.dtx
+2023/05/25 |        241 | macros/latex-dev/base/ltfilehook-doc.tex
+2023/05/25 |        240 | macros/latex-dev/base/ltshipout-doc.tex
+2023/05/25 |        238 | macros/latex-dev/base/ltmarks-doc.tex
+2023/05/25 |        238 | macros/latex-dev/base/lthooks-doc.tex
+2023/05/25 |        238 | macros/latex-dev/base/ltcmdhooks-doc.tex
+2023/05/25 |      23722 | macros/latex-dev/base/tlc3.err
+2023/05/25 |      23646 | macros/latex-dev/base/ltnews30.tex
+2023/05/25 |      23516 | macros/latex-dev/base/fix-cm.dtx
+2023/05/25 |        234 | macros/latex-dev/base/ltpara-doc.tex
+2023/05/25 |     234188 | macros/latex-dev/base/slifonts.pdf
+2023/05/25 |      23386 | macros/latex-dev/base/lppl.tex
+2023/05/25 |     230377 | macros/latex-dev/required/amsmath/amsmath.dtx
+2023/05/25 |     230331 | macros/latex-dev/base/ltnews19.pdf
+2023/05/25 |      22814 | macros/latex-dev/base/ltxdoc.dtx
+2023/05/25 |      22723 | macros/latex-dev/base/cfgguide.tex
+2023/05/25 |     227056 | macros/latex-dev/base/proc.pdf
+2023/05/25 |      22605 | macros/latex-dev/required/amsmath/diffs-m.txt
+2023/05/25 |      22575 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
+2023/05/25 |    2245559 | macros/latex/contrib/nicematrix.zip
+2023/05/25 |     223829 | macros/latex-dev/base/alltt.pdf
+2023/05/25 |       2220 | macros/latex-dev/required/tools/indentfirst.dtx
+2023/05/25 |     222080 | macros/latex-dev/required/tools/trace.pdf
+2023/05/25 |     221738 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+2023/05/25 |     221226 | macros/latex-dev/base/ifthen.pdf
+2023/05/25 |     220839 | macros/latex-dev/required/tools/dcolumn.pdf
+2023/05/25 |     219354 | macros/latex-dev/base/ltx3info.pdf
+2023/05/25 |      21882 | macros/latex-dev/base/ltxref.dtx
+2023/05/25 |     217757 | macros/latex-dev/base/lgc2.pdf
+2023/05/25 |     217497 | macros/latex-dev/required/amsmath/amstext.pdf
+2023/05/25 |     215500 | macros/latex-dev/required/tools/enumerate.pdf
+2023/05/25 |      21288 | macros/latex-dev/base/ltnews.cls
+2023/05/25 |      21229 | macros/latex-dev/base/lgc2.err
+2023/05/25 |     211180 | macros/latex-dev/base/nfssfont.pdf
+2023/05/25 |   21038011 | systems/texlive/tlnet/install-tl-windows.exe
+2023/05/25 |     205087 | macros/latex-dev/base/ltnews25.pdf
+2023/05/25 |     204709 | macros/latex-dev/base/exscale.pdf
+2023/05/25 |      20232 | systems/texlive/tlnet/archive/quantikz.r67206.tar.xz
+2023/05/25 |      20166 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+2023/05/25 |     200762 | macros/latex-dev/base/latexsym.pdf
+2023/05/25 |      19853 | macros/latex-dev/base/ltkeys.dtx
+2023/05/25 |     197733 | macros/latex-dev/required/tools/afterpage.pdf
+2023/05/25 |      19645 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+2023/05/25 |       1941 | macros/latex-dev/base/minimal.cls
+2023/05/25 |      19333 | macros/latex-dev/base/ltnews36.tex
+2023/05/25 |     191066 | macros/latex-dev/required/tools/delarray.pdf
+2023/05/25 |      19040 | macros/latex-dev/base/lppl.txt
+2023/05/25 |     189847 | macros/latex-dev/base/syntonly.pdf
+2023/05/25 |     189674 | macros/latex-dev/required/tools/hhline.pdf
+2023/05/25 |      18944 | macros/latex-dev/base/ltnews29.tex
+2023/05/25 |     187723 | macros/latex-dev/required/tools/fileerr.pdf
+2023/05/25 |      18753 | macros/latex-dev/base/ifthen.dtx
+2023/05/25 |     187430 | macros/latex-dev/base/ltcmd.dtx
+2023/05/25 |      18711 | macros/latex-dev/base/ltexpl.dtx
+2023/05/25 |     186367 | macros/latex-dev/required/tools/multicol.dtx
+2023/05/25 |      18399 | macros/latex-dev/base/nfssfont.dtx
+2023/05/25 |      18299 | macros/latex-dev/base/ltx3info.tex
+2023/05/25 |     182464 | macros/latex-dev/base/ltnews13.pdf
+2023/05/25 |   18111509 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/05/25 |     179953 | macros/latex-dev/required/amsmath/amscd.pdf
+2023/05/25 |     178723 | macros/latex-dev/base/ltoutput.dtx
+2023/05/25 |      17856 | macros/latex-dev/required/tools/xspace.dtx
+2023/05/25 |     178185 | macros/latex-dev/required/amsmath/amsgen.pdf
+2023/05/25 |      17782 | macros/latex-dev/base/cyrguide.tex
+2023/05/25 |    1769996 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
+2023/05/25 |     176859 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+2023/05/25 |     176209 | macros/latex-dev/required/tools/shellesc.pdf
+2023/05/25 |     175344 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+2023/05/25 |     174946 | macros/latex-dev/required/amsmath/amsbsy.pdf
+2023/05/25 |     174686 | macros/latex-dev/base/ltnews05.pdf
+2023/05/25 |      17389 | macros/latex-dev/base/ltbibl.dtx
+2023/05/25 |     173013 | macros/latex-dev/base/tlc2.err
+2023/05/25 |      17233 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+2023/05/25 |    1722838 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+2023/05/25 |     170874 | macros/latex-dev/base/lamport-manual.pdf
+2023/05/25 |     170716 | macros/latex-dev/base/ltnews14.pdf
+2023/05/25 |     170595 | macros/latex-dev/base/docstrip.dtx
+2023/05/25 |     169986 | macros/latex-dev/required/tools/xr.pdf
+2023/05/25 |       1694 | macros/latex-dev/base/small2e.tex
+2023/05/25 |     169414 | macros/latex-dev/base/ltnews10.pdf
+2023/05/25 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/05/25 |     167585 | macros/latex-dev/required/tools/somedefs.pdf
+2023/05/25 |       1664 | macros/latex-dev/required/tools/README.md
+2023/05/25 |     166247 | macros/latex-dev/base/ltnews17.pdf
+2023/05/25 |     165817 | macros/latex-dev/base/makeindx.pdf
+2023/05/25 |      16500 | macros/latex-dev/base/modguide.tex
+2023/05/25 |     162766 | macros/latex-dev/base/tulm.pdf
+2023/05/25 |     161725 | macros/latex-dev/base/graphpap.pdf
+2023/05/25 |     161534 | macros/latex-dev/base/ltnews01.pdf
+2023/05/25 |     159811 | macros/latex-dev/base/ltnews02.pdf
+2023/05/25 |     159801 | macros/latex/contrib/oststud/oststud.pdf
+2023/05/25 |     159349 | macros/latex-dev/base/ltnews03.pdf
+2023/05/25 |     157956 | macros/latex-dev/required/tools/indentfirst.pdf
+2023/05/25 |      15703 | macros/latex-dev/base/slifonts.fdd
+2023/05/25 |     156746 | macros/latex-dev/base/ltnews12.pdf
+2023/05/25 |     156238 | macros/latex-dev/base/classes.dtx
+2023/05/25 |    1559760 | systems/texlive/tlnet/archive/optex.doc.r67208.tar.xz
+2023/05/25 |     155426 | macros/latex-dev/base/ltnews08.pdf
+2023/05/25 |     154483 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+2023/05/25 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/05/25 |      15384 | macros/latex-dev/base/ltvers.dtx
+2023/05/25 |      15306 | macros/latex-dev/base/source2e.tex
+2023/05/25 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/05/25 |     152545 | macros/latex-dev/base/ltnews04.pdf
+2023/05/25 |       1505 | macros/latex-dev/required/amsmath/amsbsy.ins
+2023/05/25 |       1504 | macros/latex-dev/required/amsmath/amsmath.ins
+2023/05/25 |      15047 | macros/latex-dev/base/ltnews28.tex
+2023/05/25 |       1492 | macros/latex-dev/required/amsmath/amsxtra.ins
+2023/05/25 |       1492 | macros/latex-dev/required/amsmath/amstext.ins
+2023/05/25 |       1490 | macros/latex-dev/required/amsmath/amsopn.ins
+2023/05/25 |       1487 | macros/latex-dev/required/amsmath/amscd.ins
+2023/05/25 |       1484 | macros/latex-dev/required/amsmath/amsgen.ins
+2023/05/25 |     148294 | macros/latex-dev/base/ltoutenc.dtx
+2023/05/25 |     147458 | macros/latex-dev/required/amsmath/technote.pdf
+2023/05/25 |     146446 | macros/latex-dev/required/tools/fontsmpl.pdf
+2023/05/25 |     146195 | macros/latex-dev/base/webcomp.pdf
+2023/05/25 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/05/25 |     145334 | macros/latex-dev/base/ltclass.dtx
+2023/05/25 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/05/25 |      14421 | macros/latex-dev/base/lppl-1-2.txt
+2023/05/25 |      14341 | macros/latex-dev/base/lppl-1-1.txt
+2023/05/25 |     143159 | macros/latex/contrib/oststud/hsrstud.pdf
+2023/05/25 |     142870 | macros/latex-dev/base/ltnews06.pdf
+2023/05/25 |      14091 | macros/latex-dev/base/ltpage.dtx
+2023/05/25 |      14072 | macros/latex-dev/required/tools/afterpage.dtx
+2023/05/25 |     140093 | macros/latex-dev/required/amsmath/amsopn.pdf
+2023/05/25 |     138962 | macros/latex-dev/required/tools/rawfonts.pdf
+2023/05/25 |     138211 | macros/latex-dev/base/ltnews07.pdf
+2023/05/25 |     138090 | macros/latex-dev/base/ltnews16.pdf
+2023/05/25 |      13759 | macros/latex-dev/base/lamport-manual.err
+2023/05/25 |      13589 | macros/latex-dev/base/proc.dtx
+2023/05/25 |      13442 | macros/latex-dev/required/amsmath/amsgen.dtx
+2023/05/25 |       1341 | macros/latex-dev/base/ltnews18.tex
+2023/05/25 |     132384 | macros/latex-dev/base/lppl.pdf
+2023/05/25 |    1318562 | macros/latex-dev/base/encguide.pdf
+2023/05/25 |     130323 | macros/latex-dev/base/ltnews15.pdf
+2023/05/25 |     129989 | macros/latex-dev/base/ltnews09.pdf
+2023/05/25 |    1285592 | macros/latex-dev/base/ltnews.pdf
+2023/05/25 |     128521 | macros/latex-dev/required/tools/array.dtx
+2023/05/25 |       1279 | macros/latex-dev/base/legal.txt
+2023/05/25 |     127670 | macros/latex/contrib/oststud/hsrstud-classes.pdf
+2023/05/25 |      12709 | macros/latex-dev/required/tools/dcolumn.dtx
+2023/05/25 |      12559 | macros/latex-dev/required/tools/array-2020-02-10.sty
+2023/05/25 |       1252 | systems/texlive/tlnet/archive/luapstricks.doc.r67207.tar.xz
+2023/05/25 |      12520 | macros/latex-dev/base/testpage.tex
+2023/05/25 |    1242206 | macros/latex-dev/base/lthooks-code.pdf
+2023/05/25 |      12334 | macros/latex-dev/base/ltnews24.tex
+2023/05/25 |     123096 | info/tex-nutshell/tex-nutshell.tex
+2023/05/25 |      12246 | macros/latex-dev/base/tulm.fdd
+2023/05/25 |      12133 | macros/latex-dev/required/tools/longtable-2020-01-07.sty
+2023/05/25 |      12005 | macros/latex-dev/required/amsmath/technote.tex
+2023/05/25 |      11749 | macros/latex-dev/required/tools/array-2016-10-06.sty
+2023/05/25 |     114350 | macros/latex-dev/required/tools/varioref.dtx
+2023/05/25 |      11412 | macros/latex-dev/base/manifest.txt
+2023/05/25 |      11398 | macros/latex-dev/required/amsmath/amstext.dtx
+2023/05/25 |     113952 | systems/texlive/tlnet/archive/texlive-scripts.r67203.tar.xz
+2023/05/25 |     113557 | macros/latex-dev/required/amsmath/amsxtra.pdf
+2023/05/25 |      11284 | macros/latex-dev/required/amsmath/amscd.dtx
+2023/05/25 |     112191 | macros/latex-dev/base/ltnews11.pdf
+2023/05/25 |      11148 | macros/latex-dev/required/tools/hhline.dtx
+2023/05/25 |     109734 | macros/latex-dev/required/amsmath/subeqn.pdf
+2023/05/25 |     108223 | macros/latex-dev/base/fntguide.tex
+2023/05/25 |      10798 | macros/latex-dev/base/ltnews26.tex
+2023/05/25 |      10792 | macros/latex-dev/base/ltnews22.tex
+2023/05/25 |      10791 | macros/latex-dev/base/ltnews23.tex
+2023/05/25 |      10771 | macros/latex-dev/required/tools/fontsmpl.dtx
+2023/05/25 |    1075457 | macros/latex-dev/base/doc-code.pdf
+2023/05/25 |     106904 | macros/latex-dev/base/inputenc.dtx
+2023/05/25 |      10644 | macros/latex-dev/required/tools/enumerate.dtx
+2023/05/25 |      10601 | macros/latex-dev/base/makeindx.dtx
+2023/05/25 |        105 | macros/latex-dev/base/ltfilehook-code.tex
+2023/05/25 |        104 | macros/latex-dev/base/ltshipout-code.tex
+2023/05/25 |     104792 | macros/latex-dev/required/amsmath/amsldoc.tex
+2023/05/25 |     104582 | macros/latex/contrib/listlbls.zip
+2023/05/25 |        103 | macros/latex-dev/base/ltcmdhooks-code.tex
+2023/05/25 |      10370 | macros/latex-dev/base/ltfsscmp.dtx
+2023/05/25 |        102 | macros/latex-dev/base/ltmarks-code.tex
+2023/05/25 |        102 | macros/latex-dev/base/lthooks-code.tex
+2023/05/25 |      10251 | macros/latex-dev/base/webcomp.err
+2023/05/25 |      10199 | macros/latex-dev/required/amsmath/amsopn.dtx
 2023/05/24 |      93736 | systems/texlive/tlnet/archive/kvmap.doc.r67201.tar.xz
 2023/05/24 |      88708 | graphics/pgf/contrib/quantikz/tikzlibraryquantikz2.code.tex
 2023/05/24 |       8776 | systems/texlive/tlnet/archive/kvmap.source.r67201.tar.xz
+2023/05/24 |        863 | macros/latex/contrib/listlbls/README
 2023/05/24 |       8436 | systems/texlive/tlnet/archive/texplate.source.r67201.tar.xz
 2023/05/24 |       8400 | systems/texlive/tlnet/archive/statistics.r67201.tar.xz
 2023/05/24 |       8256 | systems/texlive/tlnet/archive/datetime2-german.source.r67201.tar.xz
@@ -8,12 +468,14 @@
 2023/05/24 |     784168 | systems/texlive/tlnet/archive/caption.doc.r67201.tar.xz
 2023/05/24 |       7604 | systems/texlive/tlnet/archive/actuarialangle.source.r67201.tar.xz
 2023/05/24 |     758848 | systems/texlive/tlnet/archive/arabluatex.doc.r67201.tar.xz
+2023/05/24 |      75717 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
 2023/05/24 |      74980 | systems/texlive/tlnet/archive/pdfpc-movie.doc.r67201.tar.xz
 2023/05/24 |      74160 | systems/texlive/tlnet/archive/totalcount.doc.r67201.tar.xz
 2023/05/24 |       7316 | systems/texlive/tlnet/archive/context-sudoku.r67201.tar.xz
 2023/05/24 |       7008 | systems/texlive/tlnet/archive/pbalance.r67201.tar.xz
 2023/05/24 |       6996 | systems/texlive/tlnet/archive/cellprops.r67201.tar.xz
 2023/05/24 |     689080 | systems/texlive/tlnet/archive/ragged2e.doc.r67201.tar.xz
+2023/05/24 |       6823 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2023/05/24 |     680113 | graphics/pgf/contrib/quantikz/quantikz.pdf
 2023/05/24 |       6796 | systems/texlive/tlnet/archive/templatetools.source.r67201.tar.xz
 2023/05/24 |       6692 | systems/texlive/tlnet/archive/datetime2-serbian.r67201.tar.xz
@@ -28,7 +490,6 @@
 2023/05/24 |     604526 | graphics/pgf/contrib/tikz3d-fr/doc/tikz3d-fr-doc.pdf
 2023/05/24 |     596399 | graphics/pgf/contrib/tikz3d-fr.zip
 2023/05/24 |        591 | graphics/pgf/contrib/quantikz/quantikz.sty
-2023/05/24 |    5736712 | systems/texlive/tlnet/install-tl-unx.tar.gz
 2023/05/24 |       5716 | systems/texlive/tlnet/archive/pdfpc-movie.source.r67201.tar.xz
 2023/05/24 |     567912 | systems/texlive/tlnet/archive/cellprops.doc.r67201.tar.xz
 2023/05/24 |       5572 | systems/texlive/tlnet/archive/newfloat.r67201.tar.xz
@@ -41,12 +502,7 @@
 2023/05/24 |       5224 | systems/texlive/tlnet/archive/contracard.r67201.tar.xz
 2023/05/24 |    4998468 | systems/texlive/tlnet/archive/arara.doc.r67201.tar.xz
 2023/05/24 |       4980 | systems/texlive/tlnet/archive/clojure-pamphlet.source.r67201.tar.xz
-2023/05/24 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2023/05/24 |      48964 | systems/texlive/tlnet/archive/pbalance.doc.r67201.tar.xz
-2023/05/24 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/05/24 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/05/24 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/05/24 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2023/05/24 |      47364 | systems/texlive/tlnet/archive/shortmathj.r67201.tar.xz
 2023/05/24 |     471020 | systems/texlive/tlnet/archive/latexdemo.doc.r67201.tar.xz
 2023/05/24 |       4664 | systems/texlive/tlnet/archive/perfectcut.r67201.tar.xz
@@ -57,14 +513,11 @@
 2023/05/24 |     440896 | systems/texlive/tlnet/archive/templatetools.doc.r67201.tar.xz
 2023/05/24 |     439355 | graphics/pgf/contrib/tikz2d-fr.zip
 2023/05/24 |     439308 | systems/texlive/tlnet/archive/statistics.doc.r67201.tar.xz
-2023/05/24 |     426952 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67195.tar.xz
 2023/05/24 |       4180 | systems/texlive/tlnet/archive/gatherenum.source.r67201.tar.xz
-2023/05/24 |    4076562 | biblio/ctan-bibdata.zip
 2023/05/24 |       4074 | macros/optex/base/optex.ini
 2023/05/24 |       4072 | systems/texlive/tlnet/archive/froufrou.r67201.tar.xz
 2023/05/24 |     406000 | systems/texlive/tlnet/archive/gatherenum.doc.r67201.tar.xz
 2023/05/24 |       3712 | systems/texlive/tlnet/archive/datetime2-german.r67201.tar.xz
-2023/05/24 |    3677558 | biblio/ctan-bibdata/ctan.pdf
 2023/05/24 |       3644 | systems/texlive/tlnet/archive/clojure-pamphlet.r67201.tar.xz
 2023/05/24 |       3620 | systems/texlive/tlnet/archive/algobox.r67201.tar.xz
 2023/05/24 |      35136 | systems/texlive/tlnet/archive/xindex.r67201.tar.xz
@@ -78,16 +531,13 @@
 2023/05/24 |     295576 | systems/texlive/tlnet/archive/checkcites.doc.r67201.tar.xz
 2023/05/24 |       2924 | systems/texlive/tlnet/archive/mlacls.r67201.tar.xz
 2023/05/24 |     282880 | systems/texlive/tlnet/archive/actuarialsymbol.doc.r67201.tar.xz
-2023/05/24 |    2786426 | biblio/ctan-bibdata/ctan.bib
 2023/05/24 |     277144 | systems/texlive/tlnet/archive/datetime2-serbian.doc.r67201.tar.xz
 2023/05/24 |       2728 | systems/texlive/tlnet/archive/actuarialsymbol.r67201.tar.xz
 2023/05/24 |     272248 | systems/texlive/tlnet/archive/icite.doc.r67201.tar.xz
 2023/05/24 |       2688 | systems/texlive/tlnet/archive/kvmap.r67201.tar.xz
-2023/05/24 |   26025729 | systems/texlive/tlnet/install-tl.zip
 2023/05/24 |      25862 | graphics/pgf/contrib/tikz3d-fr/doc/tikz3d-fr-doc.tex
 2023/05/24 |    2547509 | macros/optex.zip
 2023/05/24 |       2472 | systems/texlive/tlnet/archive/latexdemo.r67201.tar.xz
-2023/05/24 |    2451132 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2023/05/24 |       2448 | systems/texlive/tlnet/archive/icite.r67201.tar.xz
 2023/05/24 |      23732 | systems/texlive/tlnet/archive/statistics.source.r67201.tar.xz
 2023/05/24 |       2276 | systems/texlive/tlnet/archive/glossaries-nynorsk.source.r67201.tar.xz
@@ -96,7 +546,6 @@
 2023/05/24 |     214668 | systems/texlive/tlnet/archive/caption.source.r67201.tar.xz
 2023/05/24 |     213696 | systems/texlive/tlnet/archive/clojure-pamphlet.doc.r67201.tar.xz
 2023/05/24 |       2104 | systems/texlive/tlnet/archive/templatetools.r67201.tar.xz
-2023/05/24 |   21036660 | systems/texlive/tlnet/install-tl-windows.exe
 2023/05/24 |       2012 | systems/texlive/tlnet/archive/actuarialangle.r67201.tar.xz
 2023/05/24 |       1988 | systems/texlive/tlnet/archive/textualicomma.r67201.tar.xz
 2023/05/24 |      19824 | systems/texlive/tlnet/archive/arabluatex.r67201.tar.xz
@@ -104,13 +553,12 @@
 2023/05/24 |       1916 | systems/texlive/tlnet/archive/lualatex-truncate.r67201.tar.xz
 2023/05/24 |      18312 | systems/texlive/tlnet/archive/contracard.source.r67201.tar.xz
 2023/05/24 |     182432 | systems/texlive/tlnet/archive/contracard.doc.r67201.tar.xz
-2023/05/24 |   18111166 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/05/24 |      17816 | macros/latex/contrib/listlbls/listlbls.dtx
 2023/05/24 |       1732 | systems/texlive/tlnet/archive/biblatex2bibitem.r67201.tar.xz
 2023/05/24 |       1708 | systems/texlive/tlnet/archive/gatherenum.r67201.tar.xz
 2023/05/24 |    1702312 | systems/texlive/tlnet/archive/oldstandard.r67201.tar.xz
 2023/05/24 |       1700 | systems/texlive/tlnet/archive/glossaries-nynorsk.r67201.tar.xz
 2023/05/24 |      16885 | graphics/pgf/contrib/tikz2d-fr/doc/tikz2d-fr-doc.tex
-2023/05/24 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
 2023/05/24 |       1676 | systems/texlive/tlnet/archive/movement-arrows.r67201.tar.xz
 2023/05/24 |     167564 | systems/texlive/tlnet/archive/perfectcut.doc.r67201.tar.xz
 2023/05/24 |       1640 | systems/texlive/tlnet/archive/totalcount.r67201.tar.xz
@@ -118,13 +566,10 @@
 2023/05/24 |      15960 | systems/texlive/tlnet/archive/pbalance.source.r67201.tar.xz
 2023/05/24 |      15704 | systems/texlive/tlnet/archive/datetime2-serbian.source.r67201.tar.xz
 2023/05/24 |       1552 | systems/texlive/tlnet/archive/context-sudoku.doc.r67201.tar.xz
-2023/05/24 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/05/24 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
 2023/05/24 |    1525711 | macros/optex/doc/optex-doc.pdf
 2023/05/24 |       1500 | systems/texlive/tlnet/archive/circuit-macros.r67201.tar.xz
 2023/05/24 |      14664 | systems/texlive/tlnet/archive/newfloat.source.r67201.tar.xz
-2023/05/24 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/05/24 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/05/24 |       1465 | macros/latex/contrib/listlbls/Makefile
 2023/05/24 |      13580 | systems/texlive/tlnet/archive/cellprops.source.r67201.tar.xz
 2023/05/24 |      13520 | systems/texlive/tlnet/archive/icite.source.r67201.tar.xz
 2023/05/24 |     133104 | systems/texlive/tlnet/archive/datetime2-german.doc.r67201.tar.xz
@@ -137,14 +582,13 @@
 2023/05/24 |     118032 | systems/texlive/tlnet/archive/textualicomma.doc.r67201.tar.xz
 2023/05/24 |     115676 | systems/texlive/tlnet/archive/arara.source.r67201.tar.xz
 2023/05/24 |     114612 | systems/texlive/tlnet/archive/texplate.doc.r67201.tar.xz
-2023/05/24 |     114072 | systems/texlive/tlnet/archive/texlive-scripts.r67195.tar.xz
+2023/05/24 |     102919 | macros/latex/contrib/listlbls/listlbls.pdf
 2023/05/24 |      10161 | graphics/pgf/contrib/tikz3d-fr/tex/tikz3d-fr.sty
 2023/05/24 |      10080 | systems/texlive/tlnet/archive/mlacls.source.r67201.tar.xz
 2023/05/24 |     100188 | systems/texlive/tlnet/archive/newfloat.doc.r67201.tar.xz
 2023/05/23 |     998152 | systems/texlive/tlnet/archive/kaytannollista-latexia.doc.r67190.tar.xz
 2023/05/23 |       9802 | graphics/pstricks/contrib/luapstricks/luapstricks-plugin-pstcie.lua
 2023/05/23 |       7624 | graphics/pstricks/contrib/luapstricks/PSTricksDotFont.otf
-2023/05/23 |       7434 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2023/05/23 |       6888 | systems/texlive/tlnet/archive/collection-latexextra.r67187.tar.xz
 2023/05/23 |      67572 | systems/texlive/tlnet/archive/letgut.source.r67192.tar.xz
 2023/05/23 |       6428 | systems/texlive/tlnet/archive/yb-book.source.r67188.tar.xz
@@ -330,6 +774,7 @@
 2023/05/21 |     260236 | systems/texlive/tlnet/archive/huawei.r67170.tar.xz
 2023/05/21 |        255 | macros/luatex/latex/letgut/doc/listings-conf.tex
 2023/05/21 |      25212 | macros/luatex/latex/letgut/source/letgut-banner.org
+2023/05/21 |      23716 | macros/latex/contrib/oststud/oststud.dtx
 2023/05/21 |     220368 | systems/texlive/tlnet/archive/starray.doc.r67173.tar.xz
 2023/05/21 |    2114486 | macros/latex/contrib/proflycee.zip
 2023/05/21 |      20613 | info/kaytannollista-latexia/luku-erikoiset.tex
@@ -1356,93 +1801,3 @@
 2023/05/19 |      10128 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.tex
 2023/05/19 |      10077 | macros/luatex/generic/evangelion-jfm/figure/fig-jp.pdf
 2023/05/19 |      10074 | macros/latex/contrib/profcollege/latex/PfCRose.tex
-2023/05/18 |        998 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
-2023/05/18 |      95276 | systems/win32/miktex/tm/packages/unicode-math-input__doc.tar.lzma
-2023/05/18 |       9353 | macros/optex/README
-2023/05/18 |       9240 | macros/latex/contrib/biblatex-contrib/biblatex-publist/README
-2023/05/18 |     911675 | graphics/pgf/contrib/dynkin-diagrams.zip
-2023/05/18 |     891080 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
-2023/05/18 |     884806 | systems/win32/miktex/tm/packages/texfindpkg.tar.lzma
-2023/05/18 |       8585 | systems/win32/miktex/tm/packages/starray.tar.lzma
-2023/05/18 |       8424 | systems/win32/miktex/tm/packages/sympycalc__source.tar.lzma
-2023/05/18 |     828335 | systems/win32/miktex/tm/packages/mcf2graph__doc.tar.lzma
-2023/05/18 |    7735016 | systems/win32/miktex/tm/packages/hvfloat__doc.tar.lzma
-2023/05/18 |       7298 | systems/win32/miktex/tm/packages/codedescribe__source.tar.lzma
-2023/05/18 |       7271 | systems/win32/miktex/tm/packages/starray__source.tar.lzma
-2023/05/18 |     700676 | systems/texlive/tlnet/archive/libertinus-otf.doc.r67139.tar.xz
-2023/05/18 |     693108 | systems/win32/miktex/tm/packages/libertinus-otf__doc.tar.lzma
-2023/05/18 |      66301 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
-2023/05/18 |      65771 | systems/win32/miktex/tm/packages/plantuml__doc.tar.lzma
-2023/05/18 |      64675 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
-2023/05/18 |      62368 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
-2023/05/18 |     594546 | systems/win32/miktex/tm/packages/l3kernel__source.tar.lzma
-2023/05/18 |    5770052 | systems/win32/miktex/tm/packages/newcomputermodern.tar.lzma
-2023/05/18 |      51945 | systems/win32/miktex/tm/packages/textcsc__doc.tar.lzma
-2023/05/18 |      49687 | systems/win32/miktex/tm/packages/thuthesis__source.tar.lzma
-2023/05/18 |       4826 | systems/win32/miktex/tm/packages/ptlatexcommands__source.tar.lzma
-2023/05/18 |      44931 | systems/win32/miktex/tm/packages/thuthesis.tar.lzma
-2023/05/18 |     441977 | macros/latex/contrib/biblatex-contrib/biblatex-publist.zip
-2023/05/18 |       4200 | systems/win32/miktex/tm/packages/libertinus-otf.tar.lzma
-2023/05/18 |       4196 | macros/latex/contrib/proflycee/tex/proflycee-tools-aleatoire.tex
-2023/05/18 |     408650 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
-2023/05/18 |     404561 | systems/win32/miktex/tm/packages/sanitize-umlaut__doc.tar.lzma
-2023/05/18 |       4032 | systems/texlive/tlnet/archive/libertinus-otf.r67139.tar.xz
-2023/05/18 |      39561 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
-2023/05/18 |       3911 | systems/win32/miktex/tm/packages/adobeornaments__source.tar.lzma
-2023/05/18 |       3633 | systems/win32/miktex/tm/packages/ptlatexcommands.tar.lzma
-2023/05/18 |      36253 | systems/win32/miktex/tm/packages/mcf2graph__source.tar.lzma
-2023/05/18 |      35176 | systems/win32/miktex/tm/packages/tagpdf.tar.lzma
-2023/05/18 |       3479 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
-2023/05/18 |        342 | graphics/pgf/contrib/dynkin-diagrams/README
-2023/05/18 |     330158 | systems/win32/miktex/tm/packages/adobeornaments__doc.tar.lzma
-2023/05/18 |       3183 | systems/win32/miktex/tm/packages/textcsc__source.tar.lzma
-2023/05/18 |    3149976 | systems/win32/miktex/tm/packages/animate__doc.tar.lzma
-2023/05/18 |      30600 | systems/win32/miktex/tm/packages/animate__source.tar.lzma
-2023/05/18 |    2928724 | systems/win32/miktex/tm/packages/beamer__doc.tar.lzma
-2023/05/18 |     264203 | systems/win32/miktex/tm/packages/tikz-nfold__doc.tar.lzma
-2023/05/18 |       2433 | systems/win32/miktex/tm/packages/sympycalc.tar.lzma
-2023/05/18 |       2432 | systems/win32/miktex/tm/packages/plantuml.tar.lzma
-2023/05/18 |      24085 | systems/win32/miktex/tm/packages/animate.tar.lzma
-2023/05/18 |     237956 | systems/texlive/tlnet/archive/codedescribe.doc.r67140.tar.xz
-2023/05/18 |     233167 | systems/win32/miktex/tm/packages/tagpdf__source.tar.lzma
-2023/05/18 |     232133 | systems/win32/miktex/tm/packages/codedescribe__doc.tar.lzma
-2023/05/18 |       2285 | systems/win32/miktex/tm/packages/sanitize-umlaut.tar.lzma
-2023/05/18 |      22654 | systems/win32/miktex/tm/packages/mcf2graph.tar.lzma
-2023/05/18 |       2264 | systems/texlive/tlnet/archive/glossaries-norsk.source.r67141.tar.xz
-2023/05/18 |     209775 | systems/win32/miktex/tm/packages/hu-berlin-bundle__doc.tar.lzma
-2023/05/18 |    2094520 | systems/win32/miktex/tm/packages/pst-labo__doc.tar.lzma
-2023/05/18 |    2089418 | systems/win32/miktex/tm/packages/kpfonts-otf__doc.tar.lzma
-2023/05/18 |      20649 | systems/win32/miktex/tm/packages/kpfonts-otf__source.tar.lzma
-2023/05/18 |       1999 | systems/win32/miktex/tm/packages/plantuml__source.tar.lzma
-2023/05/18 |     199865 | systems/win32/miktex/tm/packages/starray__doc.tar.lzma
-2023/05/18 |    1976490 | systems/win32/miktex/tm/packages/nicematrix__doc.tar.lzma
-2023/05/18 |      19483 | systems/win32/miktex/tm/packages/hu-berlin-bundle__source.tar.lzma
-2023/05/18 |     191675 | systems/win32/miktex/tm/packages/circuitikz.tar.lzma
-2023/05/18 |    1911248 | systems/win32/miktex/tm/packages/tagpdf__doc.tar.lzma
-2023/05/18 |    1844425 | systems/win32/miktex/tm/packages/hvfloat__source.tar.lzma
-2023/05/18 |    1794677 | systems/win32/miktex/tm/packages/circuitikz__doc.tar.lzma
-2023/05/18 |       1786 | systems/win32/miktex/tm/packages/adobeornaments.tar.lzma
-2023/05/18 |       1784 | systems/texlive/tlnet/archive/glossaries-norsk.r67141.tar.xz
-2023/05/18 |       1756 | systems/texlive/tlnet/archive/glossaries-norsk.doc.r67141.tar.xz
-2023/05/18 |     172566 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
-2023/05/18 |     169518 | systems/win32/miktex/tm/packages/beamer.tar.lzma
-2023/05/18 |    1690252 | systems/win32/miktex/tm/packages/thuthesis__doc.tar.lzma
-2023/05/18 |      16752 | systems/win32/miktex/tm/packages/unicode-math-input.tar.lzma
-2023/05/18 |      16433 | systems/win32/miktex/tm/packages/tikz-nfold.tar.lzma
-2023/05/18 |    1635900 | systems/win32/miktex/tm/packages/newcomputermodern__doc.tar.lzma
-2023/05/18 |     162044 | systems/win32/miktex/tm/packages/nicematrix__source.tar.lzma
-2023/05/18 |     153837 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
-2023/05/18 |      15165 | systems/win32/miktex/tm/packages/hu-berlin-bundle.tar.lzma
-2023/05/18 |     138623 | systems/win32/miktex/tm/packages/sympycalc__doc.tar.lzma
-2023/05/18 |      13604 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
-2023/05/18 |     132167 | systems/win32/miktex/tm/packages/ptlatexcommands__doc.tar.lzma
-2023/05/18 |       1315 | systems/win32/miktex/tm/packages/textcsc.tar.lzma
-2023/05/18 |   12879357 | systems/win32/miktex/tm/packages/newcomputermodern__source.tar.lzma
-2023/05/18 |   11839351 | systems/win32/miktex/tm/packages/l3kernel__doc.tar.lzma
-2023/05/18 |      11726 | systems/win32/miktex/tm/packages/unicode-math-input__source.tar.lzma
-2023/05/18 |      11378 | systems/win32/miktex/tm/packages/pst-labo.tar.lzma
-2023/05/18 |      11095 | systems/win32/miktex/tm/packages/codedescribe.tar.lzma
-2023/05/18 |    1108311 | systems/win32/miktex/tm/packages/kpfonts-otf.tar.lzma
-2023/05/18 |      10840 | systems/texlive/tlnet/archive/codedescribe.r67140.tar.xz
-2023/05/18 |      10067 | systems/win32/miktex/tm/packages/libertinus-otf__source.tar.lzma
-2023/05/18 |      10046 | systems/win32/miktex/tm/packages/pst-labo__source.tar.lzma
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index e01bbac2bf..79bc2a7e16 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
 %% bib file of all CTAN packages
 %% (C) Herbert Voß
 %% 
-%% created at 25-05-2023, 02:02:22
+%% created at 26-05-2023, 02:00:59
 %% 
 
 %% This file is provided under the terms of the LPPL v1.3 or
@@ -7334,8 +7334,8 @@
   title      = {The \texttt{biblatex-gb7714-2015} package},
   subtitle   = {A Bib\LaTeX{} implementation of the GBT7714-2015 bibliography style for Chinese users},
   author     = {Hu Zhenzhen},
-  date       = {2023-04-24},
-  version    = {1.1m},
+  date       = {2023-05-25},
+  version    = {1.1n},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015},
   url        = {https://ctan.org/pkg/biblatex-gb7714-2015},
@@ -20230,8 +20230,8 @@
   title      = {The \texttt{dynkin-diagrams} package},
   subtitle   = {Draw Dynkin, Coxeter, and Satake diagrams using TikZ},
   author     = {Benjamin McKay},
-  date       = {2023-05-18},
-  version    = {3.14159265358979323},
+  date       = {2023-05-25},
+  version    = {3.141592653589793238},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/graphics/pgf/contrib/dynkin-diagrams},
   url        = {https://ctan.org/pkg/dynkin-diagrams},
@@ -36992,8 +36992,8 @@
   title      = {The \texttt{latex-amsmath-dev} package},
   subtitle   = {Development pre-release of the \LaTeX{} amsmath bundle},
   author     = {{The \LaTeX{} Project Team}},
-  date       = {2022-11-02},
-  version    = {2023-05-01 pre-release 0},
+  date       = {2023-05-25},
+  version    = {2023-06-01 pre-release 3},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex-dev/required/amsmath},
   url        = {https://ctan.org/pkg/latex-amsmath-dev},
@@ -37019,8 +37019,8 @@
   title      = {The \texttt{latex-base-dev} package},
   subtitle   = {Development pre-release of the \LaTeX{} kernel},
   author     = {{The \LaTeX{} Project Team}},
-  date       = {2023-03-09},
-  version    = {2023-06-01 pre-release 2},
+  date       = {2023-05-25},
+  version    = {2023-06-01 pre-release 3},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex-dev/base},
   url        = {https://ctan.org/pkg/latex-base-dev},
@@ -37191,8 +37191,8 @@
   title      = {The \texttt{latex-firstaid-dev} package},
   subtitle   = {Development pre-release of the \LaTeX{} firstaid package},
   author     = {{The \LaTeX{} Project Team}},
-  date       = {2022-12-03},
-  version    = {1.0w},
+  date       = {2023-05-25},
+  version    = {1.0z},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex-dev/required/firstaid},
   url        = {https://ctan.org/pkg/latex-firstaid-dev},
@@ -37454,8 +37454,8 @@
   title      = {The \texttt{latex-tools-dev} package},
   subtitle   = {Development pre-release of the \LaTeX{} tools bundle},
   author     = {{The \LaTeX{} Project Team}},
-  date       = {2022-11-02},
-  version    = {2023-05-01 pre-release 0},
+  date       = {2023-05-25},
+  version    = {2023-06-01 pre-release 3},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex-dev/required/tools},
   url        = {https://ctan.org/pkg/latex-tools-dev},
@@ -39453,8 +39453,8 @@
   title      = {The \texttt{listlbls} package},
   subtitle   = {Creates a list of all labels used throughout a document},
   author     = {Norbert Melzer},
-  date       = {2021-08-26},
-  version    = {1.03},
+  date       = {2023-05-25},
+  version    = {1.04},
   license    = {lppl1.3},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/listlbls},
   url        = {https://ctan.org/pkg/listlbls},
@@ -48089,8 +48089,8 @@
   title      = {The \texttt{nicematrix} package},
   subtitle   = {Improve the typesetting of mathematical matrices with PGF},
   author     = {François Pantigny},
-  date       = {2023-05-15},
-  version    = {6.19},
+  date       = {2023-05-25},
+  version    = {6.19a},
   license    = {lppl1.3},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/nicematrix},
   url        = {https://ctan.org/pkg/nicematrix},
@@ -49962,8 +49962,8 @@
   title      = {The \texttt{oststud} package},
   subtitle   = {Templates for the student organization at OST FH, Switzerland},
   author     = {Naoki Pross},
-  date       = {2023-04-28},
-  version    = {0.3},
+  date       = {2023-05-25},
+  version    = {0.4},
   license    = {cc-by-sa-4},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/oststud},
   url        = {https://ctan.org/pkg/oststud},
@@ -66832,8 +66832,8 @@
   title      = {The \texttt{TeX-nutshell} package},
   subtitle   = {A short document about \TeX{} principles},
   author     = {Petr Olšák},
-  date       = {2022-05-18},
-  version    = {0.8},
+  date       = {2023-05-25},
+  version    = {0.9},
   license    = {pd},
   mirror     = {https://mirror.ctan.org/info/tex-nutshell},
   url        = {https://ctan.org/pkg/tex-nutshell},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 25f9450ed4..3ae0346015 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
index 66db61382a..6a0b9acda0 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
index 6173132ee6..20d2e09eb0 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
@@ -1,6 +1,6 @@
 % The Dynkin Diagrams package.
 %
-% Version 3.141 592 653 589 793 23
+% Version 3.141 592 653 589 793 238
 %
 % This package draws Dynkin diagrams in LaTeX 
 % documents, using the TikZ package.
@@ -13,12 +13,10 @@
 % Released under the LaTeX Project Public License v1.3c or later, see 
 % http://www.latex-project.org/lppl.txt
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{dynkin-diagrams}[2023/05/18 Dynkin diagrams]
+\ProvidesPackage{dynkin-diagrams}[2023/05/25 Dynkin diagrams]
 \RequirePackage{tikz}
 \RequirePackage{xstring}
-\RequirePackage{xparse}
 \RequirePackage{etoolbox}
-\RequirePackage{expl3}
 \RequirePackage{pgfkeys}
 \RequirePackage{pgfopts}
 \RequirePackage{amsmath}
@@ -130,15 +128,21 @@
 	\xdef\dynkin@string{#4}%
 	\xdef\dynkin@series{#2}%
 	\dynkin@grok@series%
-	\IfSubStr{ABCDEFGHI}{\dynkin@series}{}{\dynkin@error@series}%
-	\IfInteger{\dynkin@string}%
-	{%
+	\expandafter\expandafter%
+	\ifx\csname dynkin\dynkin@series \endcsname\relax%
+	% Undefined series
+	\dynkin@error@series%
+	\fi	
+%%	\IfSubStr{ABCDEFGHI}{\dynkin@series}{}{\dynkin@error@series}%
+%%	\IfInteger{\dynkin@string}%
+	\if!\ifnum9<1\dynkin@string!\fi%
+%%	{%
 		\dynkin@integer@rank%
-	}%
-	{%
+%%	}%
+%%	{%
 		% Turn Satake codes into Dynkin diagram expressions in \dynkin@string.
-		\dynkin@grok@Satake@codes%
-	}%
+\else\dynkin@grok@Satake@codes\fi%
+%%	}%
 	% Expand out any digits in \dynkin@string into multiples of the various root marks.
 	\expand@Dynkin@Roots@Digits%
 	% Assign to \dynkin@roots the input string \dynkin@string with all . symbols removed,
@@ -4962,19 +4966,33 @@
 %% Draws an F series Dynkin diagram.
 \newcommand*{\Fdynkin}%
 {%
-	\dynkinPlaceRootHere*{1}{below}{above}%
-	\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
-	\dynkinPlaceRootRelativeTo*{3}{2}{east}{below}{above}%
-	\dynkinPlaceRootRelativeTo*{4}{3}{east}{below}{above}%
-	\ifdynkin@Coxeter%
+	\ifnum\dynkin@ply>1\relax%
+		\dynkin@jump{1}%
+		\dynkinPlaceRootHere*{1}{left}{above}%
+		\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{3}{2}{southfold}{left}{below}%
+		\dynkinEdge*{DoubleDownRightSemiCircle}{2}{3}%
+		\dynkinPlaceRootRelativeTo*{4}{3}{west}{below}{above}%
+		\ifdynkin@arrows%
+			\dynkinLeftFold*{1}{4}%
+		\fi%
 		\dynkinEdge*{SingleEdge}{1}{2}%
-		\dynkinEdge*{SingleEdge}{2}{3}%
 		\dynkinEdge*{SingleEdge}{3}{4}%
-		\dynkinEdgeLabel{2}{3}{4}%
 	\else%
-		\dynkinEdge*{SingleEdge}{1}{2}%
-		\dynkinEdge*{SingleEdge}{3}{4}%
-		\dynkinEdge*{DoubleEdge}{2}{3}%
+		\dynkinPlaceRootHere*{1}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{3}{2}{east}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{4}{3}{east}{below}{above}%
+		\ifdynkin@Coxeter%
+			\dynkinEdge*{SingleEdge}{1}{2}%
+			\dynkinEdge*{SingleEdge}{2}{3}%
+			\dynkinEdge*{SingleEdge}{3}{4}%
+			\dynkinEdgeLabel{2}{3}{4}%
+		\else%
+			\dynkinEdge*{SingleEdge}{1}{2}%
+			\dynkinEdge*{SingleEdge}{3}{4}%
+			\dynkinEdge*{DoubleEdge}{2}{3}%
+		\fi%
 	\fi%
 }%
 %% \Gdynkin 
@@ -5239,6 +5257,7 @@
 	\xdef\dynkin@fold@radius{\pgfmathresult pt}%
 	\dynkin@fold{2}{\the\dynkin@rank@minus@two}%
 	% We place the root number rank-2 once again (it is already placed in the \dynkin@fold):
+	\dynkinMoveToRoot*{\the\dynkin@rank@minus@two}% 
 	\dynkinPlaceRootHere*%
 		{\the\dynkin@rank@minus@two}%
 		{below right}{above right}%
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
index 8e4901234e..9523f43845 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
@@ -1,7 +1,7 @@
 \documentclass{amsart}
 \title[The Dynkin diagrams package]%
 {The Dynkin diagrams package \\ 
-Version 3.141\,592\,653\,589\,793\,23}
+Version 3.141\,592\,653\,589\,793\,238}
 %% My name:
 \makeatletter
 \DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -20,7 +20,7 @@ Version 3.141\,592\,653\,589\,793\,23}
 \author{Ben \scotsMc{}Kay}
 \address{School of Mathematical Sciences,  University College Cork, Cork, Ireland}
 \email{b.mckay@ucc.ie}
-\date{18 May 2023}
+\date{25 May 2023}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenx}
 \usepackage{etoolbox} 
@@ -321,11 +321,13 @@ G_2&\dynkins{G2}&\texttt{\detokenize{\dynkins}\{G2\}}\\
 [Coxeter]A{};
 [Coxeter]B{};
 [Coxeter]C{};
+[Coxeter]D{};
 [Coxeter]E6;
 [Coxeter]E7;
 [Coxeter]E8;
 [Coxeter]F4;
 [Coxeter,gonality=n]G2;
+[Coxeter]H2;
 [Coxeter]H3;
 [Coxeter]H4;
 [Coxeter,gonality=n]I{}}
diff --git a/info/tex-nutshell/tex-nutshell.pdf b/info/tex-nutshell/tex-nutshell.pdf
index b8a8da3b93..5f2405138c 100644
--- a/info/tex-nutshell/tex-nutshell.pdf
+++ b/info/tex-nutshell/tex-nutshell.pdf
diff --git a/info/tex-nutshell/tex-nutshell.tex b/info/tex-nutshell/tex-nutshell.tex
index 18077c7bf7..dbff5fdc2c 100644
--- a/info/tex-nutshell/tex-nutshell.tex
+++ b/info/tex-nutshell/tex-nutshell.tex
@@ -19,7 +19,6 @@
 \def\testAleB #1#2#3\relax #4#5#6\relax{%
    \ifnum `#2<`#5 \_AleBtrue \else \_AleBfalse \fi
 }
-
 \catcode`<=13
 \def<#1>{{\def\_dsp { }\iindex{:#1}\iis {:#1} {$\langle\hbox{\it#1}\rangle$}}%
    $\def\,{\hskip1.5pt plus.3pt minus1.2pt}\,\langle\hbox{\it#1}\rangle\,$}
@@ -422,7 +421,8 @@ command working only in horizontal mode or a character itself ---
 then the main processor switches to \ii horizontal/mode,@ {\em horizontal mode}: it opens 
 an unlimited horizontal data row for
 typesetting material and puts material next to each other. For example
-\i hbox `\hbox{a}\hbox{b}\hbox{c}` creates abc in horizontal mode.
+\i hbox `a\hbox{b}\hbox{c}` opens horizontal mode due to \"a character
+itself" `a` and creates abc in horizontal mode.
 
 When an empty line is scanned, the tokenizer creates a \i par `\par` token here and
 if the main processor is in horizontal mode, the `\par` command finalizes the
@@ -801,6 +801,9 @@ The rule \"everything must be balanced" is applied to separated parameters
 too. It means that `\Test AB{C..DEF G}.. H` from the example above reads
 `B{C..DEF G}` to the `#2` parameter and the `#3` parameter is empty 
 because the space (the delimiter of `#3` parameter) immediately follows two dots.
+If the real parameter is in the form `{...}` then the outer
+braces are removed from the parameter. For example `\Test A{C..DEF G}.. H`
+reads `C..DEF G` to the `#2`.
 
 The separated parameter can bring a potential problem if the user forgets the
 delimiter or the delimiter is specified incorrectly. Then \TeX/ reports an
@@ -823,7 +826,7 @@ then the number of `#` must be doubled for inner declaration. Example:
 
 \begtt
 \def\defmacro#1#2{%
-   \def#1##1 ##2 {##1 says: #1 ##2.}%
+   \def#1##1 ##2 {##1 says: #2 ##2.}%
 }
 \defmacro \hello   {hello} % expands to \def\hello#1 #2 {#1 says: hello #2.}
 \defmacro \goodbye {good bye}
@@ -895,7 +898,8 @@ All typographical traditions of math typesetting were taken into account.
 There are three chapters about math typesetting in his \TeX/book. Moreover,
 there is the detailed appendix G containing the exact specification of generating math
 formulae. This topic is unfortunately out of the scope of this short
-text.
+text. More about it can be found in
+\ulink[http://petr.olsak.net/ftp/olsak/optex/optex-math.pdf]{Typesetting Math with \OpTeX/}
 
 There is a good a piece of news: all formats (including \LaTeX/) take the default \TeX/
 syntax for `<math text>`. So, \LaTeX/ manuals or \LaTeX/ documents
@@ -1228,6 +1232,12 @@ detail).
   These spaces are inserted above and below a formula generated in math display
   mode.
 
+* \y`\thinmuskip=3mu`,
+  \y`\medmuskip=4mu plus 2mu minus 4mu`, 
+  \y`\thickmuskip=5mu plus 5mu`.
+  These spaces are inserted after comma, around binary operators, and around
+  relations in math mode. The special math unit {\tt 1mu} is $(1/18)${\tt em}.
+  
 * \y`\tabskip=0pt` is used by the `\halign` primitive command for creating tables.
 
 * \y`\output={\plainoutput}`, \y`\everypar={}`, \y`\everymath={}`
@@ -1308,17 +1318,21 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
 \endtt
 
 * \i expandafter \z`\expandafter|<token 1><token 2>;` does the transformation
-  \z`<token 1><expanded token2>`. The token processor will expand \z`<token 1>`
-  after such a transformation. The \z`<expanded token2>` is only the first level of
+  \z`<token 1><expanded token 2>`. Then \TeX/ processes `<token 1>` followed by
+  `<expanded token 2>`. 
+  If `<token 2>` isn't expandable then `\expandafter` silently does nothing.
+  The \z`<expanded token2>` is only the first level of
   expansion. For example, a macro is transformed to its `<replacement text>`
   but without expansion of `<replacement text>` at this time.
   Or the `\csname...\endcsname` pair creates a control sequence but does not
   expand it at this time.
 
-  If \z`<token 2>` is not expandable then \x`\expandafter` silently does
-  nothing.
+%  If \z`<token 2>` is not expandable then \x`\expandafter` silently does
+%  nothing.
 
-  The example above (the `\keyval` macro) shows the usage of \x`\expandafter`.
+  A typical usage: the `<token 1>` is a macro or a \TeX/
+  primitive which needs `<expanded token 2>` as its parameter.
+  The example above (the `\keyval` macro) shows this case.
   We need not define `\csname` by `\def`; we want to define 
   a `\dict:key`. The \x`\expandafter` helps here.
 
@@ -1479,7 +1493,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
   {\em do something} and it gets a \x`\chardef`-ed control sequence, it prints
   the character with Unicode (ASCII code) `<number>` to the typesetting output. 
   If it gets a \x`\mathchardef`-ed control sequence, it prints a math object (it works
-  only in math mode, not documented here).
+  only in math mode).
 
 * \i countdef `\countdef|<control sequence>;=<number>` declares `<control sequence>` as
   an equivalent to the `\count<number>` which is a register of counter type. 
@@ -1773,6 +1787,14 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
   number type then the result is truncated.
 * See \*`\numexpr` and \*`\dimexpr`, expandable primitives documented in
   sections~\ref[reg] and~\ref[expand].
+* \*\*\i pdfuniformdeviate `\pdfuniformdeviate<number>` expands to a random
+  number uniformly distributed in the range 0 (inclusive) to
+  `<number>` (exclusive). Normal distribution between $-65536$ and $65536$
+  can be reached by \*\*\i pdfnormaldeviate `\pdfnormaldeviate`.
+  The generator is initialized by time of the compilation, or you can use
+  \*\*\i pdfsetrandomseed `\pdfsetrandomseed<number>` to do fixed
+  initialization, `<number>` is an integer less than 1,000,999,999.
+  Luatex supports the same primitives but without `\pdf` prefix.
 \enditems
 
 \noindent {\bf Internal codes}
@@ -2038,13 +2060,16 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
   This feature is supported by pdf\TeX/ only.
 \enditems
 
-\noindent {\bf Commands used in math mode}
+\goodbreak\noindent {\bf Commands used in math mode}
 
 \begitems
 * \x`\displaystyle`, \x`\textstyle`, \x`\scriptstyle`, \x`\scriptscriptstyle`
-  switch to the specified style.
+  are `<style primitive>`\kern-2pts. They switch to the specified style.
+  \i mathchoice `\mathchoice{<D>}{<T>}{<S>}{<SS>}` prints only one its
+  agrument dependent on the current math style.
 * \x`\mathord`, \x`\mathop`, \x`\mathbin`, \x`\mathrel`, \x`\mathopen`, \x`\mathclose`,
-  \x`\mathpunct` followed by `{<math list>}` create a math object of the given type.
+  \x`\mathpunct` followed by `{<math list>}` create a math object of the given
+  class.
 * \i over `{<numerator>\over<denominator>}` creates a fraction.
   The primitive commands \x`\atop` (without fraction rule), 
   \i above `\above<dimen>` (fraction rule with given thickness) should be used in the same
@@ -2069,6 +2094,102 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
   \i leqno `$$<formula>\leqno<mark>$$` puts it to the left margin.
 \enditems
 
+\noindent {\bf Commands for setting math codes and math-family fonts}\par\nobreak\medskip
+
+Each character used in math mode must have its {\em math-code}. It includes
+{\em class} of the character and how the glyph of the character should be printed.
+The class is one of this: 0=Ord, 1=Op, 2=Bin, 3=Rel, 4=Open, 5=Close, 6=Punct,
+and it affects spacing between objects, super/sub/script behavior etc.
+The glyph for printing the character is saved in a {\em math-family font} at
+its {\em slot}. Each math-family font has an assigned number using
+`\textfont`, `\scriptfont` and `\scriptscriptfont` primitives.
+When old 7bit \TeX/ fonts are
+used, then the whole set of math characters is divided to more math-family
+fonts, each of them has its own number. When Unicode math is used
+then all math characters are stored in a single font and we (almost) never
+need to use more than single math-family font with a single number.
+The format must specify the math-code (i.e. class, math-family font number
+and slot) for all characters used in math mode by following primitives.
+
+The `<math-code>` mentioned below is a single 15bit number mostly used in hexadecimal
+form with four digits: `"<d1><d2><d3><d4>`, where `<d1>` is the class, `<d2>` is
+the math-family font number and `<d3><d4>` is the slot.
+
+\begitems
+* \i mathcode `\mathcode <num>=<math-code>` sets the math-code for the character given
+  by its <num> ASCII code. The `<num>` is 8bit number.
+* \i mathchardef `\mathchardef <sequence>=<math-code>` declares math-code for
+  given `<sequence>`. When the `<sequence>` is used in math mode then it behaves
+  as a single object equal to a real single character with its `<math-code>`.
+* \i textfont `\textfont<num>=<font>` declares math-family font `<num>` as
+  `<font>` for normal size characters. The `<font>` is a font selector given
+  previously by `\font` primitive.
+* \i scriptfont `\scriptfont<num>=<font>` declares math-family font `<num>` as
+  `<font>` for script size.
+* \i scriptscriptfont `\scriptscriptfont<num>=<font>` declares math-family font `<num>` as
+  `<font>` for script-in-script size.
+\enditems
+
+Unicode values can be set in \XeTeX/ and \LuaTeX/:
+
+\begitems
+* \*\*\*\i Umathcode `\Umathcode<num>=<class><math-family><slot>` sets
+  the math-code for a character given by its Unicode <num>. The math-code is
+  presented by three independent numbers.
+* \*\*\*\i Umathchardef `\Umathchardef<sequence>=<class><math-family><slot>`
+  declares `<sequence>` as a math object with the given math-code.
+\enditems
+
+The scalable parentheses used after `\left`, `\right`, `\middle` must have
+its delimiter-code `<del-code>`. It is a
+24bit number. When the hexadecimal form `"<d1><d2><d3><d4><d5><d6>` of this
+number is used then it gives
+math-family font number `<d1>` and slot `<d2><d3>` for basic size (typically
+a normal text font) and
+math-family font number `<d4>` and slot `<d5><d6>` for the first successor of
+\"parentheses chain" implemented in the font (typically a special font).
+
+\begitems
+* \i delcode `\delcode<num>=<del-code>` sets the delimiter-code for the
+  ASCII character `<num>`.
+* \*\*\*\i Udelcode `\Udelcode<num>=<math-family><slot>` sets the
+  delimiter-code for the Unicode character `<num>` when a Unicode math font is
+  loaded. The font must implement the \"parentheses chain" at the `<slot>`
+  directly, we needn't to distinguish the basic size and the first
+  successor.
+\enditems
+
+\noindent{\bf Commands for using math-codes directly in math mode}
+
+\begitems
+* \i mathchar `\mathchar<math-code>` prints a math object given by math-code.
+* \*\*\*\i Umathchar `\Umathchar<class><math-family><slot>`
+  prints a math object given by math-code.
+* \i mathaccent `\mathaccent<math-code><object>` prints an accent above
+  `<object>` given by its math-code. The `<object>` can be single math
+  object or `{<math formula>}`.
+* \*\*\*\i Umathaccent `\Umathaccent<keyword><class><math-family><slot><object>`
+  creates an accent over `<object>` given by its math-code. The accent is
+  stretchable (relative to the width of the `<object>`) by default and if
+  the font implements the \"accents chain" at the `<slot>`. The optional
+  `<keyword>` is `fixed` (do not stretch the accent) or `bottom` (place
+  the accent to the bottom of the `<object>`).
+* \i delimiter `\delimiter<del-code>` prints a given delimiter, can be used after
+  `\left`, `\right`, `\middle`. The `<del-code>` can have seven hexadecimal
+  digits, first of them is class, others give normal `<del-code>`. The class
+  is used if the `\delimiter` doesn't follow `\left`, `\right`, `\middle`.
+* \*\*\*\i Udelimiter `\Udelimiter<class><math-family><slot>` behaves as
+  a character with given delimiter-code (after `\left`, `\right`) or as
+  a normal math character with its `<class>` (in other cases).
+* \i radical `\radical<radical-code><object>` creates radical symbol over
+  `<object>`. The `<radical-code>` is interpreted as `<del-code>`, i.e.\ the
+  first font must include the basic size and the second font must implement
+  the \"radicals chain".
+* \*\*\*\i Uradical `\Uradical<math-family><slot><object>` creates radical
+  symbol over `<object>`. The Unicode math font must implement the
+  \"radicals chain" at the `<slot>`.
+\enditems
+
 \sec[plain] Summary of plain \TeX/ macros
 
 \noindent{\bf Allocators}
@@ -2092,7 +2213,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
   `\ifsoemthing` which behaves like other `\if`\code{*} primitive commands.
 \enditems
 
-\noindent{\bf Vertical skips}
+\goodbreak\noindent{\bf Vertical skips}
 
 \begitems
 * \x`\bigskip` does \x`\vskip` by one line, \x`\medskip` does `\vskip` by
@@ -2190,10 +2311,18 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
 
 * \x`\raggedright` sets the paragraph shape with the ragged right margin.
   \x`\raggedbottom` sets the page-setting shape with the ragged bottoms.
+
+* \i phantom `\phantom{<text>}` prints empty box with dimensions like
+  `\hbox{<text>}`. \i vphantom `\vphantom{<text>}`, \i hphantom
+  `\hphantom{<text>}` does the same but the result of `\vphantom` sets its
+  width to zero, the result of `\hphantom` sets its height plus depth to zero.
+  \i smash `\smash{<text>}` prints `\hbox{<text>}` but height plus depth is
+  set to zero. In math mode, these commands keep the current math style.
+
 \enditems
 
 \noindent{\bf Floating objects}
-
+\par\nobreak\medskip\nobreak
 \begitems
 * \i footnote `\footnote{<mark>}`\z`{<text>}` creates a footnote with given
   `<mark>` and \z`<text>`.
@@ -2258,6 +2387,10 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
   \x`\leqalignno` does the same as `\eqalignno` but `<mark>` is put to the
   left margin.  
 }
+* \i mathpalette `\mathpalette\macro{<text>}` runs
+  `\macro<style primitive>{<text>}`. Your `\macro` can re-set current math
+  style using its `#1` parameter. Example: `\def\macro#1#2{\hbox{$#1#2$}}`.
+
 \enditems
 
 \raggedbottom
@@ -2297,7 +2430,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed.
 \noindent
 Petr Olšák {\tt petr@olsak.net}\nl
 Czech Technical University in Prague\nl
-Version of the text: 0.8 (\the\year-\thed\month-\thed\day)
+Version of the text: 0.9 (\the\year-\thed\month-\thed\day)
 
 \break
 
diff --git a/macros/latex-dev/base/README.md b/macros/latex-dev/base/README.md
index 49f51d34a3..494705bbab 100644
--- a/macros/latex-dev/base/README.md
+++ b/macros/latex-dev/base/README.md
@@ -1,7 +1,7 @@
 The LaTeX kernel
 ================
 
-Release 2023-06-01 pre-release 2
+Release 2023-06-01 pre-release 3
 
 Overview
 --------
diff --git a/macros/latex-dev/base/alltt.pdf b/macros/latex-dev/base/alltt.pdf
index b5a773fce8..c03d479351 100644
--- a/macros/latex-dev/base/alltt.pdf
+++ b/macros/latex-dev/base/alltt.pdf
diff --git a/macros/latex-dev/base/cfgguide.pdf b/macros/latex-dev/base/cfgguide.pdf
index 9199195161..8e27a300f1 100644
--- a/macros/latex-dev/base/cfgguide.pdf
+++ b/macros/latex-dev/base/cfgguide.pdf
diff --git a/macros/latex-dev/base/changes.txt b/macros/latex-dev/base/changes.txt
index 218b2b9db7..790f9a5ad1 100644
--- a/macros/latex-dev/base/changes.txt
+++ b/macros/latex-dev/base/changes.txt
@@ -6,19 +6,156 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2023-05-22  Joseph Wright  <Joseph.Wright@latex-project.org>
+
+	* usrguide.tex
+	Ensure url package is always loaded
+
+2023-05-21  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* lthooks.dtx, ltcmdhooks.dtx:
+	Add support for accessing arguments in 'cmd' hooks.
+
+2023-05-19  Joseph Wright  <Joseph.Wright@latex-project.org>
+
+	* usrguide.tex (section Creating document commands and environments)
+	  Add details of result of trailing optional arguments on
+	  \inputlineno
+	
+2023-05-12  Ulrike Fischer <Ulrike.Fischer@latex-project.org>
+
+	* ltxref.dtx
+	extend \label to store five values and add a hook with argument
+
+2023-05-17  Joseph Wright  <Joseph.Wright@latex-project.org>
+
+	* usrguide.tex (section Creating document commands and environments)
+	  Add details of brace stripping by \SplitList
+	  Add guidance on creating commands to use at start of
+	  tabular cells
+
+2023-05-15  Joseph Wright  <Joseph.Wright@latex-project.org>
+
+	* ltfiles.dtx:
+	Use expl3-based file-existence test
+
+2023-05-13  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* ltmath.dtx: Add \ignorespaces to \eqno (gh/1059)
+
+2023-04-19  Joseph Wright  <joseph.wright@latex-project.org>
+
+	* ltfinal.dtx (subsection{Lccodes and uccodes}):
+	Add \DeclareLowercaseMapping, \DeclareTitlecaseMapping and
+	\DeclareUppercaseMapping (gh/1033)
+
+2023-04-19  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* lthooks.dtx (subsection{Specifying code for next invocation}):
+	Initialise hook structure when adding 'next' code (gh/1052)
+
+2023-04-17  Joseph Wright  <Joseph.Wright@latex-project.org>
+
+	* ltfinal.dtx (subsubsection{Lccodes and uccodes}):
+	Add \BCPdata (gh/1035)
+	Adapt \MakeLowercase, \MakeTitlecase and \MakeLowercase
+	to use \BCPdata for locale info
+
+2023-04-16  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* lthooks.dtx (subsubsection{Setting hooks up}):
+	Use \@@_replacing_args_false: in \@@_include_legacy_code_chunk:n.
+
+2023-04-15  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* ltplain.dtx: adjust \extrafloats so it does not error if thousands
+	of float boxes are allocated. github/1041
+
+2023-04-14  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* ltclass.dtx (\@onefilewithoptions):
+	When in latexrelease.sty, define \load@onefilewithoptions (gh/992).
+
+2023-04-13  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* cmfonts.fdd: add missing substitution for U/cmtt/bx/sl gh/1037
+
+2023-04-12  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* ltcmd.dtx (subsection{Grabbing arguments}):
+	Set \tex_endlinechar:D earlier to correct parsing of newlines in
+	special catcode settings (e.g., \ExplSyntaxOn) (gh/876).
+  
+2023-04-02  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* ltfilehook.dtx: allow par as a filename. (gh/942)
+
+2023-04-06  Phelype Oleinik  <phelype.oleinik@latex-project.org>
+
+	* lthooks.dtx, ltcmdhooks.dtx:
+	Add support for providing and using arguments in hooks:
+	  - Modify hook data structures to allow access to arguments;
+	  - Add commands to declare hooks with arguments;
+	  - Add commands to add code that references hook arguments;
+	  - Add commands to use hooks with arguments.
+
+2023-04-01  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* ltfssbas.dtx: locally reset frozen mathversions when the math
+	version changes. (gh/1028)
+
+2023-03-28  Joseph Wright  <Joseph.Wright@latex-project.org>
+
+	* ltclass.dtx:
+	Add \IfFileAtLeastTF (gh/1015)
+
+2023-03-28  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* ltxdoc.dtx (section{Options}):
+	Define \cs if doc is rolled back to v2 (gh/981)
+
+2023-03-28  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* ltfinal.dtx: Restore groups to \MakeUppercase and
+          \MakeLowercase, and add a group to \MakeTitlecase. (gh/1021)
+
+2023-03-22  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* ltspace.dtx:
+	Add \predisplaypenalty setting of 10000 to \samepage in case
+	that was changed (gh/1022)
+
+2023-03-11  Yukai Chou  <muzimuzhi@gmail.com>
+
+    * ltcmd.dtx (subsubsection{Showing the definition of a command}),
+                (subsubsection{Copying a command and its internal structure}):
+    Correctly recognize (non-expandable) document commands with empty or only
+    m-type arguments (gh/1009)
+
 2023-01-30  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* ltpara.dtx (subsection{Providing hooks for paragraphs}):
 	Backout \parskip at top of minipage if it shouldn't be there
 	but is due to whatsits (gh/989)
 
+2023-02-05 Yukai Chou <muzimuzhi@gmail.com>
+
+	* fntguide.tex:
+	Adjusted pagination due to recently added doc paragraphs (gh/994)
+
 2023-01-16 Yukai Chou <muzimuzhi@gmail.com>
 
 	* ltnews.cls:
-	Added full release date yyyy-mm-dd to _all_ ltnews issues.
+	Added full release date yyyy-mm-dd to _all_ ltnews issues (gh/982)
 	Added \publicationday{<day>} to specify day in a month in ltnews<n>.tex.
 	<day> defaults to 01.
 
+2023-01-12  Joseph Joseph  <Joseph.Joseph@latex-project.org>
+
+	* clsguide.tex, clsguide-historic,tex
+	Pre-2023 source moved to new name, re-worked material which remains
+	relevant in updated file
+
 ================================================================================
 All changes above are only part of the development branch for the next release.
 ================================================================================
diff --git a/macros/latex-dev/base/classes.dtx b/macros/latex-dev/base/classes.dtx
index e16dc657a1..58690e8375 100644
--- a/macros/latex-dev/base/classes.dtx
+++ b/macros/latex-dev/base/classes.dtx
@@ -53,7 +53,7 @@
 %<*driver>
 \ProvidesFile{classes.drv}
 %</driver>
-              [2022/07/02 v1.4n
+              [2023/05/17 v1.4n
 %<article|report|book> Standard LaTeX document class]
 %<10pt|11pt|12pt>      Standard LaTeX file (size option)]
 %    \end{macrocode}
@@ -3688,9 +3688,8 @@
 %
 %     A |\caption| command in a `figure' environment writes
 %
-%     |\contentsline{figure}{\numberline{|\meta{num}|}{|%
+%     |\contentsline{figure}{\numberline{|\meta{num}|}{|^^A
 %                    \meta{caption}|}}{|\meta{page}|}|
-%
 %     on the .\file{lof} file, where \meta{num} is the number produced
 %     by |\thefigure| and \meta{caption} is the figure caption.  It
 %     works similarly for a `table' environment.
@@ -3707,8 +3706,8 @@
 %                      \meta{title}|}{|\meta{page}|}|
 %
 %    \begin{description}
-%    \item[\meta{level}] An entry is produced only if\meta{ level}
-%        $<=$ value of the \Lcount{tocdepth} counter.  Note,
+%    \item[\meta{level}] An entry is produced only if \meta{level}
+%        $\leq$ value of the \Lcount{tocdepth} counter.  Note,
 %        |\chapter| is level 0, |\section| is level 1, etc.
 %    \item[\meta{indent}] The indentation from the outer left margin
 %        of the start   of the contents line.
diff --git a/macros/latex-dev/base/classes.pdf b/macros/latex-dev/base/classes.pdf
index 39f29d0e8b..ef4ed23c75 100644
--- a/macros/latex-dev/base/classes.pdf
+++ b/macros/latex-dev/base/classes.pdf
diff --git a/macros/latex-dev/base/clsguide-historic.pdf b/macros/latex-dev/base/clsguide-historic.pdf
new file mode 100644
index 0000000000..196a93f86e
--- /dev/null
+++ b/macros/latex-dev/base/clsguide-historic.pdf
diff --git a/macros/latex-dev/base/clsguide-historic.tex b/macros/latex-dev/base/clsguide-historic.tex
new file mode 100644
index 0000000000..d7a27e3c40
--- /dev/null
+++ b/macros/latex-dev/base/clsguide-historic.tex
@@ -0,0 +1,1881 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 1993-2023
+% The LaTeX Project and any individual authors listed elsewhere
+% in this file.
+%
+% This file is part of the LaTeX base system.
+% -------------------------------------------
+%
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%    http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This file has the LPPL maintenance status "maintained".
+%
+% The list of all files belonging to the LaTeX base distribution is
+% given in the file `manifest.txt'. See also `legal.txt' for additional
+% information.
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
+% extension .ins) which are part of the distribution.
+%
+% \fi
+% Filename: clsguide-historic.tex
+
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+
+\documentclass{ltxguide}[1995/11/28]
+
+\title{\LaTeXe~for class and package writers --- historic version}
+
+\author{Copyright \copyright~1995--2006 The \LaTeX\ Project\\
+   All rights reserved.%
+   \footnote{This file may be distributed and/or modified under the
+     conditions of the \LaTeX{} Project Public License, either version 1.3c
+     of this license or (at your option) any later version. See the source
+    \texttt{clsguide.tex} for full details.}%
+}
+
+\date{11 January 2023}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\section{Introduction}
+
+This document is an introduction to writing classes and packages for
+\LaTeX{}, with special attention given to upgrading existing
+\LaTeX~2.09 packages to \LaTeXe{}.  The latter subject is also
+covered in an article by Johannes Braams published in TUGboat~15.3.
+
+It is somewhat of an historical document now, since \LaTeXe{} came into
+existence in 1994.
+
+\subsection{Writing classes and packages for \LaTeXe}
+
+\LaTeX{} is a document preparation system that enables the document
+writer to concentrate on the contents of their text, without bothering
+too much about the formatting of it.  For example, chapters are
+indicated by |\chapter{<title>}| rather than by selecting 18pt bold.
+
+The file that contains the information about how to turn logical
+structure (like `|\chapter|') into formatting (like `18pt bold ragged
+right') is a \emph{document class}.  In addition, some features (such
+as colour or included graphics) are independent of the document class
+and these are contained in \emph{packages}.
+
+One of the largest differences between \LaTeX~2.09 and \LaTeXe{} is in
+the commands used to write packages and classes.  In \LaTeX~2.09,
+there was very little support for writing |.sty| files, and so writers
+had to resort to using low-level commands.
+
+\LaTeXe{} provides high-level commands for structuring packages.
+It is also much easier to build classes and packages on top of each
+other, for example writing a local technical report class |cetechr|
+(for the Chemical Engineering department) based on |article|.
+
+\subsection{Overview}
+
+This document contains an overview of how to write classes and
+packages for \LaTeX{}.  It does \emph{not} introduce all of the
+commands necessary to write packages: these can be found in either
+\emph{\LaTeXbook} or \emph{\LaTeXcomp}.  But it does describe the new
+commands for structuring classes and packages.
+
+\begin{description}
+
+\item[Section~\ref{Sec:general}] contains some general advice about
+  writing classes and packages.  It describes the difference between
+  classes and packages, the command naming conventions, the use of
+  |doc| and |docstrip|, how \TeX's primitive file and box commands
+  interact with \LaTeX{}. It also contains some hints about general
+  \LaTeX{} style.
+
+\item[Section~\ref{Sec:structure}] describes the structure of classes
+  and packages.  This includes building classes and packages on top of
+  other classes and packages, declaring options and declaring
+  commands.  It also contains example classes.
+
+\item[Section~\ref{Sec:commands}] lists the new class and package
+   commands.
+
+ \item[Section~\ref{Sec:upgrade}] gives detailed advice on how to
+   upgrade existing \LaTeX~2.09 classes and packages to \LaTeXe{}.
+
+\end{description}
+
+\subsection{Further information}
+
+For a general introduction to \LaTeX{}, including the new features of
+\LaTeXe{}, you should read \emph{\LaTeXbook}
+by Leslie Lamport~\cite{A-W:LLa94}.
+
+A more detailed description of the new features of \LaTeX, including an
+overview of more than 200 packages and nearly 1000 ready to run examples, is
+to be found in \emph{\LaTeXcomp\ second edition} by Frank Mittelbach and
+Michel Goossens~\cite{A-W:MG2004}.
+
+The \LaTeX{} system is based on \TeX{}, which is
+described in \emph{The \TeX book} by Donald E.~Knuth~\cite{A-W:DEK91}.
+
+There are a number of documentation files which accompany every copy
+of \LaTeX{}.  A copy of \emph{\LaTeX{} News} will come out with each
+six-monthly release of \LaTeX{}, and is found in the files
+|ltnews*.tex|.  The author's guide \emph{\usrguide} describes the new
+\LaTeX{} document features; it is in |usrguide.tex|.  The guide
+\emph{\fntguide} describes the \LaTeX{} font selection scheme for
+class- and package-writers; it is in |fntguide.tex|. Configuring
+\LaTeX{} is covered by the guide \emph{\cfgguide} in
+\texttt{cfgguide.tex} whilst the philosophy behind our policy on
+modifying \LaTeX{} is described in \emph{\modguide} in
+\texttt{modguide.tex}.
+
+The documented source code (from the files used to produce the kernel
+format via |latex.ltx|) is now available as
+\emph{The \LaTeXe\ Sources}.
+This very large document also includes an index of
+\LaTeX{} commands.  It can be typeset from the \LaTeX{} file
+|source2e.tex| in the |base| directory, using the source files and
+the class file |ltxdoc.cls| from this directory.
+
+For more information about \TeX{} and \LaTeX{}, please contact your
+local \TeX{} Users Group, or the international \TeX{} Users Group.
+Addresses and other details can be found at:
+\begin{quote}\small\label{addrs}
+    \texttt{http://www.tug.org/lugs.html}
+\end{quote}
+
+
+\subsection{Policy on standard classes}
+
+Many of the problem reports we receive concerning the standard classes
+are not concerned with bugs but are suggesting, more or less politely,
+that the design decisions embodied in them are `not optimal' and
+asking us to modify them.
+
+There are several reasons why we should not make such changes to these
+files.
+\begin{itemize}
+\item
+  However misguided, the current behaviour is clearly what was
+  intended when these classes were designed.
+\item
+  It is not good practice to change such aspects of `standard classes'
+  because many people will be relying on them.
+\end{itemize}
+
+We have therefore decided not to even consider making such
+modifications, nor to spend time justifying that decision.  This does
+not mean that we do not agree that there are many deficiencies in the
+design of these classes, but we have many tasks with higher priority
+than continually explaining why the standard classes for \LaTeX{}
+cannot be changed.
+
+We would, of course, welcome the production of better classes, or of
+packages that can be used to enhance these classes.  So your first
+thought when you consider such a deficiency will, we hope, be ``what
+can I do to improve this?''
+
+Similar considerations apply to those parts of the kernel that are
+implementing design decisions, many of which should be left to the
+class file but are not in the current system.  We realise that in such
+cases it is much more difficult for you to rectify the problem
+yourself but it is also the case that making such changes in the
+kernel would probably be a major project for us; therefore such
+enhancements will have to wait for \LaTeX3.
+
+\section{Writing classes and packages}
+\label{Sec:writing}
+
+This section covers some general points concerned with writing
+\LaTeX{} classes and packages.
+
+
+\subsection{Old versions}
+
+If you are upgrading an existing \LaTeX~2.09 style file then we
+recommend freezing the 2.09 version and no longer maintaining it.
+Experience with the various dialects of \LaTeX{} which existed in the
+early 1990's suggests that maintaining packages for different versions
+of \LaTeX{} is almost impossible.  It will, of course, be necessary
+for some organisations to maintain both versions in parallel for some
+time but this is not essential for those packages and classes
+supported by individuals: they should support only the new standard
+\LaTeXe{}, not obsolete versions of \LaTeX{}.
+
+
+\subsection{Using `docstrip' and `doc'}
+
+If you are going to write a large class or package for \LaTeX{} then
+you should consider using the |doc| software which comes with
+\LaTeX{}.
+\LaTeX{} classes and packages written using this can be
+processed in two ways: they can be run through \LaTeX{}, to produce
+documentation; and they can be processed with |docstrip|, to produce
+the |.cls| or |.sty| file.
+
+The |doc| software can automatically generate indexes of definitions,
+indexes of command use, and change-log lists.  It is very useful for
+maintaining and documenting large \TeX{} sources.
+
+The documented sources of the \LaTeX{} kernel itself, and of the
+standard classes, etc, are |doc| documents; they are in the |.dtx|
+files in the distribution.  You can, in fact, typeset the source code
+of the kernel as one long document, complete with index, by running
+\LaTeX{} on |source2e.tex|.  Typesetting these documents uses the
+class file |ltxdoc.cls|.
+
+For more information on |doc| and |docstrip|, consult the files
+|docstrip.dtx|, |doc.dtx|, and \emph{\LaTeXcomp}.  For examples of its
+use, look at the |.dtx| files.
+
+\subsection{Is it a class or a package?}
+\label{Sec:classorpkg}
+
+The first thing to do when you want to put some new \LaTeX{} commands
+in a file is to decide whether it should be a \emph{document class} or a
+\emph{package}.  The rule of thumb is:
+\begin{quote}
+  If the commands could be used with any document class, then make
+  them a package; and if not, then make them a class.
+\end{quote}
+
+There are two major types of class: those like |article|, |report| or
+|letter|, which are free-standing; and those which are extensions or
+variations of other classes---for example, the |proc| document class,
+which is built on the |article| document class.
+
+Thus, a company might have a local |ownlet| class for printing letters
+with their own headed note-paper.  Such a class would build on top of
+the existing |letter| class but it cannot be used with any other
+document class, so we have |ownlet.cls| rather than |ownlet.sty|.
+
+The |graphics| package, in contrast, provides commands for including
+images into a \LaTeX{} document.  Since these commands can be used
+with any document class, we have |graphics.sty| rather than
+|graphics.cls|.
+
+
+\subsection{Command names}
+
+\LaTeX{} has three types of command.
+
+There are the author commands, such as |\section|, |\emph| and
+|\times|:  most of these have short names, all in lower case.
+
+There are also the class and package writer commands:
+most of these have long mixed-case names such as the following.
+\begin{verbatim}
+   \InputIfFileExists  \RequirePackage  \PassOptionsToClass
+\end{verbatim}
+
+Finally, there are the internal commands used in the \LaTeX{}
+implementation, such as |\@tempcnta|, |\@ifnextchar| and |\@eha|:
+most of these commands contain |@| in their name, which means they
+cannot be used in documents, only in class and package files.
+
+Unfortunately, for historical reasons the distinction between these
+commands is often blurred.  For example, |\hbox| is an internal
+command which should only be used in the \LaTeX{} kernel, whereas
+|\m@ne| is the constant $-1$ and could have been |\MinusOne|.
+
+However, this rule of thumb is still useful: if a command has |@| in
+its name then it is not part of the supported \LaTeX{} language---and
+its behaviour may change in future releases!  If a command is
+mixed-case, or is described in \emph{\LaTeXbook}, then you can rely on
+future releases of \LaTeXe{} supporting the command.
+
+\subsection{Box commands and colour}
+\label{Sec:colour}
+
+Even if you do not intend to use colour in your own documents, by
+taking note of the points in this section you can ensure that your
+class or package is compatible with the |color| package. This may
+benefit people using your class or package who have access to colour
+printers.
+
+The simplest way to ensure `colour safety' is to always use \LaTeX{}
+box commands rather than \TeX{} primitives, that is use |\sbox| rather
+than |\setbox|, |\mbox| rather than |\hbox| and |\parbox| or
+the |minipage| environment rather than |\vbox|.
+The \LaTeX{} box commands have new options which mean that they are now
+as powerful as the \TeX{} primitives.
+
+As an example of what can go wrong, consider that in
+|{\ttfamily <text>}|
+the font is restored just \emph{before} the |}|, whereas in the
+similar looking construction
+|{\color{green} <text>}|
+the colour is restored just \emph{after} the final |}|. Normally this
+distinction does not matter at all; but consider a primitive \TeX{}
+box assignment such as:
+\begin{verbatim}
+   \setbox0=\hbox{\color{green} <text>}
+\end{verbatim}
+Now the colour-restore occurs after the |}| and so is \emph{not}
+stored in the box. Exactly what bad effects this can have depends on
+how colour is implemented: it can range from getting the wrong
+colours in the rest of the document, to causing errors in the
+dvi-driver used to print the document.
+
+Also of interest is the command |\normalcolor|.   This is
+normally just |\relax| (i.e., does nothing)
+but you can use it rather like |\normalfont| to
+set regions of the page such as captions or section headings to the
+`main document colour'.
+
+
+\subsection{Defining text and math characters}
+\label{Sec:chars}
+
+Because \LaTeXe{} supports different encodings, definitions of commands
+for producing symbols, accents, composite glyphs, etc.\ must be
+defined using the commands provided for this purpose and described in
+\emph{\fntguide}.  This part of the system is still under development
+so such tasks should be undertaken with great caution.
+
+Also, |\DeclareRobustCommand| should be used for encoding-independent
+commands of this type.
+
+Note that it is no longer possible to refer to the math font set-up
+outside math mode: for example, neither |\textfont 1| nor
+|\scriptfont 2| are guaranteed to be defined in other modes.
+
+
+\subsection{General style}
+\label{Sec:general}
+
+The new system provides many commands designed to help you produce
+well-structured class and package files that are both robust and
+portable.  This section outlines some ways to make intelligent use of
+these.
+
+\subsubsection{Loading other files}
+\label{Sec:loading}
+
+\NEWdescription{1995/12/01}
+\LaTeX{} provides these commands:
+\begin{verbatim}
+   \LoadClass        \LoadClassWithOptions
+   \RequirePackage   \RequirePackageWithOptions
+\end{verbatim}
+for using classes or packages inside other classes or packages.  We
+recommend strongly that you use them, rather than the primitive
+|\input| command, for a number of reasons.
+
+Files loaded with |\input <filename>| will not be listed in the
+|\listfiles| list.
+
+If a package is always loaded with |\RequirePackage...| or |\usepackage|
+then, even if its loading is requested several times, it will be
+loaded only once.  By contrast, if it is loaded with |\input| then it
+can be loaded more than once; such an extra loading may waste time and
+memory and it may produce strange results.
+
+If a package provides option-processing then, again, strange results
+are possible if the package is |\input| rather than loaded by means of
+|\usepackage| or |\RequirePackage...|.
+
+If the package |foo.sty| loads the package |baz.sty| by use of
+|\input baz.sty| then the user will get a warning:
+\begin{verbatim}
+   LaTeX Warning: You have requested package `foo',
+                  but the package provides `baz'.
+\end{verbatim}
+Thus, for several reasons, using |\input| to load packages is not a
+good idea.
+
+Unfortunately, if you are upgrading the file |myclass.sty| to a class
+file then you have to make sure that any old files which contain
+|\input myclass.sty| still work.
+
+This was also true for the standard classes (|article|, |book| and
+|report|), since a lot of existing \LaTeX~2.09 document styles contain
+|\input article.sty|.  The approach which we use to solve this is
+to provide minimal files |article.sty|, |book.sty| and |report.sty|,
+which simply load the appropriate class files.
+
+For example, |article.sty| contains just the following lines:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \@obsoletefile{article.cls}{article.sty}
+   \LoadClass{article}
+\end{verbatim}
+You may wish to do the same or, if you think that it is safe to do so,
+you may decide to just remove |myclass.sty|.
+
+\subsubsection{Make it robust}
+
+We consider it good practice, when writing packages and classes, to use
+\LaTeX{} commands as much as possible.
+
+Thus, instead of using |\def...| we recommend using one of
+|\newcommand|, |\renewcommand| or |\providecommand|; |\CheckCommand| is
+also useful. Doing this makes
+it less likely that you will inadvertently redefine a command, giving
+unexpected results.
+
+When you define an environment, use |\newenvironment| or
+|\renewenvironment| instead |\def\foo{...}| and |\def\endfoo{...}|.
+
+If you need to set or change the value of a \m{dimen} or \m{skip}
+register, use |\setlength|.
+
+To manipulate boxes, use \LaTeX{} commands such as |\sbox|,
+|\mbox| and |\parbox| rather than |\setbox|, |\hbox| and |\vbox|.
+
+Use |\PackageError|, |\PackageWarning| or |\PackageInfo| (or the
+equivalent class commands) rather than |\@latexerr|, |\@warning| or
+|\wlog|.
+
+It is still possible to declare options by defining |\ds@<option>| and
+calling |\@options|; but we recommend the |\DeclareOption| and
+|\ProcessOptions| commands instead.  These are more powerful and use
+less memory.  So rather than using:
+\begin{verbatim}
+   \def\ds@draft{\overfullrule 5pt}
+   \@options
+\end{verbatim}
+you should use:
+\begin{verbatim}
+   \DeclareOption{draft}{\setlength{\overfullrule}{5pt}}
+   \ProcessOptions\relax
+\end{verbatim}
+
+The advantage of this kind of practice is that your code is more
+readable and, more important, that it is less likely to break when
+used with future versions of \LaTeX{}.
+
+\subsubsection{Make it portable}
+
+It is also sensible to make your files are as portable as possible. To
+ensure this; they should contain only visible 7-bit text; and the
+filenames should contain at most eight characters (plus the three
+letter extension).  Also, of course, it \textbf{must not} have the
+same name as a file in the standard \LaTeX{} distribution, however
+similar its contents may be to one of these files.
+
+It is also useful if local classes or packages have a common prefix,
+for example the University of Nowhere classes might begin with |unw|.
+This helps to avoid every University having its own thesis class, all
+called |thesis.cls|.
+
+If you rely on some features of the \LaTeX{} kernel, or on a package,
+please specify the release-date you need.  For example, the package
+error commands were introduced in the June 1994 release so, if you use
+them then you should put:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}[1994/06/01]
+\end{verbatim}
+
+\subsubsection{Useful hooks}
+
+Some packages and document styles had to redefine the command
+|\document| or |\enddocument| to achieve their goal.  This is no
+longer necessary. You can now use the `hooks' |\AtBeginDocument| and
+|\AtEndDocument| (see Section~\ref{Sec:delays}).  Again, using these
+hooks makes it less likely that your code breaks with future versions
+of \LaTeX{}. It also makes it more likely that your package can work
+together with someone else's.
+
+\NEWdescription{1996/12/01}
+However, note that code in the |\AtBeginDocument| hook is part of the
+preamble.  Thus there are restrictions on what can be put there; in
+particular, no typesetting can be done.
+
+\section{The structure of a class or package}
+\label{Sec:structure}
+
+\LaTeXe{} classes and packages have more structure than \LaTeX~2.09
+style files did.  The outline of a class or package file is:
+\begin{description}
+\item[Identification] The file says that it is a \LaTeXe{} package or
+   class, and gives a short description of itself.
+\item[Preliminary declarations]
+   Here the file declares some commands and can also load
+   other files.  Usually these commands will be just those needed for
+   the code used in the declared options.
+\item[Options] The file declares and processes its options.
+\item[More declarations] This is where the file does most of its work:
+   declaring new variables, commands and fonts; and loading other files.
+\end{description}
+
+\subsection{Identification}
+
+The first thing a class or package file does is identify itself.
+Package files do this as follows:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesPackage{<package>}[<date> <other information>]
+\end{verbatim}
+For example:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesPackage{latexsym}[1994/06/01 Standard LaTeX package]
+\end{verbatim}
+Class files do this as follows:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesClass{<class-name>}[<date> <other information>]
+\end{verbatim}
+For example:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesClass{article}[1994/06/01 Standard LaTeX class]
+\end{verbatim}
+\NEWdescription{1998/06/19}
+The \m{date} should be given in the form `\textsc{yyyy/mm/dd}' and
+must be present if the optional argument is used (this is also true
+for the |\NeedsTeXFormat| command).
+Any derivation from this syntax will result in low-level \TeX{}
+errors---the commands expect a valid syntax to speed up the daily
+usage of the package or class and make no provision for the case that
+the developer made a mistake!
+
+This date is checked whenever a user specifies a date in their
+|\documentclass| or |\usepackage| command.  For example, if you wrote:
+\begin{verbatim}
+   \documentclass{article}[1995/12/23]
+\end{verbatim}
+then users at a different location
+would get a warning that their copy of |article| was out of
+date.
+
+The description of a class is displayed when the class is used.  The
+description of a package is put into the log file.  These descriptions
+are also displayed by the |\listfiles| command.  The phrase
+\texttt{Standard LaTeX} \textbf{must not} be used in the identification
+banner of any file other than those in the standard \LaTeX{}
+distribution.
+
+
+\subsection{Using classes and packages}
+
+The first major difference between \LaTeX~2.09 style files and
+\LaTeXe{} packages and classes is that \LaTeXe{} supports
+\emph{modularity}, in the sense of building files from small
+building-blocks rather than using large single files.
+
+A \LaTeX{} package or class can load a package as follows:
+\begin{verbatim}
+   \RequirePackage[<options>]{<package>}[<date>]
+\end{verbatim}
+For example:
+\begin{verbatim}
+   \RequirePackage{ifthen}[1994/06/01]
+\end{verbatim}
+This command has the same syntax as the author command |\usepackage|.
+It allows packages or classes to use features provided by other
+packages.  For example, by loading the |ifthen| package, a package
+writer can use the `if\dots then\dots else\dots' commands provided
+by that package.
+
+A \LaTeX{} class can load one other class as follows:
+\begin{verbatim}
+   \LoadClass[<options>]{<class-name>}[<date>]
+\end{verbatim}
+For example:
+\begin{verbatim}
+   \LoadClass[twocolumn]{article}
+\end{verbatim}
+This command has the same syntax as the author command |\documentclass|.
+It allows classes to be based on the syntax and appearance of another
+class.  For example, by loading the |article| class, a class writer
+only has to change the bits of |article| they don't like, rather than
+writing a new class from scratch.
+
+\NEWfeature{1995/12/01}
+The following commands can be used in the common case that you want to
+simply load a class or package file with exactly those options that
+are being used by the current class.
+\begin{verbatim}
+   \LoadClassWithOptions{<class-name>}[<date>]
+   \RequirePackageWithOptions{<package>}[<date>]
+\end{verbatim}
+For example:
+\begin{verbatim}
+   \LoadClassWithOptions{article}
+   \RequirePackageWithOptions{graphics}[1995/12/01]
+\end{verbatim}
+
+\subsection{Declaring options}
+
+\NEWdescription{1998/12/01}
+The other major difference between \LaTeX~2.09 styles and \LaTeXe{}
+packages and classes is in option handling.  Packages and classes can
+now declare options and these can be specified by authors; for
+example, the |twocolumn| option is declared by the |article| class.
+Note that the name of an option should contain only those characters
+allowed in a `\LaTeX{} name'; in particular it must not contain any
+control sequences.
+
+An option is declared as follows:
+\begin{verbatim}
+   \DeclareOption{<option>}{<code>}
+\end{verbatim}
+For example, the |dvips| option (slightly simplified)
+to the |graphics| package is implemented as:
+\begin{verbatim}
+   \DeclareOption{dvips}{\input{dvips.def}}
+\end{verbatim}
+This means that when an author writes |\usepackage[dvips]{graphics}|,
+the file |dvips.def| is loaded.  As another example, the |a4paper|
+option is declared in the |article| class to set the |\paperheight|
+and |\paperwidth| lengths:
+\begin{verbatim}
+   \DeclareOption{a4paper}{%
+      \setlength{\paperheight}{297mm}%
+      \setlength{\paperwidth}{210mm}%
+   }
+\end{verbatim}
+Sometimes a user will request an option which the class
+or package has not explicitly declared.  By default this will produce
+a warning (for classes) or error (for packages); this behaviour
+can be altered as follows:
+\begin{verbatim}
+   \DeclareOption*{<code>}
+\end{verbatim}
+For example, to make the package |fred| produce a warning rather than
+an error for unknown options, you could specify:
+\begin{verbatim}
+   \DeclareOption*{%
+      \PackageWarning{fred}{Unknown option `\CurrentOption'}%
+   }
+\end{verbatim}
+Then, if an author writes |\usepackage[foo]{fred}|, they will get a
+warning \texttt{Package fred Warning: Unknown option `foo'.}  As
+another example, the |fontenc| package tries to load a file
+|<ENC>enc.def| whenever the \m{ENC} option is used.  This
+can be done by writing:
+\begin{verbatim}
+   \DeclareOption*{%
+      \input{\CurrentOption enc.def}%
+   }
+\end{verbatim}
+\NEWdescription{1998/12/01}
+It is possible to pass options on to another package or class, using
+the command |\PassOptionsToPackage| or |\PassOptionsToClass| (note
+that this is a specialised operation that works only for option
+names).  For example, to pass every unknown option on to the |article|
+class, you can use:
+\begin{verbatim}
+   \DeclareOption*{%
+      \PassOptionsToClass{\CurrentOption}{article}%
+   }
+\end{verbatim}
+If you do this then you should make sure you load the class at some
+later point, otherwise the options will never be processed!
+
+So far, we have explained only how to declare options, not how to
+execute them.  To process the options with which the file was called,
+you should use:
+\begin{verbatim}
+   \ProcessOptions\relax
+\end{verbatim}
+This executes the \m{code} for each option that was both specified and
+declared (see Section~\ref{Sec:commands.options} for details of how
+this is done).
+
+For example, if the |jane| package file contains:
+\begin{verbatim}
+   \DeclareOption{foo}{\typeout{Saw foo.}}
+   \DeclareOption{baz}{\typeout{Saw baz.}}
+   \DeclareOption*{\typeout{What's \CurrentOption?}}
+   \ProcessOptions\relax
+\end{verbatim}
+and an author writes |\usepackage[foo,bar]{jane}|, then they will see
+the messages \texttt{Saw foo.} and \texttt{What's bar?}
+
+\subsection{A minimal class file}
+
+Most of the work of a class or package is in defining new commands, or
+changing the appearance of documents.  This is done in the body of the
+package, using commands such as |\newcommand| or |\setlength|.
+
+\LaTeXe{} provides several new commands to help class and package
+writers; these are described in detail in Section~\ref{Sec:commands}.
+
+There are four things that every class file \emph{must} contain: these
+are a definition of |\normalsize|, values for |\textwidth| and
+|\textheight| and a specification for page-numbering.  So a minimal
+document class file\footnote {This class is now in the standard
+distribution, as \texttt{minimal.cls}.} looks like this:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesClass{minimal}[1995/10/30 Standard LaTeX minimal class]
+   \renewcommand{\normalsize}{\fontsize{10pt}{12pt}\selectfont}
+   \setlength{\textwidth}{6.5in}
+   \setlength{\textheight}{8in}
+   \pagenumbering{arabic}       % needed even though this class will
+                                % not show page numbers
+\end{verbatim}
+However, this class file will not support footnotes, marginals,
+floats, etc., nor will it provide any of the 2-letter font commands
+such as |\rm|; thus most classes will contain more than this minimum!
+
+\subsection{Example: a local letter class}
+
+A company may have its own letter class, for setting letters in the
+company style.  This section shows a simple implementation of such a
+class, although a real class would need more structure.
+
+The class begins by announcing itself as |neplet.cls|.
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesClass{neplet}[1995/04/01 NonExistent Press letter class]
+\end{verbatim}
+Then this next bit passes any options on to the |letter| class, which
+is loaded with the |a4paper| option.
+\begin{verbatim}
+   \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letter}}
+   \ProcessOptions\relax
+   \LoadClass[a4paper]{letter}
+\end{verbatim}
+In order to use the company letter head, it redefines the
+|firstpage| page style: this is the page style that is used on
+the first page of letters.
+\begin{verbatim}
+   \renewcommand{\ps@firstpage}{%
+      \renewcommand{\@oddhead}{<letterhead goes here>}%
+      \renewcommand{\@oddfoot}{<letterfoot goes here>}%
+   }
+\end{verbatim}
+And that's it!
+
+\subsection{Example: a newsletter class}
+
+A simple newsletter can be typeset with \LaTeX{}, using a variant of the
+|article| class.
+The class begins by announcing itself as |smplnews.cls|.
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}
+   \ProvidesClass{smplnews}[1995/04/01 The Simple News newsletter class]
+
+   \newcommand{\headlinecolor}{\normalcolor}
+\end{verbatim}
+It passes most specified options on to the |article| class: apart from
+the |onecolumn| option, which is switched off, and the |green| option,
+which sets the headline in green.
+\begin{verbatim}
+   \DeclareOption{onecolumn}{\OptionNotUsed}
+   \DeclareOption{green}{\renewcommand{\headlinecolor}{\color{green}}}
+
+   \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+
+   \ProcessOptions\relax
+\end{verbatim}
+It then loads the class |article| with the option |twocolumn|.
+\begin{verbatim}
+   \LoadClass[twocolumn]{article}
+\end{verbatim}
+Since the newsletter is to be printed in colour, it now loads the
+|color| package.  The class does not specify a device driver option
+since this should be specified by the user of the |smplnews| class.
+\begin{verbatim}
+   \RequirePackage{color}
+\end{verbatim}
+The class then redefines |\maketitle| to produce the title in 72pt
+Helvetica bold oblique, in the appropriate colour.
+\begin{verbatim}
+   \renewcommand{\maketitle}{%
+      \twocolumn[%
+         \fontsize{72}{80}\fontfamily{phv}\fontseries{b}%
+         \fontshape{sl}\selectfont\headlinecolor
+         \@title
+      ]%
+   }
+\end{verbatim}
+It redefines |\section| and switches off section numbering.
+\begin{verbatim}
+   \renewcommand{\section}{%
+      \@startsection
+         {section}{1}{0pt}{-1.5ex plus -1ex minus -.2ex}%
+         {1ex plus .2ex}{\large\sffamily\slshape\headlinecolor}%
+   }
+
+   \setcounter{secnumdepth}{0}
+\end{verbatim}
+It also sets the three essential things.
+\begin{verbatim}
+   \renewcommand{\normalsize}{\fontsize{9}{10}\selectfont}
+   \setlength{\textwidth}{17.5cm}
+   \setlength{\textheight}{25cm}
+\end{verbatim}
+In practice, a class would need more than this: it would provide
+commands for issue numbers, authors of articles, page styles and so
+on; but this skeleton gives a start.  The |ltnews| class file is not
+much more complex than this one.
+
+\section{Commands for class and package writers}
+\label{Sec:commands}
+
+This section describes briefly each of the new commands for class and
+package writers.  To find out about other aspects of the new system,
+you should also read \emph{\LaTeXbook}, \emph{\LaTeXcomp} and
+\emph{\usrguide}.
+
+\subsection{Identification}
+
+The first group of commands discussed here are those used
+to identify your class or package file.
+
+\begin{decl}
+|\NeedsTeXFormat| \arg{format-name} \oarg{release-date}
+\end{decl}
+This command tells \TeX{} that this file should be processed using a
+format with name \m{format-name}.  You can use the optional argument
+\m{release-date} to further specify the earliest release date of the
+format that is needed.  When the release date of the format is older
+than the one specified a warning will be generated. The standard
+\m{format-name} is \texttt{LaTeX2e}.  The date, if present, must be in
+the form \textsc{yyyy/mm/dd}.
+
+Example:
+\begin{verbatim}
+   \NeedsTeXFormat{LaTeX2e}[1994/06/01]
+\end{verbatim}
+
+\begin{decl}
+|\ProvidesClass| \arg{class-name} \oarg{release-info} \\
+|\ProvidesPackage| \arg{package-name} \oarg{release-info}
+\end{decl}
+This declares that the current file contains the definitions for the
+document class \m{class-name} or package \m{package-name}.
+
+The optional \m{release-info}, if used, must contain:
+\begin{itemize}
+  \item the release date of
+  this version of the file, in the form \textsc{yyyy/mm/dd};
+\item optionally followed by a space and a short description, possibly
+  including a version number.
+\end{itemize}
+The above syntax must be followed exactly so that this information
+can be used by |\LoadClass| or |\documentclass| (for classes) or
+|\RequirePackage| or |\usepackage| (for packages) to test that the
+release is not too old.
+
+The whole of this \m{release-info} information is displayed by
+|\listfiles| and should therefore not be too long.
+
+Example:
+\begin{verbatim}
+   \ProvidesClass{article}[1994/06/01 v1.0 Standard LaTeX class]
+   \ProvidesPackage{ifthen}[1994/06/01 v1.0 Standard LaTeX package]
+\end{verbatim}
+
+\begin{decl}
+  |\ProvidesFile| \arg{file-name} \oarg{release-info}
+\end{decl}
+This is similar to the two previous commands except that here the full
+filename, including the extension, must be given. It is used for
+declaring any files other than main class and package files.
+
+Example:
+\begin{verbatim}
+   \ProvidesFile{T1enc.def}[1994/06/01 v1.0 Standard LaTeX file]
+\end{verbatim}
+
+Note that the phrase \texttt{Standard LaTeX} \textbf{must not} be used
+in the identification banner of any file other than those in the
+standard \LaTeX{} distribution.
+
+\subsection{Loading files}
+\label{Sec:loadf}
+
+\NEWfeature{1995/12/01}
+This group of commands can be used to create your own document class or
+package by building on existing classes or packages.
+\begin{decl}
+  |\RequirePackage| \oarg{options-list} \arg{package-name}
+     \oarg{release-info}\\
+  |\RequirePackageWithOptions| \arg{package-name}
+     \oarg{release-info}
+\end{decl}
+Packages and classes should use these commands to load other packages.
+
+The use of |\RequirePackage| is the same as the author command
+|\usepackage|.
+
+Examples:
+\begin{verbatim}
+   \RequirePackage{ifthen}[1994/06/01]
+   \RequirePackageWithOptions{graphics}[1995/12/01]
+\end{verbatim}
+
+\begin{decl}
+  |\LoadClass| \oarg{options-list} \arg{class-name}
+     \oarg{release-info}\\
+  |\LoadClassWithOptions| \arg{class-name}
+     \oarg{release-info}
+\end{decl}
+\NEWfeature{1995/12/01}
+These commands are for use \emph{only} in class files, they cannot be
+used in packages files;
+they can be used at most once within a class file.
+
+The use of |\LoadClass| is the same as
+the use of |\documentclass| to load a class file.
+
+Examples:
+\begin{verbatim}
+   \LoadClass{article}[1994/06/01]
+   \LoadClassWithOptions{article}[1995/12/01]
+\end{verbatim}
+
+\NEWfeature{1995/12/01}
+The two |WithOptions| versions simply load the class (or package) file
+with exactly those options that are being used by the current file
+(class or package).  See below, in \ref{Sec:opmove}, for further
+discussion of their use.
+
+
+\subsection{Option declaration}
+\label{Sec:commands.options.dec}
+
+\NEWdescription{1998/12/01}
+The following commands deal with the declaration and handling of
+options to document classes and packages.  Every option name must be a
+`\LaTeX{} name'.
+
+There are some commands designed especially for use within the
+\m{code} argument of these commands (see below).
+
+\begin{decl}
+  |\DeclareOption| \arg{option-name} \arg{code}
+\end{decl}
+This makes \m{option-name} a `declared option' of the class or package
+in which it is put.
+
+The \m{code} argument contains the code to be executed if that option
+is specified for the class or package; it can contain any valid
+\LaTeXe{} construct.
+
+Example:
+\begin{verbatim}
+   \DeclareOption{twoside}{\@twosidetrue}
+\end{verbatim}
+
+\begin{decl}
+  |\DeclareOption*| \arg{code}
+\end{decl}
+This declares the \m{code} to be executed for every option which is
+specified for, but otherwise not explicitly declared by, the class or
+package; this code is called the `default option code' and it can
+contain any valid \LaTeXe{} construct.
+
+If a class file contains no |\DeclareOption*| then, by default, all
+specified but undeclared options for that class will be silently
+passed to all packages (as will the specified and declared options for
+that class).
+
+If a package file contains no |\DeclareOption*| then, by default, each
+specified but undeclared option for that package will produce an error.
+
+
+\subsection{Commands within option code}
+\label{Sec:within.code}
+
+These two commands can be used only within the \m{code} argument of
+either |\DeclareOption| or |\DeclareOption*|.  Other commands commonly
+used within these arguments can be found in the next few subsections.
+
+\begin{decl}
+  |\CurrentOption|
+\end{decl}
+This expands to the name of the current option.
+
+\begin{decl}
+  |\OptionNotUsed|
+\end{decl}
+This causes the current option to
+be added to the list of `unused options'.
+
+\NEWfeature{1995/06/01}
+  You can now include hash marks (\texttt{\#}) within these \m{code}
+  arguments without special treatment (formerly, it had been
+  necessary to double them).
+
+\subsection{Moving options around}
+\label{Sec:opmove}
+
+These two commands are also very useful within the \m{code} argument
+of |\DeclareOption| or |\DeclareOption*|:
+\begin{decl}
+  |\PassOptionsToPackage| \arg{options-list} \arg{package-name}\\
+  |\PassOptionsToClass| \arg{options-list} \arg{class-name}
+\end{decl}
+The command |\PassOptionsToPackage| passes the option names in
+\m{options-list} to package \m{package-name}.
+This means that it adds the \m{option-list} to the
+list of options used by any future |\RequirePackage| or |\usepackage|
+command for package \m{package-name}.
+
+Example:
+\begin{verbatim}
+   \PassOptionsToPackage{foo,bar}{fred}
+   \RequirePackage[baz]{fred}
+\end{verbatim}
+is the same as:
+\begin{verbatim}
+   \RequirePackage[foo,bar,baz]{fred}
+\end{verbatim}
+
+Similarly, |\PassOptionsToClass| may be used in a class file to pass
+options to another class to be loaded with |\LoadClass|.
+
+\NEWdescription{1995/12/01}
+The effects and use of these two commands should be contrasted with
+those of the following two (documented above, in \ref{Sec:loadf}):
+\begin{verbatim}
+   \LoadClassWithOptions
+   \RequirePackageWithOptions
+\end{verbatim}
+The command |\RequirePackageWithOptions| is similar to
+|\RequirePackage|, but it always loads the required package with
+exactly the same option list as that being used by the current class
+or package, rather than with any option explicitly supplied or passed
+on by |\PassOptionsToPackage|.
+
+The main purpose of |\LoadClassWithOptions| is to allow one class to
+simply build on another, for example:
+\begin{verbatim}
+  \LoadClassWithOptions{article}
+\end{verbatim}
+This should be compared with the slightly different construction
+\begin{verbatim}
+  \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+  \ProcessOptions\relax
+  \LoadClass{article}
+\end{verbatim}
+As used above, the effects are more or less the same, but the first is
+a lot less to type; also the |\LoadClassWithOptions| method runs
+slightly quicker.
+
+If, however, the class declares options of its own then
+the two constructions are different.  Compare, for example:
+\begin{verbatim}
+  \DeclareOption{landscape}{\@landscapetrue}
+  \ProcessOptions\relax
+  \LoadClassWithOptions{article}
+\end{verbatim}
+with:
+\begin{verbatim}
+  \DeclareOption{landscape}{\@landscapetrue}
+  \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+  \ProcessOptions\relax
+  \LoadClass{article}
+\end{verbatim}
+In the first example, the \textsf{article} class will be loaded with
+option |landscape| precisely when the current class is called with
+this option. By contrast, in the second example it will never be
+called with option \texttt{landscape} as in that case \textsf{article}
+is passed options only by the default option handler, but this handler
+is not used for |landscape| because that option is explicitly
+declared.
+
+\subsection{Delaying code}
+\label{Sec:delays}
+
+These first two commands are also intended primarily for use within
+the \m{code} argument of |\DeclareOption| or |\DeclareOption*|.
+
+\begin{decl}
+  |\AtEndOfClass| \arg{code}\\
+  |\AtEndOfPackage| \arg{code}
+\end{decl}
+These commands declare \m{code} that is saved away internally and then
+executed after processing the whole of the current class or package
+file.
+
+Repeated use of these commands is permitted: the code in the
+arguments is stored (and later executed) in the order of their
+declarations.
+
+\begin{decl}
+  |\AtBeginDocument| \arg{code}\\
+  |\AtEndDocument| \arg{code}
+\end{decl}
+These commands declare \m{code} to be saved internally and executed
+while \LaTeX{} is executing |\begin{document}| or |\end{document}|.
+
+The \m{code} specified in the argument to |\AtBeginDocument| is
+executed near the end of the |\begin{document}| code, \emph{after} the
+font selection tables have been set up.  It is therefore a useful
+place to put code which needs to be executed after everything has been
+prepared for typesetting and when the normal font for the document is
+the current font.
+
+\NEWdescription{1995/12/01}
+The |\AtBeginDocument| hook should not be used for code that does any
+typesetting since the typeset result would be unpredictable.
+
+The \m{code} specified in the argument to |\AtEndDocument| is
+executed at the beginning of the |\end{document}| code,
+\emph{before} the final page is finished and before any leftover
+floating environments are processed. If some of the \m{code} is to be
+executed after these two processes, you should include a |\clearpage|
+at the appropriate point in \m{code}.
+
+Repeated use of these commands is permitted: the code in the
+arguments is stored (and later executed) in the order of their
+declarations.
+
+\begin{decl}[1994/12/01]
+  |\AtBeginDvi| \arg{specials}
+\end{decl}
+These commands save in a box register things which are written to the
+|.dvi| file at the beginning of the `shipout' of the first page of the
+document.
+
+This should not be used for anything that will add any typeset
+material to the |.dvi| file.
+
+Repeated use of this command is permitted.
+
+
+\subsection{Option processing}
+\label{Sec:commands.options}
+
+\begin{decl}
+  |\ProcessOptions|
+\end{decl}
+This command executes the \m{code} for each selected option.
+
+We shall first describe how |\ProcessOptions| works in a package file,
+and then how this differs in a class file.
+
+To understand in detail what |\ProcessOptions| does in a package file,
+you have to know the difference between \emph{local} and \emph{global}
+options.
+\begin{itemize}
+\item \textbf{Local options} are those which have been explicitly
+  specified for this particular package in the \m{options} argument of
+  any of these:
+\begin{quote}
+    |\PassOptionsToPackage{<options>}| \ |\usepackage[<options>]|\\
+    |\RequirePackage[<options>]|
+\end{quote}
+\item \textbf{Global options} are any other options that are specified
+  by the author in the \m{options} argument of
+    |\documentclass[<options>]|.
+\end{itemize}
+For example, suppose that a document begins:
+\begin{verbatim}
+   \documentclass[german,twocolumn]{article}
+   \usepackage{gerhardt}
+\end{verbatim}
+whilst package |gerhardt| calls package |fred| with:
+\begin{verbatim}
+   \PassOptionsToPackage{german,dvips,a4paper}{fred}
+   \RequirePackage[errorshow]{fred}
+\end{verbatim}
+then:
+\begin{itemize}
+\item |fred|'s local options are |german|, |dvips|, |a4paper|
+  and |errorshow|;
+\item |fred|'s only global option is |twocolumn|.
+\end{itemize}
+
+When |\ProcessOptions| is called, the following happen.
+\begin{itemize}
+\item \emph{First}, for each option so far declared in |fred.sty|
+  by |\DeclareOption|, it looks to see if that option is either a
+  global or a local option for |fred|: if it is then the corresponding
+  code is executed.
+
+  This is done in the order in which these options
+  were declared in |fred.sty|.
+\item \emph{Then}, for each remaining \emph{local} option, the command
+  |\ds@<option>| is executed if it has been defined somewhere (other
+  than by a |\DeclareOption|); otherwise, the `default option code' is
+  executed.  If no default option code has been declared then an error
+  message is produced.
+
+  This is done in the order in which these
+  options were specified.
+\end{itemize}
+Throughout this process, the system ensures that the code declared for
+an option is executed at most once.
+
+Returning to the example, if |fred.sty| contains:
+\begin{verbatim}
+   \DeclareOption{dvips}{\typeout{DVIPS}}
+   \DeclareOption{german}{\typeout{GERMAN}}
+   \DeclareOption{french}{\typeout{FRENCH}}
+   \DeclareOption*{\PackageWarning{fred}{Unknown `\CurrentOption'}}
+   \ProcessOptions\relax
+\end{verbatim}
+then the result of processing this document will be:
+\begin{verbatim}
+   DVIPS
+   GERMAN
+   Package fred Warning: Unknown `a4paper'.
+   Package fred Warning: Unknown `errorshow'.
+\end{verbatim}
+Note the following:
+
+\begin{itemize}
+\item the code for the |dvips| option is executed before that for the
+  |german| option, because that is the order in which they are declared
+  in |fred.sty|;
+\item the code for the |german| option is executed only once, when the
+  declared options are being processed;
+\item the |a4paper| and |errorshow| options produce the warning from
+  the code declared by |\DeclareOption*| (in the order in which they
+  were specified), whilst the |twocolumn| option does not: this is
+  because |twocolumn| is a global option.
+\end{itemize}
+
+In a class file, |\ProcessOptions| works in the same way, except
+that: \emph{all} options are local; and the default value for
+|\DeclareOption*| is |\OptionNotUsed| rather than an error.
+
+\NEWdescription{1995/12/01}
+Note that, because |\ProcessOptions| has a |*|-form, it is wise to
+follow the non-star form with |\relax|, as in the previous examples,
+since this prevents unnecessary look ahead and possibly misleading
+error messages being issued.
+
+\begin{decl}
+  |\ProcessOptions*| \\
+  |\@options|
+\end{decl}
+This is like |\ProcessOptions| but it executes the options in the
+order specified in the calling commands, rather than in the order of
+declaration in the class or package. For a package this means that the
+global options are processed first.
+
+The |\@options| command from \LaTeX~2.09 has been made equivalent to
+this in order to ease the task of updating old document styles to
+\LaTeXe{} class files.
+
+\begin{decl}
+  |\ExecuteOptions| \arg{options-list}
+\end{decl}
+
+For each option in the \m{options-list}, in order,
+this command simply executes the command
+|\ds@<option>| (if this command is not defined, then that option is
+silently ignored).
+
+It can be used to provide a `default option list' just before
+|\ProcessOptions|.  For example, suppose that in a class file you want
+to set up the default design to be: two-sided printing; 11pt fonts;
+in two columns. Then it could specify:
+\begin{verbatim}
+   \ExecuteOptions{11pt,twoside,twocolumn}
+\end{verbatim}
+
+
+\subsection{Safe file commands}
+
+These commands deal with file input; they ensure that the non-existence
+of a requested file can be handled in a user-friendly way.
+
+\begin{decl}
+|\IfFileExists| \arg{file-name} \arg{true} \arg{false}
+\end{decl}
+If the file exists then the code specified in \m{true} is
+executed.
+
+If the file does not exist then the code specified in \m{false} is
+executed.
+
+This command does \emph{not} input the file.
+
+\begin{decl}
+  |\InputIfFileExists| \arg{file-name} \arg{true} \arg{false}
+\end{decl}
+This inputs the file \m{file-name} if it exists and, immediately
+before the input, the code specified in \m{true} is executed.
+
+If the file does not exist then the code specified in \m{false} is
+executed.
+
+It is implemented using |\IfFileExists|.
+
+
+\subsection{Reporting errors, etc}
+
+These commands should be used by third party classes and packages to
+report errors, or to provide information to authors.
+
+\begin{decl}
+  |\ClassError| \arg{class-name} \arg{error-text} \arg{help-text}\\
+  |\PackageError| \arg{package-name} \arg{error-text} \arg{help-text}
+\end{decl}
+These produce an error message.  The \m{error-text} is displayed and the
+|?| error prompt is shown.  If the user types |h|, they will be shown
+the \m{help-text}.
+
+Within the \m{error-text} and \m{help-text}: |\protect| can be used to
+stop a command from expanding; |\MessageBreak| causes a line-break;
+and |\space| prints a space.
+
+Note that the \m{error-text} will have a full stop added to it, so do
+not put one into the argument.
+
+For example:
+\begin{verbatim}
+   \newcommand{\foo}{FOO}
+   \PackageError{ethel}{%
+      Your hovercraft is full of eels,\MessageBreak
+      and \protect\foo\space is \foo
+   }{%
+      Oh dear! Something's gone wrong.\MessageBreak
+      \space \space Try typing \space <<return>>
+      \space to proceed, ignoring \protect\foo.
+   }
+\end{verbatim}
+produces this display:
+\begin{verbatim}
+   ! Package ethel Error: Your hovercraft is full of eels,
+   (ethel)                and \foo is FOO.
+
+   See the ethel package documentation for explanation.
+\end{verbatim}
+If the user types |h|, this will be shown:
+\begin{verbatim}
+   Oh dear! Something's gone wrong.
+     Try typing  <<return>>  to proceed, ignoring \foo.
+\end{verbatim}
+
+\begin{decl}
+  |\ClassWarning| \arg{class-name} \arg{warning-text}\\
+  |\PackageWarning| \arg{package-name} \arg{warning-text}\\
+  |\ClassWarningNoLine| \arg{class-name} \arg{warning-text}\\
+  |\PackageWarningNoLine| \arg{package-name} \arg{warning-text}\\
+  |\ClassInfo| \arg{class-name} \arg{info-text}\\
+  |\PackageInfo| \arg{package-name} \arg{info-text}
+\end{decl}
+The four |Warning| commands are similar to the error commands, except
+that they produce only a warning on the screen, with no error prompt.
+
+The first two, |Warning| versions, also show the line number where the
+warning occurred, whilst the second two, |WarningNoLine| versions, do
+not.
+
+The two |Info| commands are similar except that they log the
+information only in the transcript file, including the line number.
+There are no |NoLine| versions of these two.
+
+Within the \m{warning-text} and \m{info-text}: |\protect| can be used to
+stop a command from expanding; |\MessageBreak| causes a line-break;
+and |\space| prints a space.
+Also, these should not end with a full stop as one is
+automatically added.
+
+
+\subsection{Defining commands}
+\label{Sec:commands.define}
+
+\LaTeXe{} provides some extra methods of (re)defining commands that are
+intended for use in class and package files.
+
+\NEWfeature{1994/12/01}
+The \texttt{*}-forms of these commands should be used to define
+commands that are not, in \TeX{} terms, long.  This can be useful for
+error-trapping with commands whose arguments are not intended to
+contain whole paragraphs of text.
+
+\begin{decl}
+  |\DeclareRobustCommand| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}\\
+  |\DeclareRobustCommand*| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}
+\end{decl}
+This command takes the same arguments as |\newcommand| but it declares
+a robust command, even if some code within the \m{definition} is
+fragile.  You can use this command to define new robust commands, or
+to redefine existing commands and make them robust.  A log is put into
+the transcript file if a command is redefined.
+
+For example, if |\seq| is defined as follows:
+\begin{verbatim}
+   \DeclareRobustCommand{\seq}[2][n]{%
+     \ifmmode
+       #1_{1}\ldots#1_{#2}%
+     \else
+       \PackageWarning{fred}{You can't use \protect\seq\space in text}%
+     \fi
+   }
+\end{verbatim}
+Then the command |\seq| can be used in moving arguments, even though
+|\ifmmode| cannot, for example:
+\begin{verbatim}
+   \section{Stuff about sequences $\seq{x}$}
+\end{verbatim}
+
+Note also that there is no need to put a |\relax| before the
+|\ifmmode| at the beginning of the definition; this is because the
+protection given by this |\relax| against expansion at the wrong time
+will be provided internally.
+
+\begin{decl}
+  |\CheckCommand| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}\\
+  |\CheckCommand*| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}
+\end{decl}
+This takes the same arguments as |\newcommand| but, rather than define
+\m{cmd}, it just checks that the current definition of \m{cmd} is
+exactly as given by \m{definition}.  An error is raised if these
+definitions differ.
+
+This command is useful for checking the state of the system before
+your package starts altering the definitions of commands.  It allows
+you to check, in particular, that no other package has redefined the
+same command.
+
+\subsection{Moving arguments}
+
+\NEWdescription{1994/12/01}
+The setting of protect whilst processing (i.e.~moving) moving arguments
+has been reimplemented, as has the method of writing information from
+the |.aux| file to other files such as the |.toc| file.  Details can
+be found in the file |ltdefns.dtx|.
+
+We hope that these changes will not affect many packages.
+
+\section{Miscellaneous commands, etc}
+\label{Sec:commands.misc}
+
+\subsection{Layout parameters}
+
+\begin{decl}
+|\paperheight|\\
+|\paperwidth|
+\end{decl}
+These two parameters are usually set by the class to be the size of
+the paper being used. This should be actual paper size, unlike
+|\textwidth| and |\textheight| which are the size of the main text
+body within the margins.
+
+
+\subsection{Case changing}
+\label{sec:case}
+
+\begin{decl}
+  |\MakeUppercase| \arg{text} \\
+  |\MakeLowercase| \arg{text}
+\end{decl}
+
+\NEWfeature{1995/06/01}
+\TeX{} provides two primitives |\uppercase| and |\lowercase| for
+changing the case of text.  These are sometimes used in document
+classes, for example to set information in running heads in all
+capitals.
+
+Unfortunately, these \TeX{} primitives do not change the case of
+characters accessed by commands like |\ae| or |\aa|.  To overcome this
+problem, \LaTeX{} provides two new commands |\MakeUppercase| and
+|\MakeLowercase| to do this.
+
+For example:
+\begin{quotation}
+\begin{tabular}{rl}
+   |\uppercase{aBcD\ae\AA\ss\OE}| & \uppercase{aBcD\ae\AA\ss\OE}\\
+   |\lowercase{aBcD\ae\AA\ss\OE}| & \lowercase{aBcD\ae\AA\ss\OE}\\
+   |\MakeUppercase{aBcD\ae\AA\ss\OE}| &
+                                      \MakeUppercase{aBcD\ae\AA\ss\OE}\\
+   |\MakeLowercase{aBcD\ae\AA\ss\OE}| & \MakeLowercase{aBcD\ae\AA\ss\OE}
+\end{tabular}
+\end{quotation}
+
+The commands |\MakeUppercase| and |\MakeLowercase| themselves are
+robust, but they have moving arguments.
+
+The commands use the \TeX{} primitives |\uppercase| and |\lowercase|,
+and so have a number of unexpected `features'.  In particular, they
+change the case of everything (except characters in the names of
+control-sequences) in their text argument: this includes mathematics,
+environment names, and label names.
+
+For example:
+\begin{verbatim}
+   \MakeUppercase{$x+y$ in \ref{foo}}
+\end{verbatim}
+produces $X+Y$ and the warning:
+\begin{verbatim}
+   LaTeX Warning: Reference `FOO' on page ... undefined on ...
+\end{verbatim}
+In the long run, we would like to use all-caps fonts rather than any
+command like |\MakeUppercase| but this is not possible at the moment
+because such fonts do not exist.
+
+\NEWdescription{1995/12/01}
+In order that upper/lower-casing will work reasonably well, and in
+order to provide any correct hyphenation, \LaTeXe{} \emph{must} use,
+throughout a document, the same fixed table for changing case.
+The table used is designed for the font encoding |T1|; this works well
+with the standard \TeX{} fonts for all Latin alphabets but will cause
+problems when using other alphabets.
+
+\subsection{The `openany' option in the `book' class}
+
+\NEWdescription{1996/06/01}
+The |openany| option allows chapter and similar openings to
+occur on left hand pages. Previously this option affected only
+|\chapter| and |\backmatter|.  It now also affects
+|\part|, |\frontmatter| and |\mainmatter|.
+
+\subsection{Better user-defined math display environments}
+
+\begin{decl}
+  |\ignorespacesafterend|
+\end{decl}
+
+\NEWfeature{1996/12/01}
+\NEWdescription{2003/12/01}
+Suppose that you want to define an environment for displaying text
+that is numbered as an equation.  A straightforward way to do this is
+as follows:
+\begin{verbatim}
+  \newenvironment{texteqn}
+    {\begin{equation}
+       \begin{minipage}{0.9\linewidth}}
+      {\end{minipage}
+     \end{equation}}
+\end{verbatim}
+However, if you have tried this then you will probably have noticed
+that it does not work perfectly when used in the middle of a paragraph
+because an inter-word space appears at the beginning of the first
+line after the environment.
+
+There is now an extra command (with a very long name) available that
+you can use to avoid this problem; it should be inserted as shown here:
+\begin{verbatim}
+  \newenvironment{texteqn}
+    {\begin{equation}
+       \begin{minipage}{0.9\linewidth}}
+      {\end{minipage}
+     \end{equation}
+     \ignorespacesafterend}
+\end{verbatim}
+
+This command may also have other uses.
+
+\subsection{Normalising spacing}
+
+\begin{decl}
+  |\normalsfcodes|
+\end{decl}
+
+\NEWfeature{1997/06/01}
+This command should be used to restore the normal settings of the
+parameters that affect spacing between words, sentences, etc.
+
+An important use of this feature is to correct a problem, reported by
+Donald Arseneau, that punctuation in page headers has always (in all
+known \TeX{} formats) been potentially wrong whenever a page break
+happens while a local setting of the space codes is in effect.  These
+space codes are changed by, for example, the command
+\verb|\frenchspacing|) and the \textsf{verbatim} environment.
+
+It is normally given the correct definition automatically in
+|\begin{document}| and so need not be explicitly set; however, if it
+is explicitly made nonempty in a class file then automatic
+default setting will be over-ridden.
+
+
+\section{Upgrading \LaTeX~2.09 classes and packages}
+\label{Sec:upgrade}
+
+This section describes the changes you may need to make when you
+upgrade an existing \LaTeX{} style to a package or class but we shall
+start in optimistic mode.
+
+Many existing style files will run with \LaTeXe{} without any
+modification to the file itself.  When everything is running OK,
+please put a note in the newly created package or class file to record
+that it runs with the new standard \LaTeX{}; then distribute it to
+your users.
+
+\subsection{Try it first!}
+\label{Sec:try-it}
+
+The first thing you should do is to test your style in `compatibility
+mode'.  The only change you need to make in order to do this is,
+possibly, to change the extension of the file to |.cls|: you should
+make this change only if your file was used as a main document style.
+Now, without any other modifications, run \LaTeXe{} on a document that
+uses your file.  This assumes that you have a suitable collection of
+files that tests all the functionality provided by your style file.
+(If you haven't, now is the time to make one!)
+
+You now need to change the test document files so that they are
+\LaTeXe{} documents: see \emph{\usrguide} for details of how to do
+this and then try them again.  You have now tried the test documents
+in both \LaTeXe{} native mode and \LaTeX~2.09 compatibility mode.
+
+\subsection{Troubleshooting}
+\label{Sec:trouble}
+
+If your file does not work with \LaTeXe{}, there are two likely
+reasons.
+\begin{itemize}
+\item \LaTeX{} now has a robust, well-defined designer's interface for
+  selecting fonts, which is very different from the \LaTeX~2.09
+  internals.
+\item Your style file may have used some \LaTeX~2.09 internal commands
+  which have changed, or which have been removed.
+\end{itemize}
+
+When you are debugging your file, you will probably need more
+information than is normally displayed by \LaTeXe.  This is achieved
+by resetting the counter |errorcontextlines| from its default value of
+$-1$ to a much higher value, e.g.~999.
+
+\subsection{Accommodating compatibility mode}
+
+Sometimes an existing collection of \LaTeX~2.09 documents makes it
+inconvenient or impossible to abandon the old commands entirely.
+If this is the case, then it is possible to accommodate both conventions
+by making special provision for documents processed in compatibility
+mode.
+
+\begin{decl}
+|\if@compatibility|
+\end{decl}
+This switch is set when a document begins with |\documentstyle| rather
+than |\documentclass|.  Appropriate code can be supplied for either
+condition, as follows:
+\begin{verbatim}
+   \if@compatibility
+     <code emulating LaTeX 2.09 behavior>
+   \else
+     <code suitable for LaTeX2e>
+   \fi
+\end{verbatim}
+
+
+\subsection{Font commands}
+
+Some font and size commands are now defined by the document class
+rather than by the \LaTeX{} kernel.  If you are upgrading a
+\LaTeX~2.09 document style to a class that does not load one of the
+standard classes, then you will probably need to add definitions for
+these commands.
+
+\begin{decl}
+   |\rm| |\sf| |\tt| |\bf| |\it| |\sl| |\sc|
+\end{decl}
+None of these short-form font selection commands are defined in the
+\LaTeXe{} kernel.  They are defined by all the standard class files.
+
+If you want to define them in your class file, there are several
+reasonable ways to do this.
+
+One possible definition is:
+\begin{verbatim}
+   \newcommand{\rm}{\rmfamily}
+   ...
+   \newcommand{\sc}{\scshape}
+\end{verbatim}
+This would make the font commands orthogonal; for example
+|{\bf\it text}| would produce bold italic, thus: \textbf{\textit{text}}.
+It will also make them produce an error if used in math mode.
+
+Another possible definition is:
+\begin{verbatim}
+   \DeclareOldFontCommand{\rm}{\rmfamily}{\mathrm}
+   ...
+   \DeclareOldFontCommand{\sc}{\scshape}{\mathsc}
+\end{verbatim}
+This will make |\rm| act like |\rmfamily| in text mode (see above) and
+it will make |\rm| select the |\mathrm| math alphabet in math mode.
+
+Thus |${\rm math} = X + 1$| will produce `${\rm math} = X + 1$'.
+
+If you do not want font selection to be orthogonal then you can
+follow the standard classes and define:
+\begin{verbatim}
+   \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+   ...
+   \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\mathsc}
+\end{verbatim}
+This means, for example, that |{\bf\it text}| will produce medium
+weight (rather than bold) italic, thus: \textit{text}.
+
+\begin{decl}
+   |\normalsize| \\
+   |\@normalsize|
+\end{decl}
+The command |\@normalsize| is retained for compatibility with
+\LaTeX~2.09 packages which may have used its value; but redefining it
+in a class file will have no effect since it is always reset to have
+the same meaning as |\normalsize|.
+
+This means that classes \emph{must} now redefine |\normalsize| rather
+than redefining |\@normalsize|; for example (a rather incomplete one):
+\begin{verbatim}
+   \renewcommand{\normalsize}{\fontsize{10}{12}\selectfont}
+\end{verbatim}
+Note that |\normalsize| is defined by the \LaTeX{} kernel to be an
+error message.
+
+\begin{decl}
+   |\tiny| |\footnotesize| |\small| |\large|\\
+   |\Large| |\LARGE| |\huge| |\Huge|
+\end{decl}
+None of these other `standard' size-changing commands are defined in
+the kernel: each needs to be defined in a class file if you need it.
+They are all defined by the standard classes.
+
+This means you should use |\renewcommand| for |\normalsize| and
+|\newcommand| for the other size-changing commands.
+
+
+\subsection{Obsolete commands}
+
+Some packages will not work with \LaTeXe{}, normally because they relied
+on an internal \LaTeX{} command which was never supported and has now
+changed, or been removed.
+
+In many cases there will now be a robust, high-level means of
+achieving what previously required low-level commands.  Please consult
+Section~\ref{Sec:commands} to see if you can now use the \LaTeXe{}
+class and package writers commands.
+
+Also, of course, if your package or class redefined any of the kernel
+commands (i.e.~those defined in the files |latex.tex|, |slitex.tex|,
+|lfonts.tex|, |sfonts.tex|) then you will need to check it very
+carefully against the new kernel in case the implementation has
+changed or the command no longer exists in the \LaTeX2e{} kernel.
+
+Too many of the internal commands of \LaTeX~2.09 have been
+re-implemented or removed to be able to list them all here. You must
+check any that you have used or changed.
+
+We shall, however, list some of the more important commands which are
+no longer supported.
+
+\begin{decl}
+   |\tenrm| |\elvrm| |\twlrm| \dots\\
+   |\tenbf| |\elvbf| |\twlbf| \dots\\
+   |\tensf| |\elvsf| |\twlsf| \dots\\
+   \qquad$\vdots$
+\end{decl}
+The (approximately) seventy internal commands of this form are no longer
+defined.  If your class or package uses them then \emph{please}
+replace them with new font commands described in \emph{\fntguide}.
+
+For example, the command |\twlsf| should be replaced by:
+\begin{verbatim}
+   \fontsize{12}{14}\normalfont\sffamily\selectfont
+\end{verbatim}
+
+Another possibility is to use the |rawfonts| package, described in
+\emph{\usrguide}.
+
+Also, remember that many of the fonts preloaded by \LaTeX~2.09
+are no longer preloaded.
+
+\begin{decl}
+   |\vpt| |\vipt| |\viipt| \dots
+\end{decl}
+These were the internal size-selecting commands in \LaTeX~2.09.
+(They can still be used in \LaTeX~2.09 compatibility mode.)
+Please use the command |\fontsize| instead: see \emph{\fntguide} for
+details.
+
+For example, |\vpt| should be replaced by:
+\begin{verbatim}
+   \fontsize{5}{6}\normalfont\selectfont
+\end{verbatim}
+
+\begin{decl}
+  |\prm|, |\pbf|, |\ppounds|, |\pLaTeX| \dots
+\end{decl}
+\LaTeX~2.09 used several commands beginning with |\p| in order to
+provide `protected' commands.  For example, |\LaTeX| was defined to be
+|\protect\pLaTeX|, and |\pLaTeX| was defined to produce the \LaTeX{}
+logo.  This made |\LaTeX| robust, even though |\pLaTeX| was not.
+
+These commands have now been reimplemented using
+|\DeclareRobustCommand|
+(described in Section~\ref{Sec:commands.define}).
+If your package redefined one of the |\p|-commands then you must
+remove the redefinition and use |\DeclareRobustCommand| to redefine the
+non-|\p| command.
+
+\begin{decl}
+|\footheight|\\
+|\@maxsep|\\
+|\@dblmaxsep|
+\end{decl}
+These parameters are not used by \LaTeXe{} so they have been removed,
+except in \LaTeX~2.09 compatibility mode.  Classes should no longer
+set them.
+
+\begin{thebibliography}{1}
+
+\bibitem{A-W:DEK91}
+Donald~E. Knuth.
+\newblock {\em The \TeX book}.
+\newblock Addison-Wesley, Reading, Massachusetts, 1986.
+\newblock Revised to cover \TeX3, 1991.
+
+\bibitem{A-W:LLa94}
+Leslie Lamport.
+\newblock {\em {\LaTeX:} A Document Preparation System}.
+\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
+
+\bibitem{A-W:MG2004}
+Frank Mittelbach and Michel Goossens.
+\newblock {\em The {\LaTeX} Companion second edition}.
+\newblock With Johannes Braams, David Carlisle, and Chris Rowley.
+\newblock Addison-Wesley, Reading, Massachusetts, 2004.
+
+\end{thebibliography}
+
+\newpage
+\thispagestyle{empty}
+
+\section*{\LaTeXe{} Summary sheet: updating old styles}
+
+Section references below are to \emph{\clsguide}.
+
+\begin{enumerate}
+
+\item Should it become a class or a package?
+  See Section~\ref{Sec:classorpkg} for how to answer this question.
+
+\item If it uses another style file, then you will need to obtain an
+  updated version of this other file.  Look at Section~\ref{Sec:loading}
+  for information on how to load other class and package files.
+
+\item Try it: see Section~\ref{Sec:try-it}.
+
+\item It worked?  Excellent, but there are probably still some things
+  you should change in order to make your file into a well-structured
+  \LaTeXe{} file that is both robust and portable. So you should now
+  read Section~\ref{Sec:writing}, especially~\ref{Sec:general}.  You
+  will also find some useful examples in Section~\ref{Sec:structure}.
+
+  If your file sets up new fonts, font-changing commands or symbols,
+  you should also read \emph{\fntguide}.
+
+\item It did not work?  There are three possibilities here:
+  \begin{itemize}
+  \item  error messages are produced whilst reading your file;
+  \item  error messages are produced whilst processing test documents;
+  \item  there are no errors but the output is not as it should be.
+  \end{itemize}
+  Don't forget to check carefully for this last possibility.
+
+  If you have got to this stage then you will need to read
+  Section~\ref{Sec:upgrade} to find the solutions that will make your
+  file work.
+\end{enumerate}
+
+\end{document}
diff --git a/macros/latex-dev/base/clsguide.pdf b/macros/latex-dev/base/clsguide.pdf
index ab8af60728..3d17c94cba 100644
--- a/macros/latex-dev/base/clsguide.pdf
+++ b/macros/latex-dev/base/clsguide.pdf
diff --git a/macros/latex-dev/base/clsguide.tex b/macros/latex-dev/base/clsguide.tex
index ce2c1dcf81..7225425ec8 100644
--- a/macros/latex-dev/base/clsguide.tex
+++ b/macros/latex-dev/base/clsguide.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2023
+% Copyright (C) 2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -28,21 +28,32 @@
 % \fi
 % Filename: clsguide.tex
 
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\documentclass{ltxguide}
 
-\documentclass{ltxguide}[1995/11/28]
+\usepackage[T1]{fontenc}  % needed for \textbackslash in tt
+\usepackage{csquotes}
 
-\title{\LaTeXe~for class and package writers}
-
-\author{Copyright \copyright~1995--2006 The \LaTeX\ Project\\
+\title{\LaTeX\ for package and class authors --- current version}
+\author{\copyright~Copyright 2023, \LaTeX\ Project Team.\\
    All rights reserved.%
-   \footnote{This file may be distributed and/or modified under the
+   \footnote{This file may distributed and/or modified under the
      conditions of the \LaTeX{} Project Public License, either version 1.3c
      of this license or (at your option) any later version. See the source
     \texttt{clsguide.tex} for full details.}%
 }
 
-\date{15 February 2006}
+\date{2023-01-12}
+
+\NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
+\NewDocumentCommand\marg{m}{\arg{#1}}
+\NewDocumentCommand\meta{m}{\ensuremath{\langle}\textit{#1}\ensuremath{\rangle}}
+\NewDocumentCommand\pkg{m}{\textsf{#1}}
+\NewDocumentCommand\text{m}{\ifmmode\mbox{#1}\else#1\fi}
+% Fix a 'feature'
+\makeatletter
+\renewcommand \verbatim@font {\normalfont \ttfamily}
+\makeatother
+\providecommand\url[1]{\texttt{#1}}
 
 \begin{document}
 
@@ -52,105 +63,74 @@
 
 \section{Introduction}
 
-This document is an introduction to writing classes and packages for
-\LaTeX{}, with special attention given to upgrading existing
-\LaTeX~2.09 packages to \LaTeXe{}.  The latter subject is also
-covered in an article by Johannes Braams published in TUGboat~15.3.
-
-\subsection{Writing classes and packages for \LaTeXe}
-
-\LaTeX{} is a document preparation system that enables the document
-writer to concentrate on the contents of their text, without bothering
-too much about the formatting of it.  For example, chapters are
-indicated by |\chapter{<title>}| rather than by selecting 18pt bold.
-
-The file that contains the information about how to turn logical
-structure (like `|\chapter|') into formatting (like `18pt bold ragged
-right') is a \emph{document class}.  In addition, some features (such
-as colour or included graphics) are independent of the document class
-and these are contained in \emph{packages}.
+\LaTeXe{} was released in 1994 and added a number of then-new concepts to
+\LaTeX{}. For package and class authors, these are described in
+\texttt{clsguide-historic}, which has largely remained unchanged. Since then,
+the \LaTeX{} team have worked on a number of ideas, firstly a programming
+language for \LaTeX{} (L3 programming layer) and then a range of tools for
+authors which build on that language. Here, we describe the current, stable set
+of tools provided by the \LaTeX{} kernel for package and class developers. We
+assume familiarity with general \LaTeX{} usage as a document author, and that
+the material here is read in conjunction with \texttt{usrguide}, which provides
+information for general \LaTeX{} users on up-to-date approaches to creating
+commands, etc.
 
-One of the largest differences between \LaTeX~2.09 and \LaTeXe{} is in
-the commands used to write packages and classes.  In \LaTeX~2.09,
-there was very little support for writing |.sty| files, and so writers
-had to resort to using low-level commands.
+\section{Writing classes and packages}
+\label{Sec:writing}
 
-\LaTeXe{} provides high-level commands for structuring packages.
-It is also much easier to build classes and packages on top of each
-other, for example writing a local technical report class |cetechr|
-(for the Chemical Engineering department) based on |article|.
+This section covers some general points concerned with writing
+\LaTeX{} classes and packages.
 
-\subsection{Overview}
+\subsection{Is it a class or a package?}
+\label{Sec:classorpkg}
 
-This document contains an overview of how to write classes and
-packages for \LaTeX{}.  It does \emph{not} introduce all of the
-commands necessary to write packages: these can be found in either
-\emph{\LaTeXbook} or \emph{\LaTeXcomp}.  But it does describe the new
-commands for structuring classes and packages.
+The first thing to do when you want to put some new \LaTeX{} commands
+in a file is to decide whether it should be a \emph{document class} or a
+\emph{package}.  The rule of thumb is:
+\begin{quote}
+  If the commands could be used with any document class, then make
+  them a package; and if not, then make them a class.
+\end{quote}
 
-\begin{description}
+There are two major types of class: those like |article|, |report| or
+|letter|, which are free-standing; and those which are extensions or
+variations of other classes---for example, the |proc| document class,
+which is built on the |article| document class.
 
-\item[Section~\ref{Sec:general}] contains some general advice about
-  writing classes and packages.  It describes the difference between
-  classes and packages, the command naming conventions, the use of
-  |doc| and |docstrip|, how \TeX's primitive file and box commands
-  interact with \LaTeX{}. It also contains some hints about general
-  \LaTeX{} style.
+Thus, a company might have a local |ownlet| class for printing letters
+with their own headed note-paper.  Such a class would build on top of
+the existing |letter| class but it cannot be used with any other
+document class, so we have |ownlet.cls| rather than |ownlet.sty|.
 
-\item[Section~\ref{Sec:structure}] describes the structure of classes
-  and packages.  This includes building classes and packages on top of
-  other classes and packages, declaring options and declaring
-  commands.  It also contains example classes.
+The |graphics| package, in contrast, provides commands for including
+images into a \LaTeX{} document.  Since these commands can be used
+with any document class, we have |graphics.sty| rather than
+|graphics.cls|.
 
-\item[Section~\ref{Sec:commands}] lists the new class and package
-   commands.
+\subsection{Using `docstrip' and `doc'}
 
- \item[Section~\ref{Sec:upgrade}] gives detailed advice on how to
-   upgrade existing \LaTeX~2.09 classes and packages to \LaTeXe{}.
+If you are going to write a large class or package for \LaTeX{} then
+you should consider using the |doc| software which comes with
+\LaTeX{}.
+\LaTeX{} classes and packages written using this can be
+processed in two ways: they can be run through \LaTeX{}, to produce
+documentation; and they can be processed with |docstrip|, to produce
+the |.cls| or |.sty| file.
 
-\end{description}
+The |doc| software can automatically generate indexes of definitions,
+indexes of command use, and change-log lists.  It is very useful for
+maintaining and documenting large \TeX{} sources.
 
-\subsection{Further information}
-
-For a general introduction to \LaTeX{}, including the new features of
-\LaTeXe{}, you should read \emph{\LaTeXbook}
-by Leslie Lamport~\cite{A-W:LLa94}.
-
-A more detailed description of the new features of \LaTeX, including an
-overview of more than 200 packages and nearly 1000 ready to run examples, is
-to be found in \emph{\LaTeXcomp\ second edition} by Frank Mittelbach and
-Michel Goossens~\cite{A-W:MG2004}.
-
-The \LaTeX{} system is based on \TeX{}, which is
-described in \emph{The \TeX book} by Donald E.~Knuth~\cite{A-W:DEK91}.
-
-There are a number of documentation files which accompany every copy
-of \LaTeX{}.  A copy of \emph{\LaTeX{} News} will come out with each
-six-monthly release of \LaTeX{}, and is found in the files
-|ltnews*.tex|.  The author's guide \emph{\usrguide} describes the new
-\LaTeX{} document features; it is in |usrguide.tex|.  The guide
-\emph{\fntguide} describes the \LaTeX{} font selection scheme for
-class- and package-writers; it is in |fntguide.tex|. Configuring
-\LaTeX{} is covered by the guide \emph{\cfgguide} in
-\texttt{cfgguide.tex} whilst the philosophy behind our policy on
-modifying \LaTeX{} is described in \emph{\modguide} in
-\texttt{modguide.tex}.
-
-The documented source code (from the files used to produce the kernel
-format via |latex.ltx|) is now available as
-\emph{The \LaTeXe\ Sources}.
-This very large document also includes an index of
-\LaTeX{} commands.  It can be typeset from the \LaTeX{} file
-|source2e.tex| in the |base| directory, using the source files and
-the class file |ltxdoc.cls| from this directory.
-
-For more information about \TeX{} and \LaTeX{}, please contact your
-local \TeX{} Users Group, or the international \TeX{} Users Group.
-Addresses and other details can be found at:
-\begin{quote}\small\label{addrs}
-    \texttt{http://www.tug.org/lugs.html}
-\end{quote}
+The documented sources of the \LaTeX{} kernel itself, and of the
+standard classes, etc., are |doc| documents; they are in the |.dtx|
+files in the distribution.  You can, in fact, typeset the source code
+of the kernel as one long document, complete with index, by running
+\LaTeX{} on |source2e.tex|.  Typesetting these documents uses the
+class file |ltxdoc.cls|.
 
+For more information on |doc| and |docstrip|, consult the files
+|docstrip.dtx|, |doc.dtx|, and \emph{\LaTeXcomp}.  For examples of its
+use, look at the |.dtx| files.
 
 \subsection{Policy on standard classes}
 
@@ -182,89 +162,10 @@ packages that can be used to enhance these classes.  So your first
 thought when you consider such a deficiency will, we hope, be ``what
 can I do to improve this?''
 
-Similar considerations apply to those parts of the kernel that are
-implementing design decisions, many of which should be left to the
-class file but are not in the current system.  We realise that in such
-cases it is much more difficult for you to rectify the problem
-yourself but it is also the case that making such changes in the
-kernel would probably be a major project for us; therefore such
-enhancements will have to wait for \LaTeX3.
-
-\section{Writing classes and packages}
-\label{Sec:writing}
-
-This section covers some general points concerned with writing
-\LaTeX{} classes and packages.
-
-
-\subsection{Old versions}
-
-If you are upgrading an existing \LaTeX~2.09 style file then we
-recommend freezing the 2.09 version and no longer maintaining it.
-Experience with the various dialects of \LaTeX{} which existed in the
-early 1990's suggests that maintaining packages for different versions
-of \LaTeX{} is almost impossible.  It will, of course, be necessary
-for some organisations to maintain both versions in parallel for some
-time but this is not essential for those packages and classes
-supported by individuals: they should support only the new standard
-\LaTeXe{}, not obsolete versions of \LaTeX{}.
-
-
-\subsection{Using `docstrip' and `doc'}
-
-If you are going to write a large class or package for \LaTeX{} then
-you should consider using the |doc| software which comes with
-\LaTeX{}.
-\LaTeX{} classes and packages written using this can be
-processed in two ways: they can be run through \LaTeX{}, to produce
-documentation; and they can be processed with |docstrip|, to produce
-the |.cls| or |.sty| file.
-
-The |doc| software can automatically generate indexes of definitions,
-indexes of command use, and change-log lists.  It is very useful for
-maintaining and documenting large \TeX{} sources.
-
-The documented sources of the \LaTeX{} kernel itself, and of the
-standard classes, etc, are |doc| documents; they are in the |.dtx|
-files in the distribution.  You can, in fact, typeset the source code
-of the kernel as one long document, complete with index, by running
-\LaTeX{} on |source2e.tex|.  Typesetting these documents uses the
-class file |ltxdoc.cls|.
-
-For more information on |doc| and |docstrip|, consult the files
-|docstrip.dtx|, |doc.dtx|, and \emph{\LaTeXcomp}.  For examples of its
-use, look at the |.dtx| files.
-
-\subsection{Is it a class or a package?}
-\label{Sec:classorpkg}
-
-The first thing to do when you want to put some new \LaTeX{} commands
-in a file is to decide whether it should be a \emph{document class} or a
-\emph{package}.  The rule of thumb is:
-\begin{quote}
-  If the commands could be used with any document class, then make
-  them a package; and if not, then make them a class.
-\end{quote}
-
-There are two major types of class: those like |article|, |report| or
-|letter|, which are free-standing; and those which are extensions or
-variations of other classes---for example, the |proc| document class,
-which is built on the |article| document class.
-
-Thus, a company might have a local |ownlet| class for printing letters
-with their own headed note-paper.  Such a class would build on top of
-the existing |letter| class but it cannot be used with any other
-document class, so we have |ownlet.cls| rather than |ownlet.sty|.
-
-The |graphics| package, in contrast, provides commands for including
-images into a \LaTeX{} document.  Since these commands can be used
-with any document class, we have |graphics.sty| rather than
-|graphics.cls|.
-
-
 \subsection{Command names}
 
-\LaTeX{} has three types of command.
+Prior to the introduction of the L3~programming layer described in the next
+section, \LaTeX{} had three types of command.
 
 There are the author commands, such as |\section|, |\emph| and
 |\times|:  most of these have short names, all in lower case.
@@ -289,117 +190,97 @@ However, this rule of thumb is still useful: if a command has |@| in
 its name then it is not part of the supported \LaTeX{} language---and
 its behaviour may change in future releases!  If a command is
 mixed-case, or is described in \emph{\LaTeXbook}, then you can rely on
-future releases of \LaTeXe{} supporting the command.
-
-\subsection{Box commands and colour}
-\label{Sec:colour}
-
-Even if you do not intend to use colour in your own documents, by
-taking note of the points in this section you can ensure that your
-class or package is compatible with the |color| package. This may
-benefit people using your class or package who have access to colour
-printers.
-
-The simplest way to ensure `colour safety' is to always use \LaTeX{}
-box commands rather than \TeX{} primitives, that is use |\sbox| rather
-than |\setbox|, |\mbox| rather than |\hbox| and |\parbox| or
-the |minipage| environment rather than |\vbox|.
-The \LaTeX{} box commands have new options which mean that they are now
-as powerful as the \TeX{} primitives.
-
-As an example of what can go wrong, consider that in
-|{\ttfamily <text>}|
-the font is restored just \emph{before} the |}|, whereas in the
-similar looking construction
-|{\color{green} <text>}|
-the colour is restored just \emph{after} the final |}|. Normally this
-distinction does not matter at all; but consider a primitive \TeX{}
-box assignment such as:
+future releases of \LaTeX{} supporting the command.
+
+\subsection{Programming support}
+
+As noted in the introduction, the \LaTeX{} kernel today loads dedicated support
+from programming, here referred to as the L3 programming layer but also often
+called \pkg{expl3}. Details of the general approach taken by the L3
+programming layer are given in the document \texttt{expl3}, while a reference
+for all current code interfaces is available as \texttt{interface3}. This layer
+contains two types of command: a documented set of commands making up the API
+and a large number of private internal commands. The latter all start with two
+underscores and should not be used outside of the code module which defines
+them. This more structured approach means that using the L3 programming layer
+does not suffer from the somewhat fluid situation mentioned above with
+`\texttt{@} commands'.
+
+We do not cover the detail of using the L3 programming layer here. A good
+introduction to the approach is provided at
+\url{https://www.alanshawn.com/latex3-tutorial/}.
+
+\subsection{Box commands and color}
+\label{Sec:color}
+
+Even if you do not intend to use color in your own documents, by taking note of
+the points in this section you can ensure that your class or package is
+compatible with the |color| package. This may benefit people using your class
+or package and wish to use color.
+
+The simplest way to ensure `color safety' is to always use \LaTeX{} box
+commands rather than \TeX{} primitives, that is use |\sbox| rather than
+|\setbox|, |\mbox| rather than |\hbox| and |\parbox| or the |minipage|
+environment rather than |\vbox|. The \LaTeX{} box commands have new options
+which mean that they are now as powerful as the \TeX{} primitives.
+
+As an example of what can go wrong, consider that in |{\ttfamily <text>}| the
+font is restored just \emph{before} the |}|, whereas in the similar looking
+construction |{\color{green} <text>}| the color is restored just \emph{after}
+the final |}|. Normally this distinction does not matter at all; but consider a
+primitive \TeX{} box assignment such as:
 \begin{verbatim}
    \setbox0=\hbox{\color{green} <text>}
 \end{verbatim}
-Now the colour-restore occurs after the |}| and so is \emph{not}
-stored in the box. Exactly what bad effects this can have depends on
-how colour is implemented: it can range from getting the wrong
-colours in the rest of the document, to causing errors in the
-dvi-driver used to print the document.
-
-Also of interest is the command |\normalcolor|.   This is
-normally just |\relax| (i.e., does nothing)
-but you can use it rather like |\normalfont| to
-set regions of the page such as captions or section headings to the
-`main document colour'.
-
-
-\subsection{Defining text and math characters}
-\label{Sec:chars}
-
-Because \LaTeXe{} supports different encodings, definitions of commands
-for producing symbols, accents, composite glyphs, etc.\ must be
-defined using the commands provided for this purpose and described in
-\emph{\fntguide}.  This part of the system is still under development
-so such tasks should be undertaken with great caution.
-
-Also, |\DeclareRobustCommand| should be used for encoding-independent
-commands of this type.
-
-Note that it is no longer possible to refer to the math font set-up
-outside math mode: for example, neither |\textfont 1| nor
-|\scriptfont 2| are guaranteed to be defined in other modes.
+Now the color-restore occurs after the |}| and so is \emph{not} stored in the
+box. Exactly what bad effects this can have depends on how color is
+implemented: it can range from getting the wrong colors in the rest of the
+document, to causing errors in the dvi-driver used to print the document.
 
+Also of interest is the command |\normalcolor|. This is normally just |\relax|
+(i.e., does nothing) but you can use it rather like |\normalfont| to set
+regions of the page such as captions or section headings to the `main document
+color'.
 
 \subsection{General style}
 \label{Sec:general}
 
-The new system provides many commands designed to help you produce
-well-structured class and package files that are both robust and
-portable.  This section outlines some ways to make intelligent use of
-these.
+\LaTeX{} provides many commands designed to help you produce well-structured
+class and package files that are both robust and portable. This section
+outlines some ways to make intelligent use of these.
 
 \subsubsection{Loading other files}
 \label{Sec:loading}
 
-\NEWdescription{1995/12/01}
 \LaTeX{} provides these commands:
 \begin{verbatim}
    \LoadClass        \LoadClassWithOptions
    \RequirePackage   \RequirePackageWithOptions
 \end{verbatim}
-for using classes or packages inside other classes or packages.  We
-recommend strongly that you use them, rather than the primitive
-|\input| command, for a number of reasons.
+for using classes or packages inside other classes or packages. We recommend
+strongly that you use them, rather than the primitive |\input| command, for a
+number of reasons.
 
-Files loaded with |\input <filename>| will not be listed in the
-|\listfiles| list.
+Files loaded with |\input <filename>| will not be listed in the |\listfiles|
+list.
 
-If a package is always loaded with |\RequirePackage...| or |\usepackage|
-then, even if its loading is requested several times, it will be
-loaded only once.  By contrast, if it is loaded with |\input| then it
-can be loaded more than once; such an extra loading may waste time and
-memory and it may produce strange results.
+If a package is always loaded with |\RequirePackage...| or |\usepackage| then,
+even if its loading is requested several times, it will be loaded only once. By
+contrast, if it is loaded with |\input| then it can be loaded more than once;
+such an extra loading may waste time and memory and it may produce strange
+results.
 
-If a package provides option-processing then, again, strange results
-are possible if the package is |\input| rather than loaded by means of
+If a package provides option-processing then, again, strange results are
+possible if the package is |\input| rather than loaded by means of
 |\usepackage| or |\RequirePackage...|.
 
-If the package |foo.sty| loads the package |baz.sty| by use of
-|\input baz.sty| then the user will get a warning:
+If the package |foo.sty| loads the package |baz.sty| by use of |\input baz.sty|
+then the user will get a warning:
 \begin{verbatim}
    LaTeX Warning: You have requested package `foo',
                   but the package provides `baz'.
 \end{verbatim}
-Thus, for several reasons, using |\input| to load packages is not a
-good idea.
-
-Unfortunately, if you are upgrading the file |myclass.sty| to a class
-file then you have to make sure that any old files which contain
-|\input myclass.sty| still work.
-
-This was also true for the standard classes (|article|, |book| and
-|report|), since a lot of existing \LaTeX~2.09 document styles contain
-|\input article.sty|.  The approach which we use to solve this is
-to provide minimal files |article.sty|, |book.sty| and |report.sty|,
-which simply load the appropriate class files.
+Thus, for several reasons, using |\input| to load packages is not a good idea.
 
 For example, |article.sty| contains just the following lines:
 \begin{verbatim}
@@ -407,93 +288,72 @@ For example, |article.sty| contains just the following lines:
    \@obsoletefile{article.cls}{article.sty}
    \LoadClass{article}
 \end{verbatim}
-You may wish to do the same or, if you think that it is safe to do so,
-you may decide to just remove |myclass.sty|.
+You may wish to do the same or, if you think that it is safe to do so, you may
+decide to just remove |myclass.sty|.
 
 \subsubsection{Make it robust}
 
 We consider it good practice, when writing packages and classes, to use
 \LaTeX{} commands as much as possible.
 
-Thus, instead of using |\def...| we recommend using one of
-|\newcommand|, |\renewcommand| or |\providecommand|; |\CheckCommand| is
-also useful. Doing this makes
-it less likely that you will inadvertently redefine a command, giving
-unexpected results.
+Thus, instead of using |\def...| we recommend using one of |\newcommand|,
+|\renewcommand| or |\providecommand| for programming and for defining document
+interfaces |\NewDocumentCommand|, etc. (see \texttt{usrguide} for details of
+these commands).
 
-When you define an environment, use |\newenvironment| or
-|\renewenvironment| instead |\def\foo{...}| and |\def\endfoo{...}|.
+When you define an environment, use |\NewDocumentEnvironment|, etc., (or
+|\newenvironment|, etc., for simple cases) instead of using |\def\foo{...}| and
+|\def\endfoo{...}|.
 
-If you need to set or change the value of a \m{dimen} or \m{skip}
-register, use |\setlength|.
+If you need to set or change the value of a \m{dimen} or \m{skip} register, use
+|\setlength|.
 
-To manipulate boxes, use \LaTeX{} commands such as |\sbox|,
-|\mbox| and |\parbox| rather than |\setbox|, |\hbox| and |\vbox|.
+To manipulate boxes, use \LaTeX{} commands such as |\sbox|, |\mbox| and
+|\parbox| rather than |\setbox|, |\hbox| and |\vbox|.
 
-Use |\PackageError|, |\PackageWarning| or |\PackageInfo| (or the
-equivalent class commands) rather than |\@latexerr|, |\@warning| or
-|\wlog|.
-
-It is still possible to declare options by defining |\ds@<option>| and
-calling |\@options|; but we recommend the |\DeclareOption| and
-|\ProcessOptions| commands instead.  These are more powerful and use
-less memory.  So rather than using:
-\begin{verbatim}
-   \def\ds@draft{\overfullrule 5pt}
-   \@options
-\end{verbatim}
-you should use:
-\begin{verbatim}
-   \DeclareOption{draft}{\setlength{\overfullrule}{5pt}}
-   \ProcessOptions\relax
-\end{verbatim}
+Use |\PackageError|, |\PackageWarning| or |\PackageInfo| (or the equivalent
+class commands) rather than |\@latexerr|, |\@warning| or |\wlog|.
 
-The advantage of this kind of practice is that your code is more
-readable and, more important, that it is less likely to break when
-used with future versions of \LaTeX{}.
+The advantage of this kind of practice is that your code is more readable and
+accessible to other experienced \LaTeX{} programmers.
 
 \subsubsection{Make it portable}
 
-It is also sensible to make your files are as portable as possible. To
-ensure this; they should contain only visible 7-bit text; and the
-filenames should contain at most eight characters (plus the three
-letter extension).  Also, of course, it \textbf{must not} have the
-same name as a file in the standard \LaTeX{} distribution, however
-similar its contents may be to one of these files.
+It is also sensible to make your files are as portable as possible. To ensure
+this, files must not have the same name as a file in the standard \LaTeX{}
+distribution, however similar its contents may be to one of these files. It is
+also still lower risk to stick to file names which use only the ASCII range:
+whilst \LaTeX{} works natively with UTF-8, the same cannot be said with
+certainty for all tools. For the same reason, avoid spaces in file names.
 
-It is also useful if local classes or packages have a common prefix,
-for example the University of Nowhere classes might begin with |unw|.
-This helps to avoid every University having its own thesis class, all
-called |thesis.cls|.
+It is also useful if local classes or packages have a common prefix, for
+example the University of Nowhere classes might begin with |unw|. This helps to
+avoid every University having its own thesis class, all called |thesis.cls|.
 
 If you rely on some features of the \LaTeX{} kernel, or on a package,
 please specify the release-date you need.  For example, the package
-error commands were introduced in the June 1994 release so, if you use
+error commands were introduced in the June 2022 release so, if you use
 them then you should put:
 \begin{verbatim}
-   \NeedsTeXFormat{LaTeX2e}[1994/06/01]
+   \NeedsTeXFormat{LaTeX2e}[2022-06-01]
 \end{verbatim}
 
 \subsubsection{Useful hooks}
 
-Some packages and document styles had to redefine the command
-|\document| or |\enddocument| to achieve their goal.  This is no
-longer necessary. You can now use the `hooks' |\AtBeginDocument| and
-|\AtEndDocument| (see Section~\ref{Sec:delays}).  Again, using these
-hooks makes it less likely that your code breaks with future versions
-of \LaTeX{}. It also makes it more likely that your package can work
-together with someone else's.
-
-\NEWdescription{1996/12/01}
-However, note that code in the |\AtBeginDocument| hook is part of the
-preamble.  Thus there are restrictions on what can be put there; in
-particular, no typesetting can be done.
+It is sometimes necessary for a package to arrange for code to be
+executed at the start or end of the preamble, at the end of the document
+or at the start of every use of an environment. This can be carried
+out by using hooks. As a document author, you will likely be familiar with
+|\AtBeginDocument|, a wrapper around the more powerful command |\AddToHook|.
+The \LaTeX{} kernel provides a large number of dedicated hooks (applying in
+a pre-defined location) and generic hooks (applying to arbitrary commands):
+the interface for using these is described in \texttt{lthooks} . There are
+also hooks to apply to files, described in \texttt{ltfilehooks}.
 
 \section{The structure of a class or package}
 \label{Sec:structure}
 
-\LaTeXe{} classes and packages have more structure than \LaTeX~2.09
-style files did.  The outline of a class or package file is:
+The outline of a class or package file is:
 \begin{description}
 \item[Identification] The file says that it is a \LaTeXe{} package or
    class, and gives a short description of itself.
@@ -517,7 +377,7 @@ Package files do this as follows:
 For example:
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}
-   \ProvidesPackage{latexsym}[1994/06/01 Standard LaTeX package]
+   \ProvidesPackage{latexsym}[1998-08-17 Standard LaTeX package]
 \end{verbatim}
 Class files do this as follows:
 \begin{verbatim}
@@ -527,40 +387,30 @@ Class files do this as follows:
 For example:
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}
-   \ProvidesClass{article}[1994/06/01 Standard LaTeX class]
-\end{verbatim}
-\NEWdescription{1998/06/19}
-The \m{date} should be given in the form `\textsc{yyyy/mm/dd}' and
-must be present if the optional argument is used (this is also true
-for the |\NeedsTeXFormat| command).
-Any derivation from this syntax will result in low-level \TeX{}
-errors---the commands expect a valid syntax to speed up the daily
-usage of the package or class and make no provision for the case that
-the developer made a mistake!
-
-This date is checked whenever a user specifies a date in their
-|\documentclass| or |\usepackage| command.  For example, if you wrote:
-\begin{verbatim}
-   \documentclass{article}[1995/12/23]
-\end{verbatim}
-then users at a different location
-would get a warning that their copy of |article| was out of
-date.
-
-The description of a class is displayed when the class is used.  The
-description of a package is put into the log file.  These descriptions
-are also displayed by the |\listfiles| command.  The phrase
-\texttt{Standard LaTeX} \textbf{must not} be used in the identification
-banner of any file other than those in the standard \LaTeX{}
-distribution.
+   \ProvidesClass{article}[2022-06-01 Standard LaTeX class]
+\end{verbatim}
+The \m{date} should be given in the form `\textsc{yyyy-mm-dd}' and must be
+present if the optional argument is used (this is also true for the
+|\NeedsTeXFormat| command). Any derivation from this syntax will result in
+low-level \TeX{} errors---the commands expect a valid syntax to speed up the
+daily usage of the package or class and make no provision for the case that the
+developer made a mistake!
 
+This date is checked whenever a user specifies a date in their |\documentclass|
+or |\usepackage| command. For example, if you wrote:
+\begin{verbatim}
+   \documentclass{article}[2022-06-01]
+\end{verbatim}
+then users at a different location would get a warning that their copy of
+|article| was out of date.
 
-\subsection{Using classes and packages}
+The description of a class is displayed when the class is used. The description
+of a package is put into the log file. These descriptions are also displayed by
+the |\listfiles| command. The phrase \texttt{Standard LaTeX} \textbf{must not}
+be used in the identification banner of any file other than those in the
+standard \LaTeX{} distribution.
 
-The first major difference between \LaTeX~2.09 style files and
-\LaTeXe{} packages and classes is that \LaTeXe{} supports
-\emph{modularity}, in the sense of building files from small
-building-blocks rather than using large single files.
+\subsection{Using classes and packages}
 
 A \LaTeX{} package or class can load a package as follows:
 \begin{verbatim}
@@ -568,13 +418,12 @@ A \LaTeX{} package or class can load a package as follows:
 \end{verbatim}
 For example:
 \begin{verbatim}
-   \RequirePackage{ifthen}[1994/06/01]
+   \RequirePackage{ifthen}[2022-06-01]
 \end{verbatim}
-This command has the same syntax as the author command |\usepackage|.
-It allows packages or classes to use features provided by other
-packages.  For example, by loading the |ifthen| package, a package
-writer can use the `if\dots then\dots else\dots' commands provided
-by that package.
+This command has the same syntax as the author command |\usepackage|. It allows
+packages or classes to use features provided by other packages. For example, by
+loading the |ifthen| package, a package writer can use the `if\dots then\dots
+else\dots' commands provided by that package.
 
 A \LaTeX{} class can load one other class as follows:
 \begin{verbatim}
@@ -584,13 +433,12 @@ For example:
 \begin{verbatim}
    \LoadClass[twocolumn]{article}
 \end{verbatim}
-This command has the same syntax as the author command |\documentclass|.
-It allows classes to be based on the syntax and appearance of another
-class.  For example, by loading the |article| class, a class writer
-only has to change the bits of |article| they don't like, rather than
-writing a new class from scratch.
+This command has the same syntax as the author command |\documentclass|. It
+allows classes to be based on the syntax and appearance of another class. For
+example, by loading the |article| class, a class writer only has to change the
+bits of |article| they don't like, rather than writing a new class from
+scratch.
 
-\NEWfeature{1995/12/01}
 The following commands can be used in the common case that you want to
 simply load a class or package file with exactly those options that
 are being used by the current class.
@@ -606,14 +454,20 @@ For example:
 
 \subsection{Declaring options}
 
-\NEWdescription{1998/12/01}
-The other major difference between \LaTeX~2.09 styles and \LaTeXe{}
-packages and classes is in option handling.  Packages and classes can
-now declare options and these can be specified by authors; for
-example, the |twocolumn| option is declared by the |article| class.
-Note that the name of an option should contain only those characters
-allowed in a `\LaTeX{} name'; in particular it must not contain any
-control sequences.
+Packages and classes can declare options and these can be specified by authors;
+for example, the |twocolumn| option is declared by the |article| class. Note
+that the name of an option should contain only those characters allowed in a
+`\LaTeX{} name'; in particular it must not contain any control sequences.
+
+\LaTeX{} supports two methods for creating options: a key--value system and a
+`simple text' approach. The key--value system is recommended for new classes
+and packages, and is more flexible in handling of option classes than the
+simple text approach. Both option methods use the same basic structure within
+the \LaTeX{} source: declaration of options first then processing options in a
+second step. Both also allow options to be passed on to other packages or an
+underlying class. As the `classical' simple text approach is conceptually more
+straight-forward to illustrate, it is used here to show the general structure:
+see Section~\ref{Sec:opt:keyval} for full details of the key--value approach.
 
 An option is declared as follows:
 \begin{verbatim}
@@ -624,63 +478,58 @@ to the |graphics| package is implemented as:
 \begin{verbatim}
    \DeclareOption{dvips}{\input{dvips.def}}
 \end{verbatim}
-This means that when an author writes |\usepackage[dvips]{graphics}|,
-the file |dvips.def| is loaded.  As another example, the |a4paper|
-option is declared in the |article| class to set the |\paperheight|
-and |\paperwidth| lengths:
+This means that when an author writes |\usepackage[dvips]{graphics}|, the file
+|dvips.def| is loaded. As another example, the |a4paper| option is declared in
+the |article| class to set the |\paperheight| and |\paperwidth| lengths:
 \begin{verbatim}
    \DeclareOption{a4paper}{%
       \setlength{\paperheight}{297mm}%
       \setlength{\paperwidth}{210mm}%
    }
 \end{verbatim}
-Sometimes a user will request an option which the class
-or package has not explicitly declared.  By default this will produce
-a warning (for classes) or error (for packages); this behaviour
-can be altered as follows:
+Sometimes a user will request an option which the class or package has not
+explicitly declared. By default this will produce a warning (for classes) or
+error (for packages); this behaviour can be altered as follows:
 \begin{verbatim}
    \DeclareOption*{<code>}
 \end{verbatim}
-For example, to make the package |fred| produce a warning rather than
-an error for unknown options, you could specify:
+For example, to make the package |fred| produce a warning rather than an error
+for unknown options, you could specify:
 \begin{verbatim}
    \DeclareOption*{%
       \PackageWarning{fred}{Unknown option `\CurrentOption'}%
    }
 \end{verbatim}
-Then, if an author writes |\usepackage[foo]{fred}|, they will get a
-warning \texttt{Package fred Warning: Unknown option `foo'.}  As
-another example, the |fontenc| package tries to load a file
-|<ENC>enc.def| whenever the \m{ENC} option is used.  This
-can be done by writing:
+Then, if an author writes |\usepackage[foo]{fred}|, they will get a warning
+\texttt{Package fred Warning: Unknown option `foo'.} As another example, the
+|fontenc| package tries to load a file |<ENC>enc.def| whenever the \m{ENC}
+option is used. This can be done by writing:
 \begin{verbatim}
    \DeclareOption*{%
       \input{\CurrentOption enc.def}%
    }
 \end{verbatim}
-\NEWdescription{1998/12/01}
-It is possible to pass options on to another package or class, using
-the command |\PassOptionsToPackage| or |\PassOptionsToClass| (note
-that this is a specialised operation that works only for option
-names).  For example, to pass every unknown option on to the |article|
-class, you can use:
+
+It is possible to pass options on to another package or class, using the
+command |\PassOptionsToPackage| or |\PassOptionsToClass| (note that this is a
+specialised operation that works only for option names): see
+Section~\ref{Sec:opmove}. For example, to pass every unknown option on to the
+|article| class, you can use:
 \begin{verbatim}
    \DeclareOption*{%
       \PassOptionsToClass{\CurrentOption}{article}%
    }
 \end{verbatim}
-If you do this then you should make sure you load the class at some
-later point, otherwise the options will never be processed!
+If you do this then you should make sure you load the class at some later
+point, otherwise the options will never be processed!
 
-So far, we have explained only how to declare options, not how to
-execute them.  To process the options with which the file was called,
-you should use:
+So far, we have explained only how to declare options, not how to execute them.
+To process the options with which the file was called, you should use:
 \begin{verbatim}
    \ProcessOptions\relax
 \end{verbatim}
-This executes the \m{code} for each option that was both specified and
-declared (see Section~\ref{Sec:commands.options} for details of how
-this is done).
+This executes the \m{code} for each option that was both specified and declared
+(see Section~\ref{Sec:commands.options} for details of how this is done).
 
 For example, if the |jane| package file contains:
 \begin{verbatim}
@@ -689,8 +538,8 @@ For example, if the |jane| package file contains:
    \DeclareOption*{\typeout{What's \CurrentOption?}}
    \ProcessOptions\relax
 \end{verbatim}
-and an author writes |\usepackage[foo,bar]{jane}|, then they will see
-the messages \texttt{Saw foo.} and \texttt{What's bar?}
+and an author writes |\usepackage[foo,bar]{jane}|, then they will see the
+messages \texttt{Saw foo.} and \texttt{What's bar?}
 
 \subsection{A minimal class file}
 
@@ -698,9 +547,6 @@ Most of the work of a class or package is in defining new commands, or
 changing the appearance of documents.  This is done in the body of the
 package, using commands such as |\newcommand| or |\setlength|.
 
-\LaTeXe{} provides several new commands to help class and package
-writers; these are described in detail in Section~\ref{Sec:commands}.
-
 There are four things that every class file \emph{must} contain: these
 are a definition of |\normalsize|, values for |\textwidth| and
 |\textheight| and a specification for page-numbering.  So a minimal
@@ -708,7 +554,7 @@ document class file\footnote {This class is now in the standard
 distribution, as \texttt{minimal.cls}.} looks like this:
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}
-   \ProvidesClass{minimal}[1995/10/30 Standard LaTeX minimal class]
+   \ProvidesClass{minimal}[2022-06-01 Standard LaTeX minimal class]
    \renewcommand{\normalsize}{\fontsize{10pt}{12pt}\selectfont}
    \setlength{\textwidth}{6.5in}
    \setlength{\textheight}{8in}
@@ -728,18 +574,17 @@ class, although a real class would need more structure.
 The class begins by announcing itself as |neplet.cls|.
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}
-   \ProvidesClass{neplet}[1995/04/01 NonExistent Press letter class]
+   \ProvidesClass{neplet}[2022-06-01 NonExistent Press letter class]
 \end{verbatim}
-Then this next bit passes any options on to the |letter| class, which
-is loaded with the |a4paper| option.
+Then this next bit passes any options on to the |letter| class, which is loaded
+with the |a4paper| option.
 \begin{verbatim}
    \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letter}}
    \ProcessOptions\relax
    \LoadClass[a4paper]{letter}
 \end{verbatim}
-In order to use the company letter head, it redefines the
-|firstpage| page style: this is the page style that is used on
-the first page of letters.
+In order to use the company letter head, it redefines the |firstpage| page
+style: this is the page style that is used on the first page of letters.
 \begin{verbatim}
    \renewcommand{\ps@firstpage}{%
       \renewcommand{\@oddhead}{<letterhead goes here>}%
@@ -751,17 +596,16 @@ And that's it!
 \subsection{Example: a newsletter class}
 
 A simple newsletter can be typeset with \LaTeX{}, using a variant of the
-|article| class.
-The class begins by announcing itself as |smplnews.cls|.
+|article| class. The class begins by announcing itself as |smplnews.cls|.
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}
-   \ProvidesClass{smplnews}[1995/04/01 The Simple News newsletter class]
+   \ProvidesClass{smplnews}[2022-06-01 The Simple News newsletter class]
 
    \newcommand{\headlinecolor}{\normalcolor}
 \end{verbatim}
-It passes most specified options on to the |article| class: apart from
-the |onecolumn| option, which is switched off, and the |green| option,
-which sets the headline in green.
+It passes most specified options on to the |article| class: apart from the
+|onecolumn| option, which is switched off, and the |green| option, which sets
+the headline in green.
 \begin{verbatim}
    \DeclareOption{onecolumn}{\OptionNotUsed}
    \DeclareOption{green}{\renewcommand{\headlinecolor}{\color{green}}}
@@ -774,14 +618,14 @@ It then loads the class |article| with the option |twocolumn|.
 \begin{verbatim}
    \LoadClass[twocolumn]{article}
 \end{verbatim}
-Since the newsletter is to be printed in colour, it now loads the
-|color| package.  The class does not specify a device driver option
-since this should be specified by the user of the |smplnews| class.
+Since the newsletter is to be printed in colour, it now loads the |color|
+package. The class does not specify a device driver option since this should be
+specified by the user of the |smplnews| class.
 \begin{verbatim}
    \RequirePackage{color}
 \end{verbatim}
-The class then redefines |\maketitle| to produce the title in 72pt
-Helvetica bold oblique, in the appropriate colour.
+The class then redefines |\maketitle| to produce the title in 72\,pt Helvetica
+bold oblique, in the appropriate colour.
 \begin{verbatim}
    \renewcommand{\maketitle}{%
       \twocolumn[%
@@ -807,90 +651,91 @@ It also sets the three essential things.
    \setlength{\textwidth}{17.5cm}
    \setlength{\textheight}{25cm}
 \end{verbatim}
-In practice, a class would need more than this: it would provide
-commands for issue numbers, authors of articles, page styles and so
-on; but this skeleton gives a start.  The |ltnews| class file is not
-much more complex than this one.
+In practice, a class would need more than this: it would provide commands for
+issue numbers, authors of articles, page styles and so on; but this skeleton
+gives a start. The |ltnews| class file is not much more complex than this one.
 
 \section{Commands for class and package writers}
 \label{Sec:commands}
 
-This section describes briefly each of the new commands for class and
-package writers.  To find out about other aspects of the new system,
+This section describes briefly each of the commands for class and package
+writers. To find out about other aspects of the system,
 you should also read \emph{\LaTeXbook}, \emph{\LaTeXcomp} and
 \emph{\usrguide}.
 
 \subsection{Identification}
 
-The first group of commands discussed here are those used
-to identify your class or package file.
+The first group of commands discussed here are those used to identify your
+class or package file.
 
 \begin{decl}
 |\NeedsTeXFormat| \arg{format-name} \oarg{release-date}
 \end{decl}
-This command tells \TeX{} that this file should be processed using a
-format with name \m{format-name}.  You can use the optional argument
-\m{release-date} to further specify the earliest release date of the
-format that is needed.  When the release date of the format is older
-than the one specified a warning will be generated. The standard
-\m{format-name} is \texttt{LaTeX2e}.  The date, if present, must be in
-the form \textsc{yyyy/mm/dd}.
+This command tells \TeX{} that this file should be processed using a format
+with name \m{format-name}. You can use the optional argument \m{release-date}
+to further specify the earliest release date of the format that is needed. When
+the release date of the format is older than the one specified a warning will
+be generated. The standard \m{format-name} is \texttt{LaTeX2e}. The date, if
+present, must be in the form \textsc{yyyy-mm-dd}.
 
 Example:
 \begin{verbatim}
-   \NeedsTeXFormat{LaTeX2e}[1994/06/01]
+   \NeedsTeXFormat{LaTeX2e}[2022-06-01]
 \end{verbatim}
+People often don't know what date to put here. For the kernel, you can find out
+the right one by consulting |changes.txt| and select the release date of a new
+feature you are interested in. This is slightly different for packages as they
+are released throughout the year: you will need to consult their change
+history.
 
 \begin{decl}
 |\ProvidesClass| \arg{class-name} \oarg{release-info} \\
 |\ProvidesPackage| \arg{package-name} \oarg{release-info}
 \end{decl}
-This declares that the current file contains the definitions for the
-document class \m{class-name} or package \m{package-name}.
+This declares that the current file contains the definitions for the document
+class \m{class-name} or package \m{package-name}.
 
 The optional \m{release-info}, if used, must contain:
 \begin{itemize}
-  \item the release date of
-  this version of the file, in the form \textsc{yyyy/mm/dd};
+  \item the release date of this version of the file, in the form
+    \textsc{yyyy-mm-dd};
 \item optionally followed by a space and a short description, possibly
   including a version number.
 \end{itemize}
-The above syntax must be followed exactly so that this information
-can be used by |\LoadClass| or |\documentclass| (for classes) or
-|\RequirePackage| or |\usepackage| (for packages) to test that the
-release is not too old.
+The above syntax must be followed exactly so that this information can be used
+by |\LoadClass| or |\documentclass| (for classes) or |\RequirePackage| or
+|\usepackage| (for packages) to test that the release is not too old.
 
-The whole of this \m{release-info} information is displayed by
-|\listfiles| and should therefore not be too long.
+The whole of this \m{release-info} information is displayed by |\listfiles| and
+should therefore not be too long.
 
 Example:
 \begin{verbatim}
-   \ProvidesClass{article}[1994/06/01 v1.0 Standard LaTeX class]
-   \ProvidesPackage{ifthen}[1994/06/01 v1.0 Standard LaTeX package]
+   \ProvidesClass{article}[2022-06-01 v1.0 Standard LaTeX class]
+   \ProvidesPackage{ifthen}[2022-06-01 v1.0 Standard LaTeX package]
 \end{verbatim}
 
 \begin{decl}
   |\ProvidesFile| \arg{file-name} \oarg{release-info}
 \end{decl}
 This is similar to the two previous commands except that here the full
-filename, including the extension, must be given. It is used for
-declaring any files other than main class and package files.
+filename, including the extension, must be given. It is used for declaring any
+files other than main class and package files.
 
 Example:
 \begin{verbatim}
-   \ProvidesFile{T1enc.def}[1994/06/01 v1.0 Standard LaTeX file]
+   \ProvidesFile{T1enc.def}[2022-06-01 v1.0 Standard LaTeX file]
 \end{verbatim}
 
-Note that the phrase \texttt{Standard LaTeX} \textbf{must not} be used
-in the identification banner of any file other than those in the
-standard \LaTeX{} distribution.
+Note that the phrase \texttt{Standard LaTeX} \textbf{must not} be used in the
+identification banner of any file other than those in the standard \LaTeX{}
+distribution.
 
 \subsection{Loading files}
 \label{Sec:loadf}
 
-\NEWfeature{1995/12/01}
-This group of commands can be used to create your own document class or
-package by building on existing classes or packages.
+This group of commands can be used to create your own document class or package
+by building on existing classes or packages.
 \begin{decl}
   |\RequirePackage| \oarg{options-list} \arg{package-name}
      \oarg{release-info}\\
@@ -899,13 +744,11 @@ package by building on existing classes or packages.
 \end{decl}
 Packages and classes should use these commands to load other packages.
 
-The use of |\RequirePackage| is the same as the author command
-|\usepackage|.
-
+The use of |\RequirePackage| is the same as the author command |\usepackage|.
 Examples:
 \begin{verbatim}
-   \RequirePackage{ifthen}[1994/06/01]
-   \RequirePackageWithOptions{graphics}[1995/12/01]
+   \RequirePackage{ifthen}[2022-06-01]
+   \RequirePackageWithOptions{graphics}[2022-06-01]
 \end{verbatim}
 
 \begin{decl}
@@ -914,107 +757,153 @@ Examples:
   |\LoadClassWithOptions| \arg{class-name}
      \oarg{release-info}
 \end{decl}
-\NEWfeature{1995/12/01}
-These commands are for use \emph{only} in class files, they cannot be
-used in packages files;
-they can be used at most once within a class file.
+These commands are for use \emph{only} in class files, they cannot be used in
+packages files; they can be used at most once within a class file.
 
-The use of |\LoadClass| is the same as
-the use of |\documentclass| to load a class file.
+The use of |\LoadClass| is the same as the use of |\documentclass| to load a
+class file.
 
 Examples:
 \begin{verbatim}
-   \LoadClass{article}[1994/06/01]
-   \LoadClassWithOptions{article}[1995/12/01]
+   \LoadClass{article}[2022-06-01]
+   \LoadClassWithOptions{article}[2022-06-01]
 \end{verbatim}
 
-\NEWfeature{1995/12/01}
-The two |WithOptions| versions simply load the class (or package) file
-with exactly those options that are being used by the current file
-(class or package).  See below, in \ref{Sec:opmove}, for further
-discussion of their use.
-
+The two |WithOptions| versions simply load the class (or package) file with
+exactly those options that are being used by the current file (class or
+package). See below, in \ref{Sec:opmove}, for further discussion of their use.
 
-\subsection{Option declaration}
-\label{Sec:commands.options.dec}
+\subsection{Delaying code}
+\label{Sec:delays}
 
-\NEWdescription{1998/12/01}
-The following commands deal with the declaration and handling of
-options to document classes and packages.  Every option name must be a
-`\LaTeX{} name'.
+As noted earlier, a sophisticated hook system is available and described in
+\texttt{lthooks}. Here, we document a small set of convenient short names for
+common hooks.
 
-There are some commands designed especially for use within the
-\m{code} argument of these commands (see below).
+These first two commands are also intended primarily for use within the
+\m{code} argument of |\DeclareOption| or |\DeclareOption*|.
 
 \begin{decl}
-  |\DeclareOption| \arg{option-name} \arg{code}
+  |\AtEndOfClass| \arg{code}\\
+  |\AtEndOfPackage| \arg{code}
 \end{decl}
-This makes \m{option-name} a `declared option' of the class or package
-in which it is put.
-
-The \m{code} argument contains the code to be executed if that option
-is specified for the class or package; it can contain any valid
-\LaTeXe{} construct.
+These commands declare \m{code} that is saved away internally and then executed
+after processing the whole of the current class or package file.
 
-Example:
-\begin{verbatim}
-   \DeclareOption{twoside}{\@twosidetrue}
-\end{verbatim}
+Repeated use of these commands is permitted: the code in the arguments is
+stored (and later executed) in the order of their declarations.
 
 \begin{decl}
-  |\DeclareOption*| \arg{code}
+  |\AtBeginDocument| \arg{code}\\
+  |\AtEndDocument| \arg{code}
 \end{decl}
-This declares the \m{code} to be executed for every option which is
-specified for, but otherwise not explicitly declared by, the class or
-package; this code is called the `default option code' and it can
-contain any valid \LaTeXe{} construct.
+These commands declare \m{code} to be saved internally and executed while
+\LaTeX{} is executing |\begin{document}| or |\end{document}|.
 
-If a class file contains no |\DeclareOption*| then, by default, all
-specified but undeclared options for that class will be silently
-passed to all packages (as will the specified and declared options for
-that class).
+The \m{code} specified in the argument to |\AtBeginDocument| is executed near
+the end of the |\begin{document}| code, \emph{after} the font selection tables
+have been set up. It is therefore a useful place to put code which needs to be
+executed after everything has been prepared for typesetting and when the normal
+font for the document is the current font.
 
-If a package file contains no |\DeclareOption*| then, by default, each
-specified but undeclared option for that package will produce an error.
+The |\AtBeginDocument| hook should not be used for code that does any
+typesetting since the typeset result would be unpredictable.
 
+The \m{code} specified in the argument to |\AtEndDocument| is executed at the
+beginning of the |\end{document}| code, \emph{before} the final page is
+finished and before any leftover floating environments are processed. If some
+of the \m{code} is to be executed after these two processes, you should include
+a |\clearpage| at the appropriate point in \m{code}.
 
-\subsection{Commands within option code}
-\label{Sec:within.code}
+Repeated use of these commands is permitted: the code in the arguments is
+stored (and later executed) in the order of their declarations.
+
+\subsection{Creating and using keyval options}
+\label{Sec:opt:keyval}
 
-These two commands can be used only within the \m{code} argument of
-either |\DeclareOption| or |\DeclareOption*|.  Other commands commonly
-used within these arguments can be found in the next few subsections.
+As with any key--value input, using key--value pairs as package or class
+options has two parts: creating the key options and setting (using) them.
+Options created in this way \emph{may} be used after package loading as general
+key--value settings: this will depend on the nature of the underlying code.
 
 \begin{decl}
-  |\CurrentOption|
+  |\DeclareKeys| \oarg{family} \arg{declarations}
 \end{decl}
-This expands to the name of the current option.
+This command creates a series of options from a comma-separated
+\m{declarations} list. Each entry in this list is a key--value pair, with the
+\m{key} having one or more \m{properties}. A small number of `basic'
+\m{properties} are described below. The full range of properties, provided by
+\texttt{l3keys}, can also be used for more powerful processing. See
+\texttt{interface3} for the full details.
+
+The basic properties provided here are
+\begin{itemize}
+  \item \texttt{.code} --- execute arbitrary code
+  \item \texttt{.if} --- sets a \TeX{} |\if...| switch
+  \item \texttt{.ifnot} --- sets an inverted \TeX{} |\if...| switch
+  \item \texttt{.store} --- stores a value in a macro
+  \item \texttt{.usage} -- defines whether the option can be given only
+    when loading (\texttt{load}), in the preamble (\texttt{preamble}) or
+    has no limitation on scope (\texttt{general})
+\end{itemize}
+The part of the \meta{key} before the \m{property} is the \m{name}, with the
+\m{value} working with the \m{property} to define the behaviour of the option.
+
+For example, with
+\begin{verbatim}
+\DeclareKeys[mypkg]
+ {
+   draft.if          = @mypkg@draft      ,
+   draft.usage       = preamble          ,
+   name.store        = \@mypkg@name      ,
+   name.usage        = load              ,
+   second-name.store = \@mypkg@other@name
+ }
+\end{verbatim}
+three options would be created. The option \texttt{draft} can be given anywhere
+in the preamble, and will set a switch called |\if@mypkg@draft|. The option
+\texttt{name} can only be given during package loading, and will save whatever
+value it is given in |\@mypkg@name|. Finally, the option \texttt{second-name}
+can be given anywhere, and will save its value in |\@mypkg@other@name|.
+
+Keys created \emph{before} the use of |\ProcessKeyOptions| act as package
+options.
 
 \begin{decl}
-  |\OptionNotUsed|
+  |\DeclareUnknownKeyHandler| \oarg{family} \arg{code}
 \end{decl}
-This causes the current option to
-be added to the list of `unused options'.
+The command |\DeclareUnknownKeyHandler| may be used to define the behavior when
+an undefined key is encountered. The \m{code} will receive the unknown key name
+as |#1| and the value as |#2|. These can then be processed as appropriate,
+e.g.~by forwarding to another package.
 
-\NEWfeature{1995/06/01}
-  You can now include hash marks (\texttt{\#}) within these \m{code}
-  arguments without special treatment (formerly, it had been
-  necessary to double them).
+\begin{decl}
+  |\ProcessKeyOptions| \oarg{family}
+\end{decl}
+The |\ProcessKeyOptions| function is used to check the current option list
+against the keys defined for \m{family}. Global (class) options and local
+(package) options are checked when this function is called in a package.
 
-\subsection{Moving options around}
+\begin{decl}
+  |\SetKeys| \oarg{family} \arg{keyvals}
+\end{decl}
+Sets (applies) the explicit list of \m{keyvals} for the \m{family}: if the
+latter is not given, the value of |\@currname| is used. This command may be used
+within a package to set options before or after using |\ProcessKeyOptions|.
+
+\subsection{Passing options around}
 \label{Sec:opmove}
 
-These two commands are also very useful within the \m{code} argument
-of |\DeclareOption| or |\DeclareOption*|:
+These two commands are also very useful within the \m{code} argument of
+options.
 \begin{decl}
   |\PassOptionsToPackage| \arg{options-list} \arg{package-name}\\
   |\PassOptionsToClass| \arg{options-list} \arg{class-name}
 \end{decl}
-The command |\PassOptionsToPackage| passes the option names in
-\m{options-list} to package \m{package-name}.
-This means that it adds the \m{option-list} to the
-list of options used by any future |\RequirePackage| or |\usepackage|
-command for package \m{package-name}.
+The command |\PassOptionsToPackage| passes the option names in \m{options-list}
+to package \m{package-name}. This means that it adds the \m{option-list} to the
+list of options used by any future |\RequirePackage| or |\usepackage| command
+for package \m{package-name}.
 
 Example:
 \begin{verbatim}
@@ -1026,24 +915,22 @@ is the same as:
    \RequirePackage[foo,bar,baz]{fred}
 \end{verbatim}
 
-Similarly, |\PassOptionsToClass| may be used in a class file to pass
-options to another class to be loaded with |\LoadClass|.
+Similarly, |\PassOptionsToClass| may be used in a class file to pass options to
+another class to be loaded with |\LoadClass|.
 
-\NEWdescription{1995/12/01}
-The effects and use of these two commands should be contrasted with
-those of the following two (documented above, in \ref{Sec:loadf}):
+The effects and use of these two commands should be contrasted with those of
+the following two (documented above, in \ref{Sec:loadf}):
 \begin{verbatim}
    \LoadClassWithOptions
    \RequirePackageWithOptions
 \end{verbatim}
-The command |\RequirePackageWithOptions| is similar to
-|\RequirePackage|, but it always loads the required package with
-exactly the same option list as that being used by the current class
-or package, rather than with any option explicitly supplied or passed
-on by |\PassOptionsToPackage|.
+The command |\RequirePackageWithOptions| is similar to |\RequirePackage|, but
+it always loads the required package with exactly the same option list as that
+being used by the current class or package, rather than with any option
+explicitly supplied or passed on by |\PassOptionsToPackage|.
 
-The main purpose of |\LoadClassWithOptions| is to allow one class to
-simply build on another, for example:
+The main purpose of |\LoadClassWithOptions| is to allow one class to simply
+build on another, for example:
 \begin{verbatim}
   \LoadClassWithOptions{article}
 \end{verbatim}
@@ -1053,12 +940,11 @@ This should be compared with the slightly different construction
   \ProcessOptions\relax
   \LoadClass{article}
 \end{verbatim}
-As used above, the effects are more or less the same, but the first is
-a lot less to type; also the |\LoadClassWithOptions| method runs
-slightly quicker.
+As used above, the effects are more or less the same, but the first is a lot
+less to type; also the |\LoadClassWithOptions| method runs slightly quicker.
 
-If, however, the class declares options of its own then
-the two constructions are different.  Compare, for example:
+If, however, the class declares options of its own then the two constructions
+are different. Compare, for example:
 \begin{verbatim}
   \DeclareOption{landscape}{\@landscapetrue}
   \ProcessOptions\relax
@@ -1071,255 +957,56 @@ with:
   \ProcessOptions\relax
   \LoadClass{article}
 \end{verbatim}
-In the first example, the \textsf{article} class will be loaded with
-option |landscape| precisely when the current class is called with
-this option. By contrast, in the second example it will never be
-called with option \texttt{landscape} as in that case \textsf{article}
-is passed options only by the default option handler, but this handler
-is not used for |landscape| because that option is explicitly
-declared.
-
-\subsection{Delaying code}
-\label{Sec:delays}
-
-These first two commands are also intended primarily for use within
-the \m{code} argument of |\DeclareOption| or |\DeclareOption*|.
-
-\begin{decl}
-  |\AtEndOfClass| \arg{code}\\
-  |\AtEndOfPackage| \arg{code}
-\end{decl}
-These commands declare \m{code} that is saved away internally and then
-executed after processing the whole of the current class or package
-file.
-
-Repeated use of these commands is permitted: the code in the
-arguments is stored (and later executed) in the order of their
-declarations.
-
-\begin{decl}
-  |\AtBeginDocument| \arg{code}\\
-  |\AtEndDocument| \arg{code}
-\end{decl}
-These commands declare \m{code} to be saved internally and executed
-while \LaTeX{} is executing |\begin{document}| or |\end{document}|.
-
-The \m{code} specified in the argument to |\AtBeginDocument| is
-executed near the end of the |\begin{document}| code, \emph{after} the
-font selection tables have been set up.  It is therefore a useful
-place to put code which needs to be executed after everything has been
-prepared for typesetting and when the normal font for the document is
-the current font.
-
-\NEWdescription{1995/12/01}
-The |\AtBeginDocument| hook should not be used for code that does any
-typesetting since the typeset result would be unpredictable.
-
-The \m{code} specified in the argument to |\AtEndDocument| is
-executed at the beginning of the |\end{document}| code,
-\emph{before} the final page is finished and before any leftover
-floating environments are processed. If some of the \m{code} is to be
-executed after these two processes, you should include a |\clearpage|
-at the appropriate point in \m{code}.
-
-Repeated use of these commands is permitted: the code in the
-arguments is stored (and later executed) in the order of their
-declarations.
-
-\begin{decl}[1994/12/01]
-  |\AtBeginDvi| \arg{specials}
-\end{decl}
-These commands save in a box register things which are written to the
-|.dvi| file at the beginning of the `shipout' of the first page of the
-document.
-
-This should not be used for anything that will add any typeset
-material to the |.dvi| file.
-
-Repeated use of this command is permitted.
-
-
-\subsection{Option processing}
-\label{Sec:commands.options}
-
-\begin{decl}
-  |\ProcessOptions|
-\end{decl}
-This command executes the \m{code} for each selected option.
-
-We shall first describe how |\ProcessOptions| works in a package file,
-and then how this differs in a class file.
-
-To understand in detail what |\ProcessOptions| does in a package file,
-you have to know the difference between \emph{local} and \emph{global}
-options.
-\begin{itemize}
-\item \textbf{Local options} are those which have been explicitly
-  specified for this particular package in the \m{options} argument of
-  any of these:
-\begin{quote}
-    |\PassOptionsToPackage{<options>}| \ |\usepackage[<options>]|\\
-    |\RequirePackage[<options>]|
-\end{quote}
-\item \textbf{Global options} are any other options that are specified
-  by the author in the \m{options} argument of
-    |\documentclass[<options>]|.
-\end{itemize}
-For example, suppose that a document begins:
-\begin{verbatim}
-   \documentclass[german,twocolumn]{article}
-   \usepackage{gerhardt}
-\end{verbatim}
-whilst package |gerhardt| calls package |fred| with:
-\begin{verbatim}
-   \PassOptionsToPackage{german,dvips,a4paper}{fred}
-   \RequirePackage[errorshow]{fred}
-\end{verbatim}
-then:
-\begin{itemize}
-\item |fred|'s local options are |german|, |dvips|, |a4paper|
-  and |errorshow|;
-\item |fred|'s only global option is |twocolumn|.
-\end{itemize}
-
-When |\ProcessOptions| is called, the following happen.
-\begin{itemize}
-\item \emph{First}, for each option so far declared in |fred.sty|
-  by |\DeclareOption|, it looks to see if that option is either a
-  global or a local option for |fred|: if it is then the corresponding
-  code is executed.
-
-  This is done in the order in which these options
-  were declared in |fred.sty|.
-\item \emph{Then}, for each remaining \emph{local} option, the command
-  |\ds@<option>| is executed if it has been defined somewhere (other
-  than by a |\DeclareOption|); otherwise, the `default option code' is
-  executed.  If no default option code has been declared then an error
-  message is produced.
-
-  This is done in the order in which these
-  options were specified.
-\end{itemize}
-Throughout this process, the system ensures that the code declared for
-an option is executed at most once.
-
-Returning to the example, if |fred.sty| contains:
-\begin{verbatim}
-   \DeclareOption{dvips}{\typeout{DVIPS}}
-   \DeclareOption{german}{\typeout{GERMAN}}
-   \DeclareOption{french}{\typeout{FRENCH}}
-   \DeclareOption*{\PackageWarning{fred}{Unknown `\CurrentOption'}}
-   \ProcessOptions\relax
-\end{verbatim}
-then the result of processing this document will be:
-\begin{verbatim}
-   DVIPS
-   GERMAN
-   Package fred Warning: Unknown `a4paper'.
-   Package fred Warning: Unknown `errorshow'.
-\end{verbatim}
-Note the following:
-
-\begin{itemize}
-\item the code for the |dvips| option is executed before that for the
-  |german| option, because that is the order in which they are declared
-  in |fred.sty|;
-\item the code for the |german| option is executed only once, when the
-  declared options are being processed;
-\item the |a4paper| and |errorshow| options produce the warning from
-  the code declared by |\DeclareOption*| (in the order in which they
-  were specified), whilst the |twocolumn| option does not: this is
-  because |twocolumn| is a global option.
-\end{itemize}
-
-In a class file, |\ProcessOptions| works in the same way, except
-that: \emph{all} options are local; and the default value for
-|\DeclareOption*| is |\OptionNotUsed| rather than an error.
-
-\NEWdescription{1995/12/01}
-Note that, because |\ProcessOptions| has a |*|-form, it is wise to
-follow the non-star form with |\relax|, as in the previous examples,
-since this prevents unnecessary look ahead and possibly misleading
-error messages being issued.
-
-\begin{decl}
-  |\ProcessOptions*| \\
-  |\@options|
-\end{decl}
-This is like |\ProcessOptions| but it executes the options in the
-order specified in the calling commands, rather than in the order of
-declaration in the class or package. For a package this means that the
-global options are processed first.
-
-The |\@options| command from \LaTeX~2.09 has been made equivalent to
-this in order to ease the task of updating old document styles to
-\LaTeXe{} class files.
-
-\begin{decl}
-  |\ExecuteOptions| \arg{options-list}
-\end{decl}
-
-For each option in the \m{options-list}, in order,
-this command simply executes the command
-|\ds@<option>| (if this command is not defined, then that option is
-silently ignored).
-
-It can be used to provide a `default option list' just before
-|\ProcessOptions|.  For example, suppose that in a class file you want
-to set up the default design to be: two-sided printing; 11pt fonts;
-in two columns. Then it could specify:
-\begin{verbatim}
-   \ExecuteOptions{11pt,twoside,twocolumn}
-\end{verbatim}
-
+In the first example, the \textsf{article} class will be loaded with option
+|landscape| precisely when the current class is called with this option. By
+contrast, in the second example it will never be called with option |landscape|
+as in that case \textsf{article} is passed options only by the default option
+handler, but this handler is not used for |landscape| because that option is
+explicitly declared.
 
 \subsection{Safe file commands}
 
-These commands deal with file input; they ensure that the non-existence
-of a requested file can be handled in a user-friendly way.
+These commands deal with file input; they ensure that the non-existence of a
+requested file can be handled in a user-friendly way.
 
 \begin{decl}
 |\IfFileExists| \arg{file-name} \arg{true} \arg{false}
 \end{decl}
-If the file exists then the code specified in \m{true} is
-executed.
+If the file exists then the code specified in \m{true} is executed.
 
-If the file does not exist then the code specified in \m{false} is
-executed.
+If the file does not exist then the code specified in \m{false} is executed.
 
 This command does \emph{not} input the file.
 
 \begin{decl}
   |\InputIfFileExists| \arg{file-name} \arg{true} \arg{false}
 \end{decl}
-This inputs the file \m{file-name} if it exists and, immediately
-before the input, the code specified in \m{true} is executed.
+This inputs the file \m{file-name} if it exists and, immediately before the
+input, the code specified in \m{true} is executed.
 
-If the file does not exist then the code specified in \m{false} is
-executed.
+If the file does not exist then the code specified in \m{false} is executed.
 
 It is implemented using |\IfFileExists|.
 
-
 \subsection{Reporting errors, etc}
 
-These commands should be used by third party classes and packages to
-report errors, or to provide information to authors.
+These commands should be used by third party classes and packages to report
+errors, or to provide information to authors.
 
 \begin{decl}
   |\ClassError| \arg{class-name} \arg{error-text} \arg{help-text}\\
   |\PackageError| \arg{package-name} \arg{error-text} \arg{help-text}
 \end{decl}
-These produce an error message.  The \m{error-text} is displayed and the
-|?| error prompt is shown.  If the user types |h|, they will be shown
-the \m{help-text}.
+These produce an error message. The \m{error-text} is displayed and the |?|
+error prompt is shown. If the user types |h|, they will be shown the
+\m{help-text}.
 
-Within the \m{error-text} and \m{help-text}: |\protect| can be used to
-stop a command from expanding; |\MessageBreak| causes a line-break;
-and |\space| prints a space.
+Within the \m{error-text} and \m{help-text}: |\protect| can be used to stop a
+command from expanding; |\MessageBreak| causes a line-break; and |\space|
+prints a space.
 
-Note that the \m{error-text} will have a full stop added to it, so do
-not put one into the argument.
+Note that the \m{error-text} will have a full stop added to it, so do not put
+one into the argument.
 
 For example:
 \begin{verbatim}
@@ -1354,96 +1041,22 @@ If the user types |h|, this will be shown:
   |\ClassInfo| \arg{class-name} \arg{info-text}\\
   |\PackageInfo| \arg{package-name} \arg{info-text}
 \end{decl}
-The four |Warning| commands are similar to the error commands, except
-that they produce only a warning on the screen, with no error prompt.
+The four |Warning| commands are similar to the error commands, except that they
+produce only a warning on the screen, with no error prompt.
 
-The first two, |Warning| versions, also show the line number where the
-warning occurred, whilst the second two, |WarningNoLine| versions, do
-not.
+The first two, |Warning| versions, also show the line number where the warning
+occurred, whilst the second two, |WarningNoLine| versions, do not.
 
-The two |Info| commands are similar except that they log the
-information only in the transcript file, including the line number.
-There are no |NoLine| versions of these two.
+The two |Info| commands are similar except that they log the information only
+in the transcript file, including the line number. There are no |NoLine|
+versions of these two.
 
-Within the \m{warning-text} and \m{info-text}: |\protect| can be used to
-stop a command from expanding; |\MessageBreak| causes a line-break;
-and |\space| prints a space.
-Also, these should not end with a full stop as one is
+Within the \m{warning-text} and \m{info-text}: |\protect| can be used to stop a
+command from expanding; |\MessageBreak| causes a line-break; and |\space|
+prints a space. Also, these should not end with a full stop as one is
 automatically added.
 
-
-\subsection{Defining commands}
-\label{Sec:commands.define}
-
-\LaTeXe{} provides some extra methods of (re)defining commands that are
-intended for use in class and package files.
-
-\NEWfeature{1994/12/01}
-The \texttt{*}-forms of these commands should be used to define
-commands that are not, in \TeX{} terms, long.  This can be useful for
-error-trapping with commands whose arguments are not intended to
-contain whole paragraphs of text.
-
-\begin{decl}
-  |\DeclareRobustCommand| \arg{cmd} \oarg{num} \oarg{default}
-     \arg{definition}\\
-  |\DeclareRobustCommand*| \arg{cmd} \oarg{num} \oarg{default}
-     \arg{definition}
-\end{decl}
-This command takes the same arguments as |\newcommand| but it declares
-a robust command, even if some code within the \m{definition} is
-fragile.  You can use this command to define new robust commands, or
-to redefine existing commands and make them robust.  A log is put into
-the transcript file if a command is redefined.
-
-For example, if |\seq| is defined as follows:
-\begin{verbatim}
-   \DeclareRobustCommand{\seq}[2][n]{%
-     \ifmmode
-       #1_{1}\ldots#1_{#2}%
-     \else
-       \PackageWarning{fred}{You can't use \protect\seq\space in text}%
-     \fi
-   }
-\end{verbatim}
-Then the command |\seq| can be used in moving arguments, even though
-|\ifmmode| cannot, for example:
-\begin{verbatim}
-   \section{Stuff about sequences $\seq{x}$}
-\end{verbatim}
-
-Note also that there is no need to put a |\relax| before the
-|\ifmmode| at the beginning of the definition; this is because the
-protection given by this |\relax| against expansion at the wrong time
-will be provided internally.
-
-\begin{decl}
-  |\CheckCommand| \arg{cmd} \oarg{num} \oarg{default}
-     \arg{definition}\\
-  |\CheckCommand*| \arg{cmd} \oarg{num} \oarg{default}
-     \arg{definition}
-\end{decl}
-This takes the same arguments as |\newcommand| but, rather than define
-\m{cmd}, it just checks that the current definition of \m{cmd} is
-exactly as given by \m{definition}.  An error is raised if these
-definitions differ.
-
-This command is useful for checking the state of the system before
-your package starts altering the definitions of commands.  It allows
-you to check, in particular, that no other package has redefined the
-same command.
-
-\subsection{Moving arguments}
-
-\NEWdescription{1994/12/01}
-The setting of protect whilst processing (i.e.~moving) moving arguments
-has been reimplemented, as has the method of writing information from
-the |.aux| file to other files such as the |.toc| file.  Details can
-be found in the file |ltdefns.dtx|.
-
-We hope that these changes will not affect many packages.
-
-\section{Miscellaneous commands, etc}
+\section{Miscellaneous commands, etc.}
 \label{Sec:commands.misc}
 
 \subsection{Layout parameters}
@@ -1452,78 +1065,25 @@ We hope that these changes will not affect many packages.
 |\paperheight|\\
 |\paperwidth|
 \end{decl}
-These two parameters are usually set by the class to be the size of
-the paper being used. This should be actual paper size, unlike
-|\textwidth| and |\textheight| which are the size of the main text
-body within the margins.
-
+These two parameters are usually set by the class to be the size of the paper
+being used. This should be actual paper size, unlike |\textwidth| and
+|\textheight| which are the size of the main text body within the margins.
 
 \subsection{Case changing}
 \label{sec:case}
 
 \begin{decl}
   |\MakeUppercase| \arg{text} \\
-  |\MakeLowercase| \arg{text}
+  |\MakeLowercase| \arg{text} \\
+  |\MakeTitlecase| \arg{text}
 \end{decl}
 
-\NEWfeature{1995/06/01}
-\TeX{} provides two primitives |\uppercase| and |\lowercase| for
-changing the case of text.  These are sometimes used in document
-classes, for example to set information in running heads in all
-capitals.
-
-Unfortunately, these \TeX{} primitives do not change the case of
-characters accessed by commands like |\ae| or |\aa|.  To overcome this
-problem, \LaTeX{} provides two new commands |\MakeUppercase| and
-|\MakeLowercase| to do this.
-
-For example:
-\begin{quotation}
-\begin{tabular}{rl}
-   |\uppercase{aBcD\ae\AA\ss\OE}| & \uppercase{aBcD\ae\AA\ss\OE}\\
-   |\lowercase{aBcD\ae\AA\ss\OE}| & \lowercase{aBcD\ae\AA\ss\OE}\\
-   |\MakeUppercase{aBcD\ae\AA\ss\OE}| &
-                                      \MakeUppercase{aBcD\ae\AA\ss\OE}\\
-   |\MakeLowercase{aBcD\ae\AA\ss\OE}| & \MakeLowercase{aBcD\ae\AA\ss\OE}
-\end{tabular}
-\end{quotation}
-
-The commands |\MakeUppercase| and |\MakeLowercase| themselves are
-robust, but they have moving arguments.
-
-The commands use the \TeX{} primitives |\uppercase| and |\lowercase|,
-and so have a number of unexpected `features'.  In particular, they
-change the case of everything (except characters in the names of
-control-sequences) in their text argument: this includes mathematics,
-environment names, and label names.
-
-For example:
-\begin{verbatim}
-   \MakeUppercase{$x+y$ in \ref{foo}}
-\end{verbatim}
-produces $X+Y$ and the warning:
-\begin{verbatim}
-   LaTeX Warning: Reference `FOO' on page ... undefined on ...
-\end{verbatim}
-In the long run, we would like to use all-caps fonts rather than any
-command like |\MakeUppercase| but this is not possible at the moment
-because such fonts do not exist.
-
-\NEWdescription{1995/12/01}
-In order that upper/lower-casing will work reasonably well, and in
-order to provide any correct hyphenation, \LaTeXe{} \emph{must} use,
-throughout a document, the same fixed table for changing case.
-The table used is designed for the font encoding |T1|; this works well
-with the standard \TeX{} fonts for all Latin alphabets but will cause
-problems when using other alphabets.
-
-\subsection{The `openany' option in the `book' class}
-
-\NEWdescription{1996/06/01}
-The |openany| option allows chapter and similar openings to
-occur on left hand pages. Previously this option affected only
-|\chapter| and |\backmatter|.  It now also affects
-|\part|, |\frontmatter| and |\mainmatter|.
+As described in \texttt{usrguide}, case changing for text should be carried out
+using the commands |\MakeUppercase|, |\MakeLowercase| and
+|\MakeTitlecase|. If you need to change the case of programmatic material, the
+team strongly suggest using the L3 programming layer commands in the
+\texttt{str} module. If you do not wish to do this, you should use the \TeX{}
+|\uppercase| and |\lowercase| primitives \emph{in this situation only}.
 
 \subsection{Better user-defined math display environments}
 
@@ -1531,11 +1091,8 @@ occur on left hand pages. Previously this option affected only
   |\ignorespacesafterend|
 \end{decl}
 
-\NEWfeature{1996/12/01}
-\NEWdescription{2003/12/01}
-Suppose that you want to define an environment for displaying text
-that is numbered as an equation.  A straightforward way to do this is
-as follows:
+Suppose that you want to define an environment for displaying text that is
+numbered as an equation. A straightforward way to do this is as follows:
 \begin{verbatim}
   \newenvironment{texteqn}
     {\begin{equation}
@@ -1543,13 +1100,13 @@ as follows:
       {\end{minipage}
      \end{equation}}
 \end{verbatim}
-However, if you have tried this then you will probably have noticed
-that it does not work perfectly when used in the middle of a paragraph
-because an inter-word space appears at the beginning of the first
-line after the environment.
+However, if you have tried this then you will probably have noticed that it
+does not work perfectly when used in the middle of a paragraph because an
+inter-word space appears at the beginning of the first line after the
+environment.
 
-There is now an extra command (with a very long name) available that
-you can use to avoid this problem; it should be inserted as shown here:
+You can avoid this problem using |\ignorespacesafterend|; it should be
+inserted as shown here:
 \begin{verbatim}
   \newenvironment{texteqn}
     {\begin{equation}
@@ -1567,312 +1124,298 @@ This command may also have other uses.
   |\normalsfcodes|
 \end{decl}
 
-\NEWfeature{1997/06/01}
 This command should be used to restore the normal settings of the
 parameters that affect spacing between words, sentences, etc.
 
-An important use of this feature is to correct a problem, reported by
-Donald Arseneau, that punctuation in page headers has always (in all
-known \TeX{} formats) been potentially wrong whenever a page break
-happens while a local setting of the space codes is in effect.  These
-space codes are changed by, for example, the command
-\verb|\frenchspacing|) and the \textsf{verbatim} environment.
-
-It is normally given the correct definition automatically in
-|\begin{document}| and so need not be explicitly set; however, if it
-is explicitly made nonempty in a class file then automatic
-default setting will be over-ridden.
-
-
-\section{Upgrading \LaTeX~2.09 classes and packages}
-\label{Sec:upgrade}
-
-This section describes the changes you may need to make when you
-upgrade an existing \LaTeX{} style to a package or class but we shall
-start in optimistic mode.
-
-Many existing style files will run with \LaTeXe{} without any
-modification to the file itself.  When everything is running OK,
-please put a note in the newly created package or class file to record
-that it runs with the new standard \LaTeX{}; then distribute it to
-your users.
-
-\subsection{Try it first!}
-\label{Sec:try-it}
-
-The first thing you should do is to test your style in `compatibility
-mode'.  The only change you need to make in order to do this is,
-possibly, to change the extension of the file to |.cls|: you should
-make this change only if your file was used as a main document style.
-Now, without any other modifications, run \LaTeXe{} on a document that
-uses your file.  This assumes that you have a suitable collection of
-files that tests all the functionality provided by your style file.
-(If you haven't, now is the time to make one!)
-
-You now need to change the test document files so that they are
-\LaTeXe{} documents: see \emph{\usrguide} for details of how to do
-this and then try them again.  You have now tried the test documents
-in both \LaTeXe{} native mode and \LaTeX~2.09 compatibility mode.
-
-\subsection{Troubleshooting}
-\label{Sec:trouble}
-
-If your file does not work with \LaTeXe{}, there are two likely
-reasons.
+An important use of this feature is to correct a problem, reported by Donald
+Arseneau, that punctuation in page headers has always (in all known \TeX{}
+formats) been potentially wrong whenever a page break happens while a local
+setting of the space codes is in effect. These space codes are changed by, for
+example, the command \verb|\frenchspacing|) and the \textsf{verbatim}
+environment.
+
+It is normally given the correct definition automatically in |\begin{document}|
+and so need not be explicitly set; however, if it is explicitly made non-empty
+in a class file then automatic default setting will be over-ridden.
+
+\subsection{Querying localisation}
+
+Localisation information is needed to customise a range of outputs. The
+\LaTeX{} kernel does not itself manage localisation, which is well-served by
+the bundles \pkg{babel} and \pkg{polyglossia}. To allow the kernel and other
+packages to access the current localisation information provided by \pkg{babel}
+or \pkg{polyglossia}, the command \cs{BCPdata} is defined by the kernel. The
+initial kernel definition expands to tag parts for \texttt{en-US}, as the
+kernel does not track localisation but does start out with a broadly US~English
+setup. However, if \pkg{babel} or \pkg{polyglossia} are loaded, it is redefined
+expand to the BCP-47 information from the appropriate package. The supported
+arguments are the BCP-47 tag breakdowns:
 \begin{itemize}
-\item \LaTeX{} now has a robust, well-defined designer's interface for
-  selecting fonts, which is very different from the \LaTeX~2.09
-  internals.
-\item Your style file may have used some \LaTeX~2.09 internal commands
-  which have changed, or which have been removed.
+  \item \texttt{tag} The full BCP-47 tag (e.g.~\texttt{en-US})
+  \item \texttt{language} (e.g.,~\texttt{de})
+  \item \texttt{region} (e.g.,~\texttt{AT})
+  \item \texttt{script} (e.g.,~\texttt{Latn})
+  \item \texttt{variant} (e.g.,~\texttt{1901})
+  \item \texttt{extension.t} (transformation, e.g.,~\texttt{en-t-ja})
+  \item \texttt{extension.u} (additional locale
+    information, e.g.,~\texttt{ar-u-nu-latn})
+  \item \texttt{extension.x} (private use area, e.g.,~\texttt{la-x-classic})
 \end{itemize}
+The information for the \emph{main} language for a document is be provided
+if these are prefixed by \texttt{main.}, e.g.~\texttt{main.language} will
+expand to the main language even if another language is currently active.
 
-When you are debugging your file, you will probably need more
-information than is normally displayed by \LaTeXe.  This is achieved
-by resetting the counter |errorcontextlines| from its default value of
-$-1$ to a much higher value, e.g.~999.
-
-\subsection{Accommodating compatibility mode}
-
-Sometimes an existing collection of \LaTeX~2.09 documents makes it
-inconvenient or impossible to abandon the old commands entirely.
-If this is the case, then it is possible to accommodate both conventions
-by making special provision for documents processed in compatibility
-mode.
+In addition to the tag breakdown, the following semantic arguments are
+supported
+\begin{itemize}
+  \item \texttt{casing} The tag for case changing, e.g.~\texttt{el-x-iota}
+    could be selected rather than \texttt{el} to select a capital adscript
+    iota on uppercasing an \emph{ypogegrammeni}
+\end{itemize}
 
-\begin{decl}
-|\if@compatibility|
-\end{decl}
-This switch is set when a document begins with |\documentstyle| rather
-than |\documentclass|.  Appropriate code can be supplied for either
-condition, as follows:
+For example, the case changing command \cs{MakeUppercase} is (conceptually)
+defined as
 \begin{verbatim}
-   \if@compatibility
-     <code emulating LaTeX 2.09 behavior>
-   \else
-     <code suitable for LaTeX2e>
-   \fi
+\ExpandArgs{e}\MakeUppercaseAux{\BCPdata{casing}}{#1}
 \end{verbatim}
+where |#1| is the user input and the first argument to
+\cs{MakeUppercaseAux} takes two arguments, the locale and input text.
+
+\section{Commands superseded for new material}
 
+A small number of commands were introduced as part of \LaTeXe{} in the
+mid-1990s, are widely used but have been superseded by more modern methods.
+These are covered here as they are likely to be encountered routinely in
+existing classes and packages.
 
-\subsection{Font commands}
+\subsection{Defining commands}
 
-Some font and size commands are now defined by the document class
-rather than by the \LaTeX{} kernel.  If you are upgrading a
-\LaTeX~2.09 document style to a class that does not load one of the
-standard classes, then you will probably need to add definitions for
-these commands.
+The \texttt{*}-forms of these commands should be used to define
+commands that are not, in \TeX{} terms, long.  This can be useful for
+error-trapping with commands whose arguments are not intended to
+contain whole paragraphs of text.
 
 \begin{decl}
-   |\rm| |\sf| |\tt| |\bf| |\it| |\sl| |\sc|
+  |\DeclareRobustCommand| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}\\
+  |\DeclareRobustCommand*| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}
 \end{decl}
-None of these short-form font selection commands are defined in the
-\LaTeXe{} kernel.  They are defined by all the standard class files.
-
-If you want to define them in your class file, there are several
-reasonable ways to do this.
-
-One possible definition is:
-\begin{verbatim}
-   \newcommand{\rm}{\rmfamily}
-   ...
-   \newcommand{\sc}{\scshape}
-\end{verbatim}
-This would make the font commands orthogonal; for example
-|{\bf\it text}| would produce bold italic, thus: \textbf{\textit{text}}.
-It will also make them produce an error if used in math mode.
+This command takes the same arguments as |\newcommand| but it declares a robust
+command, even if some code within the \m{definition} is fragile. You can use
+this command to define new robust commands, or to redefine existing commands
+and make them robust. A log is put into the transcript file if a command is
+redefined.
 
-Another possible definition is:
+For example, if |\seq| is defined as follows:
 \begin{verbatim}
-   \DeclareOldFontCommand{\rm}{\rmfamily}{\mathrm}
-   ...
-   \DeclareOldFontCommand{\sc}{\scshape}{\mathsc}
+   \DeclareRobustCommand{\seq}[2][n]{%
+     \ifmmode
+       #1_{1}\ldots#1_{#2}%
+     \else
+       \PackageWarning{fred}{You can't use \protect\seq\space in text}%
+     \fi
+   }
 \end{verbatim}
-This will make |\rm| act like |\rmfamily| in text mode (see above) and
-it will make |\rm| select the |\mathrm| math alphabet in math mode.
-
-Thus |${\rm math} = X + 1$| will produce `${\rm math} = X + 1$'.
-
-If you do not want font selection to be orthogonal then you can
-follow the standard classes and define:
+Then the command |\seq| can be used in moving arguments, even though
+|\ifmmode| cannot, for example:
 \begin{verbatim}
-   \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-   ...
-   \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\mathsc}
+   \section{Stuff about sequences $\seq{x}$}
 \end{verbatim}
-This means, for example, that |{\bf\it text}| will produce medium
-weight (rather than bold) italic, thus: \textit{text}.
 
-\begin{decl}
-   |\normalsize| \\
-   |\@normalsize|
-\end{decl}
-The command |\@normalsize| is retained for compatibility with
-\LaTeX~2.09 packages which may have used its value; but redefining it
-in a class file will have no effect since it is always reset to have
-the same meaning as |\normalsize|.
-
-This means that classes \emph{must} now redefine |\normalsize| rather
-than redefining |\@normalsize|; for example (a rather incomplete one):
-\begin{verbatim}
-   \renewcommand{\normalsize}{\fontsize{10}{12}\selectfont}
-\end{verbatim}
-Note that |\normalsize| is defined by the \LaTeX{} kernel to be an
-error message.
+Note also that there is no need to put a |\relax| before the |\ifmmode| at the
+beginning of the definition; this is because the protection given by this
+|\relax| against expansion at the wrong time will be provided internally.
 
 \begin{decl}
-   |\tiny| |\footnotesize| |\small| |\large|\\
-   |\Large| |\LARGE| |\huge| |\Huge|
+  |\CheckCommand| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}\\
+  |\CheckCommand*| \arg{cmd} \oarg{num} \oarg{default}
+     \arg{definition}
 \end{decl}
-None of these other `standard' size-changing commands are defined in
-the kernel: each needs to be defined in a class file if you need it.
-They are all defined by the standard classes.
-
-This means you should use |\renewcommand| for |\normalsize| and
-|\newcommand| for the other size-changing commands.
-
+This takes the same arguments as |\newcommand| but, rather than define \m{cmd},
+it just checks that the current definition of \m{cmd} is exactly as given by
+\m{definition}. An error is raised if these definitions differ.
 
-\subsection{Obsolete commands}
+This command is useful for checking the state of the system before your package
+starts altering the definitions of commands. It allows you to check, in
+particular, that no other package has redefined the same command.
 
-Some packages will not work with \LaTeXe{}, normally because they relied
-on an internal \LaTeX{} command which was never supported and has now
-changed, or been removed.
-
-In many cases there will now be a robust, high-level means of
-achieving what previously required low-level commands.  Please consult
-Section~\ref{Sec:commands} to see if you can now use the \LaTeXe{}
-class and package writers commands.
-
-Also, of course, if your package or class redefined any of the kernel
-commands (i.e.~those defined in the files |latex.tex|, |slitex.tex|,
-|lfonts.tex|, |sfonts.tex|) then you will need to check it very
-carefully against the new kernel in case the implementation has
-changed or the command no longer exists in the \LaTeX2e{} kernel.
+\subsection{Option declaration}
+\label{Sec:commands.options.dec}
 
-Too many of the internal commands of \LaTeX~2.09 have been
-re-implemented or removed to be able to list them all here. You must
-check any that you have used or changed.
+The following commands deal with the declaration and handling of options to
+document classes and packages using a classical `simple text' approach. Every
+option name must be a `\LaTeX{} name'.
 
-We shall, however, list some of the more important commands which are
-no longer supported.
+There are some commands designed especially for use within the \m{code}
+argument of these commands (see below).
 
 \begin{decl}
-   |\tenrm| |\elvrm| |\twlrm| \dots\\
-   |\tenbf| |\elvbf| |\twlbf| \dots\\
-   |\tensf| |\elvsf| |\twlsf| \dots\\
-   \qquad$\vdots$
+  |\DeclareOption| \arg{option-name} \arg{code}
 \end{decl}
-The (approximately) seventy internal commands of this form are no longer
-defined.  If your class or package uses them then \emph{please}
-replace them with new font commands described in \emph{\fntguide}.
+This makes \m{option-name} a `declared option' of the class or package in which
+it is put.
+
+The \m{code} argument contains the code to be executed if that option is
+specified for the class or package; it can contain any valid \LaTeXe{}
+construct.
 
-For example, the command |\twlsf| should be replaced by:
+Example:
 \begin{verbatim}
-   \fontsize{12}{14}\normalfont\sffamily\selectfont
+   \DeclareOption{twoside}{\@twosidetrue}
 \end{verbatim}
 
-Another possibility is to use the |rawfonts| package, described in
-\emph{\usrguide}.
-
-Also, remember that many of the fonts preloaded by \LaTeX~2.09
-are no longer preloaded.
-
 \begin{decl}
-   |\vpt| |\vipt| |\viipt| \dots
+  |\DeclareOption*| \arg{code}
 \end{decl}
-These were the internal size-selecting commands in \LaTeX~2.09.
-(They can still be used in \LaTeX~2.09 compatibility mode.)
-Please use the command |\fontsize| instead: see \emph{\fntguide} for
-details.
+This declares the \m{code} to be executed for every option which is specified
+for, but otherwise not explicitly declared by, the class or package; this code
+is called the `default option code' and it can contain any valid \LaTeXe{}
+construct.
 
-For example, |\vpt| should be replaced by:
-\begin{verbatim}
-   \fontsize{5}{6}\normalfont\selectfont
-\end{verbatim}
+If a class file contains no |\DeclareOption*| then, by default, all specified
+but undeclared options for that class will be silently passed to all packages
+(as will the specified and declared options for that class).
+
+If a package file contains no |\DeclareOption*| then, by default, each
+specified but undeclared option for that package will produce an error.
+
+\subsection{Commands within option code}
+\label{Sec:within.code}
+
+These two commands can be used only within the \m{code} argument of either
+|\DeclareOption| or |\DeclareOption*|. Other commands commonly used within
+these arguments can be found in the next few subsections.
 
 \begin{decl}
-  |\prm|, |\pbf|, |\ppounds|, |\pLaTeX| \dots
+  |\CurrentOption|
 \end{decl}
-\LaTeX~2.09 used several commands beginning with |\p| in order to
-provide `protected' commands.  For example, |\LaTeX| was defined to be
-|\protect\pLaTeX|, and |\pLaTeX| was defined to produce the \LaTeX{}
-logo.  This made |\LaTeX| robust, even though |\pLaTeX| was not.
-
-These commands have now been reimplemented using
-|\DeclareRobustCommand|
-(described in Section~\ref{Sec:commands.define}).
-If your package redefined one of the |\p|-commands then you must
-remove the redefinition and use |\DeclareRobustCommand| to redefine the
-non-|\p| command.
+This expands to the name of the current option.
 
 \begin{decl}
-|\footheight|\\
-|\@maxsep|\\
-|\@dblmaxsep|
+  |\OptionNotUsed|
 \end{decl}
-These parameters are not used by \LaTeXe{} so they have been removed,
-except in \LaTeX~2.09 compatibility mode.  Classes should no longer
-set them.
-
-\begin{thebibliography}{1}
+This causes the current option to be added to the list of `unused options'.
 
-\bibitem{A-W:DEK91}
-Donald~E. Knuth.
-\newblock {\em The \TeX book}.
-\newblock Addison-Wesley, Reading, Massachusetts, 1986.
-\newblock Revised to cover \TeX3, 1991.
-
-\bibitem{A-W:LLa94}
-Leslie Lamport.
-\newblock {\em {\LaTeX:} A Document Preparation System}.
-\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
+\subsection{Option processing}
+\label{Sec:commands.options}
 
-\bibitem{A-W:MG2004}
-Frank Mittelbach and Michel Goossens.
-\newblock {\em The {\LaTeX} Companion second edition}.
-\newblock With Johannes Braams, David Carlisle, and Chris Rowley.
-\newblock Addison-Wesley, Reading, Massachusetts, 2004.
+\begin{decl}
+  |\ProcessOptions|
+\end{decl}
+This command executes the \m{code} for each selected option.
 
-\end{thebibliography}
+We shall first describe how |\ProcessOptions| works in a package file, and then
+how this differs in a class file.
 
-\newpage
-\thispagestyle{empty}
+To understand in detail what |\ProcessOptions| does in a package file, you have
+to know the difference between \emph{local} and \emph{global} options.
+\begin{itemize}
+\item \textbf{Local options} are those which have been explicitly
+  specified for this particular package in the \m{options} argument of
+  any of these:
+\begin{quote}
+    |\PassOptionsToPackage{<options>}| \ |\usepackage[<options>]|\\
+    |\RequirePackage[<options>]|
+\end{quote}
+\item \textbf{Global options} are any other options that are specified
+  by the author in the \m{options} argument of
+    |\documentclass[<options>]|.
+\end{itemize}
+For example, suppose that a document begins:
+\begin{verbatim}
+   \documentclass[german,twocolumn]{article}
+   \usepackage{gerhardt}
+\end{verbatim}
+whilst package |gerhardt| calls package |fred| with:
+\begin{verbatim}
+   \PassOptionsToPackage{german,dvips,a4paper}{fred}
+   \RequirePackage[errorshow]{fred}
+\end{verbatim}
+then:
+\begin{itemize}
+\item |fred|'s local options are |german|, |dvips|, |a4paper|
+  and |errorshow|;
+\item |fred|'s only global option is |twocolumn|.
+\end{itemize}
 
-\section*{\LaTeXe{} Summary sheet: updating old styles}
+When |\ProcessOptions| is called, the following happen.
+\begin{itemize}
+\item \emph{First}, for each option so far declared in |fred.sty|
+  by |\DeclareOption|, it looks to see if that option is either a
+  global or a local option for |fred|: if it is then the corresponding
+  code is executed.
 
-Section references below are to \emph{\clsguide}.
+  This is done in the order in which these options
+  were declared in |fred.sty|.
+\item \emph{Then}, for each remaining \emph{local} option, the command
+  |\ds@<option>| is executed if it has been defined somewhere (other
+  than by a |\DeclareOption|); otherwise, the `default option code' is
+  executed.  If no default option code has been declared then an error
+  message is produced.
 
-\begin{enumerate}
+  This is done in the order in which these
+  options were specified.
+\end{itemize}
+Throughout this process, the system ensures that the code declared for
+an option is executed at most once.
 
-\item Should it become a class or a package?
-  See Section~\ref{Sec:classorpkg} for how to answer this question.
+Returning to the example, if |fred.sty| contains:
+\begin{verbatim}
+   \DeclareOption{dvips}{\typeout{DVIPS}}
+   \DeclareOption{german}{\typeout{GERMAN}}
+   \DeclareOption{french}{\typeout{FRENCH}}
+   \DeclareOption*{\PackageWarning{fred}{Unknown `\CurrentOption'}}
+   \ProcessOptions\relax
+\end{verbatim}
+then the result of processing this document will be:
+\begin{verbatim}
+   DVIPS
+   GERMAN
+   Package fred Warning: Unknown `a4paper'.
+   Package fred Warning: Unknown `errorshow'.
+\end{verbatim}
+Note the following:
 
-\item If it uses another style file, then you will need to obtain an
-  updated version of this other file.  Look at Section~\ref{Sec:loading}
-  for information on how to load other class and package files.
+\begin{itemize}
+\item the code for the |dvips| option is executed before that for the
+  |german| option, because that is the order in which they are declared
+  in |fred.sty|;
+\item the code for the |german| option is executed only once, when the
+  declared options are being processed;
+\item the |a4paper| and |errorshow| options produce the warning from
+  the code declared by |\DeclareOption*| (in the order in which they
+  were specified), whilst the |twocolumn| option does not: this is
+  because |twocolumn| is a global option.
+\end{itemize}
 
-\item Try it: see Section~\ref{Sec:try-it}.
+In a class file, |\ProcessOptions| works in the same way, except that:
+\emph{all} options are local; and the default value for |\DeclareOption*| is
+|\OptionNotUsed| rather than an error.
 
-\item It worked?  Excellent, but there are probably still some things
-  you should change in order to make your file into a well-structured
-  \LaTeXe{} file that is both robust and portable. So you should now
-  read Section~\ref{Sec:writing}, especially~\ref{Sec:general}.  You
-  will also find some useful examples in Section~\ref{Sec:structure}.
+Note that, because |\ProcessOptions| has a |*|-form, it is wise to follow the
+non-star form with |\relax|, as in the previous examples, since this prevents
+unnecessary look ahead and possibly misleading error messages being issued.
 
-  If your file sets up new fonts, font-changing commands or symbols,
-  you should also read \emph{\fntguide}.
+\begin{decl}
+  |\ProcessOptions*|
+\end{decl}
+This is like |\ProcessOptions| but it executes the options in the order
+specified in the calling commands, rather than in the order of declaration in
+the class or package. For a package this means that the global options are
+processed first.
 
-\item It did not work?  There are three possibilities here:
-  \begin{itemize}
-  \item  error messages are produced whilst reading your file;
-  \item  error messages are produced whilst processing test documents;
-  \item  there are no errors but the output is not as it should be.
-  \end{itemize}
-  Don't forget to check carefully for this last possibility.
+\begin{decl}
+  |\ExecuteOptions| \arg{options-list}
+\end{decl}
 
-  If you have got to this stage then you will need to read
-  Section~\ref{Sec:upgrade} to find the solutions that will make your
-  file work.
-\end{enumerate}
+It can be used to provide a `default option list' just before
+|\ProcessOptions|. For example, suppose that in a class file you want to set up
+the default design to be: two-sided printing; 11pt fonts; in two columns. Then
+it could specify:
+\begin{verbatim}
+   \ExecuteOptions{11pt,twoside,twocolumn}
+\end{verbatim}
 
 \end{document}
diff --git a/macros/latex-dev/base/cmfonts.fdd b/macros/latex-dev/base/cmfonts.fdd
index 477085eaef..af898e47b2 100644
--- a/macros/latex-dev/base/cmfonts.fdd
+++ b/macros/latex-dev/base/cmfonts.fdd
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2022
+% Copyright (C) 1993-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -67,7 +67,7 @@
 %<*driver,  >
              \ProvidesFile{cmfonts.drv}
 %</driver,  >
-        [2022/07/10 v2.5l Standard LaTeX font definitions]
+        [2023/04/13 v2.5m Standard LaTeX font definitions]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -1048,8 +1048,10 @@
 %    \end{macrocode}
 %
 % \changes{v2.5j}{2019/12/16}{Provide substitutions for cmtt/bx/sl}
+% \changes{v2.5m}{2023/04/13}{Add missing substitution for U/cmtt/bx/sl}
 %    \begin{macrocode}
 %<+OT1cmtt>\DeclareFontShape{OT1}{cmtt}{bx}{sl}
+%<+Ucmtt>\DeclareFontShape{U}{cmtt}{bx}{sl}
 %<-nowarn>  {<->sub*cmtt/m/n}{}
 %<+nowarn>  {<->ssub*cmtt/m/n}{}
 %<+OT1cmtt>\DeclareFontShape{OT1}{cmtt}{bx}{ui}
diff --git a/macros/latex-dev/base/cmfonts.pdf b/macros/latex-dev/base/cmfonts.pdf
index 6274984a6d..82de575e6d 100644
--- a/macros/latex-dev/base/cmfonts.pdf
+++ b/macros/latex-dev/base/cmfonts.pdf
diff --git a/macros/latex-dev/base/cyrguide.pdf b/macros/latex-dev/base/cyrguide.pdf
index 1b614ae415..1aa77ffdf5 100644
--- a/macros/latex-dev/base/cyrguide.pdf
+++ b/macros/latex-dev/base/cyrguide.pdf
diff --git a/macros/latex-dev/base/doc-code.pdf b/macros/latex-dev/base/doc-code.pdf
index 93037436a6..4181da4328 100644
--- a/macros/latex-dev/base/doc-code.pdf
+++ b/macros/latex-dev/base/doc-code.pdf
diff --git a/macros/latex-dev/base/doc.dtx b/macros/latex-dev/base/doc.dtx
index a2c95694ae..75e04cc299 100644
--- a/macros/latex-dev/base/doc.dtx
+++ b/macros/latex-dev/base/doc.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2022
-% The LaTeX3 Project and any individual authors listed elsewhere
+% Copyright (C) 1993-2023
+% The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
 % This file is part of the LaTeX base system.
diff --git a/macros/latex-dev/base/doc.pdf b/macros/latex-dev/base/doc.pdf
index 796e6319f2..c0a027ae5d 100644
--- a/macros/latex-dev/base/doc.pdf
+++ b/macros/latex-dev/base/doc.pdf
diff --git a/macros/latex-dev/base/docstrip.pdf b/macros/latex-dev/base/docstrip.pdf
index a489d9b28a..88ef1e1370 100644
--- a/macros/latex-dev/base/docstrip.pdf
+++ b/macros/latex-dev/base/docstrip.pdf
diff --git a/macros/latex-dev/base/encguide.pdf b/macros/latex-dev/base/encguide.pdf
index 0c2ed52b02..7f961d9148 100644
--- a/macros/latex-dev/base/encguide.pdf
+++ b/macros/latex-dev/base/encguide.pdf
diff --git a/macros/latex-dev/base/exscale.pdf b/macros/latex-dev/base/exscale.pdf
index 8dd6ce4286..1182517613 100644
--- a/macros/latex-dev/base/exscale.pdf
+++ b/macros/latex-dev/base/exscale.pdf
diff --git a/macros/latex-dev/base/fix-cm.pdf b/macros/latex-dev/base/fix-cm.pdf
index f3eb096139..762b79017f 100644
--- a/macros/latex-dev/base/fix-cm.pdf
+++ b/macros/latex-dev/base/fix-cm.pdf
diff --git a/macros/latex-dev/base/fntguide.pdf b/macros/latex-dev/base/fntguide.pdf
index d92d3d71bb..034fe97db8 100644
--- a/macros/latex-dev/base/fntguide.pdf
+++ b/macros/latex-dev/base/fntguide.pdf
diff --git a/macros/latex-dev/base/fntguide.tex b/macros/latex-dev/base/fntguide.tex
index 33bbed3ba3..619cc907b2 100644
--- a/macros/latex-dev/base/fntguide.tex
+++ b/macros/latex-dev/base/fntguide.tex
@@ -42,7 +42,7 @@
 
 \title{\LaTeXe{} font selection}
 
-\author{\copyright~Copyright 1995--2022, \LaTeX\ Project
+\author{\copyright~Copyright 1995--2023, \LaTeX\ Project
   Team.\thanks{Thanks to Arash Esbati for documenting the
     newer NFSS features of 2020}\\
   All rights reserved.%
@@ -52,7 +52,7 @@
    \texttt{fntguide.tex} for full details.}%
 }
 
-\date{August 2022}
+\date{May 2023}
 
 \begin{document}
 
@@ -299,8 +299,6 @@ e.g., ``demi-bold'' is normally just another name for ``semi-bold'', so
 should get |sb| assigned, etc.
 
 
-\newpage
-
 \NEWdescription{2020/02/02}
 The most common values for the font shape are:
 \begin{center}
@@ -325,7 +323,7 @@ A less common value for font shape is:
   \end{minipage}
 \end{center}
 and there is also |ui| for upright italic, i.e., an italic shape but
-artifically turned upright. This is sometimes useful and available in
+artificially turned upright. This is sometimes useful and available in
 some fonts.
 
 
@@ -404,8 +402,6 @@ turned into \TeX{} font names.  This is described in
 Section~\ref{Sec:install}.
 
 
-\newpage
-
 
 \subsection{Selection commands}
 
@@ -955,7 +951,6 @@ Example:
    \DeclareMathSymbol{\alphld}{\mathalpha}{AMSb}{"0C}
 \end{verbatim}
 
-\newpage
 
 \begin{decl}
   |\DeclareMathDelimiter| \arg{cmd} \arg{type}
@@ -1382,7 +1377,7 @@ the `cmr' family).
 from this subsection.
 
 \NEWdescription{2019/07/10}
-As an exception it may also contain a |\DeclareFontsubstitution|
+As an exception it may also contain a |\DeclareFontSubstitution|
 declaration (described in \ref{sec:encoding-defaults}) to specify how
 font substitution for this encoding should be handled.  In that case it
 is important that the values used point to a font that is guaranteed to
@@ -1431,6 +1426,8 @@ executed whenever a math alphabet with this encoding is called.
 It also saves the value of \m{encoding} in the macro
 |\LastDeclaredEncoding|.
 
+\newpage
+
 Example:
 \begin{verbatim}
    \DeclareFontEncoding{OT1}{}{}
@@ -1496,6 +1493,8 @@ For example, the definition of |\ss| in the |OT1| encoding is:
 It does not produce an error if the command has already
 been defined but logs the redefinition in the transcript file.
 
+\newpage
+
 \begin{decl}
   |\DeclareTextAccent| \arg{cmd} \arg{encoding} \arg{slot}
 \end{decl}
@@ -1611,6 +1610,8 @@ defined with |\DeclareTextSymbol|.
 
 For more examples of these definitions, see |ltoutenc.dtx|.
 
+\newpage
+
 \begin{decl}[1994/12/01]
   |\ProvideTextCommandDefault| \arg{cmd} \arg{definition}
 \end{decl}
@@ -2440,8 +2441,6 @@ become unavailable in the different sub-encodings.  Again, the numbers
 are the slots in the |TS1| encoding, |acc| indicates a `constructed'
 accent.
 
-\newpage
-
 
 
 \begin{table}[!tbp]
diff --git a/macros/latex-dev/base/graphpap.pdf b/macros/latex-dev/base/graphpap.pdf
index c5d07452ce..734a7e60e7 100644
--- a/macros/latex-dev/base/graphpap.pdf
+++ b/macros/latex-dev/base/graphpap.pdf
diff --git a/macros/latex-dev/base/ifthen.pdf b/macros/latex-dev/base/ifthen.pdf
index d09c30cace..a5b90c8782 100644
--- a/macros/latex-dev/base/ifthen.pdf
+++ b/macros/latex-dev/base/ifthen.pdf
diff --git a/macros/latex-dev/base/inputenc.pdf b/macros/latex-dev/base/inputenc.pdf
index 4c305b8bc1..ddd7928f37 100644
--- a/macros/latex-dev/base/inputenc.pdf
+++ b/macros/latex-dev/base/inputenc.pdf
diff --git a/macros/latex-dev/base/lamport-manual.pdf b/macros/latex-dev/base/lamport-manual.pdf
index 14ffd31d47..fb9e0e0a25 100644
--- a/macros/latex-dev/base/lamport-manual.pdf
+++ b/macros/latex-dev/base/lamport-manual.pdf
diff --git a/macros/latex-dev/base/latexrelease.pdf b/macros/latex-dev/base/latexrelease.pdf
index ce0a066012..3b4124e9d0 100644
--- a/macros/latex-dev/base/latexrelease.pdf
+++ b/macros/latex-dev/base/latexrelease.pdf
diff --git a/macros/latex-dev/base/latexsym.pdf b/macros/latex-dev/base/latexsym.pdf
index 2b3650506a..dab8955e1c 100644
--- a/macros/latex-dev/base/latexsym.pdf
+++ b/macros/latex-dev/base/latexsym.pdf
diff --git a/macros/latex-dev/base/lb2.pdf b/macros/latex-dev/base/lb2.pdf
index d5d94cd6d8..4c35d7053e 100644
--- a/macros/latex-dev/base/lb2.pdf
+++ b/macros/latex-dev/base/lb2.pdf
diff --git a/macros/latex-dev/base/letter.pdf b/macros/latex-dev/base/letter.pdf
index fb5d1b851e..139eb554c7 100644
--- a/macros/latex-dev/base/letter.pdf
+++ b/macros/latex-dev/base/letter.pdf
diff --git a/macros/latex-dev/base/lgc2.pdf b/macros/latex-dev/base/lgc2.pdf
index 161aa93503..b1af720e50 100644
--- a/macros/latex-dev/base/lgc2.pdf
+++ b/macros/latex-dev/base/lgc2.pdf
diff --git a/macros/latex-dev/base/lppl.pdf b/macros/latex-dev/base/lppl.pdf
index 4b4c6fa326..c3b3b75bc7 100644
--- a/macros/latex-dev/base/lppl.pdf
+++ b/macros/latex-dev/base/lppl.pdf
diff --git a/macros/latex-dev/base/ltclass.dtx b/macros/latex-dev/base/ltclass.dtx
index f6d5994d3f..bb52148508 100644
--- a/macros/latex-dev/base/ltclass.dtx
+++ b/macros/latex-dev/base/ltclass.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2022/11/16 v1.5f LaTeX Kernel (Class & Package Interface)]
+             [2023/04/14 v1.5h LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -324,6 +324,7 @@
 %
 % \DescribeMacro\IfPackageAtLeastTF
 % \DescribeMacro\IfClassAtLeastTF
+% \DescribeMacro\IfFileAtLeastTF
 % \DescribeMacro\@ifpackagelater
 % \DescribeMacro\@ifclasslater
 % \changes{v1.1i}{2013/07/07}{Correctly describe how the date in
@@ -890,12 +891,14 @@
 %
 %  \begin{macro}{\IfPackageAtLeastTF}
 %  \begin{macro}{\IfClassAtLeastTF}
+%  \begin{macro}{\IfFileAtLeastTF}
 %  \begin{macro}{\IfFormatAtLeastTF}
 % |\IfFormatAtLeastTF{YYYY/MM/DD}{|\meta{true
 %    code}|}{|\meta{false code}|}|
 %    Test if the format is later or equal to the given date.
 % \changes{v1.3k}{2020/04/07}{Macro added; also in rollback (gh/168)}
 % \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
+% \changes{v1.5g}{2023/03/28}{Added \cs{IfFileAtLeastTF} (gh/1015)}
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
@@ -904,6 +907,7 @@
 \def\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
 \let\IfPackageAtLeastTF\@ifpackagelater
 \let\IfClassAtLeastTF\@ifclasslater
+\def\IfFileAtLeastTF#1{\expandafter\@ifl@t@r\csname ver@#1\endcsname}
 %    \end{macrocode}
 %    For rollback pretend it was available since the beginning of dawn.
 %    \begin{macrocode}
@@ -914,12 +918,14 @@
 %<latexrelease>\def\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
 %<latexrelease>\let\IfPackageAtLeastTF\@ifpackagelater
 %<latexrelease>\let\IfClassAtLeastTF\@ifclasslater
+%<latexrelease>\def\IfFileAtLeastTF#1{\expandafter\@ifl@t@r\csname ver@#1\endcsname}
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
 %  \end{macro}
+%  \end{macro}
 %
 % \begin{macro}{\@ifl@ter}
 % \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
@@ -2133,13 +2139,28 @@
 %         {Reset \cs{CurrentOption}}
 % \changes{v1.3d}{2019/10/18}{Initialize \cs{...-h@@k} only when loading
 %                             the package or class (gh/198)}
+% \changes{v1.5h}{2023/04/14}{Define \cs{load@onefilewithoptions} when
+%                             in \pkg{latexrelease} (gh/992)}
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2020/10/01}%
 %<latexrelease>      {\@onefilewithoptions}{Hooks and unused options issue}%
+%    \end{macrocode}
+%
+%   Here this macro is called \cs{@onefilewithoptions}, but further
+%   ahead in this file it is renamed to \cs{load@onefilewithoptions},
+%   and \cs{@onefilewithoptions} becomes a wrapper around this, used for
+%   bookkeeping when rolling back.  Therefore, when in
+%   \pkg{latexrelease}, we need to define \cs{load@onefilewithoptions}
+%   instead, thus the extra guarded \cs{def} line below:
+%    \begin{macrocode}
+%<*2ekernel>
 \def\@onefilewithoptions#1[#2][#3]#4{%
+%</2ekernel>
+%<latexrelease>\def\load@onefilewithoptions#1[#2][#3]#4{%
 %    \end{macrocode}
+%
 %    We have to sanitise file names, so that something like
 % \begin{verbatim}
 %   \usepackage{some/local/path/array}
diff --git a/macros/latex-dev/base/ltcmd.dtx b/macros/latex-dev/base/ltcmd.dtx
index 78a5a389ae..5f019cdc2a 100644
--- a/macros/latex-dev/base/ltcmd.dtx
+++ b/macros/latex-dev/base/ltcmd.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1999 Frank Mittelbach, Chris Rowley, David Carlisle
-% Copyright (C) 2004-2008 Frank Mittelbach, The LaTeX3 Project
+% Copyright (C) 2004-2008 Frank Mittelbach, The LaTeX Project
 % Copyright (C) 2009-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
@@ -34,8 +34,8 @@
 %%% From File: ltcmd.dtx
 %
 %    \begin{macrocode}
-\def\ltcmdversion{v1.1b}
-\def\ltcmddate{2022-11-29}
+\def\ltcmdversion{v1.1d}
+\def\ltcmddate{2023-04-13}
 %    \end{macrocode}
 %
 %<*driver>
@@ -2123,8 +2123,8 @@
 %   and possibly another auxiliary
 %   \cs{\meta{cmd}\textvisiblespace\textvisiblespace}, if the command
 %   has both long and short arguments.  Then, its signature also has
-%   several specific bits that are unique to that command; this is in contrast to
-%   non-expandable commands, which use a common set of parsing functions.
+%   several specific bits that are unique to that command; this is in contrast
+%   to non-expandable commands, which use a common set of parsing functions.
 %
 %   We start by copying the basics, then call
 %   \cs{@@_copy_expandable_signature:NnNNNNnnn} to parse the signature
@@ -2132,7 +2132,24 @@
 %   then we call \cs{@@_copy_expandable:NnNNNNnnn} that will copy the
 %   top-level definition of the command, with the proper internal
 %   renames.
+%
 %    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_copy:NN}%
+%<latexrelease>  {Support~\NewCommandCopy~in~ltcmd}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+% \changes{v1.1c}{2023/03/12}
+%         {Distinguish (non-expandable) document commands starting with
+%          \cs{@@_start_expandable:nNNNNn}}
+%   There's one variant: a command begins with \cs{@@_start_expandable:nNNNNn}
+%   may still be un-expandable/protected if it's defined by 
+%   \cs{NewDocumentCommand} and friends, with empty or only m-type arguments.
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_copy_expandable:nnNN}%
+%<latexrelease>  {Distinguish~non-expandable~document~commands}
 \cs_new_protected:Npn \@@_copy_expandable:nnNN #1 #2 #3 #4
   {
     \cs_set_eq:cc { #1 ~ code } { #2 ~ code }
@@ -2140,9 +2157,36 @@
     \@@_set_eq_if_exist:cc { #1 ~ \c_space_tl } { #2 ~ \c_space_tl }
     \@@_set_eq_if_exist:cc { #1 ~ defaults } { #2 ~ defaults }
     \exp_after:wN \@@_copy_expandable_signature:NnNNNNnnn #4 {#1} {#2}
-    \cs_set_nopar:Npx #3
+    \token_if_protected_macro:NTF #4
+      { \cs_set_protected_nopar:Npx }{ \cs_set_nopar:Npx }
+      #3
       { \exp_after:wN \@@_copy_expandable:NnNNNNnnn #4 {#1} {#2} }
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_copy_expandable:nnNN}%
+%<latexrelease>  {Support~\NewCommandCopy~in~ltcmd}
+%<latexrelease>\cs_new_protected:Npn \@@_copy_expandable:nnNN #1 #2 #3 #4
+%<latexrelease>  {
+%<latexrelease>    \cs_set_eq:cc { #1 ~ code } { #2 ~ code }
+%<latexrelease>    \@@_set_eq_if_exist:cc { #1 ~ } { #2 ~ }
+%<latexrelease>    \@@_set_eq_if_exist:cc { #1 ~ \c_space_tl } { #2 ~ \c_space_tl }
+%<latexrelease>    \@@_set_eq_if_exist:cc { #1 ~ defaults } { #2 ~ defaults }
+%<latexrelease>    \exp_after:wN \@@_copy_expandable_signature:NnNNNNnnn #4 {#1} {#2}
+%<latexrelease>    \cs_set_nopar:Npx #3
+%<latexrelease>      { \exp_after:wN \@@_copy_expandable:NnNNNNnnn #4 {#1} {#2} }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_copy_expandable:nnNN}%
+%<latexrelease>  {Support~\NewCommandCopy~in~ltcmd}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_copy:NN (part 2)}%
+%<latexrelease>  {Support~\NewCommandCopy~in~ltcmd}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \cs_new:Npn \@@_copy_expandable:NnNNNNnnn #1 #2 #3 #4 #5 #6 #7 #8 #9
   {
     \exp_not:N #1 \exp_not:n { {#2} }
@@ -2355,7 +2399,7 @@
 % worth it.
 %    \begin{macrocode}
 %<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_copy:NN}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_copy:NN (part 2)}%
 %<latexrelease>  {Support~\NewCommandCopy~in~ltcmd}
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
@@ -2418,11 +2462,47 @@
   }
 \cs_new_protected:Npn \@@_show_expandable:N #1
   { \exp_after:wN \@@_show_expandable:NnNNNNnN #1 #1 }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_show:N}%
+%<latexrelease>  {Support~\ShowCommand~in~ltcmd}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+% \changes{v1.1c}{2023/03/12}
+%         {Distinguish (non-expandable) document commands starting with
+%          \cs{@@_start_expandable:nNNNNn}}
+%   There's one variant: a command begins with \cs{@@_start_expandable:nNNNNn}
+%   may still be un-expandable/protected if it's defined by 
+%   \cs{NewDocumentCommand} and friends, with empty or only m-type arguments.
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_show_expandable:NnNNNNnN}%
+%<latexrelease>  {Distinguish~non-expandable~document~commands}
 \cs_new_protected:Npn \@@_show_expandable:NnNNNNnN #1 #2 #3 #4 #5 #6 #7 #8
   {
-    \@@_show_command_aux:NnNNn \tl_show:x
-      { expandable~document~command } #8 #5 {#2}
+    \exp_args:NNe \@@_show_command_aux:NnNNn \tl_show:x
+      { \token_if_protected_macro:NF #8 { expandable~ } document~command }
+      #8 #5 {#2}
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_show_expandable:NnNNNNnN}%
+%<latexrelease>  {Support~\ShowCommand~in~ltcmd}
+%<latexrelease>\cs_new_protected:Npn \@@_show_expandable:NnNNNNnN #1 #2 #3 #4 #5 #6 #7 #8
+%<latexrelease>  {
+%<latexrelease>    \@@_show_command_aux:NnNNn \tl_show:x
+%<latexrelease>      { expandable~document~command } #8 #5 {#2}
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_show_expandable:NnNNNNnN}%
+%<latexrelease>  {Support~\ShowCommand~in~ltcmd}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_show:N (part 2)}%
+%<latexrelease>  {Support~\ShowCommand~in~ltcmd}
 %    \end{macrocode}
 %
 %   Now just print everything in the required format.  The auxiliary
@@ -2675,7 +2755,7 @@
 %    \begin{macrocode}
 %<latexrelease>\EndIncludeInRelease
 %
-%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_show:N}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_show:N (part 2)}%
 %<latexrelease>  {Support~\ShowCommand~in~ltcmd}
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
@@ -3218,6 +3298,10 @@
 % \begin{macro}{\@@_grab_v_long:w}
 % \begin{macro}{\@@_grab_v_aux:w}
 % \begin{macro}{\@@_grab_v_group_end:}
+%   Firstly, it is necessary to change \cs{tex_endlinechar:D} so that
+%   newlines in different catcode regimes (e.g., \cs{ExplSyntaxOn}) are
+%   not misinterpreted as spaces.
+% \changes{v1.1d}{2023/04/13}{Set \cs{tex_endlinechar:D} earlier (gh/876).}
 %   The opening delimiter is the first non-space token, and is never
 %   read verbatim.  This is required by consistency with the case where
 %   the preceding argument was optional and absent: then \TeX{} has
@@ -3251,6 +3335,7 @@
     \tl_set:Nn \l_@@_signature_tl {#1}
     \group_begin:
       \tex_escapechar:D = 92 \scan_stop:
+      \tex_endlinechar:D = `\^^M \scan_stop:
       \tl_clear:N \l_@@_v_arg_tl
       \peek_remove_spaces:n
         {
@@ -3268,8 +3353,8 @@
   }
 \cs_new_protected:Npn \@@_grab_v_group_end:
   {
-        \exp_args:NNNo
-      \group_end:
+      \exp_args:NNNo
+    \group_end:
     \tl_set:Nn \l_@@_v_arg_tl { \l_@@_v_arg_tl }
   }
 %    \end{macrocode}
@@ -3414,7 +3499,6 @@
   {
     \cs_set_eq:NN \do \char_set_catcode_other:N
     \dospecials
-    \tex_endlinechar:D = `\^^M \scan_stop:
     \bool_if:NTF \l_@@_long_bool
       { \char_set_catcode_other:n { \tex_endlinechar:D } }
       { \char_set_catcode_parameter:n { \tex_endlinechar:D } }
diff --git a/macros/latex-dev/base/ltcmdhooks-code.pdf b/macros/latex-dev/base/ltcmdhooks-code.pdf
index 0dc121d2ce..49e283c6d6 100644
--- a/macros/latex-dev/base/ltcmdhooks-code.pdf
+++ b/macros/latex-dev/base/ltcmdhooks-code.pdf
diff --git a/macros/latex-dev/base/ltcmdhooks-doc.pdf b/macros/latex-dev/base/ltcmdhooks-doc.pdf
index c67f46be25..94caa644c4 100644
--- a/macros/latex-dev/base/ltcmdhooks-doc.pdf
+++ b/macros/latex-dev/base/ltcmdhooks-doc.pdf
diff --git a/macros/latex-dev/base/ltcmdhooks.dtx b/macros/latex-dev/base/ltcmdhooks.dtx
index ccb5a35a71..27907af679 100644
--- a/macros/latex-dev/base/ltcmdhooks.dtx
+++ b/macros/latex-dev/base/ltcmdhooks.dtx
@@ -1,7 +1,8 @@
 % \iffalse meta-comment
 %
-%% File: ltcmdhooks.dtx (C) Copyright 2020-2021
-%%       Frank Mittelbach, Phelype Oleinik, LaTeX Team
+%% File: ltcmdhooks.dtx
+%% Copyright (C) 2020-2023
+%% Frank Mittelbach, Phelype Oleinik, The LaTeX Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -13,8 +14,8 @@
 %
 %%% From File: ltcmdhooks.dtx
 %
-\def\ltcmdhooksversion{v1.0f}
-\def\ltcmdhooksdate{2021/10/20}
+\def\ltcmdhooksversion{v1.0h}
+\def\ltcmdhooksdate{2023/05/21}
 %
 %
 %
@@ -51,20 +52,32 @@
 %
 %    This file implements generic hooks for (arbitrary) commands.
 %    In theory every command \tn[no-index]{\meta{name}} offers now two
-%    associated hooks to which code can be added using \tn{AddToHook}
-%    or \tn{AddToHookNext}.\footnote{In practice this is not supported
+%    associated hooks to which code can be added using
+%    \tn{AddToHook},\!\footnote{In this documentation, when something is
+%      being said about \tn{AddToHook}, the same will be valid for
+%      \tn{AddToHookWithArguments}, unless that particular paragraph is
+%      highlighting the differences between both.  The same is true for
+%      the other hook-related functions and their
+%      \texttt{\ldots WithArguments} counterparts.}
+%    \tn{AddToHookNext}, \tn{AddToHookWithArguments}, and
+%    \tn{AddToHookNextWithArguments}.\footnote{In practice this is not
+%    supported
 %    for all types of commands, see section~\ref{sec:look-ahead} for
 %    the restrictions that apply and what happens if one tries to use
-%    this with commands for which this is not supported.}  These are
+%    this with commands for which this is not supported.}  These are:
 %    \begin{description}
 %    \item[\hook{cmd/\meta{name}/before}]
 %
-%       This hook is executed at the very start of the command
-%       execution after its arguments (if any) are parsed.  The hook
-%       \meta{code} is wrapped in the command inside a call to
-%       \cs{UseHook}|{cmd/|\meta{name}|/before}|, so the arguments
-%       passed to the command are \emph{not} available in the hook
-%       \meta{code}.
+%       This hook is executed at the very start of the command, right
+%       after its arguments (if any) are parsed.  The hook \meta{code}
+%       runs in the command inside a call to \cs{UseHookWithArguments}.
+%       Any code added to this hook using \tn{AddToHookWithArguments}
+%       or \tn{AddToHookNextWithArguments} can access the command's
+%       arguments using |#1|, |#2|, etc., up to the number of arguments
+%       of the command.  If \tn{AddToHook} or \tn{AddToHookNext} are
+%       used, the arguments cannot be accessed (see the \pkg{lthooks}
+%       documentation\footnote{\texttt{texdoc lthooks-doc}} on hooks
+%       with arguments).
 %
 %    \item[\hook{cmd/\meta{name}/after}]
 %
@@ -74,9 +87,12 @@
 %    \end{description}
 %
 %    The hooks are not physically present before
-%    \verb=\begin{document}= (i.e., using a command in the preamble
-%    will never execute them) and if nobody has declared any code for
-%    them, then they are not added to the command code ever.  For
+%    \verb=\begin{document}=\footnote{More specifically, they are
+%    inserted in the commands after the \hook{begindocument} hook, so
+%    they are also not present while \LaTeX{} is reading the
+%    \texttt{.aux} file.} (i.e., using a command in the preamble
+%    will never execute the hook) and if nobody has declared any code
+%    for them, then they are not added to the command code ever.  For
 %    example, if we have the following definition
 %\begin{verbatim}
 %    \newcommand\foo[2]{Code #1 for #2!}
@@ -90,23 +106,27 @@
 %\end{verbatim}
 %    then, after |\begin{document}| the definition of \cs[no-index]{foo} will be:
 %\begin{verbatim}
-%    \renewcommand\foo[2]{\UseHook{cmd/foo/before}Code #1 for #2!}
+%    \renewcommand\foo[2]{%
+%      \UseHookWithArguments{cmd/foo/before}{2}{#1}{#2}%
+%      Code #1 for #2!}
 %\end{verbatim}
 %    and similarly \verb=\AddToHook{cmd/foo/after}{<after code>}=
 %    alters the definition to
 %\begin{verbatim}
-%    \renewcommand\foo[2]{Code #1 for #2!\UseHook{cmd/foo/after}}
+%    \renewcommand\foo[2]{%
+%      Code #1 for #2!%
+%      \UseHookWithArguments{cmd/foo/after}{2}{#1}{#2}}
 %\end{verbatim}
 %
 %    In other words, the mechanism is similar to what \pkg{etoolbox}
 %    offers with \tn{pretocmd} and \tn{apptocmd} with the important
-%    differences 
+%    differences
 %    \begin{itemize}
 %    \item
 %
 %      that code can be prepended or appended (i.e., added to the
 %      hooks) even if the command itself is not defined, because the
-%      defining package has not yet been loaded
+%      defining package has not yet been loaded;
 %
 %    \item
 %
@@ -197,6 +217,7 @@
 %
 %
 % \section{Package Author Interface}
+% \label{sec:pkg-author}
 %
 % The \hook{cmd} hooks are, by default, available for all commands
 % that can be patched to add the hooks.  For some commands, however,
@@ -206,9 +227,10 @@
 %
 % If you are a package author and you want to add the hooks to your
 % own commands in the proper position you can define the command and
-% manually add the \cs{UseHook} calls inside the command in the proper
-% positions, and manually define the hooks with \cs{NewHook} or
-% \cs{NewReversedHook}.  When the hooks are explicitly defined,
+% manually add the \cs{UseHookWithArguments} calls inside the command in
+% the proper positions, and manually define the hooks with
+% \cs{NewHookWithArguments} or \cs{NewReversedHookWithArguments}.
+% When the hooks are explicitly defined,
 % patching is not attempted so you can make sure your command works
 % properly.  For example, an (admittedly not really useful) command
 % that typesets its contents in a framed box with width optionally
@@ -230,26 +252,27 @@
 % \begin{verbatim}
 %   \newcommand\fancybox{\@ifnextchar({\@fancybox}{\@fancybox(5cm)}}
 %   \def\@fancybox(#1)#2{\fbox{%
-%                        \UseHook{cmd/fancybox/before}%
-%                        \parbox{#1}{#2}%
-%                        \UseHook{cmd/fancybox/after}}}
-%   \NewHook{cmd/fancybox/before}
-%   \NewReversedHook{cmd/fancybox/after}
+%                 \UseHookWithArguments{cmd/fancybox/before}{2}{#1}{#2}%
+%                 \parbox{#1}{#2}%
+%                 \UseHookWithArguments{cmd/fancybox/after}{2}{#1}{#2}}}
+%   \NewHookWithArguments{cmd/fancybox/before}{2}
+%   \NewReversedHookWithArguments{cmd/fancybox/after}{2}
 % \end{verbatim}
 % then the hooks will be executed where they should and no patching
 % will be attempted.  It is important that the hooks are declared with
-% \cs{NewHook} or \cs{NewReversedHook}, otherwise the command hook
+% \cs{NewHookWithArguments} or \cs{NewReversedHookWithArguments},
+% otherwise the command hook
 % code will try to patch the command.  Note also that the call to
-% |\UseHook{cmd/fancybox/before}| does not need to be in the
-% definition of \cs[no-index]{fancybox}, but anywhere it makes sense
+% |\UseHookWithArguments{cmd/fancybox/before}| does not need to be in
+% the definition of \cs[no-index]{fancybox}, but anywhere it makes sense
 % to insert it (in this case in the internal
 % \cs[no-index]{@fancybox}).
 %
 % Alternatively, if for whatever reason your command does not support
 % the generic hooks provided here, you can disable a hook with
-% \cs{DisableHook}\footnote{Please use \cs{DisableHook} if at all, only
-% on hooks that you \enquote{own}, i.e., for commands that your
-% package or class defines and not second guess
+% \cs{DisableGenericHook}\footnote{Please use \cs{DisableGenericHook} if
+% at all, only on hooks that you \enquote{own}, i.e., for commands
+% your package or class defines and not second guess
 % whether or not hooks of other packages should get disabled!}, so
 % that when someone tries to add code to it they will get an error.
 % Or if you don't want the error, you can simply declare the hook with
@@ -270,6 +293,55 @@
 % If you do that then both hooks automatically work and are patched
 % into the right places.
 %
+% \subsection{Arguments and redefining commands}
+% \label{sec:redef-warn}
+%
+% The code in \pkg{ltcmdhooks} does its best to find out how many
+% arguments a given command has, and to insert the appropriate call to
+% \cs{UseHookWithArguments}, so that the arguments seen by the hook are
+% exactly those grabbed by the command (the hook, after all, is a macro
+% call, so the arguments have to be placed in the right order, or they
+% won't match).
+%
+% When using the package writer interface, as discussed in
+% section~\ref{sec:pkg-author}, to change the position of the hooks in
+% your commands, you are also free to change how the hook code in your
+% command sees its arguments.  When a \hook{cmd} hook is declared with
+% \cs{NewHook} (or \cs{NewHookWithArguments} or other variations of
+% that), it loses its \enquote{generic} nature and works as a regular
+% hook.  This means that you may choose to declare it without
+% arguments regardless if the command takes arguments or not, or
+% declare it with arguments, even if the command takes none.
+%
+% However, this flexibility should not be abused.  When using a
+% nonstandard configuration for the hook arguments, think reasonably:
+% a user will expect that the argument \verb|#1| in the hook corresponds
+% to the argument's first argument, and so on.  Any other configuration
+% is likely to cause confusion and, if used, will have to be well
+% documented.
+%
+% This flexibility, however, allows you to \enquote{correct} the
+% arguments for the hooks.  For example, \LaTeX's \cs{refstepcounter}
+% has a single argument, the name of the counter.  The \pkg{cleveref}
+% package adds an optional argument to \cs{refstepcounter}, making the
+% name of the counter argument \verb|#2|.  If the author of
+% \pkg{cleveref} wanted, for whatever reason, to add hooks to
+% \cs{refstepcounter}, to preserve compatibility he could write
+% something along the lines of:
+% \begin{verbatim}
+%   \NewHookWithArguments{cmd/refstepcounter/before}{1}
+%   \renewcommand\refstepcounter[2][<default>]{%
+%     \UseHookWithArguments{cmd/refstepcounter/before}{1}{#2}%
+%     <code for \refstepcounter>}
+% \end{verbatim}
+% so that the mandatory argument, which is arg \verb|#2| in the
+% definition, would still be seen as \verb|#1| in the hook code.
+%
+% Another possibility would be to place the optional argument as the
+% second argument for the hook, so that people looking for it would be
+% able to use it.  In either case, it would have to be well documented
+% to cause as little confusion as possible.
+%
 % \MaybeStop{\setlength\IndexMin{200pt}  \PrintIndex  }
 %
 %
@@ -366,10 +438,13 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\c_@@_hash_tl}
-%   A constant token list that contains two parameter tokens.
+% \begin{macro}{\c_@@_hash_tl,\c_@@_hashes_tl}
+%   Two constant token lists that contain one and two parameter tokens.
+%   \changes{v1.0g}{2023/04/06}
+%           {Rename to \cs{c_@@_hashes_tl} and add \cs{c_@@_hash_tl} (hook-args).}
 %    \begin{macrocode}
-\tl_const:Nn \c_@@_hash_tl { # # }
+\tl_const:Nn \c_@@_hash_tl { # }
+\tl_const:Nn \c_@@_hashes_tl { # # }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -702,7 +777,7 @@
 %
 % \changes{v1.0f}{2021/10/20}
 %         {Correct patching by expansion+redefinition when the macro
-%          contains a parameter tokens (gh/697).}
+%          contains a parameter token (gh/697).}
 %   Patching with expansion+redefinition is trickier than it looks like
 %   at first glance.  Suppose the simple definition:
 % \begin{verbatim}
@@ -756,6 +831,8 @@
 %   parameter token, so that this case can be handled like the previous
 %   one.
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_patch_expand_redefine:NNnn}
+%<latexrelease>                 {cmd~hooks~with~args}
 \cs_new_protected:Npn \@@_patch_expand_redefine:NNnn #1 #2 #3 #4
   {
     \@@_patch_debug:x { ++~command~can~be~patched~without~rescanning }
@@ -779,14 +856,14 @@
 %       should be identical to the \meta{parameter text} used when
 %       originally defining that macro.
 %     \item[\cs{l_@@_replace_text_tl}] will contain braced pairs of
-%       \cs{c_@@_hash_tl}\meta{num} to feed to the macro when expanded.
+%       \cs{c_@@_hashes_tl}\meta{num} to feed to the macro when expanded.
 %       This token list as well as the previous will have the first item
 %       surrounded by |[|\ldots|]| in the case of an optional argument.
 %   \end{description}
 %
-%   The use of \cs{c_@@_hash_tl} here is to differentiate actual
+%   The use of \cs{c_@@_hashes_tl} here is to differentiate actual
 %   parameters in the macro from parameter tokens in the original
-%   definition of the macro.  Later on, \cs{c_@@_hash_tl} is either
+%   definition of the macro.  Later on, \cs{c_@@_hashes_tl} is either
 %   replaced by actual parameter tokens, or expanded into them.
 %    \begin{macrocode}
     \int_compare:nNnTF { \l_@@_patch_num_args_int } > { \c_zero_int }
@@ -795,7 +872,7 @@
 %   We'll first check if the command has any parameter token in its
 %   definition (feeding it empty arguments), and set \cs{@@_exp_not:n}
 %   accordingly.  \cs{@@_exp_not:n} will be used later to either leave
-%   \cs{c_@@_hash_tl} or expand it, and also to remember the result of
+%   \cs{c_@@_hashes_tl} or expand it, and also to remember the result of
 %   \cs{@@_if_has_hash:nTF} to avoid testing twice (the test can be
 %   rather slow).
 %    \begin{macrocode}
@@ -814,20 +891,22 @@
 %    \end{macrocode}
 %   Here we'll conditionally add |[|\ldots|]| around the first
 %   parameter:
+%   \changes{v1.0g}{2023/04/06}
+%           {Rename to \cs{c_@@_hashes_tl} (hook-args).}
 %    \begin{macrocode}
         \bool_if:NTF #1
-          { \@@_tmp:w \tl_set:Nx { [ \c_@@_hash_tl 1 ] } }
-          { \@@_tmp:w \tl_set:Nx { { \c_@@_hash_tl 1 } } }
+          { \@@_tmp:w \tl_set:Nx { [ \c_@@_hashes_tl 1 ] } }
+          { \@@_tmp:w \tl_set:Nx { { \c_@@_hashes_tl 1 } } }
 %    \end{macrocode}
 %   Then, for every parameter from the second, just add it normally:
 %    \begin{macrocode}
         \int_step_inline:nnn { 2 } { \l_@@_patch_num_args_int }
-          { \@@_tmp:w \tl_put_right:Nx { { \c_@@_hash_tl ##1 } } }
+          { \@@_tmp:w \tl_put_right:Nx { { \c_@@_hashes_tl ##1 } } }
 %    \end{macrocode}
 %   Now, if the command has any parameter token in its definition
 %   (then \cs{@@_exp_not:n} is \cs{exp_not:n}), call
 %   \cs{@@_double_hashes:n} to double them, and replace every
-%   \cs{c_@@_hash_tl} by |#|:
+%   \cs{c_@@_hashes_tl} by |#|:
 %    \begin{macrocode}
         \tl_set:Nx \l_@@_replace_text_tl
           { \exp_not:N #2 \exp_not:V \l_@@_replace_text_tl }
@@ -875,22 +954,110 @@
       { \exp_not:N \@@_make_prefixes:w \cs_prefix_spec:N #2 / / }
         }
 %    \end{macrocode}
-%   Finally, call \cs{@@_redefine_with_hooks:Nnnn} with the macro being
+%   Here we redefine the hook to have the right number of arguments.
+%   Disabling the hook, undefining the \verb|parameter| token list then
+%   calling \cs{@@_make_usable:nn} are enough to redefine the hook to
+%   the extent we want.  Code stored in the hook and other metadata
+%   about it are not lost in the process.
+% \changes{v1.0h}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
+%    \begin{macrocode}
+    \@@_disable:n { cmd / #3 / #4 }
+    \cs_undefine:c { c_@@_cmd / #3 / #4_parameter_tl }
+    \@@_make_usable:nn { cmd / #3 / #4 } { \l_@@_patch_num_args_int }
+%    \end{macrocode}
+%   Now call \cs{@@_redefine_with_hooks:Nnnn} with the macro being
 %   redefined in |#1|, then \cs{UseHook}|{cmd/<name>/before}| in |#2| or
 %   \cs{UseHook}|{cmd/<name>/after}| in |#3| (one is always empty), and
 %   in |#4| the \meta{replacement text} of the macro.
 %    \begin{macrocode}
-    \use:x
+    \use:e
       {
         \@@_redefine_with_hooks:Nnnn \exp_not:N #2
         \str_if_eq:nnTF {#4} { after }
           { \use_ii_i:nn }
           { \use:nn }
-            { { \@@_exp_not:NN \exp_not:N \UseHook { cmd / #3 / #4 } } }
+            { {
+                \@@_exp_not:NN \exp_not:N \UseHookWithArguments
+                  { cmd / #3 / #4 } { \int_use:N \l_@@_patch_num_args_int }
+                  \@@_braced_parameter:n { cmd / #3 / #4 }
+            } }
             { { } }
             { \@@_exp_not:NN \exp_not:V \l_@@_replace_text_tl }
       }
+%    \end{macrocode}
+%   Finally, update the hook code.
+%    \begin{macrocode}
+    \@@_update_hook_code:n { cmd / #3 / #4 }
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/06/01}{\@@_patch_expand_redefine:NNnn}
+%<latexrelease>                 {cmd~hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_patch_expand_redefine:NNnn #1 #2 #3 #4
+%<latexrelease>  {
+%<latexrelease>    \@@_patch_debug:x { ++~command~can~be~patched~without~rescanning }
+%<latexrelease>    \int_set:Nn \l_@@_patch_num_args_int
+%<latexrelease>      {
+%<latexrelease>        \exp_args:Nf \str_count:n { \cs_argument_spec:N #2 } / 2
+%<latexrelease>        \bool_if:NT #1 { -1 }
+%<latexrelease>      }
+%<latexrelease>    \int_compare:nNnTF { \l_@@_patch_num_args_int } > { \c_zero_int }
+%<latexrelease>      {
+%<latexrelease>        \tl_set:Nx \l_@@_tmpa_tl { \bool_if:NTF #1 { [ ] } { { } } }
+%<latexrelease>        \int_step_inline:nnn { 2 } { \l_@@_patch_num_args_int }
+%<latexrelease>          { \tl_put_right:Nn \l_@@_tmpa_tl { { } } }
+%<latexrelease>        \exp_args:NNo \exp_args:No \@@_if_has_hash:nTF
+%<latexrelease>            { \exp_after:wN #2 \l_@@_tmpa_tl }
+%<latexrelease>          { \cs_set_eq:NN \@@_exp_not:n \exp_not:n }
+%<latexrelease>          { \cs_set_eq:NN \@@_exp_not:n \use:n }
+%<latexrelease>        \cs_set_protected:Npn \@@_tmp:w ##1 ##2
+%<latexrelease>          {
+%<latexrelease>            ##1 \l_@@_param_text_tl   { \use:n ##2 }
+%<latexrelease>            ##1 \l_@@_replace_text_tl { \@@_exp_not:n {##2} }
+%<latexrelease>          }
+%<latexrelease>        \bool_if:NTF #1
+%<latexrelease>          { \@@_tmp:w \tl_set:Nx { [ \c_@@_hash_tl 1 ] } }
+%<latexrelease>          { \@@_tmp:w \tl_set:Nx { { \c_@@_hash_tl 1 } } }
+%<latexrelease>        \int_step_inline:nnn { 2 } { \l_@@_patch_num_args_int }
+%<latexrelease>          { \@@_tmp:w \tl_put_right:Nx { { \c_@@_hash_tl ##1 } } }
+%<latexrelease>        \tl_set:Nx \l_@@_replace_text_tl
+%<latexrelease>          { \exp_not:N #2 \exp_not:V \l_@@_replace_text_tl }
+%<latexrelease>        \tl_set:Nx \l_@@_replace_text_tl
+%<latexrelease>          {
+%<latexrelease>            \token_if_eq_meaning:NNTF \@@_exp_not:n \exp_not:n
+%<latexrelease>              { \exp_args:NNV \exp_args:No \@@_double_hashes:n }
+%<latexrelease>              { \exp_args:NV \exp_not:o }
+%<latexrelease>                  \l_@@_replace_text_tl
+%<latexrelease>          }
+%<latexrelease>        \cs_set_eq:NN \@@_def_cmd:w \tex_gdef:D
+%<latexrelease>        \cs_set_eq:NN \@@_exp_not:NN \prg_do_nothing:
+%<latexrelease>      }
+%<latexrelease>      {
+%<latexrelease>        \tl_clear:N \l_@@_param_text_tl
+%<latexrelease>        \tl_set_eq:NN \l_@@_replace_text_tl #2
+%<latexrelease>        \cs_set_eq:NN \@@_def_cmd:w \tex_xdef:D
+%<latexrelease>        \cs_set:Npn \@@_exp_not:NN ##1 { \exp_not:N ##1 \exp_not:N }
+%<latexrelease>      }
+%<latexrelease>    \group_begin:
+%<latexrelease>      \int_set:Nn \tex_escapechar:D { `\/ }
+%<latexrelease>      \use:x
+%<latexrelease>        {
+%<latexrelease>    \group_end:
+%<latexrelease>    \tl_set:Nx \exp_not:N \l_@@_patch_prefixes_tl
+%<latexrelease>      { \exp_not:N \@@_make_prefixes:w \cs_prefix_spec:N #2 / / }
+%<latexrelease>        }
+%<latexrelease>    \use:x
+%<latexrelease>      {
+%<latexrelease>        \@@_redefine_with_hooks:Nnnn \exp_not:N #2
+%<latexrelease>        \str_if_eq:nnTF {#4} { after }
+%<latexrelease>          { \use_ii_i:nn }
+%<latexrelease>          { \use:nn }
+%<latexrelease>            { { \@@_exp_not:NN \exp_not:N \UseHook { cmd / #3 / #4 } } }
+%<latexrelease>            { { } }
+%<latexrelease>            { \@@_exp_not:NN \exp_not:V \l_@@_replace_text_tl }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
 %   Now that all the needed tools are ready, without further ado we'll
@@ -973,7 +1140,7 @@
 %   }
 %   \cs{@@_double_hashes:n} loops through the token list |#1| and
 %   duplicates any catcode~6 token, and expands tokens \cs{ifx}-equal to
-%   \cs{c_@@_hash_tl}, and leaves all other tokens \cs{notexpanded} with
+%   \cs{c_@@_hashes_tl}, and leaves all other tokens \cs{notexpanded} with
 %   \cs{exp_not:N}.  Unfortunately pairs of explicit catcode~1 and
 %   catcode~2 character tokens are normalised to |{|$_1$ and |}|$_1$
 %   because it's not feasible to expandably detect the character code
@@ -1000,26 +1167,32 @@
 %    \end{macrocode}
 %
 %   \cs{@@_double_hashes_output:N} checks for the end of the token list,
-%   then checks if the token is \cs{c_@@_hash_tl}, and if so just leaves
+%   then checks if the token is \cs{c_@@_hashes_tl}, and if so just leaves
 %   it.
+%   \changes{v1.0g}{2023/04/06}
+%           {Add case for \cs{c_@@_hashes_tl} (hook-args).}
 %    \begin{macrocode}
 \cs_new:Npn \@@_double_hashes_output:N #1
   {
     \if_meaning:w \q_@@_recursion_tail #1
       \@@_double_hashes_stop:w
     \fi:
-    \if_meaning:w \c_@@_hash_tl #1
+    \if:w ?
+      \if_meaning:w \c_@@_hash_tl #1 ! \fi:
+      \if_meaning:w \c_@@_hashes_tl #1 ! \fi:
+          ?
+    \else:
 %    \end{macrocode}
 %   (this \cs{use_i:nnnn} uses \cs{fi:} and consumes \cs{use:n}, the
 %   whole \cs{if_catcode:w} block, and the \cs{exp_not:N}, leaving just
-%   |#1| which is \cs{c_@@_hash_tl}.)
+%   |#1| which is \cs{c_@@_hashes_tl}.)
 %    \begin{macrocode}
       \use_i:nnnn
     \fi:
     \use:n
       {
 %    \end{macrocode}
-%   If |#1| is not \cs{c_@@_hash_tl}, then check if its catcode is~6,
+%   If |#1| is not \cs{c_@@_hashes_tl}, then check if its catcode is~6,
 %   and if so, leave it doubled in \cs{exp_not:n} and consume the
 %   following |\exp_not:N #1|.
 %    \begin{macrocode}
@@ -1080,10 +1253,10 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_retokenize_patch:Nnn #1 #2 #3
   {
-    \@@_patch_debug:x { ..~command~can~only~be~patched~by~rescanning }
     \str_if_eq:eeTF { \cs_argument_spec:N #1 } { }
       { \@@_patch_expand_redefine:NNnn \c_false_bool #1 {#2} {#3} }
       {
+        \@@_patch_debug:x { ..~command~can~only~be~patched~by~rescanning }
 %    \end{macrocode}
 %
 %   Otherwise, we start the actual patching by retokenization job.  The
@@ -1144,6 +1317,8 @@
 %   \cs{@@_cmd_if_scanable:NnTF} and \cs{@@_patch_retokenize:Nnnn} if
 %   the former returns \meta{true}, plus some debug messages.
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_try_patch_with_catcodes:Nnnnw}
+%<latexrelease>                 {cmd~hooks~with~args}
 \cs_new_protected:Npn \@@_try_patch_with_catcodes:Nnnnw #1 #2 #3 #4
   {
     \quark_if_recursion_tail_stop_do:nn {#4} { \use:n }
@@ -1152,7 +1327,7 @@
       {
         \@@_patch_debug:x { ++~macro~can~be~retokenized~cleanly }
         \@@_patch_debug:x { ==~retokenizing~macro~now }
-        \@@_patch_retokenize:Nnnn #1 {#2} {#3} {#4}
+        \@@_patch_retokenize:Nnnn #1 { cmd / #2 / #3 } {#3} {#4}
         \use_i_delimit_by_q_recursion_stop:nw \use_none:n
       }
       {
@@ -1160,6 +1335,26 @@
         \@@_try_patch_with_catcodes:Nnnnw #1 {#2} {#3}
       }
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/06/01}{\@@_try_patch_with_catcodes:Nnnnw}
+%<latexrelease>                 {cmd~hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_try_patch_with_catcodes:Nnnnw #1 #2 #3 #4
+%<latexrelease>  {
+%<latexrelease>    \quark_if_recursion_tail_stop_do:nn {#4} { \use:n }
+%<latexrelease>    \@@_patch_debug:x { ++~trying~to~patch~by~retokenization }
+%<latexrelease>    \@@_cmd_if_scanable:NnTF {#1} {#4}
+%<latexrelease>      {
+%<latexrelease>        \@@_patch_debug:x { ++~macro~can~be~retokenized~cleanly }
+%<latexrelease>        \@@_patch_debug:x { ==~retokenizing~macro~now }
+%<latexrelease>        \@@_patch_retokenize:Nnnn #1 {#2} {#3} {#4}
+%<latexrelease>        \use_i_delimit_by_q_recursion_stop:nw \use_none:n
+%<latexrelease>      }
+%<latexrelease>      {
+%<latexrelease>        \@@_patch_debug:x { --~macro~cannot~be~retokenized~cleanly }
+%<latexrelease>        \@@_try_patch_with_catcodes:Nnnnw #1 {#2} {#3}
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1267,15 +1462,86 @@
 % \end{macro}
 %
 %
+% \begin{macro}{\@@_guess_arg_count:NN}
+% \begin{macro}{\@@_guess_arg_count:wN}
+% \begin{macro}{\@@_guess_arg_count:nw}
+%   Looks at the parameter text of a macro, and counts the parameters
+%   by looking at the number after a \verb|#|, and checking if they are
+%   sequential.  This macro assumes that all parameters are marked with
+%   hashes, and not other characters, and that there is no
+%   \enquote{trick parameter}.
+% \changes{v1.0h}{2023/05/21}
+%         {Macro added (cmd-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_guess_arg_count:NN}
+%<latexrelease>                 {cmd~hooks~with~args}
+\cs_new_protected:Npn \@@_guess_arg_count:NN #1
+  {
+    \exp_after:wN \@@_guess_arg_count:wN
+      \token_to_meaning:N #1 \s_@@_mark
+  }
+\exp_last_unbraced:NNNNo
+\cs_new_protected:Npx \@@_guess_arg_count:wN
+    #1 { \tl_to_str:n { macro: } } #2 \s_@@_mark #3
+  {
+    \int_set:Nn #3
+      {
+        \exp_not:N \@@_guess_arg_count:nw { 0 } #2
+          \c_hash_str 0 \s_@@_mark
+      }
+  }
+\use:e
+  { \cs_new:Npn \exp_not:N \@@_guess_arg_count:nw #1 #2 \c_hash_str #3 }
+  {
+    \int_compare:nNnTF { #1 + 1 } = {#3}
+      { \@@_guess_arg_count:nw {#3} }
+      { #1 \@@_use_none_delimit_by_s_mark:w }
+  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/06/01}{\@@_guess_arg_count:NN}
+%<latexrelease>                 {cmd~hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_guess_arg_count:NN
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 %
 % \begin{macro}{\@@_patch_retokenize:Nnnn}
 %   Then, if \cs{@@_cmd_if_scanable:NnTF} returned true, we can go on
 %   and patch the command.
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_patch_retokenize:Nnnn}
+%<latexrelease>                 {cmd~hooks~with~args}
 \cs_new_protected:Npn \@@_patch_retokenize:Nnnn #1 #2 #3 #4
   {
+%   Here, when patching by retokenization, we can only guess the number
+%   of arguments of the macro.
+% \changes{v1.0h}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
+%    \begin{macrocode}
+    \@@_guess_arg_count:NN #1 \l_@@_patch_num_args_int
 %    \end{macrocode}
-%   Start off by making some things \tn{relax} to avoid lots of
+%
+%   Then we redefine the hook to have the right number of arguments.
+%   Disabling the hook, undefining the \verb|parameter| token list then
+%   calling \cs{@@_make_usable:nn} are enough to redefine the hook to
+%   the extent we want.  Code stored in the hook and other metadata
+%   about it are not lost in the process.
+%    \begin{macrocode}
+    \@@_disable:n {#2}
+    \cs_undefine:c { c_@@_#2_parameter_tl }
+    \@@_make_usable:nn {#2} { \l_@@_patch_num_args_int }
+    \tl_set:Ne \l_@@_tmpa_tl
+      { \exp_args:Ne \tl_to_str:n { \@@_braced_parameter:n {#2} } }
+    \use:x
+      {
+        \str_replace_all:Nnn \exp_not:N \l_@@_tmpa_tl
+          { #### } { \c_hash_str }
+      }
+%    \end{macrocode}
+%   Then, make make some things \tn{relax} to avoid lots of
 %   \tn{noexpand} below.
 %    \begin{macrocode}
     \cs_set_eq:NN \kerneltmpDoNotUse \scan_stop:
@@ -1301,10 +1567,18 @@
             ####1 \def \kerneltmpDoNotUse ####2
               {
                 \str_if_eq:nnT {#3} { before }
-                  { \token_to_str:N \UseHook { cmd / #2 / #3 } }
+                  {
+                    \token_to_str:N \UseHookWithArguments {#2}
+                      { \int_use:N \l_@@_patch_num_args_int }
+                      \l_@@_tmpa_tl
+                  }
                 ####3
                 \str_if_eq:nnT {#3} { after }
-                  { \token_to_str:N \UseHook { cmd / #2 / #3 } }
+                  {
+                    \token_to_str:N \UseHookWithArguments {#2}
+                      { \int_use:N \l_@@_patch_num_args_int }
+                      \l_@@_tmpa_tl
+                  }
               }
           }
 %    \end{macrocode}
@@ -1328,7 +1602,39 @@
 %                {Make patching of commands a global operation (gh/674)}
 %    \begin{macrocode}
     \cs_gset_eq:NN #1 \kerneltmpDoNotUse
+%    \end{macrocode}
+%   Finally, update the hook code.
+%    \begin{macrocode}
+    \@@_update_hook_code:n {#2}
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/06/01}{\@@_patch_retokenize:Nnnn}
+%<latexrelease>                 {cmd~hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_patch_retokenize:Nnnn #1 #2 #3 #4
+%<latexrelease>  {
+%<latexrelease>    \cs_set_eq:NN \kerneltmpDoNotUse \scan_stop:
+%<latexrelease>    \cs_set_eq:NN \@@_tmp:w \scan_stop:
+%<latexrelease>    \use:x
+%<latexrelease>      {
+%<latexrelease>        \cs_set:Npn \@@_tmp:w
+%<latexrelease>            ####1 \tl_to_str:n { macro: } ####2 -> ####3 \s_@@_mark
+%<latexrelease>          {
+%<latexrelease>            ####1 \def \kerneltmpDoNotUse ####2
+%<latexrelease>              {
+%<latexrelease>                \str_if_eq:nnT {#3} { before }
+%<latexrelease>                  { \token_to_str:N \UseHook { cmd / #2 / #3 } }
+%<latexrelease>                ####3
+%<latexrelease>                \str_if_eq:nnT {#3} { after }
+%<latexrelease>                  { \token_to_str:N \UseHook { cmd / #2 / #3 } }
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>        \tl_set:Nx \exp_not:N \l_@@_tmpa_tl
+%<latexrelease>          { \exp_not:N \@@_tmp:w \token_to_meaning:N #1 \s_@@_mark }
+%<latexrelease>      }
+%<latexrelease>    \tl_rescan:nV { #4 \@@_patch_required_catcodes: } \l_@@_tmpa_tl
+%<latexrelease>    \cs_gset_eq:NN #1 \kerneltmpDoNotUse
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/macros/latex-dev/base/ltfilehook-code.pdf b/macros/latex-dev/base/ltfilehook-code.pdf
index c0f1ed5dbe..f8d5cc6817 100644
--- a/macros/latex-dev/base/ltfilehook-code.pdf
+++ b/macros/latex-dev/base/ltfilehook-code.pdf
diff --git a/macros/latex-dev/base/ltfilehook-doc.pdf b/macros/latex-dev/base/ltfilehook-doc.pdf
index c24b2321a9..f1006dec78 100644
--- a/macros/latex-dev/base/ltfilehook-doc.pdf
+++ b/macros/latex-dev/base/ltfilehook-doc.pdf
diff --git a/macros/latex-dev/base/ltfilehook.dtx b/macros/latex-dev/base/ltfilehook.dtx
index d43ffc857d..e10a5416e5 100644
--- a/macros/latex-dev/base/ltfilehook.dtx
+++ b/macros/latex-dev/base/ltfilehook.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 2020-2023
-%     Frank Mittelbach, Phelype Oleinik & LaTeX Team
+%     Frank Mittelbach, Phelype Oleinik and The LaTeX Project
 %
 % This file is part of the LaTeX base system.
 % -------------------------------------------
@@ -31,8 +31,8 @@
 %%% From File: ltfilehook.dtx
 %
 %    \begin{macrocode}
-\providecommand\ltfilehookversion{v1.0n}
-\providecommand\ltfilehookdate{2022/08/18}
+\providecommand\ltfilehookversion{v1.0o}
+\providecommand\ltfilehookdate{2023/04/02}
 %    \end{macrocode}
 %
 %<*driver>
@@ -1229,8 +1229,10 @@
 %   This auxiliary compares \cs{\meta{filename}} with
 %   \cs{csname\cs{endcsname}} to check if the empty |.tex| file was
 %   requested.
+%   \changes{v1.0o}{2023/04/02}
+%           {Make \cs{@set@curr@file@aux} \cs{long} gh/942}
 %    \begin{macrocode}
-\def\@set@curr@file@aux#1{%
+\long\def\@set@curr@file@aux#1{%
   \expandafter\ifx\csname\endcsname#1%
     .tex\else\string#1\fi}
 %    \end{macrocode}
diff --git a/macros/latex-dev/base/ltfiles.dtx b/macros/latex-dev/base/ltfiles.dtx
index 042565299a..3bac7ea0b2 100644
--- a/macros/latex-dev/base/ltfiles.dtx
+++ b/macros/latex-dev/base/ltfiles.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfiles.dtx}
-             [2023/01/05 v1.2s LaTeX Kernel (File Handling)]
+             [2023/05/17 v1.2t LaTeX Kernel (File Handling)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfiles.dtx}
@@ -1202,6 +1202,9 @@
 % \changes{v1.0t}{1995/05/25}{(CAR) added \cs{long}}
 % \changes{v1.2d}{2019/10/26}{quote on openin}
 % \changes{v1.2k}{2021/03/12}{Allow unbalanced conditionals (gh/530)}
+% \changes{v1.2t}{2023/05/15}{Use \pkg{expl3} file existence test}
+% \begin{macro}{\IfFileExists@}
+% \changes{v1.2t}{2023/05/15}{Macro added}
 % Argument |#1| is |\@curr@file| so catcode 12 string with no quotes.
 %
 %    The original definition picked up arguments |#2| and |#3| in a
@@ -1211,23 +1214,35 @@
 %    \cs{secondoftwo}. However, that changes how |#| is interpreted
 %    and so we can't do that nowaways without invalidating a lot of
 %    code. Therefore the somewhat curious construction near the end.
+%
+%    Earlier versions used |\openin| here, but this led to two
+%    code paths, one in \pkg{expl3} and one here. To avoid that,
+%    and as the \pkg{expl3} approach works by expansion, we use
+%    that here. As we need the file name to include the path,
+%    the actual \pkg{expl3} function used is not the file existence
+%    test!
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2021/06/01}%
-%<latexrelease>                 {\IfFileExists@}{manage unbalanced conditionals}
+%<latexrelease>\IncludeInRelease{2023/05/01}%
+%<latexrelease>                 {\IfFileExists@}{IfFileExists}
 \long\def \IfFileExists@#1#2#3{%
-  \openin\@inputcheck"#1" %
-  \ifeof\@inputcheck
-    \ifx\input@path\@undefined
-      \let\reserved@a\@secondoftwo
+  \edef\@filef@und{\IfFileExists@@{#1}}%
+%    \end{macrocode}
+%    The \pkg{expl3} function regards an empty argument as nothing at all,
+%    but the \LaTeXe{} convention is that this is equal to the special
+%    \texttt{.tex} file.
+%    \begin{macrocode}
+  \ifx\@filef@und\@empty
+    \if\relax\detokenize{#1}\relax
+      \let\reserved@a\@firstoftwo
+      \def\@filef@und{".tex" }%
     \else
-      \def\reserved@a{\@iffileonpath{#1}}%
+      \let\reserved@a\@secondoftwo
     \fi
   \else
-    \closein\@inputcheck
-    \edef\@filef@und{"#1" }%
     \let\reserved@a\@firstoftwo
+    \edef\@filef@und{"\@filef@und" }%
   \fi
 %    \end{macrocode}
 %    This is just there so that any |#| inside |#2| or |#3| needs
@@ -1236,10 +1251,35 @@
   \expandafter\def\expandafter\reserved@a
     \expandafter{\reserved@a{#2}{#3}}%
 \reserved@a}
+\ExplSyntaxOn
+\cs_new_eq:NN \IfFileExists@@ \file_full_name:n
+\ExplSyntaxOff
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>                 {\IfFileExists@}{IfFileExists}
+%<latexrelease>
+%<latexrelease>\long\def \IfFileExists@#1#2#3{%
+%<latexrelease>  \openin\@inputcheck"#1" %
+%<latexrelease>  \ifeof\@inputcheck
+%<latexrelease>    \ifx\input@path\@undefined
+%<latexrelease>      \let\reserved@a\@secondoftwo
+%<latexrelease>    \else
+%<latexrelease>      \def\reserved@a{\@iffileonpath{#1}}%
+%<latexrelease>    \fi
+%<latexrelease>  \else
+%<latexrelease>    \closein\@inputcheck
+%<latexrelease>    \edef\@filef@und{"#1" }%
+%<latexrelease>    \let\reserved@a\@firstoftwo
+%<latexrelease>  \fi
+%<latexrelease>  \expandafter\def\expandafter\reserved@a
+%<latexrelease>    \expandafter{\reserved@a{#2}{#3}}%
+%<latexrelease>\reserved@a}
+%<latexrelease>\let\IfFileExists@@\@undefined
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
 %<latexrelease>\IncludeInRelease{2019/10/01}%
-%<latexrelease>                 {\IfFileExists@}{manage unbalanced conditionals}
+%<latexrelease>                 {\IfFileExists@}{IfFileExists}
 %<latexrelease>
 %<latexrelease>\long\def \IfFileExists@#1#2#3{%
 %<latexrelease>  \openin\@inputcheck"#1" %
@@ -1257,7 +1297,7 @@
 %<latexrelease>  \reserved@a}
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {\IfFileExists@}{manage unbalanced conditionals}
+%<latexrelease>                 {\IfFileExists@}{IfFileExists}
 %<latexrelease>
 %<latexrelease>\let\IfFileExists@\@undefined
 %<latexrelease>
@@ -1266,7 +1306,7 @@
 %<*2ekernel>
 %    \end{macrocode}
 %  \end{macro}
-%
+%  \end{macro}
 %
 %
 %
diff --git a/macros/latex-dev/base/ltfinal.dtx b/macros/latex-dev/base/ltfinal.dtx
index 9fa6bbc856..1e39e293e0 100644
--- a/macros/latex-dev/base/ltfinal.dtx
+++ b/macros/latex-dev/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2022/11/30 v2.2y LaTeX Kernel (Final Settings)]
+             [2023/04/20 v2.3b LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -1062,6 +1062,24 @@
 \fi % End of reset block for 8-bit engines
 %    \end{macrocode}
 %
+% \begin{macro}{\BCPdata}
+% \changes{v2.3a}{2023/04/16}{Command added}
+%   A stub for use by \pkg{babel}, \pkg{polyglossia}, etc.
+%    \begin{macrocode}
+\ExplSyntaxOn
+\newcommand*\BCPdata[1]{
+  \str_case:nn {#1}
+    {
+      { language } { en }
+      { region }   { US }
+      { script }   { Latn }
+      { tag }      { en-US }
+    }
+}
+\ExplSyntaxOff
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\MakeUppercase}
 % \begin{macro}{\MakeLowercase}
 % \begin{macro}{\MakeTitlecase}
@@ -1069,6 +1087,9 @@
 % \begin{macro}{\AddToNoCaseChangeList}
 % \begin{macro}{\CaseSwitch}
 % \begin{macro}{\DeclareCaseChangeEquivalent}
+% \begin{macro}{\DeclareLowercaseMapping}
+% \begin{macro}{\DeclareTitlecaseMapping}
+% \begin{macro}{\DeclareUppercaseMapping}
 % \begin{macro}{\@uclclist}
 %
 %
@@ -1088,6 +1109,7 @@
 % \changes{v2.2x}{2022/10/26}{Introduce optional argument for case-changing commands}
 % \changes{v2.2x}{2022/10/26}{Make case changing commands language-aware}
 % \changes{v2.2x}{2022/10/26}{Auto-detect \pkg{babel} locale}
+% \changes{v2.3a}{2023/04/11}{Use new generic mechanism to detect locale}
 % Wrappers around the L3 case changing functions.
 % |\protected| to make them mostly safe as replacements for |uppercase|
 % and |\lowercase|.  
@@ -1121,33 +1143,24 @@
   {
     \cs_set_nopar:Npn \reserved@a { }
     \tl_if_blank:nTF {#2}
-      { \@@text@case@aux@ }
-      { \keys_set:nn { __kernel } {#2} }
-    \use:c { text_ #1 case:Vn } \reserved@a {#3}
-  }
-\cs_new_protected:Npn \@@text@case@aux@ { }
-\tl_gput_right:Nn \@kernel@after@begindocument
-  {
-    \@ifpackageloaded { babel }
       {
-        \@ifpackagelater { babel } { 2020-01-15 }
+        \str_set:Nx \reserved@a
+          { \BCPdata { casing } }
+        \str_if_empty:NT \reserved@a
           {
-            \cs_gset_protected:Npn \@@text@case@aux@
-              {
-                \str_set:Nx \reserved@a
-                  { \localeinfo* { tag.bcp47 } }
-              }
+            \str_set:Nx \reserved@a
+              { \BCPdata { language } }
           }
-          { }
       }
-      { }
+      { \keys_set:nn { __kernel } {#2} }
+    \use:c { text_ #1 case:Vn } \reserved@a {#3}
   }
-\exp_args_generate:n { cnx }
 %    \end{macrocode}
 % The odd use of \emph{three} spaces here is needed as \pkg{ltcmd} uses the
 % name with one and two spaces to give a `friendly' error message for a runaway
 % argument: that means we can't use it here.
 %    \begin{macrocode}
+\exp_args_generate:n { cnx }
 \cs_set_protected:Npn \reserved@a #1
   {
     \cs_generate_variant:cn { text_ \str_lowercase:n {#1} case:nn } { V }
@@ -1161,36 +1174,33 @@
 \reserved@a { Title }
 %    \end{macrocode}
 % \changes{v2.2y}{2022/11/30}{Set \cs{oe}/\cs{OE} equal to act as a marker for \pkg{babel}}
+% \changes{v2.2z}{2023/03/28}{Use groups for gh/1021}
 % Currently, \pkg{babel} uses the equivalence of \cs{oe} and \cs{OE} to force casing of
 % some material, most notably in \cs{today}. To enable that to work, we have to set those
 % commands equal even though the current case changing code does not work using this
 % approach.
 %    \begin{macrocode}
 \cs_new_protected:cpn { MakeLowercase \c_space_tl \c_space_tl \c_space_tl } [#1] #2
-  {
-    \let \kernel@saved@OE \OE
+  {{
     \let \OE \oe
     \@@text@case@aux { lower } {#1} {#2}
-    \let \OE \kernel@saved@OE
-  }
+  }}
 \cs_new_protected:cpn { MakeUppercase \c_space_tl \c_space_tl \c_space_tl } [#1] #2
-  {
-    \let \kernel@saved@oe \oe
+  {{
     \let \oe \OE
     \@@text@case@aux { upper } {#1} {#2}
-    \let \oe \kernel@saved@oe
-  }
+  }}
 \cs_new_protected:cpn { MakeTitlecase \c_space_tl \c_space_tl \c_space_tl } [#1] #2
-  {
-    \let \kernel@saved@oe \oe
+  {{
     \let \oe \OE
     \@@text@case@aux { title } {#1} {#2}
-    \let \oe \kernel@saved@oe
-  }
+  }}
 %    \end{macrocode}
 %
 % \changes{v2.2u}{2022/06/02}{Add \cs{NoCaseChange}}
 % \changes{v2.2u}{2022/06/30}{Add \cs{AddToNoCaseChangeList}}
+% \changes{v2.3b}{2023/04/19}{Add \cs{DeclareLowercaseMapping},
+%   \cs{DeclareTitlecaseMapping} and \cs{DeclareUppercaseMapping}}
 % |\NoCaseChange| protects its argument from the case change functions.
 %
 % |\AddToNoCaseChangeList| Allows new commands to protect their arguments, eg
@@ -1204,6 +1214,27 @@
 \cs_new_eq:NN \CaseSwitch \text_case_switch:nnnn
 \cs_new_eq:NN \DeclareCaseChangeEquivalent
   \text_declare_case_equivalent:Nn
+\NewDocumentCommand \DeclareLowercaseMapping { o m m }
+  {
+    \IFNoValueTF {#1}
+      { \text_declare_lowercase_mapping:nn }
+      { \text_declare_lowercase_mapping:nnn {#1} }
+        {#2} {#3}
+  }
+\NewDocumentCommand \DeclareTitlecaseMapping { o m m }
+  {
+    \IFNoValueTF {#1}
+      { \text_declare_titlecase_mapping:nn }
+      { \text_declare_titlecase_mapping:nnn {#1} }
+        {#2} {#3}
+  }
+\NewDocumentCommand \DeclareUppercaseMapping { o m m }
+  {
+    \IFNoValueTF {#1}
+      { \text_declare_uppercase_mapping:nn }
+      { \text_declare_uppercase_mapping:nnn {#1} }
+        {#2} {#3}
+  }
 \ExplSyntaxOff
 %    \end{macrocode}
 %
@@ -1222,6 +1253,9 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \changes{v1.0h}{1994/05/13}{Added output enc stuff}
 % \changes{v1.0i}{1994/05/16}{moved output enc stuff to lfonts}
diff --git a/macros/latex-dev/base/ltfssbas.dtx b/macros/latex-dev/base/ltfssbas.dtx
index 019fca9aba..fda3d1ca4b 100644
--- a/macros/latex-dev/base/ltfssbas.dtx
+++ b/macros/latex-dev/base/ltfssbas.dtx
@@ -35,7 +35,7 @@
 %
 %
 \ProvidesFile{ltfssbas.dtx}
-             [2022/07/04 v3.2k LaTeX Kernel (NFSS Basic Macros)]
+             [2023/04/01 v3.2l LaTeX Kernel (NFSS Basic Macros)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -1050,11 +1050,22 @@
 %      {\cs{def} $\to$ \cs{edef} for \cs{math@version}.}
 % \changes{v1.2g}{1990/02/16}{\cs{@nomath} added.}
 % \changes{v2.1a}{1994/01/17}{New math font setup}
+% \changes{v3.2l}{2023/04/01}{Reset frozen mathversion gh/1028}
 %    \begin{macrocode}
 \DeclareRobustCommand\mathversion[1]
          {\@nomath\mathversion
           \expandafter\ifx\csname mv@#1\endcsname\relax
           \@latex@error{Math version `#1' is not defined}\@eha\else
+%    \end{macrocode}
+%  If there has been a frozen math version reset locally. See GH 1028.
+%    \begin{macrocode}
+          \ifcsname mv@\math@version @frozen\endcsname
+            \expandafter\let
+            \csname mv@\math@version @frozen\expandafter\endcsname
+            \csname mv@\math@version\endcsname
+          \fi
+%    \end{macrocode}
+%    \begin{macrocode}
           \edef\math@version{#1}%
 %    \end{macrocode}
 %    We need to force a math font setup both now and at the point
diff --git a/macros/latex-dev/base/lthooks-code.pdf b/macros/latex-dev/base/lthooks-code.pdf
index d2bd8ee0a1..eb59fc8bbc 100644
--- a/macros/latex-dev/base/lthooks-code.pdf
+++ b/macros/latex-dev/base/lthooks-code.pdf
diff --git a/macros/latex-dev/base/lthooks-doc.pdf b/macros/latex-dev/base/lthooks-doc.pdf
index e9954e43f7..4c07148e48 100644
--- a/macros/latex-dev/base/lthooks-doc.pdf
+++ b/macros/latex-dev/base/lthooks-doc.pdf
diff --git a/macros/latex-dev/base/lthooks.dtx b/macros/latex-dev/base/lthooks.dtx
index 1255c63a8c..c0efe2c903 100644
--- a/macros/latex-dev/base/lthooks.dtx
+++ b/macros/latex-dev/base/lthooks.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 2020-2023
-%       Frank Mittelbach, Phelype Oleinik & LaTeX Team
+%       Frank Mittelbach, Phelype Oleinik, The LaTeX Project
 %
 % This file is part of the LaTeX base system.
 % -------------------------------------------
@@ -31,8 +31,8 @@
 %%% From File: lthooks.dtx
 %
 %    \begin{macrocode}
-\def\lthooksversion{v1.0v}
-\def\lthooksdate{2022/06/15}
+\def\lthooksversion{v1.1d}
+\def\lthooksdate{2023/05/21}
 %    \end{macrocode}
 %
 %<*driver>
@@ -148,7 +148,6 @@
 %    the current package name. See section~\ref{sec:default-label}.
 % \end{function}
 %
-%
 % \begin{function}{\NewMirroredHookPair}
 %   \begin{syntax}
 %     \cs{NewMirroredHookPair} \Arg{hook-1} \Arg{hook-2}
@@ -156,7 +155,45 @@
 %     A shorthand for
 %    \cs{NewHook}\Arg{hook-1}\cs{NewReversedHook}\Arg{hook-2}.
 %
-%    The \meta{hooks} can be specified using the dot-syntax to denote
+%    The \meta{hook} can be specified using the dot-syntax to denote
+%    the current package name. See section~\ref{sec:default-label}.
+% \end{function}
+%
+%
+% \begin{function}{\NewHookWithArguments}
+%   \begin{syntax}
+%     \cs{NewHookWithArguments} \Arg{hook} \Arg{number}
+%   \end{syntax}
+%   Creates a new \meta{hook} whose code takes \meta{number} arguments,
+%   and otherwise works exactly like \cs{NewHook}.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
+%
+%    The \meta{hook} can be specified using the dot-syntax to denote
+%    the current package name. See section~\ref{sec:default-label}.
+% \end{function}
+%
+% \begin{function}{\NewReversedHookWithArguments}
+%   \begin{syntax}
+%     \cs{NewReversedHookWithArguments} \Arg{hook} \Arg{number}
+%   \end{syntax}
+%   Like \cs{NewReversedHook}, but creates a hook whose code takes
+%   \meta{number} arguments.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
+%
+%    The \meta{hook} can be specified using the dot-syntax to denote
+%    the current package name. See section~\ref{sec:default-label}.
+% \end{function}
+%
+% \begin{function}{\NewMirroredHookPairWithArguments}
+%   \begin{syntax}
+%     \cs{NewMirroredHookPairWithArguments} \Arg{hook-1} \Arg{hook-2} \Arg{number}
+%   \end{syntax}
+%   A shorthand for
+%   \cs{NewHookWithArguments}\Arg{hook-1}\Arg{number}\\
+%   \cs{NewReversedHookWithArguments}\Arg{hook-2}\Arg{number}.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
+%
+%    The \meta{hook} can be specified using the dot-syntax to denote
 %    the current package name. See section~\ref{sec:default-label}.
 % \end{function}
 %
@@ -173,9 +210,9 @@
 %   \begin{syntax}
 %     \cs{DisableGenericHook} \Arg{hook}
 %   \end{syntax}
-%    After this declaration\footnotemark{} the \meta{hook} is no longer usable: Any
-%    attempt to add further code to it will result in an error and any
-%    use, e.g., via \cs{UseHook}, will simply do nothing.
+%    After this declaration\footnotemark{} the \meta{hook} is no longer
+%    usable: Any further attempt to add code to it will result in an
+%    error and any use, e.g., via \cs{UseHook}, will simply do nothing.
 %
 %    This is intended to be used with generic command hooks (see
 %    \texttt{ltcmdhooks-doc}) as depending on the definition of the
@@ -215,7 +252,7 @@
 %   \begin{syntax}
 %     \cs{UseHook} \Arg{hook}
 %   \end{syntax}
-%    Execute the hook code inside a command or environment.
+%    Execute the code stored in the \meta{hook}.
 %
 %    Before \verb=\begin{document}= the fast execution code for a hook
 %    is not set up, so in order to use a hook there it is explicitly
@@ -227,14 +264,30 @@
 %    A leading |.| is treated literally.
 % \end{function}
 %
+% \begin{function}{\UseHookWithArguments}
+%   \begin{syntax}
+%     \cs{UseHookWithArguments} \Arg{hook} \Arg{number} \Arg{arg_1} \ldots \Arg{arg_n}
+%   \end{syntax}
+%    Execute the code stored in the \meta{hook} and pass the arguments
+%    \Arg{arg_1} through \Arg{arg_n} to the \meta{hook}.  Otherwise, it
+%    works exactly like \cs{UseHook}.
+%    The \meta{number} should be the number of arguments declared for
+%    the hook.  If the hook is not declared, this command does nothing
+%    and it will remove \meta{number} items from the input.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
+%
+%    The \meta{hook} \emph{cannot} be specified using the dot-syntax.
+%    A leading |.| is treated literally.
+% \end{function}
+%
 % \begin{function}{\UseOneTimeHook}
 %   \begin{syntax}
 %     \cs{UseOneTimeHook} \Arg{hook}
 %   \end{syntax}
 %    Some hooks are only used (and can be only used) in one place, for
 %    example, those in \verb=\begin{document}= or
-%    \verb=\end{document}=. Once we have passed that point adding to
-%    the hook through a defined \cs[no-index]{\meta{addto-cmd}} command (e.g.,
+%    \verb=\end{document}=. From that point onwards, adding to the hook
+%    through a defined \cs[no-index]{\meta{addto-cmd}} command (e.g.,
 %    \cs{AddToHook} or \cs{AtBeginDocument}, etc.\@) would have no
 %    effect (as would the use of such a command inside the hook code
 %    itself). It is therefore customary to redefine
@@ -250,15 +303,30 @@
 %    section~\ref{sec:default-label} for details.
 %
 %    Using \cs{UseOneTimeHook} several times with the same
-%    \Arg{hook} means that it only executes the first time it is used. 
+%    \Arg{hook} means that it only executes the first time it is used.
 %    For example, if it is used in a command that can be called several times
-%    then the hook executes during only the \emph{first} invocation of that 
+%    then the hook executes during only the \emph{first} invocation of that
 %    command; this allows its use as an \enquote{initialization hook}.
 %
 %    Mixing \cs{UseHook} and \cs{UseOneTimeHook} for the same
 %    \Arg{hook} should be avoided, but if this is done then neither will execute
 %    after the first \cs{UseOneTimeHook}.
+% \end{function}
 %
+% \begin{function}{\UseOneTimeHookWithArguments}
+%   \begin{syntax}
+%     \cs{UseOneTimeHookWithArguments} \Arg{hook} \Arg{number} \Arg{arg_1} \ldots \Arg{arg_n}
+%   \end{syntax}
+%    Works exactly like \cs{UseOneTimeHook}, but passes arguments
+%    \Arg{arg_1} through \Arg{arg_n} to the \meta{hook}.
+%    The \meta{number} should be the number of arguments declared for
+%    the hook.  If the hook is not declared, this command does nothing
+%    and it will remove \meta{number} items from the input.
+%
+%    It should be noted that after a one-time hook is used, it is no
+%    longer possible to use \cs{AddToHookWithArguments} or similar with
+%    that hook.  \cs{AddToHook} continues to work as normal.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
 % \end{function}
 %
 %
@@ -294,6 +362,34 @@
 %    See section~\ref{sec:default-label}.
 % \end{function}
 %
+% \begin{function}{\AddToHookWithArguments}
+%   \begin{syntax}
+%     \cs{AddToHookWithArguments} \Arg{hook}\oarg{label}\Arg{code}
+%   \end{syntax}
+%    Works exactly like \cs{AddToHook}, except that the \meta{code} can
+%    access the arguments passed to the hook using \verb|#1|, \verb|#2|,
+%    \ldots, \verb|#n| (up to the number of arguments declared for the
+%    hook).  If the \meta{code} should contain \emph{parameter tokens}
+%    (\verb|#|) that are not supposed to be understood as the arguments
+%    of the hook, such tokens should be doubled.  For example, with
+%    \cs{AddToHook} one can write:
+%\begin{verbatim}
+%   \AddToHook{myhook}{\def\foo#1{Hello, #1!}}
+%\end{verbatim}
+%    but to achieve the same with \cs{AddToHookWithArguments}, one should
+%    write:
+%\begin{verbatim}
+%   \AddToHookWithArguments{myhook}{\def\foo##1{Hello, ##1!}}
+%\end{verbatim}
+%    because in the latter case, \verb|#1| refers to the first argument
+%    of the hook \hook{myhook}.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
+%
+%    The \meta{hook} and \meta{label} can be specified using the
+%    dot-syntax to denote the current package name.
+%    See section~\ref{sec:default-label}.
+% \end{function}
+%
 % \begin{function}{\RemoveFromHook}
 %   \begin{syntax}
 %     \cs{RemoveFromHook} \Arg{hook}\oarg{label}
@@ -403,6 +499,19 @@
 % \end{function}\footnotetext{There is
 %    no mechanism to reorder such code chunks (or delete them).}
 %
+% \begin{function}{\AddToHookNextWithArguments}
+%   \begin{syntax}
+%     \cs{AddToHookNextWithArguments} \Arg{hook}\Arg{code}
+%   \end{syntax}
+%    Works exactly like \cs{AddToHookNext}, but the \meta{code} can
+%    contain references to the arguments of the \meta{hook} as described
+%    for \cs{AddToHookWithArguments} above.
+%   Section~\ref{sec:hook-args} explains hooks with arguments.
+%
+%    The \meta{hook} can be specified using the dot-syntax to denote
+%    the current package name.  See section~\ref{sec:default-label}.
+% \end{function}
+%
 %
 %
 % \begin{function}{\ClearHookNext}
@@ -511,10 +620,10 @@
 % package's hooks, so the dot-syntax doesn't make much sense.
 %
 % In some cases, for example in large packages, one may want to separate
-% it in logical parts, but still use the main package name as
+% the code in logical parts, but still use the main package name as the
 % \meta{label}, then the \meta{default label} can be set using
-% \cs{SetDefaultHookLabel} or
-% \cs{PushDefaultHookLabel}\verb={..}=\,\ldots\cs{PopDefaultHookLabel}.
+% \cs{PushDefaultHookLabel}\verb={...}=\,\ldots\cs{PopDefaultHookLabel}
+% or \cs{SetDefaultHookLabel}\verb={...}=.
 %
 % \begin{function}{\PushDefaultHookLabel,\PopDefaultHookLabel}
 %   \begin{syntax}
@@ -906,8 +1015,11 @@
 % section even in \texttt{expl3} packages, but the choice is yours.
 %
 %
-% \begin{function}
-%   {\hook_new:n,\hook_new_reversed:n,\hook_new_pair:nn}
+% \begin{function}{
+%     \hook_new:n,
+%     \hook_new_reversed:n,
+%     \hook_new_pair:nn
+%   }
 %   \begin{syntax}
 %     \cs{hook_new:n} \Arg{hook}
 %     \cs{hook_new_reversed:n} \Arg{hook}
@@ -923,6 +1035,27 @@
 %    the current package name. See section~\ref{sec:default-label}.
 % \end{function}
 %
+% \begin{function}{
+%     \hook_new_with_args:nn,
+%     \hook_new_reversed_with_args:nn,
+%     \hook_new_pair_with_args:nnn
+%   }
+%   \begin{syntax}
+%     \cs{hook_new_with_args:nn} \Arg{hook} \Arg{number}
+%     \cs{hook_new_reversed_with_args:nn} \Arg{hook} \Arg{number}
+%     \cs{hook_new_pair_with_args:nnn} \Arg{hook-1} \Arg{hook-2} \Arg{number}
+%   \end{syntax}
+%   Creates a new \meta{hook} with normal or reverse ordering of code
+%    chunks, that takes \meta{number} arguments from the input stream
+%    when it is used. \cs{hook_new_pair_with_args:nn} creates a pair of
+%    such hooks with \Arg{hook-2} being a reversed hook.
+%    If a hook name is already taken, an error is raised and the hook
+%    is not created.
+%
+%    The \meta{hook} can be specified using the dot-syntax to denote
+%    the current package name. See section~\ref{sec:default-label}.
+% \end{function}
+%
 %
 %
 % \begin{function}{\hook_disable_generic:n}
@@ -958,37 +1091,62 @@
 %
 %
 %
-% \begin{function}{\hook_use:n}
+% \begin{function}{\hook_use:n,\hook_use:nnw}
 %   \begin{syntax}
 %     \cs{hook_use:n} \Arg{hook}
+%     \cs{hook_use:nnw} \Arg{hook} \Arg{number} \Arg{arg_1} \ldots \Arg{arg_n}
 %   \end{syntax}
 %    Executes the \Arg{hook} code followed (if set up) by the code for next
 %    invocation only, then empties that next invocation code.
+%    \cs{hook_use:nnw} should be used for hooks declared with arguments,
+%    and should be followed by as many brace groups as the declared
+%    number of arguments.
+%    The \meta{number} should be the number of arguments declared for
+%    the hook.  If the hook is not declared, this command does nothing
+%    and it will remove \meta{number} items from the input.
 %
 %    The \meta{hook} \emph{cannot} be specified using the dot-syntax.
 %    A leading |.| is treated literally.
 % \end{function}
 %
-% \begin{function}{\hook_use_once:n}
+% \begin{function}{\hook_use_once:n,\hook_use_once:nnw}
 %   \begin{syntax}
 %     \cs{hook_use_once:n} \Arg{hook}
+%     \cs{hook_use_once:nnw} \Arg{hook} \Arg{number} \Arg{arg_1} \ldots \Arg{arg_n}
 %   \end{syntax}
 %     Changes the \Arg{hook} status so that from now on any addition to
 %     the hook code is executed immediately. Then execute any
 %     \Arg{hook} code already set up.
+%    \cs{hook_use_once:nnw} should be used for hooks declared with arguments,
+%    and should be followed by as many brace groups as the declared
+%    number of arguments.
+%    The \meta{number} should be the number of arguments declared for
+%    the hook.  If the hook is not declared, this command does nothing
+%    and it will remove \meta{number} items from the input.
 %
 %    The \meta{hook} \emph{cannot} be specified using the dot-syntax.
 %    A leading |.| is treated literally.
 % \end{function}
 %
-% \begin{function}{\hook_gput_code:nnn}
+% \begin{function}{
+%     \hook_gput_code:nnn,
+%     \hook_gput_code_with_args:nnn
+%   }
 %   \begin{syntax}
 %     \cs{hook_gput_code:nnn} \Arg{hook} \Arg{label} \Arg{code}
+%     \cs{hook_gput_code_with_args:nnn} \Arg{hook} \Arg{label} \Arg{code}
 %   \end{syntax}
 %    Adds a chunk of \meta{code} to the \meta{hook} labeled
 %    \meta{label}. If the label already exists the \meta{code} is
 %    appended to the already existing code.
 %
+%    If \cs{hook_gput_code_with_args:nnn} is used, the \meta{code}
+%    can access the arguments passed to \cs{hook_use:nnw}
+%    (or~\cs{hook_use_once:nnw}) with \verb|#1|, \verb|#2|, \ldots,
+%    \verb|#n| (up to the number of arguments declared for the hook).
+%    In that case, if an actual parameter token should be added to the
+%    code, it should be doubled.
+%
 %    If code is added to an external \meta{hook} (of the kernel or
 %    another package) then the convention is to use the package name
 %    as the \meta{label} not some internal module name or some other
@@ -999,18 +1157,26 @@
 %    See section~\ref{sec:default-label}.
 % \end{function}
 %
-% \begin{function}
-%   {\hook_gput_next_code:nn}
+% \begin{function}{
+%     \hook_gput_next_code:nn,
+%     \hook_gput_next_code_with_args:nn,
+%   }
 %   \begin{syntax}
 %     \cs{hook_gput_next_code:nn} \Arg{hook} \Arg{code}
 %   \end{syntax}
 %    Adds a chunk of \meta{code} for use only in the next invocation of the
 %    \meta{hook}. Once used it is gone.
 %
+%    If \cs{hook_gput_next_code_with_args:nn} is used, the \meta{code}
+%    can access the arguments passed to \cs{hook_use:nnw}
+%    (or~\cs{hook_use_once:nnw}) with \verb|#1|, \verb|#2|, \ldots,
+%    \verb|#n| (up to the number of arguments declared for the hook).
+%    In that case, if an actual parameter token should be added to the
+%    code, it should be doubled.
+%
 %    This is simpler than \cs{hook_gput_code:nnn}, the code is simply
 %    appended to the hook in the order of declaration at the very end,
 %    i.e., after all standard code for the hook got executed.
-%
 %    Thus if one needs to undo what the standard does one has to do
 %    that as part of \meta{code}.
 %
@@ -1019,8 +1185,7 @@
 % \end{function}
 %
 %
-% \begin{function}
-%   {\hook_gclear_next_code:n}
+% \begin{function}{\hook_gclear_next_code:n}
 %   \begin{syntax}
 %     \cs{hook_gclear_next_code:n} \Arg{hook}
 %   \end{syntax}
@@ -1240,7 +1405,7 @@
 %    \begin{itshape}\begin{color}{blue} ...
 %    \end{itshape}\end{color}
 %\end{verbatim}
-%   and an error message that \verb=\begin{color}= ended by
+%    and an error message saying that \verb=\begin{color}= was ended by
 %    \verb=\end{itshape}=.
 %    With \hook{env/quote/after} declared as a reversed hook the
 %    execution order is reversed and so all environments are closed in
@@ -1377,9 +1542,9 @@
 %    you typically do not know what kind of variable parts may come up
 %    in real documents.
 %
-%    For example, \pkg{babel} may want to provide hooks such as
-%    \hook{babel/\meta{language}/afterextras}.  Language support in
-%    \pkg{babel} is often done through external language
+%    For example, \pkg{babel} provides hooks such as
+%    \hook{babel/\meta{language}/afterextras}.  However, language
+%    support in \pkg{babel} is often done through external language
 %    packages. Thus doing the activation for all languages inside the
 %    core \pkg{babel} code is not a viable approach. Instead it needs
 %    to be done by each language package (or by the user who wants to
@@ -1396,6 +1561,125 @@
 %    conciderably.
 %
 %
+% \subsection{Hooks with arguments}
+% \label{sec:hook-args}
+%
+%    Sometimes it is necessary to pass contextual information to a hook,
+%    and, for one reason or another, it is not feasible to store such
+%    information in macros.  To serve this purpose, hooks can be
+%    declared with arguments, so that the programmer can pass along the
+%    data necessary for the code in the hook to function properly.
+%
+%    A hook with arguments works mostly like a regular hook, and most
+%    commands that work for regular hooks, also work for hooks that take
+%    arguments.  The differences are when the hook is declared
+%    (\cs{NewHookWithArguments} is used instead of \cs{NewHook}), then
+%    code can be added with both \cs{AddToHook} and
+%    \cs{AddToHookWithArguments}, and when the hook is used
+%    (\cs{UseHookWithArguments} instead of \cs{UseHook}).
+%
+%    \medskip
+%
+%    A hook with arguments must be declared as such (before it is first
+%    used, as all regular hooks) using
+%    \cs{NewHookWithArguments}\Arg{hook}\Arg{number}.  All code added to
+%    that hook can then use \verb|#1| to access the first argument,
+%    \verb|#2| to access the second, and so forth up to the number of
+%    arguments declared.  However, it is still possible to add code with
+%    references to the arguments of a hook that was not yet declared
+%    (we will discuss that later).  At their core, hooks are macros, so
+%    \TeX's limit of 9~arguments applies, and a low-level \TeX{} error
+%    is raised if you try to reference an argument number that doesn't
+%    exist.
+%
+%    \medskip
+%
+%    To use a hook with arguments, just write
+%    \cs{UseHookWithArguments}\Arg{hook}\Arg{number} followed by a
+%    braced list of the arguments.  For example, if the hook \hook{test}
+%    takes three arguments, write:
+%\begin{verbatim}
+%    \UseHookWithArguments{test}{3}{arg-1}{arg-2}{arg-3}
+%\end{verbatim}
+%    then, in the \meta{code} of the hook, all instances of \verb|#1|
+%    will be replaced by \verb|arg-1|, \verb|#2| by \verb|arg-2| and so
+%    on.  If, at the point of usage, the programmer provides more
+%    arguments than the hook is declared to take, the excess arguments
+%    are simply ignored by the hook.  Behaviour is
+%    unpredictable\footnote
+%      {The hook \emph{will} take the declared number of arguments, and
+%       what will happen depends on what was grabbed, and what the hook
+%       code does with its arguments.}
+%    if too few arguments are provided.  If the hook isn't declared,
+%    \meta{number} arguments are removed from the input stream.
+%
+%    \medskip
+%
+%    Adding code to a hook with arguments can be done with
+%    \cs{AddToHookWithArguments} as well as with the regular
+%    \cs{AddToHook}, to achieve different outcomes.  The main difference
+%    when it comes to adding code to a hook, in this case, is firstly
+%    the possibility of accessing a hook's arguments, of course, and
+%    second, how parameter tokens (\verb|#|$_6$) are treated.
+%
+%    Using \cs{AddToHook} in a hook that takes arguments will work as it
+%    does for all other hooks. This allows a package developer to add
+%    arguments to a hook that otherwise had none without having to worry
+%    about compatibility.  This means that, for example:
+%\begin{verbatim}
+%    \AddToHook{test}{\def\foo#1{Hello, #1!}}
+%\end{verbatim}
+%    will define the same macro \cs[no-index]{foo} regardless if the
+%    hook \hook{test} takes arguments or not.
+%
+%    Using \cs{AddToHookWithArguments} allows the \meta{code} added to
+%    access the arguments of the hook with \verb|#1|, \verb|#2|, and so
+%    forth, up to the number of the arguments declared in the hook.
+%    This means that if one wants to add a \verb|#|$_6$ to the
+%    \meta{code} that token must be doubled in the input.  The same
+%    definition from above, using \cs{AddToHookWithArguments}, needs to
+%    be rewritten:
+%\begin{verbatim}
+%    \AddToHookWithArguments{test}{\def\foo##1{Hello, ##1!}}
+%\end{verbatim}
+%
+%    Extending the above example to use the hook arguments, we could
+%    rewrite something like (now from declaration to usage, to get the
+%    whole picture):
+%\begin{verbatim}
+%    \NewHookWithArguments{test}{1}
+%    \AddToHookWithArguments{test}{%
+%      \typeout{Defining foo with "#1"}
+%      \def\foo##1{Hello, ##1! Some text after: #1}%
+%    }
+%    \UseHook{test}{Howdy!}
+%    \ShowCommand\foo
+%\end{verbatim}
+%    Running the code above prints in the terminal:
+%\begin{verbatim}
+%    Defining foo with "Howdy!"
+%    > \foo=macro:
+%    #1->Hello, #1! Some text after: Howdy!.
+%\end{verbatim}
+%    Note how \verb|##1| in the call to \cs{AddToHookWithArguments}
+%    became \verb|#1|, and the \verb|#1| was replaced by the argument
+%    passed to the hook.  Should the hook be used again, with a
+%    different argument, the definition would naturally change.
+%
+%    \bigskip
+%
+%    It is possible to add code referencing a hook's arguments before
+%    such hook is declared and the number of hooks is fixed.  However,
+%    if some code is added to the hook, that references more arguments
+%    than will be declared for the hook, there will be a low-level
+%    \TeX{} error about an \enquote{Illegal parameter number} at the
+%    time the hook is declared, which will be hard to track down because
+%    at that point \TeX{} can't know whence the offending code came
+%    from.  Thus it is important that package writers explicitly
+%    document how many arguments (if any) each hook can take, so users
+%    of those packages know how many arguments can be referenced, and
+%    equally important, what each argument means.
+%
 % \subsection{Private \LaTeX{} kernel hooks}
 %
 %    There are a few places where it is absolutely essential for
@@ -1461,7 +1745,7 @@
 %    package/class name if called inside such a file
 %    (see section~\ref{sec:default-label}).
 %
-%    This way one can add further code to the hook using
+%    This way one can add code to the hook using
 %    \cs{AddToHook} or \cs{AtBeginDocument} using a different label
 %    and explicitly order the code chunks as necessary, e.g., run some
 %    code before or after another package's code.  When using the
@@ -1746,10 +2030,10 @@
 %
 % \subsection{Hooks provided by \cs{end}\texttt{\{document\}}}
 %
-%    \LaTeXe{} always provided \cs{AtEndDocument} to add code to the
-%    execution of \verb=\end{document}= just in front of the code that
+%    \LaTeXe{} has always provided \cs{AtEndDocument} to add code to the
+%    \verb=\end{document}=, just in front of the code that
 %    is normally executed there. While this was a big improvement over
-%    the situation in \LaTeX\,2.09 it was not flexible enough for a
+%    the situation in \LaTeX\,2.09, it was not flexible enough for a
 %    number of use cases and so packages, such as \pkg{etoolbox},
 %    \pkg{atveryend} and others patched \cs{enddocument} to add
 %    additional points where code could be hooked into.
@@ -2095,13 +2379,37 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[int]{\tl_gremove_once:Nx,\tl_show:x,\tl_log:x}
+% \begin{macro}{\c_@@_empty_tl}
+% \begin{macro}{\c_@@_nine_parameters_tl}
+%   An empty token list, and one containing nine parameters.
+% \changes{v1.1a}{2023/04/06}
+%         {Add auxiliary token lists (hook-args).}
+%    \begin{macrocode}
+\tl_const:Nn \c_@@_empty_tl { }
+\tl_const:Nn \c_@@_nine_parameters_tl { #1#2#3#4#5#6#7#8#9 }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}[int]{
+%     \tl_gremove_once:Nx,
+%     \tl_show:x,
+%     \tl_log:x,
+%     \tl_set:Ne,
+%     \cs_replacement_spec:c,
+%     \prop_put:Nne,
+%     \str_count:e
+%   }
 %   Some variants of \pkg{expl3} functions.
 %   \fmiinline{should probably be moved to expl3}
 %    \begin{macrocode}
 \cs_generate_variant:Nn \tl_gremove_once:Nn { Nx }
 \cs_generate_variant:Nn \tl_show:n { x }
 \cs_generate_variant:Nn \tl_log:n { x }
+\cs_generate_variant:Nn \tl_set:Nn { Ne }
+\cs_generate_variant:Nn \cs_replacement_spec:N { c }
+\cs_generate_variant:Nn \prop_put:Nnn { Nne }
+\cs_generate_variant:Nn \str_count:n { e }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2112,15 +2420,20 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_clean_to_scan:w}
+% \begin{macro}{
+%     \@@_use_none_delimit_by_s_mark:w,
+%     \@@_use_i_delimit_by_s_mark:nw
+%   }
 %   Removes tokens until the next \cs{s_@@_mark}.
+% \changes{v1.1a}{2023/04/06}
+%         {Use standard naming scheme (hook-args).}
 %    \begin{macrocode}
-\cs_new:Npn \@@_clean_to_scan:w #1 \s_@@_mark { }
+\cs_new:Npn \@@_use_none_delimit_by_s_mark:w #1 \s_@@_mark { }
+\cs_new:Npn \@@_use_i_delimit_by_s_mark:nw #1 #2 \s_@@_mark {#1}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_tl_set:Nn,\@@_tl_set:Nx,
-%               \@@_tl_set:cn,\@@_tl_set:cx}
+% \begin{macro}{\@@_tl_set:cn}
 %   Private copies of a few \pkg{expl3} functions.  \pkg{l3debug} will
 %   only add debugging to the public names, not to these copies, so we
 %   don't have to use \cs{debug_suspend:} and \cs{debug_resume:}
@@ -2130,44 +2443,43 @@
 %   copied because in \pkg{expl3} they use
 %   \cs[no-index]{__kernel_tl_(g)set:Nx}, which is also patched by
 %   \pkg{l3debug}.
-%   \changes{v1.0h}{2021/01/07}{Manually define some \pkg{l3tl} commands
+% \changes{v1.0h}{2021/01/07}{Manually define some \pkg{l3tl} commands
 %     to work around \pkg{expl3} changes}
+% \changes{v1.1a}{2023/04/06}
+%         {Clean-up unused variants (hook-args).}
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_tl_set:Nn #1#2
-  { \cs_set_nopar:Npx #1 { \__kernel_exp_not:w {#2} } }
-\cs_new_protected:Npn \@@_tl_set:Nx #1#2
-  { \cs_set_nopar:Npx #1 {#2} }
-\cs_generate_variant:Nn \@@_tl_set:Nn { c }
-\cs_generate_variant:Nn \@@_tl_set:Nx { c }
+\cs_new_protected:Npn \@@_tl_set:cn #1#2
+  { \cs_set_nopar:cpx {#1} { \__kernel_exp_not:w {#2} } }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_tl_gset:Nn,\@@_tl_gset:No,\@@_tl_gset:Nx,
+% \begin{macro}{\@@_tl_gset:Nn,\@@_tl_gset:Nx,
 %               \@@_tl_gset:cn,\@@_tl_gset:co,\@@_tl_gset:cx}
 %   Same as above.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_tl_gset:Nn #1#2
   { \cs_gset_nopar:Npx #1 { \__kernel_exp_not:w {#2} } }
-\cs_new_protected:Npn \@@_tl_gset:No #1#2
-  { \cs_gset_nopar:Npx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
 \cs_new_protected:Npn \@@_tl_gset:Nx #1#2
   { \cs_gset_nopar:Npx #1 {#2} }
-\cs_generate_variant:Nn \@@_tl_gset:Nn { c }
-\cs_generate_variant:Nn \@@_tl_gset:No { c }
+\cs_generate_variant:Nn \@@_tl_gset:Nn { c, co }
 \cs_generate_variant:Nn \@@_tl_gset:Nx { c }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_tl_gput_right:Nn,\@@_tl_gput_right:No,\@@_tl_gput_right:cn}
+% \begin{macro}{
+%     \@@_tl_gput_right:Nn,
+%     \@@_tl_gput_right:Ne,
+%     \@@_tl_gput_right:cn,
+%   }
 %   Same as above.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_tl_gput_right:Nn #1#2
   { \@@_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
-\cs_generate_variant:Nn \@@_tl_gput_right:Nn { No, cn }
+\cs_generate_variant:Nn \@@_tl_gput_right:Nn { Ne, cn }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_tl_gput_left:Nn,\@@_tl_gput_left:No}
+% \begin{macro}{\@@_tl_gput_left:Nn}
 %   Same as above.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_tl_gput_left:Nn #1#2
@@ -2175,7 +2487,6 @@
     \@@_tl_gset:Nx #1
       { \__kernel_exp_not:w {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
   }
-\cs_generate_variant:Nn \@@_tl_gput_left:Nn { No }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2202,7 +2513,11 @@
 %
 % \DescribeMacro{\g_@@_\meta{hook}_code_prop}
 % \DescribeMacro{\@@\textvisiblespace\meta{hook}}
+% \DescribeMacro{\g_@@_\meta{hook}_reversed_tl}
+% \DescribeMacro{\g_@@_\meta{hook}_declared_tl}
+% \DescribeMacro{\g_@@_\meta{hook}_parameter_tl}
 % \DescribeMacro{\@@_next\textvisiblespace\meta{hook}}
+% \DescribeMacro{\@@_toplevel\textvisiblespace\meta{hook}}
 %    Hooks have a name (called \meta{hook} in the description below)
 %    and for each hook we have to
 %    provide a number of data structures. These are
@@ -2232,12 +2547,17 @@
 %    so that it can be identified.  The |-| character is used because
 %    $\meta{reversed}1$ is $+1$ for normal hooks and $-1$ for reversed
 %    ones.
-
+%
 %    \item[{\cs[no-index]{g_@@_\meta{hook}_declared_tl}}] This token
-%    list serves as marker for the hook being officially declared. Its
+%    list serves as a marker for the hook being officially declared. Its
 %    existence is tested to raise an error in case another declaration
 %    is attempted.
 %
+%    \item[{\cs[no-index]{c_@@_\meta{hook}_parameter_tl}}] This token
+%    list stores the parameter text for a declared hook (its existence
+%    almost completely intersects the token list above), which is used
+%    for managing hooks with arguments.
+%
 %    \item[\cs{@@_toplevel\textvisiblespace\meta{hook}}] This token list stores the code
 %    inserted in the hook from the user's document, in the |top-level|
 %    label.  This label is special, and doesn't participate in sorting.
@@ -2367,45 +2687,92 @@
 % \subsubsection{Setting hooks up}
 %
 %
-%  \begin{macro}{\hook_new:n,\@@_new:n}
+%  \begin{macro}{
+%    \hook_new:n,
+%    \hook_new_with_args:nn
+%  }
+%  \begin{macro}{@@_new:nn}
 %    The \cs{hook_new:n} declaration declares a new hook and expects
 %    the hook \meta{name} as its argument, e.g.,
 %    \hook{begindocument}.
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_new_with_args:nn} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_new_with_args:nn}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \hook_new:n #1
-  { \@@_normalize_hook_args:Nn \@@_new:n {#1} }
+  { \@@_normalize_hook_args:Nn \@@_new:nn {#1} { 0 } }
+\cs_new_protected:Npn \hook_new_with_args:nn #1 #2
+  { \@@_normalize_hook_args:Nn \@@_new:nn {#1} {#2} }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_new:n #1
+\cs_new_protected:Npn \@@_new:nn #1 #2
   {
 %    \end{macrocode}
 %   We check if the hook was already \emph{explicitly} declared with
 %   \cs{hook_new:n}, and if it already exists we complain, otherwise set
 %   the \enquote{created} flag for the hook so that it errors next time
 %   \cs{hook_new:n} is used.
+% \changes{v1.1d}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
 %    \begin{macrocode}
     \@@_if_declared:nTF {#1}
       { \msg_error:nnn { hooks } { exists } {#1} }
       {
         \tl_new:c { g_@@_#1_declared_tl }
-        \@@_make_usable:n {#1}
+        \cs_undefine:c { @@~#1 }
+        \cs_undefine:c { c_@@_#1_parameter_tl }
+        \@@_make_usable:nn {#1} {#2}
+%    \end{macrocode}
+%   In case there is already code in a hook, but it's undeclared, run
+%   \cs{@@_update_hook_code:n} to make it ready to be executed (see test
+%   \texttt{lthooks-034}).
+% \changes{v1.1a}{2023/04/06}
+%         {Update hook code after declaring.}
+%    \begin{macrocode}
+        \@@_update_hook_code:n {#1}
       }
   }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_new_with_args:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \hook_new:n #1
+%<latexrelease>  { \@@_normalize_hook_args:Nn \@@_new:n {#1} }
+%<latexrelease>\cs_undefine:N \@@_new:nn
+%<latexrelease>\cs_gset_protected:Npn \@@_new:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_if_declared:nTF {#1}
+%<latexrelease>      { \msg_error:nnn { hooks } { exists } {#1} }
+%<latexrelease>      {
+%<latexrelease>        \tl_new:c { g_@@_#1_declared_tl }
+%<latexrelease>        \@@_make_usable:n {#1}
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\cs_gset_protected:Npn \hook_new_with_args:nn #1 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 %
 %
 %
-%  \begin{macro}{\@@_make_usable:n}
+%  \begin{macro}{\@@_make_usable:nn}
 %
 %    This initializes all hook data structures for the hook but if
 %    used on its own doesn't mark the hook as declared (as
 %    \cs{hook_new:n} does, so a later \cs{hook_new:n} on that hook will
 %    not result in an error.  This command is internally used by
-%    \cs{hook_gput_code:n} when adding code to a generic hook.
+%    \cs{hook_gput_code:nnn} when adding code to a generic hook.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_make_usable:n #1
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_make_usable:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_make_usable:nn #1 #2
   {
 %    \end{macrocode}
 %   Now we check if the hook's data structure can be safely created
@@ -2414,29 +2781,70 @@
 %   allocate the necessary data structures for the new hook,
 %   otherwise just do nothing.
 %    \begin{macrocode}
-    \tl_if_exist:cF { @@~#1 }
+    \@@_if_usable:nF {#1}
       {
         \seq_gput_right:Nn \g_@@_all_seq {#1}
 %    \end{macrocode}
+%    Here we'll define the \cs[no-index]{c_@@_\meta{hook}_parameter_tl}
+%    to hold a run of parameters up to the number of arguments of the
+%    hook (\verb|#2|).
+%    \begin{macrocode}
+        \__kernel_cs_parm_from_arg_count:nnF
+          { \tl_const:cn { c_@@_#1_parameter_tl } } {#2}
+          {
+            \msg_error:nnnn { hooks } { too-many-args } {#1} {#2}
+            \tl_const:cx { c_@@_#1_parameter_tl }
+              { \exp_not:V \c_@@_nine_parameters_tl }
+          }
+%    \end{macrocode}
+%    After that, use \cs{@@_normalise_cs_args:nn} to correct the number
+%    of parameters of the macros
+%    \cs[no-index]{@@_toplevel\textvisiblespace\meta{hook}} and
+%    \cs[no-index]{@@_next\textvisiblespace\meta{hook}}.  We need to be
+%    able to add
+%    code with arguments to a hook without prior knowledge of the number
+%    of arguments of that hook, so \pkg{lthooks} assumes~9 until the
+%    hook is properly declared and the number of arguments is known.
+%    \cs{@@_normalise_cs_args:nn} does the normalisation by using the
+%    \cs[no-index]{c_@@_\meta{hook}_parameter_tl} defined just above.
+%    \begin{macrocode}
+        \@@_normalise_cs_args:nn { _toplevel } {#1}
+        \@@_normalise_cs_args:nn { _next } {#1}
+%    \end{macrocode}
 %    This is only used by the actual code of the current hook, so
 %    declare it normally:
 %    \begin{macrocode}
-        \tl_new:c { @@~#1 }
+        \@@_code_gset:nn {#1} { }
 %    \end{macrocode}
 %    Now ensure that the base data structure for the hook exists:
 %    \begin{macrocode}
         \@@_init_structure:n {#1}
 %    \end{macrocode}
+%    The call to \cs{@@_normalise_code_pool:n} will correct any improper
+%    reference to arguments that don't exist in the hook, raising a
+%    low-level \TeX{} error and doubling the offending parameter tokens.
+%    It has to be done after \cs{@@_init_structure:n} because it
+%    operates on \cs[no-index]{g_@@_\meta{hook}_code_prop}.
+%    \begin{macrocode}
+        \@@_normalise_code_pool:n {#1}
+%    \end{macrocode}
 %    The \cs{g_@@_\meta{hook}_labels_clist} holds the sorted list of
 %    labels (once it got sorted). This is used only for debugging.
+%    These are defined conditionally, in case \cs{@@_make_usable:nn}
+%    is being used to redefine a hook.
+% \changes{v1.1d}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
 %    \begin{macrocode}
-        \clist_new:c { g_@@_#1_labels_clist }
+        \clist_if_exist:cF { g_@@_#1_labels_clist }
+          {
+            \clist_new:c { g_@@_#1_labels_clist }
 %    \end{macrocode}
 %    Some hooks should reverse the default order of code chunks. To
 %    signal this we have a token list which is empty for normal hooks
 %    and contains a \verb=-= for reversed hooks.
 %    \begin{macrocode}
-        \tl_new:c { g_@@_#1_reversed_tl }
+            \tl_new:c { g_@@_#1_reversed_tl }
+          }
 %    \end{macrocode}
 %    The above is all in L3 convention, but we also provide an
 %    interface to legacy \LaTeXe{} hooks of the form \cs{@...hook},
@@ -2454,9 +2862,28 @@
         \@@_include_legacy_code_chunk:n {#1}
       }
   }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
-%  \end{macro}
 %
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_make_usable:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_make_usable:nn
+%<latexrelease>\cs_gset_protected:Npn \@@_make_usable:n #1
+%<latexrelease>  {
+%<latexrelease>    \tl_if_exist:cF { @@~#1 }
+%<latexrelease>      {
+%<latexrelease>        \seq_gput_right:Nn \g_@@_all_seq {#1}
+%<latexrelease>        \tl_new:c { @@~#1 }
+%<latexrelease>        \@@_init_structure:n {#1}
+%<latexrelease>        \clist_new:c { g_@@_#1_labels_clist }
+%<latexrelease>        \tl_new:c { g_@@_#1_reversed_tl }
+%<latexrelease>        \@@_include_legacy_code_chunk:n {#1}
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%  \end{macro}
 %
 %
 % \begin{macro}{\@@_init_structure:n}
@@ -2472,49 +2899,124 @@
 %    \cs{@@_init_structure:n} the first time anything is added to it.
 %    Initializing a hook just with \cs{@@_init_structure:n} will not
 %    make it usable with \cs{hook_use:n}.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_init_structure:n}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_init_structure:n #1
   {
     \@@_if_structure_exist:nF {#1}
       {
         \prop_new:c { g_@@_#1_code_prop }
-        \tl_new:c { @@_toplevel~#1 }
-        \tl_new:c { @@_next~#1 }
+        \@@_toplevel_gset:nn {#1} { }
+        \@@_next_gset:nn {#1} { }
       }
   }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
-%  \end{macro}
-%
 %
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_init_structure:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_init_structure:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_if_structure_exist:nF {#1}
+%<latexrelease>      {
+%<latexrelease>        \prop_new:c { g_@@_#1_code_prop }
+%<latexrelease>        \tl_new:c { @@_toplevel~#1 }
+%<latexrelease>        \tl_new:c { @@_next~#1 }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%  \end{macro}
 %
-%  \begin{macro}{\hook_new_reversed:n,\@@_new_reversed:n}
+%  \begin{macro}{
+%    \hook_new_reversed:n,
+%    \hook_new_reversed_with_args:nn
+%  }
+%  \begin{macro}{\@@_new_reversed:nn}
 %
 %    Declare a new hook. The default ordering of code chunks is
 %    reversed, signaled by setting the token list to a minus sign.
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_new_reversed_with_args:nn} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_new_reversed_with_args:nn}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \hook_new_reversed:n #1
-  { \@@_normalize_hook_args:Nn \@@_new_reversed:n {#1} }
-\cs_new_protected:Npn \@@_new_reversed:n #1
+  { \@@_normalize_hook_args:Nn \@@_new_reversed:nn {#1} { 0 } }
+\cs_new_protected:Npn \hook_new_reversed_with_args:nn #1 #2
+  { \@@_normalize_hook_args:Nn \@@_new_reversed:nn {#1} {#2} }
+\cs_new_protected:Npn \@@_new_reversed:nn #1 #2
   {
-    \@@_new:n {#1}
+    \@@_if_declared:nTF {#1}
+      { \msg_error:nnn { hooks } { exists } {#1} }
+      {
+        \@@_new:nn {#1} {#2}
+        \tl_gset:cn { g_@@_#1_reversed_tl } { - }
+      }
+  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
-%    If the hook already exists the above will generate an error
-%    message, so the next line should be executed (but it is --- too
-%    bad).
+%
 %    \begin{macrocode}
-    \tl_gset:cn { g_@@_#1_reversed_tl } { - }
-  }
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_new_reversed_with_args:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \hook_new_reversed:n #1
+%<latexrelease>  { \@@_normalize_hook_args:Nn \@@_new_reversed:n {#1} }
+%<latexrelease>\cs_undefine:N \@@_new_reversed:nn
+%<latexrelease>\cs_gset_protected:Npn \@@_new_reversed:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_new:n {#1}
+%<latexrelease>    \tl_gset:cn { g_@@_#1_reversed_tl } { - }
+%<latexrelease>  }
+%<latexrelease>\cs_undefine:N \@@_new_reversed:nn
+%<latexrelease>\cs_gset_protected:Npn \hook_new_reversed_with_args:nn #1 #2 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
+%  \end{macro}
 %
-%
-%
-%
-%  \begin{macro}{\hook_new_pair:nn}
+%  \begin{macro}{\hook_new_pair:nn,\hook_new_pair_with_args:nnn}
 %    A shorthand for declaring a normal and a (matching) reversed hook in one go.
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_new_pair_with_args:nnn} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_new_pair_with_args:nnn}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \hook_new_pair:nn #1#2
-  { \hook_new:n {#1} \hook_new_reversed:n {#2} }
+  { \@@_normalize_hook_args:Nnn \@@_new_pair:nnn {#1} {#2} { 0 } }
+\cs_new_protected:Npn \hook_new_pair_with_args:nnn #1#2#3
+  { \@@_normalize_hook_args:Nnn \@@_new_pair:nnn {#1} {#2} {#3} }
+\cs_new_protected:Npn \@@_new_pair:nnn #1 #2 #3
+  {
+    \@@_if_declared:nTF {#1}
+      { \msg_error:nnn { hooks } { exists } {#1} }
+      {
+        \@@_if_declared:nTF {#2}
+          { \msg_error:nnn { hooks } { exists } {#2} }
+          {
+            \@@_new:nn {#1} {#3}
+            \@@_new_reversed:nn {#2} {#3}
+          }
+      }
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_new_pair_with_args:nnn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \hook_new_pair:nn #1#2
+%<latexrelease>  {
+%<latexrelease>    \hook_new:n {#1}
+%<latexrelease>    \hook_new_reversed:n {#2}
+%<latexrelease>  }
+%<latexrelease>\cs_gset_protected:Npn \hook_new_pair_with_args:nnn #1#2#3
+%<latexrelease>  { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -2531,6 +3033,8 @@
 %       \textbf{Warning: this support will vanish in future releases!}
 %    \end{quote}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_include_legacy_code_chunk:n}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_include_legacy_code_chunk:n #1
   {
 %    \end{macrocode}
@@ -2538,15 +3042,27 @@
 %    needs to be done.
 %    \begin{macrocode}
     \tl_if_exist:cT { @#1hook }
+      {
 %    \end{macrocode}
 %    Of course if the legacy hook exists but is empty, there is no need
 %    to add anything under \texttt{legacy} the legacy label.
 %    \begin{macrocode}
-      {
         \tl_if_empty:cF { @#1hook }
           {
-            \exp_args:Nnnv \@@_hook_gput_code_do:nnn {#1}
-                                  { legacy } { @#1hook }
+%    \end{macrocode}
+%    Here we set \cs{@@_replacing_args_false:} because no legacy code
+%    will reference hook arguments.
+% \changes{v1.1b}{2023/04/16}
+%         {\cs{@@_replacing_args_false:} in
+%          \cs{@@_include_legacy_code_chunk:n}.}
+%    \begin{macrocode}
+            \@@_replacing_args_false:
+            \use:e
+              {
+                \@@_hook_gput_code_do:nnn {#1} { legacy }
+                  { \exp_not:v { @#1hook } }
+              }
+            \@@_replacing_args_reset:
 %    \end{macrocode}
 %    Once added to the hook, we need to clear it otherwise it might
 %    get added again  later if the hook data gets updated.
@@ -2555,6 +3071,22 @@
           }
       }
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_include_legacy_code_chunk:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_include_legacy_code_chunk:n #1
+%<latexrelease>  {
+%<latexrelease>    \tl_if_exist:cT { @#1hook }
+%<latexrelease>      {
+%<latexrelease>        \tl_if_empty:cF { @#1hook }
+%<latexrelease>          {
+%<latexrelease>            \exp_args:Nnnv \@@_hook_gput_code_do:nnn
+%<latexrelease>              {#1} { legacy } { @#1hook }
+%<latexrelease>            \@@_tl_gclear:c { @#1hook }
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2579,8 +3111,8 @@
 %    if the hook is disabled.
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/06/01}%
-%<latexrelease>         {\hook_disable_generic:n}{Disable~hooks}
+%<latexrelease>\IncludeInRelease{2021/06/01}{\hook_disable_generic:n}
+%<latexrelease>                 {Disable~hooks}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2595,7 +3127,7 @@
   {
     \bool_lazy_and:nnTF
         { \tl_if_exist_p:c { g_@@_#1_declared_tl } }
-        { ! \tl_if_exist_p:c { @@~#1 } }
+        { ! \cs_if_exist_p:c { @@~#1 } }
       { \prg_return_true: }
       { \prg_return_false: }
   }
@@ -2603,8 +3135,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}
-%<latexrelease>                 {\hook_disable_generic:n}{Disable~hooks}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_disable_generic:n}
+%<latexrelease>                 {Disable~hooks}
 %<latexrelease>
 %<latexrelease>\cs_new_protected:Npn \hook_disable_generic:n #1 {}
 %<latexrelease>
@@ -2619,9 +3151,11 @@
 %    The \cs{hook_activate_generic:n} declaration declares a new hook if it
 %    wasn't declared already, in which case it only checks that the
 %    already existing hook is not a reversed hook.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/06/01}%
-%<latexrelease>         {\hook_activate_generic:n}{Providing~hooks}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_activate_generic:n}
+%<latexrelease>                 {Providing~hooks}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2646,7 +3180,7 @@
         \@@_if_declared:nF {#1}
           {
             \tl_new:c { g_@@_#1_declared_tl }
-            \@@_make_usable:n {#1}
+            \@@_make_usable:nn {#1} { 0 }
             \tl_gset:cx { g_@@_#1_reversed_tl }
               { \@@_if_generic_reversed:nT {#1} { - } }
 %    \end{macrocode}
@@ -2660,21 +3194,40 @@
       }
   }
 %    \end{macrocode}
-% \end{macro}
-% \end{macro}
 %
 %    \begin{macrocode}
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}
-%<latexrelease>                 {\hook_activate_generic:n}{Providing~hooks}
-%<latexrelease>
-%<latexrelease>\cs_new_protected:Npn \hook_activate_generic:n #1 {}
-%<latexrelease>
+%<latexrelease>\IncludeInRelease{2021/06/01}{\hook_activate_generic:n}
+%<latexrelease>                 {Providing~hooks}
+%<latexrelease>\cs_gset_protected:Npn \@@_activate_generic:nn #1 #2
+%<latexrelease>  {
+%<latexrelease>    \@@_if_disabled:nTF {#1}
+%<latexrelease>      { \msg_warning:nnn { hooks } { activate-disabled } {#1} }
+%<latexrelease>      {
+%<latexrelease>        \@@_if_declared:nF {#1}
+%<latexrelease>          {
+%<latexrelease>            \tl_new:c { g_@@_#1_declared_tl }
+%<latexrelease>            \@@_make_usable:n {#1}
+%<latexrelease>            \tl_gset:cx { g_@@_#1_reversed_tl }
+%<latexrelease>              { \@@_if_generic_reversed:nT {#1} { - } }
+%<latexrelease>            \@@_update_hook_code:n {#1}
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_activate_generic:n}
+%<latexrelease>                 {Providing~hooks}
+%<latexrelease>\cs_gset_protected:Npn \hook_activate_generic:n #1 { }
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
+% \end{macro}
+% \end{macro}
 %
 %
 % \subsection{Parsing a label}
@@ -2965,63 +3518,109 @@
 %
 % \subsection{Adding or removing hook code}
 %
-% \begin{macro}{\hook_gput_code:nnn}
-% \begin{macro}{\@@_gput_code:nnn,\@@_hook_gput_code_do:nnn}
+% \begin{macro}{\hook_gput_code:nnn,\hook_gput_code_with_args:nnn}
+% \begin{macro}{
+%     \@@_gput_code:nnn,
+%     \@@_gput_code_store:nnn,
+%     \@@_hook_gput_code_do:nnn,
+%     \@@_prop_gput_labeled_cleanup:nnn,
+%     \@@_prop_gput_labeled_do:Nnnn
+%    }
 %
 %    With \cs{hook_gput_code:nnn}\Arg{hook}\Arg{label}\Arg{code} a
 %    chunk of \meta{code} is added to an existing \meta{hook} labeled
 %    with \meta{label}.
 % \changes{v1.0o}{2021/07/22}{Do not queue removals (gh/625)}
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_gput_code_with_args:nnn} (hook-args).}
 %    \begin{macrocode}
-\cs_new_protected:Npn \hook_gput_code:nnn #1 #2
-  { \@@_normalize_hook_args:Nnn \@@_gput_code:nnn {#1} {#2} }
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_gput_code_with_args:nnn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \hook_gput_code:nnn #1 #2 #3
+  {
+    \@@_replacing_args_false:
+    \@@_normalize_hook_args:Nnn \@@_gput_code:nnn {#1} {#2} {#3}
+    \@@_replacing_args_reset:
+  }
+\cs_new_protected:Npn \hook_gput_code_with_args:nnn #1 #2 #3
+  {
+    \@@_replacing_args_true:
+    \@@_normalize_hook_args:Nnn \@@_gput_code:nnn {#1} {#2} {#3}
+    \@@_replacing_args_reset:
+  }
 %    \end{macrocode}
 %
+%   If \cs{AddToHookWithArguments} was used, do some sanity checking,
+%   and if it's not possible to use arguments at this point, fall back
+%   to regular \cs{AddToHook} by using \cs{@@_replacing_args_false:}.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_gput_code:nnn #1 #2 #3
   {
+    \@@_chk_args_allowed:nn {#1} { AddToHook }
 %    \end{macrocode}
-%   First check if the code should be executed immediately, rather than
+%   Then check if the code should be executed immediately, rather than
 %   stored:
 % \changes{v1.0r}{2021/09/06}{Use dedicated conditional (gh/606)}
 %    \begin{macrocode}
     \@@_if_execute_immediately:nTF {#1}
-      {#3}
       {
 %    \end{macrocode}
+%   \cs{AddToHookWithArguments} can't be used on one-time hooks (that
+%   were already used).
+%    \begin{macrocode}
+        \@@_if_replacing_args:TF
+          {
+            \msg_error:nnnn { hooks } { one-time-args }
+              {#1} { AddToHook }
+          }
+          { }
+        \use:n
+      }
+      { \@@_gput_code_store:nnn {#1} {#2} }
+          {#3}
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_gput_code_store:nnn #1 #2 #3
+  {
+%    \end{macrocode}
 %    Then check if the hook is usable.
 %    \begin{macrocode}
-        \@@_if_usable:nTF {#1}
+    \@@_if_usable:nTF {#1}
 %    \end{macrocode}
 %    If so we simply add (or append) the new code to the property list
 %    holding different chunks for the hook. At \verb=\begin{document}=
 %    this is then sorted into a token list for fast execution.
 %    \begin{macrocode}
-          {
-            \@@_hook_gput_code_do:nnn {#1} {#2} {#3}
+      {
+        \@@_hook_gput_code_do:nnn {#1} {#2} {#3}
 %    \end{macrocode}
 %    However, if there is an update within the document we need to alter
 %    this execution code which is done by
 %    \cs{@@_update_hook_code:n}. In the preamble this does nothing.
 %    \begin{macrocode}
-            \@@_update_hook_code:n {#1}
-          }
+        \@@_update_hook_code:n {#1}
+      }
 %    \end{macrocode}
 %
 %    If the hook is not usable, before giving up, check if it's not
 %    disabled and otherwise try to declare it as a generic hook, if its
 %    name matches one of the valid patterns.
 %    \begin{macrocode}
-          {
-            \@@_if_disabled:nTF {#1}
-              { \msg_error:nnn { hooks } { hook-disabled } {#1} }
-              { \@@_try_declaring_generic_hook:nnn {#1} {#2} {#3} }
-          }
+      {
+        \@@_if_disabled:nTF {#1}
+          { \msg_error:nnn { hooks } { hook-disabled } {#1} }
+          { \@@_try_declaring_generic_hook:nnn {#1} {#2} {#3} }
       }
   }
 %    \end{macrocode}
 %
 %    This macro will unconditionally add a chunk of code to the given hook.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_hook_gput_code_do:nnn #1 #2 #3
   {
@@ -3046,31 +3645,161 @@
         \str_if_eq:eeTF { top-level } { \@@_currname_or_default: }
           {
 %    \end{macrocode}
-%    If the hook's basic structure does not exist, we need to declare it
-%    with \cs{@@_init_structure:n}.
+%   If the hook's basic structure does not exist, we need to declare it
+%   with \cs{@@_init_structure:n}.
 %    \begin{macrocode}
             \@@_init_structure:n {#1}
-            \@@_tl_gput_right:cn { @@_toplevel~#1 } {#3}
+%    \end{macrocode}
+%   Then append to the \verb|_toplevel| container for the hook.
+%    \begin{macrocode}
+            \@@_cs_gput_right:nnn { _toplevel } {#1} {#3}
           }
           { \msg_error:nnn { hooks } { misused-top-level } {#1} }
       }
       {
-        \prop_get:cnNTF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
+%    \end{macrocode}
+%   When adding to the code pool, we have to double hashes if
+%   \cs{AddToHook} was used (\verb|replacing_args| is false), so that
+%   later it is turned into a single parameter token, rather than a
+%   parameter to the hook macro.
+%    \begin{macrocode}
+        \exp_args:Nx \@@_prop_gput_labeled_cleanup:nnn
           {
-            \prop_gput:cno { g_@@_#1_code_prop } {#2}
-              { \l_@@_return_tl #3 }
+            \@@_if_replacing_args:TF
+              { \exp_not:n }
+              { \@@_double_hashes:n }
+                {#3}
           }
-          { \prop_gput:cnn { g_@@_#1_code_prop } {#2} {#3} }
+          {#1} {#2}
       }
   }
 %    \end{macrocode}
+%
+%   Adds code to a hook's code pool.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_prop_gput_labeled_cleanup:nnn #1 #2 #3
+  {
+    \tl_set:Nn \l_@@_return_tl {#1}
+    \@@_if_replacing_args:TF
+      {
+        \@@_if_usable:nT {#2}
+          {
+            \@@_set_normalise_fn:nn {#2}
+              { Invalid~code~added~\msg_line_context: }
+            \@@_normalise_fn:nn {#3} {#1}
+            \prop_get:NnN \l_@@_work_prop {#3} \l_@@_return_tl
+          }
+      }
+      { }
+    \exp_args:NcV \@@_prop_gput_labeled_do:Nnn
+      { g_@@_#2_code_prop } \l_@@_return_tl {#3}
+  }
+\cs_new_protected:Npn \@@_prop_gput_labeled_do:Nnn #1 #2 #3
+  {
+    \prop_get:NnNTF #1 {#3} \l_@@_return_tl
+      { \prop_gput:Nno #1 {#3} { \l_@@_return_tl #2 } }
+      { \prop_gput:Nnn #1 {#3} {#2} }
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_gput_code:nnn}
+%<latexrelease>                 {Providing~hooks}
+%<latexrelease>\cs_gset_protected:Npn \hook_gput_code:nnn #1 #2
+%<latexrelease>  { \@@_normalize_hook_args:Nnn \@@_gput_code:nnn {#1} {#2} }
+%<latexrelease>\cs_gset_protected:Npn \@@_gput_code:nnn #1 #2 #3
+%<latexrelease>  {
+%<latexrelease>    \@@_if_execute_immediately:nTF {#1}
+%<latexrelease>      {#3}
+%<latexrelease>      {
+%<latexrelease>        \@@_if_usable:nTF {#1}
+%<latexrelease>          {
+%<latexrelease>            \@@_hook_gput_code_do:nnn {#1} {#2} {#3}
+%<latexrelease>            \@@_update_hook_code:n {#1}
+%<latexrelease>          }
+%<latexrelease>          {
+%<latexrelease>            \@@_if_disabled:nTF {#1}
+%<latexrelease>              { \msg_error:nnn { hooks } { hook-disabled } {#1} }
+%<latexrelease>              { \@@_try_declaring_generic_hook:nnn {#1} {#2} {#3} }
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\cs_gset_protected:Npn \@@_hook_gput_code_do:nnn #1 #2 #3
+%<latexrelease>  {
+%<latexrelease>    \@@_debug:n{\iow_term:x{****~ Add~ to~
+%<latexrelease>                      \@@_if_usable:nF {#1} { undeclared~ }
+%<latexrelease>                      hook~ #1~ (#2)
+%<latexrelease>                      \on@line\space <-~ \tl_to_str:n{#3}} }
+%<latexrelease>    \str_if_eq:nnTF {#2} { top-level }
+%<latexrelease>      {
+%<latexrelease>        \str_if_eq:eeTF { top-level } { \@@_currname_or_default: }
+%<latexrelease>          {
+%<latexrelease>            \@@_init_structure:n {#1}
+%<latexrelease>            \@@_tl_gput_right:cn { @@_toplevel~#1 } {#3}
+%<latexrelease>          }
+%<latexrelease>          { \msg_error:nnn { hooks } { misused-top-level } {#1} }
+%<latexrelease>      }
+%<latexrelease>      {
+%<latexrelease>        \prop_get:cnNTF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
+%<latexrelease>          {
+%<latexrelease>            \prop_gput:cno { g_@@_#1_code_prop } {#2}
+%<latexrelease>              { \l_@@_return_tl #3 }
+%<latexrelease>          }
+%<latexrelease>          { \prop_gput:cnn { g_@@_#1_code_prop } {#2} {#3} }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\cs_gset_protected:Npn \hook_gput_code_with_args:nnn #1#2#3 { }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\@@_chk_args_allowed:nn}
+%   This macro checks if it is possible to add code with references to
+%   a hook's arguments for hook \verb|#1|.  It only does something if
+%   the function being run is \verb|replacing_args|.  This macro will
+%   error if the hook is declared and takes no arguments, then it will
+%   set \cs{@@_replacing_args_false:} so that the macro which called it
+%   will add the code normally.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_chk_args_allowed:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_chk_args_allowed:nn #1 #2
+  {
+    \@@_if_replacing_args:TF
+      {
+        \@@_if_declared:nT {#1}
+          { \tl_if_empty:cT { c_@@_#1_parameter_tl } { \use_ii:nn } }
+        \use_none:n
+          {
+            \msg_error:nnnn { hooks } { without-args } {#1} {#2}
+            \@@_replacing_args_false:
+          }
+      }
+      { }
+  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_chk_args_allowed:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_chk_args_allowed:nn
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@@_gput_undeclared_hook:nnn}
 %   Often it may happen that a package $A$ defines a hook \verb=foo=,
 %   but package $B$, that adds code to that hook, is loaded before $A$.
 %   In such case we need to add code to the hook before its declared.
+%   An implicitly declared hook doesn't have arguments (in principle),
+%   so use \cs{c_false_bool} here.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_gput_undeclared_hook:nnn #1 #2 #3
   {
@@ -3098,24 +3827,43 @@
 %   \cs{hook_gput_next_code:nn} if the generic hook was declared, or
 %   to \cs{@@_gput_next_do:nn} otherwise.
 % \changes{v1.0p}{2021/08/25}{Standardise generic hook names (gh/648)}
+% \changes{v1.1d}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_try_declaring_generic_hook:nnn}
-%<latexrelease>                 {Standardise~generic~hook~names}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_try_declaring_generic_hook:nnn}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_try_declaring_generic_hook:nnn #1
   {
     \@@_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1}
-      \hook_gput_code:nnn
+      \@@_gput_code:nnn
       \@@_gput_undeclared_hook:nnn
         {#1}
   }
 \cs_new_protected:Npn \@@_try_declaring_generic_next_hook:nn #1
   {
     \@@_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1}
-      \hook_gput_next_code:nn
+      \@@_gput_next_code:nn
       \@@_gput_next_do:nn
         {#1}
   }
 %<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_try_declaring_generic_hook:nnn}
+%<latexrelease>                 {Standardise~generic~hook~names}
+%<latexrelease>\cs_gset_protected:Npn \@@_try_declaring_generic_hook:nnn #1
+%<latexrelease>  {
+%<latexrelease>    \@@_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1}
+%<latexrelease>      \hook_gput_code:nnn
+%<latexrelease>      \@@_gput_undeclared_hook:nnn
+%<latexrelease>        {#1}
+%<latexrelease>  }
+%<latexrelease>\cs_gset_protected:Npn \@@_try_declaring_generic_next_hook:nn #1
+%<latexrelease>  {
+%<latexrelease>    \@@_try_declaring_generic_hook:wnTF #1 / / / \scan_stop: {#1}
+%<latexrelease>      \hook_gput_next_code:nn
+%<latexrelease>      \@@_gput_next_do:nn
+%<latexrelease>        {#1}
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{2020/10/01}{\@@_try_declaring_generic_hook:nnn}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\cs_new_protected:Npn \@@_try_declaring_generic_hook:nnn #1
@@ -3170,9 +3918,11 @@
 % \end{macro}
 %
 % \begin{macro}[TF]{\@@_try_declaring_generic_hook:wn}
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_try_declaring_generic_hook:wn}%
-%<latexrelease>                 {Standardise~generic~hook~names}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_try_declaring_generic_hook:wn}
+%<latexrelease>                 {Hooks~with~args}
 \prg_new_protected_conditional:Npnn \@@_try_declaring_generic_hook:wn
     #1 / #2 / #3 / #4 \scan_stop: #5 { TF }
   {
@@ -3188,18 +3938,25 @@
 %    For some commands this will not be possible, in which case
 %    \cs{@@_patch_cmd_or_delay:Nnn} (defined in \texttt{ltcmdhooks})
 %    will generate an appropriate error message.
+% \changes{v1.1d}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
 %    \begin{macrocode}
             \str_if_eq:nnT {#1} { cmd }
-              { \@@_try_put_cmd_hook:n {#5} }
+              {
+                \@@_try_put_cmd_hook:n {#5}
+                \@@_make_usable:nn {#5} { 9 }
+                \use_none:nnn
+              }
 %    \end{macrocode}
 %
 %    Declare the hook always even if it can't really be used (error
 %    message generated elsewhere).
 %
-%    Here we use \cs{@@_make_usable:n}, so that a \cs{hook_new:n} is still
-%    possible later.
+%    Here we use \cs{@@_make_usable:nn}, so that a \cs{hook_new:n} is
+%    still possible later.  Generic hooks (except \hook{cmd} hooks) take
+%    no arguments, so use zero as the second argument.
 %    \begin{macrocode}
-            \@@_make_usable:n {#5}
+            \@@_make_usable:nn {#5} { 0 }
           }
         \@@_if_generic_reversed:nT {#5}
           { \tl_gset:cn { g_@@_#5_reversed_tl } { - } }
@@ -3285,6 +4042,37 @@
 % \end{macro}
 %
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_try_declaring_generic_hook:wn}
+%<latexrelease>                 {Standardise~generic~hook~names}
+%<latexrelease>\prg_new_protected_conditional:Npnn \@@_try_declaring_generic_hook:wn
+%<latexrelease>    #1 / #2 / #3 / #4 \scan_stop: #5 { TF }
+%<latexrelease>  {
+%<latexrelease>    \@@_if_generic:nTF {#5}
+%<latexrelease>      {
+%<latexrelease>        \@@_if_usable:nF {#5}
+%<latexrelease>          {
+%<latexrelease>            \str_if_eq:nnT {#1} { cmd }
+%<latexrelease>              { \@@_try_put_cmd_hook:n {#5} }
+%<latexrelease>            \@@_make_usable:n {#5}
+%<latexrelease>          }
+%<latexrelease>        \@@_if_generic_reversed:nT {#5}
+%<latexrelease>          { \tl_gset:cn { g_@@_#5_reversed_tl } { - } }
+%<latexrelease>        \prg_return_true:
+%<latexrelease>      }
+%<latexrelease>      {
+%<latexrelease>        \@@_if_deprecated_generic:nTF {#5}
+%<latexrelease>          {
+%<latexrelease>            \@@_deprecated_generic_warn:n {#5}
+%<latexrelease>            \exp_after:wN \@@_declare_deprecated_generic:NNn
+%<latexrelease>            \exp:w % \exp_end:
+%<latexrelease>          }
+%<latexrelease>          { \prg_return_false: }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 %<latexrelease>\IncludeInRelease{2021/06/01}{\@@_try_declaring_generic_hook:wn}
 %<latexrelease>                 {Support~cmd~hooks}
 %<latexrelease>\prg_new_protected_conditional:Npnn \@@_try_declaring_generic_hook:wn
@@ -3316,7 +4104,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_try_declaring_generic_hook:wn}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_try_declaring_generic_hook:wn}
 %<latexrelease>                 {Support~cmd~hooks}
 %<latexrelease>\prg_new_protected_conditional:Npnn \@@_try_declaring_generic_hook:wn
 %<latexrelease>    #1 / #2 / #3 / #4 \scan_stop: #5 { TF }
@@ -3338,7 +4126,6 @@
 %<latexrelease>          { \prg_return_false: }
 %<latexrelease>      }
 %<latexrelease>  }
-%<latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
@@ -3350,24 +4137,10 @@
 %   |file/foo.tex/before|).  If it is a file-specific hook, then it
 %   executes the \meta{true} branch, otherwise \meta{false}.
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_if_file_hook:w}%
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_if_file_hook:w}
 %<latexrelease>                 {Standardise~generic~hook~names}
-\prg_new_conditional:Npnn \@@_if_file_hook:w
-    #1 / #2 \s_@@_mark #3 { TF }
-  {
-    \@@_if_generic:nTF {#3}
-      {
-        \str_if_eq:nnTF {#1} { file }
-          { \prg_return_true: }
-          { \prg_return_false: }
-      }
-      { \prg_return_false: }
-  }
 %<latexrelease>\EndIncludeInRelease
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_if_file_hook:w}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_if_file_hook:w}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\prg_new_conditional:Npnn \@@_if_file_hook:w
 %<latexrelease>    #1 / #2 / #3 \s_@@_mark { TF }
@@ -3394,7 +4167,7 @@
 % \begin{macro}[EXP]{\@@_strip_double_slash:n,\@@_strip_double_slash:w}
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_file_hook_normalize:n}%
+%<latexrelease>\IncludeInRelease{2021/11/15}{\@@_file_hook_normalize:n}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
@@ -3406,7 +4179,7 @@
 %   like \verb|\def\input@path{{./mypath/}}|, in which case a hook would
 %   have to be \verb|\AddToHook{file/./mypath//file.tex/after}|.
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_file_hook_normalize:n}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_file_hook_normalize:n}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\cs_new:Npn \@@_file_hook_normalize:n #1
 %<latexrelease>  { \@@_strip_double_slash:n {#1} }
@@ -3453,7 +4226,7 @@
 %      The generic hooks used when loading a file
 %    \end{description}
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\c_@@_generics_prop}%
+%<latexrelease>\IncludeInRelease{2021/11/15}{\c_@@_generics_prop}
 %<latexrelease>                 {Standardise~generic~hook~names}
 \clist_map_inline:nn { cmd , env , file , package , class , include }
   {
@@ -3482,7 +4255,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}{\c_@@_generics_prop}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\c_@@_generics_prop}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\prop_const_from_keyval:Nn \c_@@_generics_prop
 %<latexrelease>     {cmd=,env=,file=,package=,class=,include=}
@@ -3496,13 +4269,13 @@
 %    The following generic hooks are supposed to use reverse ordering
 %    (the |ii| and |iii| names are kept for the deprecation cycle):
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\c_@@_generics_reversed_ii_prop}%
+%<latexrelease>\IncludeInRelease{2021/11/15}{\c_@@_generics_reversed_ii_prop}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}{\c_@@_generics_reversed_ii_prop}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\c_@@_generics_reversed_ii_prop}
 %<latexrelease>                 {Standardise~generic~hook~names}
 %<latexrelease>\prop_const_from_keyval:Nn \c_@@_generics_reversed_ii_prop {after=,end=}
 %<latexrelease>\prop_const_from_keyval:Nn \c_@@_generics_reversed_iii_prop {after=}
@@ -3511,13 +4284,46 @@
 %    \end{macrocode}
 %  \end{macro}
 %
+%
+% \begin{macro}{
+%     \c_@@_parameter_cmd/./before_tl,\c_@@_parameter_cmd/./after_tl,
+%   }
+%   Token lists defining the number of arguments for a given type of
+%   generic hook.
+% \changes{v1.1d}{2023/05/21}
+%         {Token lists added (cmd-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\c_@@_parameter_cmd/./before_tl}
+%<latexrelease>                 {Hooks~with~args}
+%    \end{macrocode}
+%
+%   \hook{cmd} hooks are declared with 9 arguments because they have a
+%   variable number of arguments (depending on the command they are
+%   attached to), so we use the maximum here.
+%    \begin{macrocode}
+\tl_const:cn { c_@@_parameter_cmd/./before_tl } { #1#2#3#4#5#6#7#8#9 }
+\tl_const:cn { c_@@_parameter_cmd/./after_tl }  { #1#2#3#4#5#6#7#8#9 }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\c_@@_parameter_cmd/./before_tl}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%  \end{macro}
+%
 % \begin{macro}{\hook_gremove_code:nn}
 % \begin{macro}{\@@_gremove_code:nn}
 %
 %    With \cs{hook_gremove_code:nn}\Arg{hook}\Arg{label} any code
 %    for \meta{hook} stored under \meta{label} is removed.
 % \changes{v1.0o}{2021/07/22}{Do not queue removals (gh/625)}
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_gremove_code:nn}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \hook_gremove_code:nn #1 #2
   { \@@_normalize_hook_args:Nnn \@@_gremove_code:nn {#1} {#2} }
 \cs_new_protected:Npn \@@_gremove_code:nn #1 #2
@@ -3542,8 +4348,8 @@
         \str_if_eq:nnTF {#2} {*}
           {
             \prop_gclear:c { g_@@_#1_code_prop }
-            \@@_tl_gclear:c { @@_toplevel~#1 }
-            \@@_tl_gclear:c { @@_next~#1 }
+            \@@_toplevel_gset:nn {#1} { }
+            \@@_next_gset:nn {#1} { }
           }
           {
 %    \end{macrocode}
@@ -3551,7 +4357,7 @@
 %    there is under the same label.
 %    \begin{macrocode}
             \str_if_eq:nnTF {#2} { top-level }
-              { \@@_tl_gclear:c { @@_toplevel~#1 } }
+              { \@@_toplevel_gset:nn {#1} { } }
               {
                 \prop_gpop:cnNF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
                   { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} }
@@ -3576,14 +4382,542 @@
           { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} }
       }
   }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_gremove_code:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \@@_gremove_code:nn #1 #2
+%<latexrelease>  {
+%<latexrelease>    \@@_if_structure_exist:nTF {#1}
+%<latexrelease>      {
+%<latexrelease>        \str_if_eq:nnTF {#2} {*}
+%<latexrelease>          {
+%<latexrelease>            \prop_gclear:c { g_@@_#1_code_prop }
+%<latexrelease>            \@@_tl_gclear:c { @@_toplevel~#1 }
+%<latexrelease>            \@@_tl_gclear:c { @@_next~#1 }
+%<latexrelease>          }
+%<latexrelease>          {
+%<latexrelease>            \str_if_eq:nnTF {#2} { top-level }
+%<latexrelease>              { \@@_tl_gclear:c { @@_toplevel~#1 } }
+%<latexrelease>              {
+%<latexrelease>                \prop_gpop:cnNF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
+%<latexrelease>                  { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} }
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>        \@@_if_usable:nT {#1}
+%<latexrelease>          { \@@_update_hook_code:n {#1} }
+%<latexrelease>      }
+%<latexrelease>      {
+%<latexrelease>        \@@_if_deprecated_generic:nTF {#1}
+%<latexrelease>          {
+%<latexrelease>            \@@_deprecated_generic_warn:n {#1}
+%<latexrelease>            \@@_do_deprecated_generic:Nn \@@_gremove_code:nn {#1} {#2}
+%<latexrelease>          }
+%<latexrelease>          { \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@@_cs_gput_right:nnn}
+% \begin{macro}{\@@_code_gset_auxi:nnnn,\@@_code_gset_auxi:eeen}
+%   This macro is used to append code to the \verb|toplevel| and
+%   \verb|next| token lists, trating them correctly depending on their
+%   number of arguments, and depending if the code being added should
+%   have parameter tokens understood as parameters, or doubled to be
+%   stored as parameter tokens.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_cs_gput_right:nnn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_cs_gput_right:nnn #1 #2 #3
+  {
+%    \end{macrocode}
+%   The auxiliary \cs{@@_code_gset_auxi:eeen} just does the assignment
+%   at the end.  Its first argument is the parameter text of the macro,
+%   which is chosen here depending if
+%   \cs[no-index]{c_@@_\meta{hook}_parameter_tl} exists, if the hook is
+%   declared, and if it's a generic hook.
+%    \begin{macrocode}
+    \cs_if_exist:cF { @@#1~#2 }
+      { \@@_code_gset_aux:nnn {#1} {#2} { } }
+    \@@_code_gset_auxi:eeen
+      {
+        \@@_if_declared:nTF {#2}
+          { \tl_use:c { c_@@_#2_parameter_tl } }
+          {
+            \@@_if_generic:nTF {#2}
+              { \@@_generic_parameter:n {#2} }
+              { \c_@@_nine_parameters_tl }
+          }
+      }
+%    \end{macrocode}
+%   Here we take the existing code in the macro, expand it with as many
+%   arguments as it takes, then double the hashes so the code can be
+%   reused. \pho{Maybe can be improved. The case of adding to an empty
+%     cs can be optimised by quickly checking \cs{cs_replacement_spec}.}
+%    \begin{macrocode}
+      {
+        \exp_args:NNo \exp_args:No \@@_double_hashes:n
+          {
+            \cs:w @@#1~#2 \exp_last_unbraced:Ne \cs_end:
+              { \@@_braced_cs_parameter:n { @@#1~#2 } }
+          }
+      }
+%    \end{macrocode}
+%   Now the new code:  if we are replacing arguments, then hashes are
+%   left untouched, otherwise they are doubled.
+%    \begin{macrocode}
+      {
+        \@@_if_replacing_args:TF
+          { \exp_not:n }
+          { \@@_double_hashes:n }
+            {#3}
+      }
+%    \end{macrocode}
+%   And finally, the csname which we'll define with all the above.
+%    \begin{macrocode}
+      { @@#1~#2 }
+  }
+%    \end{macrocode}
+%
+%   And as promised, the auxiliary that does the definition.
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_code_gset_auxi:nnnn #1 #2 #3 #4
+  { \cs_gset:cpn {#4} #1 { #2 #3 } }
+\cs_generate_variant:Nn \@@_code_gset_auxi:nnnn { eeen }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_cs_gput_right:nnn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_cs_gput_right:nnn
+%<latexrelease>\cs_undefine:N \@@_code_gset_auxi:nnnn
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{
+%     \@@_code_gset:nn,\@@_code_gset:ne,
+%     \@@_toplevel_gset:nn,
+%     \@@_next_gset:nn,
+%     \@@_code_gset_aux:nnn
+%   }
+%   These macros define
+%   \cs[no-index]{@@\meta{type}\textvisiblespace\meta{hook}} (with
+%   \meta{type} being \verb|_next|, \verb|_toplevel|, or empty) with the
+%   given code and the parameters stored in
+%   \cs[no-index]{c_@@_\meta{hook}_parameter_tl} (or none, if that
+%   doesn't exist).
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_code_gset:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_code_gset:nn
+  { \@@_code_gset_aux:nnn { } }
+\cs_new_protected:Npn \@@_toplevel_gset:nn
+  { \@@_code_gset_aux:nnn { _toplevel } }
+\cs_new_protected:Npn \@@_next_gset:nn
+  { \@@_code_gset_aux:nnn { _next } }
+\cs_new_protected:Npn \@@_code_gset_aux:nnn #1 #2 #3
+  {
+    \cs_gset:cpn { @@#1~#2 \exp_last_unbraced:Ne }
+      { \@@_parameter:n {#2} }
+      {#3}
+  }
+\cs_generate_variant:Nn \@@_code_gset:nn { ne }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_code_gset:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_code_gset:nn
+%<latexrelease>\cs_undefine:N \@@_toplevel_gset:nn
+%<latexrelease>\cs_undefine:N \@@_next_gset:nn
+%<latexrelease>\cs_undefine:N \@@_code_gset_aux:nnn
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_normalise_cs_args:nn}
+%   This macro normalises the parameters of the macros
+%   \cs[no-index]{@@\meta{type}\textvisiblespace\meta{hook}} to take the
+%   right number of arguments after a hook is declared.  At this point
+%   we know \cs[no-index]{c_@@_\meta{hook}_parameter_tl} exists, so use
+%   that to count the arguments and use that as \meta{parameter text}
+%   for the newly (re)defined macro.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_normalise_cs_args:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_normalise_cs_args:nn #1 #2
+  {
+    \cs_if_exist:cT { @@#1~#2 }
+      {
+        \@@_code_gset_auxi:eeen
+          { \tl_use:c { c_@@_#2_parameter_tl } }
+          {
+            \exp_args:NNo \exp_args:No \@@_double_hashes:n
+              {
+                \cs:w @@#1~#2 \exp_last_unbraced:Ne \cs_end:
+                  { \@@_braced_cs_parameter:n { @@#1~#2 } }
+              }
+          }
+          { }
+          { @@#1~#2 }
+      }
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_normalise_cs_args:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_normalise_cs_args:nn
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_normalise_code_pool:n}
+% \begin{macro}{\@@_set_normalise_fn:nn}
+%   This one's a bit of a hack.  It takes a hook, and iterates over its
+%   code pool (\cs[no-index]{g_@@_\meta{hook}_code_prop}), redefining
+%   each code label to use only valid arguments.  This is used when, for
+%   example, a code is added referencing arguments \verb|#1| and
+%   \verb|#2|, but the hook has only \verb|#1|.  In this example, every
+%   reference to \verb|#2| is changed to \verb|##2|.  This is done
+%   because otherwise \TeX{} will throw a low-level error every time
+%   some change happens to the hook (code is added, a rule is set, etc),
+%   which can get quite repetitive for no good reason.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_normalise_code_pool:n}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_normalise_code_pool:n #1
+  {
+%    \end{macrocode}
+%   First, call \cs{@@_set_normalise_fn:nn} with the hook name to set
+%   everything up, then we'll loop over the
+%   hook's code pool applying the normalisation above.  After that's
+%   done, copy the temporary property list back to the hook's.
+%    \begin{macrocode}
+    \@@_set_normalise_fn:nn {#1} { Offending~label:~'##1' }
+    \prop_clear:N \l_@@_work_prop
+    \prop_map_function:cN { g_@@_#1_code_prop } \@@_normalise_fn:nn
+    \prop_gset_eq:cN { g_@@_#1_code_prop } \l_@@_work_prop
+  }
+%    \end{macrocode}
+%
+%   The sole purpose of this function is to define
+%   \cs{@@_normalise_fn:nn}, which will then do the correcting of the
+%   code being added to the hook.
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_set_normalise_fn:nn #1 #2
+  {
+%    \end{macrocode}
+%   To start, we define two auxiliary token lists.
+%   \cs[no-index]{l_@@_tmpb_tl} contains:
+%\begin{verbatim}
+%   {\c__hook_hashes_tl 1}
+%   {\c__hook_hashes_tl 2}
+%   ...
+%   {\c__hook_hashes_tl 9}
+%\end{verbatim}
+%    \begin{macrocode}
+    \cs_set:Npn \@@_tmp:w ##1##2##3##4##5##6##7##8##9 { }
+    \tl_set:Ne \l_@@_tmpb_tl
+      { \@@_braced_cs_parameter:n { @@_tmp:w } }
+    \group_begin:
+      \@@_tl_set:cn { c_@@_hash_tl } { \exp_not:N \c_@@_hashes_tl }
+      \use:e
+        {
+    \group_end:
+    \tl_set:Nn \exp_not:N \l_@@_tmpb_tl { \l_@@_tmpb_tl }
+        }
+%    \end{macrocode}
+%   And \cs[no-index]{l_@@_tmpa_tl} contains:
+%\begin{verbatim}
+%   {\c__hook_hash_tl 1}
+%   {\c__hook_hash_tl 2}
+%   ...
+%   {\c__hook_hash_tl <n>}
+%\end{verbatim}
+%   with \meta{n} being the number of arguments declared for the hook.
+%    \begin{macrocode}
+    \exp_last_unbraced:NNf
+    \cs_set:Npn \@@_tmp:w { \@@_parameter:n {#1} } { }
+    \tl_set:Ne \l_@@_tmpa_tl { \@@_braced_cs_parameter:n { @@_tmp:w } }
+%    \end{macrocode}
+%   Now this function does the fun part.  It is meant to be used with
+%   \cs{prop_map_function:NN}, taking a label name in \verb|##1| and the
+%   code stored in that label in \verb|##2|.
+%    \begin{macrocode}
+    \cs_gset_protected:Npx \@@_normalise_fn:nn ##1 ##2
+      {
+%    \end{macrocode}
+%   Here we'll define two auxiliary macros:  the first one throws an
+%   error when it detects an invalid argument reference.  It piggybacks
+%   on \TeX's low-level \enquote{Illegal parameter number} error, but it
+%   defines a weirdly-named control sequence so that the error comes out
+%   nicely formatted.  For example, if the label \enquote{badpkg} adds
+%   some code that references argument \verb|#3| in the hook
+%   \enquote{foo}, which takes only two arguments, the error will be:
+%\begin{verbatim}
+%   ! Illegal parameter number in definition of hook 'foo'.
+%   (hooks)             Offending label: 'badpkg'.
+%   <to be read again> 
+%                      3
+%\end{verbatim}
+%   At the point of this definition, the error is raised if the code
+%   happens to reference an invalid argument.  If it was possible to
+%   detect that this definition raised no error, the next step would be
+%   unnecessary.  We'll do all this in a group so this weird definition
+%   doesn't leak out, and set \cs{tex_escapechar:D} to $-1$ so this hack
+%   shows up extra nice in the case of an error.
+%    \begin{macrocode}
+        \group_begin:
+          \int_set:Nn \tex_escapechar:D { -1 }
+          \cs_set:cpn
+              {
+                hook~'#1'. ^^J
+                (hooks) \prg_replicate:nn { 13 } { ~ }
+                #2 % more message text
+              }
+              \exp_not:v { c_@@_#1_parameter_tl }
+            {##2}
+        \group_end:
+%    \end{macrocode}
+%   This next macro, with a much less fabulous name, takes always nine
+%   arguments, and it just transfers the code \verb|##2| under the label
+%   \verb|##1| to the temporary property list.  The first \meta{n}
+%   arguments are taken from \cs[no-index]{l_@@_tmpa_tl}, and the other
+%   $9-\meta{n}$ taken from \cs[no-index]{l_@@_tmpb_tl} (which contains
+%   twice as many \verb|#| tokens as the former).  Then,
+%   \cs{@@_double_hashes:n} is used to double non-argument hashes, and
+%   expand the \cs{c_@@_hash_tl} and \cs{c_@@_hashes_tl} to the actual
+%   parameter tokens.
+%    \begin{macrocode}
+        \cs_set:Npn \exp_not:N \@@_tmp:w
+            \exp_not:V \c_@@_nine_parameters_tl
+          {
+            \prop_put:Nne \exp_not:N \l_@@_work_prop
+              {##1} { \exp_not:N \@@_double_hashes:n {##2} }
+          }
+%    \end{macrocode}
+%   This next macro, with a much less fabulous name, takes always nine
+%   arguments, and it just transfers the code \verb|##2| under the label
+%   \verb|##1| to the temporary property list.  The first \meta{n}
+%   arguments are taken from \cs[no-index]{l_@@_tmpa_tl}, and the other
+%   $9-\meta{n}$ taken from \cs[no-index]{l_@@_tmpb_tl} (which contains
+%   twice as many \verb|#| tokens as the former).  Then,
+%   \cs{@@_double_hashes:n} is used to double non-argument hashes, and
+%   expand the \cs{c_@@_hash_tl} and \cs{c_@@_hashes_tl} to the actual
+%   parameter tokens.
+%    \begin{macrocode}
+        \exp_not:N \@@_tmp:w
+          \exp_not:V \l_@@_tmpa_tl
+          \exp_args:No \exp_not:o
+            { \exp_after:wN \@@_tmp:w \l_@@_tmpb_tl }
+      }
+  }
+\cs_new_eq:NN \@@_normalise_fn:nn ?
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_normalise_code_pool:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_normalise_code_pool:n
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[pTF]{\@@_cs_if_empty:c}
+%   Check if the expansion of a control sequence is empty by looking at
+%   its replacement text.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_cs_if_empty:c}
+%<latexrelease>                 {Hooks~with~args}
+\prg_new_conditional:Npnn \@@_cs_if_empty:c #1 { p, T, F, TF }
+  {
+    \if:w \scan_stop: \@@_replacement_spec:c {#1} \scan_stop:
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
+  }
+\cs_new:Npn \@@_replacement_spec:c #1
+  {
+    \exp_args:Nc \token_if_macro:NT {#1}
+      { \cs_replacement_spec:c {#1} }
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_cs_if_empty:c}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_cs_if_empty:c
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@@_braced_cs_parameter:n}
+% \begin{macro}{\@@_braced_hidden_loop:w}
+% \begin{macro}{\@@_cs_parameter_count:N}
+% \begin{macro}{\@@_cs_parameter_count:w,\@@_cs_end:w}
+%   Looks at the \meta{parameter text} of a control sequence, and
+%   returns a run of \enquote{hidden} braced parameters for that macro.
+%   This works as long as the macros take a simple run of zero to nine
+%   arguments.  The parameters are \enquote{hidden} because the
+%   parameter tokens are returned inside \cs{c_@@_hash_tl} instead of
+%   explicitly, so that \cs{@@_double_hashes:n} won't touch these.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_braced_cs_parameter:n}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new:Npn \@@_braced_cs_parameter:n #1
+  {
+    \exp_last_unbraced:Ne \@@_braced_hidden_loop:w
+      { \exp_args:Nc \@@_cs_parameter_count:N {#1} } ? \s_@@_mark
+  }
+\cs_new:Npn \@@_braced_hidden_loop:w #1
+  {
+    \if:w ? #1
+      \@@_use_i_delimit_by_s_mark:nw
+    \fi:
+    { \exp_not:N \c_@@_hash_tl #1 }
+    \@@_braced_hidden_loop:w
+  }
+\cs_new:Npn \@@_cs_parameter_count:N #1
+  {
+    \exp_last_unbraced:Nf \@@_cs_parameter_count:w
+      { \token_if_macro:NT #1 { \cs_parameter_spec:N #1 } }
+      ? \@@_cs_end:w ? \@@_cs_end:w ? \@@_cs_end:w
+      ? \@@_cs_end:w ? \@@_cs_end:w ? \@@_cs_end:w
+      ? \@@_cs_end:w ? \@@_cs_end:w ? \@@_cs_end:w
+      \s_@@_mark
+  }
+\cs_new:Npn \@@_cs_parameter_count:w #1#2 #3#4 #5#6 #7#8
+  { #2 #4 #6 #8 \@@_cs_parameter_count:w }
+\cs_new:Npn \@@_cs_end:w #1 \s_@@_mark { }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%   This function can't be undefined when rolling back because it's used
+%   at the end of this module to adequate the hook data structures to
+%   previous versions.
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_braced_cs_parameter:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@@_braced_parameter:n}
+% \begin{macro}{\@@_braced_real_loop:w}
+%   This one is used in simpler cases, where no special handling of
+%   hashes is required.  This is used only inside
+%   \cs{@@_initialize_hook_code:n}, so it assumes
+%   \cs[no-index]{c_@@_\meta{hook}_parameter_tl} is defined, but should
+%   work otherwise.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_braced_parameter:n}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new:Npn \@@_braced_parameter:n #1
+  {
+    \if_case:w
+      \int_eval:n
+        { \exp_args:Nv \str_count:n { c_@@_#1_parameter_tl } / 3 }
+      \exp_stop_f:
+    \or: {##1}
+    \or: {##1} {##2}
+    \or: {##1} {##2} {##3}
+    \or: {##1} {##2} {##3} {##4}
+    \or: {##1} {##2} {##3} {##4} {##5}
+    \or: {##1} {##2} {##3} {##4} {##5} {##6}
+    \or: {##1} {##2} {##3} {##4} {##5} {##6} {##7}
+    \or: {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8}
+    \or: {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8} {##9}
+    \else:
+      \msg_expandable_error:nnn { latex2e } { should-not-happen }
+        { Invalid~parameter~spec. }
+    \fi:
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_braced_parameter:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_braced_parameter:n
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@@_parameter:n}
+%   This is just a shortcut to \verb|e|- or \verb|f|-expand to the
+%   \meta{parameter text} of the hook.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_parameter:n}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new:Npn \@@_parameter:n #1
+  {
+    \cs:w c_@@_
+    \tl_if_exist:cTF { c_@@_#1_parameter_tl }
+      { #1_parameter } { empty }
+    _tl \cs_end:
+  }
+\cs_new:Npn \@@_generic_parameter:n #1
+  { \@@_generic_parameter:w #1 / / / \s_@@_mark }
+\cs_new:Npn \@@_generic_parameter:w #1 / #2 / #3 / #4 \s_@@_mark
+  {
+    \cs_if_exist_use:cF { c_@@_parameter_#1/./#3_tl }
+      { \c_@@_empty_tl }
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_parameter:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_parameter:n
+%<latexrelease>\cs_undefine:N \@@_generic_parameter:n
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%  \subsection{Setting rules for hooks code}
 %
 % \begin{macro}{
 %     \g_@@_??_code_prop,
 %     \@@~??,
 %     \g_@@_??_reversed_tl,
+%     \c_@@_??_parameter_tl,
 %   }
 %
 %    Initially these variables simply used an empty ``label'' name (not
@@ -3597,11 +4931,11 @@
 %    lot, the code should be fast, so this is not done with \texttt{c}
 %    expansion in the code later on.
 %
-%    \cs{@@\textvisiblespace??} isn't used, but it has to be defined to trick
-%    the code into thinking that \texttt{??} is actually a hook.
+%    \cs{@@\textvisiblespace??} isn't used, but it has to be defined to
+%    trick the code into thinking that \texttt{??} is actually a hook.
 %    \begin{macrocode}
-\prop_new:c {g_@@_??_code_prop}
-\prop_new:c {@@~??}
+\prop_new:c { g_@@_??_code_prop }
+\prop_new:c { @@~?? }
 %    \end{macrocode}
 %
 %    Default rules are always given in normal ordering (never in
@@ -3610,11 +4944,23 @@
 %    \texttt{after} becomes \texttt{before})
 %    because those rules are applied first and then the order is reversed.
 %    \begin{macrocode}
-\tl_new:c {g_@@_??_reversed_tl}
+\tl_new:c { g_@@_??_reversed_tl }
 %    \end{macrocode}
-%  \end{macro}
 %
-%  \subsection{Setting rules for hooks code}
+%    The parameter text for the \enquote{default} hook is empty.
+% \changes{v1.1a}{2023/04/06}
+%         {Token list added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\c_@@_??_parameter_tl}
+%<latexrelease>                 {Hooks~with~args}
+\tl_const:cn { c_@@_??_parameter_tl } { }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\c_@@_??_parameter_tl}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:c { c_@@_??_parameter_tl }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%  \end{macro}
 %
 %  \begin{macro}{\hook_gset_rule:nnnn}
 %  \begin{macro}{\@@_gset_rule:nnnn}
@@ -3645,13 +4991,13 @@
         \@@_deprecated_generic_warn:n {#1}
         \@@_do_deprecated_generic:Nn \@@_gset_rule:nnnn {#1}
           {#2} {#3} {#4}
-        \@@_clean_to_scan:w
+        \@@_use_none_delimit_by_s_mark:w
       }
     \@@_if_execute_immediately:nT {#1}
       {
         \msg_error:nnnnnn { hooks } { rule-too-late }
           {#1} {#2} {#3} {#4}
-        \@@_clean_to_scan:w
+        \@@_use_none_delimit_by_s_mark:w
       }
 %    \end{macrocode}
 %    First we ensure the basic data structure of the hook exists:
@@ -3840,44 +5186,82 @@
 %  \begin{macro}{\@@_initialize_all:}
 %    Initialize all known hooks (at \verb=\begin{document}=), i.e.,
 %    update the fast execution token lists to hold the necessary code
-%    in the right  order.
+%    in the right order.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_initialize_all: {
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_initialize_all:}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_initialize_all:
+  {
 %    \end{macrocode}
 %    First we change \cs{@@_update_hook_code:n} which so far was a
 %    no-op to now initialize one hook. This way any later updates to
 %    the hook will run that code and also update the execution token
 %    list.
 %    \begin{macrocode}
-  \cs_gset_eq:NN \@@_update_hook_code:n \@@_initialize_hook_code:n
+    \cs_gset_eq:NN \@@_update_hook_code:n \@@_initialize_hook_code:n
 %    \end{macrocode}
 %    Now we loop over all hooks that have been defined and update each
-%    of them.
+%    of them.  Here we have to determine if the hook has arguments so
+%    that auxiliaries know what to do with hashes.  We look at
+%    \cs[no-index]{c_@@_\meta{hook}_parameter_tl}, if it has any
+%    parameters, and set \verb|replacing_args| accordingly.
 %    \begin{macrocode}
-  \@@_debug:n { \prop_gclear:N \g_@@_used_prop }
-  \seq_map_inline:Nn \g_@@_all_seq
+    \@@_debug:n { \prop_gclear:N \g_@@_used_prop }
+    \seq_map_inline:Nn \g_@@_all_seq
       {
+        \tl_if_empty:cTF { c_@@_##1_parameter_tl }
+          { \@@_replacing_args_false: }
+          { \@@_replacing_args_true: }
         \@@_update_hook_code:n {##1}
+        \@@_replacing_args_reset:
       }
 %    \end{macrocode}
 %    If we are debugging we show results hook by hook for all hooks
 %    that have data.
 %    \begin{macrocode}
-  \@@_debug:n
-     { \iow_term:x{^^JAll~ initialized~ (non-empty)~ hooks:}
-       \prop_map_inline:Nn \g_@@_used_prop
-           { \iow_term:x{^^J~ ##1~ ->~
-               \exp_not:v {@@~##1}~ }
-           }
-     }
+    \@@_debug:n
+      {
+        \iow_term:x { ^^J All~initialized~(non-empty)~hooks: }
+        \prop_map_inline:Nn \g_@@_used_prop
+          {
+            \iow_term:x
+              { ^^J ~ ##1 ~ -> ~ \cs_replacement_spec:c { @@~##1 } ~ }
+          }
+      }
 %    \end{macrocode}
 %    After all hooks are initialized we change the ``use'' to just
 %    call the hook code and not initialize it (as it was done in the
 %    preamble.
 %    \begin{macrocode}
-  \cs_gset_eq:NN \hook_use:n \@@_use_initialized:n
-  \cs_gset_eq:NN \@@_preamble_hook:n \use_none:n
-}
+    \@@_post_initialization_defs:
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_initialize_all:}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_initialize_all:
+%<latexrelease>  {
+%<latexrelease>    \cs_gset_eq:NN \@@_update_hook_code:n \@@_initialize_hook_code:n
+%<latexrelease>    \@@_debug:n { \prop_gclear:N \g_@@_used_prop }
+%<latexrelease>    \seq_map_inline:Nn \g_@@_all_seq
+%<latexrelease>      { \@@_update_hook_code:n {##1} }
+%<latexrelease>    \@@_debug:n
+%<latexrelease>      {
+%<latexrelease>        \iow_term:x{^^JAll~ initialized~ (non-empty)~ hooks:}
+%<latexrelease>        \prop_map_inline:Nn \g_@@_used_prop
+%<latexrelease>          {
+%<latexrelease>            \iow_term:x
+%<latexrelease>              { ^^J ~ ##1 ~ -> ~ \cs_replacement_spec:c { @@~##1 } ~ }
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>    \cs_gset_eq:NN \hook_use:n \@@_use_initialized:n
+%<latexrelease>    \cs_gset_eq:NN \@@_preamble_hook:n \use_none:n
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -3887,7 +5271,11 @@
 %    the preamble this is selectively done in case a hook gets used
 %    and at \verb=\begin{document}= this is done for all hooks and
 %    afterwards only if the hook code changes.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_initialize_hook_code:n}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_initialize_hook_code:n #1
   {
     \@@_debug:n
@@ -3915,10 +5303,15 @@
       {
         \prop_if_empty:cTF { g_@@_#1_code_prop }
           {
-            \@@_tl_gset:co { @@~#1 }
+            \@@_code_gset:ne {#1}
               {
-                \cs:w @@_toplevel~#1 \exp_after:wN \cs_end:
-                \cs:w @@_next~#1 \cs_end:
+%    \end{macrocode}
+%   The hook may take arguments, so we add a run of braced parameters
+%   after the \verb|_next| and \verb|_toplevel| macros, so that the
+%   arguments passed to the hook are forwarded to them.
+%    \begin{macrocode}
+                \exp_not:c { @@_toplevel~#1 } \@@_braced_parameter:n {#1}
+                \exp_not:c { @@_next~#1 } \@@_braced_parameter:n {#1}
               }
           }
           {
@@ -3958,6 +5351,42 @@
           }
       }
   }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_initialize_hook_code:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_initialize_hook_code:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_debug:n
+%<latexrelease>      { \iow_term:x { ^^J Update~code~for~hook~'#1' \on@line :^^J } }
+%<latexrelease>    \@@_include_legacy_code_chunk:n {#1}
+%<latexrelease>    \@@_if_usable:nT {#1}
+%<latexrelease>      {
+%<latexrelease>        \prop_if_empty:cTF { g_@@_#1_code_prop }
+%<latexrelease>          {
+%<latexrelease>            \@@_tl_gset:co { @@~#1 }
+%<latexrelease>              {
+%<latexrelease>                \cs:w @@_toplevel~#1 \exp_after:wN \cs_end:
+%<latexrelease>                \cs:w @@_next~#1 \cs_end:
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>          {
+%<latexrelease>            \@@_if_reversed:nTF {#1}
+%<latexrelease>              { \cs_set_eq:NN \@@_tl_gput:Nn    \@@_tl_gput_left:Nn
+%<latexrelease>                \cs_set_eq:NN \@@_clist_gput:NV \clist_gput_left:NV  }
+%<latexrelease>              { \cs_set_eq:NN \@@_tl_gput:Nn    \@@_tl_gput_right:Nn
+%<latexrelease>                \cs_set_eq:NN \@@_clist_gput:NV \clist_gput_right:NV }
+%<latexrelease>            \prop_set_eq:Nc \l_@@_work_prop { g_@@_#1_code_prop }
+%<latexrelease>            \@@_initialize_single:ccn
+%<latexrelease>              { @@~#1 } { g_@@_#1_labels_clist } {#1}
+%<latexrelease>            \@@_debug:n
+%<latexrelease>              { \exp_args:NNx \prop_gput:Nnn \g_@@_used_prop {#1} { } }
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -4034,7 +5463,12 @@
 %    ^^A #1 <- \@@~#1
 %    ^^A #2 <- \g_@@_#1_labels_clist
 %    ^^A #3 <- #1
+%
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_initialize_single:NNn}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_initialize_single:NNn #1#2#3
   {
 %    \end{macrocode}
@@ -4181,15 +5615,103 @@
 %    time execution (\verb=#3=).  These should normally be empty.  The
 %    |top-level| code is added with \cs{@@_tl_gput:Nn} as that might
 %    change for a reversed hook (then |top-level| is the very first code
-%    chunk added).  The |next| code is always added last.
-%    \begin{macrocode}
-    \exp_args:NNo \@@_tl_gput:Nn #1 { \cs:w @@_toplevel~#3 \cs_end: }
-    \@@_tl_gput_right:No #1 { \cs:w @@_next~#3 \cs_end: }
+%    chunk added).  The |next| code is always added last (to the right).
+%   The hook may take arguments, so we add a run of braced parameters
+%   after the \verb|_next| and \verb|_toplevel| macros, so that the
+%   arguments passed to the hook are forwarded to them.
+%    \begin{macrocode}
+    \exp_args:NNe \@@_tl_gput:Nn #1
+      { \exp_not:c { @@_toplevel~#3 } \@@_braced_parameter:n {#3} }
+    \@@_tl_gput_right:Ne #1
+      { \exp_not:c { @@_next~#3 } \@@_braced_parameter:n {#3} }
+    \use:e
+      {
+        \cs_gset:cpn { @@~#3 } \use:c { c_@@_#3_parameter_tl }
+          { \exp_not:V #1 }
+      }
   }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 \cs_generate_variant:Nn \@@_initialize_single:NNn { cc }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_initialize_single:NNn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \@@_initialize_single:NNn #1#2#3
+%<latexrelease>  {
+%<latexrelease>    \seq_clear:N \l_@@_labels_seq
+%<latexrelease>    \int_zero:N  \l_@@_labels_int
+%<latexrelease>    \tl_set:Nn \l_@@_cur_hook_tl {#3}
+%<latexrelease>    \prop_map_inline:Nn \l_@@_work_prop
+%<latexrelease>       {
+%<latexrelease>         \int_incr:N \l_@@_labels_int
+%<latexrelease>         \seq_put_right:Nn \l_@@_labels_seq {##1}
+%<latexrelease>         \@@_tl_set:cn { \@@_tl_csname:n {##1} } { 0 }
+%<latexrelease>         \seq_clear_new:c { \@@_seq_csname:n {##1} }
+%<latexrelease>       }
+%<latexrelease>    \prop_map_inline:Nn \l_@@_work_prop
+%<latexrelease>      {
+%<latexrelease>        \prop_map_inline:Nn \l_@@_work_prop
+%<latexrelease>          {
+%<latexrelease>            \@@_if_label_case:nnnnn {##1} {####1}
+%<latexrelease>              { \prop_map_break: }
+%<latexrelease>              { \@@_apply_label_pair:nnn {##1} {####1} }
+%<latexrelease>              { \@@_apply_label_pair:nnn {####1} {##1} }
+%<latexrelease>                  {#3}
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>    \@@_debug:n { \@@_debug_label_data:N \l_@@_work_prop }
+%<latexrelease>    \tl_set:Nn \l_@@_rear_tl { 0 }
+%<latexrelease>    \tl_set:cn { \@@_tl_csname:n { 0 } } { 0 }
+%<latexrelease>    \seq_map_inline:Nn \l_@@_labels_seq
+%<latexrelease>      {
+%<latexrelease>        \int_compare:nNnT { \cs:w \@@_tl_csname:n {##1} \cs_end: } = 0
+%<latexrelease>            {
+%<latexrelease>              \tl_set:cn { \@@_tl_csname:n { \l_@@_rear_tl } }{##1}
+%<latexrelease>              \tl_set:Nn \l_@@_rear_tl {##1}
+%<latexrelease>            }
+%<latexrelease>      }
+%<latexrelease>    \tl_set_eq:Nc \l_@@_front_tl { \@@_tl_csname:n { 0 } }
+%<latexrelease>    \@@_tl_gclear:N #1
+%<latexrelease>    \clist_gclear:N #2
+%<latexrelease>    \bool_while_do:nn { ! \str_if_eq_p:Vn \l_@@_front_tl { 0 } }
+%<latexrelease>      {
+%<latexrelease>        \int_decr:N \l_@@_labels_int
+%<latexrelease>        \prop_get:NVN \l_@@_work_prop \l_@@_front_tl \l_@@_return_tl
+%<latexrelease>        \exp_args:NNV \@@_tl_gput:Nn #1 \l_@@_return_tl
+%<latexrelease>        \@@_clist_gput:NV #2 \l_@@_front_tl
+%<latexrelease>        \@@_debug:n{ \iow_term:x{Handled~ code~ for~ \l_@@_front_tl} }
+%<latexrelease>        \seq_map_inline:cn { \@@_seq_csname:n { \l_@@_front_tl } }
+%<latexrelease>          {
+%<latexrelease>            \tl_set:cx { \@@_tl_csname:n {##1} }
+%<latexrelease>                       { \int_eval:n
+%<latexrelease>                           { \cs:w \@@_tl_csname:n {##1} \cs_end: - 1 }
+%<latexrelease>                       }
+%<latexrelease>            \int_compare:nNnT
+%<latexrelease>                { \cs:w \@@_tl_csname:n {##1} \cs_end: } = 0
+%<latexrelease>                {
+%<latexrelease>                  \tl_set:cn { \@@_tl_csname:n { \l_@@_rear_tl } } {##1}
+%<latexrelease>                  \tl_set:Nn \l_@@_rear_tl            {##1}
+%<latexrelease>                }
+%<latexrelease>          }
+%<latexrelease>        \tl_set_eq:Nc \l_@@_front_tl
+%<latexrelease>                      { \@@_tl_csname:n { \l_@@_front_tl } }
+%<latexrelease>      }
+%<latexrelease>    \int_compare:nNnF \l_@@_labels_int = 0
+%<latexrelease>      {
+%<latexrelease>        \iow_term:x{====================}
+%<latexrelease>        \iow_term:x{Error:~ label~ rules~ are~ incompatible:}
+%<latexrelease>        \@@_debug_label_data:N \l_@@_work_prop
+%<latexrelease>        \iow_term:x{====================}
+%<latexrelease>      }
+%<latexrelease>    \exp_args:NNo \@@_tl_gput:Nn #1 { \cs:w @@_toplevel~#3 \cs_end: }
+%<latexrelease>    \@@_tl_gput_right:No #1 { \cs:w @@_next~#3 \cs_end: }
+%<latexrelease>  }
+%<latexrelease>\cs_generate_variant:Nn \@@_tl_gput_right:Nn { No }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -4444,7 +5966,11 @@
   { \@@_log_cmd:x { >~\@spaces #1 } }
 %    \end{macrocode}
 %
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_log:nN}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_log:nN #1 #2
   {
     \@@_if_deprecated_generic:nT {#1}
@@ -4455,7 +5981,20 @@
       }
     \@@_preamble_hook:n {#1}
     \@@_log_cmd:x
-      { ^^J ->~The~ \@@_if_generic:nT {#1} { generic~ } hook~'#1': }
+      {
+        ^^J ->~The~
+        \@@_if_generic:nT {#1} { generic~ }
+        hook~'#1'
+        \@@_if_disabled:nF {#1}
+          {
+            \exp_args:Nf \@@_print_args:nn {#1}
+              {
+                \int_eval:n
+                  { \str_count:e { \@@_parameter:n {#1} } / 3 }
+              }
+          }
+        :
+      }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -4471,7 +6010,12 @@
           { \@@_log_line_indent:x { --- } }
           {
             \prop_map_inline:cn { g_@@_#1_code_prop }
-              { \@@_log_line_indent:x { ##1~->~\tl_to_str:n {##2} } }
+              {
+                \exp_after:wN \cs_set:Npn \exp_after:wN \@@_tmp:w
+                  \c_@@_nine_parameters_tl {##2}
+                \@@_log_line_indent:x
+                  { ##1~->~\cs_replacement_spec:N \@@_tmp:w }
+              }
           }
 %    \end{macrocode}
 %
@@ -4485,9 +6029,9 @@
           }
         \@@_log_line_indent:x
           {
-            \tl_if_empty:cTF { @@_toplevel~#1 }
+            \@@_cs_if_empty:cTF { @@_toplevel~#1 }
               { --- }
-              { -> ~ \exp_args:Nv \tl_to_str:n { @@_toplevel~#1 } }
+              { -> ~ \cs_replacement_spec:c { @@_toplevel~#1 } }
           }
 %    \end{macrocode}
 %
@@ -4495,7 +6039,7 @@
         \@@_log_line:x { Extra~code~for~next~invocation: }
         \@@_log_line_indent:x
           {
-            \tl_if_empty:cTF { @@_next~#1 }
+            \@@_cs_if_empty:cTF { @@_next~#1 }
               { --- }
 %    \end{macrocode}
 %
@@ -4503,7 +6047,10 @@
 %    the first tokens (the code to clear itself) so we call a helper
 %    command to  get rid of them.
 %    \begin{macrocode}
-              { ->~ \exp_args:Nv \@@_log_next_code:n { @@_next~#1 } }
+              {
+                -> ~ \exp_last_unbraced:Nf \@@_log_next_code:w
+                  { \cs_replacement_spec:c { @@_next~#1 } }
+              }
           }
 %    \end{macrocode}
 %
@@ -4549,7 +6096,7 @@
                 \@spaces
                 \clist_if_empty:cTF { g_@@_#1_labels_clist }
                   { --- }
-                  { \clist_use:cn {g_@@_#1_labels_clist} { ,~ } }
+                  { \clist_use:cn { g_@@_#1_labels_clist } { ,~ } }
               }
           }
           {
@@ -4563,15 +6110,139 @@
           }
       }
   }
+%<latexrelease>\EndIncludeInRelease
+%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_log:nN}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \@@_log:nN #1 #2
+%<latexrelease>  {
+%<latexrelease>    \@@_if_deprecated_generic:nT {#1}
+%<latexrelease>      {
+%<latexrelease>        \@@_deprecated_generic_warn:n {#1}
+%<latexrelease>        \@@_do_deprecated_generic:Nn \@@_log:nN {#1} #2
+%<latexrelease>        \exp_after:wN \use_none:nnnnnnnnn \use_none:nnnnn
+%<latexrelease>      }
+%<latexrelease>    \@@_preamble_hook:n {#1}
+%<latexrelease>    \@@_log_cmd:x
+%<latexrelease>      { ^^J ->~The~ \@@_if_generic:nT {#1} { generic~ } hook~'#1': }
+%<latexrelease>    \@@_if_usable:nF {#1}
+%<latexrelease>      { \@@_log_line:x { The~hook~is~not~declared. } }
+%<latexrelease>    \@@_if_disabled:nT {#1}
+%<latexrelease>      { \@@_log_line:x { The~hook~is~disabled. } }
+%<latexrelease>    \hook_if_empty:nTF {#1}
+%<latexrelease>      { #2 { The~hook~is~empty } }
+%<latexrelease>      {
+%<latexrelease>        \@@_log_line:x { Code~chunks: }
+%<latexrelease>        \prop_if_empty:cTF { g_@@_#1_code_prop }
+%<latexrelease>          { \@@_log_line_indent:x { --- } }
+%<latexrelease>          {
+%<latexrelease>            \prop_map_inline:cn { g_@@_#1_code_prop }
+%<latexrelease>              { \@@_log_line_indent:x { ##1~->~\tl_to_str:n {##2} } }
+%<latexrelease>          }
+%<latexrelease>        \@@_log_line:x
+%<latexrelease>          {
+%<latexrelease>            Document-level~(top-level)~code
+%<latexrelease>            \@@_if_usable:nT {#1}
+%<latexrelease>              { ~(executed~\@@_if_reversed:nTF {#1} {first} {last} ) } :
+%<latexrelease>          }
+%<latexrelease>        \@@_log_line_indent:x
+%<latexrelease>          {
+%<latexrelease>            \tl_if_empty:cTF { @@_toplevel~#1 }
+%<latexrelease>              { --- }
+%<latexrelease>              { -> ~ \exp_args:Nv \tl_to_str:n { @@_toplevel~#1 } }
+%<latexrelease>          }
+%<latexrelease>        \@@_log_line:x { Extra~code~for~next~invocation: }
+%<latexrelease>        \@@_log_line_indent:x
+%<latexrelease>          {
+%<latexrelease>            \tl_if_empty:cTF { @@_next~#1 }
+%<latexrelease>              { --- }
+%<latexrelease>              { ->~ \exp_args:Nv \@@_log_next_code:n { @@_next~#1 } }
+%<latexrelease>          }
+%<latexrelease>        \@@_log_line:x { Rules: }
+%<latexrelease>        \bool_set_true:N \l_@@_tmpa_bool
+%<latexrelease>        \@@_list_rules:nn {#1}
+%<latexrelease>          {
+%<latexrelease>            \bool_set_false:N \l_@@_tmpa_bool
+%<latexrelease>            \@@_log_line_indent:x
+%<latexrelease>              {
+%<latexrelease>                ##2~ with~
+%<latexrelease>                \str_if_eq:nnT {##3} {??} { default~ }
+%<latexrelease>                relation~ ##1
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>        \bool_if:NT \l_@@_tmpa_bool
+%<latexrelease>          { \@@_log_line_indent:x { --- } }
+%<latexrelease>        \bool_lazy_and:nnTF
+%<latexrelease>            { \@@_if_usable_p:n {#1} }
+%<latexrelease>            { ! \hook_if_empty_p:n {#1} }
+%<latexrelease>          {
+%<latexrelease>            \@@_log_line:x
+%<latexrelease>              {
+%<latexrelease>                Execution~order
+%<latexrelease>                \bool_if:NTF \l_@@_tmpa_bool
+%<latexrelease>                  { \@@_if_reversed:nT {#1} { ~(after~reversal) } }
+%<latexrelease>                  { ~(after~
+%<latexrelease>                    \@@_if_reversed:nT {#1} { reversal~and~ }
+%<latexrelease>                    applying~rules)
+%<latexrelease>                  } :
+%<latexrelease>              }
+%<latexrelease>            #2 % \tl_show:n
+%<latexrelease>              {
+%<latexrelease>                \@spaces
+%<latexrelease>                \clist_if_empty:cTF { g_@@_#1_labels_clist }
+%<latexrelease>                  { --- }
+%<latexrelease>                  { \clist_use:cn { g_@@_#1_labels_clist } { ,~ } }
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>          {
+%<latexrelease>            \@@_log_line:x { Execution~order: }
+%<latexrelease>            #2
+%<latexrelease>              {
+%<latexrelease>                \@spaces Not~set~because~the~hook~ \@@_if_usable:nTF {#1}
+%<latexrelease>                  { code~pool~is~empty }
+%<latexrelease>                  { is~\@@_if_disabled:nTF {#1} {disabled} {undeclared} }
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
 % \begin{macro}{\@@_log_next_code:n}
 %    To display the code for next invocation only (i.e., from
-%    \cs{AddToHookNext} we have to remove the first two tokens at the
-%    front which are \cs{tl_gclear:N} and the token list to clear.
+%    \cs{AddToHookNext} we have to remove the string
+%    \cs{@@_clear_next:n}\Arg{hook}, so the simplest is to use a macro
+%    delimited by a \verb|}|$_12$.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_log_next_code:n}
+%<latexrelease>                 {Hooks~with~args}
+\exp_last_unbraced:NNNNo
+\cs_new:Npn \@@_log_next_code:w #1 \c_right_brace_str { }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_log_next_code:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset:Npn \@@_log_next_code:n #1
+%<latexrelease>  { \exp_args:No \tl_to_str:n { \use_none:nn #1 } }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_print_args:n}
+%    Pretty-prints the number of arguments of a hook.
 %    \begin{macrocode}
-\cs_new:Npn \@@_log_next_code:n #1
-  { \exp_args:No \tl_to_str:n { \use_none:nn #1 } }
+\cs_new:Npn \@@_print_args:nn #1 #2
+  {
+    \int_compare:nNnT {#2} > { 0 }
+      {
+        \@@_if_declared:nT {#1} { \use_none:nnn }
+        \@@_if_cmd_hook:nT {#1}
+          { \use_i:nnn { ~ (unknown ~ } }
+        \use:n { ~ (#2 ~ }
+        argument \int_compare:nNnT {#2} > { 1 } { s } )
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4656,15 +6327,34 @@
 %  \subsection{Specifying code for next invocation}
 %
 % \begin{macro}{\hook_gput_next_code:nn}
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_gput_next_code_with_args:nn} (hook-args).}
 %    \begin{macrocode}
-\cs_new_protected:Npn \hook_gput_next_code:nn #1
-  { \@@_normalize_hook_args:Nn \@@_gput_next_code:nn {#1} }
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_gput_next_code:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \hook_gput_next_code:nn #1 #2
+  {
+    \@@_replacing_args_false:
+    \@@_normalize_hook_args:Nn \@@_gput_next_code:nn {#1} {#2}
+    \@@_replacing_args_reset:
+  }
+\cs_new_protected:Npn \hook_gput_next_code_with_args:nn #1 #2
+  {
+    \@@_replacing_args_true:
+    \@@_normalize_hook_args:Nn \@@_gput_next_code:nn {#1} {#2}
+    \@@_replacing_args_reset:
+  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_gput_next_code:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \hook_gput_next_code:nn #1
+%<latexrelease>  { \@@_normalize_hook_args:Nn \@@_gput_next_code:nn {#1} }
+%<latexrelease>\cs_gset_protected:Npn \hook_gput_next_code_with_args:nn #1 #2 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
-% \begin{macro}{\@@_gput_next_code:nn,
-%               \@@_gput_next_do:nn,
-%               \@@_gput_next_do:Nnn}
+% \begin{macro}{\@@_gput_next_code:nn}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_gput_next_code:nn #1 #2
   {
@@ -4672,20 +6362,17 @@
       { \msg_error:nnn { hooks } { hook-disabled } {#1} }
       {
         \@@_if_structure_exist:nTF {#1}
-          { \@@_gput_next_do:nn {#1} {#2} }
-          { \@@_try_declaring_generic_next_hook:nn {#1} {#2} }
+          { \@@_gput_next_do:nn }
+          { \@@_try_declaring_generic_next_hook:nn }
+              {#1} {#2}
       }
   }
 %    \end{macrocode}
+%  \end{macro}
 %
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_gput_next_do:nn #1
-  {
-    \exp_args:Nc \@@_gput_next_do:Nnn
-      { @@_next~#1 } {#1}
-  }
-%    \end{macrocode}
-%   First check if the ``next code'' token list is empty:  if so we need
+% \begin{macro}{\@@_gput_next_do:nn}
+%   Start by sanity-checking with \cs{@@_chk_args_allowed:nn}.
+%   Then check if the ``next code'' token list is empty:  if so we need
 %   to add a \cs{tl_gclear:c} to clear it, so the code lasts for one
 %   usage only.  The token list is cleared early so that nested usages
 %   don't get lost.  \cs{tl_gclear:c} is used instead of
@@ -4694,38 +6381,74 @@
 %   that would make an infinite loop.  Also in case the main code token
 %   list is empty, the hook code has to be updated to add the next
 %   execution token list.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
+% \changes{v1.1c}{2023/04/19}
+%         {Initialise hook structure when adding 'next' code (gh/1052).}
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_gput_next_do:Nnn #1 #2
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_gput_next_do:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_gput_next_do:nn #1
   {
-    \tl_if_empty:cT { @@~#2 }
-      { \@@_update_hook_code:n {#2} }
-    \tl_if_empty:NT #1
-      { \@@_tl_gset:Nn #1 { \@@_clear_next:n {#2} } }
-    \@@_tl_gput_right:Nn #1
+    \@@_init_structure:n {#1}
+    \@@_chk_args_allowed:nn {#1} { AddToHookNext }
+    \@@_cs_if_empty:cT { @@~#1 }
+      { \@@_update_hook_code:n {#1} }
+    \@@_cs_if_empty:cT { @@_next~#1 }
+      { \@@_next_gset:nn {#1} { \@@_clear_next:n {#1} } }
+    \@@_cs_gput_right:nnn { _next } {#1}
   }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_gput_next_do:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_gput_next_do:nn #1
+%<latexrelease>  {
+%<latexrelease>    \exp_args:Nc \@@_gput_next_do:Nnn
+%<latexrelease>      { @@_next~#1 } {#1}
+%<latexrelease>  }
+%<latexrelease>\cs_gset_protected:Npn \@@_gput_next_do:Nnn #1 #2
+%<latexrelease>  {
+%<latexrelease>    \tl_if_empty:cT { @@~#2 }
+%<latexrelease>      { \@@_update_hook_code:n {#2} }
+%<latexrelease>    \tl_if_empty:NT #1
+%<latexrelease>      { \@@_tl_gset:Nn #1 { \@@_clear_next:n {#2} } }
+%<latexrelease>    \@@_tl_gput_right:Nn #1
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
-%
-%
-%  \begin{macro}{\hook_gclear_next_code:n,\@@_clear_next:n}
+%  \begin{macro}{\hook_gclear_next_code:n}
 %    Discard anything set up for next invocation of the hook.
 % \changes{v1.0o}{2021/07/27}{Macro made public}
 %    \begin{macrocode}
 \cs_new_protected:Npn \hook_gclear_next_code:n #1
   { \@@_normalize_hook_args:Nn \@@_clear_next:n {#1} }
-\cs_new_protected:Npn \@@_clear_next:n #1
-  { \cs_gset_eq:cN { @@_next~#1 } \c_empty_tl }
 %    \end{macrocode}
 %  \end{macro}
 %
+% \begin{macro}{\@@_clear_next:n}
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_clear_next:n}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_clear_next:n #1
+  { \@@_next_gset:nn {#1} { } }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_clear_next:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_clear_next:n #1
+%<latexrelease>  { \cs_gset_eq:cN { @@_next~#1 } \c_empty_tl }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
 %
 %
 % \subsection{Using the hook}
 %
 % \begin{macro}{\hook_use:n}
 % \begin{macro}[EXP]{\@@_use_initialized:n}
-% \begin{macro}{\@@_use_undefined:w,\@@_use_end:}
 % \begin{macro}{\@@_preamble_hook:n}
 %   \cs{hook_use:n} as defined here is used in the preamble, where
 %   hooks aren't initialized by default.  \cs{@@_use_initialized:n} is
@@ -4750,24 +6473,50 @@
 %   \verb=\csname ...\endcsname= construct \cs{tl_if_exist:c} is
 %   careful to avoid this.
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}{\hook_use:n}
-%<latexrelease>                 {Standardise~generic~hook~names}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_use:n}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \hook_use:n #1
   {
-    \tl_if_exist:cT { @@~#1 }
-      {
-        \@@_preamble_hook:n {#1}
-        \cs:w @@~#1 \cs_end:
-      }
+    \@@_preamble_hook:n {#1}
+    \@@_use_initialized:n {#1}
   }
 \cs_new:Npn \@@_use_initialized:n #1
   {
     \if_cs_exist:w @@~#1 \cs_end:
-      \cs:w @@~#1 \exp_after:wN \cs_end:
+      \cs:w @@~#1 \use_i:nn
     \fi:
+    \use_none:n
+    \cs_end:
   }
 \cs_new_protected:Npn \@@_preamble_hook:n #1
-  { \@@_initialize_hook_code:n {#1} }
+  {
+    \if_cs_exist:w @@~#1 \cs_end:
+      \@@_initialize_hook_code:n {#1}
+    \fi:
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2021/11/15}{\hook_use:n}
+%<latexrelease>                 {Standardise~generic~hook~names}
+%<latexrelease>\cs_new_protected:Npn \hook_use:n #1
+%<latexrelease>  {
+%<latexrelease>    \tl_if_exist:cT { @@~#1 }
+%<latexrelease>      {
+%<latexrelease>        \@@_preamble_hook:n {#1}
+%<latexrelease>        \cs:w @@~#1 \cs_end:
+%<latexrelease>      }
+%<latexrelease>  }
+%<latexrelease>\cs_new:Npn \@@_use_initialized:n #1
+%<latexrelease>  {
+%<latexrelease>    \if_cs_exist:w @@~#1 \cs_end:
+%<latexrelease>      \cs:w @@~#1 \exp_after:wN \cs_end:
+%<latexrelease>    \fi:
+%<latexrelease>  }
+%<latexrelease>\cs_new_protected:Npn \@@_preamble_hook:n #1
+%<latexrelease>  { \@@_initialize_hook_code:n {#1} }
+%<latexrelease>\cs_new:Npn \hook_use:nnw #1 { }
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
@@ -4799,13 +6548,69 @@
 %<latexrelease>\cs_new_protected:Npn \@@_preamble_hook:n #1
 %<latexrelease>  { \@@_initialize_hook_code:n {#1} }
 %<latexrelease>\cs_new_eq:NN \@@_use_end: \cs_end:
+%<latexrelease>\cs_new:Npn \hook_use:nnw #1 { }
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
+%
+%
+% \begin{macro}{\hook_use:nnw}
+% \begin{macro}[EXP]{\@@_use_initialized:nnw}
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_use:nnw} (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_use:nnw}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \hook_use:nnw #1
+  {
+    \@@_preamble_hook:n {#1}
+    \@@_use_initialized:nnw {#1}
+  }
+\cs_new:Npn \@@_use_initialized:nnw #1 #2
+  {
+    \cs:w
+      \if_cs_exist:w @@~#1 \cs_end:
+        @@~#1
+      \else:
+        use_none: \prg_replicate:nn {#2} { n }
+      \fi:
+    \cs_end:
+  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_use:nnw}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset:Npn \hook_use:nnw #1 #2
+%<latexrelease>  { \use:c { use_none: \prg_replicate:nn {#2} { n } } }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\@@_post_initialization_defs:}
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_post_initialization_defs:}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_post_initialization_defs:
+  {
+    \cs_gset_eq:NN \hook_use:n \@@_use_initialized:n
+    \cs_gset_eq:NN \hook_use:nnw \@@_use_initialized:nnw
+    \cs_gset_eq:NN \@@_preamble_hook:n \use_none:n
+    \cs_gset_eq:NN \@@_post_initialization_defs: \prg_do_nothing:
+  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_post_initialization_defs:}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_post_initialization_defs:
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
 % \end{macro}
 %
+%
 % \begin{macro}[EXP]{\@@_use:wn}
 % \begin{macro}{\@@_try_file_hook:n,\@@_if_usable_use:n}
 %   \cs{@@_use:wn} does a quick check to test if the current hook is a
@@ -4861,8 +6666,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\hook_use_once:n}
-% \begin{macro}{\@@_use_once:n}
+% \begin{macro}{\hook_use_once:n,\hook_use_once:nnw}
 %   For hooks that can and should be used only once we have a special
 %   use command that further inhibits the hook from getting more code
 %   added to it.  This has the effect that any
@@ -4874,20 +6678,80 @@
 %   documented to not trim spaces.
 %
 % \changes{v1.0r}{2021/09/06}{Clean up after \cs{UseOneTimeHook} (gh/606)}
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{hook_use_once:nnw} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_use_once:nnw}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \hook_use_once:n #1
   {
     \@@_if_execute_immediately:nF {#1}
-      { \@@_normalize_hook_args:Nn \@@_use_once:n { \use:n {#1} } }
+      { \@@_normalize_hook_args:Nn \@@_use_once:nn { \use:n {#1} } { 0 } }
   }
-\cs_new_protected:Npn \@@_use_once:n #1
+\cs_new_protected:Npn \hook_use_once:nnw #1 #2
+  {
+    \@@_if_execute_immediately:nF {#1}
+      { \@@_normalize_hook_args:Nn \@@_use_once:nn { \use:n {#1} } {#2} }
+  }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_use_once:nnw}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \hook_use_once:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_if_execute_immediately:nF {#1}
+%<latexrelease>      { \@@_normalize_hook_args:Nn \@@_use_once:n { \use:n {#1} } }
+%<latexrelease>  }
+%<latexrelease>\cs_gset:Npn \hook_use_once:nnw #1 #2
+%<latexrelease>  { \use:c { use_none: \prg_replicate:nn {#2} { n } } }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+% \begin{macro}{\@@_use_once:nn}
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_use_once:nn}
+%<latexrelease>                 {Hooks~with~args}
+\cs_new_protected:Npn \@@_use_once:nn #1 #2
   {
     \@@_preamble_hook:n {#1}
     \@@_use_once_set:n {#1}
-    \@@_use_initialized:n {#1}
-    \@@_use_once_clear:n {#1}
+%    \end{macrocode}
+%   When a hook has arguments, the call to \cs{@@_use_initialized:n},
+%   should be the very last thing to happen, otherwise the arguments
+%   grabbed will be wrong.  So, to clean up after the hook we need to
+%   cheat a bit and sneak the cleanup code at the end of the hook,
+%   along with the next execution code.
+%    \begin{macrocode}
+    \@@_replacing_args_false:
+    \@@_cs_gput_right:nnn { _next } {#1} { \@@_use_once_clear:n {#1} }
+    \@@_replacing_args_reset:
+    \@@_if_usable:nTF {#1}
+      { \@@_use_initialized:n {#1} }
+      {
+        \int_compare:nNnT {#2} > { 0 }
+          { \use:c { use_none: \prg_replicate:nn {#2} { n } } }
+      }
   }
+%<latexrelease>\EndIncludeInRelease
+%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_use_once:nn}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_gset_protected:Npn \@@_use_once:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_preamble_hook:n {#1}
+%<latexrelease>    \@@_use_once_set:n {#1}
+%<latexrelease>    \@@_use_initialized:n {#1}
+%<latexrelease>    \@@_use_once_clear:n {#1}
+%<latexrelease>  }
+%<latexrelease>\cs_undefine:N \@@_use_once:nn
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
+% \end{macro}
 %
 % \begin{macro}{\@@_use_once_set:n}
 % \begin{macro}{\@@_use_once_clear:n}
@@ -4900,43 +6764,60 @@
 %   \cs{hook_use_once:n} will expand to nothing.
 % \changes{v1.0r}{2021/09/06}{Clean up after \cs{UseOneTimeHook} (gh/606)}
 % \changes{v1.0u}{2022/05/13}{Check if prop exists to avoid l3debug error}
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_use_once_clear:n}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new_protected:Npn \@@_use_once_set:n #1
   { \@@_tl_gset:cn { g_@@_#1_reversed_tl } { I } }
 \cs_new_protected:Npn \@@_use_once_clear:n #1
   {
-    \@@_tl_gclear:c { @@~#1 }
-    \@@_tl_gclear:c { @@_next~#1 }
-    \@@_tl_gclear:c { @@_toplevel~#1 }
+    \@@_code_gset:nn {#1} { }
+    \@@_next_gset:nn {#1} { }
+    \@@_toplevel_gset:nn {#1} { }
     \prop_gclear_new:c { g_@@_#1_code_prop }
   }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_use_once_clear:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \@@_use_once_clear:n #1
+%<latexrelease>  {
+%<latexrelease>    \@@_tl_gclear:c { @@~#1 }
+%<latexrelease>    \@@_tl_gclear:c { @@_next~#1 }
+%<latexrelease>    \@@_tl_gclear:c { @@_toplevel~#1 }
+%<latexrelease>    \prop_gclear_new:c { g_@@_#1_code_prop }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
-% \end{macro}
-% \end{macro}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}[pTF]{\@@_if_execute_immediately:n}
-%   To check whether the code being added should be executed immediately (that
-%   is, if the hook is a one-time hook), we check if it's usable (it
-%   can't be one-time if it was not already usable), then we check that
+%   To check whether the code being added should be executed immediately
+%   (that is, if the hook is a one-time hook), we check if
 %   \cs[no-index]{g_@@_\meta{hook}_reversed_tl} is |I|.  The gymnastics
 %   around \cs{if:w} is there to allow the |reversed| token list to be
 %   empty.
 % \changes{v1.0r}{2021/09/06}{Macro added (gh/606)}
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
 %    \begin{macrocode}
 \prg_new_conditional:Npnn \@@_if_execute_immediately:n #1 { T, F, TF }
   {
-    \@@_if_usable:nTF {#1}
-      {
-        \exp_after:wN \@@_clean_to_scan:w
-        \if:w I \cs:w g_@@_#1_reversed_tl \cs_end:
-          \s_@@_mark \prg_return_true:
-        \else:
-          \s_@@_mark \prg_return_false:
+    \exp_after:wN \@@_use_none_delimit_by_s_mark:w
+    \if:w I
+        \if_cs_exist:w g_@@_#1_reversed_tl \cs_end:
+          \cs:w g_@@_#1_reversed_tl \exp_after:wN \cs_end:
         \fi:
-      }
-      { \prg_return_false: }
+        X
+      \s_@@_mark \prg_return_true:
+    \else:
+      \s_@@_mark \prg_return_false:
+    \fi:
   }
 %    \end{macrocode}
 %  \end{macro}
@@ -4963,30 +6844,57 @@
 %
 %    All other states can only be queried with internal tests as the
 %    different states are irrelevant for package code.
-
+%
 % \begin{macro}[pTF]{\hook_if_empty:n}
 %   Test if a hook is empty (that is, no code was added to that hook).
 %   A \meta{hook} being empty means that all three of its
 %   \cs{g_@@_\meta{hook}_code_prop}, its
 %   \cs{@@_toplevel\textvisiblespace\meta{hook}} and its
 %   \cs{@@_next\textvisiblespace\meta{hook}} are empty.
+% \changes{v1.1a}{2023/04/06}
+%         {Changes to add hook arguments (hook-args).}
+% \changes{v1.1c}{2023/04/19}
+%         {Simpler and faster version (gh/1052).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\hook_if_empty:n}
+%<latexrelease>                 {Hooks~with~args}
 \prg_new_conditional:Npnn \hook_if_empty:n #1 { p , T , F , TF }
   {
-    \@@_if_structure_exist:nTF {#1}
-      {
-        \bool_lazy_and:nnTF
-            { \prop_if_empty_p:c { g_@@_#1_code_prop } }
-            {
-              \bool_lazy_and_p:nn
-                { \tl_if_empty_p:c { @@_toplevel~#1 } }
-                { \tl_if_empty_p:c { @@_next~#1 } }
-            }
-          { \prg_return_true: }
-          { \prg_return_false: }
-      }
-      { \prg_return_true: }
+    \if:w
+        T
+        \prop_if_exist:cT { g_@@_#1_code_prop }
+          { \prop_if_empty:cF { g_@@_#1_code_prop } { F } }
+        \@@_cs_if_empty:cF { @@_toplevel~#1 } { F }
+        \@@_cs_if_empty:cF { @@_next~#1 } { F }
+        T
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
   }
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\hook_if_empty:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\prg_new_conditional:Npnn \hook_if_empty:n #1 { p , T , F , TF }
+%<latexrelease>  {
+%<latexrelease>    \@@_if_structure_exist:nTF {#1}
+%<latexrelease>      {
+%<latexrelease>        \bool_lazy_and:nnTF
+%<latexrelease>            { \prop_if_empty_p:c { g_@@_#1_code_prop } }
+%<latexrelease>            {
+%<latexrelease>              \bool_lazy_and_p:nn
+%<latexrelease>                { \tl_if_empty_p:c { @@_toplevel~#1 } }
+%<latexrelease>                { \tl_if_empty_p:c { @@_next~#1 } }
+%<latexrelease>            }
+%<latexrelease>          { \prg_return_true: }
+%<latexrelease>          { \prg_return_false: }
+%<latexrelease>      }
+%<latexrelease>      { \prg_return_true: }
+%<latexrelease>  }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4994,15 +6902,15 @@
 % \begin{macro}[pTF]{\@@_if_usable:n}
 %   A hook is usable if the
 %   token list that stores the sorted code for that hook,
-%   \cs[no-index]{@@~\meta{hook}}, exists.  The property list
-%   \cs[no-index]{g_@@_\meta{hook}_code_prop} cannot be used here
+%   \cs[no-index]{@@\textvisiblespace\meta{hook}}, exists.  The property
+%   list \cs[no-index]{g_@@_\meta{hook}_code_prop} cannot be used here
 %   because often it is necessary to add code to a hook without knowing
 %   if such hook was already declared, or even if it will ever be
 %   (for example, in case the package that defines it isn't loaded).
 %    \begin{macrocode}
 \prg_new_conditional:Npnn \@@_if_usable:n #1 { p , T , F , TF }
   {
-    \tl_if_exist:cTF { @@~#1 }
+    \cs_if_exist:cTF { @@~#1 }
       { \prg_return_true: }
       { \prg_return_false: }
   }
@@ -5046,7 +6954,7 @@
 %    \begin{macrocode}
 \prg_new_conditional:Npnn \@@_if_reversed:n #1 { p , T , F , TF }
   {
-    \exp_after:wN \@@_clean_to_scan:w
+    \exp_after:wN \@@_use_none_delimit_by_s_mark:w
     \if:w - \cs:w g_@@_#1_reversed_tl \cs_end:
       \s_@@_mark \prg_return_true:
     \else:
@@ -5086,6 +6994,37 @@
 %  \end{macro}
 %  \end{macro}
 %
+% \begin{macro}[pTF]{\@@_if_cmd_hook:n}
+% \begin{macro}[pTF]{\@@_if_cmd_hook:w}
+%   An internal conditional that checks if a given hook is a valid
+%   generic \hook{cmd} hook.
+% \changes{v1.1d}{2023/05/21}
+%         {Changes to allow support arguments in cmd hooks (cmd-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\@@_if_cmd_hook:n}
+%<latexrelease>                 {Hooks~with~args}
+\prg_new_conditional:Npnn \@@_if_cmd_hook:n #1 { T }
+  { \@@_if_cmd_hook:w #1 / / / \s_@@_mark }
+\cs_new:Npn \@@_if_cmd_hook:w #1 / #2 / #3 / #4 \s_@@_mark
+  {
+    \if:w Y
+          \str_if_eq:nnF {#1} { cmd } { N }
+          \tl_if_exist:cF { c_@@_generic_#1/./#3_tl } { N }
+          Y
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
+  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@@_if_cmd_hook:n}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_undefine:N \@@_if_cmd_hook:nT
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%  \end{macro}
+%  \end{macro}
+%
 % \begin{macro}[pTF]{\@@_if_generic_reversed:n}
 %   An internal conditional that checks if a name belongs to a generic
 %   reversed hook.
@@ -5103,6 +7042,50 @@
 %    \end{macrocode}
 %  \end{macro}
 %
+% \begin{macro}[EXP]{\@@_if_replacing_args:TF}
+% \begin{macro}[EXP]{\@@_misused_if_replacing_args:nn}
+% \begin{macro}{\@@_replacing_args_true:}
+% \begin{macro}{\@@_replacing_args_false:}
+% \begin{macro}{\@@_replacing_args_reset:}
+% \begin{macro}{\g_@@_replacing_stack_seq}
+%   An internal conditional that checks if the code being added to the
+%   hook contains arguments.
+% \changes{v1.1a}{2023/04/06}
+%         {Macro added (hook-args).}
+%    \begin{macrocode}
+\seq_new:N \g_@@_replacing_stack_seq
+\cs_new:Npn \@@_misused_if_replacing_args:nn #1 #2
+  {
+    \msg_expandable_error:nnn { latex2e } { should-not-happen }
+      { Misused~\@@_if_replacing_args:. }
+  }
+\cs_new:Npn \@@_if_replacing_args:TF
+  { \@@_misused_if_replacing_args:nn }
+\cs_new_protected:Npn \@@_replacing_args_true:
+  {
+    \seq_gpush:No \g_@@_replacing_stack_seq
+      { \@@_if_replacing_args:TF }
+    \cs_set:Npn \@@_if_replacing_args:TF { \use_i:nn }
+  }
+\cs_new_protected:Npn \@@_replacing_args_false:
+  {
+    \seq_gpush:No \g_@@_replacing_stack_seq
+      { \@@_if_replacing_args:TF }
+    \cs_set:Npn \@@_if_replacing_args:TF { \use_ii:nn }
+  }
+\cs_new_protected:Npn \@@_replacing_args_reset:
+  {
+    \seq_gpop:NN \g_@@_replacing_stack_seq \l_@@_return_tl
+    \cs_gset_eq:NN \@@_if_replacing_args:TF \l_@@_return_tl
+  }
+%    \end{macrocode}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%
 %  \subsection{Messages}
 %
 %    Hook errors are LaTeX kernel errors:
@@ -5137,6 +7120,55 @@
       Please~ use~ a~ different~ name~ for~ your~ hook.}
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{too-many-args}
+%<latexrelease>                 {Hooks~with~args}
+%    \end{macrocode}
+%
+% \changes{v1.1a}{2023/04/06}
+%         {Messages 'too-many-args', 'without-args' and 'one-time-args' added (hook-args).}
+%    \begin{macrocode}
+\msg_new:nnnn { hooks } { too-many-args }
+  { Too~many~arguments~for~hook~'#1'. }
+  {
+    You~tried~to~declare~a~hook~with~#2~arguments,~but~a~
+    hook~can~only~have~up~to~nine.~LaTeX~will~define~this~
+    hook~with~nine~arguments.
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\msg_new:nnnn { hooks } { without-args }
+  { Hook~'#1'~has~no~arguments. }
+  {
+    You~tried~to~use~\iow_char:N\\#2WithArguments~
+    on~a~hook~that~takes~no~arguments.\\
+    Check~the~usage~of~the~hook~or~use~\iow_char:N\\#2~instead.\\
+    \\
+    LaTeX~will~use~\iow_char:N\\#2.
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\msg_new:nnnn { hooks } { one-time-args }
+  { You~can't~have~arguments~in~used~one-time~hook~'#1'. }
+  {
+    You~tried~to~use~\iow_char:N\\#2WithArguments~
+    on~a~one-time~hook~that~has~already~been~used.~
+    You~have~to~add~the~code~before~the~hook~is~used,~
+    or~add~the~code~without~arguments~using~\iow_char:N\\#2~instead.\\
+    \\
+    LaTeX~will~use~\iow_char:N\\#2.
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{too-many-args}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
 %
 %    \begin{macrocode}
 \msg_new:nnnn { hooks } { hook-disabled }
@@ -5278,17 +7310,49 @@
 %  \begin{macro}{\NewHook,\NewReversedHook,\NewMirroredHookPair}
 %    Declaring new hooks \ldots
 %    \begin{macrocode}
-\NewDocumentCommand \NewHook             { m }{ \hook_new:n {#1} }
-\NewDocumentCommand \NewReversedHook     { m }{ \hook_new_reversed:n {#1} }
-\NewDocumentCommand \NewMirroredHookPair { mm }{ \hook_new_pair:nn {#1}{#2} }
+\NewDocumentCommand \NewHook             { m }
+  { \hook_new:n {#1} }
+\NewDocumentCommand \NewReversedHook     { m }
+  { \hook_new_reversed:n {#1} }
+\NewDocumentCommand \NewMirroredHookPair { mm }
+  { \hook_new_pair:nn {#1}{#2} }
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%
+%  \begin{macro}{
+%    \NewHookWithArguments,
+%    \NewReversedHookWithArguments,
+%    \NewMirroredHookPairWithArguments
+%  }
+%    Declaring new hooks with arguments\ldots
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{NewHookWithArguments} (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\NewHookWithArguments}
+%<latexrelease>                 {Hooks~with~args}
+\NewDocumentCommand \NewHookWithArguments             { mm }
+  { \hook_new_with_args:nn {#1} {#2} }
+\NewDocumentCommand \NewReversedHookWithArguments     { mm }
+  { \hook_new_reversed_with_args:nn {#1} {#2} }
+\NewDocumentCommand \NewMirroredHookPairWithArguments { mmm }
+  { \hook_new_pair_with_args:nnn {#1} {#2} {#3} }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2023/06/01}{\NewHookWithArguments}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \NewHookWithArguments #1 #2 { }
+%<latexrelease>\cs_new_protected:Npn \NewReversedHookWithArguments #1 #2 { }
+%<latexrelease>\cs_new_protected:Npn \NewMirroredHookPairWithArguments #1 #2 #3 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
 %
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/06/01}%
-%<latexrelease>         {\hook_activate_generic:n}{Providing~hooks}
+%<latexrelease>\IncludeInRelease{2021/06/01}{\ActivateGenericHook}
+%<latexrelease>                 {Providing~hooks}
 %    \end{macrocode}
 %
 %  \begin{macro}{\ActivateGenericHook}
@@ -5296,7 +7360,8 @@
 % \changes{v1.0m}{2021/04/29}{Add \cs{ProvideHook} etc.}
 % \changes{v1.0o}{2021/08/02}{Change name}
 %    \begin{macrocode}
-\NewDocumentCommand \ActivateGenericHook { m }{ \hook_activate_generic:n {#1} }
+\NewDocumentCommand \ActivateGenericHook { m }
+  { \hook_activate_generic:n {#1} }
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -5304,32 +7369,57 @@
 %    Disabling a generic hook.
 % \changes{v1.0o}{2021/08/02}{Change name}
 %    \begin{macrocode}
-\NewDocumentCommand \DisableGenericHook { m }{ \hook_disable_generic:n {#1} }
+\NewDocumentCommand \DisableGenericHook { m }
+  { \hook_disable_generic:n {#1} }
 %    \end{macrocode}
 %  \end{macro}
 %
 %    \begin{macrocode}
 %<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{2020/10/01}
-%<latexrelease>                 {\hook_activate_generic:n}{Providing~hooks}
-%<latexrelease>
-%<latexrelease>\def \ActivateGenericHook#1{}
-%<latexrelease>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}{\ActivateGenericHook}
+%<latexrelease>                 {Providing~hooks}
+%<latexrelease>\def \ActivateGenericHook #1 { }
+%<latexrelease>\def \DisableGenericHook #1 { }
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
 %
-%  \begin{macro}{\AddToHook}
+%  \begin{macro}{\AddToHook,\AddToHookWithArguments}
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{AddToHookWithArguments} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\AddToHookWithArguments}
+%<latexrelease>                 {Hooks~with~args}
 \NewDocumentCommand \AddToHook { m o +m }
   { \hook_gput_code:nnn {#1} {#2} {#3} }
+\NewDocumentCommand \AddToHookWithArguments { m o +m }
+  { \hook_gput_code_with_args:nnn {#1} {#2} {#3} }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\AddToHookWithArguments}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \AddToHookWithArguments #1 #2 #3 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
-%  \begin{macro}{\AddToHookNext}
+%  \begin{macro}{\AddToHookNext,\AddToHookNextWithArguments}
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{AddToHookNextWithArguments} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\AddToHookNextWithArguments}
+%<latexrelease>                 {Hooks~with~args}
 \NewDocumentCommand \AddToHookNext { m +m }
   { \hook_gput_next_code:nn {#1} {#2} }
+\NewDocumentCommand \AddToHookNextWithArguments { m +m }
+  { \hook_gput_next_code_with_args:nn {#1} {#2} }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\AddToHookNextWithArguments}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new_protected:Npn \AddToHookNextWithArguments #1 #2 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -5396,12 +7486,29 @@
 %
 %
 %
-%  \begin{macro}{\UseHook,\UseOneTimeHook}
+%  \begin{macro}{
+%    \UseHook,
+%    \UseOneTimeHook,
+%    \UseHookWithArguments,
+%    \UseOneTimeHookWithArguments,
+%  }
 %    Avoid the overhead of \pkg{xparse} and its protection that we
 %    don't want here (since the hook should vanish without trace if empty)!
+% \changes{v1.1a}{2023/04/06}
+%         {Add \cs{UseHookWithArguments} (hook-args).}
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2023/06/01}{\UseHookWithArguments}
+%<latexrelease>                 {Hooks~with~args}
 \cs_new:Npn \UseHook        { \hook_use:n }
 \cs_new:Npn \UseOneTimeHook { \hook_use_once:n }
+\cs_new:Npn \UseHookWithArguments        { \hook_use:nnw }
+\cs_new:Npn \UseOneTimeHookWithArguments { \hook_use_once:nnw }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}{\UseHookWithArguments}
+%<latexrelease>                 {Hooks~with~args}
+%<latexrelease>\cs_new:Npn \UseHookWithArguments #1 #2 { }
+%<latexrelease>\cs_new:Npn \UseOneTimeHookWithArguments #1 #2 { }
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -5462,7 +7569,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[EXP]{\IfHookExistsTF}
+% \begin{macro}[EXP,int]{\IfHookExistsTF}
 %    Marked for removal and no longer documented in the doc section!
 % \phoinline{\cs{IfHookExistsTF} is used in \texttt{jlreq.cls},
 % \texttt{pxatbegshi.sty}, \texttt{pxeverysel.sty},
@@ -5484,7 +7591,7 @@
 % \changes{v1.0p}{2021/08/20}{Added deprecation warnings for
 %                             old generic hook commands (gh/638)}
 %
-% \begin{macro}{
+% \begin{macro}[int]{
 %     \hook_disable:n,
 %     \hook_provide:n,
 %     \hook_provide_reversed:n,
@@ -5529,7 +7636,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{
+% \begin{macro}[int]{
 %     \DisableHook,
 %     \ProvideHook,
 %     \ProvideReversedHook,
@@ -5596,8 +7703,10 @@
 %<@@=>
 %    \end{macrocode}
 %
-%  \begin{macro}{\@expl@@@initialize@all@@,
-%                \@expl@@@hook@curr@name@pop@@}
+%  \begin{macro}[int]{
+%      \@expl@@@initialize@all@@,
+%      \@expl@@@hook@curr@name@pop@@
+%  }
 %
 % \InternalDetectionOff
 %    \begin{macrocode}
@@ -5620,8 +7729,8 @@
 %                             to be for \cs{AddToHook} vice versa (gh/401)}
 %    \begin{macrocode}
 %
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {lthooks}{The~hook~management}%
+%<latexrelease>\IncludeInRelease{0000/00/00}{lthooks}
+%<latexrelease>                 {The~hook~management}%
 %<latexrelease>
 %<latexrelease>\def \NewHook#1{}
 %<latexrelease>\def \NewReversedHook#1{}
@@ -5656,10 +7765,56 @@
 %<latexrelease>\long\def \IfHookEmptyTF #1#2#3{#2}
 %<latexrelease>
 %<latexrelease>\EndModuleRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<@@=hook>
+%    \end{macrocode}
+%
+% \changes{v1.1a}{2023/04/06}
+%         {Add dedicated rollback code to revert data structures (hook-args).}
+%    \begin{macrocode}
+%<latexrelease>\cs:w @@_rollback_tidying: \cs_end:
+%<latexrelease>\bool_lazy_and:nnT
+%<latexrelease>    { \int_compare_p:nNn { \sourceLaTeXdate } > { 20230600 } }
+%<latexrelease>    { \int_compare_p:nNn { \requestedLaTeXdate } < { 20230601 } }
+%<latexrelease>  {
+%<latexrelease>    \cs_gset_protected:Npn \@@_rollback_tidying:
+%<latexrelease>      {
+%<latexrelease>        \@latex@error { Rollback~code~executed~twice }
+%<latexrelease>          {
+%<latexrelease>            Something~went~wrong~(unless~this~was~
+%<latexrelease>            done~on~purpose~in~a~testing~environment).
+%<latexrelease>          }
+%<latexrelease>        \use_none:nnnn
+%<latexrelease>      }
+%<latexrelease>    \cs_set:Npn \@@_tmp:w #1 #2
+%<latexrelease>      {
+%<latexrelease>        \@@_tl_gset:cx { @@#1~#2 }
+%<latexrelease>          {
+%<latexrelease>            \exp_args:No \exp_not:o
+%<latexrelease>              {
+%<latexrelease>                \cs:w @@#1~#2 \exp_last_unbraced:Ne \cs_end:
+%<latexrelease>                  { \@@_braced_cs_parameter:n { @@#1~#2 } }
+%<latexrelease>              }
+%<latexrelease>          }
+%<latexrelease>      }
+%<latexrelease>    \seq_map_inline:Nn \g_@@_all_seq
+%<latexrelease>      {
+%<latexrelease>        \exp_after:wN \cs_gset_nopar:Npn
+%<latexrelease>          \cs:w g_@@_#1_code_prop \exp_args:NNo \exp_args:No
+%<latexrelease>            \cs_end: { \cs:w g_@@_#1_code_prop \cs_end: }
+%<latexrelease>        \@@_tmp:w { _toplevel } {#1}
+%<latexrelease>        \@@_tmp:w { _next } {#1}
+%<latexrelease>      }
+%<latexrelease>  }
 \ExplSyntaxOff
 %</2ekernel|latexrelease>
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+%<@@=>
+%    \end{macrocode}
 %
 % \Finale
 %
diff --git a/macros/latex-dev/base/ltlists.dtx b/macros/latex-dev/base/ltlists.dtx
index afde14e070..d43df93a54 100644
--- a/macros/latex-dev/base/ltlists.dtx
+++ b/macros/latex-dev/base/ltlists.dtx
@@ -31,7 +31,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltlists.dtx}
-             [2020/12/05 v1.0t LaTeX Kernel (List Environments)]
+             [2023/05/17 v1.0t LaTeX Kernel (List Environments)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltlists.dtx}
@@ -68,7 +68,6 @@
 % \begin{quote}
 %        |\list|\marg{LABEL}\marg{COMMANDS} ... |\endlist|
 % \end{quote}
-%
 % which can be invoked by the user as the list environment.  The LABEL
 % argument specifies item labeling.  COMMANDS contains commands for
 % changing the horizontal and vertical spacing parameters.
@@ -187,7 +186,7 @@
 % |\hsize|.
 %
 % Here are the parameters of a list that can be set by commands in
-% the |\list|'s COMMANDS argument.  These parameters are all TeX
+% the |\list|'s COMMANDS argument.  These parameters are all \TeX{}
 % skips or dimensions (defined by |\newskip| or |\newdimen|), so the
 % usual \TeX\ or \LaTeX\ commands can be used to set them.  The
 % commands will be executed in vmode if and only if the |\list| was
@@ -228,7 +227,7 @@
 %                      label.
 %  \item[\cs{labelwidth}:] nominal width of box that contains the label.
 %                      If the natural width of the
-%                         label $< =$ \cs{labelwidth},
+%                         label $\leq$ \cs{labelwidth},
 %                      then the label is flushed right inside a box
 %                      of width \cs{labelwidth} (with an \cs{hfil}).
 %                      Otherwise,
diff --git a/macros/latex-dev/base/ltluatex.pdf b/macros/latex-dev/base/ltluatex.pdf
index 855095c6ef..a2c7bdc1dc 100644
--- a/macros/latex-dev/base/ltluatex.pdf
+++ b/macros/latex-dev/base/ltluatex.pdf
diff --git a/macros/latex-dev/base/ltmarks-code.pdf b/macros/latex-dev/base/ltmarks-code.pdf
index 54c2703531..22470e7814 100644
--- a/macros/latex-dev/base/ltmarks-code.pdf
+++ b/macros/latex-dev/base/ltmarks-code.pdf
diff --git a/macros/latex-dev/base/ltmarks-doc.pdf b/macros/latex-dev/base/ltmarks-doc.pdf
index cf70d21cae..b3a84ca9f7 100644
--- a/macros/latex-dev/base/ltmarks-doc.pdf
+++ b/macros/latex-dev/base/ltmarks-doc.pdf
diff --git a/macros/latex-dev/base/ltmarks.dtx b/macros/latex-dev/base/ltmarks.dtx
index 3dc4b493ac..677534dd27 100644
--- a/macros/latex-dev/base/ltmarks.dtx
+++ b/macros/latex-dev/base/ltmarks.dtx
@@ -1,7 +1,8 @@
 % \iffalse meta-comment
 %
-%% File: ltmarks.dtx (C) Copyright 2022
-%       Frank Mittelbach, LaTeX Team
+%% File: ltmarks.dtx
+%% Copyright (C) 2022-2023
+%% Frank Mittelbach, The LaTeX Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/macros/latex-dev/base/ltmath.dtx b/macros/latex-dev/base/ltmath.dtx
index 746a3077fb..3b1518dd2e 100644
--- a/macros/latex-dev/base/ltmath.dtx
+++ b/macros/latex-dev/base/ltmath.dtx
@@ -38,7 +38,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltmath.dtx}
-              [2022/09/07 v1.2m LaTeX Kernel (Math Setup)]
+              [2023/05/13 v1.2n LaTeX Kernel (Math Setup)]
 % \iffalse
 %</driver>
 %
@@ -1132,9 +1132,29 @@
 \fi
 %    \end{macrocode}
 %
+% \begin{macro}{\eqno}
+% \begin{macro}{\leqno}
+% \changes{v1.2n}{2023/05/13}{add \cs{ignorespaces} gh/1059}
+% Ensure the (deprecated) \verb|$$..\eqno 1 $$| ignores spaces.
 %    \begin{macrocode}
 %</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2023/06/01}%
+%<latexrelease>                 {\eqno}{add ignorespaces to eqno}%
+\let\@kernel@eqno\eqno
+\let\@kernel@leqno\leqno
+\protected\def\eqno{\@kernel@eqno\aftergroup\ignorespaces}
+\protected\def\leqno{\@kernel@leqno\aftergroup\ignorespaces}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\eqno}{add ignorespaces to eqno}%
+%<latexrelease>\let\eqno\@kernel@eqno
+%<latexrelease>\let\leqno\@kernel@leqno
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
+% \end{macro}
+% \end{macro}
 %
 %
 %
@@ -1322,6 +1342,5 @@
 % \end{environment}
 %
 %
-%
 % \Finale
 %
diff --git a/macros/latex-dev/base/ltmeta.dtx b/macros/latex-dev/base/ltmeta.dtx
index 31c5d8dbee..daaa71626b 100644
--- a/macros/latex-dev/base/ltmeta.dtx
+++ b/macros/latex-dev/base/ltmeta.dtx
@@ -1,7 +1,8 @@
 % \iffalse meta-comment
 %
-%% File: ltmeta.dtx (C) Copyright 2021, 2022
-%       Frank Mittelbach, LaTeX Team
+%% File: ltmeta.dtx
+%% Copyright (C) 2021-2023
+%% Frank Mittelbach, The LaTeX Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/macros/latex-dev/base/ltnews.cls b/macros/latex-dev/base/ltnews.cls
index f55165d436..a57d9fc673 100644
--- a/macros/latex-dev/base/ltnews.cls
+++ b/macros/latex-dev/base/ltnews.cls
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2020
+% Copyright (C) 1993-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews.pdf b/macros/latex-dev/base/ltnews.pdf
index bc1b2d7b36..20e9915fb0 100644
--- a/macros/latex-dev/base/ltnews.pdf
+++ b/macros/latex-dev/base/ltnews.pdf
diff --git a/macros/latex-dev/base/ltnews01.pdf b/macros/latex-dev/base/ltnews01.pdf
index 618176aa56..a7f0341632 100644
--- a/macros/latex-dev/base/ltnews01.pdf
+++ b/macros/latex-dev/base/ltnews01.pdf
diff --git a/macros/latex-dev/base/ltnews02.pdf b/macros/latex-dev/base/ltnews02.pdf
index 423dd7db37..35984fad28 100644
--- a/macros/latex-dev/base/ltnews02.pdf
+++ b/macros/latex-dev/base/ltnews02.pdf
diff --git a/macros/latex-dev/base/ltnews03.pdf b/macros/latex-dev/base/ltnews03.pdf
index a43f3c2ffc..447d1674df 100644
--- a/macros/latex-dev/base/ltnews03.pdf
+++ b/macros/latex-dev/base/ltnews03.pdf
diff --git a/macros/latex-dev/base/ltnews04.pdf b/macros/latex-dev/base/ltnews04.pdf
index 95683443c7..cc15094d78 100644
--- a/macros/latex-dev/base/ltnews04.pdf
+++ b/macros/latex-dev/base/ltnews04.pdf
diff --git a/macros/latex-dev/base/ltnews05.pdf b/macros/latex-dev/base/ltnews05.pdf
index 91ba9c3669..0e70b1e807 100644
--- a/macros/latex-dev/base/ltnews05.pdf
+++ b/macros/latex-dev/base/ltnews05.pdf
diff --git a/macros/latex-dev/base/ltnews06.pdf b/macros/latex-dev/base/ltnews06.pdf
index 57c9abe6a9..59abf02bd7 100644
--- a/macros/latex-dev/base/ltnews06.pdf
+++ b/macros/latex-dev/base/ltnews06.pdf
diff --git a/macros/latex-dev/base/ltnews07.pdf b/macros/latex-dev/base/ltnews07.pdf
index a587a13ac7..82a2540ab1 100644
--- a/macros/latex-dev/base/ltnews07.pdf
+++ b/macros/latex-dev/base/ltnews07.pdf
diff --git a/macros/latex-dev/base/ltnews08.pdf b/macros/latex-dev/base/ltnews08.pdf
index c57077ac14..f32fb2cad0 100644
--- a/macros/latex-dev/base/ltnews08.pdf
+++ b/macros/latex-dev/base/ltnews08.pdf
diff --git a/macros/latex-dev/base/ltnews09.pdf b/macros/latex-dev/base/ltnews09.pdf
index 7dff0aaeb5..4ca9012f17 100644
--- a/macros/latex-dev/base/ltnews09.pdf
+++ b/macros/latex-dev/base/ltnews09.pdf
diff --git a/macros/latex-dev/base/ltnews10.pdf b/macros/latex-dev/base/ltnews10.pdf
index 9911e7cc2e..5fca7346e9 100644
--- a/macros/latex-dev/base/ltnews10.pdf
+++ b/macros/latex-dev/base/ltnews10.pdf
diff --git a/macros/latex-dev/base/ltnews11.pdf b/macros/latex-dev/base/ltnews11.pdf
index 9d35abb5ea..6627ca370a 100644
--- a/macros/latex-dev/base/ltnews11.pdf
+++ b/macros/latex-dev/base/ltnews11.pdf
diff --git a/macros/latex-dev/base/ltnews12.pdf b/macros/latex-dev/base/ltnews12.pdf
index 71aa27bcfc..8bd9137660 100644
--- a/macros/latex-dev/base/ltnews12.pdf
+++ b/macros/latex-dev/base/ltnews12.pdf
diff --git a/macros/latex-dev/base/ltnews13.pdf b/macros/latex-dev/base/ltnews13.pdf
index 1940689968..dd8b6c663e 100644
--- a/macros/latex-dev/base/ltnews13.pdf
+++ b/macros/latex-dev/base/ltnews13.pdf
diff --git a/macros/latex-dev/base/ltnews14.pdf b/macros/latex-dev/base/ltnews14.pdf
index 66821fc4d0..83c326971d 100644
--- a/macros/latex-dev/base/ltnews14.pdf
+++ b/macros/latex-dev/base/ltnews14.pdf
diff --git a/macros/latex-dev/base/ltnews15.pdf b/macros/latex-dev/base/ltnews15.pdf
index 0dfe862498..5f4eae06f9 100644
--- a/macros/latex-dev/base/ltnews15.pdf
+++ b/macros/latex-dev/base/ltnews15.pdf
diff --git a/macros/latex-dev/base/ltnews16.pdf b/macros/latex-dev/base/ltnews16.pdf
index 0c8934029d..5e7ee0cd0b 100644
--- a/macros/latex-dev/base/ltnews16.pdf
+++ b/macros/latex-dev/base/ltnews16.pdf
diff --git a/macros/latex-dev/base/ltnews17.pdf b/macros/latex-dev/base/ltnews17.pdf
index 2d5500ff62..637d049e40 100644
--- a/macros/latex-dev/base/ltnews17.pdf
+++ b/macros/latex-dev/base/ltnews17.pdf
diff --git a/macros/latex-dev/base/ltnews18.pdf b/macros/latex-dev/base/ltnews18.pdf
index b88c8a5401..badbfac892 100644
--- a/macros/latex-dev/base/ltnews18.pdf
+++ b/macros/latex-dev/base/ltnews18.pdf
diff --git a/macros/latex-dev/base/ltnews19.pdf b/macros/latex-dev/base/ltnews19.pdf
index b6a132732e..5f857220a2 100644
--- a/macros/latex-dev/base/ltnews19.pdf
+++ b/macros/latex-dev/base/ltnews19.pdf
diff --git a/macros/latex-dev/base/ltnews20.pdf b/macros/latex-dev/base/ltnews20.pdf
index 3c79e0d9be..2cd03fc389 100644
--- a/macros/latex-dev/base/ltnews20.pdf
+++ b/macros/latex-dev/base/ltnews20.pdf
diff --git a/macros/latex-dev/base/ltnews20.tex b/macros/latex-dev/base/ltnews20.tex
index aeab3fae60..b233f92dc4 100644
--- a/macros/latex-dev/base/ltnews20.tex
+++ b/macros/latex-dev/base/ltnews20.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993--2019
+% Copyright (C) 1993-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews21.pdf b/macros/latex-dev/base/ltnews21.pdf
index c6528cfbea..fbf13d47b8 100644
--- a/macros/latex-dev/base/ltnews21.pdf
+++ b/macros/latex-dev/base/ltnews21.pdf
diff --git a/macros/latex-dev/base/ltnews21.tex b/macros/latex-dev/base/ltnews21.tex
index 7b363447d9..a48cd0b199 100644
--- a/macros/latex-dev/base/ltnews21.tex
+++ b/macros/latex-dev/base/ltnews21.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2019
+% Copyright (C) 2019-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews22.pdf b/macros/latex-dev/base/ltnews22.pdf
index 625a3af16e..f107f51d4d 100644
--- a/macros/latex-dev/base/ltnews22.pdf
+++ b/macros/latex-dev/base/ltnews22.pdf
diff --git a/macros/latex-dev/base/ltnews23.pdf b/macros/latex-dev/base/ltnews23.pdf
index 2d591ff424..0b1a540118 100644
--- a/macros/latex-dev/base/ltnews23.pdf
+++ b/macros/latex-dev/base/ltnews23.pdf
diff --git a/macros/latex-dev/base/ltnews24.pdf b/macros/latex-dev/base/ltnews24.pdf
index bea89f1051..e7ee535ed4 100644
--- a/macros/latex-dev/base/ltnews24.pdf
+++ b/macros/latex-dev/base/ltnews24.pdf
diff --git a/macros/latex-dev/base/ltnews25.pdf b/macros/latex-dev/base/ltnews25.pdf
index aa027c430c..735abd907e 100644
--- a/macros/latex-dev/base/ltnews25.pdf
+++ b/macros/latex-dev/base/ltnews25.pdf
diff --git a/macros/latex-dev/base/ltnews26.pdf b/macros/latex-dev/base/ltnews26.pdf
index fe7d100e0d..d62efe0af4 100644
--- a/macros/latex-dev/base/ltnews26.pdf
+++ b/macros/latex-dev/base/ltnews26.pdf
diff --git a/macros/latex-dev/base/ltnews27.pdf b/macros/latex-dev/base/ltnews27.pdf
index 29da354bf3..487ee60ee4 100644
--- a/macros/latex-dev/base/ltnews27.pdf
+++ b/macros/latex-dev/base/ltnews27.pdf
diff --git a/macros/latex-dev/base/ltnews28.pdf b/macros/latex-dev/base/ltnews28.pdf
index ee61704ae6..23876fc9d9 100644
--- a/macros/latex-dev/base/ltnews28.pdf
+++ b/macros/latex-dev/base/ltnews28.pdf
diff --git a/macros/latex-dev/base/ltnews29.pdf b/macros/latex-dev/base/ltnews29.pdf
index 807dc2f7c2..19b4de4a57 100644
--- a/macros/latex-dev/base/ltnews29.pdf
+++ b/macros/latex-dev/base/ltnews29.pdf
diff --git a/macros/latex-dev/base/ltnews30.pdf b/macros/latex-dev/base/ltnews30.pdf
index 0e1203352a..b8f3672842 100644
--- a/macros/latex-dev/base/ltnews30.pdf
+++ b/macros/latex-dev/base/ltnews30.pdf
diff --git a/macros/latex-dev/base/ltnews30.tex b/macros/latex-dev/base/ltnews30.tex
index 74d7659512..8183f7eabb 100644
--- a/macros/latex-dev/base/ltnews30.tex
+++ b/macros/latex-dev/base/ltnews30.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2019
+% Copyright (C) 2019-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews31.pdf b/macros/latex-dev/base/ltnews31.pdf
index 878583bfb2..d46eff87c9 100644
--- a/macros/latex-dev/base/ltnews31.pdf
+++ b/macros/latex-dev/base/ltnews31.pdf
diff --git a/macros/latex-dev/base/ltnews31.tex b/macros/latex-dev/base/ltnews31.tex
index 1dff72986c..44bf494142 100644
--- a/macros/latex-dev/base/ltnews31.tex
+++ b/macros/latex-dev/base/ltnews31.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2019-2020
+% Copyright (C) 2019-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews32.pdf b/macros/latex-dev/base/ltnews32.pdf
index 35069ceab5..76a4a10cbe 100644
--- a/macros/latex-dev/base/ltnews32.pdf
+++ b/macros/latex-dev/base/ltnews32.pdf
diff --git a/macros/latex-dev/base/ltnews32.tex b/macros/latex-dev/base/ltnews32.tex
index 28f3bf88b4..c64cd97958 100644
--- a/macros/latex-dev/base/ltnews32.tex
+++ b/macros/latex-dev/base/ltnews32.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2019-2020
+% Copyright (C) 2019-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews33.pdf b/macros/latex-dev/base/ltnews33.pdf
index e42df53c30..f255b9d1ef 100644
--- a/macros/latex-dev/base/ltnews33.pdf
+++ b/macros/latex-dev/base/ltnews33.pdf
diff --git a/macros/latex-dev/base/ltnews33.tex b/macros/latex-dev/base/ltnews33.tex
index 39af4f1b72..0b98a707ba 100644
--- a/macros/latex-dev/base/ltnews33.tex
+++ b/macros/latex-dev/base/ltnews33.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2019-2021
+% Copyright (C) 2019-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews34.pdf b/macros/latex-dev/base/ltnews34.pdf
index 0707a1e9a2..5523ac2cd6 100644
--- a/macros/latex-dev/base/ltnews34.pdf
+++ b/macros/latex-dev/base/ltnews34.pdf
diff --git a/macros/latex-dev/base/ltnews34.tex b/macros/latex-dev/base/ltnews34.tex
index 517856834a..d3a9202b56 100644
--- a/macros/latex-dev/base/ltnews34.tex
+++ b/macros/latex-dev/base/ltnews34.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2019-2021
+% Copyright (C) 2019-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews35.pdf b/macros/latex-dev/base/ltnews35.pdf
index bef895d098..a68acbd83f 100644
--- a/macros/latex-dev/base/ltnews35.pdf
+++ b/macros/latex-dev/base/ltnews35.pdf
diff --git a/macros/latex-dev/base/ltnews35.tex b/macros/latex-dev/base/ltnews35.tex
index 0230ef6e58..8d49bf1984 100644
--- a/macros/latex-dev/base/ltnews35.tex
+++ b/macros/latex-dev/base/ltnews35.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2021-2022
+% Copyright (C) 2021-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -322,7 +322,6 @@ has been refined, such that
 \ProcessKeyOptions
 \end{verbatim}
 will now automatically pick up the package name as the key \emph{family},
-%unless explicitly given as an optional argument.
 unless explicitly given as an optional argument:
 \begin{verbatim}
 \ProcessKeyOptions[family]
@@ -378,9 +377,7 @@ syntax are described in \file{usrguide3.pdf}.  The command \cs{fpeval}
 offers a rich syntax allowing for extensive calculations, whereas the
 other three commands are essentially thin wrappers for \cs{numexpr},
 \cs{dimexpr}, and \cs{glueexpr} \Dash therefore inheriting some syntax
-%peculiars and limitations in expressiveness.
 peculiarities and limitations in expressiveness.
-%  \newcommand\calulateheight[1]{%
 \begin{verbatim}
   \newcommand\calculateheight[1]{%
     \setlength\textheight{\dimeval{\topskip
@@ -698,7 +695,7 @@ Source files containing \textlangle\ or \textrangle\ directly written
 as Unicode codepoints U+2329 and U+232A no longer break when the
 source file gets normalized under Unicode normalization rules.
 %
-\githubissue{gh/714}
+\githubissue{714}
 
 
 
@@ -907,7 +904,6 @@ For details and further examples, see \file{mathcolor.pdf}.
 
 
 \subsection{Fix locating files with \cs{graphicspath}}
-%
 
 If a call to \cs{includegraphics} asked for a file (say, \file{image})
 without extension, and if both \file{A/image.pdf} and \file{B/image.tex}
@@ -953,22 +949,10 @@ internal syntax errors due to premature expansion.
   \emph{\LaTeX{} Tagged PDF \Dash A blueprint for a large project}.\\
   \url{https://latex-project.org/publications/indexbyyear/2020/}
 
-%\bibitem{35:source2e}
-%  \emph{\LaTeX{} documentation on the \LaTeX{} Project Website}.\\
-%  \url{https://latex-project.org/help/documentation/}
-
-%\bibitem{35:ltnews31} \LaTeX{} Project Team:
-%  \emph{\LaTeXe{} news 31}.\\
-%  \url{https://latex-project.org/news/latex2e-news/ltnews31.pdf}
-
 \bibitem{35:ltnews32} \LaTeX{} Project Team:
   \emph{\LaTeXe{} news 32}.\\
   \url{https://latex-project.org/news/latex2e-news/ltnews32.pdf}
 
-%\bibitem{35:ltnews33} \LaTeX{} Project Team:
-%  \emph{\LaTeXe{} news 33}.\\
-%  \url{https://latex-project.org/news/latex2e-news/ltnews33.pdf}
-
 \bibitem{35:ltnews34} \LaTeX{} Project Team:
   \emph{\LaTeXe{} news 34}.\\
   \url{https://latex-project.org/news/latex2e-news/ltnews34.pdf}
diff --git a/macros/latex-dev/base/ltnews36.pdf b/macros/latex-dev/base/ltnews36.pdf
index acd22fa631..13802736fd 100644
--- a/macros/latex-dev/base/ltnews36.pdf
+++ b/macros/latex-dev/base/ltnews36.pdf
diff --git a/macros/latex-dev/base/ltnews36.tex b/macros/latex-dev/base/ltnews36.tex
index b3f66564cb..5dee958747 100644
--- a/macros/latex-dev/base/ltnews36.tex
+++ b/macros/latex-dev/base/ltnews36.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2021-2022
+% Copyright (C) 2021-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltnews37.pdf b/macros/latex-dev/base/ltnews37.pdf
index 3b13c3e619..781a244469 100644
--- a/macros/latex-dev/base/ltnews37.pdf
+++ b/macros/latex-dev/base/ltnews37.pdf
diff --git a/macros/latex-dev/base/ltnews37.tex b/macros/latex-dev/base/ltnews37.tex
index a1197e1052..5b2a55dda3 100644
--- a/macros/latex-dev/base/ltnews37.tex
+++ b/macros/latex-dev/base/ltnews37.tex
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2021-2023
+% Copyright (C) 2021-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -124,7 +124,8 @@
 
 % \publicationday{01} % change this if it's not released on 1st of a month
 \publicationmonth{June}
-\publicationyear{2023  --- DRAFT version for upcoming release}
+%\publicationyear{2023  --- DRAFT version for upcoming release}
+\publicationyear{2023}
 
 \publicationissue{37}
 
@@ -142,7 +143,8 @@
 \medskip
 
 
-\section{Introduction}
+%\section{Introduction}
+
 
 
 \section{New functionality offered as part of the
@@ -150,7 +152,8 @@
 
 We have now enabled new automatic tagging functionality for additional
 \LaTeX{} elements, among them most display environments, standard
-sectioning commands and content, figure and table listings. This can
+sectioning commands, content, figure and table listings, floats and graphics and
+bibliographies. This can
 be activated through
 \begin{verbatim}
 \DocumentMetadata{testphase=phase-III}
@@ -168,9 +171,9 @@ alter internals of \LaTeX{}.
 
 Also note that there are still several environments and commands
 described in the \LaTeX{} manual that do not have tagging support yet,
-notably tabulars, floats, \texttt{tabbing} and the various math
-environment.  They will get this support as part of \texttt{phase-III}
-between now and the June release.
+notably tabulars, \texttt{tabbing}, the various math environment and a
+few others.  They will get this support as part of \texttt{phase-III},
+but some of them will be delayed until after the June release.
 
 A prototype for math tagging (including support for the \pkg{amsmath}
 environments) is already available, but it is mainly intended for
@@ -194,60 +197,84 @@ be accessed with \verb|texdoc -l latex-lab|.
 Feedback is welcome! 
 Please use \url{https://github.com/latex3/latex2e/discussions/1010}.
 
-\section{Documentation improvements}
-
-
-\subsection{Displaying the exact release dates for \LaTeX{}}
-
-In some situations it is necessary to find out the exact release dates
-for older version of the \LaTeX{} format, for example, when you need
-to use different code in a package depending on the availablilty of a
-certain feature and you therefore want to use
-\cs{IfFormatAtLeastTF}\texttt\{\meta{date}\texttt\} or the
-rather horrible construction \verb/\@ifl@t@r\fmtversion{/\meta{date}\texttt\},
-if you
-want to cater for formats that are older than 2020.
-
-Or you know that your package is definitely not going to work with a
-format before a certain \meta{date}, in which case you could use
-\verb/\NeedsTeXFormat{LaTeX2e}[/\meta{date}\texttt] to ensure that any
-  user is alerted if their format is too old.
-
-The big problem is to know the exact \meta{date} to put into such
-commands and in the past that was not that easy to find. You could have 
-looked in the the file \file{changes.txt}, but that is hidden somewhere
-in your installation and if you try
-\verb*/texdoc -l changes.txt/ you get more than thirty results and the
-right file is by no means the first.
-
-Yukai Chou (\textsf{@muzimuzhi}) kindly provided a patch for this, so that we now have
-the exact dates for each \LaTeX{} format listed in an easy to remember
-place: in \file{ltnews.pdf} and that file conveniently also contains all major
-features and changes to \LaTeX{} over the years\Dash one of which is
-most likely the reason you need the \meta{date} date in the first
-place.
-
-It is given in parentheses in the newsletter title, thus this
-newsletter tells you that on
-%
-\makeatletter
-\mbox{\expandafter\@gobblenonyear\@year\@nil
-  -\@julianmonthtonum\@month-\two@digits\@day}
-\makeatother
-%
-the command
-\cs{NewEnvironmentCopy}, a new \texttt{shipout} hook, etc.\ was made
-available.  And looking into \file{ltnews.pdf} you can now easily find
-out that the \LaTeX3 programming layer was added on 2020-02-02
-(because the date was so nice) and not on the first of the month.
-%
-\githubissue{982}
-
 
 
 \section{New or improved commands}
 
+\subsection{Extending hooks to take arguments}
+
+Hooks have always been containers for code whose outcome was entirely
+dependent on the contents of the hook alone.  If any type of contextual
+information had to be passed to the hook, it had to be done by setting
+some variable before the hook so that the code in the hook could use
+that.  But this is somewhat hard to keep track of, clumsy to implement,
+and it required the programmer to have some kind of \enquote{hook before
+the hook} to do that setup.
+
+To make things a bit easier, \pkg{lthooks} was enhanced to support hooks
+with arguments.  Hooks can now be declared and used with arguments, then
+the code added to these hooks can reference the hook's arguments using
+\verb|#1|, \verb|#2|, etc., so now hooks can behave more like macros
+than like \emph{token lists} (using \pkg{expl3} terminology).  Regular
+argument-less hooks continue to work exactly like they did before:  this
+extension is completely compatible with older documents and packages.
+
+\AddToHook{cmd/verbatim@font/after}[hack]{\small}
+To declare a hook with arguments, use
+\begin{verbatim}
+\NewHookWithArguments {<hook>} {<num args>}
+\end{verbatim}
+then, similarly, to use the code in the hook (supposing a hook declared
+with 2 arguments), write
+\begin{verbatim}
+\UseHookWithArguments {<hook>} {2} {<arg 1>} {<arg 2>}
+\end{verbatim}
+
+Or, if you want to add some code to a hook that takes arguments, write
+\begin{verbatim}
+\AddToHookWithArguments {<hook>} [<label>] {<code>}
+\end{verbatim}
+exactly like you would for regular hooks, except that the \meta{code}
+can use the arguments by referencing \verb|#1|, \verb|#2|, etc.  In this
+case, if you want to add an actual parameter token (\verb|#|) to the
+\meta{code}, you have to double it, as usual.
+\RemoveFromHook{cmd/verbatim@font/after}[hack]
+
+Additionally, if you want to add \enquote{regular} code to a hook with
+arguments, you can still use \cs{AddToHook} --- in that case \verb|#|
+tokens are \emph{not} doubled.  This means that a package author can
+decide to add arguments to an existing hook without worrying about
+compatibility: \cs{AddToHook} will do the right thing and will not
+mistakenly reference the newly added arguments.
+
+The commands \cs{NewReversedHookWithArguments}, \cs
+{NewMirroredHookPairWithArguments}, \cs
+{AddToHookNextWithArguments}, \cs{UseOneTimeHookWithArguments}, and
+the \pkg{expl3} conterparts of the commands discussed in this section
+were also added.  The complete documentation can be found in the
+\pkg{lthooks} documentation \cite{37:lthooks-doc}.
+
+\subsubsection{Generic \texttt{cmd} hooks with arguments}
+
+Along with the possibility to pass arguments to a regular hook as
+discussed above, generic \hook{cmd} hooks now can access the arguments
+of the command they are patched into using the interface described in
+the previous section.
+
+For example, if you were to add some code to the \cs{title} command
+using hooks, you could access the actual title given in the argument.
+For example, to write the title of the document in the terminal you
+could use:
+\begin{verbatim}
+  \AddToHookWithArguments{cmd/title/before}
+    {\typeout{Document title: #1}}
+\end{verbatim}
 
+As with regular hooks, code added to a \hook{cmd} hook using
+\cs{AddToHook} will not be able to access the command's arguments.  This
+means that, as with regular hooks, this change is completely backwards
+compatible, so previous usages of \hook{cmd} hooks will work exactly as
+they did before.
 
 \subsection{Providing copy and show functions for environments}
 
@@ -279,31 +306,124 @@ following output:
 %
 \githubissue{963}
 
+\subsection{\cs{IfFileAtLeastTF}}
 
+The 2020-10-01 \LaTeX{} release introduced the CamelCase tests
+\cs{IfClassAtLeastTF} and \cs{IfPackageAtLeastTF} for checking class
+and package dates. We have now added \cs{IfFileAtLeastTF} to allow the
+same to happen for generic files which contain a \cs{ProvidesFile}
+line.
+%
+\githubissue{1015}
+
+\subsection{\cs{DeclareLowercaseMapping}, \cs{DeclareTitlecaseMapping}
+  and \cs{DeclareUppercaseMapping}}
+
+The move from a case-changing approach using \cs{lccode} and \cs{uccode} data
+to one where information is stored by a kernel-managed structure left a gap in
+the ability of the user to \emph{tune} the case changing outcomes. This has now
+been addressed by the addition of three commands
+\begin{itemize}
+  \item \cs{DeclareLowercaseMapping}
+  \item \cs{DeclareTitlecaseMapping}
+  \item \cs{DeclareUppercaseMapping}
+\end{itemize}
+which can be used to customise the outcome for codepoints. This can be applied
+generally or to a specific locale (see also the next section). A small number
+of pre-defined customisations have been set up in the kernel where the outcomes
+for \pdfTeX{} should be different for those from Unicode engines. For
+example
+\begin{verbatim}
+  \DeclareUppercaseMapping{"01F0}{\v{J}}
+\end{verbatim}
+allows \v{J} to be produced in 8-bit engines: without this customisation,
+an error would occur as there is no pre-composed \v{J} in Unicode. More detail
+is given in \texttt{usrguide}.
+%
+\githubissue{1033}
+
+\subsection{\cs{BCPdata}}
+
+Improvements in the Unicode handling for case changing have highlighted that
+the kernel has not to-date been locale-aware. The packages \pkg{babel} and
+\pkg{polyglossia} provide comprehensive locale support, but did not have
+an agreed unified interface to pass that information back to other code.
+Following discussion with the maintainers of those two bundles, the kernel
+now defines \cs{BCPdata} as a stub (so it is always defined), and \pkg{babel}
+and \pkg{polyglossia} will redefine it to provide the locale data. An agreed
+set of keywords mean that \cs{BCPdata} can be queried in a structured way
+by both the kernel and any other \enquote{consumer} packages.
+%
+\githubissue{1035}
+
+\subsection{Improve \cs{samepage}}
+
+The \cs{samepage} declaration sets various parameters to
+\texttt{10000} to prevent undesired page breaks.  The
+\cs{predisplaypenalty} parameter has already by default a value of
+\texttt{10000} and to save space back in the days it was therefore not
+explicitly set. However, there are a few classes that change the
+parameter and as result the user might experience a page break in
+front of a display formula within the scope of \cs{samepage} when
+using such classes. This has now been corrected and
+\cs{predisplaypenalty} is also explicitly set to \texttt{10000}.
+%
+\githubissue{1022}
 
+\subsection{Groups in \cs{MakeUppercase}}
+%
+Prior to 2022, \cs{MakeUppercase} and \cs{MakeLowercase} used a brace
+group around their argument so providing a scope for any declarations
+within the argument. This grouping has been restored (also
+for \cs{MakeTitlecase}), although the underlying L3 text case commands do
+not use grouping.
+%
+\githubissue{1021}
+
+\subsection{Extension of the \cs{label} command}
+
+Previously, in standard \LaTeX{}, the \cs{label} command wrote a \cs{newlabel} declaration into
+the \texttt{.aux} file and stored two values in
+second argument of this \cs{newlabel} command:
+\cs{@currentlabel}, which normally contains the state of the current 
+counter and \cs{thepage} for the current page number.
+
+The packages \pkg{hyperref} and 
+\pkg{nameref} then patched the \cs{label} command to store five values instead.
+In addition to the above they saved \cs{@currentlabelname}, which normally contains the 
+current title text and can be retrieved with \cs{nameref}, and 
+\cs{@currentHref}, which is the name of the destination needed to create an 
+active link. The fifth argument was only used if external 
+references were loaded with the \pkg{xr-hyper} package. 
+
+Starting with this release, the number of values stored in \cs{newlabel} have been unified. 
+\cs{label} now writes a
+\cs{newlabel} command that always contains five values in the second argument (each in a brace group):
+\cs{@currentlabel}, \cs{thepage}, \cs{@currentlabelname}, 
+\cs{@currentHref}, and \cs{@kernel@reserved@label@data} (which is reserved for the kernel).
+
+Additionally, a hook with the name \texttt{label} has been 
+added. It takes one argument: the label string.
+Code added to the hook can refer to this argument with \verb+#1+. 
+The hook is executed directly before the \cs{label} command writes to the \texttt{.aux} file
+but \emph{after} the \cs{@bsphack} command has done its spacing magic and it is located \emph{inside} a group, thus its code only affects the write operation. 
 
 \section{Code improvements}
 
-\subsection{\pkg{doc}: Index \texttt{\textbackslash\textvisiblespace} correctly}
-
-\emph{to write}
-%
-\githubissue{943}
+\subsection{Performance in checking file existence}
 
+The addition of hooks, etc., to file operations had a side-effect in that
+multiple checks were made that the file existed. In larger documents using
+lots of files, these file system operations caused non-trivial performance
+impact. We now cache the existence of files, such that these repeated filesystem
+calls are avoided.
 
-\subsection{Default definition for \cs{do}}
+\subsection{\pkg{doc}: Handle \texttt{\textbackslash\textvisiblespace} correctly in the index}
 
-The command \cs{do} with its nice public name is in reality an
-internal command inherited from plain \TeX{} for list
-processing. However, it only got a definition when
-\verb=\begin{document}= was executed, with a result that a user
-definition in the preamble was unconditionally overwritten at this
-point. To properly alert the user that this command is not freely
-available we now already provide a definition in the format so that
-\cs{newcommand} and friends produce a proper error message instead of
-providing a definition that doesn't last.
+Due to some problems in the code it wasn't possible to prevent
+\verb*=\ = from showing up in the index\Dash \verb=\DoNotIndex{\ }=, etc.\ had no effect. This has now been corrected.
 %
-\githubissue{975}
+\githubissue{943}
 
 
 \subsection{\pkg{doc}: Support the \pkg{upquote} package}
@@ -341,6 +461,23 @@ desired effect.
 \githubissue{953}
 
 
+\subsection{Default definition for \cs{do}}
+
+The command \cs{do} with its nice public name is in reality an
+internal command inherited from plain \TeX{} for list
+processing. However, it only got a definition when
+\verb=\begin{document}= was executed, with a result that a user
+definition in the preamble was unconditionally overwritten at this
+point. To properly alert the user that this command is not freely
+available we now already provide a definition in the format so that
+\cs{newcommand} and friends produce a proper error message instead of
+providing a definition that doesn't last.
+%
+\githubissue{975}
+
+
+
+
 \subsection{New key for \env{filecontents}}
 
 The \env{filecontents} environment warns on the terminal if a file
@@ -350,14 +487,13 @@ the warning less noisy in this case we added a new \texttt{nowarn} key
 that redirects the overwriting warning to the transcript file. We
 think that some record of the action is still required to help with
 debugging, thus it is not completely silenced. The warning that
-nothing gets written, because the file aready exists (and the
+nothing gets written, because the file already exists (and the
 \texttt{force} key was not used), is not altered and still shows up on
 the terminal.
 %
 \githubissue{958}
 
 
-
 \subsection{A further hook for shipping out pages}
 
 Since October 2020 the shipout process offers a number of hooks to
@@ -429,10 +565,21 @@ group (i.e., any local changes would immediately be revoked, breaking,
 for example, \pkg{wrapfig} in that special situation).
 %
 This got fixed with the 2022-11 PL1 hotfix, so was already corrected in
-the previous release, but only now documented in a newletter.
+the previous release, but only now documented in the newsletter.
 %
 \githubissue{967}
 
+\subsection{Ensure that \cs{cs} is defined in \cls{ltxdoc}}
+
+The class \cls{ltxdoc} defined the command \cs{cs} to typeset a
+command name with a backslash in front. This definition was moved to
+the \pkg{doc} package itself. This meant that it was suddenly missing
+when reverting to the old \pkg{doc} package implementation via the
+class option \texttt{doc2}. This has now been corrected.
+%
+\githubissue{981}
+
+
 
 \subsection{Improve spacing at top of \env{minipages}}
 
@@ -453,15 +600,180 @@ correct.
 \githubissue{989}
 
 
+\subsection{A fix for \cs{NewCommandCopy} and \cs{ShowCommand}}
+
+When copying and showing definitions of (non-expandable) document commands
+(aka commands defined by \cs{NewDocumentCommand} and friends) containing empty
+or only \texttt{m}-type arguments, these commands were wrongly recognized as
+expandable ones.
+This is fixed in the present \LaTeX{} release.
+%
+\githubissue{1009}
+
+\subsection{Corrections for switching math version}
+Some internal code improvements improve support for switching math version
+when nested within an outer math expression.
+This will improve \cs{boldsymbol} and \cs{bm} and similar commands.
+%
+\githubissue{1028}
+
+\subsection{Allow par as a filename}
+\verb|\input{par}| or \verb|\includegraphics{par}| could give spurious
+errors. This has been fixed by making an internal command \cs{long}.
+%
+\githubissue{942}
+
+\subsection{Correct setting of \cs{endlinechar} in \texttt{+v} arguments}
+In the particular case of a document command with a \texttt{+v}-type
+argument used inside \cs{ExplSyntaxOn}\texttt{/Off}, newlines would be
+misinterpreted as spaces because the value of \cs{endlinechar} was
+set too late.  This has been fixed, and now newlines are correctly
+translated to ``\verb|the character ^^M|''.
+%
+\githubissue{876}
+
+\subsection{Correct handling of hooks with only `next' code}
+When \cs{AddToHookNext} was used on a not-yet-declared hook, that hook
+would be incorrectly identified as empty by \cs{ShowHook}.  Also, if
+that hook was later declared, that `next' code would not be executed.
+This has been fixed by correctly initializing the hook structure when
+\cs{AddToHookNext} is used.
+%
+\githubissue{1052}
+
+\subsection{Ignoring space after \texttt{\$\$}}
+Space is normally ignored after a closing \texttt{\$\$},
+but internal \LaTeX{} font handling code could interfere if
+\cs{eqno} was used. \cs{eqno} and \cs{leqno} have been redefined
+to add \cs{ignorespaces} after the math group.
+%
+\githubissue{1059}
+
+\section{Documentation improvements}
+
+\subsection{Updates to the guides}
+
+When \LaTeXe{} was released, the team provided documentation for both document
+authors and package/class developers in the two files \texttt{usrguide} and
+\texttt{clsguide}. Over time, the team have augmented these documents as new
+methods have been added to the kernel. However, they retained there structure
+as starting from familiarity with \LaTeX{}~2.09. This meant that for new users,
+there was material which is no longer relevant, and less clarity than desirable
+in what approaches are recommended today.
+
+The two files have now been (partially) re-written, with the versions available
+previously now frozen as \texttt{usrguide-historic} and \texttt{clsguide-historic}.
+More material has been carried forward in the class/package guide than in the
+user guide, but both are worth a re-read by experienced \LaTeX{} users.
+
+
+
+\subsection{Displaying the exact release dates for \LaTeX{}}
 
-\section{Changes to packages in the \pkg{amsmath} category}
+In some situations it is necessary to find out the exact release dates
+for older version of the \LaTeX{} format, for example, when you need
+to use different code in a package depending on the availability of a
+certain feature and you therefore want to use
+\cs{IfFormatAtLeastTF}\texttt\{\meta{date}\texttt\} or the
+rather horrible construction \verb/\@ifl@t@r\fmtversion{/\meta{date}\texttt\},
+if you
+want to cater for formats that are older than 2020.
 
-\section{Changes to packages in the \pkg{graphics} category}
+Or you know that your package is definitely not going to work with a
+format before a certain \meta{date}, in which case you could use
+\verb/\NeedsTeXFormat{LaTeX2e}[/\meta{date}\texttt] to ensure that any
+  user is alerted if their format is too old.
+
+The big problem is to know the exact \meta{date} to put into such
+commands and in the past that was not that easy to find. You could have 
+looked in the the file \file{changes.txt}, but that is hidden somewhere
+in your installation and if you try
+\verb*/texdoc -l changes.txt/ you get more than thirty results and the %*
+right file is by no means the first.
+
+Yukai Chou (\textsf{@muzimuzhi}) kindly provided a patch for this, so that we now have
+the exact dates for each \LaTeX{} format listed in an easy to remember
+place: in \file{ltnews.pdf} and that file conveniently also contains all major
+features and changes to \LaTeX{} over the years\Dash one of which is
+most likely the reason you need the \meta{date} date in the first
+place.
+
+It is given in parentheses in the newsletter title, thus this
+newsletter tells you that on
+%
+\makeatletter
+\mbox{\expandafter\@gobblenonyear\@year\@nil
+  -\@julianmonthtonum\@month-\two@digits\@day}
+\makeatother
+%
+the command
+\cs{NewEnvironmentCopy}, a new \texttt{shipout} hook, etc.\ was made
+available.  And looking into \file{ltnews.pdf} you can now easily find
+out that the \LaTeX3 programming layer was added on 2020-02-02
+(because the date was so nice) and not on the first of the month.
+%
+\githubissue{982}
+
+\subsection{Fresh from the press: \enquote{The \LaTeX{} Companion, third edition} is now in print}
+
+The third edition of \emph{The \LaTeX{} Companion} is now
+available. This is the end of five years of careful work and we hope
+that it will provide our readers with all the information they need to
+successfully navigate the \LaTeX{} ecosystem and efficiently produce
+beautiful documents.
+
+Since the publication of the last edition (2004) a lot has happened in
+the \LaTeX{} world and thus a complete rewrite was necessary.  All
+chapters have been thoroughly revised and in many cases largely
+extended to describe new important functionality and features. More
+than 5,000 add-on packages have been analyzed in detail, out of which
+roughly 10\% have been chosen for inclusion in \emph{The \LaTeX{}
+Companion}. All important aspects of these packages are described to
+provide the user once again with a satisfying one-stop–shop experience
+for the decade to come.
+
+To cover what we thought worth describing today, the book nearly
+doubled in size. The print edition is therefore produced as a
+two-volume set and sold as a bundle. Both volumes come as hard-cover
+with ribbons to easily mark pages in the book.
+
+To give you an idea of what is covered in the third edition you can
+find some excerpts at
+\begin{quote}
+\url{https://www.latex-project.org/news/2023/03/17/TLC3}
+\end{quote}
+
+The edition is also available as an eBook (Parts I and II combined)
+consisting of PDF and ePub format without DRM. Finally, the publisher
+offers the combination of the printed books and the digital versions at
+a very attractive price not available anywhere else.
+
+
+%\section{Changes to packages in the \pkg{amsmath} category}
+
+%\section{Changes to packages in the \pkg{graphics} category}
 
 \section{Changes to packages in the \pkg{tools} category}
 
 
-\subsection{Fix handling of nested \env{multicols}}
+\subsection{\pkg{multicol}: Better support for CJK languages}
+
+The default minimum depth of each column in a \env{multicols}
+corresponds to the depth of a \enquote{p} in the current font. This
+helps to get some uniformity if rules are used between the columns and
+makes sense for Latin-based languages.  Until now it was hard-wired,
+but for CJK (Chinese/Japanese/Korean) languages it is better to use a zero depth, because there
+all characters have the same height and depth.  And even with
+Latin-based languages one might want to use the depth of a \cs{strut}
+or that of a parenthesis. So we now offer a way to adjust this while
+maintaining backward compatibility. Just redefine
+\cs{multicolmindepthstring} to hold whatever you want to get measured
+for its depth (the width is not relevant).
+%
+\githubissue{698}
+
+
+\subsection{\pkg{multicol}: Fix handling of nested environments}
 
 If \env{multicols} environments have been nested into each other (the
 inner one boxed) it could fail if the boxed environment appeared near a
@@ -484,6 +796,10 @@ page. This has now been fixed.
   \emph{The \texttt{\upshape ltshipout} documentation}.\\
   Run \texttt{texdoc} \texttt{ltshipout-doc} to view.
 
+\bibitem{37:lthooks-doc} Frank Mittelbach, Phelype Oleinik, \LaTeX{}~Project~Team:
+ \emph{\LaTeX's hook management}.\\
+ Run \texttt{texdoc} \texttt{lthooks-doc} to view.
+
 %\bibitem{37:blueprint} Frank Mittelbach and Chris Rowley:
 %  \emph{\LaTeX{} Tagged PDF \Dash A blueprint for a large project}.\\
 %  \url{https://latex-project.org/publications/indexbyyear/2020/}
diff --git a/macros/latex-dev/base/ltpara-code.pdf b/macros/latex-dev/base/ltpara-code.pdf
index 7813560129..9085a887da 100644
--- a/macros/latex-dev/base/ltpara-code.pdf
+++ b/macros/latex-dev/base/ltpara-code.pdf
diff --git a/macros/latex-dev/base/ltpara-doc.pdf b/macros/latex-dev/base/ltpara-doc.pdf
index fec25ce942..cd675c22bf 100644
--- a/macros/latex-dev/base/ltpara-doc.pdf
+++ b/macros/latex-dev/base/ltpara-doc.pdf
diff --git a/macros/latex-dev/base/ltpara.dtx b/macros/latex-dev/base/ltpara.dtx
index 7c96c72fc7..9c1a95ee61 100644
--- a/macros/latex-dev/base/ltpara.dtx
+++ b/macros/latex-dev/base/ltpara.dtx
@@ -1,7 +1,8 @@
 % \iffalse meta-comment
 %
-%% File: ltpara.dtx (C) Copyright 2020-2023
-%       Frank Mittelbach, LaTeX Team
+%% File: ltpara.dtx
+%% Copyright (C) 2020-2023
+%% Frank Mittelbach, The LaTeX Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/macros/latex-dev/base/ltplain.dtx b/macros/latex-dev/base/ltplain.dtx
index 1bdff344f7..89e5017300 100644
--- a/macros/latex-dev/base/ltplain.dtx
+++ b/macros/latex-dev/base/ltplain.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltplain.dtx}
-             [2022/01/25 v2.3h LaTeX Kernel (Plain TeX)]
+             [2023/04/15 v2.3i LaTeX Kernel (Plain TeX)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltplain.dtx}
@@ -660,6 +660,10 @@
 \def\extrafloats#1{%
 \ifnum#1>\z@
 \count@\numexpr\float@count-1\relax
+%    \end{macrocode}
+% \changes{v2.3i}{2023/04/15}{Protect box 255 in lualatex gh/1041}
+%    \begin{macrocode}
+  \ifnum\count@<266 \ch@ck0\m@ne\insert\fi
   \ch@ck0\count@\count
   \ch@ck1\count@\dimen
   \ch@ck2\count@\skip
@@ -668,8 +672,12 @@
 \global\expandafter\e@alloc@chardef
             \csname bx@\the\float@count\endcsname\float@count
 \@cons\@freelist{\csname bx@\the\float@count\endcsname}%
-\expandafter
-\extrafloats\expandafter{\numexpr#1-1\relax}%
+%    \end{macrocode}
+% \changes{v2.3i}{2023/04/15}{unwind numexpr and ifnum nesting}
+%    \begin{macrocode}
+\expandafter\extrafloats\expandafter{\the\numexpr#1-1\expandafter}%
+%    \end{macrocode}
+%    \begin{macrocode}
 \fi}%
 %    \end{macrocode}
 %
@@ -880,7 +888,6 @@
 % but the code is commented out if no special value needs to be set.
 % INITEX makes all parameters zero except where noted.
 %
-% \begin{oldcomments}
 %    \begin{macrocode}
 \pretolerance=100
 \tolerance=200 % INITEX sets this to 10000
@@ -897,10 +904,14 @@
 \brokenpenalty=100
 \predisplaypenalty=10000
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \postdisplaypenalty=0
 % \interlinepenalty=0
 % \floatingpenalty=0, set during \insert
 % \outputpenalty=0, set before TeX enters \output
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \doublehyphendemerits=10000
 \finalhyphendemerits=5000
@@ -971,6 +982,8 @@
 %    \begin{macrocode}
 \uchyph=1
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \lefthyphenmin=2 \righthyphenmin=3 set below
 % \globaldefs=0
 % \maxdeadcycles=25 % INITEX does this
@@ -978,21 +991,29 @@
 % \fam=0
 % \mag=1000 % INITEX does this
 % \escapechar=`\\ % INITEX does this
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \defaulthyphenchar=`\-
 \defaultskewchar=-1
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \endlinechar=`\^^M % INITEX does this
 % \newlinechar=-1     \LaTeX\ sets this in ltdefns.dtx.
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \delimiterfactor=901
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \time=now % TeX does this at beginning of job
 % \day=now % TeX does this at beginning of job
 % \month=now % TeX does this at beginning of job
 % \year=now % TeX does this at beginning of job
+%    \end{macrocode}
 %
-% \end{oldcomments}
 %    In \LaTeX{} we don't want box information in the transcript
 %    unless we do a full tracing.
 %  \changes{v1.0g}{1994/04/28}{Turn off overfull box tracing in log}
@@ -1012,26 +1033,36 @@
 \boxmaxdepth=\maxdimen
 %    \end{macrocode}
 %
-% \begin{oldcomments}
+%    \begin{macrocode}
 % \lineskiplimit=0pt, changed by \normalbaselines
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \delimitershortfall=5pt
 \nulldelimiterspace=1.2pt
 \scriptspace=0.5pt
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \mathsurround=0pt
 % \predisplaysize=0pt, set before TeX enters $$
 % \displaywidth=0pt, set before TeX enters $$
 % \displayindent=0pt, set before TeX enters $$
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \parindent=20pt
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \hangindent=0pt, zeroed by TeX after each paragraph
 % \hoffset=0pt
 % \voffset=0pt
 %
 % \baselineskip=0pt, changed by \normalbaselines
 % \lineskip=0pt, changed by \normalbaselines
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \parskip=0pt plus 1pt
 \abovedisplayskip=12pt plus 3pt minus 9pt
@@ -1039,19 +1070,26 @@
 \belowdisplayskip=12pt plus 3pt minus 9pt
 \belowdisplayshortskip=7pt plus 3pt minus 4pt
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \leftskip=0pt
 % \rightskip=0pt
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \topskip=10pt
 \splittopskip=10pt
 %    \end{macrocode}
+%
+%    \begin{macrocode}
 % \tabskip=0pt
 % \spaceskip=0pt
 % \xspaceskip=0pt
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \parfillskip=0pt plus 1fil
 %    \end{macrocode}
-% \end{oldcomments}
 %
 %
 % \begin{macro}{\normalbaselineskip}
@@ -1215,7 +1253,7 @@
   \gdef\obeylines{\catcode`\^^M\active%
     \let^^M\obeyedline%
 %    \end{macrocode}
-%    
+%
 %    The next line ending the definition is rather curious and it took
 %    me awhile to understand why rollback fails. The problem is the
 %    following: if \texttt{latexrelease} is used, then blocks of
diff --git a/macros/latex-dev/base/ltshipout-code.pdf b/macros/latex-dev/base/ltshipout-code.pdf
index 79b27f4984..c9209dbbb0 100644
--- a/macros/latex-dev/base/ltshipout-code.pdf
+++ b/macros/latex-dev/base/ltshipout-code.pdf
diff --git a/macros/latex-dev/base/ltshipout-doc.pdf b/macros/latex-dev/base/ltshipout-doc.pdf
index 131c5251a0..b05bab812e 100644
--- a/macros/latex-dev/base/ltshipout-doc.pdf
+++ b/macros/latex-dev/base/ltshipout-doc.pdf
diff --git a/macros/latex-dev/base/ltshipout.dtx b/macros/latex-dev/base/ltshipout.dtx
index 1b3cabcfc8..b19814a6fd 100644
--- a/macros/latex-dev/base/ltshipout.dtx
+++ b/macros/latex-dev/base/ltshipout.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %%
 %% Copyright (C) 2020-2023
-%%               Frank Mittelbach, LaTeX Team
+%% Frank Mittelbach, The LaTeX Project
 %%
 %
 % This file is part of the LaTeX base system.
diff --git a/macros/latex-dev/base/ltspace.dtx b/macros/latex-dev/base/ltspace.dtx
index 672ab92729..1dbfefc7b1 100644
--- a/macros/latex-dev/base/ltspace.dtx
+++ b/macros/latex-dev/base/ltspace.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltspace.dtx}
-             [2022/11/28 v1.3o LaTeX Kernel (spacing)]
+             [2023/03/22 v1.3p LaTeX Kernel (spacing)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltspace.dtx}
@@ -308,8 +308,10 @@
 %  \end{macro}
 %
 %  \begin{macro}{\samepage}
+% \changes{v1.3p}{2023/03/22}{Add \cs{predisplaypenalty} setting (gh/1022)}
 %    \begin{macrocode}
 \DeclareRobustCommand\samepage{\interlinepenalty\@M
+   \predisplaypenalty\@M
    \postdisplaypenalty\@M
    \interdisplaylinepenalty\@M
    \@beginparpenalty\@M
diff --git a/macros/latex-dev/base/ltvers.dtx b/macros/latex-dev/base/ltvers.dtx
index da131765ac..beed347903 100644
--- a/macros/latex-dev/base/ltvers.dtx
+++ b/macros/latex-dev/base/ltvers.dtx
@@ -115,7 +115,7 @@
    {2023-06-01}
 %</2ekernel|latexrelease>
 %<*2ekernel>
-\def\patch@level{-2}
+\def\patch@level{-3}
 %    \end{macrocode}
 %
 % \begin{macro}{\development@branch@name}
diff --git a/macros/latex-dev/base/ltx3info.pdf b/macros/latex-dev/base/ltx3info.pdf
index ccdd69abd9..b69198d99f 100644
--- a/macros/latex-dev/base/ltx3info.pdf
+++ b/macros/latex-dev/base/ltx3info.pdf
diff --git a/macros/latex-dev/base/ltxdoc.dtx b/macros/latex-dev/base/ltxdoc.dtx
index 78b6de4bcc..e147c9d22f 100644
--- a/macros/latex-dev/base/ltxdoc.dtx
+++ b/macros/latex-dev/base/ltxdoc.dtx
@@ -30,7 +30,7 @@
 %
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<class>\ProvidesClass{ltxdoc}
-%<class>         [2022/06/22 v2.1i Standard LaTeX documentation class]
+%<class>         [2023/03/28 v2.1j Standard LaTeX documentation class]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -182,9 +182,13 @@
 %
 %    Support rolling back \pkg{doc} to version 2:
 % \changes{v2.1e}{2022/05/27}{Support rolling  back doc to version 2}
+% \changes{v2.1j}{2023/03/28}{Define \cs{cs} if doc is rolled back to v2 (gh/981)}
 %    \begin{macrocode}
 \let\ltxdoc@doc@version\@empty  % use current version by default
-\DeclareOption{doc2}{\def\ltxdoc@doc@version{=v2}}
+\DeclareOption{doc2}{%
+  \def\ltxdoc@doc@version{=v2}%
+  \DeclareRobustCommand\cs[1]{\texttt{\bslash #1}}%
+}
 %    \end{macrocode}
 % 
 %    \begin{macrocode}
@@ -670,8 +674,10 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 % kernel sources.
 %
 %
-% Copyright 2006, 2007, 2011 Heiko Oberdiek
-% Copyright 2014-2021 The LaTeX Project
+% Copyright 2006, 2007, 2011
+% Heiko Oberdiek
+% Copyright (C) 2014-2023
+% The LaTeX Project
 % 
 
 \ProvidesFile{ltxdoc.cfg}%
diff --git a/macros/latex-dev/base/ltxdoc.pdf b/macros/latex-dev/base/ltxdoc.pdf
index 188d833aeb..b820c58deb 100644
--- a/macros/latex-dev/base/ltxdoc.pdf
+++ b/macros/latex-dev/base/ltxdoc.pdf
diff --git a/macros/latex-dev/base/ltxguide.cls b/macros/latex-dev/base/ltxguide.cls
index b743fd9cda..778f7e993e 100644
--- a/macros/latex-dev/base/ltxguide.cls
+++ b/macros/latex-dev/base/ltxguide.cls
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2019
+% Copyright (C) 1993-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/ltxref.dtx b/macros/latex-dev/base/ltxref.dtx
index dcfebf0e7e..0f842e4312 100644
--- a/macros/latex-dev/base/ltxref.dtx
+++ b/macros/latex-dev/base/ltxref.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltxref.dtx}
-             [2022/04/12 v1.1p LaTeX Kernel (Cross Referencing)]
+             [2023/05/16 v1.1q LaTeX Kernel (Cross Referencing)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltxref.dtx}
@@ -93,6 +93,15 @@
 %  to align with the use of \pkg{hyperref}. Without \pkg{hyperref} (or some
 %  other package using the starred form) the star is simply ignored.
 %
+%  Note: starting with 2023-06-01 |\label| stores also the current value
+%  of |\@currentlabelname| which should typically contain a (sanitized) title.
+%  (A reference command |\nameref| is provided by the \pkg{nameref} package.)
+%  |\label| also stores |\@currentHref| which if set should refer to a target name
+%  for links. This value is set and used by \pkg{hyperref}. Unlike the other values
+%  |\@currentHref| should be set globally. A fifth value |\@kernel@reserved@label@data|
+%  is reserved for the kernel to allow future extensions of the cross-reference
+%  system.
+%    
 %
 % \MaybeStop{}
 %
@@ -108,7 +117,8 @@
 %  incremented by the command  \refstepcounter{CNT} , which sets
 %  \@currentlabel == {CNT}{eval(\p@cnt\theCNT)}.   The command
 %  \label{FOO} then writes the following on file \@auxout :
-%        \newlabel{FOO}{{eval(\@currentlabel)}{eval(\thepage)}}
+%        \newlabel{FOO}{{eval(\@currentlabel)}{eval(\thepage)}%
+%           {eval(\@currentlabelname)}{eval(\@currentHref)}{eval(\@kernel@reserved@label@data)}}
 %
 %  \ref{FOO} ==
 %    BEGIN
@@ -228,6 +238,10 @@
 %
 % RmS 93/09/08: Added setting of refundefined switch.
 %    \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2023/06/01}%
+%<latexrelease>                 {\@kernel@sref}{store five arguments}%
 \def\@setref#1#2#3{%
   \ifx#1\relax
    \protect\G@refundefinedtrue
@@ -235,19 +249,53 @@
    \@latex@warning{Reference `#3' on page \thepage \space
              undefined}%
   \else
-   \expandafter#2#1\null
+   \expandafter#2#1\@empty\@empty\@empty\null
   \fi}
 %    \end{macrocode}
 %    \begin{macrocode}
-%</2ekernel>
-%<*2ekernel|latexrelease>
+\long\def\@firstoffive#1#2#3#4#5{#1}
+\long\def\@secondoffive#1#2#3#4#5{#2}
+\def\@kernel@sref#1{\expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}}
+\def\@kernel@spageref#1{\expandafter\@setref\csname r@#1\endcsname
+                 \@secondoffive{#1}}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2022/06/01}%
+%<latexrelease>                 {\@kernel@sref}{store five arguments}%
+%<latexrelease>\def\@setref#1#2#3{%
+%<latexrelease>  \ifx#1\relax
+%<latexrelease>   \protect\G@refundefinedtrue
+%<latexrelease>   \nfss@text{\reset@font\bfseries ??}%
+%<latexrelease>   \@latex@warning{Reference `#3' on page \thepage \space
+%<latexrelease>             undefined}%
+%<latexrelease>  \else
+%<latexrelease>   \expandafter#2#1\null
+%<latexrelease>  \fi}
+%<latexrelease>\let\@firstoffive\undefined
+%<latexrelease>\let\@secondoffive\undefined
+%<latexrelease>\def\@kernel@sref#1{\expandafter\@setref\csname r@#1\endcsname\@firstoftwo{#1}}
+%<latexrelease>\def\@kernel@spageref#1{\expandafter\@setref\csname r@#1\endcsname
+%<latexrelease>                 \@secondoftwo{#1}}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@kernel@sref}{store five arguments}%
+%<latexrelease>\def\@setref#1#2#3{%
+%<latexrelease>  \ifx#1\relax
+%<latexrelease>   \protect\G@refundefinedtrue
+%<latexrelease>   \nfss@text{\reset@font\bfseries ??}%
+%<latexrelease>   \@latex@warning{Reference `#3' on page \thepage \space
+%<latexrelease>             undefined}%
+%<latexrelease>  \else
+%<latexrelease>   \expandafter#2#1\null
+%<latexrelease>  \fi}
+%<latexrelease>\let\@firstoffive\undefined
+%<latexrelease>\let\@secondoffive\undefined
+%<latexrelease>\let\@kernel@sref\undefined
+%<latexrelease>\let\@kernel@spageref\undefined
+%<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{2022/06/01}%
 %<latexrelease>                 {\ref}{Add starred reference commands}%
 %    \end{macrocode}
 %    \begin{macrocode}
-\def\@kernel@sref#1{\expandafter\@setref\csname r@#1\endcsname\@firstoftwo{#1}}
-\def\@kernel@spageref#1{\expandafter\@setref\csname r@#1\endcsname
-                 \@secondoftwo{#1}}
 \let\@kernel@ref\@kernel@sref
 \let\@kernel@pageref\@kernel@spageref
 \NewDocumentCommand\ref{s}
@@ -334,6 +382,8 @@
 %  \begin{macro}{\label}
 % \changes{v1.1d}{1994/11/04}{(ASAJ)Added \cs{protected@write}}
 % \changes{v1.1d}{1994/11/04}{(ASAJ)Added \cs{protected@edef}}
+% \changes{v1.1q}{2023/05/12}{(UFi)extended to store five arguments}
+% \changes{v1.1q}{2023/05/12}{(UFi)added a hook with argument} 
 %    The commands |\label| and |\refstepcounter| have been changed to
 %    allow |\protect|'ed commands to work properly.  For example,
 %\begin{verbatim}
@@ -343,16 +393,27 @@
 %    to something like |\foo{4.d}|.  Change made 20 Jul 88.
 %
 %    \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2023/06/01}%
+%<latexrelease>                 {\label}{store five label arguments}%
+\providecommand\@currentlabelname{}
+\providecommand\@currentHref{}
+\providecommand\@kernel@reserved@label@data{}
+\NewHookWithArguments{label}{1}
 \def\label#1{\@bsphack
+  \begingroup
+  \UseHookWithArguments{label}{1}{#1}%
   \protected@write\@auxout{}%
-         {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}%
+         {\string\newlabel{#1}{{\@currentlabel}{\thepage}%
+          {\@currentlabelname}{\@currentHref}{\@kernel@reserved@label@data}}}%
+  \endgroup        
   \@esphack}
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 %
 %    \begin{macrocode}
-%</2ekernel>
-%<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2022/06/01}%
 %<latexrelease>                 {\Ref}{Add starred version}%
 %    \end{macrocode}
@@ -432,6 +493,16 @@
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\label}{store five label arguments}%
+%<latexrelease>\let\@currenttitle\@undefined
+%<latexrelease>\let\@currenttarget\@undefined
+%<latexrelease>\let\@kernel@currentdata\@undefined
+%<latexrelease>\def\label#1{\@bsphack
+%<latexrelease>  \protected@write\@auxout{}%
+%<latexrelease>         {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}%
+%<latexrelease>  \@esphack}
+%<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{2020/10/01}%
 %<latexrelease>                 {\Ref}{Add starred version}%
 %<latexrelease>\def\@currentcounter{}
diff --git a/macros/latex-dev/base/makeindx.pdf b/macros/latex-dev/base/makeindx.pdf
index 8d714a1cf1..39caa9b4cb 100644
--- a/macros/latex-dev/base/makeindx.pdf
+++ b/macros/latex-dev/base/makeindx.pdf
diff --git a/macros/latex-dev/base/manifest.txt b/macros/latex-dev/base/manifest.txt
index d63945fa0e..22791a2494 100644
--- a/macros/latex-dev/base/manifest.txt
+++ b/macros/latex-dev/base/manifest.txt
@@ -27,7 +27,8 @@
 % sample2e.tex    --  Sample LaTeX input file.
 % small2e.tex     --  Small sample LaTeX input file.
 %
-% clsguide.tex    --  How to write class files.
+% clsguide.tex   --  How to write class files.
+% clsguide-historic.tex    --  How to write class files with a focus on moving from 2.09.
 % cfgguide.tex    --  Guide to using `.cfg' files to configure LaTeX.
 % cyrguide.tex    --  Guide to using cyrillic languages in LaTeX.
 % encguide.tex    --  Guide to font encodings.
@@ -71,12 +72,15 @@
 % ltnews33.tex    --  What was new in the release dated 2021/06.
 % ltnews34.tex    --  What was new in the release dated 2021/11.
 % ltnews35.tex    --  What was new in the release dated 2022/06.
+% ltnews36.tex    --  What was new in the release dated 2022/11.
+% ltnews37.tex    --  What was new in the release dated 2023/06.
 
 %
 % ltx3info.tex    --  Information about the LaTeX3 project.
 %
 % lamport-manual.err  --  Errata for the LaTeX Manual book, second edition.
 % tlc2.err        --  Errata for the LaTeX Companion, second edition.
+% tlc3.err        --  Errata for the LaTeX Companion, third edition.
 % lb2.err         --  Errata for the LaTeX-Begleiter, 2te erw. Auflage (German).
 % lgc2.err        --  Errata for the LaTeX Graphics Companion, second edition.
 % webcomp.err     --  Errata for the LaTeX Web Companion.
diff --git a/macros/latex-dev/base/minimal.cls b/macros/latex-dev/base/minimal.cls
index 9024a23bca..89c233c30f 100644
--- a/macros/latex-dev/base/minimal.cls
+++ b/macros/latex-dev/base/minimal.cls
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2019
+% Copyright (C) 1993-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/modguide.pdf b/macros/latex-dev/base/modguide.pdf
index d484bf783b..6c5e0ef3e5 100644
--- a/macros/latex-dev/base/modguide.pdf
+++ b/macros/latex-dev/base/modguide.pdf
diff --git a/macros/latex-dev/base/nfssfont.pdf b/macros/latex-dev/base/nfssfont.pdf
index cb2d37b3c3..a6455d33ad 100644
--- a/macros/latex-dev/base/nfssfont.pdf
+++ b/macros/latex-dev/base/nfssfont.pdf
diff --git a/macros/latex-dev/base/proc.pdf b/macros/latex-dev/base/proc.pdf
index dc5c8e3a67..3e75484000 100644
--- a/macros/latex-dev/base/proc.pdf
+++ b/macros/latex-dev/base/proc.pdf
diff --git a/macros/latex-dev/base/slides.pdf b/macros/latex-dev/base/slides.pdf
index 49a2fbf7be..0b7fbe33b6 100644
--- a/macros/latex-dev/base/slides.pdf
+++ b/macros/latex-dev/base/slides.pdf
diff --git a/macros/latex-dev/base/slifonts.fdd b/macros/latex-dev/base/slifonts.fdd
index ec8b802596..5b66975095 100644
--- a/macros/latex-dev/base/slifonts.fdd
+++ b/macros/latex-dev/base/slifonts.fdd
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2019
+% Copyright (C) 1993-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/slifonts.pdf b/macros/latex-dev/base/slifonts.pdf
index 4707b8a219..411d29444c 100644
--- a/macros/latex-dev/base/slifonts.pdf
+++ b/macros/latex-dev/base/slifonts.pdf
diff --git a/macros/latex-dev/base/source2e.pdf b/macros/latex-dev/base/source2e.pdf
index f84a84ea72..153a370981 100644
--- a/macros/latex-dev/base/source2e.pdf
+++ b/macros/latex-dev/base/source2e.pdf
diff --git a/macros/latex-dev/base/syntonly.pdf b/macros/latex-dev/base/syntonly.pdf
index 24da1cf460..bafd004837 100644
--- a/macros/latex-dev/base/syntonly.pdf
+++ b/macros/latex-dev/base/syntonly.pdf
diff --git a/macros/latex-dev/base/tlc2.pdf b/macros/latex-dev/base/tlc2.pdf
index e21a6fb104..af4dda256a 100644
--- a/macros/latex-dev/base/tlc2.pdf
+++ b/macros/latex-dev/base/tlc2.pdf
diff --git a/macros/latex-dev/base/tlc3.err b/macros/latex-dev/base/tlc3.err
new file mode 100644
index 0000000000..f790c6d791
--- /dev/null
+++ b/macros/latex-dev/base/tlc3.err
@@ -0,0 +1,829 @@
+\newcommand\erratafiledate{2023-05-16}
+
+\def\comando#1{\texttt{\string#1}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% To produce a printed version of this errata file run this file through
+% LaTeX. It will unpack a small class file (if not already present) and
+% a configuration file with the extension .cfg. You might want to modify
+% the setting in this configuration file to print only a partial errata
+% suitable for your printed revision of this book, see details in the
+% .cfg file.
+%
+% The current version of this file can be found at:
+%
+%    https://www.latex-project.org/help/books/
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\begin{filecontents}{ttcterrata.cls}
+%%
+%% Copyright (C) 1997-2021 Frank Mittelbach
+%% This class file is licenced under LPPL latest version;
+%% see https://www.latex-project.org/lppl
+%
+%
+% It sets up a few commands used to format the errata entries for books in the
+% Addison-Wesley Series:
+%
+%    Tools and Techniques for Computer Typesetting
+%
+% hence the name. However, anybody who likes to use it is free to apply it for
+% errata files of other books.
+%
+% Changes:
+%
+% v1.0a - changed name from errata.cls to ttcterrata.cls
+% v1.0b - added \arraybackslash
+% v1.0c - and took it out again and used \tabularnewline instead
+
+\ProvidesClass{ttcterrata}
+  [2021/08/03 v1.0c Mini class for errata files; subject to change (FMi)]
+
+\LoadClass{article}
+
+\setcounter{secnumdepth}{-1}
+\addtolength\textwidth{5cm}
+\addtolength\oddsidemargin{-3cm}
+
+\addtolength\textheight{36pt}
+
+\RequirePackage{shortvrb}
+\MakeShortVerb{\|}
+
+\RequirePackage{array,longtable}
+\RequirePackage{multicol}
+
+
+\newcommand\erratagetnumber{}
+\def\erratagetnumber#1/#2/#3\erratagetnumber{#1#2#3}
+
+
+\newcommand\gobbleerrata{%
+  \setbox\@tempboxa\vbox\bgroup
+     \let\endgobble\egroup
+     \let\hideamp\relax
+     \let\\\relax
+     \let\tabularnewline\relax
+     \let\par\@@par}
+
+\newcommand*\hideamp{&}
+
+\let\endgobble\relax
+
+
+\newcommand\erratastartdate{}
+\newcommand\myprinting{1}
+
+
+\newcommand\doweprint[2]{%
+  \ifnum \myprinting < \if!#2!1000 \else \ifx s#2 1000\else#2 \fi\fi
+   \ifnum \expandafter\erratagetnumber\erratastartdate\erratagetnumber <
+          \erratagetnumber#1\erratagetnumber \relax
+     \@tempswatrue
+   \else
+     \@tempswafalse
+   \fi
+  \else
+    \@tempswafalse
+  \fi
+}
+
+
+
+\newcommand\includedentries{entries after = \erratastartdate}
+\newcommand\printedentries{between \erratastartdate\space and}
+
+\newcommand\showallerrors{%
+ \renewcommand\includedentries{all errata entries}%
+ \renewcommand\printedentries{up to}
+ \renewcommand\doweprint[2]{\@tempswatrue}}
+
+
+\newcommand\displayrevisionfix[2]{%
+    \if!#2!\textbf{#1}\else\textit{#1}\rlap{\textsuperscript{#2}}\fi}
+
+\newcommand\norevisionnumbers{%
+  \renewcommand\displayrevisionfix[2]{\textbf{##1}}}
+
+\IfFileExists{\jobname.cfg}
+  {
+   \input{\jobname.cfg}
+   \typeout{***************************************************}
+   \typeout{*}
+   \typeout{* Configuration file for \jobname.err found }
+   \typeout{*}
+   \typeout{***************************************************}
+  \AtEndDocument{
+   \typeout{***************************************************}
+   \typeout{*}
+   \typeout{* If you wish to generate an errata listing}
+   \typeout{* containing only errors found after a certain revision}
+   \typeout{* and/or only errors found after a certain date}
+   \typeout{* modify the information stored in \jobname.cfg}
+   \typeout{*}
+   \typeout{* Current settings are:}
+   \typeout{*}
+   \typeout{* \@spaces  printing of your book = \myprinting}
+   \typeout{* \@spaces  include \includedentries}
+   \typeout{*}
+   \typeout{***************************************************}
+  }}
+  {}
+
+%% \erroronpage <page> <line info> <contributor> <date> <fixed in revision>
+
+\newcommand\erroronpage[5]{%
+   \endgobble
+   \doweprint{#4}{#5}%
+   \if@tempswa
+     \typeout{Typesetting entry #1 #2 #3 #4}%
+   \else
+     \typeout{Ignoring entry #1 #2 #3 #4}%
+     \expandafter\gobbleerrata
+   \fi
+   \hideamp \tabularnewline
+   \displayrevisionfix{#1}{#5}
+   \hideamp #2 \hideamp (\textsf{#3}) \hideamp
+}
+
+\newcommand\seriouserroronpage[5]{%
+   \endgobble
+   \doweprint{#4}{#5}%
+   \if@tempswa
+     \typeout{Typesetting entry #1 #2 #3 #4}%
+   \else
+     \typeout{Ignoring entry #1 #2 #3 #4}%
+     \expandafter\gobbleerrata
+   \fi
+   \hideamp \tabularnewline
+   \fbox{\bfseries !!}\hfill
+   \displayrevisionfix{#1}{#5}
+   \hideamp #2 \hideamp (\textsf{#3}) \hideamp
+}
+
+\newcommand\CHAPTER[1]{\endgobble
+  &\tabularnewline[4pt]%
+  \multicolumn{4}{l}{\framebox[10cm][l]{\textbf{\normalsize\strut#1}}} \tabularnewline}
+
+\newenvironment{erratalist}
+  {\begin{longtable}{r>{\raggedright}p{2cm}l>{\raggedright}p{10cm}l}}
+  {\endgobble\end{longtable}}
+
+\newcommand\erratatitle[2]
+  {\begin{center}\LARGE\bfseries
+      Errata list for #1\\[5pt](\myprinting.\ printing)\\[10pt]
+      \small Includes all entries found \printedentries\space #2\\
+      (For other periods/print runs reprocess this document
+      with different config settings)
+   \end{center}%
+   \markright{Errata for #1 (\printedentries\space #2)}%
+   \thispagestyle{plain}%
+   \vspace{20pt}}
+
+\pagestyle{myheadings}
+
+\AtBeginDocument{\small}
+
+\setlength\parindent{0pt}
+\setlength\parskip{2pt}
+
+\newcommand\contributor[2]{\makebox[1cm][l]{\sffamily#1} #2\par}
+
+% some special shortcuts overwriting existing commands:
+
+\let\u\underline
+\renewcommand\>{$\to$}
+
+%%% some code suggested by Thorsten Hansen to count the number of
+%%% contributions by individuals (will work only if we do not get
+%%% too many :-)
+
+\def\count@contributors#1/#2/#3\@nil{
+   \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}%
+%%%   also count secondary:
+%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}%
+}
+
+\renewcommand\erroronpage[5]{%
+   \count@contributors#3/secondary/\@nil
+   \endgobble
+   \doweprint{#4}{#5}%
+   \if@tempswa
+     \typeout{Typesetting entry #1 #2 #3 #4}%
+   \else
+     \typeout{Ignoring entry #1 #2 #3 #4}%
+     \expandafter\gobbleerrata
+   \fi
+   \hideamp \tabularnewline
+   \displayrevisionfix{#1}{#5}
+   \hideamp #2 \hideamp (\textsf{#3}) \hideamp
+}
+
+\renewcommand\seriouserroronpage[5]{%
+   \count@contributors#3/secondary/\@nil
+   \endgobble
+   \doweprint{#4}{#5}%
+   \if@tempswa
+     \typeout{Typesetting entry #1 #2 #3 #4}%
+   \else
+     \typeout{Ignoring entry #1 #2 #3 #4}%
+     \expandafter\gobbleerrata
+   \fi
+   \hideamp \tabularnewline
+   \fbox{\bfseries !!}\hfill
+   \displayrevisionfix{#1}{#5}
+   \hideamp #2 \hideamp (\textsf{#3}) \hideamp
+}
+
+\renewcommand\contributor[2]{\makebox[1cm][l]{%
+  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par}
+
+\end{filecontents}
+
+
+\begin{filecontents}{\jobname.cfg}
+%
+%
+% Configuration file for the errata listing of
+%
+%  The LaTeX Companion, Third Edition, Parts I & II
+%
+%
+% \erratastartdate
+%
+% Specifies the date from which on errata entries should be listed.
+%
+% The format is YYYY/MM/DD.
+%
+% The default below ensures that all entries for a particular
+% printing are typeset.
+%
+
+\renewcommand\erratastartdate{2023/04/01}
+
+
+%
+% \myprinting
+%
+% Specifies which (revised) printing you own. For example, if you
+%    have the second printing set this to 2 so that errors already
+%    corrected in that printing will not appear in your errata
+%    listing.
+%
+% The default below ensures that all entries relevant to the x-th
+%    printing are typeset.
+%
+%
+
+\renewcommand\myprinting{1}
+
+%
+% \norevisionnumbers
+%
+% Specifies that all page numbers in the errata are shown in the same
+%    format (bold face) irregardless of whether or not they are fixed
+%    in some revision. The default is to print corrected errors in
+%    italic and add the revision number as a superscript.
+
+%
+% \showallerrors
+%
+% With this command you tell the program that all errata entries are
+%    supposed to be generated. This makes \myprinting and
+%    \erratastartdate basically obsolete so this isn't turned on by
+%    default.
+%
+%
+\endinput
+\end{filecontents}
+
+
+\documentclass{ttcterrata}[2005/11/10]  % we want new class
+
+\usepackage[T1]{fontenc}
+\let\u\underline          % shortcut for this file
+\newcommand\meta[1]{$\langle$\textit{#1\/}$\rangle$}
+
+\usepackage{textcomp}
+
+\usepackage{url}
+
+\begin{document}
+
+\erratatitle{The \LaTeX{} Companion, Third Edition, Parts I \& II}{\erratafiledate}
+
+
+\begin{verbatim}
+@book(A-W:MF:2023,
+   author = {Frank Mittelbach and Ulrike Fischer},
+   title = {The {\LaTeX} Companion},
+   edition = 3,
+   note =  {With contributions by Javier Bezos, Johannes Braams, and Joseph Wright},
+   series =    {Tools and Techniques for Computer Typesetting},
+   publisher = {Addison-Wesley},
+   address   = {Boston, Massachusetts},
+   year = 2023,
+   pagenums = {976 (Part I) and 1008 (Part II)},
+   bibliography = {yes},
+   index = {yes},
+   isbn = {978-0-13-816648-9},
+)
+\end{verbatim}
+
+
+\begin{list}{}{\setlength\leftmargin{0cm}\setlength\rightmargin{3cm}}
+\item[]
+
+This file (\texttt{\jobname.err}) can be found as part of the \LaTeX{}
+distribution and its latest version is maintained on the \LaTeX{}
+project site at \texttt{https://www.latex-project.org/help/books/\jobname.err}
+where you will also find extracts of the book.
+
+The first column in the table shows the page number of the errata
+entry.  Superscript numbers in the first column refer to the printed
+revision in which this entry was corrected (\textit{s} indicates a
+correction in the sources only). The second
+column gives the precise location (negative line or paragraph numbers
+are counted from the bottom of the page). The third column shows the
+first finder of the problem.
+
+You can customize this list to only show errata related to the printing
+you own by changing the configuration in the file \texttt{\jobname.cfg}.
+
+\begin{center}
+  \Large \bfseries  To Err is Human --- Bug Contest
+\end{center}
+
+Any mistake found and reported is a gain for all readers of our book.
+For this reason Addison-Wesley and the authors offer a prize (for 5
+periods) to the eligible person who finds the largest
+number of bugs during that period (in case of a draw a random choice
+will be made between all those with the largest number of findings).
+A person can receive at most one prize, ever; errors found by any of
+the authors do not count.
+
+Each prize is a free choice of any single computing book found on the
+Addison-Wesley/Pearson web site:
+\texttt{https://www.informit.com} (that
+is, no boxed sets or multiple volume offers).
+
+
+As usual, the authors and publisher reserve the right to make various
+decisions such as whether a reported feature is an error for
+competitive purposes or whether similar features count as a single or
+multiple errors.  ---
+Good luck!
+
+\begin{center}
+\begin{tabular}{clr}
+Contest period ends & Winner \\[4pt]
+2023/?? &                         & ??? suggestions\\
+\end{tabular}
+\end{center}
+
+
+Due to its size the third edition of \textit{The \LaTeX{} Companion} is printed
+as a two-volume set. The digital version, however, is provided as a
+single PDF or ePub. This means that a small fraction of the digital
+content differs from that of the printed version: there is only a
+single font matter, a single bibliography, and a single index, whereas
+in the printed books these are separated out. However, all versions share the main
+matter (down to the page numbering) so most of the errata applies to
+all versions, but to a few only to the digital and others only to the
+printed version. Thus, we end up with three separate lists.
+
+
+\end{list}
+
+%\newpage
+
+
+%<--------------------------
+
+\newcommand\BibTeX{\textsc{Bib}\TeX}
+\newcommand\cs[1]{\texttt{\textbackslash #1}}
+\newcommand\env[1]{\texttt{#1}}
+\newcommand\pkg[1]{\textsf{#1}}
+
+\section*{Errata for the print version (not applicable to the digital version)}
+
+The printed books differ from the digital version in that the
+biligraphy is split across both volumes (with a few repeats) and that
+the font matter of each volume has its own table of contents and list
+of figures and tables. Therefore these parts have different page
+numbers and you will see similar errata entries for both print and
+digital differing only in that respect.
+
+\begin{erratalist}
+
+\CHAPTER{Front matter (Part I)} 
+
+\erroronpage{I-ix\ldots I-xvi}{}{FMi}{2023/04/04}{s}
+Dot leaders have been changed on all sections.
+
+\erroronpage{I-xvii}{chapter head}{FMi}{2023/04/04}{s}
+formulas \> \u{F}ormulas
+
+\erroronpage{I-xvii}{chapter head}{FMi}{2023/04/04}{s}
+documents \> \u{D}ocuments
+
+\erroronpage{I-xvii}{chapter head}{FMi}{2023/04/04}{s}
+beyond \> \u{B}yond
+
+\erroronpage{I-xx\ldots I-xxi}{}{FMi}{2023/04/04}{s}
+Dot leaders have been changed on all sections.
+
+\CHAPTER{Bibliography (Part I)} 
+
+\erroronpage{I-783}{[55], l.-2}{FMi}{2023/04/04}{s}
+all \> \u{them} all
+
+\erroronpage{I-785}{[73], l.-2}{kb/bb}{2023/04/04}{s}
+the go-forward way for \LaTeX-coding \> \\
+the way for \LaTeX{} coding going forward
+
+\erroronpage{I-786}{[87], l.2}{kb/bb}{2023/04/04}{s}
+p. \> pp.
+
+\erroronpage{I-786}{[88], l.2}{kb/bb}{2023/04/04}{s}
+p. \> pp.
+
+\erroronpage{I-787}{[92], l.2}{kb/bb}{2023/04/04}{s}
+Add: Vancouver, 1999
+
+\erroronpage{I-788}{[100], l.3}{kb/bb}{2023/04/04}{s}
+Publishing \> Publishing\u{,}
+
+\erroronpage{I-790}{[122], l.1}{kb/bb}{2023/04/04}{s}
+In \u{ACM editor} ``Proceedings \> In ``PODC'01: Proceedings
+
+\erroronpage{I-790}{[122], l.1}{kb/bb}{2023/04/04}{s}
+In \u{Unicode Consortium, editor} \> In
+
+
+\CHAPTER{Front matter (Part II)} 
+
+\erroronpage{II-x\ldots II-xxviii}{}{FMi}{2023/04/04}{s}
+Dot leaders have been changed on all sections.
+
+\erroronpage{II-xiv}{heading}{bb/FMi}{2023/04/04}{s}
+Multiple alignments: \env{align} \u{and \env{flalign}}
+\>\\
+Multiple alignments: \env{align}\u{, \env{flalign}, and \env{alignat}}
+
+\erroronpage{II-xv}{chapter head}{FMi}{2023/04/04}{s}
+formulas \> \u{F}ormulas
+
+\erroronpage{II-xvi}{chapter head}{FMi}{2023/04/04}{s}
+documents \> \u{D}ocuments
+
+\erroronpage{II-xxi}{chapter head}{FMi}{2023/04/04}{s}
+beyond \> \u{B}yond
+
+
+
+\CHAPTER{Bibliography (Part II)} 
+
+\erroronpage{II-799}{[43], l.-2}{FMi}{2023/04/04}{s}
+all \> \u{them} all
+
+\erroronpage{II-801}{[62], l.-2}{kb/bb}{2023/04/04}{s}
+the go-forward way for \LaTeX-coding \>\\
+the way for \LaTeX{} coding going forward
+
+\erroronpage{II-802}{[71], l.2}{kb/bb}{2023/04/04}{s}
+p. \> pp.
+
+\erroronpage{II-802}{[72], l.2}{kb/bb}{2023/04/04}{s}
+p. \> pp.
+
+\erroronpage{II-803}{[80], l.3}{kb/bb}{2023/04/04}{s}
+Publishing \> Publishing\u{,}
+
+
+
+
+\end{erratalist}
+
+
+%<--------------------------
+
+\section*{Errata for the digital version (not applicable to the print version)}
+
+All known errors to the digital version have already been incorporated in the product as distributed.
+
+%\begin{erratalist}
+%
+%\CHAPTER{General}
+%
+%\CHAPTER{Front matter}
+%
+%\end{erratalist}
+
+
+%<--------------------------
+
+
+\section*{Errata common to the print and digital versions}
+
+The main matter is identical (also in page numbers) in the print and
+the digital versions. Therefore most errata entries appear in this
+section.
+
+\begin{erratalist}
+
+
+\CHAPTER{General}
+
+\erroronpage{}{}{FMi}{2023/04/04}{s}
+Some corrections result in index changes. These are not tracked here;
+the index is always fully regenerated for new printings.
+
+\CHAPTER{Chapter 1 --- Introduction}
+
+\erroronpage{I-5}{para 4, l.4}{kb}{2023/04/04}{s}
+\u{of} the bugs \> \u{with} the bugs
+\\ Already corrected in the digital version.
+
+
+\erroronpage{I-5}{para 5, l.5}{kb}{2023/04/04}{s}
+not least \> \u{but} not least
+\\ Already corrected in the digital version.
+
+
+\CHAPTER{Chapter 2 --- The Structure of a \LaTeX{} Document}
+
+\erroronpage{I-34}{l.-1}{FMi}{2023/04/04}{s}
+Moved first line of page 35 to 34.
+\\ Already corrected in the digital version.
+
+\erroronpage{I-35}{l.1}{FMi}{2023/04/04}{s}
+Moved first line of page 35 to 34.
+\\ Already corrected in the digital version.
+
+\erroronpage{I-113}{listing}{FMi}{2023/05/14}{s}
+Situation is the same in the 2023 distributions; listing output updated.
+\\ Already corrected in the digital version.
+
+
+\CHAPTER{Chapter 3 --- Basic Formatting Tools -- Paragraph \ldots}
+
+
+\CHAPTER{Chapter 4 --- Basic Formatting Tools -- Larger \ldots}
+
+
+\CHAPTER{Chapter 5 --- The Layout of the Page}
+
+
+\CHAPTER{Chapter 6 --- Tabular  Material}
+
+
+\CHAPTER{Chapter 7 --- Mastering Floats}
+
+
+\CHAPTER{Chapter 8 --- Graphics Generation and Manipulation}
+
+
+\CHAPTER{Chapter 9 --- Font Selection and Encodings}
+ 
+\erroronpage{I-669}{exa 9-3-11}{FMi}{2023/04/04}{s}
+Changed line breaks in example.
+
+\erroronpage{I-708}{listing}{FMi}{2023/05/14}{s}
+Situation is the same in the 2023 distributions; listing output updated.
+\\ Already corrected in the digital version.
+
+
+\CHAPTER{Chapter 10 --- Text and Symbol Fonts}
+ 
+\erroronpage{II-114}{table 10.89}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-117}{table 10.92}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-121}{table 10.96}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-122}{table 10.98}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-122}{table 10.99}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-123}{table 10.100}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-124}{table 10.103}{FMi}{2023/04/04}{s}
+Added missing \texttt{U+00Fx} line.
+There was a bug in code generating it.
+\\ Already corrected in the digital version.
+
+
+
+\CHAPTER{Chapter 11 --- Higher Mathematics}
+
+\erroronpage{II-127}{para 1, l.5}{bb/FMi}{2023/04/04}{s}
+\u{The} American Mathematical Society (AMS) \u{provides} a major
+package, \pkg{amsmath}, which \u{makes} \ldots
+\>\\
+\u{In the early nineties the} American Mathematical Society (AMS)
+\u{provided} a major package, \pkg{amsmath}, which \u{made} \ldots
+\\ Already corrected in the digital version.
+
+\erroronpage{II-129}{para -3, l.1}{bb/FMi}{2023/04/04}{s}
+The principal documentation for these packages
+\>\\
+The principal documentation for these \u{two} packages
+\\ Already corrected in the digital version.
+
+
+\erroronpage{II-129}{para -1, l.3}{bb}{2023/04/04}{s}
+\u{lot} additions \> \u{many} additions
+\\ Already corrected in the digital version.
+
+
+\erroronpage{II-132}{table 11.1}{bb/FMi}{2023/04/04}{s}
+Also mention \env{alignat}, \env{alignat*}, and \env{alignedat}.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-133}{para 4,l.2}{bb/FMi}{2023/04/04}{s}
+Add:
+
+Furthermore, they move the equation tag out of the way if it would
+otherwise overprint the formula.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-138}{heading}{bb/FMi}{2023/04/04}{s}
+Multiple alignments: \env{align} \u{and \env{flalign}}
+\>
+Multiple alignments: \env{align}\u{, \env{flalign}, and \env{alignat}}
+\\ Already corrected in the digital version.
+
+\erroronpage{II-138}{}{FMi}{2023/04/04}{s}
+Moved para from 139 to end of this page.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-139}{para 1}{FMi}{2023/04/04}{s}
+Moved para back to page 138.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-139}{bottom}{FMi}{2023/04/04}{s}
+Add:
+
+Sometimes it is more convenient to explicitly specify all the
+horizontal spacing yourself within the formula. For this you can use
+an \env{alignat} environment. It differs from \env{align} in two ways: you have to
+specify the number of \texttt{rl} pairs as an argument to the environment and
+it does not add any spaces between the pairs, e.g.,
+\begin{verbatim}
+\begin{alignat}{3} x &= y &\qquad X &= Y &\qquad a &= b+c \\ ...
+\end{verbatim}
+As usual, equation numbers can be altered with \cs{tag} or suppressed with \cs{notag}.
+\\ Already corrected in the digital version.
+
+
+\erroronpage{II-140}{para 1, l.2}{bb/FMi}{2023/04/04}{s}
+Add:
+
+Do not forget to reset \cs{minalignsep} if you change it in this manner.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-140}{para 2, l.4}{bb/FMi}{2023/04/04}{s}
+Add:
+
+You can think of them as subsidiary environments that can be used
+within any of the display environments discussed so far (below we use
+them inside equation).
+\\ Already corrected in the digital version.
+
+\erroronpage{II-140}{para -1}{FMi}{2023/04/04}{s}
+Paragraph moved to page 141.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-141}{}{FMi}{2023/04/04}{s}
+One paragraph added moved over from page 144.
+\\ Already corrected in the digital version.
+
+\erroronpage{II-144}{para 2, l.-3}{FMi}{2023/04/04}{s}
+the issue \> the \u{spacing} issue
+\\ Already corrected in the digital version.
+
+\erroronpage{II-145}{para 2, l.1}{bb/FMi}{2023/04/04}{s}
+Add:
+
+Another problem is that an empty line introduces an unwanted break
+point in front of the display, thus \cs{predisplaypenalty} is no
+longer honored.
+\\ Already corrected in the digital version.
+
+
+\CHAPTER{Chapter 12 --- Fonts in Formulas}
+
+\erroronpage{II-225}{heading}{FMi}{2023/04/04}{s}
+Chapter title not properly capitalized.
+\\ Already corrected in the digital version.
+
+
+\CHAPTER{Chapter 13 --- Localizing Documents}
+ 
+\erroronpage{II-297}{heading}{FMi}{2023/04/04}{s}
+Chapter title not properly capitalized.
+\\ Already corrected in the digital version.
+
+
+\CHAPTER{Chapter 14 --- Index Generation}
+ 
+
+\CHAPTER{Chapter 15 --- Bibliography Generation}
+ 
+
+\CHAPTER{Chapter 16 --- Managing Citations}
+
+
+\CHAPTER{Chapter 17 --- \LaTeX{} Package Documentation Tools}
+ 
+
+\CHAPTER{Appendix A --- \LaTeX{} Overview for Preamble, \ldots}
+ 
+
+\CHAPTER{Appendix B --- Tracing and Resolving Problems}
+ 
+
+\CHAPTER{Appendix C --- Going Beyond}
+  
+\erroronpage{II-297}{heading}{FMi}{2023/04/04}{s}
+Appendix title not properly capitalized.
+\\ Already corrected in the digital version.
+
+\CHAPTER{Biographies}
+
+\CHAPTER{Production Notes}
+
+\end{erratalist}
+
+
+
+
+
+\setcounter{collectmore}{3}
+
+\begin{multicols}{3}[Thanks to all who have found errors or
+   omissions. Listed are the people who found an errata entry first.]
+\contributor{bb}{Barbara Beeton}
+\contributor{FMi}{Frank Mittelbach}
+\contributor{kb}{Karl Berry}
+\end{multicols}
+
+
+Other people have sent us corrections for errors already found.
+Thanks to all of you!
+
+If you find further errors please report them to one of the authors, e.g.,
+\begin{quote}\ttfamily
+  frank.mittelbach@latex-project.org
+\end{quote}
+preferably in a form usable directly in this file, i.e.,
+\begin{flushleft}
+|\erroronpage{|\textit{page-number}|}{|\textit{line-identification}|}{|%
+   \textit{your-initials}|}{|\textit{date}|}{}| \\
+   \hspace*{2em}\textit{description of the erratum}
+\end{flushleft}
+Here is an example:
+\begin{verbatim}
+\erroronpage{5}{para 3, l.1}{FMi}{2023/06/21}{}
+   \u{LaTeX}  \>  \u{\LaTeX}
+\end{verbatim}
+\verb=\u= underlines a text fragment and \verb=\>= produces \>.
+\end{document}
+
+
+
+
+\seriouserroronpage{general}{}{FMi}{2004/06/12}{}
+
+   To help you in assessing this errata document we have placed
+   exclamation marks in front of each entry that we consider essential
+   for correctly understanding the book contents.
+
+\erroronpage{general}{}{FMi}{2004/05/14}{}
+
+   Due to the printing process there may be small alignment problems
+   between blue and black text on some pages. These can vary from book
+   to book depending on how the paper was handled between print
+   runs---such is the analog nature of printing on a press.
+
diff --git a/macros/latex-dev/base/tlc3.pdf b/macros/latex-dev/base/tlc3.pdf
new file mode 100644
index 0000000000..df716ea46f
--- /dev/null
+++ b/macros/latex-dev/base/tlc3.pdf
diff --git a/macros/latex-dev/base/tulm.fdd b/macros/latex-dev/base/tulm.fdd
index 243cbe30cc..c8dd8b95fc 100644
--- a/macros/latex-dev/base/tulm.fdd
+++ b/macros/latex-dev/base/tulm.fdd
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2016-2021
+% Copyright (C) 2016-2023
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
diff --git a/macros/latex-dev/base/tulm.pdf b/macros/latex-dev/base/tulm.pdf
index d2c4ec94d0..3084afc1ab 100644
--- a/macros/latex-dev/base/tulm.pdf
+++ b/macros/latex-dev/base/tulm.pdf
diff --git a/macros/latex-dev/base/usrguide-historic.pdf b/macros/latex-dev/base/usrguide-historic.pdf
index 3149112b43..b160cc0774 100644
--- a/macros/latex-dev/base/usrguide-historic.pdf
+++ b/macros/latex-dev/base/usrguide-historic.pdf
diff --git a/macros/latex-dev/base/usrguide.pdf b/macros/latex-dev/base/usrguide.pdf
index c4953d7e33..4f4a8b4e28 100644
--- a/macros/latex-dev/base/usrguide.pdf
+++ b/macros/latex-dev/base/usrguide.pdf
diff --git a/macros/latex-dev/base/usrguide.tex b/macros/latex-dev/base/usrguide.tex
index f06850afaa..b1039a3595 100644
--- a/macros/latex-dev/base/usrguide.tex
+++ b/macros/latex-dev/base/usrguide.tex
@@ -32,9 +32,10 @@
 
 \usepackage[T1]{fontenc}  % needed for \textbackslash in tt
 \usepackage{csquotes}
+\usepackage{url}
 
 \title{\LaTeX\ for authors --- current version}
-\author{\copyright~Copyright 2020-2022, \LaTeX\ Project Team.\\
+\author{\copyright~Copyright 2020-2023, \LaTeX\ Project Team.\\
    All rights reserved.%
    \footnote{This file may be distributed and/or modified under the
      conditions of the \LaTeX{} Project Public License, either version 1.3c
@@ -42,7 +43,7 @@
     \texttt{usrguide.tex} for full details.}%
 }
 
-\date{2022-07-05}
+\date{2023-05-23}
 
 \NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
 \NewDocumentCommand\marg{m}{\arg{#1}}
@@ -340,6 +341,12 @@ in \pkg{amsmath} environments, which in the terms here would be defined as
 \NewDocumentCommand\\{!s !o}{ ... }
 \end{verbatim}
 
+Also notable when using optional arguments in the last position is that \TeX{}
+will necessarily look ahead for the argument opening token. This means that
+the value of |\inputlineno| will be `out by one' if such a trailing optional
+argument is \emph{not} present and the command ends a line; it will be one
+greater than the line number containing the last mandatory argument.
+
 \subsection{`Embellishments'}
 \label{sec:cmd:embellishment}
 
@@ -636,7 +643,19 @@ processed argument can be further processed using a mapping function
 If only a single character \meta{token} is used for the split, any
 category code $13$ (active) character matching the \meta{token} will
 be replaced before the split takes place.
-Spaces are trimmed at each end of each item parsed.
+Spaces are trimmed at each end of each item parsed. Exactly one set
+of braces will be stripped if an entire item is surrounded by them,
+i.e.~the following inputs and outputs result (each separte item as
+a brace group).
+\begin{verbatim}
+a      ==> {a}
+{a}    ==> {a}
+{a}b   ==> {{a}b}
+a,b    ==> {a}{b}
+{a},b  ==> {a}{b}
+a,{b}  ==> {a}{b}
+a,{b}c ==> {a}{{b}c}
+\end{verbatim}
 
 \begin{decl}
   |\ProcessList| \arg{list} \arg{function}
@@ -716,7 +735,7 @@ put that code at the end of the \meta{start code}. Nevertheless this
 
 Environments that use this feature can be nested.
 
-\subsection{Fully-expandable document commands}
+\subsection{Fully-expandable document commands\label{sec:ltcmd:expandable}}
 
 Document commands created using \cs{NewDocumentCommand}, etc.\@, are normally
 created so that they do not expand unexpectedly. This is done using engine
@@ -724,7 +743,7 @@ features, so is more powerful than \LaTeXe{}'s \cs{protect} mechanism. There
 are \emph{very rare} occasion when it may be useful to create functions using a
 expansion-only grabber. This imposes a number of restrictions on the
 nature of the arguments accepted by a function, and the code it implements.
-This facility should only be used when \emph{absolutely necessary}.
+This facility should only be used when \emph{necessary}.
 
 \begin{decl}
   |\NewExpandableDocumentCommand|     \arg{cmd} \arg{arg spec} \arg{code} \\
@@ -755,6 +774,25 @@ available:
     in the standard version.
 \end{itemize}
 
+\subsection{Commands at the start of tabular cells}
+
+Creating commands that are used at the start of tabular cells imposes
+some restrictions on the underlying implementation. The standard \LaTeX{}
+tabular environments (\texttt{tabular}, etc.)  use a mechanism which requires
+that any command wrapping \cs{multicolumn} or similar must be
+`expandable'. This is \emph{not} the case for commands created using
+\cs{NewDocumentCommand}, etc., which as detailed in
+Section~\ref{sec:ltcmd:expandable} use an engine feature which prevents
+such `expansion'. Therefore, to create such wrappers for use at the start
+of tabular cells, you must use \cs{NewExpandableDocumentCommand}, for example
+\begin{verbatim}
+\NewExpandableDocumentCommand\MyMultiCol{m}{\multicolumn{3}{c}{#1}}
+\begin{tabular}{lcr}
+a & b & c \\
+\MyMultiCol{stuff} \\
+\end{tabular}
+\end{verbatim}
+
 \subsection{Details about argument delimiters}
 
 In normal (non-expandable) commands, the delimited types look for the
@@ -844,23 +882,23 @@ The argument specifications for document commands and environments are
 available for examination and use.
 
 \begin{decl}
-  |\GetDocumentCommandArgSpec| \arg{function}         \\
+  |\GetDocumentCommandArgSpec| \arg{cmd}         \\
   |\GetDocumentEnvironmentArgSpec| \arg{environment}
 \end{decl}
 These functions transfer the current argument specification for the
-requested \meta{function} or \meta{environment} into the token list
-variable \cs{ArgumentSpecification}. If the \meta{function} or
+requested \meta{cmd} or \meta{environment} into the token list
+variable \cs{ArgumentSpecification}. If the \meta{cmd} or
 \meta{environment} has no known argument specification then an error
 is issued. The assignment to \cs{ArgumentSpecification} is local to
 the current \TeX{} group.
 
 \begin{decl}
-  |\ShowDocumentCommandArgSpec| \arg{function}         \\
+  |\ShowDocumentCommandArgSpec| \arg{cmd}         \\
   |\ShowDocumentEnvironmentArgSpec| \arg{environment}
 \end{decl}
 These functions show the current argument specification for the
-requested \meta{function} or \meta{environment} at the terminal. If
-the \meta{function} or \meta{environment} has no known argument
+requested \meta{cmd} or \meta{environment} at the terminal. If
+the \meta{cmd} or \meta{environment} has no known argument
 specification then an error is issued.
 
 
@@ -1149,11 +1187,11 @@ therefore shows the same syntax peculiars as discussed
 above. Nevertheless, in practice they are usually sufficient.  For
 example
 \begin{verbatim}
-\newcommand\calulateheight[1]{%
+\newcommand\calculateheight[1]{%
   \setlength\textheight{\dimeval{\topskip+\baselineskip*\inteval{#1-1}}}}
 \end{verbatim}
 sets the \cs{textheight} to the appropriate value if a page should
-hold a specific number of text lines. Thus after |\calulateheight{40}|
+hold a specific number of text lines. Thus after |\calculateheight{40}|
 it is set to \dimeval{\topskip+\baselineskip*\inteval{40-1}}, given
 the values \cs{topskip} (\dimeval{\topskip}) and \cs{baselineskip}
 (\dimeval{\baselineskip}) in the current document.
@@ -1216,8 +1254,35 @@ cases
   \item Lowercasing
   \item Titlecasing (only applies for the start of the input)
 \end{itemize}
+
 The command \cs{DeclareCaseChangeEquivalent} provides a way to substitute a
 command by an alternative version when it is found inside a case changing
-situation.
+situation. There are three commands for customising the case changing of
+codepoints
+\begin{decl}
+  |\DeclareLowercaseMapping| \oarg{locale} \arg{codepoint} \arg{output} \\
+  |\DeclareTitlecaseMapping| \oarg{locale} \arg{codepoint} \arg{output} \\
+  |\DeclareUppercaseMapping| \oarg{locale} \arg{codepoint} \arg{output}
+\end{decl}
+All three take a \meta{codepoint} (as an integer expression) and will
+result in the \meta{output} being produced under the appropriate case changing
+operation. The optional \meta{locale} can be given if the mapping should only
+apply to a specific one: this is given in BCP-47 format
+(\url{https://en.wikipedia.org/wiki/IETF_language_tag}). For example,
+the kernel customises the mapping for U+01F0 (\v{j}) when uppercasing in
+8-bit engines:
+\begin{quotation}
+  |\DeclareUppercaseMapping{"01F0}{\v{J}}|
+\end{quotation}
+as there is no pre-composed \v{J} character, and this is problematic if
+the engine does not support Unicode natively. Similarly, to set a locale
+\texttt{xx} to behave in the same way as Turkish and retain the difference
+between dotted- and dotless-i, one could use for example
+\begin{quotation}
+  |\DeclareLowercaseMapping{xx}{"0049}{\i}|\\
+  |\DeclareLowercaseMapping{xx}{"0130}{i}|\\
+  |\DeclareUppercaseMapping{xx}{"0069}{\.{I}}|\\
+  |\DeclareUppercaseMapping{xx}{"0131}{I}|
+\end{quotation}
 
 \end{document}
diff --git a/macros/latex-dev/base/utf8ienc.pdf b/macros/latex-dev/base/utf8ienc.pdf
index d211ec2de1..d8b84af1b4 100644
--- a/macros/latex-dev/base/utf8ienc.pdf
+++ b/macros/latex-dev/base/utf8ienc.pdf
diff --git a/macros/latex-dev/base/webcomp.pdf b/macros/latex-dev/base/webcomp.pdf
index a7e1a07aec..86adc3d75f 100644
--- a/macros/latex-dev/base/webcomp.pdf
+++ b/macros/latex-dev/base/webcomp.pdf
diff --git a/macros/latex-dev/required/amsmath/README.md b/macros/latex-dev/required/amsmath/README.md
index 059ebb7f30..a636bfca30 100644
--- a/macros/latex-dev/required/amsmath/README.md
+++ b/macros/latex-dev/required/amsmath/README.md
@@ -1,7 +1,7 @@
 The amsmath bundle for LaTeX
 ============================
 
-Release 2023-05-01 pre-release 0
+Release 2023-06-01 pre-release 3
 
 Overview
 --------
@@ -77,5 +77,5 @@ version 1.3c or later.
 -----
 
 <p>Copyright (C) 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society. <br />
-<p>Copyright (C) 2016-2022 The LaTeX Project and American Mathematical Society. <br />
+<p>Copyright (C) 2016-2023 The LaTeX Project and American Mathematical Society. <br />
 
diff --git a/macros/latex-dev/required/amsmath/amsbsy.ins b/macros/latex-dev/required/amsmath/amsbsy.ins
index c35a72dad6..62b4e9a67c 100644
--- a/macros/latex-dev/required/amsmath/amsbsy.ins
+++ b/macros/latex-dev/required/amsmath/amsbsy.ins
@@ -26,7 +26,7 @@
 \preamble
 
 Copyright (C) 1995, 1999 American Mathematical Society.
-Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsbsy.pdf b/macros/latex-dev/required/amsmath/amsbsy.pdf
index fef1eb8058..6111ecae01 100644
--- a/macros/latex-dev/required/amsmath/amsbsy.pdf
+++ b/macros/latex-dev/required/amsmath/amsbsy.pdf
diff --git a/macros/latex-dev/required/amsmath/amscd.dtx b/macros/latex-dev/required/amsmath/amscd.dtx
index 1ed5be6b67..85475708cc 100644
--- a/macros/latex-dev/required/amsmath/amscd.dtx
+++ b/macros/latex-dev/required/amsmath/amscd.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amscd.ins b/macros/latex-dev/required/amsmath/amscd.ins
index 5ecf051583..56aedca375 100644
--- a/macros/latex-dev/required/amsmath/amscd.ins
+++ b/macros/latex-dev/required/amsmath/amscd.ins
@@ -1,6 +1,6 @@
 %%
 %% Copyright (C) 2010 American Mathematical Society.
-%% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
 \preamble
 
 Copyright (C) 1995, 1999 American Mathematical Society.
-Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amscd.pdf b/macros/latex-dev/required/amsmath/amscd.pdf
index 54650bb11d..a2c2ed3461 100644
--- a/macros/latex-dev/required/amsmath/amscd.pdf
+++ b/macros/latex-dev/required/amsmath/amscd.pdf
diff --git a/macros/latex-dev/required/amsmath/amsgen.dtx b/macros/latex-dev/required/amsmath/amsgen.dtx
index 0493940071..6c4aefed67 100644
--- a/macros/latex-dev/required/amsmath/amsgen.dtx
+++ b/macros/latex-dev/required/amsmath/amsgen.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsgen.ins b/macros/latex-dev/required/amsmath/amsgen.ins
index 7d845e61cf..faef4aa275 100644
--- a/macros/latex-dev/required/amsmath/amsgen.ins
+++ b/macros/latex-dev/required/amsmath/amsgen.ins
@@ -25,7 +25,7 @@
 \preamble
 
 Copyright (C) 1995, 1999 American Mathematical Society.
-Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsgen.pdf b/macros/latex-dev/required/amsmath/amsgen.pdf
index 487f9c57dd..d390ea31c1 100644
--- a/macros/latex-dev/required/amsmath/amsgen.pdf
+++ b/macros/latex-dev/required/amsmath/amsgen.pdf
diff --git a/macros/latex-dev/required/amsmath/amsldoc.pdf b/macros/latex-dev/required/amsmath/amsldoc.pdf
index 75882027b2..e4a1de1d67 100644
--- a/macros/latex-dev/required/amsmath/amsldoc.pdf
+++ b/macros/latex-dev/required/amsmath/amsldoc.pdf
diff --git a/macros/latex-dev/required/amsmath/amsldoc.tex b/macros/latex-dev/required/amsmath/amsldoc.tex
index 4a8230e39f..5c4b9e0d89 100644
--- a/macros/latex-dev/required/amsmath/amsldoc.tex
+++ b/macros/latex-dev/required/amsmath/amsldoc.tex
@@ -1,6 +1,6 @@
 %
 % Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsmath.dtx b/macros/latex-dev/required/amsmath/amsmath.dtx
index 34d17b65f0..bf8aa418df 100644
--- a/macros/latex-dev/required/amsmath/amsmath.dtx
+++ b/macros/latex-dev/required/amsmath/amsmath.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{amsmath}[2022/04/08 v2.17n AMS math features]
+\ProvidesPackage{amsmath}[2023/05/13 v2.17o AMS math features]
 %    \end{macrocode}
 %
 % \section{Catcode defenses}
@@ -6261,9 +6261,10 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}%
 %    Standard \latex/ provides three environments for one-line equations:
 %    \cn{[}\cn{]}, \env{equation}, and \env{displaymath}. We add
 %    \env{equation*} as a synonym for \env{displaymath}.
+% \changes{v2.17o}{2023/05/13}{Do not error if \cs{eqno} not primitive (gh/1059)}
 %    \begin{macrocode}
-\@saveprimitive\leqno\@@leqno
-\@saveprimitive\eqno\@@eqno
+\let\@@eqno\eqno
+\let\@@leqno\leqno
 \def\eqno{\@@eqno\let\eqno\relax\let\leqno\relax}
 \def\leqno{\@@leqno\let\leqno\relax\let\eqno\relax}
 %
diff --git a/macros/latex-dev/required/amsmath/amsmath.ins b/macros/latex-dev/required/amsmath/amsmath.ins
index 82876ffc5d..f92839f959 100644
--- a/macros/latex-dev/required/amsmath/amsmath.ins
+++ b/macros/latex-dev/required/amsmath/amsmath.ins
@@ -1,6 +1,6 @@
 %%
 %% Copyright (C) 2010 American Mathematical Society.
-%% Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
 \preamble
 
 Copyright (C) 1995, 1999, 2000, 2013 American Mathematical Society.
-Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsmath.pdf b/macros/latex-dev/required/amsmath/amsmath.pdf
index 3f4832c1d9..448b93eb6e 100644
--- a/macros/latex-dev/required/amsmath/amsmath.pdf
+++ b/macros/latex-dev/required/amsmath/amsmath.pdf
diff --git a/macros/latex-dev/required/amsmath/amsopn.dtx b/macros/latex-dev/required/amsmath/amsopn.dtx
index 110a5fa8be..b089749c17 100644
--- a/macros/latex-dev/required/amsmath/amsopn.dtx
+++ b/macros/latex-dev/required/amsmath/amsopn.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsopn.ins b/macros/latex-dev/required/amsmath/amsopn.ins
index 8a57404c1e..859e3d7e5a 100644
--- a/macros/latex-dev/required/amsmath/amsopn.ins
+++ b/macros/latex-dev/required/amsmath/amsopn.ins
@@ -1,6 +1,6 @@
 %%
 %% Copyright (C) 2010 American Mathematical Society.
-%% Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
 \preamble
 
 Copyright (C) 1995, 1999 American Mathematical Society.
-Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsopn.pdf b/macros/latex-dev/required/amsmath/amsopn.pdf
index 03ebc9dcc8..600d07b451 100644
--- a/macros/latex-dev/required/amsmath/amsopn.pdf
+++ b/macros/latex-dev/required/amsmath/amsopn.pdf
diff --git a/macros/latex-dev/required/amsmath/amstext.dtx b/macros/latex-dev/required/amsmath/amstext.dtx
index 7498040214..a4bc541d34 100644
--- a/macros/latex-dev/required/amsmath/amstext.dtx
+++ b/macros/latex-dev/required/amsmath/amstext.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amstext.ins b/macros/latex-dev/required/amsmath/amstext.ins
index 3ba3000eb8..11ed56cc3c 100644
--- a/macros/latex-dev/required/amsmath/amstext.ins
+++ b/macros/latex-dev/required/amsmath/amstext.ins
@@ -1,6 +1,6 @@
 %%
 %% Copyright (C) 2010 American Mathematical Society.
-%% Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
 \preamble
 
 Copyright (C) 1995, 1999 American Mathematical Society.
-Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amstext.pdf b/macros/latex-dev/required/amsmath/amstext.pdf
index 7478fd056f..22d74846a0 100644
--- a/macros/latex-dev/required/amsmath/amstext.pdf
+++ b/macros/latex-dev/required/amsmath/amstext.pdf
diff --git a/macros/latex-dev/required/amsmath/amsxtra.dtx b/macros/latex-dev/required/amsmath/amsxtra.dtx
index c2bc4bbd26..a1f2c6686c 100644
--- a/macros/latex-dev/required/amsmath/amsxtra.dtx
+++ b/macros/latex-dev/required/amsmath/amsxtra.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2022 LaTeX Project and American Mathematical Society.
+% Copyright (C) 2016-2023 LaTeX Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsxtra.ins b/macros/latex-dev/required/amsmath/amsxtra.ins
index 70f50c6bcb..4707222513 100644
--- a/macros/latex-dev/required/amsmath/amsxtra.ins
+++ b/macros/latex-dev/required/amsmath/amsxtra.ins
@@ -1,6 +1,6 @@
 %%
 %% Copyright (C) 2010 American Mathematical Society.
-%% Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
 \preamble
 
 Copyright (C) 1995, 1999 American Mathematical Society.
-Copyright (C) 2016-2022  LaTeX Project and American Mathematical Society.
+Copyright (C) 2016-2023  LaTeX Project and American Mathematical Society.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex-dev/required/amsmath/amsxtra.pdf b/macros/latex-dev/required/amsmath/amsxtra.pdf
index 1c089bcc8b..db5c893578 100644
--- a/macros/latex-dev/required/amsmath/amsxtra.pdf
+++ b/macros/latex-dev/required/amsmath/amsxtra.pdf
diff --git a/macros/latex-dev/required/amsmath/changes.txt b/macros/latex-dev/required/amsmath/changes.txt
index 83d6c6e3a1..afa03be5dd 100644
--- a/macros/latex-dev/required/amsmath/changes.txt
+++ b/macros/latex-dev/required/amsmath/changes.txt
@@ -2,6 +2,11 @@
 All changes above are only part of the development branch for the next release.
 ================================================================================
 
+
+2023-05-13  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* amsmath.dtx: Adjust the definition of \@@eqno  (gh/1059)
+
 #########################
 # 2022-06-01 Release
 #########################
diff --git a/macros/latex-dev/required/amsmath/subeqn.pdf b/macros/latex-dev/required/amsmath/subeqn.pdf
index 396c9f26ea..a57bf08977 100644
--- a/macros/latex-dev/required/amsmath/subeqn.pdf
+++ b/macros/latex-dev/required/amsmath/subeqn.pdf
diff --git a/macros/latex-dev/required/amsmath/technote.pdf b/macros/latex-dev/required/amsmath/technote.pdf
index ae2549ac2a..fa8c5fb8d3 100644
--- a/macros/latex-dev/required/amsmath/technote.pdf
+++ b/macros/latex-dev/required/amsmath/technote.pdf
diff --git a/macros/latex-dev/required/amsmath/testmath.pdf b/macros/latex-dev/required/amsmath/testmath.pdf
index a18992e79c..91af9de869 100644
--- a/macros/latex-dev/required/amsmath/testmath.pdf
+++ b/macros/latex-dev/required/amsmath/testmath.pdf
diff --git a/macros/latex-dev/required/firstaid/changes.txt b/macros/latex-dev/required/firstaid/changes.txt
index 31e2439734..e326957807 100644
--- a/macros/latex-dev/required/firstaid/changes.txt
+++ b/macros/latex-dev/required/firstaid/changes.txt
@@ -1,3 +1,14 @@
+2023-05-20  Ulrike Fischer  <Ulrike.Fischer@latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx: removed temporary fix for 
+      GitHub issue 591, unneeded now and it breaks for luatex the fix for gh 989
+      (minipage/list spacing) 
+
+2022-12-06  Ulrike Fischer  <Ulrike.Fischer@latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx (subsection{the crop package first aid}):
+	A first aid for crop after changes to \rlap and \stockwidth/\stockheight
+
 2022-11-28  Ulrike Fischer  <Ulrike.Fischer@latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx (subsection{the songs package first aid}):
diff --git a/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
index 0d9ce67bca..90958ed777 100644
--- a/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022
+%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023
 %%
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
@@ -65,7 +65,7 @@
 %
 %    For that reason, it is put into a separate bundle so that we can
 %    update it easily without requiring the CTAN maintainers to
-%    install a new full LaTeX system just because we take out (or add)
+%    install a new full \LaTeX{} system just because we take out (or add)
 %    a fix for a package here.
 %
 %    In the best case scenario the file documented here should be
@@ -111,8 +111,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\LaTeXFirstAidDate{2022/11/28}
-\def\LaTeXFirstAidVersion{v1.0w}
+\def\LaTeXFirstAidDate{2023/05/20}
+\def\LaTeXFirstAidVersion{v1.0z}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -429,7 +429,7 @@
 % \subsection{The \pkg{songs} package first aid}
 %
 %    The songs package uses \cs{obeylines} and redefines \cs{par} for special effect.
-%    this no longer works in LaTeX 2022-06-01 (gh issue 367). The following
+%    this no longer works in \LaTeX{} 2022-06-01 (gh issue 367). The following
 %    fixes at least one failure.
 %    \begin{macrocode}
 \AddToHook{file/songs.sty/after}[firstaid]{%
@@ -443,6 +443,41 @@
 }
 %    \end{macrocode}
 %
+% \subsection{The \pkg{crop} package first aid}
+%
+%    The crop packages fails currently due to two \LaTeX{} changes:
+%    It doesn't know that \cs{stockheight} and \cs{stockwidth} 
+%    are now defined, and doesn't take into account that \cs{rlap}
+%    is robust (https://github.com/rrthomas/crop/issues/2).
+%    The first is addressed by setting the dimension if they are zero or
+%    negative. For the second we locally change the meaning of \cs{protect}
+%    
+%    \begin{macrocode}
+\AddToHook{file/crop.sty/after}[firstaid]{%
+  \FirstAidNeededT{crop}{sty}{2017/11/19 1.10 crop marks (mf)}%
+                  {%
+  \ifdim\stockwidth  > 0pt \else \stockwidth\paperwidth \fi  
+  \ifdim\stockheight > 0pt \else \stockheight\paperheight \fi 
+  \renewcommand*\CROP@genreflect[1]{%
+    \leavevmode
+    \dimen0\CROP@horigin
+    \kern2\dimen0
+    \begingroup 
+    \set@typeset@protect %change protect
+    \reflectbox{%
+        \hb@xt@\paperwidth{%
+            \vbox to\paperheight{%
+                #1%
+                \vss
+            }%
+            \hss
+        }%
+    }%
+   \endgroup
+   }
+  }%
+}
+%    \end{macrocode}
 %    \begin{macrocode}
 %</kernel>
 %    \end{macrocode}
@@ -640,63 +675,6 @@
 %    \end{macrocode}
 %
 %
-% \subsection[Temporary fixes for the kernel (until the next
-%             patch-level release)]
-%    {Temporary fixes for the kernel \\
-%     (until the next patch-level release)}
-%
-% This fixes GitHub issue 591. It is only needed in Lua\TeX\ and replaces just one
-% instance of \cs{tex\_par:D} with the following version which removes
-% other nodes in the current list first.
-%    \begin{macrocode}
-\ExplSyntaxOn
-\sys_if_engine_luatex:T
-  {
-    \newluafunction \g__para_end_empty_par_id_int
-    \exp_args:Nx \everyjob {
-      \exp_not:V \everyjob
-      \exp_not:N \lua_now:n {
-        local~texnest, flush_list, par_token = tex.nest, node.flush_list, token.create'tex_par:D'~
-        lua.get_functions_table()[\int_use:N \g__para_end_empty_par_id_int] = function()
-          local~nest_level = texnest.top~
-          local~cur_head = nest_level.head~
-          flush_list(cur_head.next)
-          nest_level.tail, cur_head.next = cur_head, nil~
-          token.put_next(par_token)
-        end
-      }
-    }
-    \protected \luadef \__para_end_empty_par: \g__para_end_empty_par_id_int
-    \group_begin:
-    \cs_set:Npn \__para_extract_everypar:w #1 \the \toks #2 \s_stop
-      {
-        \tl_gset:Nn \g__para_standard_everypar_tl {
-          \box_gset_to_last:N \g_para_indent_box
-          \group_begin:
-            \__para_end_empty_par:
-          \group_end:
-          \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} }
-          \@kernel@before@para@before
-          \hook_use:n {para/before}
-          \group_begin:
-            \tex_everypar:D {}
-            \skip_zero:N \tex_parskip:D
-            \tex_noindent:D
-          \group_end:
-          \tex_everypar:D{\g__para_standard_everypar_tl}
-          \@kernel@before@para@begin
-          \hook_use:n {para/begin}
-          \if_mode_horizontal: \else:
-            \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi:
-          \__para_handle_indent:
-          \the \toks #2
-        }
-      }
-    \exp_last_unbraced:No \__para_extract_everypar:w \g__para_standard_everypar_tl \s_stop
-    \group_end:
-  }
-\ExplSyntaxOff
-%    \end{macrocode}
 %
 %
 %    \begin{macrocode}
diff --git a/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
index b525f8eea8..991a11ec54 100644
--- a/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
+++ b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
diff --git a/macros/latex-dev/required/tools/README.md b/macros/latex-dev/required/tools/README.md
index a7e8675cb8..41e6036b98 100644
--- a/macros/latex-dev/required/tools/README.md
+++ b/macros/latex-dev/required/tools/README.md
@@ -1,7 +1,7 @@
 The LaTeX `tools` bundle
 ========================
 
-Release 2023-05-01 pre-release 0
+Release 2023-06-01 pre-release 3
 
 Overview
 --------
diff --git a/macros/latex-dev/required/tools/afterpage.dtx b/macros/latex-dev/required/tools/afterpage.dtx
index cf949c0aca..b94a85d26d 100644
--- a/macros/latex-dev/required/tools/afterpage.dtx
+++ b/macros/latex-dev/required/tools/afterpage.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/afterpage.ins b/macros/latex-dev/required/tools/afterpage.ins
index 3aa1679f77..6fec5edc6f 100644
--- a/macros/latex-dev/required/tools/afterpage.ins
+++ b/macros/latex-dev/required/tools/afterpage.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -45,7 +45,7 @@ The source is maintained by the LaTeX Project team and bug
 reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/afterpage.pdf b/macros/latex-dev/required/tools/afterpage.pdf
index 1b117523cd..6efc9c6d4c 100644
--- a/macros/latex-dev/required/tools/afterpage.pdf
+++ b/macros/latex-dev/required/tools/afterpage.pdf
diff --git a/macros/latex-dev/required/tools/array.dtx b/macros/latex-dev/required/tools/array.dtx
index 4b163b5f18..72e2f095e9 100644
--- a/macros/latex-dev/required/tools/array.dtx
+++ b/macros/latex-dev/required/tools/array.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/array.pdf b/macros/latex-dev/required/tools/array.pdf
index 5a62c4c93d..1526176b44 100644
--- a/macros/latex-dev/required/tools/array.pdf
+++ b/macros/latex-dev/required/tools/array.pdf
diff --git a/macros/latex-dev/required/tools/bm.dtx b/macros/latex-dev/required/tools/bm.dtx
index daf4dce66b..51ae53f041 100644
--- a/macros/latex-dev/required/tools/bm.dtx
+++ b/macros/latex-dev/required/tools/bm.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/bm.ins b/macros/latex-dev/required/tools/bm.ins
index 51243a6090..a7424a0e67 100644
--- a/macros/latex-dev/required/tools/bm.ins
+++ b/macros/latex-dev/required/tools/bm.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -45,7 +45,7 @@ The source is maintained by the LaTeX Project team and bug
 reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/bm.pdf b/macros/latex-dev/required/tools/bm.pdf
index 52ab388d9d..df46ae81bb 100644
--- a/macros/latex-dev/required/tools/bm.pdf
+++ b/macros/latex-dev/required/tools/bm.pdf
diff --git a/macros/latex-dev/required/tools/calc.dtx b/macros/latex-dev/required/tools/calc.dtx
index 97ef72e7b9..c243eed8d3 100644
--- a/macros/latex-dev/required/tools/calc.dtx
+++ b/macros/latex-dev/required/tools/calc.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/calc.pdf b/macros/latex-dev/required/tools/calc.pdf
index 21bc238389..e536d9581e 100644
--- a/macros/latex-dev/required/tools/calc.pdf
+++ b/macros/latex-dev/required/tools/calc.pdf
diff --git a/macros/latex-dev/required/tools/changes.txt b/macros/latex-dev/required/tools/changes.txt
index 7b3e63dca5..fc1a9fc08b 100644
--- a/macros/latex-dev/required/tools/changes.txt
+++ b/macros/latex-dev/required/tools/changes.txt
@@ -4,6 +4,25 @@ It is provided for convenience only.  It therefore makes no claims to
 completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
+2023-05-11  Ulrike Fischer  <Ulrike.Fischer@latex-project.org>
+
+	* showkeys.dtx: Use label hook if format new enough.
+
+2023-04-15  David Carlisle  <David.Carlisle@latex-project.org>
+
+	* shellesc.dtx: Normalise use of "." in messages. github/1008
+
+2023-03-30  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* multicol.dtx (subsection{The output routines}]):
+	Make column min depth customizable through the command
+	\multicolmindepthstring defaulting to 'p' (gh/698)
+
+2023-02-25  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* multicol.dtx:
+	Delay returning boxed multicols so that all parameters get restored first
+	in case the boxed multicols is used into another multicols (gh/1002)
 
 ================================================================================
 All changes above are only part of the development branch for the next release.
diff --git a/macros/latex-dev/required/tools/dcolumn.dtx b/macros/latex-dev/required/tools/dcolumn.dtx
index 7415e23752..cfb7b4d33e 100644
--- a/macros/latex-dev/required/tools/dcolumn.dtx
+++ b/macros/latex-dev/required/tools/dcolumn.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/dcolumn.pdf b/macros/latex-dev/required/tools/dcolumn.pdf
index 9b5782c333..d1bbbd4576 100644
--- a/macros/latex-dev/required/tools/dcolumn.pdf
+++ b/macros/latex-dev/required/tools/dcolumn.pdf
diff --git a/macros/latex-dev/required/tools/delarray.dtx b/macros/latex-dev/required/tools/delarray.dtx
index d8aba52f32..86a1a6203f 100644
--- a/macros/latex-dev/required/tools/delarray.dtx
+++ b/macros/latex-dev/required/tools/delarray.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/delarray.pdf b/macros/latex-dev/required/tools/delarray.pdf
index a2405903fa..7505f08b43 100644
--- a/macros/latex-dev/required/tools/delarray.pdf
+++ b/macros/latex-dev/required/tools/delarray.pdf
diff --git a/macros/latex-dev/required/tools/enumerate.dtx b/macros/latex-dev/required/tools/enumerate.dtx
index 89910438e9..49179cfa06 100644
--- a/macros/latex-dev/required/tools/enumerate.dtx
+++ b/macros/latex-dev/required/tools/enumerate.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/enumerate.pdf b/macros/latex-dev/required/tools/enumerate.pdf
index 5a2cb393b3..26b0872cbe 100644
--- a/macros/latex-dev/required/tools/enumerate.pdf
+++ b/macros/latex-dev/required/tools/enumerate.pdf
diff --git a/macros/latex-dev/required/tools/fileerr.dtx b/macros/latex-dev/required/tools/fileerr.dtx
index 59c1bbbbec..eef222bb6e 100644
--- a/macros/latex-dev/required/tools/fileerr.dtx
+++ b/macros/latex-dev/required/tools/fileerr.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/fileerr.pdf b/macros/latex-dev/required/tools/fileerr.pdf
index e9000aee21..3d7e0a8d15 100644
--- a/macros/latex-dev/required/tools/fileerr.pdf
+++ b/macros/latex-dev/required/tools/fileerr.pdf
diff --git a/macros/latex-dev/required/tools/fontsmpl.dtx b/macros/latex-dev/required/tools/fontsmpl.dtx
index de2b55a608..525065cde5 100644
--- a/macros/latex-dev/required/tools/fontsmpl.dtx
+++ b/macros/latex-dev/required/tools/fontsmpl.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/fontsmpl.pdf b/macros/latex-dev/required/tools/fontsmpl.pdf
index 09a27818c7..c3f711a28f 100644
--- a/macros/latex-dev/required/tools/fontsmpl.pdf
+++ b/macros/latex-dev/required/tools/fontsmpl.pdf
diff --git a/macros/latex-dev/required/tools/ftnright.dtx b/macros/latex-dev/required/tools/ftnright.dtx
index 1a7f7f584f..00e98c3f77 100644
--- a/macros/latex-dev/required/tools/ftnright.dtx
+++ b/macros/latex-dev/required/tools/ftnright.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/ftnright.pdf b/macros/latex-dev/required/tools/ftnright.pdf
index 22a7ad4e82..846ae64125 100644
--- a/macros/latex-dev/required/tools/ftnright.pdf
+++ b/macros/latex-dev/required/tools/ftnright.pdf
diff --git a/macros/latex-dev/required/tools/hhline.dtx b/macros/latex-dev/required/tools/hhline.dtx
index 74143d1373..49ac1ae208 100644
--- a/macros/latex-dev/required/tools/hhline.dtx
+++ b/macros/latex-dev/required/tools/hhline.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/hhline.pdf b/macros/latex-dev/required/tools/hhline.pdf
index a3912de489..c9068dd180 100644
--- a/macros/latex-dev/required/tools/hhline.pdf
+++ b/macros/latex-dev/required/tools/hhline.pdf
diff --git a/macros/latex-dev/required/tools/indentfirst.dtx b/macros/latex-dev/required/tools/indentfirst.dtx
index dff777d29d..295b678fd8 100644
--- a/macros/latex-dev/required/tools/indentfirst.dtx
+++ b/macros/latex-dev/required/tools/indentfirst.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/indentfirst.pdf b/macros/latex-dev/required/tools/indentfirst.pdf
index c2e66c96c8..cf168f8093 100644
--- a/macros/latex-dev/required/tools/indentfirst.pdf
+++ b/macros/latex-dev/required/tools/indentfirst.pdf
diff --git a/macros/latex-dev/required/tools/layout.dtx b/macros/latex-dev/required/tools/layout.dtx
index 323705e9ba..fffa6d8e18 100644
--- a/macros/latex-dev/required/tools/layout.dtx
+++ b/macros/latex-dev/required/tools/layout.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/layout.pdf b/macros/latex-dev/required/tools/layout.pdf
index b82b65bb14..0dbc2cc257 100644
--- a/macros/latex-dev/required/tools/layout.pdf
+++ b/macros/latex-dev/required/tools/layout.pdf
diff --git a/macros/latex-dev/required/tools/longtable.dtx b/macros/latex-dev/required/tools/longtable.dtx
index 72b8727d81..332a95d224 100644
--- a/macros/latex-dev/required/tools/longtable.dtx
+++ b/macros/latex-dev/required/tools/longtable.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/longtable.ins b/macros/latex-dev/required/tools/longtable.ins
index 7f53df7c5e..5c3ad27063 100644
--- a/macros/latex-dev/required/tools/longtable.ins
+++ b/macros/latex-dev/required/tools/longtable.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -45,7 +45,7 @@ The source is maintained by the LaTeX Project team and bug
 reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/longtable.pdf b/macros/latex-dev/required/tools/longtable.pdf
index 8444910b91..23f0d9eaf5 100644
--- a/macros/latex-dev/required/tools/longtable.pdf
+++ b/macros/latex-dev/required/tools/longtable.pdf
diff --git a/macros/latex-dev/required/tools/multicol.dtx b/macros/latex-dev/required/tools/multicol.dtx
index aa21d75f07..2676d03aa1 100644
--- a/macros/latex-dev/required/tools/multicol.dtx
+++ b/macros/latex-dev/required/tools/multicol.dtx
@@ -20,7 +20,7 @@
 % \iffalse    This is a METACOMMENT
 %
 %% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2019 Frank Mittelbach
+%% Copyright 1989-2023 Frank Mittelbach
 %%
 %%  In addition to the terms of LPPL any distributed version
 %%  (unchanged or modified) of multicol has to keep the statement
@@ -99,7 +99,7 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2021/11/30 v1.9d  multicolumn formatting (FMi)]
+          [2023/03/30 v1.9f  multicolumn formatting (FMi)]
 %
 %
 %%
@@ -1760,14 +1760,27 @@
                  \kept@firstmark
     \return@nonemptymark{bot}%
                   \kept@botmark
-    \page@sofar
+%    \end{macrocode}
+%    When the boxed multicol is returned to the page it can happen
+%    that it doesn't fit onto it and \LaTeX{} therefore breaks
+%    earlier. The problem in that case is that during the generation
+%    \cs{hsize}, etc.\ got changed and this setting is still in effect
+%    right now, and if this boxed multicol is within, say,
+%    \texttt{multicols*} then its output routine gets very upset. We
+%    therefore delay returning the result by saving it in box for now
+%    until we have left the group below.
+% \changes{v1.9e}{2023/02/25}{Delay returning boxed multicols (gh/1002)}
+%    \begin{macrocode}
+    \global\setbox\mc@boxedresult\vbox{%    
+      \page@sofar
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-    \global\let\kept@firstmark
-               \l@kept@firstmark
-    \global\let\kept@botmark
-            \l@kept@botmark
+      \global\let\kept@firstmark
+                 \l@kept@firstmark
+      \global\let\kept@botmark
+                 \l@kept@botmark
+    }%
 %<*marktrace>
     \mult@info\tw@
       {Restore kept marks to\MessageBreak
@@ -1879,12 +1892,15 @@
 %    \end{macrocode}
 %    Now it's time to return any footnotes if we are in unrestricted
 %    mode. In boxed mode footnotes are kept inside, but in that case
-%    we have to write another column status into the \texttt{.aux}
+%    we have to first return the saved box to the page and then write
+%    another column status into the \texttt{.aux}
 %    file to support \cs{docolaction} in case we have nested
 %    environments.
 % \changes{v1.8s}{2018/04/20}{Support for \cs{docolaction} (issue/39)}
+% \changes{v1.9e}{2023/02/25}{Delay returning boxed multicols (gh/1002)}
 %    \begin{macrocode}
   \if@boxedmulticols
+    \unvbox\mc@boxedresult
     \mc@col@status@write
   \else
     \reinsert@footnotes
@@ -1949,6 +1965,7 @@
 % \SpecialMainIndex{\multicolsep}
 % \SpecialMainIndex{\multicolbaselineskip}
 % \SpecialMainIndex{\partial@page}
+% \SpecialMainIndex{\mc@boxedresult}
 %    Let us end this section by allocating all the registers used so
 %    far.
 %    \begin{macrocode}
@@ -1970,6 +1987,7 @@
 \newskip\multicolbaselineskip
 \newbox\partial@page
 \newbox\last@line
+\newbox\mc@boxedresult
 %    \end{macrocode}
 %    And here are their default values:
 %    \begin{macrocode}
@@ -2119,8 +2137,9 @@
 %    of the character ``p'' since that is one of the depths that
 %    compete for the maximum.
 % \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}}
+% \changes{v1.9f}{2023/03/30}{Make column min depth customizable (gh/698)}
 %    \begin{macrocode}
-   \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@
+   \setbox\z@\hbox{\multicolmindepthstring}\global\dimen\tw@\dp\z@
    \moveright\multicol@leftmargin
     \hbox to\full@width{%
 %    \end{macrocode}
@@ -2135,9 +2154,11 @@
 %    The depths of the columns depend on their last lines. To ensure
 %    that we will always get a similar look as far as the rules are
 %    concerned we force the depth to be at least the depth of a
-%    letter~`p' (which is what we set |\dimen2| to above).
+%    letter~`p' or more exactly \cs{multicolmindepthstring} (which is what
+%    we set |\dimen2| to above).
+% \changes{v1.9f}{2023/03/30}{Make column min depth customizable (gh/698)}
 %    \begin{macrocode}
-       \rlap{\phantom p}%
+       \rlap{\phantom \multicolmindepthstring}%
     }%
 %    \end{macrocode}
 %    The processed material might consist of a last line with a
@@ -2179,6 +2200,23 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%
+%  \begin{macro}{\multicolmindepthstring}
+%    The default minimum depth of each column corresponds to the depth
+%    of a `p' in the current font. This makes sense for Latin-based
+%    languages and was hard-wired intitially, but for Asian languages
+%    it is better to use a zero depth (and alternatively one might
+%    want to use the depth of a strut or a parentheses). So we now
+%    offer a way to adjust this while maintaining backward
+%    compatibility. Use \cs{renewcommand} to alter it.
+% \changes{v1.9f}{2023/03/30}{Make column min depth customizable (gh/698)}
+%    \begin{macrocode}
+\def\multicolmindepthstring{p}
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%
 % \begin{macro}{\columnseprulecolor}
 % \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook}
 %    By default the vertical rule between columns will be in |\normalcolor|.
diff --git a/macros/latex-dev/required/tools/multicol.ins b/macros/latex-dev/required/tools/multicol.ins
index 9bbf2780ad..fa561e0bb1 100644
--- a/macros/latex-dev/required/tools/multicol.ins
+++ b/macros/latex-dev/required/tools/multicol.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -45,7 +45,7 @@ The source is maintained by the LaTeX Project team and bug
 reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/multicol.pdf b/macros/latex-dev/required/tools/multicol.pdf
index 6aabc7f6a2..2363775dda 100644
--- a/macros/latex-dev/required/tools/multicol.pdf
+++ b/macros/latex-dev/required/tools/multicol.pdf
diff --git a/macros/latex-dev/required/tools/rawfonts.dtx b/macros/latex-dev/required/tools/rawfonts.dtx
index cbd1ba89ea..4b930f3ea7 100644
--- a/macros/latex-dev/required/tools/rawfonts.dtx
+++ b/macros/latex-dev/required/tools/rawfonts.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/rawfonts.pdf b/macros/latex-dev/required/tools/rawfonts.pdf
index 57454b23c1..ddbc6bce62 100644
--- a/macros/latex-dev/required/tools/rawfonts.pdf
+++ b/macros/latex-dev/required/tools/rawfonts.pdf
diff --git a/macros/latex-dev/required/tools/shellesc.dtx b/macros/latex-dev/required/tools/shellesc.dtx
index 4f60ff8d03..97ec542b66 100644
--- a/macros/latex-dev/required/tools/shellesc.dtx
+++ b/macros/latex-dev/required/tools/shellesc.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %% Source File: shellesc.dtx
-%% Copyright (C) 2015-2022
+%% Copyright (C) 2015-2023
 %%
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
@@ -20,7 +20,7 @@
 %<driver> \ProvidesFile{shellesc.drv}
 % \fi
 %         \ProvidesFile{shellesc.dtx}
-       [2019/11/08 v1.0c unified shell escape interface for LaTeX]
+       [2023/04/15 v1.0d unified shell escape interface for LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -189,6 +189,7 @@
 %
 % \begin{macro}{\ShellEscape@Lua}
 % \changes{v1.0a}{2019/10/13}{loging for gh/195}
+% \changes{v1.0d}{2023/04/15}{Add dots in messages gh/1008}
 % Shared Lua code for \verb|\DelayedShellEscape| and \verb|\ShellEscape|.
 %    \begin{macrocode}
 \ifx\directlua\@undefined\else
@@ -197,15 +198,15 @@ local status, msg = os.execute("\luaescapestring{#1}")%
 if status == nil then
     texio.write_nl("log",%
       "runsystem(" .. "\luaescapestring{#1}"%
-       .. ")...(" .. msg .. ")\string\n")
+       .. ")...(" .. msg .. ").\string\n")
   elseif status == 0 then
     texio.write_nl("log",%
       "runsystem(" .. "\luaescapestring{#1}"%
-      .. ")...executed\string\n")
+      .. ")...executed.\string\n")
   else
     texio.write_nl("log",%
       "runsystem(" .. "\luaescapestring{#1}"%
-       .. ")...failed " .. (msg or "") .. "\string\n")
+       .. ")...failed. " .. (msg or "") .. "\string\n")
   end
 }}
 \fi
diff --git a/macros/latex-dev/required/tools/shellesc.pdf b/macros/latex-dev/required/tools/shellesc.pdf
index 9c2ed782fc..8237a0b24e 100644
--- a/macros/latex-dev/required/tools/shellesc.pdf
+++ b/macros/latex-dev/required/tools/shellesc.pdf
diff --git a/macros/latex-dev/required/tools/showkeys.dtx b/macros/latex-dev/required/tools/showkeys.dtx
index 3aed90d304..9841004156 100644
--- a/macros/latex-dev/required/tools/showkeys.dtx
+++ b/macros/latex-dev/required/tools/showkeys.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
@@ -39,7 +39,7 @@
 %<driver> \ProvidesFile{showkeys.drv}
 % \fi
 %         \ProvidesFile{showkeys.dtx}
-          [2022/04/12 v3.18 Show cite and label keys (DPC, MH)]
+          [2023/05/11 v3.19 Show cite and label keys (DPC, MH)]
 %
 % \iffalse
 %<*driver>
@@ -342,16 +342,20 @@
 % \begin{macro}{\label}
 % \changes{v3.09}{1996/08/30}
 %      {Add extra group so brace hack works. Donald Arseneau tools/2147}
+% \changes{v3.19}{2023/05/11}
+%      {Use label hook if format is new enough.}
 % The new definition, print the argument, and then do the old
 % definition.
 %    \begin{macrocode}
-\def\label#1{%
+\@ifl@t@r\fmtversion{2023-06-01}
+ {\AddToHookWithArguments{label}{\SK@\SK@@label{#1}}}
+ {\def\label#1{%
   \@bsphack
   \SK@\SK@@label{#1}%
   \begingroup
     \SK@label{#1}%
   \endgroup
-  \@esphack}
+  \@esphack}}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/macros/latex-dev/required/tools/showkeys.pdf b/macros/latex-dev/required/tools/showkeys.pdf
index f017f5fd3b..c155beabae 100644
--- a/macros/latex-dev/required/tools/showkeys.pdf
+++ b/macros/latex-dev/required/tools/showkeys.pdf
diff --git a/macros/latex-dev/required/tools/somedefs.dtx b/macros/latex-dev/required/tools/somedefs.dtx
index 24916b4286..02653a1393 100644
--- a/macros/latex-dev/required/tools/somedefs.dtx
+++ b/macros/latex-dev/required/tools/somedefs.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/somedefs.pdf b/macros/latex-dev/required/tools/somedefs.pdf
index 6072dca3c7..e5e16f8701 100644
--- a/macros/latex-dev/required/tools/somedefs.pdf
+++ b/macros/latex-dev/required/tools/somedefs.pdf
diff --git a/macros/latex-dev/required/tools/tabularx.dtx b/macros/latex-dev/required/tools/tabularx.dtx
index 0d1cbeac34..177d92f12f 100644
--- a/macros/latex-dev/required/tools/tabularx.dtx
+++ b/macros/latex-dev/required/tools/tabularx.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/tabularx.ins b/macros/latex-dev/required/tools/tabularx.ins
index 0c6d26e940..6e81e93432 100644
--- a/macros/latex-dev/required/tools/tabularx.ins
+++ b/macros/latex-dev/required/tools/tabularx.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -45,7 +45,7 @@ The source is maintained by the LaTeX Project team and bug
 reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/tabularx.pdf b/macros/latex-dev/required/tools/tabularx.pdf
index 9dc24cdabf..f237e57663 100644
--- a/macros/latex-dev/required/tools/tabularx.pdf
+++ b/macros/latex-dev/required/tools/tabularx.pdf
diff --git a/macros/latex-dev/required/tools/theorem.dtx b/macros/latex-dev/required/tools/theorem.dtx
index 2dc0412efb..58476db07e 100644
--- a/macros/latex-dev/required/tools/theorem.dtx
+++ b/macros/latex-dev/required/tools/theorem.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/theorem.pdf b/macros/latex-dev/required/tools/theorem.pdf
index 8d403092c0..d5e952583f 100644
--- a/macros/latex-dev/required/tools/theorem.pdf
+++ b/macros/latex-dev/required/tools/theorem.pdf
diff --git a/macros/latex-dev/required/tools/tools-overview.pdf b/macros/latex-dev/required/tools/tools-overview.pdf
index a0d541c796..8db0f5233f 100644
--- a/macros/latex-dev/required/tools/tools-overview.pdf
+++ b/macros/latex-dev/required/tools/tools-overview.pdf
diff --git a/macros/latex-dev/required/tools/tools-overview.tex b/macros/latex-dev/required/tools/tools-overview.tex
index 882a2ae77f..3bc325d67c 100644
--- a/macros/latex-dev/required/tools/tools-overview.tex
+++ b/macros/latex-dev/required/tools/tools-overview.tex
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{tools-overview.tex}[2015/03/31 v1.0 Tools overview]
 
-% Copyright (C) 2006-2022
+% Copyright (C) 2006-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/tools.ins b/macros/latex-dev/required/tools/tools.ins
index b93f649153..6898faead3 100644
--- a/macros/latex-dev/required/tools/tools.ins
+++ b/macros/latex-dev/required/tools/tools.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -49,7 +49,7 @@ reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/trace.dtx b/macros/latex-dev/required/tools/trace.dtx
index 93906eb76b..788f831620 100644
--- a/macros/latex-dev/required/tools/trace.dtx
+++ b/macros/latex-dev/required/tools/trace.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/trace.pdf b/macros/latex-dev/required/tools/trace.pdf
index 1f2fe7f2ca..9fe9d8fff3 100644
--- a/macros/latex-dev/required/tools/trace.pdf
+++ b/macros/latex-dev/required/tools/trace.pdf
diff --git a/macros/latex-dev/required/tools/varioref.dtx b/macros/latex-dev/required/tools/varioref.dtx
index 579c411868..e801c54f81 100644
--- a/macros/latex-dev/required/tools/varioref.dtx
+++ b/macros/latex-dev/required/tools/varioref.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/varioref.ins b/macros/latex-dev/required/tools/varioref.ins
index cef11f9c2f..dcc41d0176 100644
--- a/macros/latex-dev/required/tools/varioref.ins
+++ b/macros/latex-dev/required/tools/varioref.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 1993-2022
+%% Copyright (C) 1993-2023
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
 %%
@@ -45,7 +45,7 @@ The source is maintained by the LaTeX Project team and bug
 reports for it can be opened at https://latex-project.org/bugs/
 (but please observe conditions on bug reports sent to that address!)
 
-Copyright (C) 1993-2022
+Copyright (C) 1993-2023
 The LaTeX Project and any individual authors listed elsewhere
 in this file.
 
diff --git a/macros/latex-dev/required/tools/varioref.pdf b/macros/latex-dev/required/tools/varioref.pdf
index faa84a5373..7541e2214d 100644
--- a/macros/latex-dev/required/tools/varioref.pdf
+++ b/macros/latex-dev/required/tools/varioref.pdf
diff --git a/macros/latex-dev/required/tools/verbatim.dtx b/macros/latex-dev/required/tools/verbatim.dtx
index 2018e85505..0085f166ea 100644
--- a/macros/latex-dev/required/tools/verbatim.dtx
+++ b/macros/latex-dev/required/tools/verbatim.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/verbatim.pdf b/macros/latex-dev/required/tools/verbatim.pdf
index f4e1365707..fd4b0a264e 100644
--- a/macros/latex-dev/required/tools/verbatim.pdf
+++ b/macros/latex-dev/required/tools/verbatim.pdf
diff --git a/macros/latex-dev/required/tools/xr.dtx b/macros/latex-dev/required/tools/xr.dtx
index 33e096c6cd..0dd5f3ad95 100644
--- a/macros/latex-dev/required/tools/xr.dtx
+++ b/macros/latex-dev/required/tools/xr.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/xr.pdf b/macros/latex-dev/required/tools/xr.pdf
index 293437b3ab..3607da5d48 100644
--- a/macros/latex-dev/required/tools/xr.pdf
+++ b/macros/latex-dev/required/tools/xr.pdf
diff --git a/macros/latex-dev/required/tools/xspace.dtx b/macros/latex-dev/required/tools/xspace.dtx
index 7b29b7b0be..807fc9c5df 100644
--- a/macros/latex-dev/required/tools/xspace.dtx
+++ b/macros/latex-dev/required/tools/xspace.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2022
+% Copyright (C) 1993-2023
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
diff --git a/macros/latex-dev/required/tools/xspace.pdf b/macros/latex-dev/required/tools/xspace.pdf
index 0d8075103d..656970c6c3 100644
--- a/macros/latex-dev/required/tools/xspace.pdf
+++ b/macros/latex-dev/required/tools/xspace.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
index 91f89dbfdf..73958edc29 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
@@ -1,4 +1,4 @@
-<b>Date of last change: 2023-04-24 to version v1.1m</b>
+<b>Date of last change: 2023-05-24 to version v1.1n</b>
 
 
 # biblatex-gb7714-2015: a biblatex style  package
@@ -1600,6 +1600,8 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information!
 * 2022/11/07 v1.1k,ctan,github
 * 2023/03/31 v1.1l,ctan,github
 * 2023/04/24 v1.1m,ctan,github
+* 2023/05/24 v1.1n,ctan,github
+
 
 ---------------------------------------------------------
 ## Update history:
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
index cdfafd74dd..cae76042ca 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
@@ -33,7 +33,7 @@
 %\colorlet{gbemphcolor}{violet}
 
 %定义版�，showframe,
-\usepackage[paperwidth=210mm,paperheight=290mm,left=35mm,right=20mm,top=25mm, bottom=20mm,showcrop]{geometry}%,showframe
+\usepackage[paperwidth=210mm,paperheight=290mm,left=40mm,right=15mm,top=25mm, bottom=20mm,showcrop]{geometry}%,showframe
 \renewcommand{\baselinestretch}{1.35}
 %页�布局的标尺
 \usepackage[type=none]{fgruler}
@@ -96,6 +96,8 @@
 \usepackage[colorlinks=true,%
 pdfstartview=FitH,allcolors=gbemphcolor,
 bookmarksopenlevel=4,%
+bookmarksnumbered=true,
+bookmarksopen=true,
 bookmarksdepth=4,]{hyperref}
 %linkcolor=gbblue,anchorcolor=gbblue,citecolor=gbblue
 %linkcolor=black,linkcolor=green,blue,red,cyan, magenta,
@@ -331,7 +333,7 @@ theorem style=plain,fonttitle=\bfseries\heiti,coltitle=gbforestgreen
 
 %--------------列表环境---------------------------------------------
 \usepackage[inline]{enumitem} %�设list环境
-\setlist[enumerate]{label=\bfseries\textcolor{gbemphcolor}{(\arabic*)},topsep=2pt,partopsep=0pt,parsep=0pt,%
+\setlist[enumerate]{label=\textbf{(\arabic*)},topsep=2pt,partopsep=0pt,parsep=0pt,%
 align=left,leftmargin=0em,itemsep=0.5em,labelwidth=0.1em,itemindent=2.6em,listparindent=2em}%label=$\triangleright$,itemindent=1em
 \setlist[itemize]{topsep=2pt,partopsep=0pt,parsep=0pt,%
 leftmargin=3em,itemindent=0em}
@@ -394,13 +396,13 @@ itemsep=0pt,leftmargin=0em,itemindent=0em}%注�，font或format中的最�一
 \setlength{\parsep}{0pt}
 \setlength{\leftmargin}{0pt}%
 \setlength{\itemindent}{0pt}%
-\renewcommand*{\makelabel}[1]{\hss\llap{\footnotesize\color{orange}\bfseries##1}}}}
+\renewcommand*{\makelabel}[1]{\hss\llap{\footnotesize\color{gblabelcolor}\bfseries##1}}}}
 {\endlist}
 
 \makeatletter
 \newcommand{\updateinfo}[2][\@empty]{%
 \par\small\addvspace{2ex plus 1ex}%
-\noindent{\color{gbemphcolor}\rule{\linewidth}{2pt}}
+\noindent{\color{gblabelcolor}\rule{\linewidth}{2pt}}
 \vskip -\parskip
 \ifx\@empty#1 \begin{marglist} \item #2\end{marglist}
 \else \begin{marglist} \item[#1] #2\end{marglist} \fi}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
index 462c1f0409..23f368025f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
index f2aabef29f..962aaae18a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
@@ -62,39 +62,39 @@ biblatex-gb7714-2015 å®�包是为满足《GB/T 7714-2015~~ä¿¡æ�¯ä¸Žæ–‡çŒ®~~å�‚è€
 \pagestyle{fancy}
 \section{概述}
 
-《GB/T 7714-2015~~信�与文献~~�考文献著录规则》是国内科技文档�考文献著录的一般标准，国内多数大学�出版社�期刊编辑部对于学�论文�出版物�期刊论文的�考文献�求通常都基于该标准。对于\LaTeX{}用户�说，�考文献生�是典型的自动化应用，通常有两�方法，一是基于bibtex的传统方法，二是基于biblatex的新方法。生�符�GB/T 7714 标准�求的�考文献，这两�路�都已�实践多年。
-基于biblatex的方法，早期有�志奇(icetea)的gbtstyle实现以�Casper Ti. Vector的caspervector样�，然而由于biblatex�包�级�样�包维护和完善方�的问题，未能达到精确符�国标�求�且具备高�用性�兼容性和�维护性的�想状�。开�biblatex-gb7714-2015 样�包的�衷首先是基于当时这样的状�，其次也为解决很多实际应用中的问题，因此考虑如下原则：
+《GB/T 7714-2015~~信�与文献~~�考文献著录规则》是国内科技文档�考文献著录的一般标准，国内多数大学�出版社�期刊编辑部对于学�论文�出版物�期刊论文的�考文献�求通常都基于该标准。对于\LaTeX{}用户�说，�考文献生�是典型的自动化应用，主�有两�方法，一是基于bibtex的传统方法，二是基于biblatex的新方法。生�符�GB/T 7714 标准�求的�考文献，这两�路都已�实践多年。
+基于biblatex的方法，早期有�志奇(icetea)的gbtstyle实现以�Casper Ti. Vector的caspervector样�，然而由于biblatex�包�级�样�包维护和完善等方�的问题，未能达到精确符�国标�求�且具备高�用性�兼容性和�维护性的�想状�。开�biblatex-gb7714-2015 样�包的�衷首先是基于当时这样的状�，其次也为解决很多实际应用中的问题，因此考虑如下原则：
 
 \subsection{设计原则}
 
 \begin{enumerate}
   \item 兼容性
 
-由于biblatex的�续�级，一些接�和功能的�化，会使得样�无法使用或者输出结果产生异�。因此biblatex-gb7714-2015�包设计之�，就一直秉承兼容性原则，力图兼容�版本的biblatex，希望与biblatex v2.8 (in texlive2014) 以上所有版本适�(注� ctex 2.9.4 的用户需�级 biblatex)。
+由于biblatex的�续�级，一些接�和功能的�化，会使得样�无法使用或者输出结果产生异�。因此biblatex-gb7714-2015�包设计之�，就一直秉承兼容性原则，力图兼容�版本的biblatex，希望与biblatex v2.8 (in texlive2014) 以上所有版本适�(注�：使用ctex 2.9.4 套件的用户需�级 biblatex或更�使用最新版 texlive)。
 
 出于兼容一些旧的bib文件的考虑，增加对传统�考文献�目类型比如www/electronic/conference/mastersthsis/phdthsis/techreport/standard等的支�。根�国标�求，考虑增加newspaper(报纸�出的文献)�database(数�库)�dataset(数�集)� software(软件)�map(舆图)�archive(档案)等类型。也为兼容适用于��样�的bib数��，增加对一些自定义域的支�，比如gbt7714�包的bst样�中mark和medium域。此外，也试图去完善样�在��文档类包括beamer类中的使用问题。
 
   \item 易用性
 
-�考文献是\LaTeX{}自动化应用之一，尽�能让其自动完�，�少用户的人工干预，包括数�的准备�格�的调整等等。因此�包试图�少用户对于bib文件的调整，�需�简�地输入文献本身的信�，或者从�类学术网站或利用zotero等工具下载�考文献数���，而�需�为了符�国标格�而去手动增添�考文献类型和载体标识等一些数�域，也�必为了文献语言分集�文献排�等去增加语言�排�关键字等数�域，这些所有工作都由�包自动完�。
+�考文献是\LaTeX{}自动化应用之一，尽�能让其自动完�，�少用户的人工干预，包括数�的准备�格�的调整等等。因此�包试图�少用户对于bib文件的调整，�需�简�地输入文献本身的信�，或者从�类学术网站或利用zotero等工具下载�考文献数���，而�需�为了符�国标格�而去手动增添�考文献类型和载体标识等一些数�域，也�必为了文献语言分集�文献排�等去增加语言�排�关键字等数�域，所有这些工作都由会�包自动处�。
 
-为了符�国标�求以�中文�考文献标注习惯，�供丰富的标注（引用）命令，用户�需熟悉几个命令的特性�能够完�两�编制样�下多样的标注格�，包括：顺�编�制的 \verb|\cite|(上标�设置页�)� \verb|\parencite|(�上标�设置页�)� \verb|\pagescite|(上标加自动页�)� \verb|\textcite|(�供作者为主语加�上标编�)� \verb|\authornumcite|(�供作者为主语加上标编�)� \verb|\footfullcite|(脚注方�)；著者-年份制的\verb|\cite|(作者加年份用括�包围�设置页�)� \verb|\pagescite|(作者加年份用括�包围自动页�)�
+为了符�国标�求以�中文�考文献标注习惯，�供丰富的标注（引用）命令，用户�需熟悉几个命令的特性�能够完�两�编制样�下多样的标注格�，包括：顺�编�制的 \verb|\cite|(上标�设置页�)� \verb|\parencite|(�上标�设置页�)� \verb|\pagescite|(上标加自动页�)� \verb|\textcite|(�供作者为主语加�上标编�)� \verb|\authornumcite|(�供作者为主语加上标编�)� \verb|\footfullcite|(脚注注释)；著者-年份制的\verb|\cite|(作者加年份用括�包围�设置页�)� \verb|\pagescite|(作者加年份用括�包围自动页�)�
 \verb|\yearcite|(�供年份用括�包围)� \verb|\yearpagescite|(�供年份用括�包围自动页�)�
-\verb|\textcite|(�供主语作者加括�包围年份)� \verb|\footfullcite|(脚注方�)。
+\verb|\textcite|(�供主语作者加括�包围年份)� \verb|\footfullcite|(脚注注释)。
 
-习惯natbib的用户也�以直接使用 \verb|\citet| 和 \verb|\citep| 命令，
-也�供一些习惯使用的命令，比如\verb|\citetns|�\verb|\citepns|�
-\verb|\upcite|�\verb|\inlinecite|等让用户�以无�衔接从bibtex转到biblatex。
+也�供与natbib�包常用命令��的命令 \verb|\citet| 和 \verb|\citep|，
+和一些惯常使用的命令，如\verb|\citetns|�\verb|\citepns|�
+\verb|\upcite|�\verb|\inlinecite|等，让用户�以无�衔接从bibtex转到biblatex。
 
 �外，增加并完善对多语言混�文献表�多语言对照文献表的支�。��语言文献�按文献自身语言录入，�包自动识别语言并通过autolang选项自动完�语言切�，针对多语言对照文献表�供了基于�目集和关��目概念的两�实现方�。
 
 
   \item �活性
 
-在考虑实现严格符�GB/T 7714-2015标准的格�外，也希望能够针对用户的特殊格�需求，�供方便�活的定制方�，比如通过设置选项�达到格�的�化。为此，增加了多个方�的设置选项，使用户�以根�自己的需求�活地调整。主�包括：
+在考虑实现严格符�GB/T 7714-2015标准的格�外，也希望能够针对用户的特殊格�需求，�供方便的定制方�，比如通过设置选项�达到格�的�化。为此，增加了多个方�的设置选项，使用户�以根�自身需求�活地调整。主�包括：
 
 著录表排�选项：
-sorting选项值(gb7714-2015支�以语言著者-出版年标题��排列，gbnytd支�以语言著者-出版年标题��排列，gbynta支�以语言年份作者标题��排列，gbyntd支�以语言年份作者标题��排列)�gblanorder 选项(�以设置��的文�(语言)文献的排列顺�)�sortlocale 选项(�以设置本地语言的排�调整方案，比如zh\_\_pinyin支�汉字字符以拼音排�，zh\_\_stroke以笔画排�，auto/zh以unicode编�排�，zh\_\_gb2312han 以gb2312编�排�)。使用拼音排�时�到多音字也�以利用key域解决。
+sorting选项值(gb7714-2015支�以语言著者-出版年标题��排列，gbnytd支�以语言著者-出版年标题��排列，gbynta支�以语言年份作者标题��排列，gbyntd支�以语言年份作者标题��排列)�gblanorder 选项(�以设置��的文�(语言)文献的排列顺�)�sortlocale 选项(�以设置本地语言的排�调整方案，比如zh\_\_pinyin支�汉字字符以拼音排�，zh\_\_stroke以笔画排�，auto/zh以unicode编�排�，zh\_\_gb2312han 以gb2312编�排�)。使用拼音排�时�到多音字也�以利用添加key域或使用修改�的locale文件pinyin.pm解决。
 
 
 
@@ -112,11 +112,11 @@ sorting选项值(gb7714-2015支�以语言著者-出版年标题��排列，
 标签格�控制(gbbiblabel选项，�设置标签数字��的包围符�)�
 �目格�控制(gbstyle选项，利用gb7714-2015ms样��实现中英文献分设��格�)�
 编制样�设置命令(利用\verb|\setaystylesection|和gb7714-2015mx样�实现��文献节��的编制方�)�
-格�命令\verb|\bibauthorfont|�设置作者项字体�
-格�命令\verb|\bibtitlefont|�设置标题项字体�
-格�命令\verb|\bibpubfont|�设置出版项字体�
-格�尺寸\verb|\bibitemindent|和\verb|\bibhang|�设置文献表的缩进�
-文献标题控制(gbctexset选项，�设置标题内容由\verb|\bibname|或\verb|\refname|�调整)；
+文献标题控制(gbctexset选项，�设置标题内容由\verb|\bibname|或\verb|\refname|�调整)�
+命令\verb|\bibauthorfont|�设置作者项字体等格��
+命令\verb|\bibtitlefont|�设置标题项字体等格��
+命令\verb|\bibpubfont|�设置出版项字体等格��
+尺寸\verb|\bibitemindent|和\verb|\bibhang|�设置文献表的缩进等格�；
 
 编�设置选项：
 GBK编�兼容(gbcodegbk选项，�设置GBK编�文档编译)等等。
@@ -126,7 +126,8 @@ GBK编�兼容(gbcodegbk选项，�设置GBK编�文档编译)等等。
 
   \item �维护性
 
-�包的长期使用价值体现在�包的维护和更新上�，追求�包具有高的�读性���解性��维护性，�为�包长期�挥作用�供帮助。由于biblatex已�是一个相当�熟完善的�包，�便是在样�方�考虑也相当全�，这�能与西方出版界对于�考文献的多样且细致的�求有关。而国内�有一个通用标准就是GB/T 7714标准，且除了一些特殊需求�具体实现外，标准中大多数格��求的实现完全�以借用biblatex�供的标准样�，因此既�需��新造轮�，也�以使gb7714-2015样�与biblatex�包的标准样���一致的结构�风格和习惯，这样�以大大增加代��读性和�维护性。通过在biblatex原有样�基础上增加有�修改的方�，并且对代�加上详细注释，�以使得样�包维护者，�需通过学习biblatex，��轻��解gb7714-2015样��的工作，比如�了哪些修改，为什么这么修改，实现了什么样的效果。
+�包的长期使用价值体现在�包的维护和更新上�，追求�包具有高的�读性���解性��维护性，�为�包长期�挥作用�供帮助。由于biblatex已�是一个相当�熟完善的�包，�便是在样�方�考虑也相当全�，这�能与西方出版界对于�考文献的多样且细致的�求有关。而国内�有一个通用标准就是GB/T 7714标准，且除了一些特殊需求�具体实现外，标准中大多数格��求的实现完全�以借用biblatex�供的标准样�，因此既�需��新造轮�，也�以使gb7714-2015样�与biblatex�包的标准样���一致的结构�风格和习惯，这样�以大大增加代��读性和�维护性。通过在biblatex原有样�基础上增加有�修改，并对代�加上详细注释，�使维护者�需通过学习biblatex，��轻��解gb7714-2015样�的代�。
+%�的工作，比如�了哪些修改，为什么这么修改，实现了什么样的效果。
 
 
 �外，为方便用户，样�包�供了全��详实的说明，包括
@@ -225,13 +226,19 @@ GB/T 7714标准的�解和解释（\ref{sec:gbt:std}节）�
 \end{figure}
 
 
-
+\section{使用说明}
 
 
 \subsection{最�示例}
 
-基于biblatex�包的�考文献生�方法�常简�，例 \ref{code:doc:structrue} 是一个最�工作示例。示例代�中给出了详细注释，介�了使用biblatex 的tex�文档基本结构，其中gb7714-2015 样��biblatex�包加载，
-�考文献数�文件example.bib利用 \verb|\addbibresource|加载 （注�：bib文件需�外准备，详�\ref{sec:bib:bibtex}节），文献表利用 \verb|\printbibliography| 命令输出(�在正文任��置)。
+基于biblatex�包的�考文献生�方法�常简�，例 \ref{code:doc:structrue} 是一个最�工作示例。示例代�中给出了详细注释，介�了使用biblatex 的tex�文档基本结构，其中：
+\begin{itemize}
+\item gb7714-2015 样��biblatex�包加载;
+\item bib(�考文献数�)文件利用 \verb|\addbibresource|加载 （注�：bib文件需�外准备，详�\ref{sec:bib:bibtex}节）;
+\item 引用文献则在正文中利用\verb|\cite|等命令带上entrykey(文献唯一标识)�数，
+比如\verb|\cite{entrykey}|，
+\item 打�文献表利用 \verb|\printbibliography| 命令输出(�放在正文任��置)。
+\end{itemize}
 
 \begin{example}{biblatex�考文献生�的最�工作示例}{code:doc:structrue}
 \begin{texlist}
@@ -243,7 +250,7 @@ GB/T 7714标准的�解和解释（\ref{sec:gbt:std}节）�
 \usepackage[colorlinks=true,pdfstartview=FitH,linkcolor=blue,anchorcolor=violet,citecolor=magenta]{hyperref}
     %�考文献工具，加载biblatex�包，,其�端backend使用biber，%标注(引用)样�citestyle，著录样�bibstyle都采用gb7714-2015样�，两者相�时�以�并为一个选项style
 \usepackage[backend=biber,style=gb7714-2015]{biblatex}
-    %biblatex�包的�考文献数��加载方�
+    %biblatex�包的�考文献数���bib文件加载方�
 \addbibresource[location=local]{example.bib}
 \begin{document}%正文区开始:
     %正文内容，引用�考文献
@@ -284,13 +291,13 @@ GB/T 7714标准的�解和解释（\ref{sec:gbt:std}节）�
 上述最�工作示例的编译结果如图\ref{fig:eg:ref}所示。所有基于 biblatex 生��考文献的文档无论大�万��离其宗，
 若需更全�了解biblatex��考文献生�高级功能���考:
 \href{https://github.com/plk/biblatex}{biblatex�包手册}
-\footnote{地�:\url{https://github.com/plk/biblatex}}�
+%\footnote{地�:\url{https://github.com/plk/biblatex}}�
 \href{https://github.com/hushidong/biblatex-zh-cn}{中文版}
-\footnote{地�:\url{https://github.com/hushidong/biblatex-zh-cn}}
+%\footnote{地�:\url{https://github.com/hushidong/biblatex-zh-cn}}
 或者
 \href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}{LaTeX 文档中文�考文献的biblatex解决方案}
-\footnote{地�:%
-\url{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}}。
+%\footnote{地�:%
+%\url{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}}。
 
 
 \subsection{编译方�}
@@ -311,7 +318,7 @@ latexmk -xelatex jobname.tex
 \end{example}
 
 
-\section{使用说明}
+
 
 \subsection{样��选项加载}
 
@@ -374,8 +381,8 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename
 \end{example}
 
 其中，
-v1.0m版本增加的gb7714-2015ms样�文件，主�是为了在一个文献表中针对��语言使用��的样�，比如中文文献使用GB/T 7714-2015规定的著录格�，而其它语言文献使用biblatex�供的标准样�。
-v1.0r版本增加了gb7714-2015mx样�，主�是为了在一个文档中针对���考文献分节使用��的�考文献样�，比如�些节使用著者年份制，�些节使用顺�编�制。
+v1.0m版本增加的gb7714-2015ms样�文件，主�是为了在一个文献表中针对��语言使用��的样�，�中文文献使用GB/T 7714-2015规定的著录格�，而其它语言文献使用biblatex�供的标准样�。
+v1.0r版本增加了gb7714-2015mx样�，主�是为了在一个文档中针对���考文献分节使用��的样�，比如�些节使用著者年份制，�些节使用顺�编�制。
 %尽管这些方��常用，但�尔也有需求，所以都�了实现。
 
 尽管国标1987和2005版本已�过时，但�然有些地方还在使用，所以1.0z版本增加了gb7714-1987和gb7714-2005两个版本的样�，也分顺�编�和著者年份制：
@@ -398,11 +405,11 @@ v1.0r版本增加了gb7714-2015mxæ ·å¼�，主è¦�是为了在一个文档中针å¯
 \end{example}
 
 
-�外，根�国内大学的学�论文的文献生�需求，增加了几个与国标有明显区别的样�，包括：西北农林(gb7714-NWAFU)��中师范(gb7714-CCNU)�东�大学(gb7714-SEU)等。其他大学的文献样�与国标基本一致，比如上海交大�浙大��旦等，直接使用��。�外一些大学与国标略有差别，�以通过简�的设置满足�求，比如清��科学院大学�中科大�国防科大等，通常在学�论文模�中实现，在egthesis文件夹内，针对一些大学的学�论文�考文献�了测试。
+�外，根�国内大学的学�论文的文献生�需求，增加了几个与国标有明显区别的样�，包括：西北农林(gb7714-NWAFU)��中师范(gb7714-CCNU)�东�大学(gb7714-SEU)等。其他大学的文献样�与国标基本一致，比如上海交大�浙大��旦等，直接使用��。�外一些大学与国标略有差别，�以通过简�的设置满足�求，比如清��科学院大学�中科大�国防科大等，通常在学�论文模�中实现。而在egthesis文件夹内则对一些大学的学�论文�考文献�了测试。
 
 此外，根�期刊文献生�需求，为文科类期刊增加了如下样�：
-v1.0r版本增加了chinese-erj样�用于生��济研究期刊的文献; 
-v1.1l版本增加了chinese-css样�用于生�社会科学期刊的脚注注释; 
+v1.0r版本增加了chinese-erj样�用于生��济研究期刊的文献;
+v1.1l版本增加了chinese-css样�用于生�社会科学期刊的脚注注释文献;
 v1.1m版本增加了chinese-jmw样�用于生�管�世界期刊的文献。
 而�工类期刊文献通常与国标差别�大，部分期刊与国标的最大的差异主�是在�语对照文献中，比如计算机学报等，�以通过简�的设置�满足�求，具体�以�考github上的问题。
 
@@ -434,8 +441,10 @@ v1.1m版本增加了chinese-jmw样�用于生�管�世界期刊的文献。
 
 
 \subsubsection{新增选项}\label{sec:added:opt}
-样�包新增了一些选项和命令，新增选项更常用一些，所以在本节集中介�，而新增命令往往涉�更细节的修改，所以在��介��类格�调整的内容中介�。
-新增选项用于标签对�方��出版项缺�处��责任者(作者)缺�处�等功能的控制，其使用方�与biblatex�包选项完全相�:
+样�包新增了一些选项。
+%由于选项更为常用，所以在本节集中介�。
+%而新增命令往往涉�更细节的修改，所以在���类格�调整的内容中介�。
+新增选项用于处�标签对��缺�出版项�缺�责任者(作者)处�等，其使用方�与biblatex�包选项完全相�，主�包括:
 \begin{description}
 
   \pdfbookmark[4]{gbalign}{gbalign}
@@ -443,10 +452,11 @@ v1.1m版本增加了chinese-jmw样�用于生�管�世界期刊的文献。
 
   为控制文献表数字��标签增加的选项，用于选择是�生���标签�其对�方�。
   \begin{itemize}
-    \item gbalign=right，数字��标签，是list环境中的标签�对�，是gb7714-2015样�的默认选项；
-    \item gbalign=left，数字��标签，是list环境中的标签左对�；
-    \item gbalign=center，数字��标签，是list环境中的等宽标签，数字在[]内居中；
-    \item gbalign=gb7714-2015，数字��标签，是项对�方�，�段�环境中标签使用原始宽度，标签与�目内容等间�。
+    \item gbalign=right，是list环境中的�对�数字��标签，是gb7714-2015样�的默认选项；
+    \item gbalign=left，是list环境中的左对�数字��标签；
+    \item gbalign=center，是list环境中的等宽数字��标签，数字在[]内居中；
+    \item gbalign=centpos，是list环境中的局中数字��标签，带括�标签[1]在标签盒�内居中；
+    \item gbalign=gb7714-2015，是项对�方�数字��标签，�段�环境中标签使用原始宽度，标签与�目内容等间�。
     \item gbalign=gb7714-2015ay，无数字��标签，是author-year风格的文献表，是gb7714-2015ay样�的默认选项。
   \end{itemize}
   该选项对\textbf{著者年份制�顺�编�制�有效}，也就是说当使用著者年份制时，加上gbalign选项��样�以实现文献表的顺���标签(比如：
@@ -527,6 +537,9 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
   \begin{itemize}
     \item gbbiblabel=bracket，��数字由方括�包围，比如[1]；
     \item gbbiblabel=parens，��数字由圆括�包围，比如(1)；
+    \item gbcitelabel=bracketqj，标注标签由全角方括�包围，比如�1】；
+    \item gbcitelabel=parensqj，标注标签由全角圆括�包围，比如（1）；
+    \item gbcitelabel=quanjiao，标注标签由全角方括�包围，比如�1】；
     \item gbbiblabel=dot，��数字数字��加点，比如1.；
     \item gbbiblabel=plain，��数字无装饰，比如1；
     \item gbbiblabel=box，��数字由方框包围，比如\framebox{1}；
@@ -561,8 +574,11 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
     \item gbcitelabel=plain，标注标签无装饰，比如1；
     \item gbcitelabel=box，标注标签由方框包围，比如\framebox{1}；
     \item gbcitelabel=circle，标注标签由圆圈包围，比如\textcircled{1}。
+    \item gbcitelabel=bracketqj，标签由全角方括�包围，比如�作者, 2001】
+    \item gbcitelabel=parensqj，标签由全角圆括�包围，比如（作者, 2001）
+    \item gbcitelabel=quanjiao，标签由全角圆括�包围且内部标点为全角标点，比如（作者，2001）
   \end{itemize}
-  顺�编�制和作者年制存在一定的差异，作者年制主�是方括��圆括��无括�的选择。
+  注�顺�编�制和作者年制存在一定的差异，作者年制主�是方括��圆括�以�全角�角的选择。
   顺�编�制默认是方括�，作者年制默认是圆括�。
 
 
@@ -940,8 +956,8 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 
   为实现多�样�并存而增加的选项。仅用于gb7714-2015ms样�中。
   \begin{itemize}
-    \item gbstyle=true，�默认全部文献使用gb7714-2015样�。
-    \item gbstyle=false，仅中文文献使用gb7714-2015样�，其它语言文献使用biblatex默认样�。
+    \item gbstyle=true，�默认全部文献使用国标样�。
+    \item gbstyle=false，仅中文文献使用国标样�，其它语言文献使用biblatex默认样�。
   \end{itemize}
 
   该选项的实现原�是把所有国标格�设置局部化到�一�文献打�时，处�时首先判断gbstyle 选项�文献的语言，当满足�求则使用这些局部化格�，�则使用默认的标准样�。这�实现为一篇文档内实现两�样��供解决�路，尽管目��中文语言文献的著录格�是标准样�，但��对标准样��进一步的修改就�以形�符���格�规范的样�，比如�ieee，nature等的样�。因此存在中文使用GB/T 7714-2015 著录格�，而英文文献使用ieee等著录格�的�能性。测试文档�：\href{run:./example/opt-gbstyle.tex}{opt-gbstyle.tex}。
@@ -1021,7 +1037,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 
   注�，若�让脚注计数器与其它计数器比如chapter等关�，那么采用latex的常规方法就能解决，比如使用latex内核常用的\verb|\@addtoreset|命令。
 
-
+    
   \item[gbstrict]=\textbf{true}，false. \hfill default is true
 
   为��输出bib文件中多余的域信�而增加选项，目的是为了兼容一些bib文件，因为�些bst样�文件进行中英文判断需�在bib文件中增加类似language这样的域作为支撑，而其中�些域在标准的biblatex样�文件中是默认输出的。
@@ -1042,14 +1058,16 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \end{description}
 
 
-\subsubsection{新增的��命令}\label{sec:add:cmd}
+\subsubsection{新增��命令}\label{sec:add:cmd}
 
 \begin{description}
-  \item[defdoublelangentry] \{entrykey1\}\{entrykey2\}
+  \pdfbookmark[4]{defdblanentry}{defdblanentry}
+  \item[defdblanentry] \{entrykey1\}\{entrykey2\}
 
-  用于定义�语对照文献，将entrykey2�目和entrykey1�目关�起�，在文献表中对照输出。比如：
+  用于定义�语对照文献，将entrykey2�目和entrykey1�目关�起�，在文献表中对照输出。比如：\verb|\defdblanentry{entrykey1}{entrykey2}|或
   \verb|\defdoublelangentry{entrykey1}{entrykey2}|，若entrykey1�目是中文的文献，entrykey2�目是对应entrykey1�目的英文形�，那么该命令会使得在文献表中，entrykey2的英文内容紧跟在entrykey1的中文内容�对照输出。该命令也�能出现在导言区中。
-
+  
+  \pdfbookmark[4]{addEntryField}{addEntryField}
   \item[addEntryField] \{entrykey or entrykey comma list\}\{field\}\{fieldvalue\}
 
   用于给指定的文献�目(集)添加域。�将field=\{fieldvalue\}这样的域信�添加到指定的entrykey�目或者entrykey comma list�目集中。比如：
@@ -1058,6 +1076,16 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 
   将会为author2007en,author2014en两个�目添加nameformat域信�。
   该命令也�能出现在导言区中。
+  
+  
+  \pdfbookmark[4]{setlocalbibstring}{setlocalbibstring}
+  \item[setlocalbibstring] \{bibstringkey\}\{bibstringval\}
+
+  用于局部调整本地化字符串的内容。比如\verb|\setlocalbibstring{andothersincite}{et al.}|，就是临时将本地化字符串andothersincite的内容调整为“et al.�。
+
+注�：如果�在本地化字符串的内容设置中使用biblatex�供的一些标点命令，比如adddot 等，那么需�对其进行�护，��直接展开导致命令未定义的错误，比如：
+\verb|\setlocalbibstring{andothersincite}{et al\protect\adddot}|
+
 
 \end{description}
 
@@ -1199,12 +1227,12 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 
 \subsection{文献引用�标注格�}\label{sec:cbx:usage}
 
-�生��考文献，第一步就是在正文中引用�考文献。正文中因引用文献所形�的标注的格�称为�考文献标注样�，也称引用样�或引用标签样�，分为两类: 顺�编�制和著者-出版年（作者年）制。引用文献的基本命令是\verb|\cite|，但为了在一篇文档中实现��的标签效果，通常还需�使用其它命令，
-比如\verb|\parencite|, \verb|\textcite|, \verb|\pagescite|,\verb|\footfullcite|等。此外为�循biblatex对于�数形�标注命令的使用习惯，也�供上述命令的�数形�，比如\verb|\cite|命令的�数形�命令\verb|\cites|，便于输出�个文献的页�等��注信�。
+�生��考文献，第一步就是在正文中引用�考文献。正文中因引用文献所形�的标注的格�称为�考文献标注样�，也称引用样�或引用标签样�，分为两类: 顺�编�制和著者-出版年（作者年）制。引用文献的基本命令是\verb|\cite|，但为了在一篇文档中实现��的标签效果，通常还需�使用\verb|\parencite|等其它命令，以�这些命令的�数形�以实现�一处引用多篇文献的附加信�输入。
 
-熟悉natbib的用户也�以直接使用使用\verb|\citet|, \verb|\citep|命令。
-�外也�以使用一些习惯命令比如\verb|\citetns|�\verb|\citepns|�
-\verb|\upcite|�\verb|\inlinecite|等。
+%比如\verb|\parencite|, \verb|\textcite|, \verb|\pagescite|,\verb|\footfullcite|等。此外为�循biblatex对于�数形�标注命令的使用习惯，也�供上述命令的�数形�，比如\verb|\cite|命令的�数形�命令\verb|\cites|，便于输出�个文献的页�等��注信�。
+%熟悉natbib的用户也�以直接使用使用\verb|\citet|, \verb|\citep|命令。
+%�外也�以使用一些惯用命令比如\verb|\citetns|�\verb|\citepns|�
+%\verb|\upcite|�\verb|\inlinecite|等。
 
 \subsubsection{两�编制的标注格�}
 
@@ -1214,41 +1242,19 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 为使用户�于输入文献作者，完善了\verb|\textcite|命令，�供作者为��主语，并附带行内�上标的顺�编�，
 并增加了\verb|\authornumcite|命令，以输出作者作为��主语，并附带上标的顺�编�。
 增加了\verb|\citec|命令，输出�一�形�的编�压缩标签，比如\textsuperscript{[2]-[4]}区别于一般的\textsuperscript{[2-4]}。
-
 其它命令\verb|\citet|�\verb|\citep|�\verb|\citetns|�\verb|\citepns|�
 \verb|\upcite|�\verb|\inlinecite|分别等价于
 \verb|\authornumcite|�\verb|\cite|�\verb|\textcite|�\verb|\parencite|�
 \verb|\cite|�\verb|\parencite|。
 
-上述命令��在{bibtexkey}��的[]内或第二个[]内(当有两个[]时)，指定页�用于输出。若�指定页�，则仅有\verb|\pagescite|命令默认���考文献的页�信�进行输出。
+上述命令��指定页�等信�用于输出，�在{entrykey}��的[]内或第二个[]内(当有两个[]时)给出需�附加输出的信�，比如：\verb|\cite[p. 9]{entrykey}|或\verb|\cite[第�页]{中文entrykey}|。若�指定页�，则仅有\verb|\pagescite|命令默认���考文献的页�信�进行输出。
 �引用命令的使用方�如表\ref{tab:cite:num}所示。
 测试文档�\href{run:example/testallformat.tex}{testallformat.tex}。
 
-%�命令使用方�如例\ref{eg:citefornumeric}所示。
-%�引用命令的效果如图\ref{fig:cite:num}所示。
-
-\qd{对于一个引用命令中�时给出多个文献bibtexkey的压缩形�，页��会应用到最�一个�考文献��，这是�正确的，但这�情况其实本�应出现，因为指定页�本�就需�具体化指��一文献。使用时请尽�能使用
-\textbackslash pagescite\{key1\}\textbackslash pagescite\{key2\}这�形�
-而�是\textbackslash pagescite\{key1,key2\}|。当然除了多次使用标注命令外，也�以使用对应标注命令的�数形��为�篇文献�供相应的页�信�。}
 
 
-%著者-出版年制的标注样�文件大体使用标准引用样�authoryear的内容。
-\paragraph{\heiti 著者-出版年制的标注样�}
-为满足GB/T 7714-2015第10.2节的�求，
-考虑\verb|\cite|和\verb|\parencite|命令将引用标签用圆括�括起�。增加了\verb|\pagescite|命令，用于自动加页�。增加了\verb|\yearpagescite|， \verb|\yearcite|命令用于处�文中已有作者信��需�年份和页�的情况(为兼容性考虑，顺�编�制也给出该命令，但作用与
-\verb|\pagescite| 命令相�)，也完善了 \verb|\textcite| 命令，�供作者为��主语，并附带行内�上标的页�，增加了\verb|\authornumcite|命令，以输出作者作为��主语，并附带上标的页�。
-
-其它命令\verb|\citet|�\verb|\citep|�\verb|\citetns|�\verb|\citepns|�
-\verb|\upcite|�\verb|\inlinecite|分别等价于
-\verb|\authornumcite|�\verb|\cite|�\verb|\textcite|�\verb|\parencite|�
-\verb|\cite|�\verb|\parencite|。
-
-%�命令使用方�如例\ref{eg:citeforauthoryear}所示。
-%�引用命令的效果如图\ref{fig:cite:ay}所示。
-�引用命令的使用方�如表\ref{tab:cite:authoryear}所示。
-测试文档�\href{run:example/testallformat.tex}{testallformat.tex}。
-
 %\begin{table}[!htb]
+\medskip
 \noindent\begin{minipage}{0.95\linewidth}
 \begin{refsection}
 \centering
@@ -1282,9 +1288,38 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \end{tabular}
 \end{refsection}
 \end{minipage}
+\medskip
 %\end{table}
 
 
+%�命令使用方�如例\ref{eg:citefornumeric}所示。
+%�引用命令的效果如图\ref{fig:cite:num}所示。
+
+注�：对于一个引用命令中�时给出多个文献entrykey的压缩形�，页��会应用到最�一个�考文献��。
+%这是�正确的，但这�情况其实本�应出现，因为指定页�本�就需�具体化指��一文献。
+若�为�篇添加页�信�，则应多次使用标注命令
+\verb|\cite[p.2]{entrykey1}\cite[p.5]{entrykey2}|或使用�数形�的标注命令
+\verb|\cites[p.2]{entrykey1}[p.5]{entrykey2}|，
+而�是\verb|\cite[p.5]{entrykey1,entrykey2}|。
+
+%当然除了这�多次使用标注命令外，也�以使用对应标注命令的�数形��为�篇文献�供相应的页�信�。
+
+
+%著者-出版年制的标注样�文件大体使用标准引用样�authoryear的内容。
+\paragraph{\heiti 著者-出版年制的标注样�}
+为满足GB/T 7714-2015第10.2节的�求，
+考虑\verb|\cite|和\verb|\parencite|命令将引用标签用圆括�括起�。增加了\verb|\pagescite|命令，用于自动加页�。增加了\verb|\yearpagescite|， \verb|\yearcite|命令用于处�文中已有作者信��需�年份和页�的情况(为兼容性考虑，顺�编�制也给出该命令，但作用与
+\verb|\pagescite| 命令相�)，也完善了 \verb|\textcite| 命令，�供作者为��主语，并附带行内�上标的页�，增加了\verb|\authornumcite|命令，以输出作者作为��主语，并附带上标的页�。
+
+其它命令\verb|\citet|�\verb|\citep|�\verb|\citetns|�\verb|\citepns|�
+\verb|\upcite|�\verb|\inlinecite|分别等价于
+\verb|\authornumcite|�\verb|\cite|�\verb|\textcite|�\verb|\parencite|�
+\verb|\cite|�\verb|\parencite|。
+
+%�命令使用方�如例\ref{eg:citeforauthoryear}所示。
+%�引用命令的效果如图\ref{fig:cite:ay}所示。
+�引用命令的使用方�如表\ref{tab:cite:authoryear}所示。
+测试文档�\href{run:example/testallformat.tex}{testallformat.tex}。
 
 
 
@@ -1331,22 +1366,24 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 
 \subsubsection{标注格�局部调整}
 
-标注在�一个文档中是�能存在��格�需求的，比如：有的地方需�用上标，有的地方需�用行内，有的地方需�给出作者，有的地方需�给出页�等。一般情况下，��标注格��以通过使用��的标注命令�得到，比如上一�节给出的大���的命令，��命令能够产生独特的标注标签。
+标注在�一个文档中�能存在��格�需求，比如：有的地方需�用上标，有的地方需�用行内，有的地方需�给出作者，有的地方需�给出页�等。一般情况下，��标注格��以通过使用��的标注命令�得到，比如上一�节给出的��命令。
+%，��命令能够产生独特的标注标签。
 
-除了利用命令�调整标注格�外，还有更多的方法�进行局部格�调整。这利用了tex的编组特性，编组内的局部格��影�编组外的格�，所以�以利用编组内的局部设置�调整标注的格�，类似的，文献表的著录格�也是�以局部调整的，�下一节。
+除了利用命令�调整标注格�外，还有更多方法�进行局部格�调整。这利用了tex的编组特性，编组内的局部格��影�编组外的格�，所以�利用编组内的局部设置�调整标注的格�。类似的，文献表的著录格�也�局部调整，详�下一节。
 
-引用文献所产生标注标签的格�包括很多内容，包括作者数�，标点，本地化字符串等。最常�的局部调整需求是标点和本地化字符串。这里以�语图题中的引用标签的��本地化字符串需求为例�展示局部调整的方法。
+引用文献所产生标注标签的格�包括很多内容，包括作者数��标点�本地化字符串等。最常�的局部调整需求是本地化字符串和标点。这里以�语图题中的引用标注标签的��本地化字符串需求为例�展示局部调整的方法。
 
-在中科院�类学�论文中，正文的标注标签�求两个英文作者之间用和而�是and连接，多个英文作者截断�一个作者时��用等.而�是et al.表示。这�以容易通过设置本地化字符串�实现。然而对于�语的图题，英文图题中的出现等与和这样的字符实在�雅，所以��求在这�全英文的环境中将和与等.更�为英文的表示符�，这就需�利用本地化字符串的局部调整。这�本地化字符串的局部调整其实已�是比较深入的内容，因为biblatex�供的接�DefineBibliographyStrings是全局的设置，如何进行局部调整并没有�常方便的接�，�解决这一需求，需�对biblatex以�gb7714-2015样�有比较深入的了解。
+\paragraph{标注中“等�“和�等本地化字符串调整}
 
-因为gb7714-2015通过gbcitelocalcase计数器�选择使用中文或英文的本地化字符串，因此通过局部设置gbcitelocalcase�以局部的选择��语言的本地化字符串，然而因为本地化字符串的内容通常是全局设置的，所以当中文的或者英文的本地化字符串设置都�满足�求时，就需�局部的调整本地化字符串的内容，如\ref{eg:str:localset}所示，对本地化字符串andothersincite的内容�了调整，从全局设置的等.转�为et al.，和转�为and，这�局部设置是通过csdef对�存字符串信�的命令直接�的调整。比如\verb|\csdef{abx@sstr@andothersincite}{et al.}|就是将andothersincite本地化字符串的内容临时调整为et al.。
+在中科院�类学�论文中，正文的标注标签�求两个英文作者之间用“和�而�是“and�连接，多个英文作者则截断�一个作者时��用“等.�而�是“et al.�表示。这�以容易通过设置本地化字符串�实现。然而对于�语的图题，英文图题中�适�出现“等�与“和�这样的字符，所以��求在这�全英文的环境中将“和�与“等.�更�为英文符�，这就需�利用本地化字符串的局部调整。这�本地化字符串的局部调整其实已�是比较深入的内容，因为biblatex�供的接�DefineBibliographyStrings是全局的设置，而局部调整则需�使用其它方�。
+%如何进行局部调整并没有�常方便的接�，�解决这一需求，需�对biblatex以�gb7714-2015样�有比较深入的了解。
 
-为方便用户使用，�供了
-\verb|\setlocalbibstring|命令�替代上述直接定义的csdef命令，比如：
-\verb|\setlocalbibstring{andothersincite}{et al.}|，等价于与��csdef那�命令。
-�外，如果�在本地化字符串的内容设置中使用biblatex�供的一些标点命令，比如adddot等，那么需�对其进行�护，��直接展开导致命令未定义的错误，比如：
-\verb|\setlocalbibstring{andothersincite}{et al\protect\adddot}|
+因为gb7714-2015通过gbcitelocalcase计数器�选择使用中文或英文的本地化字符串，因此通过局部设置gbcitelocalcase�以局部的选择��语言的本地化字符串，比如在一个编组内，局部化设置计数器为：\verb|\defcounter{gbcitelocalcase}{1}|，那么这个编组内的所有本地化字符串会使用默认的中文字符串，�之若设置为2，则本地化字符串会使用默认的英文字符串。
 
+然而因为本地化字符串的内容通常是全局设置的，所以当中文的或者英文的本地化字符串设置都�满足�求时，就需�局部的调整本地化字符串的内容，如例\ref{eg:str:localset}所示，对本地化字符串andothersincite的内容�了调整，从全局设置的“等.�转�为“et al.�，“和�转�为“and�，这�局部设置�通过csdef对�存字符串信�的命令直接�的调整，比如\verb|\csdef{abx@sstr@andothersincite}{et al.}|就是将andothersincite本地化字符串的内容临时调整为“et al.�。
+但为方便用户使用，�供了
+�包�供了\verb|\setlocalbibstring|命令�替代上述直接定义的csdef命令，
+如例\ref{eg:str:localset}所示。
 具体的测试�\href{egthesis/thesis-ucas-m.tex}{thesis-ucas-m.tex}
 
   \begin{example}{�语图题内的标注标签的本地化字符串局部设置}{eg:str:localset}
@@ -1362,8 +1399,82 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
   \end{example}
 
 
-\paragraph{标注中的全�角标点设置}
+\paragraph{标注中的全�角标点和括�调整}
+
+除了本地化字符串外，标注中的括�和标点也是需�调整的内容。这里两个默认采用英文的�角符�。首先�以通过选项调整，gbcitelabel选项�供了��的选择，�以设置标注的括�，为全局或�角，�时�供了一个gbcitelabel=quanjiao，�以将标点和括�全部改为全角。
+
+如果选项�供的效果还�够，那么�以局部调整mkbibleftborder和mkbibrightborder，�更�需�的括�。例\ref{eg:parens:localset}中的局部调整�以将标注中的括�改�为『和�。
+
+\begin{example}{局部调整标注标签中的括�}{eg:parens:localset}
+\begin{texlist}
+{\renewrobustcmd{\mkbibleftborder}{『}%
+\renewrobustcmd{\mkbibrightborder}{�}%
+中文段�\cite{Aaa_2018,Aaa_2018a}\cite{Aaa_2021,Aaa_2018}\\
+中文段�\textcite{Aaa_2018,Aaa_2018a}，\textcite{Aaa_2021,Aaa_2018} \\
+中文段�\cite{Aaa_2018,Bbb_2019}\parencite{Aaa_2018,Bbb_2019}}
+\end{texlist}
+\end{example}
+
+对于标点�说，若默认的设定�满足�求，则�以在导言区进行调整，
+如例\ref{eg:punct:globalset}中的第一段代�所示，除了其中标点外，有时还需�设置finalnamedelim。这是标签中除姓�外的标点调整，至于姓�内的标点调整则是需�从�外的接�修改，比如：通过gbcaselocalset等�修改revsdnamepunct，bibinitperiod等等，这些在标注标签中通常�太需�修改。
+
+但有的时候，我们需�对中英文文献的标注标签使用��的符�，比如中文的标签使用中文全角标点，而英文的标签使用英文的标点，那么�以在标点设置时�一个判断，如例
+\ref{eg:punct:globalset}中的第二段代�所示。
+
+而还有的时候，文档中存在独立的中文段�和英文段�，期望在中文段�中使用中文的标点，而在英文段�中则使用英文的标点，此时�以利用gbcitelocal选项的内部设置的计数器gbcitelocalcase�局部化调整。如例
+\ref{eg:punct:globalset}中的第三段代�所示，�如此设置�，那么��在指定的段�局部化计数器gbcitelocalcase的值就�以达到临时调整标点的目的。
+
+\begin{example}{标注标签中的标点的全局和局部设置}{eg:punct:globalset}
+\begin{texlist}
+%第一段代�：导言区�设标注标签的标点
+\renewcommand*{\multicitedelim}{ï¼›}%\addsemicolon\addspaceï¼›
+\renewcommand*{\compcitedelim}{，}
+\renewcommand{\compextradelim}{，}
+\DeclareDelimFormat[cite,parencite,pagescite]{nameyeardelim}{，}%\addcomma\space
+\DeclareDelimFormat[textcite]{nameyeardelim}{，}%\addcomma\space
+\DeclareDelimFormat[cite,parencite,pagescite]{andothersdelim}{，}%
+\DeclareDelimFormat[textcite]{andothersdelim}{，}%
+
+%第二段代�：导言区�设标注标签的标点，根�文献的中英文调整标点形�
+\renewcommand*{\multicitedelim}{\iffieldequalstr{userf}{chinese}{ï¼›}{\addsemicolon\addspace}}%ï¼›
+\renewcommand*{\compcitedelim}{\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}}
+\renewcommand{\compextradelim}{\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}}
+\DeclareDelimFormat[cite,parencite,pagescite,citep]{nameyeardelim}
+{\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}}%
+\DeclareDelimFormat[textcite,authornumcite,citet]{nameyeardelim}
+{\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}}%
+\DeclareDelimFormat[cite,parencite,pagescite,citep]{andothersdelim}
+{\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}}%
+\DeclareDelimFormat[textcite,authornumcite,citet]{andothersdelim}
+{\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}}%
+
+%第二段代�：导言区�设标注标签的标点，�根�计数器gbcitelocalcase局部设置调整中英文标点
+\renewcommand*{\multicitedelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{ï¼›}{\addsemicolon\addspace}%
+\or ï¼›\or\addsemicolon\addspace\fi}%ï¼›
+\renewcommand*{\compcitedelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}%
+\or ，\or\addcomma\space\fi}
+\renewcommand{\compextradelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}%
+\or ，\or\addcomma\space\fi}
+\DeclareDelimFormat[cite,parencite,pagescite,citep]{nameyeardelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}%
+\or ，\or\addcomma\space\fi}
+\DeclareDelimFormat[textcite,authornumcite,citet]{nameyeardelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}%
+\or ，\or\addcomma\space\fi}
+\DeclareDelimFormat[cite,parencite,pagescite,citep]{andothersdelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}%
+\or ，\or\addcomma\space\fi}
+\DeclareDelimFormat[textcite,authornumcite,citet]{andothersdelim}
+{\ifcase\value{gbcitelocalcase}\iffieldequalstr{userf}{chinese}{，}{\addcomma\space}%
+\or ，\or\addcomma\space\fi}
+\end{texlist}
+\end{example}
+
 
+示例�以�考：\href{run:example/test-punct-quanjiao.tex}{test-punct-quanjiao.tex}
 �考:\url{https://blog.csdn.net/xenonhu/article/details/124686522}
 
 
@@ -1374,15 +1485,18 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 引用文献�，�以在文档需�的�置利用 \verb|\printbibliography| 命令输出文献表。文献表的输出格�称为�考文献著录样�，也称著录表样�或著录格�，也分两类: 顺�编�制和著者-出版年制(作者年制)。
 
 %顺�编�制的�考文献样�基于标准样�numeric-comp/numeric
-\paragraph{\heiti 顺�编�制样�} 中���考文献�目以数字��按引用先�顺�组织。
+\subsubsection{顺�编�制样�}
+
+文献表中��考文献�目以数字��按引用先�顺�组织。
 著录格�中��格��\ref{sec:bib:serialno}节，
 �类型文献�目的著录格��\ref{sec:numeric:data}节，
 �考文献�目中�信�域�其录入方��\ref{sec:bib:bibtex}节。
 
 %著者-出版年制的�考文献样�则基于标准样�authoryear
-\paragraph{\heiti 著者-出版年制样�} 中���考文献�目以作者-年为标签以一定的顺�排列。著者-出版年制的著录格�与顺�编�制基本相�，差别仅在于把年份��到作者��作为�目的标签。数��bib文件中��目的数�录入与顺�编�制完全一致。
+\subsubsection{著者-出版年制样�}
+文献表中��考文献�目以作者-年为标签以一定的顺�排列。著者-出版年制的著录格�与顺�编�制基本相�，差别仅在于把年份��到作者��作为�目的标签。数��bib文件中��目的数�录入与顺�编�制完全一致。
 
-\qd{著者-出版年制有文献按文�集中的�求，因此gb7714-2015ay样�设计了gblanorder选项���专用的排�模�，�以方便地设置��文�的先�顺�，默认文�顺�是中日韩英法俄。如需其他顺�则�利用gblanorder选项�设，设置方法�第\ref{sec:added:opt}节。此外，由于排�需�根�文献所使用的语言判断，因此使用language域，该域由biblatex-gb7714-2015�包自动判断处�，一般�需过多关注，如果当语言判断出现问题，�以在bib文件中手动设置language域为正确的语言，比如chinese，japanese，english，french等。}
+注�：著者-出版年制有文献按文�集中的�求，因此gb7714-2015ay样�设计了gblanorder选项���专用的排�模�，�以方便地设置��文�的先�顺�，默认文�顺�是中日韩英法俄。如需其他顺�则�利用gblanorder选项�设，设置方法�第\ref{sec:added:opt}节。此外，由于排�需�根�文献所使用的语言判断，因此使用language域，该域由biblatex-gb7714-2015�包自动判断处�，一般�需过多关注，如果当语言判断出现问题，�以在bib文件中手动设置language域为正确的语言，比如chinese，japanese，english，french等。
 
 %�一段为20190331更新
 %\qd{著者-出版年制有分文�文献集中的�求，因此gb7714-2015排�模�以nyt模�为基础，增加 language 作为 name �的排�域。默认情况下，本样�文件将标题(或作者)为中文的文献的 language 域设置� chinese，英文的设置� english。这一设置过程，在biber 处�时自动完�。当出现问题或者有更多文�分集且有特殊顺�时，�以在bib文件中为相应文�文献的 language 域手动设置适�排�的字符串。比如: 中文文献设置为 chinese，英文文献设置为 enlish，法文文献设置为 french，那么排�中，相应的中文文献排在最��，英文文献在中间，法文文献最�，因为��情况下字�顺�是c然�e然�f。}
@@ -1406,18 +1520,17 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \end{texlist}
 \end{example}
 
-更多的设置方法，请�考：
-\href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography/blob/master/biblatex-solution-to-latex-bibliography.pdf}%
-{biblatex高级使用方法和样�包设计实现方法}
+%更多的设置方法，请�考：
+%\href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography/blob/master/biblatex-solution-to-latex-bibliography.pdf}%
+%{biblatex高级使用方法和样�包设计实现方法}
 
 \subsubsection{段�格�控制}
 
 \paragraph{\heiti 文献表字体�颜色} 为方便用户改�文献表段�格��内容字体和颜色等，在 biblatex �供的 \verb|\bibfont| 命令基础上，
-增加了\verb|\bibauthorfont|�\verb|\bibtitlefont|�\verb|\bibpubfont| 等命令用于控制文献部分著录项的格�，比如作者，标题，出版项等。增加了\verb|\SlashFont|
-用法具体�例\ref{eg:biblist:fontset}，结果如图\ref{fig:par:fmt}所示。
+增加了\verb|\bibauthorfont|�\verb|\bibtitlefont|�\verb|\bibpubfont| 等命令用于控制文献部分著录项的格�，比如作者，标题，出版项等。增加了\verb|\SlashFont|用于控制斜�的字体。
+具体用法�例\ref{eg:biblist:fontset}，结果如图\ref{fig:par:fmt}所示。
 测试用例�\href{run:example/testfontinbiblio.tex}{testfontinbiblio.tex}。
 
-
 \begin{example}{文献表段�格��字体�颜色}{eg:biblist:fontset}
 \begin{texlist}
 % 文献项之间的间隔符控制（比如是��行）
@@ -1432,7 +1545,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \renewcommand{\bibpubfont}{\itshape\color{violet}}%
     % url和doi字体
 \def\UrlFont{\ttfamily}%\rmfamily %\urlstyle{sf} %\def\UrlFont{\bfseries}
-    %斜�的字体，比如[J/OL]中的斜�
+    %斜�的字体，比如[J/OL]或�出文献符�//中的斜�
 \def\SlashFont{\ttfamily}%\rmfamilyç­‰
 \end{texlist}
 \end{example}
@@ -1466,34 +1579,36 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \paragraph{\heiti 文献表水平间�(缩进)控制}
 增加了尺寸\verb|\bibitemindent| 用于控制�考文献�目在文献表中的缩进，
 其�义与 list 环境中 \verb|\itemindent| 相�。
-文献表的水平缩进控制，两�编制方�下是��的。
+文献表的水平缩进控制，两�编制方�下是��的，调整方法�例\ref{eg:biblist:hspace}。
 
-(a) 对于\emph{著者-出版年}制文献表，bibitemindent表示
+\textbf{(a)} 对于\emph{著者-出版年}制文献表
+
+bibitemindent表示
 \emph{一�文献中第一行相对���行的缩进}，bibhang 表示\emph{页边到文献�行起始�置的�离}。因此�调整缩进则直接设置这两尺寸。
 
 当使用著者-出版年样��需�使用顺�编�数字标签的文献表时(此时使用gbalign选项)，缩进方�与顺�编�制文献表类似，但�略有差异。
 数字标签盒�默认宽度为2em，�以调整biblabelextend�增大或缩�(使用正或负的长度)该宽度，数字标签的盒�与文献内容之间的间�为4.5pt，通过直接设置biblabelsep尺寸�调整。
 
 
-(b) 对于\emph{顺�编�}制文献表，由于存在数字标签，且其宽度与�考文献数�相关，所以这个宽度是动��化的，�能��设定，而是在文献表生�时给出，所以调整缩进需�根�文献表输出环境的情况�针对性处�。
-
-顺�编�样�使用了两类输出环境，所以设定选项也区分两类：
+\textbf{(b)} 对于\emph{顺�编�}制文献表
 
-一是采用list环境的文献表，�设置gbalign=left�right�center时（�顺�编�标签是左对���对�和居中对�的情况）。
+由于存在数字标签，且其宽度与�考文献数�相关，所以这个宽度是动��化的，�能��设定，而是在文献表生�时给出，所以调整缩进需�根�文献表输出环境的情况�针对性处�。
 
-此时文献表环境，数字标签盒�默认宽度为labelnumberwidth，由biblatex根�文献数�自动计算�设定，因此改�缩进主�通过调整biblabelsep和bibitemindent两个尺寸�实现。biblabelsep设置数字标签的盒�与文献内容之间的间�。bibitemindent设置第一行和��其它行的缩进，默认情况下bibitemindent为0pt，则一�文献内所有行缩进相�，若bibitemindent>0pt则第一行相比���行缩进，若bibitemindent<0pt则���行相比第一行缩进。
-
-顺�编�样�下bibitemindent与bibhang的�义与著者-出版年制下相�，但由于数字标签盒�的存在，所以页边到�行起始�置的�离bibhang=labelnumberwidth +biblabelsep -bibitemindent。
+顺�编�样�使用了两类输出环境，所以设定选项也区分两类：
 
-当采用�些字体导致计算的标签宽度�足时，�以设置biblabelextend尺寸，�增加labelnumberwidth的宽度��缩进格�产生问题，使得：bibhang=labelnumberwidth +biblabelextend +biblabelsep -bibitemindent。默认情况下biblabelextend尺寸为0pt。
+\begin{itemize}
+\item 一是采用list环境的文献表，�设置gbalign=left�right�center时（�顺�编�标签是左对���对�和居中对�的情况）。此时需�调整的尺寸包括三个：biblabelsep，bibitemindent，biblabelextend。
 
-二是采用正常段�环境的文献表，�设置gbalign=gb7714-2015时（�项对�情况，就是��文献是自身对�的情况）。
 
-此时数字标签盒�默认宽度根�标签实际宽度自动设定，因此�会存在数字标签盒�宽度�足的情况，所以�用设置biblabelextend尺寸。数字标签的盒�与文献内容之间的间�通过调整biblabelsep�设置。\emph{���考文献第二行开始的缩进�离}通过调整bibitemindent尺寸设置，bibitemindent默认为0pt，则一�文献内所有行缩进相�，若bibitemindent>0pt则第一行相比���行缩进，若bibitemindent<0pt则���行相比第一行缩进。
+\hspace{2em}此时的文献表环境中，数字标签盒�默认宽度为labelnumberwidth，由biblatex根�文献数�自动计算�设定，因此改�缩进主�通过调整biblabelsep和bibitemindent两个尺寸�实现。biblabelsep设置数字标签盒�与文献内容之间的间�。bibitemindent设置第一行相对��其它行的缩进，默认情况下bibitemindent为0pt，则一�文献内所有行缩进相�，若bibitemindent>0pt则第一行相比���行缩进，若bibitemindent<0pt则���行相比第一行缩进。
 
+\hspace{2em}顺�编�样�下bibitemindent与bibhang的�义与著者-出版年制下相�，但由于数字标签盒�的存在，所以页边到�行起始�置的�离bibhang=labelnumberwidth +biblabelsep -bibitemindent。
+当采用�些字体导致默认计算的标签宽度�足时，�以设置biblabelextend尺寸，�增加labelnumberwidth的宽度��缩进格�产生问题，使得：bibhang=labelnumberwidth +biblabelextend +biblabelsep -bibitemindent。默认情况下biblabelextend尺寸为0pt。
 
-调整方法�例\ref{eg:biblist:hspace}。
+\item 二是采用正常段�环境的文献表，�设置gbalign=gb7714-2015时（�项对�情况，��文献严格按从左到�的顺�输出，顺�数字标签宽度等于实际宽度，文献内容与其间隔biblabelsep）。此时需�调整的尺寸包括两个：biblabelsep，bibitemindent。
 
+\hspace{2em}此时数字标签盒�默认宽度根�标签实际宽度自动设定，因此�存在数字标签盒�宽度�足的情况，因而无需设置biblabelextend尺寸。数字标签盒�与文献内容之间的间��通过调整biblabelsep设置。\emph{���考文献第二行开始的缩进�离}通过调整bibitemindent尺寸设置，bibitemindent默认为0pt，则一�文献内所有行缩进相�，若bibitemindent>0pt则第一行相比���行缩进，若bibitemindent<0pt则���行相比第一行缩进。
+\end{itemize}
 
 
 \begin{example}{文献表水平缩进控制}{eg:biblist:hspace}
@@ -1512,7 +1627,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \end{texlist}
 \end{example}
 
-(c) 其它形�的文献表。
+\textbf{(c)} 其它形�的文献表
 
 除了使用这�段�形�的文献表外，也有生�\emph{表格文献表}的需求，�把文献表放到一个表格里�，�求�一�文献��表格的一行。这也是能实现的，具体�考我的�客文章
 \href{https://blog.csdn.net/xenonhu/article/details/121696116}{latex中生�表格形�的�考文献表}。
@@ -1581,18 +1696,28 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \renewcommand*{\finentrypunct}{\iffieldequalstr{userd}{chinese}{。}{\adddot}}
 
 %姓�格�相关的标点
-\DeclareDelimFormat{nameyeardelim}{，}%\addcomma\addspace
-%\DeclareDelimFormat[bib,biblist]{nameyeardelim}{，}%\addcomma\addspace
-\DeclareDelimFormat{multinamedelim}{，}%[bib,biblist]
-\DeclareDelimFormat{finalnamedelim}{，}
-\DeclareDelimFormat{andothersdelim}{，}
-\renewcommand*{\revsdnamepunct}{，}%
+\DeclareDelimFormat[bib,biblist]{nameyeardelim}{，}%\addcomma\addspace
+\DeclareDelimFormat[bib,biblist]{multinamedelim}{，}%[bib,biblist]
+\DeclareDelimFormat[bib,biblist]{finalnamedelim}{，}
+\DeclareDelimFormat[bib,biblist]{andothersdelim}{，}
+
+%姓�内部的相关标点，包括如下等设置
+%注�这类设置与gbnamefmt选项相关，��的选项值对应��的gb...localset
+%除了如下命令外还有其它设置，有需��以查biblatex文档
+\def\gbcaselocalset{%
+\renewcommand*{\revsdnamepunct}{，}%%
+\renewrobustcmd*{\bibinitperiod}{}%将�字简写�的点去掉
+\renewrobustcmd*{\bibinithyphendelim}{}%.\mbox{-}
+\renewrobustcmd*{\bibnamedelima}{} %%\mbox{-}
+}
 \end{texlist}
 \end{example}
 
-\subsubsection{�目著录格�的选项控制}\label{sec:entry:fmt}
+\subsubsection{�目著录格�控制}\label{sec:entry:fmt}
 
-文献表输出的格���考文献著录样�，除了整体的段�格�外，还有�目内部的格��以控制，�目内部的这些项称为著录项，这些著录项的格�通常�由选项控制。�用选项除了biblatex �供的标准选项外，也包括样�包�供的选项。
+文献表输出的格���考文献著录样�，除了整体的段�格�外，还有�目内部的格��以控制，�目内部的这些项称为著录项，这些著录项的格�通常�由选项控制。
+
+�用选项除了biblatex �供的标准选项外，也包括样�包�供的选项。
 图\ref{fig:content:fmta}�\ref{fig:content:fmtb}�\ref{fig:content:fmtc}给出了一些选项设置�的格�控制效果，
 更多选项的详细说明�第\ref{sec:added:opt}�\ref{sec:old:opt}�节。
 
@@ -1651,9 +1776,11 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 \caption{文献表�目著录格�示例三}\label{fig:content:fmtc}
 \end{figure}
 
-\subsubsection{�目著录格�的局部调整}\label{sec:entry:fmtlocal}
 
-得益于biblatex利用tex�控制著录格�的特点，加上tex语言本身编组的局部化特性，所以在利用biblatex生��考文献的过程中�以有丰富手段�进行�考文献著录格�的局部调整。因为是局部的格�调整，所以通常是结�refsection或者refsegment��作的。���到过的一个很简�的例�，当在学�论文的写作中需�正文部分的�考文献使用顺�编�制，而附录中研究�果部分使用作者年制这样的需求就是一个典型的局部化格�调整。这一问题的解决方�为：在研究�果部分使用refsection将其局部化，并结�gb7714-2015mx样�，并利用setaystylesection命令设置该refsection为作者年制样�。
+\subsubsection{�考文献表的局部调整}\label{sec:entry:fmtlocal}
+
+文档中有时需�多个文献表，而且�能具有��的格�，因此全局的设置�一定满足�求，所以需�进行局部的调整，调整的内容也包括：文献表的标题�段�格�和著录格�。
+得益于biblatex利用tex�控制著录格�的特点，加上tex语言本身编组的局部化特性，所以在利用biblatex生��考文献的过程中�以有丰富手段�进行�考文献表的局部调整。因为是局部的格�调整，所以通常是结�refsection或者refsegment��作的。���到过的一个很简�的例�，当在学�论文的写作中需�正文部分的�考文献使用顺�编�制，而附录中研究�果部分使用作者年制这样的需求就是一个典型的局部化格�调整。这一问题的解决方�为：在研究�果部分使用refsection将其局部化，并结�gb7714-2015mx样�，并利用setaystylesection命令设置该refsection为作者年制样�。
 
 因为tex�的局部化调整特性，因此几乎biblatex中所有格�设置都是�以�局部调整的，�于篇幅，这里仅介�一些常�的简�的调整方�：
 
@@ -1828,7 +1955,8 @@ biber -l zh__stroke jobname
 
 为��这一添加拼音到key域的�作，这里�供�一��能更为方便的方法。biber在�排�时实际上是利用 perl 的 Unicode::Collation::locale 模�，其中的Pinyin.pm�供了汉字的拼音顺�，对该文件�临时的修改，�以调整多音字的顺�。
 
-因为在�考文献排�中通常会使用字的姓�音，所以我们对这个文件��正�的修改，并放到github上(\href{https://github.com/hushidong/biblatex-gb7714-2015/files/11120449/Pinyin.zip}{Pinyin.zip})，若用户需�正确的姓的多音字排�，那么��用该文件替�biber临时工作目录中的文件��。注�：目�该文件�修改了“曾�“沈�两个字，而“翟�“仇�等没有�修改，若用户有需求���增加。
+因为在�考文献排�中通常会使用字的姓�音，所以我们对这个文件��正�的修改，并放到github上(\href{https://github.com/hushidong/biblatex-gb7714-2015/files/11147697/Pinyin-modified-zhai.zip}{Pinyin.zip})，若用户需�正确的姓的多音字排�，那么��用该文件替�biber临时工作目录中的文件��。
+%注�：目�该文件�修改了“曾�“沈�两个字，而“翟�“仇�等没有�修改，若用户有需求���增加。
 
 通常biber在第一次�行的时候，会构建一个�赖目录，这也是biber的临时工作路径，而所有的�赖文件就在其中。
 在windows下通常会在临时目录temp下构建类似\verb|par-<hex_encoded_username>/cache-|的目录(其它系统也是类似命�，�以�索一下)，所有的�赖包括Pinyin.pm都会在其内部，找到并替���(Pinyin.pm文件通常在\verb|cache-<hex-code-string>\inc\lib\Unicode\Collate\CJK|下)。
@@ -1934,7 +2062,8 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
 
 \paragraph{\heiti 利用�目集类型满足�语文献�求}
 
-设置�目集类型(set)有��和动�两�方法。其中动�方法使用更为方便，�需在写文档时利用\verb|\defbibentryset|将两�文献��语言的文献设置�一个set�目，然�引用set的bibtex键。比如:
+设置�目集类型(set)有��和动�两�方法。其中动�方法使用更为方便，
+�需在写文档时利用\verb|\defbibentryset|将两�文献��语言的文献设置�一个set�目，然�引用set的bibtex键。比如:
 \begin{example}{设置set�目集用于�语文献的动�方法}{eg:setforbilangentry}
 \begin{texlist}
 \defbibentryset{bilangyi2013}{易仕和2013--,Yi2013--}
@@ -1955,9 +2084,9 @@ biblatex v3.7å�Šä¹‹å‰�版本，因为 set 带有第一个å­�æ�¡ç›®çš„ä¿¡æ�¯ï¼Œæ‰
 \end{texlist}
 \end{example}
 
-\bc{在biblatex3.8以上版本中，例{eg:setforbilangentry}的作者年制标注标签会是“易仕和，等，2013�，注�到其中的逗�是中文全角逗�，与其它标签的英文逗�的存在差异，正因为此，该方法并没有完美解决问题。}
+\bc{在biblatex3.8以上版本中，例\ref{eg:setforbilangentry}的作者年制标注标签会是“易仕和，等，2013�，注�到其中的逗�是中文全角逗�，与其它标签的英文逗�的存在差异，正因为此，该方法并没有完美解决问题。}
 
-\bc{由于顺�编�制使用的时数字标签，�述的问题对于顺�编�制并�存在。而作者年制中的标签问题，�以采用下�的���目集方法和关�(related)方法�解决。}
+\bc{由于顺�编�制使用的是数字标签，�述的问题对于顺�编�制并�存在。而作者年制中的标签问题，�以采用下�的���目集方法和关�(related)方法�解决。}
 
 ��方法是在bib�文件中给出�目集(set)并使用biber�端进行解�，�目的域信�定义方法如下:
 
@@ -1965,7 +2094,7 @@ biblatex v3.7å�Šä¹‹å‰�版本，因为 set 带有第一个å­�æ�¡ç›®çš„ä¿¡æ�¯ï¼Œæ‰
 \begin{example}{设置set�目集用于�语文献的��方法}{eg:set:static}
 \begin{texlist}
 @Set{set1,
-entryset = {key1,key2,key3},
+entryset = {entrykey1,entrykey2,entrykey3},
 }
 %如果�达到上例动�设置set一样的结果，在bib文件中��设置set�目如下:
 @Set{bilangyi2013,
@@ -1977,10 +2106,10 @@ entryset = {易仕和2013--,Yi2013--},
 然而例\ref{eg:set:static}这般简�的���目集设置，还存在两个�的问题：
 \begin{enumerate}
   \item 中文排�会出现问题，�目集会出现在文献表末尾，这是因为�目集没有设置language域用于排�，而其它常规�目都会利用动�数�修改设置language域，但因为���目集需�在biber�行时解�，所以无法对language域进行处�。而使用动��目集方法则没有这一问题，因为其解�过程直接会利用第一个��目的排�信�。
-  \item 著者-出版年制中的标注标签问题，对于���目集，v3.8以上版本的biblatex�样��制第一个��目信�，因此著者- 出版年制中的引用也无法生�正确的标注标签，这也就是��动��目集方法中�到的问题
+  \item 著者-出版年制中的标注标签问题，对于���目集，v3.8以上版本的biblatex�样��制第一个��目信�，因此著者- 出版年制中的引用也无法生�正确的标注标签，这也就是��动��目集方法中�到的问题。
 \end{enumerate}
 
-但���目集方法有自己的解决方便，对于第一个问题，�以通过在set�目中手动设置language域�解决；第二个问题，也�以通过在set�目中手动设置label域�解决。比如：
+但���目集方法有自己的解决之�，对于第一个问题，�以通过在set�目中手动设置language域�解决；第二个问题，也�以通过在set�目中手动设置label域�解决。比如：
 
 \begin{example}{在bib文件中正确设置set�目集的��方法}{eg:set:staticright}
 \begin{texlist}
@@ -2005,7 +2134,8 @@ language={chinese}
 
 除上述给出的�目集方案外，关��目方法则是�一��行方案\footnote{Again about the \@ set label for authoryear style：\url{https://github.com/plk/biblatex/issues/681}}。该方案�样也有��和动�两�方法，��就是直接修改bib文件的内容，动�则是在tex�文档中�设置，然�通过biblatex的动�数�修改机制�临时修改。
 
-��方法很简�，bib文件中�目设置如例\ref{eg:related:staticright}所示，它能解决�语�时显示的问题，也能解决排�和标注标签问题，唯一的问题在于修改了bib文件�，当�需��语文献时还需改回�，这会带��便，因此�以考虑下�的动�方法。但�注�动�方法需�利用多个\verb|\DeclareStyleSourcemap|，因此该方法�适用于biblatex v3.7�以上版本。
+��方法很简�，bib文件中�目设置如例\ref{eg:related:staticright}所示，它能解决�语�时显示的问题，也能解决排�和标注标签问题，唯一的问题在于修改了bib文件�，当�需��语文献时还需改回�，这会带��便，因此�以考虑下�的动�方法。
+但�注�动�方法需�利用多个\verb|\DeclareStyleSourcemap|，因此该方法�适用于biblatex v3.7�以上版本。
 
 \begin{example}{在bib文件中正确设置关��目的��方法}{eg:related:staticright}
 \begin{texlist}
@@ -2029,7 +2159,7 @@ language={chinese}
 \end{texlist}
 \end{example}
 
-动�方法利用动�数�修改自动添加related域，��对bib文件�直接修改。本样�中对该过程进行了�装，定义一个新的命令\verb|\defdoublelangentry|，例如:
+动�方法利用动�数�修改自动添加related域，��对bib文件�直接修改。本样�中对该过程进行了�装，定义一个新的命令\verb|\defdblanentry|和一个等价命令\verb|\defdoublelangentry|�实现，例如:
 \begin{example}{设置关��目的动�方法}{eg:related:dynamic}
 \begin{texlist}
 \defdoublelangentry{易仕和2013--}{Yi2013--}
@@ -2038,7 +2168,7 @@ language={chinese}
 
 使用该命令�，�以引用主�目“易仕和2013--�生��语文献。
 但�注�由于\verb|\DeclareStyleSourcemap|命令�能在导言区中使用，
-因此\verb|\defdoublelangentry|命令也�能出现在导言区中，这也是相比�目集动�方法的唯一�憾。
+因此\verb|\defdblanentry|或\verb|\defdoublelangentry|命令也�能出现在导言区中，这也是相比�目集动�方法的唯一�憾。
 实现的具体细节�
 \href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}%
 {biblatex-solution-to-latex-bibliography}。
@@ -2303,11 +2433,16 @@ bib文件中的å�‚考文献信æ�¯æ˜¯ä»¥æ�¡ç›®å½¢å¼�组织，一篇文献创建ä¸
 
 需�注�的是，
 \begin{itemize}
-  \item note域在本样�中也�特殊用途，�在book类型的note域中输入standard表示标准，在aritcle类型的note域中输入news或newspaper表示报纸，当然也�以��特殊用，而�是表示�项信�。因为报纸和标准也�以在entrysubtype域中输入new|newspaper和standard表示，或者标准和报纸直接用standard 和newspaper 类型表示，尽管这两�类型�是biblatex 原生支�的�目类型。
+  \item note域在本样�中也�特殊用途，�在book类型的note域中输入standard表示标准，在aritcle类型的note域中输入news或newspaper表示报纸。
+      当然也�以��特殊用，而�是表示�项信�，因为报纸和标准也�以在entrysubtype域中输入new或newspaper和standard表示报纸和标准类型，亦或者直接用standard 和newspaper 类型表示两者，尽管这两�类型�是biblatex 原生支�的�目类型。
 
-  \item usera域用于表示�考文献类型和载体标识符（为兼容Lee zeping 的bst样�使用的bib文件也�以用mark和medium 表示）。一般情况下usera，mark，medium这些域�用在bib文件中输入，而由样�文件自动处�得到，既为了使bib文件更纯粹，也为了兼容��的样�。想象一下如果在bib文件中给出usera域，但�一样�需�使用usera域且用途��，那么就会有兼容性问题。�用手动输入更��的目的是为用户�负，因为用户�以直接使用从网络（��学术网站）导出�考文献信�而�用��外添加一个�考文献类型和载体标识符。
+  \item usera域用于表示�考文献类型和载体标识符（为兼容Lee zeping 的bst样�使用的bib文件也�以用mark和medium 表示）。一般情况下usera，mark，medium这些域�用在bib文件中输入，而由样�文件自动处�得到，既为了使bib文件更纯粹，也为了兼容��的样�。
+      %想象一下如果在bib文件中给出usera域，但�一样�需�使用usera域且用途��，那么就会有兼容性问题。�用手动输入更��的目的是为用户�负，因为用户�以直接使用从网络（��学术网站）导出�考文献信�而�用��外添加一个�考文献类型和载体标识符。
+      因此，用户�以直接使用从网络（��学术网站）导出�考文献本身的信�而�用��外手动添加�考文献类型和载体标识符。
 
-  \item 本样�自动判断语言，用户一般�需�直接给出表示文献语言的域language，因为样�在处�过程中会对�个域的字符�语言判断，这对于一篇文献存在多�语言的情况�常有用，比如一本英文著作被翻译为中文，原作者�用英文，而译者则使用中文。那么该文献无法用一个language 标识文献的语言，简��说，标记language域更多的目的是用在多�语言混�的文档中，�以用language �标记英语�中文�日语�法语和俄语等用于分文�排�。当然这�标记也是由样�自动处�的，用户仅需在自动判断出现问题时手动干预。
+  \item 本样�自动判断语言，用户一般�需�直接给出表示文献语言的域language，因为样�在处�过程中会对�个域的字符�语言判断，这对于一篇文献存在多�语言的情况�常有用，比如一本英文著作被翻译为中文，原作者�用英文，而译者则使用中文。那么该文献无法用一个language 标识文献的语言，但会对��的域如作者和译者��外的判断，从而使输出的格�正确。
+      所以，使用language域更多的是用于多�语言混�文献表的排�，�用language �标记英语�中文�日语�法语和俄语等用于分文�排�。
+      %当然这�标记也是由样�自动处�的，用户仅需在自动判断出现问题时手动干预。
 
 \end{itemize}
 
@@ -2433,7 +2568,7 @@ bib文件中的å�‚考文献信æ�¯æ˜¯ä»¥æ�¡ç›®å½¢å¼�组织，一篇文献创建ä¸
 
 
 
-\subsection{其它注�事项}\label{sec:pkg:hints}
+\subsection{其它事项}\label{sec:pkg:hints}
 
 \begin{enumerate}
     \item biblatex 的优点
@@ -3057,7 +3192,7 @@ gb7714-2015实现了GB/T 7714-2015第8.8节�求的�出文献相关格�。
 %读者若查看样�文件内容�以看到作者对�目标�求所�的修改�，读者也�以根�自己的需求进行修改，作者设计样�文件的�路以�在设计过程中用到的一些biblatex�包功能说明，详�第\ref{sec:biblatex:mech}节和LaTeX文档中文�考文献的biblatex解决方案的第2.7节。
 
 最��感谢如下��师长和朋�，正是在��的帮助建议下，本样��断�级��完善。包括: moewew (biblatex 现在的维护者之一，给予�少有益的建议和指导)� �志奇(基于biblatex的符�GBT7714-2005的中文文献生�工具的作者，工具中的一些设计如usera域的使用/�期范围解�等带�很多��，本人之�一直使用该工具，之所以开�biblatex-gb7714-2015其实主�是因为该工具因biblatex�级而无法使用)�caspervector(虽然未曾真正交�，但从biblatex-caspervector样�包中学到很多，包括排�/GBK编�等问题的解决�路)�LeoLiu(刘海洋，给出的CJK字符判断函数
-\footnote{\url{http://bbs.ctex.org/forum.php?mod=viewthread&tid=152663&extra=page\%3D3}} 对本�包�常有帮助)�chinatex(china tex版主，给了很多建议和帮助，并且一起�作)�Sheng wenbo(biblatex用户手册�作译者，LaTeX2e �图指�第三版译者，我们一起翻译的过程相互激励相互促进)�zepinglee(gbt7714-2015 bst样�作者，给了很多建议和讨论)�Harry Chen(ctex套件维护者之一，给了�少好的建议)�liubenyuan(关于项目组织给出了很好的建议)�刘�涛（讨论了关于zotero的使用并�出了建议）�ghiclgi(讨论了GB中著者-出版年制标注标签的一些问题)�邓东�(很很多建议和讨论)�秀文工作组�leipility�qingkuan�湘厦人�秋平�任蒲军�fredericky123�qiuzhu�chaoxiaosu�Old Jack�Wu Nailong�Yibai Zhang�wayne508� 钟乙��Xiaodong Yao�dsycircle�rpjshu�zjsdut�谢澜涛�Zutian Luo�海阔天空�zzqzyx�程晨�xmtangjun�蔡伟 等等。当然还有更多朋��供了bug报告，�出了issue，�供了热心帮助，�于篇幅这里��一一列举，在此一并表示感谢!
+\footnote{\url{http://bbs.ctex.org/forum.php?mod=viewthread&tid=152663&extra=page\%3D3}} 对本�包�常有帮助)�chinatex(china tex版主，给了很多建议和帮助，并且一起�作)�Sheng wenbo(biblatex用户手册�作译者，LaTeX2e �图指�第三版译者，我们一起翻译的过程相互激励相互促进)�zepinglee(gbt7714-2015 bst样�作者，给了很多建议和讨论)�Harry Chen(ctex套件维护者之一，给了�少好的建议)�liubenyuan(关于项目组织给出了很好的建议)�刘�涛（讨论了关于zotero的使用并�出了建议）�ghiclgi(讨论了GB中著者-出版年制标注标签的一些问题)�邓东�(很多建议和讨论)�秀文工作组�leipility�qingkuan�湘厦人�秋平�任蒲军�fredericky123�qiuzhu�chaoxiaosu�Old Jack�Wu Nailong�Yibai Zhang�wayne508� 钟乙��Xiaodong Yao�dsycircle�rpjshu�zjsdut�谢澜涛�Zutian Luo�海阔天空�zzqzyx�程晨�xmtangjun�蔡伟 等等。当然还有更多朋��供了bug报告，�出了issue，�供了热心帮助，�于篇幅这里��一一列举，在此一并表示感谢!
 
 
 \section{存在的问题和下一步工作}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
index cba4e06459..a8031346b2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx
@@ -27,6 +27,11 @@
 \DeclareBibliographyOption{gbpunctcn}[true]{%biblatex低版本
   \ifstrequal{#1}{false}{\execgbpuncten}{}}
 
+\newtoggle{bbx:gbvolnum}
+\DeclareBibliographyOption{gbvolnum}[false]{%
+    \settoggle{bbx:gbvolnum}{#1}}
+    \ExecuteBibliographyOptions{gbvolnum}
+
 \newbibmacro*{bbx:ifmergeddate}{\@secondoftwo}
 
 \newbibmacro*{date+extradate}{}
@@ -41,18 +46,12 @@
            {\printdateextra}
            {\printlabeldateextra}}}}%
   \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}%
-%  \renewbibmacro*{issue+date}{%
-%    \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}}
-%                and
-%                test {\iffieldundef{issue}}}
-%      {}
-%      {\printtext[parens]{%
-%         \printfield{issue}%
-%         \setunit*{\addspace}%
-%         \usebibmacro{bbx:ifmergeddate}
-%           {}
-%           {\printdate}}}%
-%    \newunit}
+  \renewbibmacro*{issue+date}{%去掉括�
+    \iffieldundef{issue}
+      {\usebibmacro{date}}%
+      {\iftoggle{bbx:gbstrict}{}{\printfield{issue}%
+       \setunit*{\addspace}}%
+       \usebibmacro{date}}}%
 }
 
 
@@ -91,6 +90,7 @@
     dateabbrev=false,
     maxbibnames=99,
     mergedate=true,
+    gbfootbibfmt =true,
     %datezeros=false,
     }
 
@@ -122,7 +122,7 @@
 \def\gbpunctttr{》}%
 }
 
-\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}%将页�间隔符替�会英文的短横线
+\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{\textasciitilde}}%将页�间隔符替�会英文的短横线
 
 %==================================================
 %为标注和文献表中标点格�，�设and本地化字符串
@@ -130,10 +130,10 @@
 \DefineBibliographyStrings{english}{
     and         = { and},%and��的空格在finalnamedelim已�加过了，所以这里去掉20191009
     andcn       = {\gbpunctmark\unspace},%\gbpunctmark
-    %andotherscn={ç­‰},
     mathesiscn={硕士学�论文},
     phdthesiscn={�士学�论文},
     bytranslator= {trans\adddot\ \lbx@sfromlang\ by},
+    in={in\space},
 }
 
 
@@ -153,7 +153,10 @@
 \DeclareFieldFormat[article,incollection,inbook,inproceedings,misc]{title}{%
 \iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\mkbibquote{#1}\isdot}}
 \DeclareFieldFormat*{journaltitle}{%
-\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}}}%
+\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}%
+{\iffieldequalstr{entrysubtype}{workpaper}{#1}%
+{\textbf{\textit{#1}}}%
+}}%
 \DeclareFieldFormat{booktitle}{%
 \iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}}}
 \renewcommand*{\revsdnamepunct}{%
@@ -216,9 +219,10 @@
 %   调整页��的标点和去掉期刊文章等页���的标点
 %
 \renewbibmacro*{note+pages}{%��自standard.bbx
-%    \iffieldundef{postnote}{\iffieldundef{pages}{}{%
-%              \setunit{\bibpagespunct}%
-%              \printfield{pages}}}{}%
+\iffieldequalstr{userd}{chinese}{}%
+        {\iffieldundef{pages}{}{%
+              \setunit{\bibpagespunct}%
+              \printfield{pages}}}%
 }
 
 
@@ -239,7 +243,13 @@
 \printdelim{finalpunct}}
 %调整标注的注释中的�目结尾标点
 \DeclareDelimFormat{finalpunct}{\iffieldequalstr{userd}{chinese}{\gbpunctdot}{\adddot}}
-\DeclareDelimFormat[fullinnercite]{finalpunct}{}
+%注�由于usedriver中biblatex自动把\finenty定义为\blx@finentry@usedrv
+%而\blx@finentry@usedrv的标点默认设置为空，所以userdriver最�本�没有标点
+%这里将其���文献表中的标点\blx@imc@finentry，所以会与文献表一致
+\AtUsedriver{%
+  \let\finentry\blx@imc@finentry%\blx@finentry@usedrv
+}
+
 
 %出版项中：出版社地���的标点
 \renewcommand{\publocpunct}{%
@@ -408,7 +418,9 @@
 
 
 \renewbibmacro*{in:}{%
-\iftoggle{bbx:gbpunctin}{\gbpunctcomma}%\addthinspace
+\iftoggle{bbx:gbpunctin}{\iffieldequalstr{userd}{chinese}%
+                             {\gbpunctcomma}%
+                             {\newunit\printtext{\bibstring{in}}}}%\addthinspace
                          {\setunit{\adddot\addspace}%
                              \iffieldequalstr{userd}{chinese}%
                              {\gbpunctcomma}%
@@ -431,11 +443,12 @@
         \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero} 期}}%
         {\printtext{\bibstring{serialcn}\addthinspace #1 期}}%
         }}%
-        {\newunit\setcounter{numberwithoutzero}{#1}\printtext{\bibstring{number}}\arabic{numberwithoutzero}}%
+        {\setcounter{numberwithoutzero}{#1}\printtext{\bibstring{number}}~\arabic{numberwithoutzero}}%
 }
 
 \DeclareFieldFormat[book,inbook,incollection,misc]{number}%
-{\iffieldequalstr{userd}{chinese}{\iffieldint{number}%
+{\iffieldequalstr{userd}{chinese}
+    {\iffieldint{number}%
         {%
         \bibstring{serialcn}#1\bibstring{numbercn}%
         }{#1}%
@@ -516,13 +529,31 @@
 \iffieldequalstr{userd}{chinese}%
   {\iffieldundef{volume}{}{\printfield{volume}}%
     \iffieldundef{number}{}{\printfield{number}}}%区别于顺�编�制
-  {\newunit\printfield{volume}%
-  \printfield{number}%
-  \setunit{\addcomma\space}%
+  {\newunit%
+  \iftoggle{bbx:gbvolnum}%
+      {\usebibmacro{gb+volume+number}}%
+      {\iffieldundef{volume}{}{\printfield{volume}}%
+       \newunit\iffieldundef{number}{}{\printfield{number}}}%
   \printfield{eid}}%
 }
 
 
+\DeclareFieldFormat{plainvolume}{#1}%
+
+
+\newbibmacro*{gb+volume+number}
+{%
+\ifboolexpr{
+   not test {\iffieldundef{volume}} and  not test {\iffieldundef{number}}
+    }
+    {\printfield[plainvolume]{volume}\printfield[parens]{number}}
+    {%
+        \iffieldundef{volume}{}{\printfield{volume}}%
+        \iffieldundef{number}{}{\printfield{number}}%
+    }%
+}
+
+
 %
 %   期刊的标题�修改
 %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
index d8a89fb535..9b21ea69f4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx
@@ -78,6 +78,13 @@
 \DeclareDelimFormat[parencite]{andothersdelim}{\iffieldequalstr{userf}{chinese}{}{\addspace}}%
 
 
+%去掉footfullcite��的点
+%注�由于usedriver中biblatex自动把\finenty设置为空，所以userdriver最�本�没有标点
+%默认了加了period所以把它去掉
+\renewcommand{\bibfootnotewrapper}[1]{%
+  \bibsentence#1}%
+
+
 %标注压缩时，直接用date+extradate代替extradate实现2006a，2006b的效果
 %\DeclareDelimFormat*{compcitedelim}{\gbpunctmarkcite}%\addcomma\addspace
 \newbibmacro*{cite:extradate}{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
index b5233fc1f9..d68a55d403 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信�
 %
-\def\versionofgbtstyle{2023/04/24 v1.1m}
+\def\versionofgbtstyle{2023/05/24 v1.1n}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显�指定用biber�端，当用bibtex时会报错，但其实�会影�编译，�是采用bibtex�无法达�格�需求
@@ -215,14 +215,21 @@
 %% 20220625,hzz,v1.1i
 \newlength{\BracketLift}
 \setlength{\BracketLift}{0.0ex}
-\renewcommand*{\bibleftparen}{\blx@postpunct\raise\BracketLift\hbox{(}}
-\renewcommand*{\bibrightparen}{\blx@postpunct\raise\BracketLift\hbox{)}\midsentence}
-\renewcommand*{\bibleftbracket}{\blx@postpunct\raise\BracketLift\hbox{[}}
-\renewcommand*{\bibrightbracket}{\blx@postpunct\raise\BracketLift\hbox{]}\midsentence}
-\newcommand*{\gbleftparen}{\raise\BracketLift\hbox{(}}
-\newcommand*{\gbrightparen}{\raise\BracketLift\hbox{)}}
-\newcommand*{\gbleftbracket}{\raise\BracketLift\hbox{[}}
-\newcommand*{\gbrightbracket}{\raise\BracketLift\hbox{]}}
+%如下4个字符�以�全局性的改�，无论是在citation还是bibliography中
+\def\CharParenLeft{(}
+\def\CharParenRight{)}
+\def\CharBracketLeft{[}
+\def\CharBracketRight{]}
+%如下4个用于改�biblatex�供的括�命令中的字符的�置抬�
+\renewcommand*{\bibleftparen}{\blx@postpunct\raise\BracketLift\hbox{\CharParenLeft}}
+\renewcommand*{\bibrightparen}{\blx@postpunct\raise\BracketLift\hbox{\CharParenRight}\midsentence}
+\renewcommand*{\bibleftbracket}{\blx@postpunct\raise\BracketLift\hbox{\CharBracketLeft}}
+\renewcommand*{\bibrightbracket}{\blx@postpunct\raise\BracketLift\hbox{\CharBracketRight}\midsentence}
+%如下4个用于改�biblatex-gb7714-2015相关的括�命令中的字符的�置抬�
+\newcommand*{\gbleftparen}{\raise\BracketLift\hbox{\CharParenLeft}}
+\newcommand*{\gbrightparen}{\raise\BracketLift\hbox{\CharParenRight}}
+\newcommand*{\gbleftbracket}{\raise\BracketLift\hbox{\CharBracketLeft}}
+\newcommand*{\gbrightbracket}{\raise\BracketLift\hbox{\CharBracketRight}}
 
 
 %=====================================================================
@@ -689,7 +696,10 @@
     %为数字标签格�选择增加的计数器/命令
     \newcommand{\mkgbnumlabel}[1]{\mkbibbrackets{#1}}
     \def\gbbiblabelopt@bracket{\renewcommand{\mkgbnumlabel}[1]{\mkbibbrackets{##1}}}
+    \def\gbbiblabelopt@bracketqj{\renewcommand{\mkgbnumlabel}[1]{�##1】}}
+    \def\gbbiblabelopt@quanjiao{\renewcommand{\mkgbnumlabel}[1]{�##1】}}
     \def\gbbiblabelopt@parens{\renewcommand{\mkgbnumlabel}[1]{\mkbibparens{##1}}}
+    \def\gbbiblabelopt@parensqj{\renewcommand{\mkgbnumlabel}[1]{（##1）}}
     \def\gbbiblabelopt@dot{\renewcommand{\mkgbnumlabel}[1]{##1\adddot}}
     \def\gbbiblabelopt@plain{\renewcommand{\mkgbnumlabel}[1]{##1}}
     \def\gbbiblabelopt@box{\renewcommand{\mkgbnumlabel}[1]{\framebox{##1}}}
@@ -801,6 +811,7 @@
         \ifstrequal{#1}{right}{\setcounter{gbalignlabel}{0}}{}
         \ifstrequal{#1}{left}{\setcounter{gbalignlabel}{1}}{}
         \ifstrequal{#1}{center}{\setcounter{gbalignlabel}{2}}{}
+        \ifstrequal{#1}{centpos}{\setcounter{gbalignlabel}{3}}{}
         \ifstrequal{#1}{gb7714-2015}{\setaligngbstyle}{}
         \ifstrequal{#1}{gb7714-2015ay}{\setaligngbstyleay}{}
     }
@@ -845,6 +856,7 @@
         \ifstrequal{#1}{right}{\setcounter{gbalignlabel}{0}}{}
         \ifstrequal{#1}{left}{\setcounter{gbalignlabel}{1}}{}
         \ifstrequal{#1}{center}{\setcounter{gbalignlabel}{2}}{}
+        \ifstrequal{#1}{centpos}{\setcounter{gbalignlabel}{3}}{}
         \ifstrequal{#1}{gb7714-2015}{}{}
         \ifstrequal{#1}{gb7714-2015ay}{\setaligngbstyleay}{}
     }
@@ -2229,6 +2241,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
     \mkgbnumlabel{#1}\hfill%
 \or%中间对�，比如：��数字居于[]中间
     \hfil\mkgbnumlabel{\hfill#1\hfill}\hfil%
+\or%中间对�，但是整个标签�于中间，比如：[1]�于中间
+    \hfil\mkgbnumlabel{#1}\hfil%
 \fi}
 
 %
@@ -3185,6 +3199,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
           }
        }
     }
+    \let\defdblanentry=\defdoublelangentry
 }
 
 %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
index 7c39e23385..7d9d75eefe 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -58,6 +58,18 @@
 \renewrobustcmd{\mkbibleftborder}{\gbleftparen}%
 \renewrobustcmd{\mkbibrightborder}{\gbrightparen}%
 }
+\def\gbcitelabelopt@parensqj{%
+\renewrobustcmd{\mkbibleftborder}{\allowbreak（}%
+\renewrobustcmd{\mkbibrightborder}{）\unspace}%
+}
+\def\gbcitelabelopt@bracketqj{%
+\renewrobustcmd{\mkbibleftborder}{\allowbreak�}%
+\renewrobustcmd{\mkbibrightborder}{】\unspace}%
+}
+\def\gbcitelabelopt@quanjiao{%
+\renewrobustcmd{\mkbibleftborder}{\allowbreak（}%
+\renewrobustcmd{\mkbibrightborder}{）\unspace}%
+}
 \def\gbcitelabelopt@dot{%
 \renewrobustcmd{\mkbibleftborder}{}%
 \renewrobustcmd{\mkbibrightborder}{.}%
@@ -100,12 +112,13 @@
 %   20210121,v1.0w,hzz
 %
 \iftoggle{iftlatest}%
-{\renewbibmacro*{textcite}{%
+{%
+\renewbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\usebibmacro{cite:comp}}
     {\usebibmacro{cite:dump}%
      \ifbool{cbx:parens}
-       {\printtext{\bibclosebracket}\global\boolfalse{cbx:parens}}
+       {\printtext{\mkbibrightborder}\global\boolfalse{cbx:parens}}%\bibclosebracket
        {}%
      \iffirstcitekey
        {}
@@ -115,14 +128,37 @@
        {\printfield[citetitle]{labeltitle}}
        {\iftoggle{bbx:gblabelref}{\printtext[bibhyperref]{\printnames{labelname}}}{\printnames{labelname}}}%
      \setunit*{\printdelim{namelabeldelim}}%
-     \printtext{\bibopenbracket}\global\booltrue{cbx:parens}%
+     \printtext{\mkbibleftborder}\global\booltrue{cbx:parens}%\bibopenbracket
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
      \usebibmacro{cite:comp}%
      \stepcounter{textcitecount}%
-     \savefield{namehash}{\cbx@lasthash}}}%
-     }
+     \savefield{namehash}{\cbx@lasthash}}}
+%这是�版本的textcite，上�是新版本的，使用新版本�，对于�版本的biblatex的兼容性�能会�影�
+%\renewbibmacro*{textcite}{%
+%  \iffieldequals{namehash}{\cbx@lasthash}
+%    {\usebibmacro{cite:comp}}
+%    {\usebibmacro{cite:dump}%
+%     \ifbool{cbx:parens}
+%       {\printtext{\mkbibrightborder}\global\boolfalse{cbx:parens}}%\bibclosebracket
+%       {}%
+%     \iffirstcitekey
+%       {}
+%       {\setunit{\textcitedelim}}%
+%     \usebibmacro{cite:init}%
+%     \ifnameundef{labelname}
+%       {\printfield[citetitle]{labeltitle}}
+%       {\iftoggle{bbx:gblabelref}{\printtext[bibhyperref]{\printnames{labelname}}}{\printnames{labelname}}}%
+%     \setunit*{\printdelim{namelabeldelim}}%
+%     \printtext{\mkbibleftborder}\global\booltrue{cbx:parens}%\bibopenbracket
+%     \ifnumequal{\value{citecount}}{1}
+%       {\usebibmacro{prenote}}
+%       {}%
+%     \usebibmacro{cite:comp}%
+%     \stepcounter{textcitecount}%
+%     \savefield{namehash}{\cbx@lasthash}}}%
+}
 
 
 %
@@ -178,7 +214,7 @@
 %   定义一个上标方括�wrapper
 %
 \newcommand*\mkbibsuperbracket[1]{%
-  \mkbibsuperscript{\mkbibbrackets{#1}}%
+  \mkbibsuperscript{\mkbibleftborder{#1}\mkbibrightborder}%
 }
 
 %   修改postnote的输出格�
@@ -201,7 +237,7 @@
     \begingroup%
     \protected\long\def\mkbibsuperscriptusp##1{%
       \blx@warning{Nested superscript}%
-      \mkbibbrackets{##1}}%
+      \mkbibleftborder{##1}\mkbibrightborder}%
     #1\endgroup}}
 
 
@@ -243,7 +279,7 @@
 %   �定义parencite命令，以满足标签带页�的国标�求
 %
 \DeclareCiteCommand{\parencite}%[\mkbibbrackets]
-  {\addspace\mkbibleftborder\usebibmacro{cite:init}%
+  {\mkbibleftborder\usebibmacro{cite:init}%
    \usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \usebibmacro{cite:comp}}
@@ -352,7 +388,8 @@
     {\usebibmacro{cite:comp}}%
     {\usebibmacro{cite:dump}%
      \ifbool{cbx:parens}%
-       {\mkbibsuperscript{{\hspace{-0.075em}\bibclosebracket}}\global\boolfalse{cbx:parens}}%\printtext
+       {\mkbibsuperscript{{\hspace{-0.075em}\mkbibrightborder}}%\bibclosebracket
+       \global\boolfalse{cbx:parens}}%\printtext
        {}%
      \iffirstcitekey
        {}
@@ -362,7 +399,8 @@
        {\printfield[citetitle]{labeltitle}}
        {\printnames{labelname}}%
      %\setunit*{\printdelim{namelabeldelim}}%
-     \mkbibsuperscript{\printtext{\bibopenbracket}\global\booltrue{cbx:parens}%
+     \mkbibsuperscript{\printtext{\mkbibleftborder}%\bibopenbracket
+     \global\booltrue{cbx:parens}%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}%
        {}%
@@ -378,11 +416,13 @@
   {}%
   {\ifbool{cbx:incitet}%
         {\mkbibsuperscript{\usebibmacro{cite:dump}\usebibmacro{postnote}%
-        \ifbool{cbx:parens}{\hspace{-0.075em}\bibclosebracket\global\boolfalse{cbx:parens}}{}%
+        \ifbool{cbx:parens}{\hspace{-0.075em}\mkbibrightborder%\bibclosebracket
+        \global\boolfalse{cbx:parens}}{}%
         }%
         }%
         {\usebibmacro{cite:dump}\usebibmacro{postnote}%
-        \ifbool{cbx:parens}{\bibclosebracket\global\boolfalse{cbx:parens}}{}%
+        \ifbool{cbx:parens}{\mkbibrightborder%\bibclosebracket
+        \global\boolfalse{cbx:parens}}{}%
         }%
    }
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
index a1f7a23492..3ebe52afca 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,7 +10,7 @@
 %
 %   版本和时间信�
 %
-\def\versionofgbtstyle{2023/04/24 v1.1m}
+\def\versionofgbtstyle{2023/05/24 v1.1n}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显�指定用biber�端，当用bibtex时会报错，但其实�会影�编译，�是采用bibtex�无法达�格�需求
@@ -212,14 +212,21 @@
 %% 20220625,hzz,v1.1i
 \newlength{\BracketLift}
 \setlength{\BracketLift}{0.0ex}
-\renewcommand*{\bibleftparen}{\blx@postpunct\raise\BracketLift\hbox{(}}
-\renewcommand*{\bibrightparen}{\blx@postpunct\raise\BracketLift\hbox{)}\midsentence}
-\renewcommand*{\bibleftbracket}{\blx@postpunct\raise\BracketLift\hbox{[}}
-\renewcommand*{\bibrightbracket}{\blx@postpunct\raise\BracketLift\hbox{]}\midsentence}
-\newcommand*{\gbleftparen}{\raise\BracketLift\hbox{(}}
-\newcommand*{\gbrightparen}{\raise\BracketLift\hbox{)}}
-\newcommand*{\gbleftbracket}{\raise\BracketLift\hbox{[}}
-\newcommand*{\gbrightbracket}{\raise\BracketLift\hbox{]}}
+%如下4个字符�以�全局性的改�，无论是在citation还是bibliography中
+\def\CharParenLeft{(}
+\def\CharParenRight{)}
+\def\CharBracketLeft{[}
+\def\CharBracketRight{]}
+%如下4个用于改�biblatex�供的括�命令中的字符的�置抬�
+\renewcommand*{\bibleftparen}{\blx@postpunct\raise\BracketLift\hbox{\CharParenLeft}}
+\renewcommand*{\bibrightparen}{\blx@postpunct\raise\BracketLift\hbox{\CharParenRight}\midsentence}
+\renewcommand*{\bibleftbracket}{\blx@postpunct\raise\BracketLift\hbox{\CharBracketLeft}}
+\renewcommand*{\bibrightbracket}{\blx@postpunct\raise\BracketLift\hbox{\CharBracketRight}\midsentence}
+%如下4个用于改�biblatex-gb7714-2015相关的括�命令中的字符的�置抬�
+\newcommand*{\gbleftparen}{\raise\BracketLift\hbox{\CharParenLeft}}
+\newcommand*{\gbrightparen}{\raise\BracketLift\hbox{\CharParenRight}}
+\newcommand*{\gbleftbracket}{\raise\BracketLift\hbox{\CharBracketLeft}}
+\newcommand*{\gbrightbracket}{\raise\BracketLift\hbox{\CharBracketRight}}
 
 
 %=====================================================================
@@ -634,7 +641,10 @@
     %为数字标签格�选择增加的计数器/命令
     \newcommand{\mkgbnumlabel}[1]{\mkbibbrackets{#1}}
     \def\gbbiblabelopt@bracket{\renewcommand{\mkgbnumlabel}[1]{\mkbibbrackets{##1}}}
+    \def\gbbiblabelopt@bracketqj{\renewcommand{\mkgbnumlabel}[1]{�##1】}}
+    \def\gbbiblabelopt@quanjiao{\renewcommand{\mkgbnumlabel}[1]{�##1】}}
     \def\gbbiblabelopt@parens{\renewcommand{\mkgbnumlabel}[1]{\mkbibparens{##1}}}
+    \def\gbbiblabelopt@parensqj{\renewcommand{\mkgbnumlabel}[1]{（##1）}}
     \def\gbbiblabelopt@dot{\renewcommand{\mkgbnumlabel}[1]{##1\adddot}}
     \def\gbbiblabelopt@plain{\renewcommand{\mkgbnumlabel}[1]{##1}}
     \def\gbbiblabelopt@box{\renewcommand{\mkgbnumlabel}[1]{\framebox{##1}}}
@@ -744,6 +754,7 @@
         \ifstrequal{#1}{right}{\setcounter{gbalignlabel}{0}\setaligngbnumeric}{}
         \ifstrequal{#1}{left}{\setcounter{gbalignlabel}{1}\setaligngbnumeric}{}
         \ifstrequal{#1}{center}{\setcounter{gbalignlabel}{2}\setaligngbnumeric}{}
+        \ifstrequal{#1}{centpos}{\setcounter{gbalignlabel}{3}\setaligngbnumeric}{}
         \ifstrequal{#1}{gb7714-2015}{\setaligngbstyle}{}
         \ifstrequal{#1}{gb7714-2015ay}{}{}%默认就是ay样�的
     }%
@@ -791,6 +802,7 @@
         \ifstrequal{#1}{right}{\setcounter{gbalignlabel}{0}\setaligngbnumeric}{}
         \ifstrequal{#1}{left}{\setcounter{gbalignlabel}{1}\setaligngbnumeric}{}
         \ifstrequal{#1}{center}{\setcounter{gbalignlabel}{2}\setaligngbnumeric}{}
+        \ifstrequal{#1}{centpos}{\setcounter{gbalignlabel}{3}\setaligngbnumeric}{}
         \ifstrequal{#1}{gb7714-2015}{\setaligngbstyle}{}
         \ifstrequal{#1}{gb7714-2015ay}{}{}
     }%
@@ -2005,6 +2017,7 @@
           }
        }
     }
+    \let\defdblanentry=\defdoublelangentry
 }
 
 
@@ -2103,6 +2116,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
     \mkgbnumlabel{#1}\hfill%
 \or%中间对�，比如：��数字居于[]中间
     \hfil\mkgbnumlabel{\hfill#1\hfill}\hfil%
+\or%中间对�，但是整个标签�于中间，比如：[1]�于中间
+    \hfil\mkgbnumlabel{#1}\hfil%
 \fi}
 
 %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
index 454e5cc7e6..739528dc1b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
@@ -28,6 +28,9 @@
 %   增加标签包围符�格�处�选项
 %   20211030,1.1a,hzz
 %
+\def\gbpunctcommacite{\addcomma\addspace}
+\def\gbpunctmarkcite{\addcomma\addspace}%
+\def\gbpunctsemicoloncite{\addsemicolon\addspace}
 \newrobustcmd{\mkbibleftborder}{\gbleftparen}
 \newrobustcmd{\mkbibrightborder}{\gbrightparen}
 \DeclareBibliographyOption[string]{gbcitelabel}[bracket]{%
@@ -43,6 +46,21 @@
 \renewrobustcmd{\mkbibleftborder}{\gbleftparen}%
 \renewrobustcmd{\mkbibrightborder}{\gbrightparen}%
 }
+\def\gbcitelabelopt@parensqj{%
+\renewrobustcmd{\mkbibleftborder}{\allowbreak（}%
+\renewrobustcmd{\mkbibrightborder}{）\unspace}%
+}
+\def\gbcitelabelopt@bracketqj{%
+\renewrobustcmd{\mkbibleftborder}{\allowbreak�}%
+\renewrobustcmd{\mkbibrightborder}{】\unspace}%
+}
+\def\gbcitelabelopt@quanjiao{%
+\renewrobustcmd{\mkbibleftborder}{\allowbreak（}%
+\renewrobustcmd{\mkbibrightborder}{）\unspace}%
+\def\gbpunctcommacite{，}%
+\def\gbpunctmarkcite{�}%
+\def\gbpunctsemicoloncite{ï¼›}%
+}
 \def\gbcitelabelopt@dot{%
 \renewrobustcmd{\mkbibleftborder}{}%
 \renewrobustcmd{\mkbibrightborder}{.}%
@@ -116,14 +134,20 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
 % v1.0t，20200320，hzz，修改如下
 % 在cbx中增加标注中的nameyeardelim标点定义，��bbx使用其它样�时出现问题
 % �时设置textcite的nameyeardelim为一个短空格，似乎原�直接连上去的�够美观
-\DeclareDelimFormat[cite,parencite,pagescite]{nameyeardelim}{\addcomma\space}%\addcomma\space
-\DeclareDelimFormat[textcite]{nameyeardelim}{\addthinspace}%\addcomma\space
-\DeclareDelimFormat[textcite]{andothersdelim}{\iffieldequalstr{userf}{chinese}{\addthinspace}{\addspace}}%
-\AtEveryCitekey{%
-\iffieldequalstr{userf}{chinese}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
-  {\renewcommand*{\andothersdelim}{\addspace}}%
-}
-\newcommand{\compextradelim}{\addcomma\addthinspace} %标注中压缩�相�年份�附加标签a�b之间的标点
+\renewcommand*{\multicitedelim}{\gbpunctsemicoloncite}%\addsemicolon\addspaceï¼›
+\renewcommand*{\compcitedelim}{\gbpunctmarkcite}
+\newcommand{\compextradelim}{\gbpunctcommacite} %标注中压缩�相�年份�附加标签a�b之间的标点
+\DeclareDelimFormat[cite,parencite,pagescite,citep]{nameyeardelim}{\gbpunctcommacite}%\addcomma\space
+\DeclareDelimFormat[textcite,authornumcite,citet]{nameyeardelim}{\addthinspace}%\addcomma\space
+\DeclareDelimFormat[cite,parencite,pagescite,citep]{andothersdelim}
+    {\iffieldequalstr{userf}{chinese}{\addthinspace}{\addspace}}%
+\DeclareDelimFormat[textcite,authornumcite,citet]{andothersdelim}
+    {\iffieldequalstr{userf}{chinese}{\addthinspace}{\addspace}}%
+%\AtEveryCitekey{%
+%\iffieldequalstr{userf}{chinese}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
+%  {\renewcommand*{\andothersdelim}{\addspace}}%
+%}
+
 
 %
 %   修订使�用选项gblabelref�控制是�将标准标签中的作者加上超链接
@@ -152,12 +176,12 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
     {\usebibmacro{cite:shorthand}%
      \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
-\renewbibmacro*{textcite}{%
+\newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\iffieldundef{shorthand}
        {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                     \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-          {\setunit{\compextradelim}%
+          {\setunit{\addcomma}%
            \usebibmacro{cite:extradate}}
           {\setunit{\compcitedelim}%
            \usebibmacro{cite:labeldate+extradate}%
@@ -170,7 +194,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
           {\usebibmacro{cite:label}%
            \setunit{%
              \global\booltrue{cbx:parens}%
-             \printdelim{nonameyeardelim}\bibopenparen}%
+             \printdelim{nonameyeardelim}\mkbibleftborder}%\bibopenparen
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
@@ -179,7 +203,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
        {\iftoggle{bbx:gblabelref}{\printtext[bibhyperref]{\printnames{labelname}}}{\printnames{labelname}}%
         \setunit{%
           \global\booltrue{cbx:parens}%
-          \printdelim{nameyeardelim}\bibopenparen}%
+          \printdelim{nameyeardelim}\mkbibleftborder}%\bibopenparen
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
@@ -194,9 +218,69 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {\mkbibrightborder\global\boolfalse{cbx:parens}}%\bibcloseparen
       {}%
-    \textcitedelim}}}{}
+    \textcitedelim}}
+\newbibmacro*{textcite:postnote}{%
+  \usebibmacro{postnote}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+    {\setunit{}%
+     \printtext{%
+       \ifbool{cbx:parens}
+         {\mkbibrightborder\global\boolfalse{cbx:parens}}%\bibcloseparen
+         {}}}
+    {\setunit{%
+       \ifbool{cbx:parens}
+         {\mkbibrightborder\global\boolfalse{cbx:parens}}%\bibcloseparen
+         {}%
+       \textcitedelim}}}
+%这是�版本的textcite，上�是新版本的，使用新版本�，对于�版本的biblatex的兼容性�能会�影�
+%\renewbibmacro*{textcite}{%
+%  \iffieldequals{namehash}{\cbx@lasthash}
+%    {\iffieldundef{shorthand}
+%       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+%                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+%          {\setunit{\compextradelim}%
+%           \usebibmacro{cite:extradate}}
+%          {\setunit{\compcitedelim}%
+%           \usebibmacro{cite:labeldate+extradate}%
+%           \savefield{labelyear}{\cbx@lastyear}}}
+%       {\setunit{\compcitedelim}%
+%        \usebibmacro{cite:shorthand}%
+%        \global\undef\cbx@lastyear}}
+%    {\ifnameundef{labelname}
+%       {\iffieldundef{shorthand}
+%          {\usebibmacro{cite:label}%
+%           \setunit{%
+%             \global\booltrue{cbx:parens}%
+%             \printdelim{nonameyeardelim}\bibopenparen}%\bibopenparen\mkbibleftborder
+%           \ifnumequal{\value{citecount}}{1}
+%             {\usebibmacro{prenote}}
+%             {}%
+%           \usebibmacro{cite:labeldate+extradate}}
+%          {\usebibmacro{cite:shorthand}}}
+%       {\iftoggle{bbx:gblabelref}{\printtext[bibhyperref]{\printnames{labelname}}}{\printnames{labelname}}%
+%        \setunit{%
+%          \global\booltrue{cbx:parens}%
+%          \printdelim{nameyeardelim}\bibopenparen}%\mkbibleftborder
+%        \ifnumequal{\value{citecount}}{1}
+%          {\usebibmacro{prenote}}
+%          {}%
+%        \iffieldundef{shorthand}
+%          {\iffieldundef{labelyear}
+%             {\usebibmacro{cite:label}}
+%             {\usebibmacro{cite:labeldate+extradate}}%
+%           \savefield{labelyear}{\cbx@lastyear}}
+%          {\usebibmacro{cite:shorthand}%
+%           \global\undef\cbx@lastyear}}%
+%     \stepcounter{textcitecount}%
+%     \savefield{namehash}{\cbx@lasthash}}%
+%  \setunit{%
+%    \ifbool{cbx:parens}
+%      {\bibcloseparen\global\boolfalse{cbx:parens}}%\bibcloseparen\mkbibrightborder
+%      {}%
+%    \textcitedelim}}%
+}{}
 
 
 
@@ -229,6 +313,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
   {\mkbibrightborder\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote}
   }
 
+
 %
 %   定义upcite命令
 %   20180604，v1.0l，hzz
@@ -332,7 +417,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
               \savefield{labelyear}{\cbx@lastyear}}}
           {\iftoggle{bbx:gblabelref}{\printtext[bibhyperref]{\printnames{labelname}}}{\printnames{labelname}}%%
            %\setunit{\printdelim{nameyeardelim}}%
-           \gbleftparen\usebibmacro{cite:labeldate+extradate}\gbrightparen%
+           \mkbibleftborder\usebibmacro{cite:labeldate+extradate}\mkbibrightborder%
            \savefield{namehash}{\cbx@lasthash}%
            \savefield{labelyear}{\cbx@lastyear}}}}
     {\usebibmacro{cite:shorthand}%
@@ -385,11 +470,11 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {\mkbibrightborder\global\boolfalse{cbx:parens}}%\bibcloseparen
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {\mkbibrightborder\global\boolfalse{cbx:parens}}%\bibcloseparen
          {}%
        \textcitedelim}}%
        \renewbibmacro*{postnote}{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
index f60044ae8a..fe97e02286 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
@@ -1786,6 +1786,7 @@
           }
        }
     }
+    \let\defdblanentry=\defdoublelangentry
 
     %   关�文献的输出格�
     %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
index 7f090e434a..e829ef3c3a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
@@ -2359,6 +2359,7 @@
           }
        }
     }
+    \let\defdblanentry=\defdoublelangentry
 
 %
 %   关�文献间的分隔符
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py
index b783537cb5..10b5db33dc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py
@@ -20,7 +20,9 @@ def compileall():
 	
 	pwd=os.getcwd()
 	filesneedcopy=['gb7714-CCNU.bbx','gb7714-CCNU.cbx','gb7714-NWAFU.bbx','gb7714-NWAFU.cbx','gb7714-SEU.bbx','gb7714-SEU.cbx',
-	'chinese-erj.bbx','chinese-erj.cbx','chinese-css.bbx','chinese-css.cbx','example.bib', 'gb7714-1987.bbx', 'gb7714-1987.cbx', 
+	'chinese-erj.bbx','chinese-erj.cbx','chinese-css.bbx','chinese-css.cbx',
+	'chinese-jmw.bbx','chinese-jmw.cbx',
+	'example.bib', 'gb7714-1987.bbx', 'gb7714-1987.cbx', 
 	'gb7714-1987ay.bbx', 'gb7714-1987ay.cbx', 'gb7714-2005.bbx', 'gb7714-2005.cbx', 'gb7714-2005ay.bbx',
 	'gb7714-2005ay.cbx', 'gb7714-2015-gbk.def', 'gb7714-2015.bbx', 'gb7714-2015.cbx', 'gb7714-2015ay.bbx',
 	'gb7714-2015ay.cbx', 'gb7714-2015ms.bbx', 'gb7714-2015ms.cbx', 'gb7714-2015mx.bbx', 'gb7714-2015mx.cbx']
diff --git a/macros/latex/contrib/listlbls/Makefile b/macros/latex/contrib/listlbls/Makefile
index 20ecc6f468..64df745ce7 100644
--- a/macros/latex/contrib/listlbls/Makefile
+++ b/macros/latex/contrib/listlbls/Makefile
@@ -1,13 +1,17 @@
-NAME  = listlbls
-SHELL = bash
-PWD   = $(shell pwd)
-TEMP := $(shell mktemp -d)
-TDIR  = $(TEMP)/$(NAME)
-VERS  = $(shell ltxfileinfo -v $(NAME).dtx)
-LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
-UTREE = $(shell kpsewhich --var-value TEXMFHOME)
-
-all:	$(NAME).pdf README.md README clean
+NAME    = listlbls
+SHELL   = bash
+PWD     = $(shell pwd)
+TEMP   := $(shell mktemp -d)
+TDIR    = $(TEMP)/$(NAME)
+VERS    = $(shell ltxfileinfo -v $(NAME).dtx)
+LOCAL   = $(shell kpsewhich --var-value TEXMFLOCAL)
+UTREE   = $(shell kpsewhich --var-value TEXMFHOME)
+PREFIX ?= $(LOCAL)
+LATEX   = xelatex
+SUDO    = sudo
+
+all: $(NAME).pdf README.md README
+	$(MAKE) clean
 
 README: README.txt
 	cp README.txt README
@@ -17,11 +21,12 @@ README.txt: $(NAME).pdf
 README.md: $(NAME).pdf
 
 $(NAME).pdf: $(NAME).dtx
-	xelatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+	$(LATEX) -shell-escape -recorder $(NAME).dtx
 	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
 	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
-	xelatex -shell-escape -recorder -interaction=nonstopmode $(NAME).dtx > /dev/null
-	xelatex -shell-escape -recorder -interaction=nonstopmode $(NAME).dtx > /dev/null
+	$(LATEX) -shell-escape -recorder -interaction=scrollmode $(NAME).dtx
+	$(LATEX) -shell-escape -recorder -interaction=scrollmode $(NAME).dtx
+	$(LATEX) -shell-escape -recorder -interaction=scrollmode $(NAME).dtx
 
 clean:
 	rm -f *.fls
@@ -31,16 +36,13 @@ distclean: clean
 	rm -f $(NAME).{pdf,sty} README{,.{md,txt}}
 
 inst: all
-	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
-	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
-	cp $(NAME).sty $(UTREE)/tex/latex/$(NAME)
-	cp $(NAME).pdf $(UTREE)/doc/latex/$(NAME)
+	$(MAKE) install PREFIX=$(UTREE) SUDO=""
 
 install: all
-	sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(NAME)
-	sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
-	sudo cp $(NAME).sty $(LOCAL)/tex/latex/$(NAME)
-	sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
+	$(SUDO) mkdir -p $(PREFIX)/{tex,source,doc}/latex/$(NAME)
+	$(SUDO) cp $(NAME).dtx $(PREFIX)/source/latex/$(NAME)
+	$(SUDO) cp $(NAME).sty $(PREFIX)/tex/latex/$(NAME)
+	$(SUDO) cp $(NAME).pdf $(PREFIX)/doc/latex/$(NAME)
 
 zip: all
 	mkdir $(TDIR)
diff --git a/macros/latex/contrib/listlbls/listlbls.dtx b/macros/latex/contrib/listlbls/listlbls.dtx
index 52da33c381..a52b55a6cf 100644
--- a/macros/latex/contrib/listlbls/listlbls.dtx
+++ b/macros/latex/contrib/listlbls/listlbls.dtx
@@ -120,17 +120,17 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{listlbls}
 %<*package>
-    [2014/08/04 v1.03 Creates a list of all labels used throughout a document]
+    [2023/05/24 v1.04 Creates a list of all labels used throughout a document]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{microtype}
-\usepackage{libertine}
-\usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry}
-\usepackage{colordoc}
+\usepackage{lmodern}
+\usepackage{fontawesome5}
+\usepackage[a4paper,margin=25mm,left=45mm,nohead]{geometry}
 \usepackage{multicol}
-\usepackage{dox}
-\doxitem{Option}{option}{option}
+\usepackage[reportchangedates]{doc}
+\usepackage{dtxdescribe}
 \usepackage[numbered]{hypdoc}
 \usepackage{xspace}
 \usepackage{nameref}
@@ -140,6 +140,10 @@ Running "make install" installs the files in the local TeX tree.
 \CodelineIndex
 \RecordChanges
 \newcommand\TSE{\href{http://tex.stackexchange.com/}{\TeX-Stackexchange}\xspace}
+
+\newcommand\link[2]{\href{#1}{#2}\footnote{\nolinkurl{#1}}}
+\newcommand\ghissue[3]{\link{https://github.com/#1/#2/issues/#3}{\faIcon{github}~#1/#2\##3}}
+\newcommand\thisissue[1]{\ghissue{nobbz}{listlbls}{#1}}
 \begin{document}
   \DocInput{\jobname.dtx}
 \end{document}
@@ -160,9 +164,11 @@ Running "make install" installs the files in the local TeX tree.
 %\changes{v1.00}{2014/07/25}{First public release}
 %\changes{v1.01}{2014/07/25}{Changed maintainer email}
 %\changes{v1.01}{2014/07/25}{Changed some internal stuff to make it releaseable on CTAN}
-%\changes{v1.02}{2014/07/26}{Local option wins agains global option}
+%\changes{v1.02}{2014/07/27}{Local option wins agains global option}
 %\changes{v1.02}{2014/07/27}{Added languag-support for English, German and French.}
 %\changes{v1.03}{2014/08/04}{Proceeding with namespacing internal macros}
+%\changes{v1.04}{2023/05/24}{Fix build problems due to bitrotten dependencies}
+%\changes{v1.04}{2023/05/24}{Switch back to lmodern for documentation}
 % \begin{abstract}
 % This is a package meant to help a \LaTeX-writer to keep track all the defined labels by typesetting a complete list of labels whereever the author requests it. Keep in mind, that you might need to have additional \LaTeX\ runs to get the references right.
 %
@@ -183,8 +189,10 @@ Running "make install" installs the files in the local TeX tree.
 % \subsection{From Github}\label{ssec:inst-gh}
 %
 % \begin{enumerate}
-%   \item Check out the sourcecode from \href{https://github.com/}{GitHub}:\\
-%     |git clone git@github.com:NobbZ/listlbls.git|
+%   \item Check out the sourcecode from \link{https://github.com/}{GitHub}:\\
+%     |git clone https://github.com/NobbZ/nixos-config.git| or\\
+%     |git clone git@github.com:NobbZ/listlbls.git| or\\
+%     |gh repo clone NobbZ/listlbls|
 %   \item Switch to the source-folder:\\|cd listlbls|
 %   \item Checkout the branch/tag you desire: |master| for latest release, |develop| for latest builds (might be broken) or the version number desired.\\
 %     |git checkout <branch/tag>|
@@ -240,9 +248,12 @@ Running "make install" installs the files in the local TeX tree.
 %
 % Then anywhere in your document, you can use the |\listoflabels|-macro to typeset a list of labels. An example can be seen on page \pageref{special:listoflabels}.
 %
-% \DescribeMacro{\label} Use |\label| as you are used to it!
+% \DescribeMacro{\label} \marg{name}
+% Use |\label| as you are used to it!
 %
-% \DescribeMacro{\listoflabels} This macro will typeset the list of labels when this module is in draft mode. It will itself register the label ``|special:listoflabels|''.
+% \DescribeMacro{\listoflabels} \oarg{label}
+% This macro will typeset the list of labels when this module is in draft mode.
+% It will itself register the label from the optional arg, defaulting to ``|special:listoflabels|''.
 %
 %\StopEventually{^^A
 %  \PrintChanges
@@ -254,11 +265,11 @@ Running "make install" installs the files in the local TeX tree.
 %
 % \section{Contribution and bugreports}\label{sec:contribute}
 %
-% If you have feature-requests or bug-reports, please feel free to report them on the \href{https://github.com/NobbZ/listlbls}{project page at GitHub}.
+% If you have feature-requests or bug-reports, please feel free to report them on the \link{https://github.com/NobbZ/listlbls}{project page at GitHub}.
 %
 % If you want to contribute then follow these steps:
 % \begin{enumerate}
-%   \item Visit the \href{https://github.com/NobbZ/listlbls}{project page at GitHub},
+%   \item Visit the \link{https://github.com/NobbZ/listlbls}{project page at GitHub},
 %   \item forkt it,
 %   \item clone it to your local machine,
 %   \item create a branch ``|feature/|\meta{feature name}'',
@@ -268,6 +279,17 @@ Running "make install" installs the files in the local TeX tree.
 %   \item and wait for approval.
 % \end{enumerate}
 % After approval your code will be merged to the |development|-branch and I will generally not accept pull-requests that edit |develop| directly.
+%
+% \section{Known issues and limitations}\label{sec:issues}
+% \changes{v1.04}{2023/05/24}{Add issues and limitations section}
+%
+% \subsection{\texttt{\textbackslash{}include}}\label{ssec:issues-include}
+% 
+% Documents containing |\include| will not work.
+% Currently there is no logic to recurse through the different |.aux|-files.
+%
+% Please see \thisissue{4} for more information.
+%
 % \section{Implementation}\label{sec:implementation}
 %
 %    \begin{macrocode}
@@ -280,7 +302,7 @@ Running "make install" installs the files in the local TeX tree.
 % \subsection{Options}\label{ssec:impl-options}
 % \begin{option}{draft}
 % \changes{v1.01}{2014/07/25}{Added option}
-% \changes{v1.02}{2014/07/26}{Introduced @ifdraft}
+% \changes{v1.02}{2014/07/27}{Introduced @ifdraft}
 % Check for |draft|-option:
 %    \begin{macrocode}
 \DeclareOption{draft}{\llbls@drafttrue}
@@ -288,21 +310,21 @@ Running "make install" installs the files in the local TeX tree.
 % \end{option}
 % \begin{option}{final}
 % \changes{v1.01}{2014/07/25}{Added option}
-% \changes{v1.02}{2014/07/26}{Introduced @ifdraft}
+% \changes{v1.02}{2014/07/27}{Introduced @ifdraft}
 % Check for |final|-option:
 %    \begin{macrocode}
 \DeclareOption{final}{\llbls@draftfalse}
 %    \end{macrocode}
 % \end{option}
 % \begin{option}{totoc}
-% \changes{v1.02}{2014/07/26}{Added option}
+% \changes{v1.02}{2014/07/27}{Added option}
 % Check for |totoc|-option:
 %    \begin{macrocode}
 \DeclareOption{totoc}{\llbls@totoctrue}
 %    \end{macrocode}
 % \end{option}
 % \begin{option}{notoc}
-% \changes{v1.02}{2014/07/26}{Added option}
+% \changes{v1.02}{2014/07/27}{Added option}
 % Check for |notoc|-option:
 %    \begin{macrocode}
 \DeclareOption{notoc}{\llbls@totocfalse}
@@ -368,14 +390,27 @@ Running "make install" installs the files in the local TeX tree.
   {llbls-onpage}%
   {\`a la page}
 %    \end{macrocode}
+% \subsubsection{Portuguese}\label{sssec:impl-i18n-pt}
+% \changes{v1.04}{2023/05/24}{Add Portuguese translation}
+%    \begin{macrocode}
+\DeclareTranslation{Portuguese}%
+  {llbls-listoflabels}%
+  {Lista de R\'{o}tulos}
+\DeclareTranslation{Portuguese}%
+  {llbls-onpage}%
+  {na p\'{a}gina}
+%    \end{macrocode}
 % \subsection{Internal stuff}\label{ssec:impl-internal}
 % \begin{macro}{\llbls@headline}\begin{macro}{\llbls@toccommand}\begin{macro}{\llbls@tocgroup}
 % Determine if we have |\chapter|s or not and create a command that maps to |\chapter| or |\section| as needed.
 %    \begin{macrocode}
-\ifdefined\chapter*
+\ifdefined\chapter
   \ifllbls@numtoc
     \def\llbls@headline{%
-      \chapter{List of Labels}\label{special:listoflabels}}
+%    \end{macrocode}
+% We are using |\llbls@labelname| here and in the other possible definitions of |\llbls@headline| to be able to set the label name in the |\listoflabels| macro.
+%    \begin{macrocode}
+      \chapter{List of Labels}\label{\llbls@labelname}}
   \else
     \def\llbls@toccommand{\chapter*}
     \def\llbls@tocgroup{chapter}
@@ -383,7 +418,7 @@ Running "make install" installs the files in the local TeX tree.
 \else
   \ifllbls@numtoc
     \def\llbls@headline{%
-      \section{List of Labels}\label{special:listoflabels}}
+      \section{List of Labels}\label{\llbls@labelname}}
   \else
     \def\llbls@toccommand{\section*}
     \def\llbls@tocgroup{section}
@@ -392,7 +427,7 @@ Running "make install" installs the files in the local TeX tree.
 \ifdefined\llbls@headline\else
   \def\llbls@headline{%
     \llbls@toccommand{\GetTranslation{llbls-listoflabels}}%
-    \label{special:listoflabels}%
+    \label{\llbls@labelname}%
     \ifllbls@totoc%
       \addcontentsline{toc}%
         {\llbls@tocgroup}%
@@ -428,7 +463,7 @@ Running "make install" installs the files in the local TeX tree.
 % \end{macro}
 %
 % \begin{macro}{\llbls@showlabel}
-% \changes{v1.03}{2014/07/27}{Add support for nameref-package}
+% \changes{v1.02}{2014/08/04}{Add support for nameref-package}
 % Displays a single entry in the |\listoflabels|
 %    \begin{macrocode}
 \def\llbls@showlabel#1#2{%
@@ -454,13 +489,16 @@ Running "make install" installs the files in the local TeX tree.
 \ifllbls@draft
 %    \end{macrocode}
 % \begin{macro}{\listoflabels}
+% \changes{v1.04}{2023/05/24}{add optional argument to change the name of the label used.}
+% \begin{macro}{\llbls@labelname}
 % Print a list of all available lables that are defined throughout the document.
 %    \begin{macrocode}
-  \newcommand\listoflabels{%
+  \newcommand{\listoflabels}[1][special:listoflabels]{%
+    \def\llbls@labelname{#1}%
     \llbls@headline%
     \the\llbls@lablist}
 %    \end{macrocode}
-% \end{macro}
+% \end{macro}\end{macro}
 %    \begin{macrocode}
 \else
   \let\listoflabels=\relax
diff --git a/macros/latex/contrib/listlbls/listlbls.pdf b/macros/latex/contrib/listlbls/listlbls.pdf
index 15a732d799..537f54e51a 100644
--- a/macros/latex/contrib/listlbls/listlbls.pdf
+++ b/macros/latex/contrib/listlbls/listlbls.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 4c28160949..93555aa1e5 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -17,8 +17,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{6.19}
-\def\myfiledate{2023/05/15}
+\def\myfileversion{6.19a}
+\def\myfiledate{2023/05/25}
 %
 %
 %<*batchfile>
@@ -1743,7 +1743,10 @@ version 2005/12/01 or later.
         \seq_map_indexed_inline:Nn \g_@@_notes_seq
           {
             \tl_if_eq:nnT { { #1 } { #2 } } { ##2 } 
-              { \int_set:Nn \l_tmpa_int { ##1 } \seq_map_break: }
+              { 
+                \int_set:Nn \l_tmpa_int { ##1 } 
+                \seq_map_break: 
+              }
           }
         \int_compare:nNnF \l_tmpa_int = \c_zero_int 
           { \int_add:Nn \l_tmpa_int \g_@@_notes_caption_int }
@@ -1829,31 +1832,20 @@ version 2005/12/01 or later.
           { \int_gzero:N \c@tabularnote }
 %    \end{macrocode}
 % Now, we try to detect duplicate notes in the caption.
+% Be careful! We must put |\tl_if_in:NnF| and not |\tl_if_in:NnT|!
 %    \begin{macrocode}
-        \bool_set_false:N \l_tmpa_bool
-        \seq_map_inline:Nn \g_@@_notes_in_caption_seq
-          { \@@_if_eq_two_three:nnn ##1 { #2 } }
-%    \end{macrocode}
-% Be careful! We must put |\bool_if:NF| and not |\bool_if:NT|!
-%    \begin{macrocode}
-        \bool_if:NF \l_tmpa_bool
+        \seq_if_in:NnF \g_@@_notes_in_caption_seq { { #1 } { #2 } }
           { \@@_error:n { Identical~notes~in~caption } }
       }
       {
 %    \end{macrocode}
 % In the following code, we are in the first composition of the caption or at
-% the first |\tabularnote| of the second composition. We have
-% to see whether the text of our tabular note is among the texts of the
-% tabularnotes stored in |\g_@@_notes_in_caption_seq|. For that, we will loop on 
-% |\g_@@_notes_in_caption_seq| and we will raise |\l_tmpa_bool| if the text is found.
+% the first |\tabularnote| of the second composition. 
 %    \begin{macrocode}
-        \bool_set_false:N \l_tmpa_bool
-        \seq_map_inline:Nn \g_@@_notes_in_caption_seq
-          { \@@_if_eq_two_three:nnn ##1 { #2 } }
-        \bool_if:NTF \l_tmpa_bool
+        \seq_if_in:NnTF \g_@@_notes_in_caption_seq { { #1 } { #2 } }
           {
 %    \end{macrocode}
-% Now, we known that are in the second composition of the caption since we are
+% Now, we know that are in the second composition of the caption since we are
 % reading a tabular note which has yet been read. Now, the value of
 % |\g_@@_notes_caption_int| won't change anymore: it's the number of uses
 % \emph{without optional argument} of the command |\tabularnote| in the caption.
@@ -1884,16 +1876,6 @@ version 2005/12/01 or later.
   }
 %    \end{macrocode}
 %      
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_if_eq_two_three:nnn #1 #2 #3
-  { 
-    \tl_if_eq:nnT { #2 } { #3 } 
-      { 
-        \bool_set_true:N \l_tmpa_bool 
-        \seq_map_break: 
-      } 
-  }
-%    \end{macrocode}
 %
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_count_novalue_first:nn #1 #2 
@@ -9218,7 +9200,8 @@ version 2005/12/01 or later.
 %
 % In the |\CodeAfter|, the command |\@@_line:nn| will be linked to |\line|. This
 % command takes two arguments which are the specifications of two cells in the
-% array (in the format $i$-$j$) and draws a dotted line between these cells. 
+% array (in the format $i$-$j$) and draws a dotted line between these cells. In
+% fact, if also works with names of blocks.
 % 
 % \medskip
 % First, we write a command with the following behaviour:
@@ -9284,7 +9267,10 @@ version 2005/12/01 or later.
       { 
         \@@_error:nnn { unknown~cell~for~line~in~CodeAfter } { #1 } { #2 }
       } 
-      { \@@_draw_line_ii:nn { #1 } { #2 } }
+%    \end{macrocode}
+% The test of |measuring@| is a security (cf. question 686649 on TeX StackExchange). 
+%    \begin{macrocode}
+      { \legacy_if:nF { measuring@ } { \@@_draw_line_ii:nn { #1 } { #2 } } }
   }
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
index 6cc99d6835..923fd4f553 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index fcc05694fd..d7c7d18c98 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 1b5bf2b9df..b27ce64a4e 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -1808,7 +1808,10 @@ l'extension \pkg{xcolor} ;
     rowcolor}, etc.)}
 \colorbox{yellow!50}{\textbf{Nouveau 6.18}}
 
-une spécification d'opacité selon la forme \texttt{opacity = \textsl{valeur}}.
+une spécification d'opacité selon la forme \texttt{opacity =
+  \textsl{valeur}}.\footnote{Attention : cette fonctionnalité génère des instructions de
+  transparence dans le \textsc{pdf} résultant et certains lecteurs de
+  \textsc{pdf} n'acceptent pas la transparence.}
 \end{itemize}
 
 
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 474dac2ee0..9f3a9dfb70 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index 6cf322afa9..f09d282e10 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -1755,7 +1755,9 @@ by a comma)
 the extension \pkg{xcolor};
 \item \index{opacity (key of commands such as\newline \texttt{\textbackslash rowcolor}, etc.)}
 \colorbox{yellow!50}{\textbf{New 6.18}}\par\nobreak
-a specification of opacity f the form \texttt{opacity = \textsl{value}}.
+a specification of opacity of the form \texttt{opacity =
+  \textsl{value}}.\footnote{Caution : that feature creates instructions of
+  transparency in the \textsc{pdf} and some \textsc{pdr} don't support such instructions.}
 \end{itemize}
 
 \bigskip
diff --git a/macros/latex/contrib/oststud/hsrstud-classes.pdf b/macros/latex/contrib/oststud/hsrstud-classes.pdf
index 29590a39a7..8fc79d86d6 100644
--- a/macros/latex/contrib/oststud/hsrstud-classes.pdf
+++ b/macros/latex/contrib/oststud/hsrstud-classes.pdf
diff --git a/macros/latex/contrib/oststud/hsrstud.pdf b/macros/latex/contrib/oststud/hsrstud.pdf
index cf1ad1e27f..0f3a59381e 100644
--- a/macros/latex/contrib/oststud/hsrstud.pdf
+++ b/macros/latex/contrib/oststud/hsrstud.pdf
diff --git a/macros/latex/contrib/oststud/oststud.dtx b/macros/latex/contrib/oststud/oststud.dtx
index 35539e7b19..c9aadcfbb8 100644
--- a/macros/latex/contrib/oststud/oststud.dtx
+++ b/macros/latex/contrib/oststud/oststud.dtx
@@ -19,7 +19,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{oststud}
 %<*package>
-    [2023/04/18 v0.3 OST Student's package]
+    [2023/05/20 v0.4 OST Student's package]
 %</package>
 %
 %<*driver>
@@ -27,6 +27,7 @@
 
 \usepackage{oststud}
 \usepackage{enumitem}
+\usepackage{esint}
 \usepackage{tikz}
 \usepackage{framed}
 \usepackage[
@@ -50,6 +51,7 @@
 % \changes{v0.1}{2022/11/18}{Initial version}
 % \changes{v0.2}{2022/11/22}{Port features of \texttt{hsrstud}}
 % \changes{v0.3}{2023/04/18}{Cleanup for CTAN upload}
+% \changes{v0.4}{2023/05/20}{Fix probability operators and improve documentation}
 %
 % \GetFileInfo{oststud.dtx}
 %
@@ -87,8 +89,12 @@
 %        derivatives. Instead the symbols \(\vec{\nabla}, \vec{\nabla}\dotp,
 %         \vec{\nabla}\crossp, \nabla^2, \vec{\nabla}^2\) are be replaced with
 %         grad, div, curl and div grad.
-%    \item[|bfemph|] \textit{Work in progress.}
-%    \item[|bbprobability|] \textit{Work in progress.}
+%    \item[|bfemph|] Change the behaviour of |\emph| to use a bold font for
+%        emphasis (instead of italics). This option cannot be used together
+%        with the |dontrenew| option.
+%    \item[|bbprobability|] Use blackboard symbols $\mathbb{P}$, $\mathbb{E}$
+%        and $\mathbb{V}$ instead of Pr, E and Var for the probability,
+%        expectation and variance respectively.
 %    \item[|scrtransforms|] \textit{Work in progress.}
 % \end{description}
 %
@@ -106,6 +112,9 @@
 % arrow ($\oldvec{u}$) is replaced by bold and the arrow notation saved in
 % |\oldvec|. In vector calculus it is common to denote unit vectors by putting
 % a hat, so there is a macro |\uvec| that does just that:
+% ^^A \begin{leftbar}
+% ^^A |\uvec{u} = \vec{u}/u|
+% ^^A \end{leftbar}
 % \[
 %   \uvec{u} = \vec{u}/u.
 % \]
@@ -115,6 +124,9 @@
 % To differentiate the dot and cross products (between vectors) from normal
 % product between scalars ($a \cdot b$ and $a \times b$), the macros |\dotp|
 % and |\crossp| provide a bold variant:
+% \begin{leftbar}
+% |\vec{u} \dotp \vec{v},        \vec{u} \crossp \vec{v}|
+% \end{leftbar}
 % \[
 %   \vec{u} \dotp \vec{v}, \qquad
 %   \vec{u} \crossp \vec{v}.
@@ -133,6 +145,9 @@
 % divergence and the symbol $\divsymb$ is saved in |\divsymb|. For a scalar
 % field $\phi$ or a vector field $\vec{F}$ the notation (in order) of the
 % gradient, divergence and curl appear as follows:
+% \begin{leftbar}
+% |\grad \phi,    \div \vec{F},    \curl \vec{F}|
+% \end{leftbar}
 % \[
 %   \grad \phi, \quad
 %   \div \vec{F}, \quad
@@ -143,6 +158,9 @@
 % \DescribeMacro{\vlaplacian}
 % Continuing with the (ab)use of the ``Nabla'' or ``Del'' notation, the
 % there is a macro |\laplacian| for the Laplacian operator
+% \begin{leftbar}
+% |\laplacian \equiv \div \grad \equiv \sum_i \partial^2_i|
+% \end{leftbar}
 % \[
 %   \laplacian \equiv \div \grad \equiv \sum_i \partial^2_i.
 % \]
@@ -191,9 +209,15 @@
 % \DescribeMacro{\tr}
 % This package also provides a macro for the trace of a matrix.
 %
-% \subsection{Complex Numbers}
+% \subsection{Mathematical Programming}
 %
+% \DescribeMacro{\argmin}
+% \DescribeMacro{\argmax}
 % ^^A TODO: write section
+% \textit{Work in progress.}
+%
+% \subsection{Complex Numbers}
+%
 % \DescribeMacro{\Re}
 % \DescribeMacro{\Im}
 % AMS maths's default notation for the real and imaginary parts of a complex
@@ -206,17 +230,76 @@
 %
 % \subsection{Probability Operators}
 %
-% ^^A TODO: write section
-% \textit{Work in progress.}
+% \DescribeMacro{\Pr}
+% \DescribeMacro{\E}
+% \DescribeMacro{\Var}
+% Since according to quantum mechanics it seems that ultimately the universe
+% can only be described using probabilities there are the operators |\Pr|, |\E|
+% and |\Var| for the probability, expectation and variance respectively. If the
+% |dontrenew| option is set, the probability is defined in the csname |\P|.
+%
+% All three operators take an argument \marg{expression} which is automatically
+% surrounded using curly braces. If the expression contains multiple random
+% variables, to disambiguate with respect to which variable the operation is
+% being taken it is possible to specify an optional argument \oarg{rv}. An
+% example:
+% \begin{leftbar}
+% |\E[x]{g(x)} = \int_\mathcal{X} g(\bar{x}) p_x(\bar{x}) \, d\bar{x}|
+% \end{leftbar}
+% \[
+%   \E[x]{g(x)} = \int_\mathcal{X} g(\bar{x}) p_x(\bar{x}) \, d\bar{x}.
+% \]
+%
+% Because some people like to use the blackboard font for the probability
+% operators (such as in the machine learning community), there is an option
+% |bbprobability| that changes the look of the three operators to $\mathbb{P}$,
+% $\mathbb{E}$ and $\mathbb{V}$.
 %
 % \subsection{Transformation Operators}
 %
-% ^^A TODO: write section
-% \textit{Work in progress.}
+% \DescribeMacro{\corresponds}
+% \DescribeMacro{\rcorresponds}
+% When working with transformations it is common to use the ``correspondence
+% symbol'' show below for example with the Laplace transformation:
+% \begin{leftbar}
+% |\laplace\{f(t)\} = F(s) \corresponds f(t) \rcorresponds F(s)|
+% \end{leftbar}
 % \[
 %   \laplace\{f(t)\} = F(s) \corresponds f(t) \rcorresponds F(s)
 % \]
 %
+% \DescribeMacro{\fourier}
+% \DescribeMacro{\ifourier}
+% \DescribeMacro{\laplace}
+% \DescribeMacro{\ilaplace}
+% \DescribeMacro{\ztransf}
+% \DescribeMacro{\iztransf}
+% \DescribeMacro{\hilbert}
+% As shown in the example above the for the Laplace transform operator symbol
+% there is a macro |\laplace|. Similar operators are also defined for other
+% transformations and their inverses. Here is their usual definition:
+% \begin{align*}
+% \fourier\left\{f(t)\right\}(\omega)
+%   &= \frac{1}{\sqrt{2\pi}} \int_\mathbb{R} f(t) e^{-i\omega t} \, dt, &
+% \ifourier\left\{F(\omega)\right\}(t)
+%   &= \frac{1}{\sqrt{2\pi}} \int_\mathbb{R} F(\omega) e^{i\omega t} \, d\omega, \\
+% \laplace\left\{f(t)\right\}(s)
+%   &= \int_\mathbb{R^+} f(t) e^{-st} \, dt, &
+% \ilaplace\left\{F(s)\right\}(t)
+%   &= \frac{1}{2\pi i}\int_{\gamma + i\mathbb{R}} F(s) e^{st} \, ds, \\
+% \ztransf \left\{f_k\right\}(z) 
+%   &= \sum_{k \in \mathbb{Z}^+} f_k z^{-k}, &
+% \iztransf \left\{F(z)\right\}(k)
+%   &= \frac{1}{2\pi i} \ointctrclockwise_C F(z) z^{k-1} \, dz, \\
+% \hilbert \left\{ f(t) \right\}(\tau)
+%   &= \mathrm{P.V.} \frac{1}{\pi} \int_\mathbb{R} \frac{f(t)}{\tau - t} \, dt,
+% \end{align*}
+% in order they are the Fourier transform (|\fourier|, |\ifourier|), the
+% Laplace transform (|\laplace|, |\ilaplace|), the Z-transform (|\ztransf|,
+% |\iztransf|), and the Hilbert transform (|\hilbert|). The Hilbert has no
+% inverse since $-\hilbert \hilbert f(t) = f(t)$, tough of course one could
+% write |\hilbert^{-1}| to get $\hilbert^{-1}$.
+%
 % \subsection{References}
 %
 % ^^A TODO: write section
@@ -460,11 +543,11 @@
 % Expectation of a random variable.
 %    \begin{macrocode}
 \ifost@bbprobability
-    \DeclareMathOperator{\ost@expectation}{\mathbb{E}}
+    \DeclareMathOperator*{\ost@expectation}{\mathbb{E}}
 \else
-    \DeclareMathOperator{\ost@expectation}{E}
+    \DeclareMathOperator*{\ost@expectation}{E}
 \fi
-\newcommand{\E}[1]{\ost@expectation\left\{#1\right\}}
+\newcommand*{\E}[2][]{\ost@expectation_{#1}\left\{#2\right\}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -472,11 +555,11 @@
 % Variance of a random variable.
 %    \begin{macrocode}
 \ifost@bbprobability
-    \DeclareMathOperator{\ost@variance}{\mathbb{V}}
+    \DeclareMathOperator*{\ost@variance}{\mathbb{V}}
 \else
-    \DeclareMathOperator{\ost@variance}{Var}
+    \DeclareMathOperator*{\ost@variance}{Var}
 \fi
-\newcommand{\Var}[1]{\ost@variance\left\{#1\right\}}
+\newcommand*{\Var}[2][]{\ost@variance_{#1}\left\{#2\right\}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -484,14 +567,14 @@
 % Probability operator.
 %    \begin{macrocode}
 \ifost@bbprobability
-    \DeclareMathOperator{\ost@probability}{\mathbb{P}}
+    \DeclareMathOperator*{\ost@probability}{\mathbb{P}}
 \else
-    \DeclareMathOperator{\ost@probability}{Pr}
+    \DeclareMathOperator*{\ost@probability}{Pr}
 \fi
 \ifost@dontrenew
-    \newcommand{\P}[1]{\ost@probability\left\{#1\right\}}
+    \newcommand*{\P}[2][]{\ost@probabiliy_{#1}\left\{#2\right\}}
 \else
-    \renewcommand{\Pr}[1]{\ost@probability\left\{#1\right\}}
+    \renewcommand*{\P}[2][]{\ost@probabiliy_{#1}\left\{#2\right\}}
 \fi
 %    \end{macrocode}
 % \end{macro}
diff --git a/macros/latex/contrib/oststud/oststud.pdf b/macros/latex/contrib/oststud/oststud.pdf
index 74abd99be0..1e0148e24b 100644
--- a/macros/latex/contrib/oststud/oststud.pdf
+++ b/macros/latex/contrib/oststud/oststud.pdf
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 54764781fe..4f996a6bea 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -39,11 +39,13 @@ $mirrors = {
       'https://ctan.yazd.ac.ir/' => 1,
     },
     'Japan' => {
+      'http://ring.airnet.ne.jp/archives/text/CTAN/' => 1,
       'https://ftp.jaist.ac.jp/pub/CTAN/' => 1,
       'https://ftp.kddilabs.jp/CTAN/' => 1,
       'https://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1,
     },
     'Korea' => {
+      'http://ftp.ktug.org/tex-archive/' => 1,
       'https://cran.asia/tex/' => 1,
       'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
       'https://lab.uklee.pe.kr/tex-archive/' => 1,
@@ -68,18 +70,22 @@ $mirrors = {
       'https://mirror.datacenter.by/pub/mirrors/CTAN/' => 1,
     },
     'Czech Republic' => {
+      'http://ftp.cvut.cz/tex-archive/' => 1,
       'https://mirrors.nic.cz/tex-archive/' => 1,
     },
+    'Denmark' => {
+      'https://mirrors.dotsrc.org/ctan/' => 1,
+    },
     'Finland' => {
       'https://www.nic.funet.fi/pub/TeX/CTAN/' => 1,
       'https://www.texlive.info/CTAN/' => 1,
     },
     'France' => {
-      'https://ctan.crest.fr/tex-archive/' => 1,
       'https://ctan.gutenberg-asso.fr/' => 1,
       'https://ctan.mines-albi.fr/' => 1,
       'https://ctan.tetaneutral.net/' => 1,
-      'https://mirror.ibcp.fr/pub/CTAN/' => 1,
+      'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
+      'https://mirrors.ircam.fr/pub/CTAN/' => 1,
       'https://texlive.mycozy.space/' => 1,
     },
     'Germany' => {
@@ -104,6 +110,10 @@ $mirrors = {
       'https://mirror.physik.tu-berlin.de/pub/CTAN/' => 1,
       'https://packages.oth-regensburg.de/ctan/' => 1,
     },
+    'Greece' => {
+      'http://ftp.ntua.gr/mirror/ctan/' => 1,
+      'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
+    },
     'Hungary' => {
       'https://mirror.szerverem.hu/ctan/' => 1,
     },
@@ -143,7 +153,6 @@ $mirrors = {
       'https://ctan.ijs.si/tex-archive/' => 1,
     },
     'Spain' => {
-      'https://ctan.fisiquimicamente.com/' => 1,
       'https://ctan.javinator9889.com/' => 1,
     },
     'Sweden' => {
@@ -180,6 +189,7 @@ $mirrors = {
       'https://ctan.math.washington.edu/tex-archive/' => 1,
       'https://ctan.mirrors.hoobly.com/' => 1,
       'https://mirror.las.iastate.edu/tex-archive/' => 1,
+      'https://mirror.math.princeton.edu/pub/CTAN/' => 1,
       'https://mirror.mwt.me/ctan/' => 1,
       'https://mirror2.sandyriver.net/pub/ctan/' => 1,
       'https://mirrors.mit.edu/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 31997a251b..5c92e5cd62 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2023
-depend revision/67208
+depend revision/67219
 
 name 00texlive.image
 category TLCore
@@ -4747,7 +4747,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 67203
+revision 67210
 shortdesc TeX Live standalone installer package
 longdesc This package defines the files to go into the installer
 longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -38819,7 +38819,7 @@ catalogue-version 1.7
 
 name biblatex-gb7714-2015
 category Package
-revision 66929
+revision 67214
 shortdesc A BibLaTeX implementation of the GBT7714-2015 bibliography style for Chinese users
 relocated 1
 longdesc This package provides an implementation of the GBT7714-2015
@@ -38827,11 +38827,11 @@ longdesc bibliography style. This implementation follows the
 longdesc GBT7714-2015 standard and can be used by simply loading
 longdesc BibLaTeX with the appropriate option. A demonstration database
 longdesc is provided to show how to format input for the style.
-containersize 51792
-containerchecksum e2463dd58d062e77626b42ca5fe45759a661a82f133a5156f2cbf85a096fdc7ecaf7d381211c839c45790114e212ec805070206cb7c6daac1645a4c8986bc240
-doccontainersize 1405872
-doccontainerchecksum 37ce59f58710eac9bbbc48988ccbab510628b2e1e5081692dd386d24c9fab21596892a6ff7b4ff0281694d8ef5fed58b27d5daaa449bcd1d169dc53e0efc80e1
-docfiles size=544
+containersize 52768
+containerchecksum e6e72f77da052b34781c81e451bcf381f4d1049fa634e50db666e3304800a30ffef1a7af47be7e0b02941b944e0f10270bd849dbbf81adbcb1360d84e993095c
+doccontainersize 1419940
+doccontainerchecksum 9900de65168b942bed2991ae52ed9d21e77a76d16be607b0736481e443a339bf1a2e137ea975ed7029a016457a5ca4db3a307008a5001251acba6e24caba6537
+docfiles size=549
  RELOC/doc/latex/biblatex-gb7714-2015/README.md details="Readme"
  RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
  RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf details="Package documentation (Chinese)" language="zh"
@@ -38839,7 +38839,7 @@ docfiles size=544
  RELOC/doc/latex/biblatex-gb7714-2015/example.bib
  RELOC/doc/latex/biblatex-gb7714-2015/gb7714texttobib.pl
  RELOC/doc/latex/biblatex-gb7714-2015/makeall.py
-runfiles size=218
+runfiles size=220
  RELOC/tex/latex/biblatex-gb7714-2015/chinese-css.bbx
  RELOC/tex/latex/biblatex-gb7714-2015/chinese-css.cbx
  RELOC/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx
@@ -38873,7 +38873,7 @@ catalogue-contact-repository https://github.com/hushidong/biblatex-gb7714-2015
 catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015
 catalogue-license lppl1.3c
 catalogue-topics biblatex chinese
-catalogue-version 1.1m
+catalogue-version 1.1n
 
 name biblatex-german-legal
 category Package
@@ -102969,18 +102969,18 @@ catalogue-version 0.2b
 
 name dynkin-diagrams
 category Package
-revision 67146
+revision 67211
 shortdesc Draw Dynkin, Coxeter, and Satake diagrams using TikZ
 relocated 1
 longdesc Draws Dynkin, Coxeter, and Satake diagrams in LaTeX documents,
 longdesc using the TikZ package. The package requires amsmath, amssymb,
 longdesc etoolbox, expl3, mathtools, pgfkeys, pgfopts, TikZ, xparse, and
 longdesc xstring.
-containersize 20636
-containerchecksum 31ac29084763439803f4e9c24b1eb4e25d4c2f6680efbe4787901dd8c9fe6e2b980ae679d03c9db8530df0f0680d2080317b7990353b8086c1e63add0e5fd1a6
-doccontainersize 889072
-doccontainerchecksum d0ba14f5085eaa0a45dc5c3e964ac96ab83390dc484825288b97b651f4eb46ba106fd46547723d21006b1a7d9f026dc4c43516d698934a3d507e945915a68619
-docfiles size=241
+containersize 20732
+containerchecksum a899e36a2b0db415316ddafd33e765ce03e81766b50471ad056b953ff778b9c14a2ce65a160d9e13a2e41213aefe20a25bc70becff3d9b9a530608a6de16eba3
+doccontainersize 893592
+doccontainerchecksum ae0c774b00c37a07331eeb728fe5000ecb508631ad3d5a3965b1cacd4c41542d9f04344ac230395c29bd0511e2bb68107ef825f6a869c3d23151dc6b8c9b3327
+docfiles size=242
  RELOC/doc/latex/dynkin-diagrams/README details="Readme"
  RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.bib
  RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf details="Package documentation"
@@ -102990,7 +102990,7 @@ runfiles size=38
 catalogue-ctan /graphics/pgf/contrib/dynkin-diagrams
 catalogue-license lppl1.3c
 catalogue-topics graphics diagram pgf-tikz expl3
-catalogue-version 3.14159265358979323
+catalogue-version 3.141592653589793238
 
 name dyntree
 category Package
@@ -171512,7 +171512,7 @@ catalogue-topics macro-supp layout latex3 pre-release
 
 name l3kernel
 category Package
-revision 67134
+revision 67219
 shortdesc LaTeX3 programming conventions
 relocated 1
 longdesc The l3kernel bundle provides an implementation of the LaTeX3
@@ -171522,11 +171522,11 @@ longdesc LaTeX3 kernel and other future code are built: it is an API for
 longdesc TeX programmers. The packages are set up so that the LaTeX3
 longdesc conventions can be used with regular LaTeX2e packages.
 depend l3backend
-containersize 172072
-containerchecksum 8d281c8a144af11ca396aa5bf20edb077b3f26ed3b3a894d08d443bf60c8a3fde0e7803d4dab4d5de4e672fcf4c6aa86531738ecf42763874d85e4a6b1053cfc
-doccontainersize 11843748
-doccontainerchecksum e52c27e95baaba936f1805e44442c9b25a8a050d1d6ab95c02ec7d87aabcf572879270a0cbad1e1f93fdd319b9ac4f3ccba1d8a2ac969a51b4c7e124dcf6151d
-docfiles size=3378
+containersize 172608
+containerchecksum 61d01ad0010065fc3e70873397907f88a3199f3f3dc904c4b3c79d2a6ccb02584256878fee779f755259904678aa4aacf68b85a8fcc3af6f628323f4c1caa19b
+doccontainersize 11889472
+doccontainerchecksum f21622e02d931f525d33af33986718c439ef97d01506cad994b36ba85a480aba041a9016291c31b9b88a4e67c2ee0bd26b2338dc9a0401607b7173b5985254db
+docfiles size=3389
  RELOC/doc/latex/l3kernel/CHANGELOG.md
  RELOC/doc/latex/l3kernel/README.md details="Readme"
  RELOC/doc/latex/l3kernel/expl3.pdf details="The LaTeX3 Programming Language"
@@ -171573,9 +171573,9 @@ docfiles size=3378
  RELOC/doc/latex/l3kernel/source3.pdf
  RELOC/doc/latex/l3kernel/source3.tex
  RELOC/doc/latex/l3kernel/source3body.tex
-srccontainersize 591908
-srccontainerchecksum 880015946c8775c802b09909018e6e7619ca9f164239059b9f65be35ac770285ff0bf12b7501345000a762f1b23f77fa4de9b6b942472f176039d13d88ec0d38
-srcfiles size=910
+srccontainersize 595984
+srccontainerchecksum b7293a527a0f83d4509a77695e80a61897d567d186352ec9e20a832ea044c1e8f62263191c0ca3eacf6249db9014dcbeb849766e3d39fd004b58124ea3decbae
+srcfiles size=916
  RELOC/source/latex/l3kernel/expl3.dtx
  RELOC/source/latex/l3kernel/l3.ins
  RELOC/source/latex/l3kernel/l3basics.dtx
@@ -171634,7 +171634,7 @@ srcfiles size=910
  RELOC/source/latex/l3kernel/l3tl.dtx
  RELOC/source/latex/l3kernel/l3token.dtx
  RELOC/source/latex/l3kernel/l3unicode.dtx
-runfiles size=350
+runfiles size=351
  RELOC/tex/latex/l3kernel/expl3-code.tex
  RELOC/tex/latex/l3kernel/expl3-generic.tex
  RELOC/tex/latex/l3kernel/expl3.ltx
@@ -173000,17 +173000,17 @@ catalogue-version 2022-11-01 PL1
 
 name latex-amsmath-dev
 category Package
-revision 64899
+revision 67218
 shortdesc Development pre-release of the LaTeX amsmath bundle
 relocated 1
 longdesc This is a pre-release version of the standard LaTeX amsmath
 longdesc bundle. It accompanies the pre-testing kernel code
 longdesc (latex-base-dev), and is intended for testing by knowledgeable
 longdesc users.
-containersize 31024
-containerchecksum 54d16b5357800dfdeed39ea71e5c98bbe8ff88c4f01bf9781be181d47854110bd5e9f50a70b512963e4034d5b984e5ab898f61412b3d5b183c3799a908512e64
-doccontainersize 2420644
-doccontainerchecksum e1d3a8c5f15962c3727dab5d9cf6aff999e817e56ec950b3a49adc762318a895cbfe411e27795957831b18f8b19ade00b40ea9c72e0e112ed41540556eb179f0
+containersize 31040
+containerchecksum 8d8ef0feed458d68ab325cf9e87c68084c386d0b08099ffcf0883c38fc3fc04d75bc21c223f15c6693efee1048ce9e65ecddd454f833cf78f030ecab972af2de
+doccontainersize 2420832
+doccontainerchecksum 3985340d3e4ddfa09b409e88eb3b1c761f7e02adcaa6858ab58e8fe67367ec8931be8a6b6ab9b2bd98ec9f7c7c316e7e6060f52bcc1fc5dbb3a9046f56d24678
 docfiles size=717
  RELOC/doc/latex-dev/amsmath/README.md details="Readme"
  RELOC/doc/latex-dev/amsmath/ams-external.txt
@@ -173033,8 +173033,8 @@ docfiles size=717
  RELOC/doc/latex-dev/amsmath/technote.tex
  RELOC/doc/latex-dev/amsmath/testmath.pdf details="Examples paper" language="en"
  RELOC/doc/latex-dev/amsmath/testmath.tex
-srccontainersize 66328
-srccontainerchecksum 2d1cb38cf290f4fbcf7cd32f2befbb399a4f92a89396ce312f4274f05ceb72b702c0908b1f7877fcc346e4c78499af1028edbb6723b57d3ca4a31ea30d68fb76
+srccontainersize 66360
+srccontainerchecksum 932c9243ffc11b665e9af51431a6df8376550c594117ddd86f48dc2e5cc15ea37a1b92e0f33f122cc560f40e77abff45ffbea3b6fb86ddfe106eb5fd7b7c7bd6
 srcfiles size=82
  RELOC/source/latex-dev/amsmath/amsbsy.dtx
  RELOC/source/latex-dev/amsmath/amsbsy.ins
@@ -173063,11 +173063,11 @@ runfiles size=70
 catalogue-ctan /macros/latex-dev/required/amsmath
 catalogue-license lppl1.3c
 catalogue-topics maths latex-devel
-catalogue-version 2023-05-01 pre-release 0
+catalogue-version 2023-06-01 pre-release 3
 
 name latex-base-dev
 category Package
-revision 66513
+revision 67218
 shortdesc Development pre-release of the LaTeX kernel
 relocated 1
 longdesc This package provides a testing release for upcoming LaTeX2e
@@ -173077,11 +173077,11 @@ longdesc users is required by adding these changes to the release LaTeX
 longdesc kernel. Typically, the code here will be used by a TeX system
 longdesc to create dedicated formats, for example pdflatex-dev, which
 longdesc can then be used explicitly for testing.
-containersize 229944
-containerchecksum 1b7c2780dcf6c7d3d0356c0ded016fc031bc5f18f20a426e8b5faf3d63825ccb8cc28893f401a1d2f658c2091b14c627c955c8256c7f12f6c6a1310d078659a6
-doccontainersize 31529372
-doccontainerchecksum 6f0fa65698f7e44b8c2585bff281a2834ece8d9df6aec188760307d4f32c7e61550ceaac2c3120e0515a5a612c4236c873f5510163c5d067645e26bea93f0db9
-docfiles size=9955
+containersize 234772
+containerchecksum 0d57a87780358df41932cd2306c40777188e46cda08c79a51d0c78d41d78e5562f15481cde67f190f958ddbec5c1962b27e8f32a80e0e981310c15e82c309afb
+doccontainersize 32794552
+doccontainerchecksum 324c9feba63feeecde4eddebb9688baf20c9f7e1b54bc9d6d4ebf4e777db2d045b93d3d47701887359d810b054db307f34f8622b6ec9887fff328d9e0a4f4943
+docfiles size=10285
  RELOC/doc/latex-dev/base/README.md details="Readme"
  RELOC/doc/latex-dev/base/alltt.pdf
  RELOC/doc/latex-dev/base/bugs.txt
@@ -173090,6 +173090,8 @@ docfiles size=9955
  RELOC/doc/latex-dev/base/changes.old.txt
  RELOC/doc/latex-dev/base/changes.txt
  RELOC/doc/latex-dev/base/classes.pdf
+ RELOC/doc/latex-dev/base/clsguide-historic.pdf
+ RELOC/doc/latex-dev/base/clsguide-historic.tex
  RELOC/doc/latex-dev/base/clsguide.pdf details="Class and package programming guide"
  RELOC/doc/latex-dev/base/clsguide.tex
  RELOC/doc/latex-dev/base/cmfonts.pdf
@@ -173240,6 +173242,8 @@ docfiles size=9955
  RELOC/doc/latex-dev/base/syntonly.pdf
  RELOC/doc/latex-dev/base/tlc2.err
  RELOC/doc/latex-dev/base/tlc2.pdf
+ RELOC/doc/latex-dev/base/tlc3.err
+ RELOC/doc/latex-dev/base/tlc3.pdf
  RELOC/doc/latex-dev/base/tulm.pdf
  RELOC/doc/latex-dev/base/usrguide-historic.pdf details="LaTeX for authors -- historic version"
  RELOC/doc/latex-dev/base/usrguide-historic.tex
@@ -173248,9 +173252,9 @@ docfiles size=9955
  RELOC/doc/latex-dev/base/utf8ienc.pdf
  RELOC/doc/latex-dev/base/webcomp.err
  RELOC/doc/latex-dev/base/webcomp.pdf
-srccontainersize 722308
-srccontainerchecksum 4d7b6520586f30ecac21054e6b5cd29899f912f0c87e99cb6835c1c5dc04cb21bf9b7cf4133e88ebbf96a6b85ceac194845c228b537605f7ceba59d5dd77aa7d
-srcfiles size=1058
+srccontainersize 735896
+srccontainerchecksum d048b28535c553cb92feecf2b7c6a1bfdc2afff4375f1b1cc5f076d11554b8cfb854a9b0fb80ec422d6f9cfc14d41d63894231486be1a8b4308e55d709f5f784
+srcfiles size=1086
  RELOC/source/latex-dev/base/alltt.dtx
  RELOC/source/latex-dev/base/alltt.ins
  RELOC/source/latex-dev/base/classes.dtx
@@ -173355,7 +173359,7 @@ srcfiles size=1058
  RELOC/source/latex-dev/base/tulm.ins
  RELOC/source/latex-dev/base/unpack.ins
  RELOC/source/latex-dev/base/utf8ienc.dtx
-runfiles size=645
+runfiles size=664
  RELOC/tex/latex-dev/base/alltt.sty
  RELOC/tex/latex-dev/base/ansinew.def
  RELOC/tex/latex-dev/base/applemac.def
@@ -173525,7 +173529,7 @@ catalogue-also latex-base
 catalogue-ctan /macros/latex-dev/base
 catalogue-license lppl1.3c
 catalogue-topics format class latex-devel
-catalogue-version 2023-06-01 pre-release 2
+catalogue-version 2023-06-01 pre-release 3
 
 name latex-bin
 category TLCore
@@ -175426,18 +175430,18 @@ catalogue-version 1.2
 
 name latex-tools-dev
 category Package
-revision 64899
+revision 67218
 shortdesc Development pre-release of the LaTeX tools bundle
 relocated 1
 longdesc This is a pre-release version of the standard LaTeX tools
 longdesc bundle. It accompanies the pre-testing kernel code
 longdesc (latex-base-dev), and is intended for testing by knowledgeable
 longdesc users.
-containersize 43220
-containerchecksum 04be02d57a30975443b1f56512a066775d4f9531c63f4466e728e6575e7edad0677c5bf7f492c5b9dd2938359b392789845e0df6d4e69d53da465dad7d6783ff
-doccontainersize 5313960
-doccontainerchecksum f784daabae6e1986c0c79115e7600849af75061a314e3410d7521b1e8ea5920d1e382a15c9b18bb6f7d5a585b40a4a835f59e8a1fa6ad62f5f16a5fb6e037e42
-docfiles size=1765
+containersize 43324
+containerchecksum 0edf6c93641bfc8f8b5240d1a79d3193b571ce0179396c6a821c3f42b16e30c6833be35c21cddda23de78b6b8fa51fdff630c02e76eadc4b002a5e0ad1238b23
+doccontainersize 5313592
+doccontainerchecksum 72832025e85d5b046e0a829836c0b0e2be8e45a0cf533f416545ef6a7b6ba7e9a5f798bde7735fb6e62903d93512522d10f8ca8da17b24b541874b6b96f744b0
+docfiles size=1764
  RELOC/doc/latex-dev/tools/README.md details="Readme"
  RELOC/doc/latex-dev/tools/afterpage.pdf
  RELOC/doc/latex-dev/tools/array.pdf
@@ -175469,8 +175473,8 @@ docfiles size=1765
  RELOC/doc/latex-dev/tools/verbatim.pdf
  RELOC/doc/latex-dev/tools/xr.pdf
  RELOC/doc/latex-dev/tools/xspace.pdf
-srccontainersize 228760
-srccontainerchecksum 4f2a940c3cd04762ffac656929c1b01a74feb4a4edbc8387ad2cb673aa2af5e8ce1b3f804c7f46053cc2e38416ee5cd8739e59eb19b8af9796b68651e1f08665
+srccontainersize 229284
+srccontainerchecksum 3585ee22705c5eed6654cf2c68f4c04eb937baffb4dd0d8794fc896d43a119095cb0c7440796142f10b9cb9bffb0f9994c7264799c200d7053717ccc6af214f5
 srcfiles size=270
  RELOC/source/latex-dev/tools/afterpage.dtx
  RELOC/source/latex-dev/tools/afterpage.ins
@@ -175556,7 +175560,7 @@ runfiles size=121
 catalogue-ctan /macros/latex-dev/required/tools
 catalogue-license lppl1.3c
 catalogue-topics collection latex-devel
-catalogue-version 2023-05-01 pre-release 0
+catalogue-version 2023-06-01 pre-release 3
 
 name latex-uni8
 category Package
@@ -189902,7 +189906,7 @@ catalogue-version 1.5
 
 name listlbls
 category Package
-revision 34893
+revision 67215
 shortdesc Creates a list of all labels used throughout a document
 relocated 1
 longdesc The package aims to help a LaTeX author to keep track of all
@@ -189912,28 +189916,26 @@ longdesc to have additional LaTeX runs to get the references right. )
 longdesc This package is based on an answer David Carlisle gave on
 longdesc TeX/Stackexchange in the thread 'List of all labels with
 longdesc hyperlinks'.
-containersize 1908
-containerchecksum b5c2e7e168b07aa288c911dbf5c1fa8b56d2a73d38babf0140b77bbf783334f2da42b2bfa8d951e166f7184345cea26a908d12ff4a07ef89b85a7d7772d645e1
-doccontainersize 74316
-doccontainerchecksum 225837c7a5c80b5a01739c20011f4b4c76b0cdeaf26e3f8f44fcafee3e439a104c6eb1a47660a788b96a3cd63f3e19d1384ecada059380773850c7a4109d3269
-docfiles size=23
- RELOC/doc/latex/listlbls/Makefile
+containersize 1940
+containerchecksum bb0391bd671c306bb34abc336f74e203141fb0b2ae131dc36820e24716ddb5b7a1bfe9650baa5ba4cb4078e6f9d097a9a464aba1022b36f76c3257e25e583979
+doccontainersize 99448
+doccontainerchecksum 773bb3996ee16ca65ef8a91e42e6d1641d42ae50de7fbe4b8324ad9e70d326d0fbca85e245d48bfea137a65f33ffc6e81add6208d239992012ac1851ca12d4a8
+docfiles size=29
  RELOC/doc/latex/listlbls/README details="Readme"
  RELOC/doc/latex/listlbls/README.md
  RELOC/doc/latex/listlbls/README.txt
- RELOC/doc/latex/listlbls/listlbls.hd
  RELOC/doc/latex/listlbls/listlbls.pdf details="Package documentation"
-srccontainersize 5048
-srccontainerchecksum 3b35fa88f640d4f2a13f0cc888a7ab7bb09052ab080454d398f0edc27caa11728152e24bf5184d54aeb1bc86e599aa8a4bbfff6a6efd790e11277f99da2f27e6
-srcfiles size=5
+srccontainersize 5876
+srccontainerchecksum 441fa4a8ac0e618a997078368794800f57e25545134533b81121718bcec912c1c367b193bf7cb3756102ffad4f75497e63c9cef611319aa478fee955c9cea780
+srcfiles size=6
+ RELOC/source/latex/listlbls/Makefile
  RELOC/source/latex/listlbls/listlbls.dtx
- RELOC/source/latex/listlbls/listlbls.ins
-runfiles size=1
+runfiles size=2
  RELOC/tex/latex/listlbls/listlbls.sty
 catalogue-ctan /macros/latex/contrib/listlbls
 catalogue-license lppl1.3
 catalogue-topics label-ref debug-supp
-catalogue-version 1.03
+catalogue-version 1.04
 
 name listliketab
 category Package
@@ -225896,7 +225898,7 @@ catalogue-topics font font-type1 font-decor
 
 name nicematrix
 category Package
-revision 67135
+revision 67216
 shortdesc Improve the typesetting of mathematical matrices with PGF
 relocated 1
 longdesc This package is based on the package array. It creates PGF/TikZ
@@ -225906,21 +225908,21 @@ longdesc matrices. Among the features : continuous dotted lines for the
 longdesc mathematical matrices; exterior rows and columns (so-called
 longdesc border matrices); control of the width of the columns; tools to
 longdesc color rows and columns with a good PDF result; blocks of cells;
-longdesc etc. The package requires and loads l3keys2e, xparse, array,
-longdesc amsmath, pgfcore, and the module shapes of PGF.
-containersize 39356
-containerchecksum 21671a61acde8241e8b1676af7e6fd84e6db3f0976dbce94f77c6b62f32572063abf0624edf249eaf2575cc9d2ea1eeaa172f8bedb3b33fa0b8e2ddf873bb578
-doccontainersize 2058676
-doccontainerchecksum 607804e3ec1c2b1ac81d2d5c7d1201593e9ad98b8b182a3fc7bf620c0ddff9dc009367d63cfd65cd8b14e2ec7bbd6b06366352713829085a9d4f223c18c47129
-docfiles size=625
+longdesc tabular notes; etc. The package requires and loads l3keys2e,
+longdesc array, amsmath, pgfcore, and the module shapes of PGF.
+containersize 39292
+containerchecksum 4bd7878902330119e61e484afc36093a498fd4d12a4f2e2130be49e2dfb5ceb12852b538542eec8dc921e2f203db55845041d0d18efba6533145e809ed60e8bd
+doccontainersize 2076592
+doccontainerchecksum e0932d72566e397644c0adfbc403fcbe4a95ca2d11d5ed0e757c23c84b8fbc29a39a277ee88b0450b3cf2ea56c56b1a78707568e51b4df6d3c4bdbce82a5c033
+docfiles size=629
  RELOC/doc/latex/nicematrix/README.md details="Readme"
  RELOC/doc/latex/nicematrix/nicematrix-code.pdf
  RELOC/doc/latex/nicematrix/nicematrix-french.pdf details="Package documentation in French" language="fr"
  RELOC/doc/latex/nicematrix/nicematrix-french.tex
  RELOC/doc/latex/nicematrix/nicematrix.pdf details="Package documentation"
  RELOC/doc/latex/nicematrix/nicematrix.tex
-srccontainersize 84788
-srccontainerchecksum a7f1e05b4360330426a7ea691bc9d33edb1ecf1731d9f0034e7b25eff97e760253ad5c02a860bb226caf03ac6689703a028b35a154141390ec1bb78132107db6
+srccontainersize 84736
+srccontainerchecksum 68722f5d18b779dae1b12c34f8246fb8363ae3f6f2a9eeb959db4c2a71dc269a5360f5ab44594a48426ec7764ca67ce130be06e8d22d555657009a546aae80b0
 srcfiles size=136
  RELOC/source/latex/nicematrix/nicematrix-code.dtx
  RELOC/source/latex/nicematrix/nicematrix.ins
@@ -225929,7 +225931,7 @@ runfiles size=87
 catalogue-ctan /macros/latex/contrib/nicematrix
 catalogue-license lppl1.3
 catalogue-topics maths matrix pgf-tikz expl3
-catalogue-version 6.19
+catalogue-version 6.19a
 
 name nicetext
 category Package
@@ -239042,7 +239044,7 @@ catalogue-version 1.7
 
 name oststud
 category Package
-revision 66894
+revision 67217
 shortdesc Templates for the student organization at OST FH, Switzerland
 relocated 1
 longdesc This package is made by the student organization at the
@@ -239055,19 +239057,19 @@ longdesc version of the oststud package before the school changed its
 longdesc name in 2021. We would like to keep it for backwards
 longdesc compatibility when compiling old documents that have not been
 longdesc migrated yet.
-containersize 6872
-containerchecksum 16f0cab06b563a5e6f2402c4aca9522707eddcc009a949d1728a97d63342aba8e568b521ac5145ed8cbd954f45b9223d2be67cb8ebe2061d89f1113908b8c4c8
-doccontainersize 354252
-doccontainerchecksum 03b0065af756e474f2ab2e6e6e9e055a8a0b7e4ef49a88ca79e01c1fc39539ece9610ee71477e78559802c6ec39542e1160a6898aaeb291e5edf690ee2ad7c66
-docfiles size=109
+containersize 6892
+containerchecksum 9ffd86c1fddc4667f6d02a9ad91ce0a3e562147dbb8453c474ad5595a77df8ae77a4defca5f6fdec2ea837e37ab23128be1b00d4ec15f20cb0bbc2e591fdf0e6
+doccontainersize 368556
+doccontainerchecksum 700021abdba0ba3484a0f11600564ffd372bd998f889da1cfa26ff505395844b958468675eae6465af4010e417a56df45c2226d6543d1bb6f2331099e08d9ac6
+docfiles size=113
  RELOC/doc/latex/oststud/LICENSE.txt
  RELOC/doc/latex/oststud/README.md details="Readme"
  RELOC/doc/latex/oststud/hsrstud-classes.pdf
  RELOC/doc/latex/oststud/hsrstud.pdf
  RELOC/doc/latex/oststud/oststud.pdf details="Package documentation"
-srccontainersize 14892
-srccontainerchecksum e1a4337313b1c18c375c38e4f7644e1f25d5b89a3e7ac6314f10487dd56e678ca85b782481ba23e9cf81068fdc024ef356a14e14d70257f20a6f47582969c00a
-srcfiles size=17
+srccontainersize 15896
+srccontainerchecksum 5a35d201ffaa677d464e0dd8f2f5a474099505d341ead2e00970be39523199a2e3ddec73da19e7ec329a53cdedad495640dd1385fd6e5d005dca9a5027ee8f90
+srcfiles size=18
  RELOC/source/latex/oststud/Makefile
  RELOC/source/latex/oststud/hsrstud-classes.dtx
  RELOC/source/latex/oststud/hsrstud.dtx
@@ -239084,7 +239086,7 @@ catalogue-contact-repository https://github.com/HSR-Stud/HSRStud-Package
 catalogue-ctan /macros/latex/contrib/oststud
 catalogue-license cc-by-sa-4
 catalogue-topics doc-templ
-catalogue-version 0.3
+catalogue-version 0.4
 
 name oswald
 category Package
@@ -300287,7 +300289,7 @@ catalogue-version 1.0
 
 name tex-nutshell
 category Package
-revision 63336
+revision 67213
 shortdesc A short document about TeX principles
 relocated 1
 longdesc This document is meant for users who are looking for
@@ -300295,18 +300297,18 @@ longdesc information about the basics of TeX. Its main goal is its
 longdesc brevity. The pure TeX features are described, no features
 longdesc provided by macro extensions. Only the last section gives a
 longdesc summary of plain TeX macros.
-containersize 516
-containerchecksum 4eb68fe292ca246efb1398ecae471831147834928338f6f964febcae5ef2833270a5e39d22aa803ab770d3ab21db3d60d4010912ebc79399f029c45ecbeac9fc
-doccontainersize 284232
-doccontainerchecksum cf610ee44e4b4e8a8cfa94aa9cdfe622d12fc7949f62c567e833f5f5affb42a99ef1a0f296fd1f1bccd2594d864f9bf965d89df642dee45346810363e6ccf4c4
-docfiles size=93
+containersize 512
+containerchecksum cb8d343a8b070c6350cc922c74d5dc08ea9f6bc92397e5325591913f5b7ff01704b0c5009a8c8083a47baef64190b6640c51a91216af54b8505654d3105f34b7
+doccontainersize 302628
+doccontainerchecksum 50cf98a9ba348f6814274cdd195a2ff9129474e61e858932f8e8c256f8108f622a088b0bed586c25e199737fbe3aaaa11441d6ebaf29fb0974ca822d662b79e0
+docfiles size=99
  RELOC/doc/plain/tex-nutshell/README details="Readme"
  RELOC/doc/plain/tex-nutshell/tex-nutshell.pdf details="The document itself"
  RELOC/doc/plain/tex-nutshell/tex-nutshell.tex
 catalogue-ctan /info/tex-nutshell
 catalogue-license pd
 catalogue-topics documentation tut-plaintex
-catalogue-version 0.8
+catalogue-version 0.9
 
 name tex-overview
 category Package
@@ -312813,7 +312815,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 67203
+revision 67210
 shortdesc TeX Live infrastructure programs
 longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
 longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -312821,10 +312823,10 @@ depend texlive-scripts.ARCH
 depend texlive.infra
 execute addMap mathpple.map
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 113952
-containerchecksum 7d820184024769f7aedf657b5f75dce6f7ff1a3645e64f927b960d012726b8850fc7bc91e34649d4b74cd185bd292058e014176a25ce1b6bf374b362f0ea4ee1
+containersize 114012
+containerchecksum e301dae7e5327b22621ad1bbf9c6f45d7a3becba46638976b42de925b63024fcb00d68fe9f4c74004b2ba0c3c5f825715e96b0d30b8a7bebac3381447c2d3867
 doccontainersize 426948
-doccontainerchecksum b873e7a1e4acfd2f97b16a0f29c0c2a6ffd801833e0e43c85478d83d3c0daf444f1838179bd7a2caa61d7db860974027d437902ba691aed94a036c373dce25ff
+doccontainerchecksum 21f4471d3431be7e4add678aa941979130bb8d68c40051400bdb38715be7d033c6049fa87a1669fa99eda9be81f839f4c14bad71841dc055430812844422feed
 docfiles size=545
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -319628,14 +319630,14 @@ catalogue-topics pgf-tikz
 
 name tikz3d-fr
 category Package
-revision 66992
+revision 67212
 shortdesc Work with some 3D figures
 relocated 1
 longdesc This is a package for working with some 3D figures.
-containersize 3252
-containerchecksum 447e79c4a4e540ac88846ce2e4133ffd837af895d2102d6876a23f13c57c44ed72bc3b5d5ba505adb61bb7513fb1d7403cd09703089fa18e6773f42e582c86fd
-doccontainersize 593460
-doccontainerchecksum 510e90bd5cd6905604cb52fa4175afde0a25d466f70bb1e5ff654e55504d74092159c15b950c44ffe39992f1508a294d3df23c9a8213d1bc081f146242f93179
+containersize 3332
+containerchecksum e90d89c0c08df39c6189fa40a7fd0295645c8608644ff46719db08e73674d8e4acf49847f61514ed6f1df49513af7f7ad8b35b96931b6dd68b407ecafcde5ce2
+doccontainersize 594228
+doccontainerchecksum 37243821b7510ab7c597cf8c4d4c5ce30c0b36d37988b3a5b04b3d4bdc7731c1ff7941fd1f2701bac10dfc97e9f08c42b7b63f26aade611ede0efad33def5dfe
 docfiles size=156
  RELOC/doc/latex/tikz3d-fr/README.md details="Readme"
  RELOC/doc/latex/tikz3d-fr/tikz3d-fr-doc.pdf details="Package documentation"
@@ -319648,7 +319650,7 @@ catalogue-contact-support https://github.com/cpierquet/tikz3dfr/issues
 catalogue-ctan /graphics/pgf/contrib/tikz3d-fr
 catalogue-license lppl1.3c
 catalogue-topics graphics-3d pgf-tikz
-catalogue-version 0.1.0
+catalogue-version 0.1.1
 
 name tikzbricks
 category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 14e43929d2..5f1e09b289 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-1d9dd0188e51fa0e95907b7d789bb4a3  texlive.tlpdb
+a6e3460b124be2bceee9ee37dd93f6b2  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index b24d4a4d82..5e3dd91252 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-7d6fdaf1afd1f714e2a9ae17dffb43f0c7db50f6a288d5191f52d558fdd910c823b3d378bfa3bb8ab3c1457f90470fb3d7243a2e72df10def9671c76088fd15a  texlive.tlpdb
+e996315b4fbaf7becb1dd4fb65d75ba942d6b8b421fb98b81278f04a52996bf4760a18d2fd7b42ea0c6615907d504262fd2f1add4818530ee8d9534df2d45f19  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 751db06542..425130c25d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmRuoXsACgkQTOGHfhlD
-jHAfQQf/eY7uT2pMkLvbw3c+bb0gURwkawJNLoXo+lwbn7DTQCdpwyYrL13+g9LR
-tC+xqOwbxQIo25ilDEaqC2e2ZcLQqJzBD2PSOWNKGj4CqSgd7CLkPw6JygtdHyho
-RhUdW9R8AxPhO7bbiVkdeKicfNUbdTyRkf/lf+O7DWI3C3joIEunu442TnS6Y9rN
-FAXszynNCNoH5QOoiRGWBAibjL+isMG9/b6DUBukDyIMs/BDhpUEButyYlIX6L75
-6PF3VN+8H9vPLcD3lWMI1kSIP3YuRls3CbW0sL6duEWrmXCZnxNmWpoAcbOfOAC3
-g2cRUNdOxx7rnnwx6y5fMdI1xUDPNw==
-=QcSo
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmRv8wEACgkQTOGHfhlD
+jHCpugf/aSOJPwW+FCkE3+uNbZsWZCPXsCpLf+YyudfAK+nNrfTZVZm4ykclvm6n
+W434G4gWfstYCaMonp1ZZ7UXxm0FsrB670NF8G9hLR+OAuh5Lg4DI5wAws5NkaGs
+h+OAqxR/eNOovTFFFWXvGyFfloK3mx98p2K9sIdpS7rvddiGbYroXcqO4sZlJ2MV
+UWQghiPJ8NnTRC7vT6zrqI3gbeoqmvf/LT3/+Feyhu8FN795GejRcSUY1Vh485CI
+jXqhN1PzyLyfg5bWHQF6BmQIaJjwHMKyr5u3kecUs/VhmxcfG+k1KlhkyIuadW3U
+l9mi9bhKiu9AMV9bfwonKfpTXXaOFA==
+=eLHm
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 510cd5d8c9..5909ebaa60 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/timestamp b/timestamp
index 45c590d3d6..aea2b9a2d2 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
 #   The source CTAN of this site's material:
 dante.ctan.org
 #   The year-month-day-hour-minute of this site's material:
-2023-05-25-02-02
+2023-05-26-02-02