[latex3-commits] [latex3/latex2e] add-theHcount: merge develop (1f7fc304)
github at latex-project.org
github at latex-project.org
Thu Oct 3 00:15:10 CEST 2024
Repository : https://github.com/latex3/latex2e
On branch : add-theHcount
Link : https://github.com/latex3/latex2e/commit/1f7fc30447ccd7d38eefb37324c9fc56e2f7007e
>---------------------------------------------------------------
commit 1f7fc30447ccd7d38eefb37324c9fc56e2f7007e
Merge: 0f4947f5 948c666a
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Thu Oct 3 00:15:10 2024 +0200
merge develop
>---------------------------------------------------------------
1f7fc30447ccd7d38eefb37324c9fc56e2f7007e
base/changes.txt | 4 +
base/lttagging.dtx | 4 +-
required/latex-lab/changes.txt | 5 +-
required/latex-lab/latex-lab-footnotes.dtx | 62 +-
required/latex-lab/testfiles-LM/LM-2-2.tlg | 284 ++++---
.../latex-lab/testfiles-OR-luatex/footmisc-003.tlg | 20 +-
.../latex-lab/testfiles-OR-luatex/footmisc-004.tlg | 20 +-
.../footmisc-009-multiple-tagging.tlg | 60 +-
.../testfiles-OR-luatex/footmisc-009-multiple.tlg | 4 +-
.../footmisc-010-setspace-tagging.tlg | 4 +-
.../testfiles-OR-luatex/footmisc-010-setspace.tlg | 4 +-
.../testfiles-OR-luatex/footmisc-011-para.tlg | 4 +-
.../footmisc-012-side-hyperref.tlg | 30 +-
.../testfiles-OR-luatex/footmisc-012-side.tlg | 4 +-
.../testfiles-OR-luatex/footmisc-014-hang.tlg | 4 +-
.../latex-lab/testfiles-OR-luatex/memoir-001.tpf | 402 +++++-----
.../latex-lab/testfiles-OR-luatex/scrartcl-001.tpf | 362 +++++----
.../testfiles-OR-luatex/test-minipage.tpf | 334 +++++----
required/latex-lab/testfiles-OR-luatex/test1.tpf | 224 +++---
required/latex-lab/testfiles-OR-luatex/test10.tpf | 276 ++++---
.../testfiles-OR-luatex/test11-series.tpf | 244 +++---
required/latex-lab/testfiles-OR-luatex/test2.tpf | 258 ++++---
required/latex-lab/testfiles-OR-luatex/test3.tpf | 258 ++++---
required/latex-lab/testfiles-OR-luatex/test4.tpf | 256 ++++---
required/latex-lab/testfiles-OR-luatex/test5.tpf | 272 ++++---
required/latex-lab/testfiles-OR-luatex/test6.tpf | 264 ++++---
required/latex-lab/testfiles-OR-luatex/test7.tpf | 280 ++++---
required/latex-lab/testfiles-OR-luatex/test8.tpf | 230 +++---
required/latex-lab/testfiles-OR-luatex/test9.tpf | 248 +++----
.../latex-lab/testfiles-OR/check-declarations.tlg | 4 +-
required/latex-lab/testfiles-OR/footmisc-002.tlg | 4 +-
required/latex-lab/testfiles-OR/footmisc-003.tlg | 244 +++---
required/latex-lab/testfiles-OR/footmisc-004.tlg | 244 +++---
required/latex-lab/testfiles-OR/footmisc-005.tlg | 284 +++----
required/latex-lab/testfiles-OR/footmisc-006.tlg | 514 ++++++-------
.../testfiles-OR/footmisc-007-rollback.tlg | 4 +-
.../testfiles-OR/footmisc-009-multiple-tagging.tlg | 576 +++++++--------
.../testfiles-OR/footmisc-009-multiple.tlg | 8 +-
.../testfiles-OR/footmisc-010-setspace-tagging.tlg | 416 +++++------
.../testfiles-OR/footmisc-010-setspace.tlg | 8 +-
.../latex-lab/testfiles-OR/footmisc-011-para.tlg | 168 ++---
.../testfiles-OR/footmisc-012-side-hyperref.tlg | 34 +-
.../latex-lab/testfiles-OR/footmisc-012-side.tlg | 8 +-
.../testfiles-OR/footmisc-013-scrartcl.tlg | 188 ++---
.../latex-lab/testfiles-OR/footmisc-014-hang.tlg | 4 +-
.../footmisc-floats-abovefloats-flushbottom.tlg | 814 ++++++++++-----------
.../testfiles-OR/footmisc-floats-abovefloats.tlg | 814 ++++++++++-----------
.../footmisc-floats-belowfloats-flushbottom.tlg | 814 ++++++++++-----------
.../testfiles-OR/footmisc-floats-latex.tlg | 814 ++++++++++-----------
.../testfiles-OR/footnote-float-above.tlg | 62 +-
.../latex-lab/testfiles-OR/footnote-heading.tlg | 2 +-
.../testfiles-OR/footnote-hyperref-001.tlg | 4 +-
required/latex-lab/testfiles-OR/footnote-par.tlg | 4 +-
required/latex-lab/testfiles-OR/memoir-001.tpf | 414 +++++------
required/latex-lab/testfiles-OR/scrartcl-001.tpf | 372 +++++-----
required/latex-lab/testfiles-OR/tagging-001.tlg | 108 +--
.../testfiles-OR/tagging-002-longtable.tpf | 350 +++++----
.../minipage-005-footnote.luatex.tlg | 2 +-
.../testfiles-minipage/minipage-005-footnote.tlg | 50 +-
.../minipage-006-gh723.luatex.tpf | 530 ++++++++++++++
.../testfiles-minipage/minipage-006-gh723.pvt | 20 +
.../testfiles-minipage/minipage-006-gh723.tpf | 803 ++++++++++++++++++++
.../latex-lab/testfiles-title/title-002.luatex.tpf | 312 ++++----
required/latex-lab/testfiles-title/title-002.tpf | 338 +++++----
.../latex-lab/testfiles-title/title-003.luatex.tpf | 236 +++---
required/latex-lab/testfiles-title/title-003.tpf | 254 ++++---
.../latex-lab/testfiles-title/title-004.luatex.tpf | 312 ++++----
required/latex-lab/testfiles-title/title-004.tpf | 338 +++++----
.../latex-lab/testfiles-title/title-005.luatex.tpf | 312 ++++----
required/latex-lab/testfiles-title/title-005.tpf | 338 +++++----
.../latex-lab/testfiles-title/title-006.luatex.tpf | 256 ++++---
required/latex-lab/testfiles-title/title-006.tpf | 292 ++++----
.../latex-lab/testfiles-title/title-007.luatex.tpf | 328 ++++-----
required/latex-lab/testfiles-title/title-007.tpf | 358 +++++----
.../latex-lab/testfiles-title/title-008.luatex.tpf | 252 ++++---
required/latex-lab/testfiles-title/title-008.tpf | 274 ++++---
.../latex-lab/testfiles-title/title-009.luatex.tpf | 252 ++++---
required/latex-lab/testfiles-title/title-009.tpf | 274 ++++---
78 files changed, 9482 insertions(+), 8350 deletions(-)
diff --cc base/lttagging.dtx
index c5d2090f,3d752f28..d759b1fd
--- a/base/lttagging.dtx
+++ b/base/lttagging.dtx
@@@ -33,7 -33,7 +33,7 @@@
%<*driver>
% \fi
\ProvidesFile{lttagging.dtx}
- [2024/09/24 v1.0i LaTeX Kernel (tagging support)]
- [2024/10/02 v1.0i LaTeX Kernel (tagging support)]
++ [2024/10/02 v1.0j LaTeX Kernel (tagging support)]
% \iffalse
\documentclass{l3doc}
\GetFileInfo{lttagging.dtx}
@@@ -239,8 -240,10 +240,9 @@@
\tl_set_eq:NN \l__tag_para_tag_tl\l__tag_para_tag_default_tl
\bool_set_false:N\l__tag_para_flattened_bool
\int_zero:N \l__tag_block_flattened_level_int
+ \bool_set_true:N \l__tag_para_bool
}
\AssignSocketPlug{tagsupport/para/restore}{default}
-\ExplSyntaxOff
% \end{macrocode}
% \end{plugdecl}
%
diff --cc required/latex-lab/changes.txt
index f6fddf72,c48d7edd..44de53c0
--- a/required/latex-lab/changes.txt
+++ b/required/latex-lab/changes.txt
@@@ -1,7 -1,6 +1,10 @@@
- 2024-10-01 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
++2024-10-02 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
+ * latex-lab-toc.dtx, latex-lab-sec.dtx, latex-lab-toc-kernel-changes: move target
+ handling (\MakeLinkTarget patches) into the kernel.
+
+ 2024-09-30 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
+ * latex-lab-footnotes.dtx: remove unneeded NonStruct structure.
+
2024-09-30 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* latex-lab-math.dtx (subsection{Content grabbing}):
Correct logic for inserting below skips after displays (tagging/721)
diff --cc required/latex-lab/testfiles-LM/LM-2-2.tlg
index c19fe588,2429618b..6711d7f8
--- a/required/latex-lab/testfiles-LM/LM-2-2.tlg
+++ b/required/latex-lab/testfiles-LM/LM-2-2.tlg
@@@ -1596,9 -1588,5 +1588,9 @@@ The sequence \g__tag_mc_main_marks_seq
braces):
> {e+}
> {125}
- > {203}.
+ > {201}.
[4]
+***************
+Compilation 1 of test file completed with exit status 0
+Compilation 2 of test file completed with exit status 0
+Compilation 3 of test file completed with exit status 0
diff --cc required/latex-lab/testfiles-OR-luatex/footmisc-009-multiple.tlg
index 628433bc,4315d40e..0a0b5779
--- a/required/latex-lab/testfiles-OR-luatex/footmisc-009-multiple.tlg
+++ b/required/latex-lab/testfiles-OR-luatex/footmisc-009-multiple.tlg
@@@ -230,8 -230,8 +230,8 @@@ Completed box being shipped out [1
......\mathoff
....\hbox(6.65+0.0)x0.0, direction TLT
.....\rule(6.65+0.0)x0.0
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{7}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.7}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{6}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.6}{}}}
....\OT1/cmr/m/n/8 B
....\penalty 10000
....\rule(0.0+2.85002)x0.0
diff --cc required/latex-lab/testfiles-OR-luatex/footmisc-010-setspace-tagging.tlg
index 8adb3f1d,a0631039..e1bf154b
--- a/required/latex-lab/testfiles-OR-luatex/footmisc-010-setspace-tagging.tlg
+++ b/required/latex-lab/testfiles-OR-luatex/footmisc-010-setspace-tagging.tlg
@@@ -1279,8 -1279,8 +1279,8 @@@ Completed box being shipped out [1
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
.....\rule(6.65+0.0)x0.0
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{14}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.14}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{13}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.13}{}}}
....\OT1/cmr/m/n/8 B
....\penalty 10000
....\rule(0.0+2.85002)x0.0
diff --cc required/latex-lab/testfiles-OR-luatex/footmisc-010-setspace.tlg
index cbdf655d,f5cd00fa..080f80d3
--- a/required/latex-lab/testfiles-OR-luatex/footmisc-010-setspace.tlg
+++ b/required/latex-lab/testfiles-OR-luatex/footmisc-010-setspace.tlg
@@@ -1132,8 -1132,8 +1132,8 @@@ Completed box being shipped out [1
......\mathoff
....\hbox(6.65+0.0)x0.0, direction TLT
.....\rule(6.65+0.0)x0.0
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{7}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.7}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{6}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.6}{}}}
....\OT1/cmr/m/n/8 B
....\penalty 10000
....\rule(0.0+2.85002)x0.0
diff --cc required/latex-lab/testfiles-OR-luatex/footmisc-011-para.tlg
index 2425574d,8f537279..75276069
--- a/required/latex-lab/testfiles-OR-luatex/footmisc-011-para.tlg
+++ b/required/latex-lab/testfiles-OR-luatex/footmisc-011-para.tlg
@@@ -187,8 -187,8 +187,8 @@@ Completed box being shipped out [1
....\pdfliteral page <lua data reference ...>
....\TU/lmr/m/n/10
....\glue -1.63
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{10}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.10}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{9}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.9}{}}}
....\penalty 10000
....\glue 0.0
....\OT1/cmr/m/n/8 B
diff --cc required/latex-lab/testfiles-OR-luatex/footmisc-012-side.tlg
index 8bdb933b,0544532c..1677f9a5
--- a/required/latex-lab/testfiles-OR-luatex/footmisc-012-side.tlg
+++ b/required/latex-lab/testfiles-OR-luatex/footmisc-012-side.tlg
@@@ -205,8 -205,8 +205,8 @@@ Completed box being shipped out [1
..........\hbox(3.86665+0.0)x4.16661, shifted -2.82333, direction TLT
...........\OT1/cmr/m/n/6 2
..........\mathoff
- ........\write1{\new at label@record{__fnote/foo}{{fnote/struct}{7}}}
- ........\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.7}{}}}
+ ........\write1{\new at label@record{__fnote/foo}{{fnote/struct}{6}}}
-........\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++........\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.6}{}}}
........\OT1/cmr/m/n/8 B
........\penalty 10000
........\glue(\parfillskip) 0.0 plus 1.0fil
diff --cc required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
index 9df07885,74f02dae..d1696cbf
--- a/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
@@@ -329,8 -329,8 +329,8 @@@ Completed box being shipped out [1
....\special{}
....\hbox(6.65+0.0)x0.0
.....\rule(6.65+0.0)x0.0
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{7}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.7}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{6}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.6}{}}}
....\T1/cmr/m/n/8 B
....\penalty 10000
....\rule(0.0+2.85002)x0.0
diff --cc required/latex-lab/testfiles-OR/footmisc-010-setspace-tagging.tlg
index d61629ec,b9b08761..93eb84d1
--- a/required/latex-lab/testfiles-OR/footmisc-010-setspace-tagging.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-010-setspace-tagging.tlg
@@@ -1359,8 -1359,8 +1359,8 @@@ Completed box being shipped out [1
....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\hbox(6.65+0.0)x0.0
.....\rule(6.65+0.0)x0.0
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{14}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.14}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{13}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.13}{}}}
....\T1/cmr/m/n/8 B
....\penalty 10000
....\rule(0.0+2.85002)x0.0
diff --cc required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
index acb6cc3c,2648929e..e6acc36d
--- a/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
@@@ -1147,8 -1147,8 +1147,8 @@@ Completed box being shipped out [1
....\special{}
....\hbox(6.65+0.0)x0.0
.....\rule(6.65+0.0)x0.0
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{7}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.7}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{6}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.6}{}}}
....\T1/cmr/m/n/8 B
....\penalty 10000
....\rule(0.0+2.85002)x0.0
diff --cc required/latex-lab/testfiles-OR/footmisc-011-para.tlg
index 4a6cf09c,08712fa0..45ab2bfb
--- a/required/latex-lab/testfiles-OR/footmisc-011-para.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-011-para.tlg
@@@ -367,8 -367,8 +367,8 @@@ Completed box being shipped out [1
....\pdfliteral shipout page{/footnote <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\penalty 10000
....\glue 1.69955
- ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{10}}}
- ....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.10}{}}}
+ ....\write1{\new at label@record{__fnote/foo}{{fnote/struct}{9}}}
-....\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++....\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.9}{}}}
....\penalty 10000
....\glue 0.0
....\T1/cmr/m/n/8 B
diff --cc required/latex-lab/testfiles-OR/footmisc-012-side.tlg
index d52a88c0,c2b62ce1..0c9f52ca
--- a/required/latex-lab/testfiles-OR/footmisc-012-side.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-012-side.tlg
@@@ -278,8 -278,8 +278,8 @@@ Completed box being shipped out [1
..........\mathoff
........\special{}
........\special{}
- ........\write1{\new at label@record{__fnote/foo}{{fnote/struct}{7}}}
- ........\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.7}{}}}
+ ........\write1{\new at label@record{__fnote/foo}{{fnote/struct}{6}}}
-........\write1{\newlabel{foo}{{2}{\thepage }{}{}{}}}
++........\write1{\newlabel{foo}{{2}{\thepage }{}{footnote*.6}{}}}
........\T1/cmr/m/n/8 B
........\special{}
........\penalty 10000
More information about the latex3-commits
mailing list.