latex-base-dev (5feb22)

git-svn-id: svn://tug.org/texlive/trunk@61902 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 71 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex-dev/base/doc.sty b/Master/texmf-dist/tex/latex-dev/base/doc.sty
index 752263a72f1..d10d036f3f1 100644
--- a/Master/texmf-dist/tex/latex-dev/base/doc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/doc.sty
@@ -53,7 +53,7 @@
 \DeclareCurrentRelease{v3}{2022-06-01}
 
 \ProvidesPackage{doc}
-  [2022/06/01 v3.0g
+  [2022/06/01 v3.0h
    Standard LaTeX documentation package V3 (FMi)]
 %%
 %% Package `doc' to use with LaTeX 2e
@@ -89,7 +89,7 @@
     hyperref / true  .code:n = { \legacy_if_set_true:n  { doc@hyperref } },
     hyperref / false .code:n = { \legacy_if_set_false:n { doc@hyperref } },
     hyperref  .default:n = { true },
-    hyperref  .choice:,
+    nohyperref  .choice:,
     nohyperref / true  .code:n = { \legacy_if_set_false:n  { doc@hyperref } },
     nohyperref / false .code:n = { \legacy_if_set_true:n { doc@hyperref } },
     nohyperref  .default:n = { true },
@@ -100,7 +100,7 @@
     nomulticol  .choice:,
     nomulticol / true  .code:n = { \legacy_if_set_false:n  { doc@multicol } },
     nomulticol / false .code:n = { \legacy_if_set_true:n { doc@multicol } },
-    multicol  .default:n = { true },
+    nomulticol  .default:n = { true },
     debugshow  .choice:,
     debugshow / true  .code:n = { \legacy_if_set_true:n  { doc@debugshow } },
     debugshow / false .code:n = { \legacy_if_set_false:n { doc@debugshow } },
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index cd0d59f6576..b9cf2952fca 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -576,11 +576,20 @@
 \def\null{\hbox{}}
 \let\bgroup={
 \let\egroup=}
-{\catcode`\^^M=\active % these lines must end with %
-  \gdef\obeylines{\catcode`\^^M\active \let^^M\par}%
-  \global\let^^M\par} % this is in case ^^M appears in a \write
-\def\obeyspaces{\catcode`\ \active}
-{\obeyspaces\global\let =\space}
+\begingroup
+\catcode`\^^M=\active % these lines must end with %
+  \gdef\obeylines{\catcode`\^^M\active%
+    \let^^M\obeyedline%
+  }%
+  \global\let^^M\par % this is in case ^^M appears in a \write
+\endgroup
+\protected\gdef\obeyedline{\par}
+\global\let\obeyedspace\space
+\begingroup
+\catcode`\ =\active%
+\gdef\obeyspaces{\catcode`\ \active\let =\obeyedspace}%
+\global\let =\space%
+\endgroup
 \long\def \loop #1\repeat{%
   \def\iterate{#1\relax  % Extra \relax
                \expandafter\iterate\fi
@@ -696,7 +705,7 @@
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
    {2022-06-01}
-\def\patch@level{-1}
+\def\patch@level{-2}
 \edef\development@branch@name{develop \the\year-\the\month-\the\day}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
@@ -14344,6 +14353,23 @@ Type  H <return>  for immediate help.}%
 }
 %%% From File: ltkeys.dtx
 \ExplSyntaxOn
+\group_begin:
+  \cs_set_protected:Npn \__keys_tmp:nn #1#2
+    {
+      \quark_if_recursion_tail_stop:n {#1}
+      \cs_new_eq:cc
+        { \c__keys_props_root_str . #2 }
+        { \c__keys_props_root_str . #1 }
+      \__keys_tmp:nn
+    }
+  \__keys_tmp:nn
+    { code }            { code }
+    { legacy_if_set:n } { if }
+    { tl_set:N }        { store }
+    { usage:n }         { usage }
+    { \q_recursion_tail } { }
+    \q_recursion_stop
+\group_end:
 \cs_generate_variant:Nn \clist_put_right:Nn { Nv }
 \clist_new:N \l__keys_options_clist
 \bool_new:N \l__keys_options_loading_bool
@@ -14370,7 +14396,7 @@ Type  H <return>  for immediate help.}%
     \bool_set_true:N \l__keys_options_loading_bool
     \keys_set:nV {#2} \l__keys_options_clist
     \bool_set_false:N \l__keys_options_loading_bool
-    \cs_set_eq:NN \@unprocessedoptions \scan_stop:
+    \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: }
     \__keys_option_end:
     \__keys_options_loaded:n {#2}
   }
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
index b743e3a4351..596fc1062cd 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
@@ -848,6 +848,40 @@ of this package available from CTAN}
   \let\tracingstacklevels\@undefined
 \fi
 \EndIncludeInRelease
+\IncludeInRelease{2022/06/01}{\obeylines}%
+    {Add a redirection to obeylines and obeyspaces}%
+\begingroup
+\catcode`\^^M=\active % these lines must end with %
+  \gdef\obeylines{\catcode`\^^M\active%
+    \let^^M\obeyedline%
+  }%
+  \global\let^^M\par % this is in case ^^M appears in a \write
+\endgroup
+\protected\gdef\obeyedline{\par}
+\global\let\obeyedspace\space
+\begingroup
+\catcode`\ =\active%
+\gdef\obeyspaces{\catcode`\ \active\let =\obeyedspace}%
+\global\let =\space%
+\endgroup
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\obeylines}%
+    {Add a redirection to obeylines and obeyspaces}%
+
+\expandafter\let\csname obeylines \endcsname\@undefined
+\expandafter\let\csname obeyspace \endcsname\@undefined
+
+\begingroup
+\catcode`\^^M=\active % these lines must end with %
+  \gdef\obeylines{\catcode`\^^M\active \let^^M\par %
+                 }%
+  \global\let^^M\RawParEnd % this is in case ^^M appears in a \write
+\endgroup
+\def\obeyspaces{\catcode`\ \active}
+
+\let\obeyedline\@undefined
+\let\obeyedspace\@undefined
+\EndIncludeInRelease
 \IncludeInRelease{2021/06/01}{\loggingall}
                  {\tracingstacklevels and \tracinglostchars=3}%
 \edef\loggingall{%
diff --git a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
index e6b651020aa..986b0fd6fc0 100644
--- a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \ProvidesPackage{shortvrb}
-  [2022/06/01 v3.0g
+  [2022/06/01 v3.0h
    Standard LaTeX documentation package V3 (FMi)]
 %%
 %% Package `doc' to use with LaTeX 2e