latex-base-dev (13jun24)

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

4 files changed, 67 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex-dev/base/doc.sty b/Master/texmf-dist/tex/latex-dev/base/doc.sty
index ea693f4ff1d..16b0fbc897d 100644
--- a/Master/texmf-dist/tex/latex-dev/base/doc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/doc.sty
@@ -52,7 +52,7 @@
 \DeclareCurrentRelease{v3}{2022-06-01}
 
 \ProvidesPackage{doc}
-  [2024/04/26 v3.0p
+  [2024/06/04 v3.0q
    Standard LaTeX documentation package V3 (FMi)]
 %%
 %% Package `doc' to use with LaTeX 2e
@@ -908,15 +908,6 @@
   \expandafter\let\expandafter\doc@eoph@@k\csname doc.sty-h@@k\endcsname
   \RequirePackage{hypdoc}
   \expandafter\let\csname doc.sty-h@@k\endcsname\doc@eoph@@k
-  \let\PrintDescribeMacro \@@PrintDescribeMacro
-  \let\PrintDescribeEnv \@@PrintDescribeEnv
-  \let\PrintMacroName \@@PrintMacroName
-  \let\PrintEnvName \@@PrintEnvName
-  \let\SpecialUsageIndex \@@SpecialUsageIndex
-  \let\SpecialEnvIndex \@@SpecialEnvIndex
-  \let\SortIndex \@@SortIndex
-  \let\DescribeMacro \@@DescribeMacro
-  \let\DescribeEnv \@@DescribeEnv
   \ifx\special@index\@gobble  % do we write index entries at all?
   \else
     \ifcodeline@index
@@ -1242,6 +1233,7 @@
                 idxgroup  = environments ,
                 printtype = \textit{env.}
                ]{Env}{environment}
+\AddToHook{package/hypdoc/before}{%
   \let\@@PrintDescribeMacro \PrintDescribeMacro
   \let\@@PrintDescribeEnv \PrintDescribeEnv
   \let\@@PrintMacroName \PrintMacroName
@@ -1251,6 +1243,18 @@
   \let\@@SortIndex \SortIndex
   \let\@@DescribeMacro \DescribeMacro
   \let\@@DescribeEnv \DescribeEnv
+}
+\AddToHook{package/hypdoc/after}{%
+  \let\PrintDescribeMacro \@@PrintDescribeMacro
+  \let\PrintDescribeEnv \@@PrintDescribeEnv
+  \let\PrintMacroName \@@PrintMacroName
+  \let\PrintEnvName \@@PrintEnvName
+  \let\SpecialUsageIndex \@@SpecialUsageIndex
+  \let\SpecialEnvIndex \@@SpecialEnvIndex
+  \let\SortIndex \@@SortIndex
+  \let\DescribeMacro \@@DescribeMacro
+  \let\DescribeEnv \@@DescribeEnv
+}
 
 \DeclareRobustCommand\cs[1]{\texttt{\bslash #1}}
 \AddToHook{class/amsdtx/after}{%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index b468b974374..66ee8826d2a 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -710,7 +710,7 @@
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
    {2024-11-01}
-\def\patch@level{0}
+\def\patch@level{1}
 \edef\development@branch@name{develop \the\year-\the\month-\the\day}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
@@ -14671,15 +14671,11 @@ Type  H <return>  for immediate help.}%
   \@end@tempboxa}
 \def\@finalstrut#1{%
   \unskip
-  \ifhmode \nobreak \vrule
+  \ifhmode \nobreak
   \else
-    \ifdim \prevdepth=-\@m\p@
-    \else
-      \vskip-\prevdepth
-    \fi
-    \hrule
+    \vskip-\baselineskip
   \fi
-  \@width\z@\@height\z@\@depth\dp#1}
+  \vrule\@width\z@\@height\z@\@depth\dp#1}
 \def\@@line{\hb@xt@\hsize}
 \DeclareRobustCommand\leftline[1]{\@@line{#1\hss}}
 \DeclareRobustCommand\rightline[1]{\@@line{\hss#1}}
@@ -17137,7 +17133,11 @@ Type  H <return>  for immediate help.}%
   \ifx\@currext\@clsextension
     document class%
   \else
-    package%
+    \ifx\@currext\@pkgextension
+      package%
+    \else
+      file%
+    \fi
   \fi}
 \@onlypreamble\@cls@pkg
 \def\@unknownoptionerror{%
@@ -17341,6 +17341,13 @@ Type  H <return>  for immediate help.}%
   \pkgcls@debug{\@spaces 4: #4}%
   \def\pkgcls@name{#1}%                  % for info message
   \def\pkgcls@arg {#3}%                  % for info message
+  \edef\pkgcls@ext{%
+    \ifx#4\@clsextension document class\else
+      \ifx#4\@pkgextension package\else
+        file
+      \fi
+    \fi
+  }%                                     % for info message
   \pkgcls@parse@date@arg{#3}%
   \let\pkgcls@candidate\@empty
   \begingroup
@@ -17382,7 +17389,7 @@ Type  H <return>  for immediate help.}%
         \ifnum \@parse@version0#1//00\@nil > \pkgcls@targetdate
           \@latex@warning@no@line{Suspicious rollback/min-date date given\MessageBreak
             A minimal date of #1 has been specified for
-             \@cls@pkg\MessageBreak '\pkgcls@name'.\MessageBreak
+             \pkgcls@ext\MessageBreak '\pkgcls@name'.\MessageBreak
              But this is in conflict
              with a rollback request to \requestedpatchdate}
         \fi
@@ -19715,8 +19722,8 @@ Type  H <return>  for immediate help.}%
     \int_compare:nNnT \g__tbl_col_int > 0
         {
           \tbl_count_missing_cells:n {#1}
-          \cr
         }
+    \crcr
 }
 \ExplSyntaxOff
 \let\@kernel@refstepcounter\refstepcounter
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
index 7fcd9a53f73..5a696389f15 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
@@ -122,6 +122,13 @@
   \pkgcls@debug{\@spaces 4: #4}%
   \def\pkgcls@name{#1}%                  % for info message
   \def\pkgcls@arg {#3}%                  % for info message
+  \edef\pkgcls@ext{%
+    \ifx#4\@clsextension document class\else
+      \ifx#4\@pkgextension package\else
+        file
+      \fi
+    \fi
+  }%                                     % for info message
   \pkgcls@parse@date@arg{#3}%
   \let\pkgcls@candidate\@empty
   \begingroup
@@ -163,7 +170,7 @@
         \ifnum \@parse@version0#1//00\@nil > \pkgcls@targetdate
           \@latex@warning@no@line{Suspicious rollback/min-date date given\MessageBreak
             A minimal date of #1 has been specified for
-             \@cls@pkg\MessageBreak '\pkgcls@name'.\MessageBreak
+             \pkgcls@ext\MessageBreak '\pkgcls@name'.\MessageBreak
              But this is in conflict
              with a rollback request to \requestedpatchdate}
         \fi
@@ -16019,15 +16026,11 @@ of this package available from CTAN}
                  {\@finalstrut}{final strut correction}%
 \def\@finalstrut#1{%
   \unskip
-  \ifhmode \nobreak \vrule
+  \ifhmode \nobreak
   \else
-    \ifdim \prevdepth=-\@m\p@
-    \else
-      \vskip-\prevdepth
-    \fi
-    \hrule
+    \vskip-\baselineskip
   \fi
-  \@width\z@\@height\z@\@depth\dp#1}
+  \vrule\@width\z@\@height\z@\@depth\dp#1}
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
                  {\@finalstrut}{final strut correction}%
@@ -18463,6 +18466,29 @@ of this package available from CTAN}
 \DeclareRobustCommand\AtEndDocument{\g@addto@macro\@enddocumenthook}
 
 \EndIncludeInRelease
+\IncludeInRelease{2024/11/01}%
+                 {\@cls@pkg}{Allow for more extensions}%
+\def\@cls@pkg{%
+  \ifx\@currext\@clsextension
+    document class%
+  \else
+    \ifx\@currext\@pkgextension
+      package%
+    \else
+      file%
+    \fi
+  \fi}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@cls@pkg}{Allow for more extensions}%
+
+\def\@cls@pkg{%
+  \ifx\@currext\@clsextension
+    document class%
+  \else
+    package%
+  \fi}
+\EndIncludeInRelease
 \IncludeInRelease{2020/10/01}%
                  {\filec@ntents}{Define \q@curr@file directly (gh/220)}%
 \def\filecontents{\@tempswatrue\@fileswtrue
diff --git a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
index c0266dd6930..8caa7e43a8b 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}
-  [2024/04/26 v3.0p
+  [2024/06/04 v3.0q
    Standard LaTeX documentation package V3 (FMi)]
 %%
 %% Package `doc' to use with LaTeX 2e