[latex3-commits] [git/LaTeX3-latex3-latex2e] gh488: added explicit \par in front of \color at endgroup in suport for paragrah hooks where appropriate (59792ac9)
Frank Mittelbach
frank.mittelbach at latex-project.org
Wed Feb 10 17:05:01 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : gh488
Link : https://github.com/latex3/latex2e/commit/59792ac982c10344d0f4b9b49bd632a04e78f020
>---------------------------------------------------------------
commit 59792ac982c10344d0f4b9b49bd632a04e78f020
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Wed Feb 10 17:05:01 2021 +0100
added explicit \par in front of \color at endgroup in suport for paragrah hooks where appropriate
>---------------------------------------------------------------
59792ac982c10344d0f4b9b49bd632a04e78f020
base/changes.txt | 10 ++++++++++
base/ltboxes.dtx | 32 +++++++++++++++++++++++++++++++-
base/ltfloat.dtx | 33 ++++++++++++++++++++++++++++++++-
required/tools/array.dtx | 5 +++--
required/tools/changes.txt | 6 ++++++
5 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 4ed1fbe3..bc55545c 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,16 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2021-02-10 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltboxes.dtx (section{\LaTeX\ Box commands}):
+ Explicitly run \par at the end of footnote text in preparation
+ for paragraph hooks
+
+ * ltfloat.dtx (subsection{Footnotes}):
+ Explicitly run \par at the end of footnote text in preparation
+ for paragraph hooks
+
2021-02-04 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltboxes.dtx (section{\LaTeX\ Box commands}):
diff --git a/base/ltboxes.dtx b/base/ltboxes.dtx
index 752aeb9b..8281b4b7 100644
--- a/base/ltboxes.dtx
+++ b/base/ltboxes.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltboxes.dtx}
- [2021/02/04 v1.4b LaTeX Kernel (Box Commands)]
+ [2021/02/10 v1.4b LaTeX Kernel (Box Commands)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltboxes.dtx}
@@ -1135,7 +1135,13 @@
% page.}
% \changes{v1.0o}{1994/11/05}
% {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/05/01}%
+%<latexrelease> {\@mpfootnotetext}{footnotetext tagging}%
\long\def\@mpfootnotetext#1{%
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
@@ -1147,7 +1153,31 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \par
\color at 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 at font\footnotesize
+%<latexrelease> \hsize\columnwidth
+%<latexrelease> \@parboxrestore
+%<latexrelease> \protected at edef\@currentlabel
+%<latexrelease> {\csname p at mpfootnote\endcsname\@thefnmark}%
+%<latexrelease> \color at begingroup
+%<latexrelease> \@makefntext{%
+%<latexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<latexrelease> \color at endgroup}}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
diff --git a/base/ltfloat.dtx b/base/ltfloat.dtx
index 626ee9f9..bc79943d 100644
--- a/base/ltfloat.dtx
+++ b/base/ltfloat.dtx
@@ -31,7 +31,7 @@
%
%<*driver>
% \fi
-\ProvidesFile{ltfloat.dtx}[2020/12/05 v1.2d LaTeX Kernel (Floats)]
+\ProvidesFile{ltfloat.dtx}[2021/02/10 v1.2e LaTeX Kernel (Floats)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfloat.dtx}
@@ -1480,7 +1480,13 @@
% {Removed \cs{normalcolor} (again)}
% \changes{v1.1t}{1997/11/19}
% {Missing percent, again}
+% \changes{v1.2e}{2021/02/10}{Explicitly run \cs{par} at the end of footnote text
+% in preparation for paragraph hooks}
% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/05/01}%
+%<latexrelease> {\@footnotetext}{footnotetext tagging}%
\long\def\@footnotetext#1{\insert\footins{%
\reset at font\footnotesize
\interlinepenalty\interfootnotelinepenalty
@@ -1493,7 +1499,32 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \par
\color at endgroup}}%
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\@footnotetext}{footnotetext tagging}%
+%<latexrelease>
+%<latexrelease>\long\def\@footnotetext#1{\insert\footins{%
+%<latexrelease> \reset at font\footnotesize
+%<latexrelease> \interlinepenalty\interfootnotelinepenalty
+%<latexrelease> \splittopskip\footnotesep
+%<latexrelease> \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%<latexrelease> \hsize\columnwidth \@parboxrestore
+%<latexrelease> \protected at edef\@currentlabel{%
+%<latexrelease> \csname p at footnote\endcsname\@thefnmark
+%<latexrelease> }%
+%<latexrelease> \color at begingroup
+%<latexrelease> \@makefntext{%
+%<latexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<latexrelease> \color at endgroup}}%
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
diff --git a/required/tools/array.dtx b/required/tools/array.dtx
index 1dd75f3c..1ca08036 100644
--- a/required/tools/array.dtx
+++ b/required/tools/array.dtx
@@ -33,7 +33,7 @@
%<+package>\DeclareCurrentRelease{}{2020-10-01}
%<+package>
%<+package>\ProvidesPackage{array}
-%<+package> [2021/01/09 v2.5c Tabular extension package (FMi)]
+%<+package> [2021/02/10 v2.5d Tabular extension package (FMi)]
%
% \fi
%
@@ -2008,8 +2008,9 @@
% \changes{v2.2d}{1994/05/16}{Use \LaTeXe \cs{@finalstrut}}
% \changes{v2.3g}{1996/05/07}{Add \cs{hfil} for tools/2120}
% \changes{v2.4i}{2018/09/13}{Add group to prevent color leak (gh/72)}
+% \changes{v2.5d}{2021/02/10}{Explicitly run \cs{par} at the end of pboxes}
% \begin{macrocode}
-\def\@endpbox{\@finalstrut\@arstrutbox \color at endgroup \egroup\hfil}
+\def\@endpbox{\@finalstrut\@arstrutbox \par \color at endgroup \egroup\hfil}
% \end{macrocode}
% \end{macro}
%
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index 607f5305..7fd7e7b3 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -5,6 +5,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2021-02-10 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * array.dtx (section{The macros \texttt{\textbackslash @classz}):
+ Explicitly run \par at the end of pboxes in preparation for
+ paragraph hooks
+
2020-07-25 Johannes Braams <Johannes.Braams at latex-project.org>
* layout.dtx: (subsection{Options}):
More information about the latex3-commits
mailing list.