From 138d0a6cfd5f2187973fb6b83ad2fb0dcf5a8348 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Wed, 2 Jun 2021 03:04:23 +0000
Subject: CTAN sync 202106020304

---
 macros/latex/base/ltboxes.dtx | 118 +++++++++++++++++++++++++++++++-----------
 1 file changed, 88 insertions(+), 30 deletions(-)

(limited to 'macros/latex/base/ltboxes.dtx')

diff --git a/macros/latex/base/ltboxes.dtx b/macros/latex/base/ltboxes.dtx
index 39c134b3bf..8499d3ab8b 100644
--- a/macros/latex/base/ltboxes.dtx
+++ b/macros/latex/base/ltboxes.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2020
-% The LaTeX3 Project and any individual authors listed elsewhere
+% Copyright (C) 1993-2021
+% The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
 % This file is part of the LaTeX base system.
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltboxes.dtx}
-             [2020/09/27 v1.4a LaTeX Kernel (Box Commands)]
+             [2021/02/10 v1.4b LaTeX Kernel (Box Commands)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltboxes.dtx}
@@ -222,7 +222,7 @@
 % \changes{v1.0j}{1994/10/18}
 %         {stuff from ltpatch done}
 % \changes{v1.0p}{1994/11/09}
-%         {more colour changes\ldots}
+%         {more color changes\ldots}
 % \changes{v1.0q}{1994/11/17}
 %         {\cs{@tempa} to \cs{reserved@a}}
 % \changes{v1.0t}{1995/05/07}{Use \cs{hb@xt@}}
@@ -422,7 +422,7 @@
 %         {macro added}
 % \changes{v0.1a}{1993/12/03}
 %         {color support}
-% This macro is initially a no-op, but the colour package will redefine
+% This macro is initially a no-op, but the color package will redefine
 % it to insert a |\special|.
 %    \begin{macrocode}
 \let\set@color\relax
@@ -431,38 +431,66 @@
 %
 % \begin{macro}{\color@begingroup}
 % \changes{v1.0b}{1994/03/14}
-%         {macro added for colour support}
+%         {macro added for color support}
 % \begin{macro}{\color@endgroup}
 % \changes{v1.0b}{1994/03/14}
-%         {macro added for colour support}
+%         {macro added for color support}
 % \begin{macro}{\color@setgroup}
 % \changes{v1.0f}{1994/05/11}
-%         {macro added for colour support}
+%         {macro added for color support}
 % \begin{macro}{\normalcolor}
 % \changes{v1.0g}{1994/05/12}
-%         {macro added for colour support}
+%         {macro added for color support}
 % \begin{macro}{\color@hbox}
 % \changes{v1.0n}{1994/11/05}
-%         {macro added for colour support}
+%         {macro added for color support}
 % \begin{macro}{\color@vbox}
 % \changes{v1.0r}{1994/11/18}
-%         {macro added for colour support}
+%         {macro added for color support}
 % \begin{macro}{\color@endbox}
 % \changes{v1.0n}{1994/11/05}
-%         {macro added for colour support}
-% These macros are initially a no-op, but the colour package will
+%         {macro added for color support}
+% \changes{v1.4b}{2021/02/04}
+%         {Always add the color groups (gh/488)}
+% In the past these macros were initially no-ops, and the \pkg{color}
+% package redefined
 % redefine them to be |\begingroup|, |\endgroup|,
 % |\begingroup\set@color|,\\ |\hbox\bgroup\color@begingroup|,
 % |\color@endgroup\egroup|.
-% and \meta{set to main document colour} respectively.
+% and \meta{set to main document color} respectively.
+%
+% Nowadays we always set the group already in the kernel as this makes the
+% coding simpler.
 %    \begin{macrocode}
-\let\color@begingroup\relax
-\let\color@endgroup\relax
-\let\color@setgroup\relax
-\let\normalcolor\relax
-\let\color@hbox\relax
-\let\color@vbox\relax
-\let\color@endbox\relax
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>                 {\color@begingroup}{color group settings}%
+\let\color@begingroup\begingroup
+\def\color@endgroup{\endgraf\endgroup}
+\def\color@setgroup{\color@begingroup}        % changed further in color package
+\let\normalcolor\relax                        % remains untouched; only changed in a color package
+\def\color@hbox{\hbox\bgroup\color@begingroup}
+\def\color@vbox{\vbox\bgroup\color@begingroup}
+\def\color@endbox{\color@endgroup\egroup}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\color@begingroup}{color group settings}%
+%<latexrelease>
+%<latexrelease>\let\color@begingroup\relax
+%<latexrelease>\let\color@endgroup\relax
+%<latexrelease>\let\color@setgroup\relax
+%<latexrelease>\let\normalcolor\relax
+%<latexrelease>\let\color@hbox\relax
+%<latexrelease>\let\color@vbox\relax
+%<latexrelease>\let\color@endbox\relax
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -539,7 +567,7 @@
 % \changes{v1.0b}{1994/03/14}
 %         {Use \cs{color@setgroup}}
 % \changes{v1.0d}{1994/04/15}
-%         {Added missing procent character.}
+%         {Added missing percent character.}
 % \changes{v1.0v}{1995/07/20}
 %         {Use \cs{sbox}}
 %    \begin{macrocode}
@@ -888,7 +916,7 @@
 %
 % The rational for allowing two normally global flags to be set
 % locally here was stated originally by
-% Donald Arsenau and extended by Chris Rowley.
+% Donald Arseneau and extended by Chris Rowley.
 % It is because these flags are only set globally to
 % true by section commands, and these should never appear within
 % boxes or, indeed, in any group; and they are only ever
@@ -1016,7 +1044,7 @@
 %
 % \begin{macro}{\@iiiminipage}
 % \changes{v1.0e}{1994/04/21}
-%     {Extra \cs{bgroup} for colour}
+%     {Extra \cs{bgroup} for color}
 % \changes{v1.0f}{1994/05/11}
 %         {Use new \cs{color@setgroup} concept.}
 % Internal form of |minipage|.
@@ -1054,11 +1082,11 @@
 %     {(RmS) replaced \cs{vskip}-\cs{lastskip} by \cs{unskip}
 %       (proposed by FMi)}
 % \changes{v1.0e}{1994/04/21}
-%     {Extra \cs{egroup} for colour}
+%     {Extra \cs{egroup} for color}
 % \changes{v1.0f}{1994/05/11}
 %         {Use new \cs{color@setgroup} concept.}
 % \changes{v1.0n}{1994/11/05}
-%     {Colour resetting for footnotes moved to here: as for main
+%     {Color resetting for footnotes moved to here: as for main
 %     page.}
 %    \begin{macrocode}
 \def\endminipage{%
@@ -1093,9 +1121,9 @@
 % Final |\strut| added 27 Mar 89, on suggestion by Don Hosek
 % \changes{LaTeX2.09}{1991/09/29}{(RmS) added \cs{reset@font}}
 % \changes{LaTeX2.09}{1992/11/26}{(RmS) added protection for \cs{edef}}
-% \changes{v0.1a}{1994/03/07}{Extra group for colour}
+% \changes{v0.1a}{1994/03/07}{Extra group for color}
 % \changes{v1.0e}{1994/04/21}
-%     {Extra \cs{endgraf} for colour}
+%     {Extra \cs{endgraf} for color}
 % \changes{v1.0f}{1994/05/11}
 %         {Use new \cs{color@setgroup} concept.}
 % \changes{v1.0f}{1994/05/11}
@@ -1103,11 +1131,17 @@
 % \changes{v1.0m}{1994/11/04}
 %         {Added \cs{protected@edef}. ASAJ.}
 % \changes{v1.0n}{1994/11/05}
-%     {Colour resetting for footnotes moved to endminipage: as for main
+%     {Color resetting for footnotes moved to endminipage: as for main
 %     page.}
 % \changes{v1.0o}{1994/11/05}
-%     {Colour groups restored here.}
+%     {Color groups restored here.}
+% \changes{v1.4b}{2021/02/10}
+%         {Explicitly run \cs{par} in support for paragraph tagging}
 %    \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>                 {\@mpfootnotetext}{footnotetext tagging}%
 \long\def\@mpfootnotetext#1{%
   \global\setbox\@mpfootins\vbox{%
     \unvbox\@mpfootins
@@ -1119,7 +1153,31 @@
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+    \par
     \color@endgroup}}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@mpfootnotetext}{footnotetext tagging}%
+%<latexrelease>
+%<latexrelease>\long\def\@mpfootnotetext#1{%
+%<latexrelease>  \global\setbox\@mpfootins\vbox{%
+%<latexrelease>    \unvbox\@mpfootins
+%<latexrelease>    \reset@font\footnotesize
+%<latexrelease>    \hsize\columnwidth
+%<latexrelease>    \@parboxrestore
+%<latexrelease>    \protected@edef\@currentlabel
+%<latexrelease>         {\csname p@mpfootnote\endcsname\@thefnmark}%
+%<latexrelease>    \color@begingroup
+%<latexrelease>      \@makefntext{%
+%<latexrelease>        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<latexrelease>    \color@endgroup}}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
 %    \end{macrocode}
 % \end{macro}
 %
-- 
cgit v1.2.3

