[latex3-commits] [git/LaTeX3-latex3-latex2e] OR-lab: WIP (4146840c)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Feb 27 00:33:21 CET 2022
Repository : https://github.com/latex3/latex2e
On branch : OR-lab
Link : https://github.com/latex3/latex2e/commit/4146840c05c6e5db40627392004a973e03efc206
>---------------------------------------------------------------
commit 4146840c05c6e5db40627392004a973e03efc206
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Feb 27 00:33:21 2022 +0100
WIP
>---------------------------------------------------------------
4146840c05c6e5db40627392004a973e03efc206
required/latex-lab/config-OR.lua | 2 +
required/latex-lab/latex-lab-footnotes.dtx | 106 ++++++-
.../testfiles-OR/footmisc-009-multiple.tlg | 52 ++--
.../testfiles-OR/footmisc-010-setspace.tlg | 28 +-
.../{footmisc-009-multiple.lvt => tagging-001.lvt} | 16 +-
required/latex-lab/testfiles-OR/tagging-001.tlg | 323 +++++++++++++++++++++
required/latex-lab/update-OR-all.sh | 2 +
required/latex-lab/usage-of- at footnotetext.txt | 66 +++--
8 files changed, 511 insertions(+), 84 deletions(-)
diff --git a/required/latex-lab/config-OR.lua b/required/latex-lab/config-OR.lua
index a0aade5f..fa74ce3d 100644
--- a/required/latex-lab/config-OR.lua
+++ b/required/latex-lab/config-OR.lua
@@ -4,3 +4,5 @@ stdengine = "pdftex"
checkengines = {"pdftex"}
checksearch = true
testfiledir = "testfiles-OR"
+
+-- checkruns = 3
diff --git a/required/latex-lab/latex-lab-footnotes.dtx b/required/latex-lab/latex-lab-footnotes.dtx
index b352fd59..03cc133d 100644
--- a/required/latex-lab/latex-lab-footnotes.dtx
+++ b/required/latex-lab/latex-lab-footnotes.dtx
@@ -188,12 +188,15 @@
%-------------------------------------
+\NewHook{fntext/before}
\NewHook{fntext/begin}
+\NewHook{fntext/after}
\long\def\@footnotetext#1{
%-------
% ./linguex/linguex.sty
+ \UseHook{fntext/before}
%-------
\@footnotetext at process { % config point
%-------
@@ -220,9 +223,7 @@
% ./resphilosophica/resphilosophica.cls
%-------
\def\@currentcounter{footnote}
- \protected at edef \@currentlabel {
- \csname p at footnote\endcsname \@thefnmark
- }%
+ \protected at edef \@currentlabel { \p at footnote \@thefnmark }
\color at begingroup
%-------
% fnpara wants to replace \@makefntext{...} (footmisc probably too ...)
@@ -251,6 +252,7 @@
}
%-------
% ./linguex/linguex.sty
+ \UseHook{fntext/after}
%-------
}
@@ -258,16 +260,16 @@
\def\@footnotetext at process { \insert\footins }
-% to survive overwriting by setspace for now
+% to survive overwrite by setspace for now
\let \FN at footnotetext \@footnotetext
% firstaid for setspace:
\AddToHook{package/setspace/after}
- {\let \@footnotetext \FN at footnotetext
- \AddToHook{fntext/begin}[setspace]{\let\baselinestretch\setspace at singlespace}%
- }
+ {\let \@footnotetext \FN at footnotetext % should not overwrite it but use hook
+ \AddToHook{fntext/begin}[setspace]{\let\baselinestretch\setspace at singlespace}}
+
@@ -332,6 +334,94 @@
\@footnotemark
}
+
+
+%-------------------------------------
+% Tagging
+%-------------------------------------
+
+% hyperref support commented out
+
+\newcounter{absfootnote}
+\AddToHook{fnmark}{\stepcounter{absfootnote}} % too simple (fails with opt args)
+
+\AddToHook{fnmark}
+{
+ \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}
+% \hyper at linkstart {link}{fn.\the\c at absfootnote}
+ }
+}
+
+\AddToHook{fnmark/end}
+{
+ \cs_if_exist:NT \tag_struct_begin:n
+ {
+% \Hyper at linkend
+ \tag_mc_end:
+ \tag_struct_end:
+ \tag_mc_begin_pop:n{}
+ }
+}
+
+\AddToHook{fntext/before}
+{
+ \cs_if_exist:NT \tag_struct_begin:n
+ {
+ \bool_gset_eq:NN \g__tag_saved_in_mc_bool \g__tag_in_mc_bool
+ \bool_gset_false:N \g__tag_in_mc_bool
+ }
+}
+
+\AddToHook{fntext/after}
+{
+ \cs_if_exist:NT \tag_struct_begin:n
+ {
+ \bool_gset_eq:NN \g__tag_in_mc_bool\g__tag_saved_in_mc_bool
+ }
+}
+
+% align this with redefs below instead ...
+
+\AtBeginDocument{
+ \def\@makefntext #1 {
+ \parindent 1em
+ \noindent
+ \tag at FENote { \hb at xt@1.8em{\hss\@makefnmark} }{ #1 }
+ }
+}
+
+\def\tag at FENote#1#2{
+ \cs_if_exist:NTF \tag_struct_begin:n
+ {
+ \tag_mc_end_push:
+% \hypertarget{fn.\the\c at absfootnote}{}
+ \tag_struct_begin:n
+ {
+ tag=FENote
+ ,label=fn.\the\c at absfootnote
+ }
+ \tag_struct_begin:n{tag=Lbl}
+ \tag_mc_begin:n{tag=Lbl}
+ #1
+ \tag_mc_end:
+ \tag_struct_end:
+ \tag_mc_begin:n{tag=FENote}
+ #2
+ \tag_mc_end:
+ \tag_struct_end:
+ \tag_mc_begin_pop:n{}
+ }
+ { #1 #2 }
+}
+
+%-------------------------------------
+
+
\ExplSyntaxOff
@@ -1039,8 +1129,6 @@
\endinput
-\def\@makefntext
- {\noindent\tagstructbegin{tag=Lbl}\tagmcbegin{tag=Lbl}\@makefnmark\tagmcend\tagstructend}
\ExplSyntaxOn
\AddToHook{cmd/footnote/before}{\tag_mc_end_push:\bgroup\tagpdfparaOff\tagstructbegin{tag=Note}}
diff --git a/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
index bd5cfb1d..ac37018e 100644
--- a/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
@@ -27,7 +27,7 @@ Completed box being shipped out [1]
...\pdfrunninglinkon
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 441.49358fil
+..\vbox(550.0+0.0)x345.0, glue set 441.82678fil
...\write-{}
...\glue(\topskip) 1.85997
...\hbox(8.14003+0.0)x345.0, glue set 292.34714fil
@@ -124,8 +124,8 @@ Completed box being shipped out [1]
....\glue(\rightskip) 0.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
-...\glue(\baselineskip) 3.12236
-...\hbox(8.87764+1.94444)x345.0, glue set 170.68123fil
+...\glue(\baselineskip) 3.51115
+...\hbox(8.48885+1.94444)x345.0, glue set 169.82033fil
....\hbox(0.0+0.0)x15.0
....\OT1/cmr/m/n/10 W
....\kern-0.83334
@@ -135,10 +135,10 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 g
....\OT1/cmr/m/n/10 :
....\penalty 10000
-....\hbox(8.87764+0.0)x4.48514
+....\hbox(8.48885+0.0)x5.34604
.....\mathon
-.....\hbox(5.24872+1.74957)x4.48514, shifted -3.62892
-......\TS1/cmr/m/n/7 ^^86
+.....\hbox(4.85992+1.36078)x5.34604, shifted -3.62892
+......\TS1/cmr/m/n/7 ^^b6
.....\mathoff
....\kern -0.00005
....\kern 0.00005
@@ -180,8 +180,8 @@ Completed box being shipped out [1]
...\kern -3.0
...\rule(0.4+0.0)x137.9979
...\kern 2.6
-...\hbox(6.68999+2.85002)x345.0, glue set 320.6332fil
-....\hbox(6.68999+0.0)x18.00005, glue set 13.83344fil
+...\hbox(6.68999+2.85002)x345.0, glue set 323.33301fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.68999+0.0)x4.16661
......\mathon
@@ -196,8 +196,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.68999+2.85002)x345.0, glue set 320.9832fil
-....\hbox(6.68999+0.0)x18.00005, glue set 13.83344fil
+...\hbox(6.68999+2.85002)x345.0, glue set 323.68301fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.68999+0.0)x4.16661
......\mathon
@@ -213,8 +213,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.68999+2.85002)x345.0, glue set 320.86098fil
-....\hbox(6.68999+0.0)x18.00005, glue set 13.83344fil
+...\hbox(6.68999+2.85002)x345.0, glue set 323.56079fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.68999+0.0)x4.16661
......\mathon
@@ -229,8 +229,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 320.51097fil
-....\hbox(6.98898+0.0)x18.00005, glue set 14.22308fil
+...\hbox(6.98898+2.85002)x345.0, glue set 323.21078fil
+....\hbox(6.98898+0.0)x15.30023, glue set 11.52327fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.98898+0.0)x3.77696
......\mathon
@@ -245,8 +245,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 321.21931fil
-....\hbox(6.98898+0.0)x18.00005, glue set 14.22308fil
+...\hbox(6.98898+2.85002)x345.0, glue set 323.91913fil
+....\hbox(6.98898+0.0)x15.30023, glue set 11.52327fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.98898+0.0)x3.77696
......\mathon
@@ -261,13 +261,13 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 321.45543fil
-....\hbox(6.98898+0.0)x18.00005, glue set 13.0567fil
+...\hbox(6.98898+2.85002)x345.0, glue set 324.15524fil
+....\hbox(6.98898+0.0)x15.30023, glue set 11.52327fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(6.98898+0.0)x4.94334
+.....\hbox(6.98898+0.0)x3.77696
......\mathon
-......\hbox(4.16565+1.16638)x4.94334, shifted -2.82333
-.......\TS1/cmr/m/n/6 ^^b6
+......\hbox(4.16565+1.16638)x3.77696, shifted -2.82333
+.......\TS1/cmr/m/n/6 ^^a7
......\mathoff
....\hbox(6.65+0.0)x0.0
.....\rule(6.65+0.0)x0.0
@@ -277,13 +277,13 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(7.32224+2.85002)x345.0, glue set 320.3318fil
-....\hbox(7.32224+0.0)x18.00005, glue set 13.83427fil
+...\hbox(6.98898+2.85002)x345.0, glue set 323.03162fil
+....\hbox(6.98898+0.0)x15.30023, glue set 10.35689fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(7.32224+0.0)x4.16577
+.....\hbox(6.98898+0.0)x4.94334
......\mathon
-......\hbox(4.4989+1.49963)x4.16577, shifted -2.82333
-.......\TS1/cmr/m/n/6 ^^86
+......\hbox(4.16565+1.16638)x4.94334, shifted -2.82333
+.......\TS1/cmr/m/n/6 ^^b6
......\mathoff
....\hbox(6.65+0.0)x0.0
.....\rule(6.65+0.0)x0.0
diff --git a/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
index de836f0d..09ddae1d 100644
--- a/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
@@ -554,8 +554,8 @@ Completed box being shipped out [1]
...\kern -3.0
...\rule(0.4+0.0)x137.9979
...\kern 2.6
-...\hbox(6.68999+1.55556)x345.0, glue set 0.23169
-....\hbox(6.68999+0.0)x18.00005, glue set 13.83344fil
+...\hbox(6.68999+1.55556)x345.0, glue set 0.36311
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.68999+0.0)x4.16661
......\mathon
@@ -1017,8 +1017,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.68999+2.85002)x345.0, glue set 320.9832fil
-....\hbox(6.68999+0.0)x18.00005, glue set 13.83344fil
+...\hbox(6.68999+2.85002)x345.0, glue set 323.68301fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.68999+0.0)x4.16661
......\mathon
@@ -1034,8 +1034,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.68999+2.85002)x345.0, glue set 320.86098fil
-....\hbox(6.68999+0.0)x18.00005, glue set 13.83344fil
+...\hbox(6.68999+2.85002)x345.0, glue set 323.56079fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.68999+0.0)x4.16661
......\mathon
@@ -1050,8 +1050,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 320.51097fil
-....\hbox(6.98898+0.0)x18.00005, glue set 14.22308fil
+...\hbox(6.98898+2.85002)x345.0, glue set 323.21078fil
+....\hbox(6.98898+0.0)x15.30023, glue set 11.52327fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.98898+0.0)x3.77696
......\mathon
@@ -1066,8 +1066,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 321.21931fil
-....\hbox(6.98898+0.0)x18.00005, glue set 14.22308fil
+...\hbox(6.98898+2.85002)x345.0, glue set 323.91913fil
+....\hbox(6.98898+0.0)x15.30023, glue set 11.52327fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.98898+0.0)x3.77696
......\mathon
@@ -1082,8 +1082,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 222.98874fil
-....\hbox(6.98898+0.0)x18.00005, glue set 14.22308fil
+...\hbox(6.98898+2.85002)x345.0, glue set 225.68855fil
+....\hbox(6.98898+0.0)x15.30023, glue set 11.52327fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.98898+0.0)x3.77696
......\mathon
@@ -1124,8 +1124,8 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\hbox(6.98898+2.85002)x345.0, glue set 320.3318fil
-....\hbox(6.98898+0.0)x18.00005, glue set 13.0567fil
+...\hbox(6.98898+2.85002)x345.0, glue set 323.03162fil
+....\hbox(6.98898+0.0)x15.30023, glue set 10.35689fil
.....\glue 0.0 plus 1.0fil minus 1.0fil
.....\hbox(6.98898+0.0)x4.94334
......\mathon
diff --git a/required/latex-lab/testfiles-OR/footmisc-009-multiple.lvt b/required/latex-lab/testfiles-OR/tagging-001.lvt
similarity index 66%
copy from required/latex-lab/testfiles-OR/footmisc-009-multiple.lvt
copy to required/latex-lab/testfiles-OR/tagging-001.lvt
index cad9f75d..2a11d36c 100644
--- a/required/latex-lab/testfiles-OR/footmisc-009-multiple.lvt
+++ b/required/latex-lab/testfiles-OR/tagging-001.lvt
@@ -1,11 +1,11 @@
-\DocumentMetadata{testphase=new-or}
+\DocumentMetadata{uncompress,testphase=phase-II,pdfversion=2.0,debug=para}
\documentclass{article}
\input{regression-test}
-\usepackage[multiple]{footmisc}
+%\usepackage[multiple]{footmisc}
\showoutput
@@ -14,6 +14,14 @@
\START
+abc \footnote{blub} xyz\footnotemark
+
+\footnotetext{huhu}
+
+\newpage
+\OMIT
+\end{document}
+
Test\footnote{A}\footnote{\label{foo}B}\footnote[7]{C}
@@ -25,7 +33,3 @@ Test\footnote{D} and\footnote{E}\footref{foo}
Wrong:\footnotetext{F}\footnote{G} there should be no comma!
-
-\newpage
-\OMIT
-\end{document}
diff --git a/required/latex-lab/testfiles-OR/tagging-001.tlg b/required/latex-lab/testfiles-OR/tagging-001.tlg
new file mode 100644
index 00000000..de3d05f2
--- /dev/null
+++ b/required/latex-lab/testfiles-OR/tagging-001.tlg
@@ -0,0 +1,323 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <7> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <5> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <8> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <6> on input line ....
+! Package tagpdf Error: required tag missing - mcid 11
+Type <return> to continue.
+ ...
+l. ...
+LaTeX does not know anything more about this error, sorry.
+Try typing <return> to proceed.
+If that doesn't work, type X <return> to quit.
+Package tagpdf Warning: tag is not known
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\hbox(0.0+0.0)x0.0
+..\kern -72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
+...\kern -72.26999
+...\hbox(0.0+0.0)x0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\pdfrunninglinkoff
+...\pdfliteral page{/Artifact BMC}
+...\marks1{b-,20,-1,}
+...\marks1{b+,20,-1,}
+...\hbox(0.0+0.0)x345.0
+....\hbox(0.0+0.0)x345.0
+...\pdfliteral page{EMC}
+...\marks1{e-,20,1,}
+...\marks1{e+,20,1,}
+...\pdfrunninglinkon
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 514.71503fil
+...\hbox(0.0+0.0)x0.0
+...\pdfinterwordspaceon
+...\write-{}
+...\glue(\topskip) 1.85997
+...\hbox(8.14003+1.94444)x345.0, glue set 284.08322fil
+....\pdfliteral page{/Artifact BMC}
+....\hbox(3.22221+0.0)x0.0, glue set - 5.76398fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.....\OT1/cmr/m/n/5 1
+.....\glue 2.36115 plus 1.04169 minus 0.69444
+....\pdfcolorstack 0 pop
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-2}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{2}{tagmcid}{0}}}
+....\pdfliteral page{/P /l3pdf1 BDC}
+....\write1{\newlabeldata{l3pdf1}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 b
+....\kern0.27779
+....\OT1/cmr/m/n/10 c
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\penalty 10000
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-3}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{3}{tagmcid}{1}}}
+....\pdfliteral page{/Lbl /l3pdf2 BDC}
+....\write1{\newlabeldata{l3pdf2}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(8.14003+0.0)x4.48613
+.....\mathon
+.....\hbox(4.51111+0.0)x4.48613, shifted -3.62892
+......\OT1/cmr/m/n/7 1
+.....\mathoff
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-4}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{4}{tagmcid}{2}}}
+....\pdfliteral page{/P /l3pdf3 BDC}
+....\write1{\newlabeldata{l3pdf3}{{abspage}{\__ref_attribute_abspage: }}}
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 y
+....\OT1/cmr/m/n/10 z
+....\penalty 10000
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-11}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{11}{tagmcid}{7}}}
+....\pdfliteral page{/Lbl /l3pdf8 BDC}
+....\write1{\newlabeldata{l3pdf8}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(8.14003+0.0)x4.48613
+.....\mathon
+.....\hbox(4.51111+0.0)x4.48613, shifted -3.62892
+......\OT1/cmr/m/n/7 2
+.....\mathoff
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-12}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{12}{tagmcid}{8}}}
+....\pdfliteral page{/ /l3pdf9 BDC}
+....\write1{\newlabeldata{l3pdf9}{{abspage}{\__ref_attribute_abspage: }}}
+....\pdfliteral page{EMC}
+....\pdfliteral page{/Artifact BMC}
+....\hbox(3.22221+0.0)x0.0, glue set - 5.76398fil
+.....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.....\glue 2.36115 plus 1.04169 minus 0.69444
+.....\OT1/cmr/m/n/5 2
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\pdfcolorstack 0 pop
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks1{b-,1,-1,}
+...\marks1{b+,1,-1,}
+...\marks1{e-,1,2,}
+...\marks1{e+,1,2,}
+...\marks1{b-,2,2,P,,,}
+...\marks1{b+,2,2,P,,,}
+...\marks1{e-,2,2,}
+...\marks1{e+,2,2,}
+...\marks1{b-,3,3,Lbl,,,}
+...\marks1{b+,3,3,Lbl,,,}
+...\marks1{e-,3,3,}
+...\marks1{e+,3,3,}
+...\marks1{b-,4,2,P,,,}
+...\marks1{b+,4,2,P,,,}
+...\marks1{e-,10,2,}
+...\marks1{e+,10,2,}
+...\marks1{b-,11,7,Lbl,,,}
+...\marks1{b+,11,7,Lbl,,,}
+...\marks1{e-,11,7,}
+...\marks1{e+,11,7,}
+...\marks1{b-,12,2,,,,}
+...\marks1{b+,12,2,,,,}
+...\marks1{e-,12,2,}
+...\marks1{e+,12,2,}
+...\marks1{b-,13,-1,}
+...\marks1{b+,13,-1,}
+...\marks1{e-,13,2,}
+...\marks1{e+,13,2,}
+...\glue -1.94444
+...\glue 0.0 plus 1.0fil
+...\kern 0.0
+...\hbox(0.0+0.0)x0.0
+...\glue 9.0 plus 4.0 minus 2.0
+...\kern -3.0
+...\rule(0.4+0.0)x137.9979
+...\kern 2.6
+...\hbox(0.0+0.0)x0.0
+...\hbox(6.68999+2.85002)x345.0, glue set 313.17175fil
+....\pdfliteral page{/Artifact BMC}
+....\hbox(3.22221+0.0)x0.0, glue set - 5.76398fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.....\OT1/cmr/m/n/5 2
+.....\glue 2.36115 plus 1.04169 minus 0.69444
+....\pdfcolorstack 0 pop
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-6}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{6}{tagmcid}{3}}}
+....\pdfliteral page{/P /l3pdf4 BDC}
+....\write1{\newlabeldata{l3pdf4}{{abspage}{\__ref_attribute_abspage: }}}
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{tagpdfstruct-fn.1}{{tagstruct}{5}{tagstructobj}{26 0 R}}}
+....\write1{\newlabeldata{mcid-7}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{7}{tagmcid}{4}}}
+....\pdfliteral page{/Lbl /l3pdf5 BDC}
+....\write1{\newlabeldata{l3pdf5}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\hbox(6.68999+0.0)x4.16661
+......\mathon
+......\hbox(3.86665+0.0)x4.16661, shifted -2.82333
+.......\OT1/cmr/m/n/6 1
+......\mathoff
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-8}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{8}{tagmcid}{5}}}
+....\pdfliteral page{/FENote /l3pdf6 BDC}
+....\write1{\newlabeldata{l3pdf6}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(6.65+0.0)x0.0
+.....\rule(6.65+0.0)x0.0
+....\OT1/cmr/m/n/8 b
+....\OT1/cmr/m/n/8 l
+....\OT1/cmr/m/n/8 u
+....\OT1/cmr/m/n/8 b
+....\penalty 10000
+....\rule(0.0+2.85002)x0.0
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-9}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{9}{tagmcid}{6}}}
+....\pdfliteral page{/P /l3pdf7 BDC}
+....\write1{\newlabeldata{l3pdf7}{{abspage}{\__ref_attribute_abspage: }}}
+....\pdfliteral page{EMC}
+....\pdfliteral page{/Artifact BMC}
+....\hbox(3.22221+0.0)x0.0, glue set - 5.76398fil
+.....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.....\glue 2.36115 plus 1.04169 minus 0.69444
+.....\OT1/cmr/m/n/5 1
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\pdfcolorstack 0 pop
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks1{b-,5,-1,}
+...\marks1{b+,5,-1,}
+...\marks1{e-,5,4,}
+...\marks1{e+,5,4,}
+...\marks1{b-,6,4,P,,,}
+...\marks1{b+,6,4,P,,,}
+...\marks1{e-,6,4,}
+...\marks1{e+,6,4,}
+...\marks1{b-,7,6,Lbl,,,}
+...\marks1{b+,7,6,Lbl,,,}
+...\marks1{e-,7,6,}
+...\marks1{e+,7,6,}
+...\marks1{b-,8,5,FENote,,,}
+...\marks1{b+,8,5,FENote,,,}
+...\marks1{e-,8,5,}
+...\marks1{e+,8,5,}
+...\marks1{b-,9,4,P,,,}
+...\marks1{b+,9,4,P,,,}
+...\marks1{e-,9,4,}
+...\marks1{e+,9,4,}
+...\marks1{b-,10,-1,}
+...\marks1{b+,10,-1,}
+...\marks1{e-,10,4,}
+...\marks1{e+,10,4,}
+...\hbox(6.68999+2.85002)x345.0, glue set 311.28284fil
+....\pdfliteral page{/Artifact BMC}
+....\hbox(3.22221+0.0)x0.0, glue set - 5.76398fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.....\OT1/cmr/m/n/5 3
+.....\glue 2.36115 plus 1.04169 minus 0.69444
+....\pdfcolorstack 0 pop
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-15}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{15}{tagmcid}{9}}}
+....\pdfliteral page{/P /l3pdf10 BDC}
+....\write1{\newlabeldata{l3pdf10}{{abspage}{\__ref_attribute_abspage: }}}
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{tagpdfstruct-fn.2}{{tagstruct}{9}{tagstructobj}{36 0 R}}}
+....\write1{\newlabeldata{mcid-16}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{16}{tagmcid}{10}}}
+....\pdfliteral page{/Lbl /l3pdf11 BDC}
+....\write1{\newlabeldata{l3pdf11}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\hbox(6.68999+0.0)x4.16661
+......\mathon
+......\hbox(3.86665+0.0)x4.16661, shifted -2.82333
+.......\OT1/cmr/m/n/6 2
+......\mathoff
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-17}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{17}{tagmcid}{11}}}
+....\pdfliteral page{/FENote /l3pdf12 BDC}
+....\write1{\newlabeldata{l3pdf12}{{abspage}{\__ref_attribute_abspage: }}}
+....\hbox(6.65+0.0)x0.0
+.....\rule(6.65+0.0)x0.0
+....\OT1/cmr/m/n/8 h
+....\kern-0.23611
+....\OT1/cmr/m/n/8 u
+....\OT1/cmr/m/n/8 h
+....\kern-0.23611
+....\OT1/cmr/m/n/8 u
+....\penalty 10000
+....\rule(0.0+2.85002)x0.0
+....\pdfliteral page{EMC}
+....\write1{\newlabeldata{mcid-18}{{tagabspage}{\__ref_attribute_tagabspage: }{tagmcabs}{18}{tagmcid}{12}}}
+....\pdfliteral page{/P /l3pdf13 BDC}
+....\write1{\newlabeldata{l3pdf13}{{abspage}{\__ref_attribute_abspage: }}}
+....\pdfliteral page{EMC}
+....\pdfliteral page{/Artifact BMC}
+....\hbox(3.22221+0.0)x0.0, glue set - 5.76398fil
+.....\pdfcolorstack 0 push {1.0 0.0 0.0 rg 1.0 0.0 0.0 RG}
+.....\glue 2.36115 plus 1.04169 minus 0.69444
+.....\OT1/cmr/m/n/5 3
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\pdfcolorstack 0 pop
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks1{b-,14,-1,}
+...\marks1{b+,14,-1,}
+...\marks1{e-,14,8,}
+...\marks1{e+,14,8,}
+...\marks1{b-,15,8,P,,,}
+...\marks1{b+,15,8,P,,,}
+...\marks1{e-,15,8,}
+...\marks1{e+,15,8,}
+...\marks1{b-,16,10,Lbl,,,}
+...\marks1{b+,16,10,Lbl,,,}
+...\marks1{e-,16,10,}
+...\marks1{e+,16,10,}
+...\marks1{b-,17,9,FENote,,,}
+...\marks1{b+,17,9,FENote,,,}
+...\marks1{e-,17,9,}
+...\marks1{e+,17,9,}
+...\marks1{b-,18,8,P,,,}
+...\marks1{b+,18,8,P,,,}
+...\marks1{e-,18,8,}
+...\marks1{e+,18,8,}
+...\marks1{b-,19,-1,}
+...\marks1{b+,19,-1,}
+...\marks1{e-,19,8,}
+...\marks1{e+,19,8,}
+...\kern -2.85002
+...\hbox(0.0+2.85002)x0.0
+...\glue -2.85002
+...\glue 0.0 plus 0.0001fil
+..\pdfrunninglinkoff
+..\pdfliteral page{/Artifact BMC}
+..\marks1{b-,21,-1,}
+..\marks1{b+,21,-1,}
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0
+...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
+....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+..\pdfliteral page{EMC}
+..\marks1{e-,21,1,}
+..\marks1{e+,21,1,}
+..\pdfrunninglinkon
+.\kern 0.0
+.\kern -633.0
+.\hbox(0.0+0.0)x0.0
+.\kern 633.0
diff --git a/required/latex-lab/update-OR-all.sh b/required/latex-lab/update-OR-all.sh
index 45001976..afcbc8d4 100644
--- a/required/latex-lab/update-OR-all.sh
+++ b/required/latex-lab/update-OR-all.sh
@@ -24,6 +24,8 @@ l3build save -cconfig-OR \
footmisc-006 \
footmisc-007-rollback \
footmisc-008-pdfcol \
+ footmisc-009-multiple \
+ footmisc-010-setspace \
github-001 \
footmisc-symbols-001 \
footmisc-symbols-002 \
diff --git a/required/latex-lab/usage-of- at footnotetext.txt b/required/latex-lab/usage-of- at footnotetext.txt
index be4792a8..f9f2549c 100644
--- a/required/latex-lab/usage-of- at footnotetext.txt
+++ b/required/latex-lab/usage-of- at footnotetext.txt
@@ -145,6 +145,8 @@
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
\color at endgroup}}
+%-------------------------------------
+
% ./linguex/linguex.sty
@@ -155,6 +157,8 @@
\@noftnotetrue}
+%-------------------------------------
+
% ./fnpara/fnpara.sty
@@ -178,35 +182,7 @@
\dp0=0pt \ht0=\fudgefactor\wd0 \box0
\color at endgroup}}
-
-% ./footmisc/footmisc.sty (normal)
-
-% this is missing the \par at the end and \@currentcounter
-
- \long\def\FN at footnotetext#1{%
- \insert\footins{%
- \ifFN at setspace
- \let\baselinestretch\FN at baselinestretch
- \fi
- \reset at font\footnotesize
- \interlinepenalty\interfootnotelinepenalty
- \splittopskip\footnotesep
- \splitmaxdepth \dp\strutbox
- \floatingpenalty\@MM
- \hsize\columnwidth
- \@parboxrestore
- \protected at edef\@currentlabel{%
- \csname p at footnote\endcsname\@thefnmark
- }%
- \color at begingroup
- \@makefntext{%
- \rule\z@\footnotesep
- \ignorespaces#1\@finalstrut\strutbox
- }%
- \color at endgroup
- }%
- \FN at mf@prepare
- }%
+%-------------------------------------
% ./footmisc/footmisc.sty (para option)
@@ -242,6 +218,38 @@
\FN at mf@prepare
}
+%-------------------------------------
+
+
+% ./footmisc/footmisc.sty (normal)
+
+% this is missing the \par at the end and \@currentcounter
+
+ \long\def\FN at footnotetext#1{%
+ \insert\footins{%
+ \ifFN at setspace
+ \let\baselinestretch\FN at baselinestretch
+ \fi
+ \reset at font\footnotesize
+ \interlinepenalty\interfootnotelinepenalty
+ \splittopskip\footnotesep
+ \splitmaxdepth \dp\strutbox
+ \floatingpenalty\@MM
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark
+ }%
+ \color at begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep
+ \ignorespaces#1\@finalstrut\strutbox
+ }%
+ \color at endgroup
+ }%
+ \FN at mf@prepare
+ }%
+
% ./footmisc/footmisc.sty (side option)
More information about the latex3-commits
mailing list.