[latex3-commits] [git/LaTeX3-latex3-latex2e] OR-lab: more docu (27726f43)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Mar 7 19:30:13 CET 2022
Repository : https://github.com/latex3/latex2e
On branch : OR-lab
Link : https://github.com/latex3/latex2e/commit/27726f43147b52abb8a354de742962f43bd8f464
>---------------------------------------------------------------
commit 27726f43147b52abb8a354de742962f43bd8f464
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Mar 7 19:30:13 2022 +0100
more docu
>---------------------------------------------------------------
27726f43147b52abb8a354de742962f43bd8f464
required/latex-lab/latex-lab-footnotes.dtx | 100 ++++++++++++++++-------------
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git a/required/latex-lab/latex-lab-footnotes.dtx b/required/latex-lab/latex-lab-footnotes.dtx
index efe33378..09674578 100644
--- a/required/latex-lab/latex-lab-footnotes.dtx
+++ b/required/latex-lab/latex-lab-footnotes.dtx
@@ -337,8 +337,40 @@
%
% \subsubsection{Additional configuration possibilities}
%
+% The formatting of the footnote mark in front of the footnote
+% texts is influenced by the setting of the dimen parameter
+% \cs{footnotemargin}. By default its value is 1.8em in the current
+% text font (or \texttt{-}\cs{maxdimen} when the para option is
+% chosen). The following rules apply:
+% \begin{itemize}
+% \item
%
+% If it has the value \texttt{-}\cs{maxdimen} then the mark is
+% generated by \cs{@makefnmark}.
%
+% \item
+%
+% Otherwise, if the value is
+% negative then the mark is placed into an \cs{llap} left aligned
+% in a box of size \texttt{-}\cs{footnotemargin}.
+%
+% \item
+%
+% If the value is zero an \cs{llap} is used without an inner box.
+%
+% \item
+%
+% If the value is greater zero (but less than \cs{maxdimen}) the
+% mark is placed right aligned into a box of size
+% \cs{footnotemargin}.
+%
+% \item
+%
+% The value \cs{maxdimen} is used as a marker to indicate that
+% no value was given and that the default should be used,
+% i.e. 1.8em or \texttt{-}\cs{maxdimen} depending on the chosen
+% option.
+% \end{itemize}
%
%
% \section{Tagging support}
@@ -816,31 +848,16 @@
\newcounter{absfootnote}
\AddToHook{fnmark/begin}{\stepcounter{absfootnote}} % too simple (fails with opt args)
-% \AddToHook{fnmark/begin}
-% {
-% \cs_if_exist:NT \tag_struct_begin:n
-% {
-% \tag_mc_end_push:
-% \exp_args:Nx
-% \tag_struct_begin:n{tag=Lbl,ref=fn.\the\c at absfootnote}
-% \tag_mc_begin:n{tag=Lbl}
-% \IfPackageLoadedTF{hyperref}{ \hyper at linkstart {link}{fn.\the\c at absfootnote} }{}
-% }
-% }
-%
-% \AddToHook{fnmark/end}
-% {
-% \cs_if_exist:NT \tag_struct_begin:n
-% {
-% \IfPackageLoadedTF{hyperref}{ \hyper at linkend }{}
-% \tag_mc_end:
-% \tag_struct_end:
-% \tag_mc_begin_pop:n{}
-% }
-% }
+
+
+% this is rubbish and should be handled better:
+
+\cs_new:Npn \tag_if_loaded:TF { \cs_if_exist:NTF \tag_struct_begin:n }
+
+
\cs_new:Npn \tag at FEMark #1 {
- \cs_if_exist:NTF \tag_struct_begin:n
+ \tag_if_loaded:TF
{
\tag_mc_end_push:
\exp_args:Nx
@@ -860,28 +877,10 @@
\cs_set_eq:NN \@kernel at process@makefnmark \tag at FEMark
-% \AddToHook{fntext/before}
-% {
-% \cs_if_exist:NT \tag_struct_begin:n
-% {
-% \tag_mc_end_push:
-% \tag_struct_begin:n { tag=FENote,label=fn.\the\c at absfootnote }
-% }
-% }
-%
-% \AddToHook{fntext/after}
-% {
-% \cs_if_exist:NT \tag_struct_begin:n
-% {
-% \tag_struct_end:
-% \tag_mc_begin_pop:n{}
-% }
-% }
-
% kernel hook for tagging (2 args)
\cs_set:Npn \@kernel at process@footnotetext #1#2 {
- \cs_if_exist:NTF \tag_struct_begin:n
+ \tag_if_loaded:TF
{
\tag_mc_end_push:
\tag_struct_begin:n { tag=FENote,label=fn.\the\c at absfootnote }
@@ -909,7 +908,7 @@
\cs_new:Npn \tag at FELbl#1{
- \cs_if_exist:NTF \tag_struct_begin:n
+ \tag_if_loaded:TF
{
% target should perhaps be raised ...
\IfPackageLoadedTF{hyperref}{ \hypertarget{fn.\the\c at absfootnote}{} }{}
@@ -924,7 +923,7 @@
}
\def\tag at FENote#1{
- \cs_if_exist:NTF \tag_struct_begin:n
+ \tag_if_loaded:TF
{
\tag_mc_begin:n{tag=FENote}
#1
@@ -934,6 +933,9 @@
{ #1 }
}
+
+
+
%-------------------------------------
@@ -975,7 +977,7 @@
\DeclareRelease{v5}{2011-06-06}{footmisc-2011-06-06.sty}
\DeclareCurrentRelease{}{2022-02-14}
\ProvidesPackage{latex-lab-footmisc}%
- [2022/02/14 v6.0b
+ [2022/03/07 v6.0c
a miscellany of footnote facilities -- latex-lab version%
]
@@ -1293,6 +1295,14 @@
\ifFN at perpage
\RequirePackage{perpage}
\MakePerPage{footnote}
+% \end{macrocode}
+% Fix a bug in perpage \ldots
+% \begin{macrocode}
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m at ne
+ \stepcounter{#1}%
+ \setcounter{#1}{0}%
+ }
+ \def\pp at cl@end at iii\stepcounter#1\setcounter#2#3{}
\fi
More information about the latex3-commits
mailing list.