CTAN sync 202206170301

94 files changed, 61 insertions, 27 deletions

diff --git a/macros/latex/base/README.md b/macros/latex/base/README.md
index 436bffdd5e..302fb3d4ad 100644
--- a/macros/latex/base/README.md
+++ b/macros/latex/base/README.md
@@ -1,7 +1,7 @@
 The LaTeX kernel
 ================
 
-Release 2022-06-01
+Release 2022-06-01 patch level 1
 
 Overview
 --------
diff --git a/macros/latex/base/alltt.pdf b/macros/latex/base/alltt.pdf
index 7f53e4ee12..b68240407e 100644
--- a/macros/latex/base/alltt.pdf
+++ b/macros/latex/base/alltt.pdf
diff --git a/macros/latex/base/cfgguide.pdf b/macros/latex/base/cfgguide.pdf
index d018177ecb..3340e6d405 100644
--- a/macros/latex/base/cfgguide.pdf
+++ b/macros/latex/base/cfgguide.pdf
diff --git a/macros/latex/base/changes.txt b/macros/latex/base/changes.txt
index f880f43d67..ce72312d3d 100644
--- a/macros/latex/base/changes.txt
+++ b/macros/latex/base/changes.txt
@@ -10,6 +10,21 @@ are not part of the distribution.
 All changes above are only part of the development branch for the next release.
 ================================================================================
 
+2022-06-16  Joseph Wright <Joseph.Wright@latex-proejct.org>
+
+	* ltkeys.dtx (subsection{Main mechanism})
+	Remove key name but avoid touching key value in \@unusedoptionlist
+
+2022-06-15  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* lthooks.dtx (subsubsection{Disabling and providing hooks}):
+	Ensure that a newly activated generic hook gets its execution code set
+
+2022-06-14  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* ltxdoc.dtx: Delay definitions of \enquote etc in case they get defined in
+	the preamble of existing documents.
+
 #########################
 # 2022-06-01 Release
 #########################
diff --git a/macros/latex/base/classes.pdf b/macros/latex/base/classes.pdf
index 20fbdaf242..7d1b9e8453 100644
--- a/macros/latex/base/classes.pdf
+++ b/macros/latex/base/classes.pdf
diff --git a/macros/latex/base/clsguide.pdf b/macros/latex/base/clsguide.pdf
index 11d0c9e47a..f5f716adf9 100644
--- a/macros/latex/base/clsguide.pdf
+++ b/macros/latex/base/clsguide.pdf
diff --git a/macros/latex/base/cmfonts.pdf b/macros/latex/base/cmfonts.pdf
index 5c25484024..ab94f922d4 100644
--- a/macros/latex/base/cmfonts.pdf
+++ b/macros/latex/base/cmfonts.pdf
diff --git a/macros/latex/base/cyrguide.pdf b/macros/latex/base/cyrguide.pdf
index e9fa336379..f46472597d 100644
--- a/macros/latex/base/cyrguide.pdf
+++ b/macros/latex/base/cyrguide.pdf
diff --git a/macros/latex/base/doc-code.pdf b/macros/latex/base/doc-code.pdf
index 9d52323c41..38d4f82330 100644
--- a/macros/latex/base/doc-code.pdf
+++ b/macros/latex/base/doc-code.pdf
diff --git a/macros/latex/base/doc.pdf b/macros/latex/base/doc.pdf
index c649645b07..6796c27a54 100644
--- a/macros/latex/base/doc.pdf
+++ b/macros/latex/base/doc.pdf
diff --git a/macros/latex/base/docstrip.pdf b/macros/latex/base/docstrip.pdf
index 07457cea0d..47ad57079c 100644
--- a/macros/latex/base/docstrip.pdf
+++ b/macros/latex/base/docstrip.pdf
diff --git a/macros/latex/base/encguide.pdf b/macros/latex/base/encguide.pdf
index fca0d5c611..196ccc9edd 100644
--- a/macros/latex/base/encguide.pdf
+++ b/macros/latex/base/encguide.pdf
diff --git a/macros/latex/base/exscale.pdf b/macros/latex/base/exscale.pdf
index ac3162238a..94ad97b2fc 100644
--- a/macros/latex/base/exscale.pdf
+++ b/macros/latex/base/exscale.pdf
diff --git a/macros/latex/base/fix-cm.pdf b/macros/latex/base/fix-cm.pdf
index ffe0337c9b..8aac40d3bd 100644
--- a/macros/latex/base/fix-cm.pdf
+++ b/macros/latex/base/fix-cm.pdf
diff --git a/macros/latex/base/fntguide.pdf b/macros/latex/base/fntguide.pdf
index 34bae59bea..5e46ecc713 100644
--- a/macros/latex/base/fntguide.pdf
+++ b/macros/latex/base/fntguide.pdf
diff --git a/macros/latex/base/graphpap.pdf b/macros/latex/base/graphpap.pdf
index 2caa28232f..1ed2f69711 100644
--- a/macros/latex/base/graphpap.pdf
+++ b/macros/latex/base/graphpap.pdf
diff --git a/macros/latex/base/ifthen.pdf b/macros/latex/base/ifthen.pdf
index fe7349820d..e0aac52ba3 100644
--- a/macros/latex/base/ifthen.pdf
+++ b/macros/latex/base/ifthen.pdf
diff --git a/macros/latex/base/inputenc.pdf b/macros/latex/base/inputenc.pdf
index 274e06fbc0..5b80585b56 100644
--- a/macros/latex/base/inputenc.pdf
+++ b/macros/latex/base/inputenc.pdf
diff --git a/macros/latex/base/lamport-manual.pdf b/macros/latex/base/lamport-manual.pdf
index a39bb10333..8a7a7cf083 100644
--- a/macros/latex/base/lamport-manual.pdf
+++ b/macros/latex/base/lamport-manual.pdf
diff --git a/macros/latex/base/latexrelease.pdf b/macros/latex/base/latexrelease.pdf
index 8724a65da4..12f09cd026 100644
--- a/macros/latex/base/latexrelease.pdf
+++ b/macros/latex/base/latexrelease.pdf
diff --git a/macros/latex/base/latexsym.pdf b/macros/latex/base/latexsym.pdf
index 91835c6c0a..8ba858063c 100644
--- a/macros/latex/base/latexsym.pdf
+++ b/macros/latex/base/latexsym.pdf
diff --git a/macros/latex/base/lb2.pdf b/macros/latex/base/lb2.pdf
index b192987d57..64053ba56c 100644
--- a/macros/latex/base/lb2.pdf
+++ b/macros/latex/base/lb2.pdf
diff --git a/macros/latex/base/letter.pdf b/macros/latex/base/letter.pdf
index cc9cc990ff..21e1df4f36 100644
--- a/macros/latex/base/letter.pdf
+++ b/macros/latex/base/letter.pdf
diff --git a/macros/latex/base/lgc2.pdf b/macros/latex/base/lgc2.pdf
index 885057e32b..8c0459b7ab 100644
--- a/macros/latex/base/lgc2.pdf
+++ b/macros/latex/base/lgc2.pdf
diff --git a/macros/latex/base/lppl.pdf b/macros/latex/base/lppl.pdf
index 1e9a4ce081..916caca462 100644
--- a/macros/latex/base/lppl.pdf
+++ b/macros/latex/base/lppl.pdf
diff --git a/macros/latex/base/ltcmdhooks-code.pdf b/macros/latex/base/ltcmdhooks-code.pdf
index 70eeb7d4dd..9f11b67c39 100644
--- a/macros/latex/base/ltcmdhooks-code.pdf
+++ b/macros/latex/base/ltcmdhooks-code.pdf
diff --git a/macros/latex/base/ltcmdhooks-doc.pdf b/macros/latex/base/ltcmdhooks-doc.pdf
index 9bb4f81784..3a2d5d871b 100644
--- a/macros/latex/base/ltcmdhooks-doc.pdf
+++ b/macros/latex/base/ltcmdhooks-doc.pdf
diff --git a/macros/latex/base/ltfilehook-code.pdf b/macros/latex/base/ltfilehook-code.pdf
index 1c2731b68b..3e1f2c268c 100644
--- a/macros/latex/base/ltfilehook-code.pdf
+++ b/macros/latex/base/ltfilehook-code.pdf
diff --git a/macros/latex/base/ltfilehook-doc.pdf b/macros/latex/base/ltfilehook-doc.pdf
index b41f835379..36fce9e03a 100644
--- a/macros/latex/base/ltfilehook-doc.pdf
+++ b/macros/latex/base/ltfilehook-doc.pdf
diff --git a/macros/latex/base/lthooks-code.pdf b/macros/latex/base/lthooks-code.pdf
index 244eed91e2..86a0c63692 100644
--- a/macros/latex/base/lthooks-code.pdf
+++ b/macros/latex/base/lthooks-code.pdf
diff --git a/macros/latex/base/lthooks-doc.pdf b/macros/latex/base/lthooks-doc.pdf
index 266cd976ac..cf90a3a98a 100644
--- a/macros/latex/base/lthooks-doc.pdf
+++ b/macros/latex/base/lthooks-doc.pdf
diff --git a/macros/latex/base/lthooks.dtx b/macros/latex/base/lthooks.dtx
index 06a0e8258f..cfa1454775 100644
--- a/macros/latex/base/lthooks.dtx
+++ b/macros/latex/base/lthooks.dtx
@@ -31,8 +31,8 @@
 %%% From File: lthooks.dtx
 %
 %    \begin{macrocode}
-\def\lthooksversion{v1.0u}
-\def\lthooksdate{2022/05/19}
+\def\lthooksversion{v1.0v}
+\def\lthooksdate{2022/06/15}
 %    \end{macrocode}
 %
 %<*driver>
@@ -2649,6 +2649,13 @@
             \@@_make_usable:n {#1}
             \tl_gset:cx { g_@@_#1_reversed_tl }
               { \@@_if_generic_reversed:nT {#1} { - } }
+%    \end{macrocode}
+%    Reflect that we have activated the generic hook and set its
+%    execution code.
+% \changes{v1.0v}{2022/06/15}{Ensure that a newly activated generic hook
+%               gets its execution code set}
+%    \begin{macrocode}
+            \@@_update_hook_code:n {#1}
           }
       }
   }
diff --git a/macros/latex/base/ltkeys.dtx b/macros/latex/base/ltkeys.dtx
index 00c2600289..c6dfa5f6dd 100644
--- a/macros/latex/base/ltkeys.dtx
+++ b/macros/latex/base/ltkeys.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltkeys.dtx}
-             [2022/02/21 v1.0f LaTeX Kernel (Kevyal options)]
+             [2022/06/16 v1.0g LaTeX Kernel (Kevyal options)]
 % \iffalse
 \documentclass{l3doc}
 \GetFileInfo{ltkeys.dtx}
@@ -277,6 +277,9 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_options_class:n}
+% \changes{v1.0g}{2022/06/16}{Better handling of option removal}
+% \begin{macro}{\@@_options_remove:nnn}
+% \changes{v1.0g}{2022/06/16}{New function}
 %   For classes, each option (stripped of any content after |=|)
 %   is checked for existence as a key. If found, the option is added to
 %   the combined list for processing. On the other hand, unused options
@@ -296,18 +299,26 @@
           {
             \clist_map_inline:cn { opt@ \@currname . \@currext }
               {
-                \keys_if_exist:neTF
-                  {#1} { \@@_remove_equals:n {##1} }
-                  { \clist_put_right:Nn \l_@@_options_clist {##1} }
-                  { \clist_put_right:Nn \@unusedoptionlist {##1} }
+                \@@_options_remove:enn
+                  { \@@_remove_equals:n {##1} }
+                  {##1} {#1}
               }
           }
       }
   }
+\cs_new_protected:Npn \@@_options_remove:nnn #1#2#3
+  {
+    \keys_if_exist:nnTF {#3} {#1}
+      { \clist_put_right:Nn \l_@@_options_clist {#2} }
+      { \clist_put_right:Nn \@unusedoptionlist {#1} }
+  }
+\cs_generate_variant:Nn \@@_options_remove:nnn { e }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\@@_options_package:n}
+% \changes{v1.0g}{2022/06/16}{Better handling of option removal}
 %   For global options when processing a package, the tasks are slightly
 %   different from those for a class. The check is the same, but here
 %   there is nothing to do if the option is not applicable. Each valid
@@ -317,11 +328,9 @@
   {
     \clist_map_inline:Nn \@classoptionslist
       {
-        \keys_if_exist:neT {#1} { \@@_remove_equals:n {##1} }
-          {
-            \clist_put_right:Nn \l_@@_options_clist {##1}
-            \clist_remove_all:Nn \@unusedoptionlist {##1}
-          }
+        \@@_options_remove:enn
+          { \@@_remove_equals:n {##1} }
+          {##1} {#1}
       }
   }
 %    \end{macrocode}
diff --git a/macros/latex/base/ltluatex.pdf b/macros/latex/base/ltluatex.pdf
index 613b669f2f..715cccdc7a 100644
--- a/macros/latex/base/ltluatex.pdf
+++ b/macros/latex/base/ltluatex.pdf
diff --git a/macros/latex/base/ltmarks-code.pdf b/macros/latex/base/ltmarks-code.pdf
index 719155ba02..2ebc5271db 100644
--- a/macros/latex/base/ltmarks-code.pdf
+++ b/macros/latex/base/ltmarks-code.pdf
diff --git a/macros/latex/base/ltmarks-doc.pdf b/macros/latex/base/ltmarks-doc.pdf
index b329ad81df..705938d156 100644
--- a/macros/latex/base/ltmarks-doc.pdf
+++ b/macros/latex/base/ltmarks-doc.pdf
diff --git a/macros/latex/base/ltnews.pdf b/macros/latex/base/ltnews.pdf
index a55de7eb1c..20e8dea9a4 100644
--- a/macros/latex/base/ltnews.pdf
+++ b/macros/latex/base/ltnews.pdf
diff --git a/macros/latex/base/ltnews01.pdf b/macros/latex/base/ltnews01.pdf
index ed4420fac7..f77a5b28d9 100644
--- a/macros/latex/base/ltnews01.pdf
+++ b/macros/latex/base/ltnews01.pdf
diff --git a/macros/latex/base/ltnews02.pdf b/macros/latex/base/ltnews02.pdf
index dced90a7bd..0a33f62e06 100644
--- a/macros/latex/base/ltnews02.pdf
+++ b/macros/latex/base/ltnews02.pdf
diff --git a/macros/latex/base/ltnews03.pdf b/macros/latex/base/ltnews03.pdf
index a6f83c70e3..53c96235c7 100644
--- a/macros/latex/base/ltnews03.pdf
+++ b/macros/latex/base/ltnews03.pdf
diff --git a/macros/latex/base/ltnews04.pdf b/macros/latex/base/ltnews04.pdf
index d9eb536b86..5547952ef6 100644
--- a/macros/latex/base/ltnews04.pdf
+++ b/macros/latex/base/ltnews04.pdf
diff --git a/macros/latex/base/ltnews05.pdf b/macros/latex/base/ltnews05.pdf
index b24151feed..ff24fd0a87 100644
--- a/macros/latex/base/ltnews05.pdf
+++ b/macros/latex/base/ltnews05.pdf
diff --git a/macros/latex/base/ltnews06.pdf b/macros/latex/base/ltnews06.pdf
index d6ff0c4ce8..6f78782136 100644
--- a/macros/latex/base/ltnews06.pdf
+++ b/macros/latex/base/ltnews06.pdf
diff --git a/macros/latex/base/ltnews07.pdf b/macros/latex/base/ltnews07.pdf
index 03172d6299..e20380a79b 100644
--- a/macros/latex/base/ltnews07.pdf
+++ b/macros/latex/base/ltnews07.pdf
diff --git a/macros/latex/base/ltnews08.pdf b/macros/latex/base/ltnews08.pdf
index 1500a3b436..30bab4f8af 100644
--- a/macros/latex/base/ltnews08.pdf
+++ b/macros/latex/base/ltnews08.pdf
diff --git a/macros/latex/base/ltnews09.pdf b/macros/latex/base/ltnews09.pdf
index 46b251d25c..574b47fa54 100644
--- a/macros/latex/base/ltnews09.pdf
+++ b/macros/latex/base/ltnews09.pdf
diff --git a/macros/latex/base/ltnews10.pdf b/macros/latex/base/ltnews10.pdf
index 71203b94e1..9ea06f76ca 100644
--- a/macros/latex/base/ltnews10.pdf
+++ b/macros/latex/base/ltnews10.pdf
diff --git a/macros/latex/base/ltnews11.pdf b/macros/latex/base/ltnews11.pdf
index 0b5e3aee42..ebe4532b73 100644
--- a/macros/latex/base/ltnews11.pdf
+++ b/macros/latex/base/ltnews11.pdf
diff --git a/macros/latex/base/ltnews12.pdf b/macros/latex/base/ltnews12.pdf
index 7ce5bc2138..7e6032f020 100644
--- a/macros/latex/base/ltnews12.pdf
+++ b/macros/latex/base/ltnews12.pdf
diff --git a/macros/latex/base/ltnews13.pdf b/macros/latex/base/ltnews13.pdf
index 7cc92b75fb..f2083e9019 100644
--- a/macros/latex/base/ltnews13.pdf
+++ b/macros/latex/base/ltnews13.pdf
diff --git a/macros/latex/base/ltnews14.pdf b/macros/latex/base/ltnews14.pdf
index 35ff9ebfd6..3721424d0c 100644
--- a/macros/latex/base/ltnews14.pdf
+++ b/macros/latex/base/ltnews14.pdf
diff --git a/macros/latex/base/ltnews15.pdf b/macros/latex/base/ltnews15.pdf
index 86e6f5112e..9ba1dbc6b7 100644
--- a/macros/latex/base/ltnews15.pdf
+++ b/macros/latex/base/ltnews15.pdf
diff --git a/macros/latex/base/ltnews16.pdf b/macros/latex/base/ltnews16.pdf
index d1cff3c808..1d2b17732e 100644
--- a/macros/latex/base/ltnews16.pdf
+++ b/macros/latex/base/ltnews16.pdf
diff --git a/macros/latex/base/ltnews17.pdf b/macros/latex/base/ltnews17.pdf
index bb04d1aca6..2468e25ad4 100644
--- a/macros/latex/base/ltnews17.pdf
+++ b/macros/latex/base/ltnews17.pdf
diff --git a/macros/latex/base/ltnews18.pdf b/macros/latex/base/ltnews18.pdf
index 21ef52e75d..3dbf4ee348 100644
--- a/macros/latex/base/ltnews18.pdf
+++ b/macros/latex/base/ltnews18.pdf
diff --git a/macros/latex/base/ltnews19.pdf b/macros/latex/base/ltnews19.pdf
index 6e0428dbf1..3cf318808c 100644
--- a/macros/latex/base/ltnews19.pdf
+++ b/macros/latex/base/ltnews19.pdf
diff --git a/macros/latex/base/ltnews20.pdf b/macros/latex/base/ltnews20.pdf
index 464fd8b71b..f3ecf75d70 100644
--- a/macros/latex/base/ltnews20.pdf
+++ b/macros/latex/base/ltnews20.pdf
diff --git a/macros/latex/base/ltnews21.pdf b/macros/latex/base/ltnews21.pdf
index a0244199bd..df01d98c08 100644
--- a/macros/latex/base/ltnews21.pdf
+++ b/macros/latex/base/ltnews21.pdf
diff --git a/macros/latex/base/ltnews22.pdf b/macros/latex/base/ltnews22.pdf
index 271e7b5549..7af667be54 100644
--- a/macros/latex/base/ltnews22.pdf
+++ b/macros/latex/base/ltnews22.pdf
diff --git a/macros/latex/base/ltnews23.pdf b/macros/latex/base/ltnews23.pdf
index 1baa40823b..ce5a6d101e 100644
--- a/macros/latex/base/ltnews23.pdf
+++ b/macros/latex/base/ltnews23.pdf
diff --git a/macros/latex/base/ltnews24.pdf b/macros/latex/base/ltnews24.pdf
index 2819e7ae60..a19bae372c 100644
--- a/macros/latex/base/ltnews24.pdf
+++ b/macros/latex/base/ltnews24.pdf
diff --git a/macros/latex/base/ltnews25.pdf b/macros/latex/base/ltnews25.pdf
index b15213fa0a..0d7669ddc2 100644
--- a/macros/latex/base/ltnews25.pdf
+++ b/macros/latex/base/ltnews25.pdf
diff --git a/macros/latex/base/ltnews26.pdf b/macros/latex/base/ltnews26.pdf
index ef2f6476a5..13dc3d26d5 100644
--- a/macros/latex/base/ltnews26.pdf
+++ b/macros/latex/base/ltnews26.pdf
diff --git a/macros/latex/base/ltnews27.pdf b/macros/latex/base/ltnews27.pdf
index 70a4b3298e..5d8e665fb8 100644
--- a/macros/latex/base/ltnews27.pdf
+++ b/macros/latex/base/ltnews27.pdf
diff --git a/macros/latex/base/ltnews28.pdf b/macros/latex/base/ltnews28.pdf
index 267e85ea51..328c065c53 100644
--- a/macros/latex/base/ltnews28.pdf
+++ b/macros/latex/base/ltnews28.pdf
diff --git a/macros/latex/base/ltnews29.pdf b/macros/latex/base/ltnews29.pdf
index 090fc4c658..52445cc420 100644
--- a/macros/latex/base/ltnews29.pdf
+++ b/macros/latex/base/ltnews29.pdf
diff --git a/macros/latex/base/ltnews30.pdf b/macros/latex/base/ltnews30.pdf
index 849f406acb..f9caf97816 100644
--- a/macros/latex/base/ltnews30.pdf
+++ b/macros/latex/base/ltnews30.pdf
diff --git a/macros/latex/base/ltnews31.pdf b/macros/latex/base/ltnews31.pdf
index 11880394de..242feb7d2c 100644
--- a/macros/latex/base/ltnews31.pdf
+++ b/macros/latex/base/ltnews31.pdf
diff --git a/macros/latex/base/ltnews32.pdf b/macros/latex/base/ltnews32.pdf
index 5850e93b18..363250860b 100644
--- a/macros/latex/base/ltnews32.pdf
+++ b/macros/latex/base/ltnews32.pdf
diff --git a/macros/latex/base/ltnews33.pdf b/macros/latex/base/ltnews33.pdf
index 45cc1a580d..cbd0f2b46c 100644
--- a/macros/latex/base/ltnews33.pdf
+++ b/macros/latex/base/ltnews33.pdf
diff --git a/macros/latex/base/ltnews34.pdf b/macros/latex/base/ltnews34.pdf
index 87a85b0599..9919a56abe 100644
--- a/macros/latex/base/ltnews34.pdf
+++ b/macros/latex/base/ltnews34.pdf
diff --git a/macros/latex/base/ltnews35.pdf b/macros/latex/base/ltnews35.pdf
index 2e946fa605..857e259bec 100644
--- a/macros/latex/base/ltnews35.pdf
+++ b/macros/latex/base/ltnews35.pdf
diff --git a/macros/latex/base/ltpara-code.pdf b/macros/latex/base/ltpara-code.pdf
index 52bd980cb1..f6de8902d2 100644
--- a/macros/latex/base/ltpara-code.pdf
+++ b/macros/latex/base/ltpara-code.pdf
diff --git a/macros/latex/base/ltpara-doc.pdf b/macros/latex/base/ltpara-doc.pdf
index 5e05da5379..7d3886667d 100644
--- a/macros/latex/base/ltpara-doc.pdf
+++ b/macros/latex/base/ltpara-doc.pdf
diff --git a/macros/latex/base/ltshipout-code.pdf b/macros/latex/base/ltshipout-code.pdf
index f0b7e9d4e0..96f65484fd 100644
--- a/macros/latex/base/ltshipout-code.pdf
+++ b/macros/latex/base/ltshipout-code.pdf
diff --git a/macros/latex/base/ltshipout-doc.pdf b/macros/latex/base/ltshipout-doc.pdf
index 5d1c35c96e..7114777340 100644
--- a/macros/latex/base/ltshipout-doc.pdf
+++ b/macros/latex/base/ltshipout-doc.pdf
diff --git a/macros/latex/base/ltvers.dtx b/macros/latex/base/ltvers.dtx
index da9d3c590e..021bb5038f 100644
--- a/macros/latex/base/ltvers.dtx
+++ b/macros/latex/base/ltvers.dtx
@@ -115,7 +115,7 @@
    {2022-06-01}
 %</2ekernel|latexrelease>
 %<*2ekernel>
-\def\patch@level{0}
+\def\patch@level{1}
 %    \end{macrocode}
 %
 % \begin{macro}{\development@branch@name}
@@ -125,7 +125,7 @@
 %    intended to help us internally when we locally install a
 %    format out of some development branch.
 %    \begin{macrocode}
-\edef\development@branch@name{develop \the\year-\the\month-\the\day}
+\edef\development@branch@name{}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/macros/latex/base/ltx3info.pdf b/macros/latex/base/ltx3info.pdf
index e06a073b96..b1df70669e 100644
--- a/macros/latex/base/ltx3info.pdf
+++ b/macros/latex/base/ltx3info.pdf
diff --git a/macros/latex/base/ltxdoc.dtx b/macros/latex/base/ltxdoc.dtx
index 4d854728a0..f68c45ee36 100644
--- a/macros/latex/base/ltxdoc.dtx
+++ b/macros/latex/base/ltxdoc.dtx
@@ -30,7 +30,7 @@
 %
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<class>\ProvidesClass{ltxdoc}
-%<class>         [2022/06/03 v2.1f Standard LaTeX documentation class]
+%<class>         [2022/06/14 v2.1g Standard LaTeX documentation class]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -623,27 +623,30 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\url}
-%    \begin{macrocode}
-\providecommand\url{\texttt}
-%    \end{macrocode}
-% \end{macro}
 %
 %    \begin{macrocode}
 \def\task#1#2{}
 %    \end{macrocode}
+%
+%
 % \changes{v2.1f}{2022/06/03}{define \cs{pkg} and other commands}
 % \changes{v2.1f}{2022/06/03}{allow \_ in macro names}
 % Some feaures from l3doc.cls
+% \changes{v2.1g}{2022/06/14}{define \cs{pkg} but delay until begin document}
 %    \begin{macrocode}
-\providecommand\LuaTeX{Lua\TeX}
-\providecommand\cls{\textsf}
-\providecommand\pkg{\textsf}
-\providecommand\enquote[1]{``#1''}
 \DeclareRobustCommand\cs[1]{\texttt{\bslash\detokenize{#1}}}%
 \AtBeginDocument{%
   \renewcommand\PrintMacroName[1]{\MacroFont\detokenize{#1}}%
-  }
+%    \end{macrocode}
+%    We provide those delated in case somebody has loaded \texttt{csquotes}
+%    or makes some definitions in the preamble.
+%    \begin{macrocode}
+  \providecommand\LuaTeX{Lua\TeX}
+  \providecommand\cls{\textsf}
+  \providecommand\pkg{\textsf}
+  \providecommand\enquote[1]{``#1''}
+  \providecommand\url{\texttt}
+}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -667,7 +670,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 % 
 
 \ProvidesFile{ltxdoc.cfg}%
-  [2021/12/07 v2.0c ltxdoc.cls configuration (LaTeX Project)]
+  [2022/06/14 v2.0d ltxdoc.cls configuration (LaTeX Project)]
 \PassOptionsToClass{a4paper}{article}
 
 % hyperref and hypdoc are now loaded late (or by the user) so we have to wait
diff --git a/macros/latex/base/ltxdoc.pdf b/macros/latex/base/ltxdoc.pdf
index 9eae697fac..b5777b7254 100644
--- a/macros/latex/base/ltxdoc.pdf
+++ b/macros/latex/base/ltxdoc.pdf
diff --git a/macros/latex/base/makeindx.pdf b/macros/latex/base/makeindx.pdf
index 6ac94e0948..2689599099 100644
--- a/macros/latex/base/makeindx.pdf
+++ b/macros/latex/base/makeindx.pdf
diff --git a/macros/latex/base/modguide.pdf b/macros/latex/base/modguide.pdf
index d486116f31..d49b2d3885 100644
--- a/macros/latex/base/modguide.pdf
+++ b/macros/latex/base/modguide.pdf
diff --git a/macros/latex/base/nfssfont.pdf b/macros/latex/base/nfssfont.pdf
index 75dc8427b6..4550a82fe6 100644
--- a/macros/latex/base/nfssfont.pdf
+++ b/macros/latex/base/nfssfont.pdf
diff --git a/macros/latex/base/proc.pdf b/macros/latex/base/proc.pdf
index a332696bed..240143af6d 100644
--- a/macros/latex/base/proc.pdf
+++ b/macros/latex/base/proc.pdf
diff --git a/macros/latex/base/slides.pdf b/macros/latex/base/slides.pdf
index 8493448c95..197dc1d51a 100644
--- a/macros/latex/base/slides.pdf
+++ b/macros/latex/base/slides.pdf
diff --git a/macros/latex/base/slifonts.pdf b/macros/latex/base/slifonts.pdf
index 094ac62cf1..52b9da8326 100644
--- a/macros/latex/base/slifonts.pdf
+++ b/macros/latex/base/slifonts.pdf
diff --git a/macros/latex/base/source2e.pdf b/macros/latex/base/source2e.pdf
index 7bf5bb6271..70e084f6e8 100644
--- a/macros/latex/base/source2e.pdf
+++ b/macros/latex/base/source2e.pdf
diff --git a/macros/latex/base/syntonly.pdf b/macros/latex/base/syntonly.pdf
index e6ae0243f2..ef6ff5857b 100644
--- a/macros/latex/base/syntonly.pdf
+++ b/macros/latex/base/syntonly.pdf
diff --git a/macros/latex/base/tlc2.pdf b/macros/latex/base/tlc2.pdf
index 3380da7878..54b6f037af 100644
--- a/macros/latex/base/tlc2.pdf
+++ b/macros/latex/base/tlc2.pdf
diff --git a/macros/latex/base/tulm.pdf b/macros/latex/base/tulm.pdf
index 2e2261a0ce..993243e50b 100644
--- a/macros/latex/base/tulm.pdf
+++ b/macros/latex/base/tulm.pdf
diff --git a/macros/latex/base/usrguide.pdf b/macros/latex/base/usrguide.pdf
index 8af52cca0b..1c8e6fdf84 100644
--- a/macros/latex/base/usrguide.pdf
+++ b/macros/latex/base/usrguide.pdf
diff --git a/macros/latex/base/usrguide3.pdf b/macros/latex/base/usrguide3.pdf
index e8048df824..ce002ec1ef 100644
--- a/macros/latex/base/usrguide3.pdf
+++ b/macros/latex/base/usrguide3.pdf
diff --git a/macros/latex/base/utf8ienc.pdf b/macros/latex/base/utf8ienc.pdf
index ca7dc00f2c..282ed4d197 100644
--- a/macros/latex/base/utf8ienc.pdf
+++ b/macros/latex/base/utf8ienc.pdf
diff --git a/macros/latex/base/webcomp.pdf b/macros/latex/base/webcomp.pdf
index f1f98e12a0..456c8e33a5 100644
--- a/macros/latex/base/webcomp.pdf
+++ b/macros/latex/base/webcomp.pdf