1 files changed, 33 insertions, 17 deletions
diff --git a/macros/latex/required/tools/multicol.dtx b/macros/latex/required/tools/multicol.dtx
index 4d86448002..90decb3bb1 100644
--- a/macros/latex/required/tools/multicol.dtx
+++ b/macros/latex/required/tools/multicol.dtx
@@ -20,7 +20,7 @@
 % \iffalse    This is a METACOMMENT
 %
 %% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2023 Frank Mittelbach
+%% Copyright 1989-2024 Frank Mittelbach
 %%
 %%  In addition to the terms of LPPL any distributed version
 %%  (unchanged or modified) of multicol has to keep the statement
@@ -77,7 +77,7 @@
 %% not for the payment of a license fee per se (which might or might
 %% not follow from this evaluation).
 %%
-%% The license fee, if any, can be payed either to the LaTeX fund
+%% The license fee, if any, can be paid either to the LaTeX fund
 %% (see ltx3info.txt in the base LaTeX distribution) or to the author of
 %% the program who can be contacted at
 %%
@@ -98,7 +98,7 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2024/05/23 v1.9h  multicolumn formatting (FMi)]
+          [2024/09/14 v1.9i  multicolumn formatting (FMi)]
 %
 %
 %
@@ -403,12 +403,17 @@
 % the most important is called |\tolerance|: this controls the
 % allowed `looseness' (i.e.\ the amount of blank space between words).
 % Its default value is 200 (the \LaTeX{} |\fussy|) which is too
-% small for narrow columns. On the other hand the |\sloppy|
-% declaration (which sets |\tolerance| to $10000=\infty$) is too
-% large, allowing really bad spacing.\footnote{Look at the next
-% paragraph, it was set with the \cs{sloppy} declaration.}
-%
-% \begin{sloppypar}
+% small for narrow columns.
+
+% Setting it to \texttt{10000} (a.k.a.\ $\infty$) means arbitrary bad
+% lines are possible.  With that setting \LaTeX{} will make most lines
+% perfect but intermix them with really bad lines. This was the
+% setting originally used by \cs{sloppy} (nowadays it is a bit more
+% cautious and used \texttt{9999} which makes a huge
+% difference).\footnote{Look at the next paragraph, it was set with
+% the \cs{tolerance}\texttt{=10000}.}
+%
+% \begin{sloppypar}\tolerance=10000
 % \DescribeMacro\multicoltolerance \DescribeMacro\multicolpretolerance
 %  We therefore use a |\multicoltolerance| parameter for the
 % |\tolerance| value inside the \mc{} environment.  Its default value
@@ -417,10 +422,10 @@
 % be done outside the \mc{} environment.  Since |\tolerance| is set
 % to |\multicoltolerance| at the beginning of every \textsf{multicols}
 % environment one can locally overwrite this default by assigning
-% \verb*+\tolerance = +\meta{desired value}. There also exists a
+% \cs{tolerance}\texttt{=}\meta{desired value}. There also exists a
 % |\multicolpretolerance| parameter holding the value for
 % |\pretolerance| within a \mc{} environment. Both parameters are
-% usually used only by package designers.
+% usually used only by package  or class designers.
 % \end{sloppypar}
 %
 % Generation of multicolumn output can be divided into two parts.  In
@@ -679,7 +684,7 @@
 %    this value will additionally trace the mark handling
 %    algorithm. It will show what marks are found, what marks are
 %    considered, etc. To fully understand this information you will
-%    probably have to read carefully trough the implementation.
+%    probably have to read carefully through the implementation.
 % \item[$\meta{number}\geq 4$.]  Setting \meta{number}\pagebreak[2] to
 %    such a high value will additionally place an |\hrule| into your
 %    output, separating the part of text which had already been
@@ -1945,7 +1950,7 @@
 %   the balancing happened in the output routine then \TeX{} reverts
 %   to the |\prevdepth| that was current before the OR once the OR has
 %   finished. In short |\prevdepth| is something you can't set
-%   globally it is alway local to the current list being built. Thus
+%   globally it is always local to the current list being built. Thus
 %   we need to set it back to zero here to avoid incorrect spacing.
 % \changes{v1.8h}{2014/09/12}{Set \cs{prevdepdth} for current vlist
 %   when returning from multicols environment}
@@ -2216,7 +2221,7 @@
 %  \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
+%    languages and was hard-wired initially, 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
@@ -2462,7 +2467,7 @@
 %    If |\kept@firstmark| is non-empty then |\kept@botmark| must be
 %    non-empty too so we can use their values. Otherwise we use the
 %    value of |\kept@topmark| which was first initialized when we
-%    gathered the |\partical@page| and later on was updated to the
+%    gathered the |\partial@page| and later on was updated to the
 %    |\botmark| for the preceding page.
 %
 % \changes{v1.4a}{1992/02/14}{\cs{botmark} set to \cs{splitbotmark}}
@@ -2938,7 +2943,7 @@
 %    marks from this box. This has to be done \emph{before} we add a
 %    penalty of $-10000$ to the top of the box, otherwise only an
 %    empty box will be considered. But even that is not enough: the box
-%    may contain \cs{columnbreak}s in which case doing some artifical
+%    may contain \cs{columnbreak}s in which case doing some artificial
 %    splitting to get the marks out still fails to see all marks
 %    unless we take some special precaution in \cs{get@keptmarks}
 %    (which is now done).
@@ -3625,12 +3630,22 @@
 % \changes{v1.6g}{2006/02/23}{Added \cs{@minipagefalse}}
 % \changes{v1.6h}{2008/12/05}{Use \cs{@endfloatbox} to better support
 %   the modifications done by the float package}
+% \changes{v1.9i}{2024/09/14}{Added tagging support}   
 %    Even if this should be used as a hook we use a |@| in the
 %    name since it is more for experts.
-%    \begin{macrocode}
+%  For now we test if the socket is already defined
+%    \begin{macrocode}
+\ExplSyntaxOn
+\str_if_exist:cF { l__socket_tagsupport/float/end_plug_str }
+  {
+    \NewSocket{tagsupport/float/end}{0}
+    \NewSocket{tagsupport/float/hmode/end}{0}
+  }
+\ExplSyntaxOff  
 \def\set@floatcmds{%
  \let\@dblfloat\@dbflt
  \def\end@dblfloat{\@endfloatbox
+   \UseTaggingSocket{float/end}%
    \@largefloatcheck
    \outer@nobreak
 %    \end{macrocode}
@@ -3652,6 +3667,7 @@
    \fi
    \ifnum\@floatpenalty=-\@Mii
      \@Esphack
+     \UseTaggingSocket{float/hmode/end}%
    \fi}}
 %    \end{macrocode}
 % \end{macro}