[latex3-commits] [git/LaTeX3-latex3-latex2e] footrefmark: renamed \footrefmark to \footref (047d220b)
Frank Mittelbach
frank.mittelbach at latex-project.org
Wed Jan 27 12:01:19 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : footrefmark
Link : https://github.com/latex3/latex2e/commit/047d220bf67c49b27f1660433d813b2d3d5f8776
>---------------------------------------------------------------
commit 047d220bf67c49b27f1660433d813b2d3d5f8776
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Wed Jan 27 12:01:19 2021 +0100
renamed \footrefmark to \footref
>---------------------------------------------------------------
047d220bf67c49b27f1660433d813b2d3d5f8776
base/changes.txt | 2 +-
base/doc/ltnews33.tex | 8 +++++---
base/ltfloat.dtx | 22 +++++++++++-----------
...tlb-footrefmark-001.lvt => tlb-footref-001.lvt} | 4 ++--
...tlb-footrefmark-001.tlg => tlb-footref-001.tlg} | 2 +-
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 6 ++----
.../tlb-latexrelease-rollback-003-often.tlg | 6 ++----
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 6 ++----
base/testfiles/tlb-rollback-004-often.luatex.tlg | 3 +--
base/testfiles/tlb-rollback-004-often.tlg | 3 +--
base/testfiles/tlb-rollback-004-often.xetex.tlg | 3 +--
11 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index b34f9882..0fa6fbed 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -9,7 +9,7 @@ are not part of the distribution.
2021-01-26 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltfloat.dtx (subsection{Footnotes}):
- \footrefmark added
+ \footref added
2021-01-22 Marcel Krüger <Marcel.Krueger at latex-project.org>
diff --git a/base/doc/ltnews33.tex b/base/doc/ltnews33.tex
index efe8b029..8589326d 100644
--- a/base/doc/ltnews33.tex
+++ b/base/doc/ltnews33.tex
@@ -201,10 +201,12 @@ or last.
It is sometimes necessary to reference the same footnote several
times, i.e., produce several footnote marks with the same number or
-symbol. This is now possible by placing a \cs{label} into the
-\cs{footnote} and reference it with the command \cs{footrefmark}
+symbol. This is now always possible by placing a \cs{label} into the
+\cs{footnote} and reference it with the command \cs{footref}
elsewhere. This way marks refering to footnotes anywhere on the page
-(including those in \texttt{minipage}s) can be generated.
+(including those in \texttt{minipage}s) can be generated. In the past
+this command was only available with certain classes or when loading
+the \pkg{footmisc} package.
diff --git a/base/ltfloat.dtx b/base/ltfloat.dtx
index afb11d89..8ab7b539 100644
--- a/base/ltfloat.dtx
+++ b/base/ltfloat.dtx
@@ -1566,17 +1566,17 @@
%
%
%
-% \begin{macro}{\footrefmark}
+% \begin{macro}{\footref}
% This command generates a footnote mark. The value is produced by
% referencing a \cs{label} placed into a \cs{footnote} elsewhere
% (can be one in the main galley or in a minipage).
-% \changes{v1.2e}{2021/01/26}{\cs{footrefmark} added}
+% \changes{v1.2e}{2021/01/26}{\cs{footref} added}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2021/05/01}%
-%<latexrelease> {\footrefmark}{Add footrefmark}%
-\DeclareRobustCommand*\footrefmark[1]{%
+%<latexrelease> {\footref}{Add footref}%
+\def\footref#1{%
\begingroup
\unrestored at protected@xdef\@thefnmark{\ref{#1}}%
\endgroup
@@ -1585,14 +1585,14 @@
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
-%
+% We don't remove it when rolling back.
% \begin{macrocode}
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\footrefmark}{Add footrefmark}%
-%<latexrelease>
-%<latexrelease>\let\footrefmark\@undefined
-%<latexrelease>
-%<latexrelease>\EndIncludeInRelease
+%%<latexrelease>\IncludeInRelease{0000/00/00}%
+%%<latexrelease> {\footref}{Add footref}%
+%%<latexrelease>
+%%<latexrelease>\let\footref\@undefined
+%%<latexrelease>
+%%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
% \end{macro}
diff --git a/base/testfiles/tlb-footrefmark-001.lvt b/base/testfiles/tlb-footref-001.lvt
similarity index 87%
rename from base/testfiles/tlb-footrefmark-001.lvt
rename to base/testfiles/tlb-footref-001.lvt
index 6b549af3..53b3f57b 100644
--- a/base/testfiles/tlb-footrefmark-001.lvt
+++ b/base/testfiles/tlb-footref-001.lvt
@@ -14,12 +14,12 @@
Footnotes in a minipage are numbered using
lowercase letters.\footnote{\label{B}Inside
minipage} This text references a footnote
- at the bottom\footrefmark{A} of the page.
+ at the bottom\footref{A} of the page.
And another\footnote{Inside again} note.
\end{minipage}
\end{center}
\ldots{} main text referencing minipage
-footnote\footrefmark{B}.
+footnote\footref{B}.
\end{document}
diff --git a/base/testfiles/tlb-footrefmark-001.tlg b/base/testfiles/tlb-footref-001.tlg
similarity index 99%
rename from base/testfiles/tlb-footrefmark-001.tlg
rename to base/testfiles/tlb-footref-001.tlg
index 596d90ac..e8a2d3eb 100644
--- a/base/testfiles/tlb-footrefmark-001.tlg
+++ b/base/testfiles/tlb-footref-001.tlg
@@ -425,4 +425,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(tlb-footrefmark-001.aux)
+(tlb-footref-001.aux)
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 785311fc..98c9fe4f 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -348,8 +348,7 @@ Applying: [....-..-..] \textsubscript on input line ...
Skipping: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Skipping: [....-..-..] Make commands robust on input line ....
@@ -860,8 +859,7 @@ Already applied: [....-..-..] \textsubscript on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Make commands robust on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 0c2162eb..624cc768 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -342,8 +342,7 @@ Applying: [....-..-..] \textsubscript on input line ...
Skipping: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Skipping: [....-..-..] Make commands robust on input line ....
@@ -844,8 +843,7 @@ Already applied: [....-..-..] \textsubscript on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Make commands robust on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index f194a9cc..cb6d67d4 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -342,8 +342,7 @@ Applying: [....-..-..] \textsubscript on input line ...
Skipping: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Skipping: [....-..-..] Make commands robust on input line ....
@@ -853,8 +852,7 @@ Already applied: [....-..-..] \textsubscript on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Make commands robust on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 9350c707..e938b0ec 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -716,8 +716,7 @@ Already applied: [....-..-..] \textsubscript on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Make commands robust on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index b609f778..dcddc888 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -704,8 +704,7 @@ Already applied: [....-..-..] \textsubscript on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Make commands robust on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index d4ce10d3..7fc0c1d1 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -705,8 +705,7 @@ Already applied: [....-..-..] \textsubscript on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
-Skipping: [....-..-..] Add footrefmark on input line ....
-Applying: [....-..-..] Add footrefmark on input line ....
+Skipping: [....-..-..] Add footref on input line ....
Skipping: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Allow nocite in preamble on input line ....
Applying: [....-..-..] Make commands robust on input line ....
More information about the latex3-commits
mailing list.