[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Fix for #863 (f006ae78)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/f006ae782cf2fc9ad426ae1f8747dd1489d4f30d

>---------------------------------------------------------------

commit f006ae782cf2fc9ad426ae1f8747dd1489d4f30d
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Jul 22 14:34:14 2022 +0200

    Fix for #863


>---------------------------------------------------------------

f006ae782cf2fc9ad426ae1f8747dd1489d4f30d
 required/latex-lab/changes.txt                     |  5 +++++
 required/latex-lab/latex-lab-footnotes.dtx         |  8 +++++---
 required/latex-lab/testfiles-OR/github-863.lvt     | 22 ++++++++++++++++++++++
 .../latex-lab/testfiles-OR/github-863.tlg          | 11 +++--------
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt
index 80b3b4a2..b4b4df98 100644
--- a/required/latex-lab/changes.txt
+++ b/required/latex-lab/changes.txt
@@ -1,3 +1,8 @@
+2022-07-22  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* latex-lab-footnotes.dtx (subsection{Document-level commands}):
+	Make mandatory arguments of  \footnote and \footnotetext long (gh863)
+
 2022-05-28 Joseph Wright <Joseph.Wright at latex-project.org>
 
 	* latex-lab-prototype.dtx
diff --git a/required/latex-lab/latex-lab-footnotes.dtx b/required/latex-lab/latex-lab-footnotes.dtx
index 330ae7b0..6fe7ff69 100644
--- a/required/latex-lab/latex-lab-footnotes.dtx
+++ b/required/latex-lab/latex-lab-footnotes.dtx
@@ -403,7 +403,7 @@
 % \subsection{File declaration}
 %    \begin{macrocode}
 \ProvidesFile{latex-lab-footnotes.ltx}
-        [2022-03-10 v0.6a changes to the footnote interfaces]
+        [2022-07-22 v0.6b changes to the footnote interfaces]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -903,9 +903,11 @@
 %
 % \subsection{Document-level commands}
 %
+% \changes{v0.6b}{2022/07/22}{Make mandatory arguments of  \cs{footnote}
+%      and \cs{footnotetext} long (gh863)}
 %    \begin{macrocode}
 
-\DeclareDocumentCommand\footnotetext {om} {
+\DeclareDocumentCommand\footnotetext {o+m} {
   \fnote_set_fnmark:nn {#1} \@mpfn
   \@footnotetext {#2}
 }
@@ -914,7 +916,7 @@
 %-------------------------------------
 
 
-\DeclareDocumentCommand\footnote {om} {
+\DeclareDocumentCommand\footnote {o+m} {
   \fnote_step_fnmark:nn {#1} \@mpfn
   \cs_set_eq:NN \@@_footnotemark_finish: \prg_do_nothing:
   \@footnotemark
diff --git a/required/latex-lab/testfiles-OR/github-863.lvt b/required/latex-lab/testfiles-OR/github-863.lvt
new file mode 100644
index 00000000..2dfbe58a
--- /dev/null
+++ b/required/latex-lab/testfiles-OR/github-863.lvt
@@ -0,0 +1,22 @@
+
+\documentclass{article}
+
+\input{regression-test}
+
+\usepackage{footmisc}
+
+\begin{document}
+
+\START
+
+\typeout{testing long argument}
+
+A \footnote{A}
+B \footnote{A \par B}
+C \footnotetext{C}
+D \footnotetext{C \par D}
+
+\newpage
+\OMIT
+\end{document}
+
diff --git a/base/testfiles/tlb0435.luatex.tlg b/required/latex-lab/testfiles-OR/github-863.tlg
similarity index 73%
copy from base/testfiles/tlb0435.luatex.tlg
copy to required/latex-lab/testfiles-OR/github-863.tlg
index 77a92b65..902835c0 100644
--- a/base/testfiles/tlb0435.luatex.tlg
+++ b/required/latex-lab/testfiles-OR/github-863.tlg
@@ -1,11 +1,6 @@
-This is a generated file for the LaTeX2e validation system.
+This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-Author: Alan Jeffrey
-Format: LaTeX2e<1994/12/01>
-Main Class: article
-hello
-hello
-hello
+testing long argument
 LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <7> on input line ....
 LaTeX Font Info:    External font `cmex10' loaded for size
@@ -15,4 +10,4 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <6> on input line ....
 [1
-] (tlb0435.aux)
+]