[latex3-commits] [latex3/latex2e] tagging705-float: improve autoref compability (ab25a965)
github at latex-project.org
github at latex-project.org
Mon Sep 16 00:32:11 CEST 2024
Repository : https://github.com/latex3/latex2e
On branch : tagging705-float
Link : https://github.com/latex3/latex2e/commit/ab25a965178d0b55db700901b888b68bb461092a
>---------------------------------------------------------------
commit ab25a965178d0b55db700901b888b68bb461092a
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Sep 16 00:32:11 2024 +0200
improve autoref compability
>---------------------------------------------------------------
ab25a965178d0b55db700901b888b68bb461092a
required/latex-lab/latex-lab-float.dtx | 5 +--
.../latex-lab/testfiles-float/float-001.luatex.tlg | 4 +--
required/latex-lab/testfiles-float/float-001.tlg | 4 +--
.../latex-lab/testfiles-float/float-002.luatex.tlg | 10 +++---
required/latex-lab/testfiles-float/float-002.tlg | 10 +++---
.../latex-lab/testfiles-float/float-003.luatex.tlg | 10 +++---
required/latex-lab/testfiles-float/float-003.tlg | 10 +++---
.../latex-lab/testfiles-float/float-004.luatex.tlg | 36 +++++++++++-----------
required/latex-lab/testfiles-float/float-004.tlg | 36 +++++++++++-----------
.../testfiles-float/float-005-double.luatex.tlg | 2 +-
.../latex-lab/testfiles-float/float-005-double.tlg | 2 +-
.../testfiles-float/float-006-spacing.luatex.tlg | 6 ++--
.../testfiles-float/float-006-spacing.tlg | 6 ++--
.../testfiles-float/float-007-gh55.luatex.tlg | 4 +--
.../latex-lab/testfiles-float/float-007-gh55.tlg | 4 +--
15 files changed, 75 insertions(+), 74 deletions(-)
diff --git a/required/latex-lab/latex-lab-float.dtx b/required/latex-lab/latex-lab-float.dtx
index 3da0404b..46cac9d5 100644
--- a/required/latex-lab/latex-lab-float.dtx
+++ b/required/latex-lab/latex-lab-float.dtx
@@ -469,7 +469,7 @@
% \end{macrocode}
% We add a target for links. TODO: check that it doesn't affect spacing!!
% \begin{macrocode}
- \MakeLinkTarget*{floatstructure.\@current at float@struct}%
+ \MakeLinkTarget*{\@captype.struct.\@current at float@struct}%
}%
% \end{macrocode}
% The end code of the float ...
@@ -548,8 +548,9 @@
\@kernel at refstepcounter\@captype
% \end{macrocode}
% we need to reset the target for \cs{addcontentsline}.
+% We use \cs{@captype} to support autoref.
% \begin{macrocode}
- \xdef\@currentHref{floatstructure.\@current at float@struct}%
+ \xdef\@currentHref{\@captype.struct.\@current at float@struct}%
}
\expandafter\@firstofone
\fi
diff --git a/required/latex-lab/testfiles-float/float-001.luatex.tlg b/required/latex-lab/testfiles-float/float-001.luatex.tlg
index b1546b35..75636079 100644
--- a/required/latex-lab/testfiles-float/float-001.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-001.luatex.tlg
@@ -164,7 +164,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.11111
.....\hbox(6.94444+1.94444)x345.0, glue set 94.86098fil, direction TLT
@@ -231,7 +231,7 @@ Completed box being shipped out [1]
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
.....\special{}
-.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.17}\protected at file@percent }}
+.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.17}\protected at file@percent }}
.....\glue 10.0
.....\hbox(6.94444+1.94444)x345.0, glue set 92.86096fil, direction TLT
......\glue 0.0 plus 1.0fil
diff --git a/required/latex-lab/testfiles-float/float-001.tlg b/required/latex-lab/testfiles-float/float-001.tlg
index 3c7db483..c0c2bcbd 100644
--- a/required/latex-lab/testfiles-float/float-001.tlg
+++ b/required/latex-lab/testfiles-float/float-001.tlg
@@ -153,7 +153,7 @@ Completed box being shipped out [1]
.....\marks4{b+,4,12,text,,,}
.....\marks4{e-,4,12,}
.....\marks4{e+,4,12,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.16882
.....\hbox(6.8872+1.94397)x345.0, glue set 94.88007fil
@@ -214,7 +214,7 @@ Completed box being shipped out [1]
...\vbox(28.8872+0.0)x345.0
....\vbox(28.8872+0.0)x345.0
.....\special{}
-.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.17}\protected at file@percent }}
+.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.17}\protected at file@percent }}
.....\glue 10.0
.....\hbox(6.8872+1.94397)x345.0, glue set 92.88055fil
......\glue 0.0 plus 1.0fil
diff --git a/required/latex-lab/testfiles-float/float-002.luatex.tlg b/required/latex-lab/testfiles-float/float-002.luatex.tlg
index 67db91c1..d58bcfcd 100644
--- a/required/latex-lab/testfiles-float/float-002.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-002.luatex.tlg
@@ -322,7 +322,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.22224
.....\hbox(6.83331+1.94444)x345.0, glue set 146.86105fil, direction TLT
@@ -351,7 +351,7 @@ Completed box being shipped out [1]
.....\glue 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}}
+.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}}
.....\glue(\parskip) 0.0
.....\glue(\parskip) 0.0
.....\glue(\baselineskip) 3.22224
@@ -390,7 +390,7 @@ Completed box being shipped out [1]
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
.....\special{}
-.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected at file@percent }}
+.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.19}\protected at file@percent }}
.....\glue 10.0
.....\hbox(6.94444+0.0)x345.0, glue set 140.55551fil, direction TLT
......\glue 0.0 plus 1.0fil
@@ -620,7 +620,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.29}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.16669
.....\hbox(6.83331+1.94444)x345.0, glue set 147.0694fil, direction TLT
@@ -747,7 +747,7 @@ Completed box being shipped out [2]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.38}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.16669
.....\hbox(6.83331+1.94444)x345.0, glue set 146.99995fil, direction TLT
diff --git a/required/latex-lab/testfiles-float/float-002.tlg b/required/latex-lab/testfiles-float/float-002.tlg
index c1dcc049..5bb9ffe5 100644
--- a/required/latex-lab/testfiles-float/float-002.tlg
+++ b/required/latex-lab/testfiles-float/float-002.tlg
@@ -305,7 +305,7 @@ Completed box being shipped out [1]
.....\marks4{b+,5,14,text,,,}
.....\marks4{e-,5,14,}
.....\marks4{e+,5,14,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.16882
.....\hbox(6.8872+1.94397)x345.0, glue set 146.86737fil
@@ -338,7 +338,7 @@ Completed box being shipped out [1]
.....\marks4{e-,7,15,}
.....\marks4{e+,7,15,}
.....\glue 0.0
-.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}}
+.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}}
.....\glue(\parskip) 0.0
.....\glue(\parskip) 0.0
.....\glue(\baselineskip) 3.16882
@@ -373,7 +373,7 @@ Completed box being shipped out [1]
...\vbox(28.8872+0.0)x345.0
....\vbox(28.8872+0.0)x345.0
.....\special{}
-.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected at file@percent }}
+.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.19}\protected at file@percent }}
.....\glue 10.0
.....\hbox(6.8872+0.0)x345.0, glue set 140.56335fil
......\glue 0.0 plus 1.0fil
@@ -602,7 +602,7 @@ Completed box being shipped out [1]
.....\marks4{b+,15,33,text,,,}
.....\marks4{e-,15,33,}
.....\marks4{e+,15,33,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.29}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.1128
.....\hbox(6.8872+1.94397)x345.0, glue set 147.07565fil
@@ -726,7 +726,7 @@ Completed box being shipped out [2]
.....\marks4{b+,20,42,text,,,}
.....\marks4{e-,20,42,}
.....\marks4{e+,20,42,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.38}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.1128
.....\hbox(6.8872+1.94397)x345.0, glue set 147.00623fil
diff --git a/required/latex-lab/testfiles-float/float-003.luatex.tlg b/required/latex-lab/testfiles-float/float-003.luatex.tlg
index 488b8851..a77371e2 100644
--- a/required/latex-lab/testfiles-float/float-003.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-003.luatex.tlg
@@ -340,7 +340,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.22224
.....\hbox(6.83331+1.94444)x345.0, glue set 146.86105fil, direction TLT
@@ -369,7 +369,7 @@ Completed box being shipped out [1]
.....\glue 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}}
+.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}}
.....\glue(\parskip) 0.0
.....\glue(\parskip) 0.0
.....\glue(\baselineskip) 3.22224
@@ -408,7 +408,7 @@ Completed box being shipped out [1]
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
.....\special{}
-.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected at file@percent }}
+.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.19}\protected at file@percent }}
.....\glue 10.0
.....\hbox(6.94444+0.0)x345.0, glue set 140.55551fil, direction TLT
......\glue 0.0 plus 1.0fil
@@ -638,7 +638,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.29}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.16669
.....\hbox(6.83331+1.94444)x345.0, glue set 147.0694fil, direction TLT
@@ -765,7 +765,7 @@ Completed box being shipped out [2]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.38}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.16669
.....\hbox(6.83331+1.94444)x345.0, glue set 146.99995fil, direction TLT
diff --git a/required/latex-lab/testfiles-float/float-003.tlg b/required/latex-lab/testfiles-float/float-003.tlg
index 9e4ee71a..f483a78c 100644
--- a/required/latex-lab/testfiles-float/float-003.tlg
+++ b/required/latex-lab/testfiles-float/float-003.tlg
@@ -323,7 +323,7 @@ Completed box being shipped out [1]
.....\marks4{b+,5,14,text,,,}
.....\marks4{e-,5,14,}
.....\marks4{e+,5,14,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.16882
.....\hbox(6.8872+1.94397)x345.0, glue set 146.86737fil
@@ -356,7 +356,7 @@ Completed box being shipped out [1]
.....\marks4{e-,7,15,}
.....\marks4{e+,7,15,}
.....\glue 0.0
-.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}}
+.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}}
.....\glue(\parskip) 0.0
.....\glue(\parskip) 0.0
.....\glue(\baselineskip) 3.16882
@@ -391,7 +391,7 @@ Completed box being shipped out [1]
...\vbox(28.8872+0.0)x345.0
....\vbox(28.8872+0.0)x345.0
.....\special{}
-.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected at file@percent }}
+.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.19}\protected at file@percent }}
.....\glue 10.0
.....\hbox(6.8872+0.0)x345.0, glue set 140.56335fil
......\glue 0.0 plus 1.0fil
@@ -620,7 +620,7 @@ Completed box being shipped out [1]
.....\marks4{b+,15,33,text,,,}
.....\marks4{e-,15,33,}
.....\marks4{e+,15,33,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.29}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.1128
.....\hbox(6.8872+1.94397)x345.0, glue set 147.07565fil
@@ -744,7 +744,7 @@ Completed box being shipped out [2]
.....\marks4{b+,20,42,text,,,}
.....\marks4{e-,20,42,}
.....\marks4{e+,20,42,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.38}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 5.1128
.....\hbox(6.8872+1.94397)x345.0, glue set 147.00623fil
diff --git a/required/latex-lab/testfiles-float/float-004.luatex.tlg b/required/latex-lab/testfiles-float/float-004.luatex.tlg
index fce2fedb..9b183dc2 100644
--- a/required/latex-lab/testfiles-float/float-004.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-004.luatex.tlg
@@ -349,8 +349,8 @@ Completed box being shipped out [1]
...\vbox(550.0+0.0)x345.0, glue set 55.14034fil, direction TLT
....\vbox(305.75659+0.0)x345.0, direction TLT
.....\vbox(305.75659+0.0)x345.0, direction TLT
-......\pdfdest name{floatstructure.13} xyz
-......\pdfdest name{floatstructure.13} xyz
+......\pdfdest name{figure.struct.13} xyz
+......\pdfdest name{figure.struct.13} xyz
......\penalty 10000
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
@@ -384,7 +384,7 @@ Completed box being shipped out [1]
.......\glue(\rightskip) 0.0
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{floatstructure.13}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{figure.struct.13}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.05556
......\hbox(6.94444+1.94444)x345.0, glue set 93.1943fil, direction TLT
@@ -444,7 +444,7 @@ Completed box being shipped out [1]
.......\OT1/cmr/m/n/10 e
.......\TU/lmr/m/n/10
.......\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111
-.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{floatstructure.13}{}}}
+.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{figure.struct.13}{}}}
.......\penalty 10000
.......\glue 0.0
.......\glue 0.0 plus 1.0fil
@@ -760,7 +760,7 @@ Completed box being shipped out [1]
.....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00310033> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action struct name{floatstructure.13} goto name{floatstructure.13}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020006600690067007500720065002E007300740072007500630074002E00310033> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action struct name{figure.struct.13} goto name{figure.struct.13}
.....\OT1/cmr/m/n/10 1
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 2}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -829,7 +829,7 @@ Completed box being shipped out [1]
.....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00320039> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action struct name{floatstructure.29} goto name{floatstructure.29}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020006600690067007500720065002E007300740072007500630074002E00320039> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action struct name{figure.struct.29} goto name{figure.struct.29}
.....\OT1/cmr/m/n/10 2
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 3}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -854,7 +854,7 @@ Completed box being shipped out [1]
.....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00330035> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action struct name{floatstructure.35} goto name{floatstructure.35}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020006600690067007500720065002E007300740072007500630074002E00330035> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action struct name{figure.struct.35} goto name{figure.struct.35}
.....\OT1/cmr/m/n/10 3
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 4}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -1115,7 +1115,7 @@ Completed box being shipped out [1]
.....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00320034> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action struct name{floatstructure.24} goto name{floatstructure.24}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020007400610062006C0065002E007300740072007500630074002E00320034> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action struct name{table.struct.24} goto name{table.struct.24}
.....\OT1/cmr/m/n/10 1
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 5}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -1337,10 +1337,10 @@ Completed box being shipped out [1]
.....\vbox(43.24998+0.0)x345.0, direction TLT
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\pdfdest name{floatstructure.24} xyz
-......\pdfdest name{floatstructure.24} xyz
+......\pdfdest name{table.struct.24} xyz
+......\pdfdest name{table.struct.24} xyz
......\penalty 10000
-......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.24}\protected at file@percent }}
+......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.24}\protected at file@percent }}
......\glue 10.0
......\hbox(6.94444+1.94444)x345.0, glue set 92.86096fil, direction TLT
.......\glue 0.0 plus 1.0fil
@@ -1405,7 +1405,7 @@ Completed box being shipped out [1]
......\glue 0.0
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{floatstructure.24}{}}}
+......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{table.struct.24}{}}}
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
......\glue(\baselineskip) 7.11113
@@ -1532,8 +1532,8 @@ Completed box being shipped out [2]
....\glue 8.0 plus 2.0fil
....\vbox(481.94403+0.0)x345.0, direction TLT
.....\vbox(481.94403+0.0)x345.0, direction TLT
-......\pdfdest name{floatstructure.29} xyz
-......\pdfdest name{floatstructure.29} xyz
+......\pdfdest name{figure.struct.29} xyz
+......\pdfdest name{figure.struct.29} xyz
......\penalty 10000
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
@@ -1567,7 +1567,7 @@ Completed box being shipped out [2]
.......\glue(\rightskip) 0.0
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{floatstructure.29}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{figure.struct.29}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.05556
......\hbox(6.94444+1.94444)x345.0, glue set 28.15251fil, direction TLT
@@ -1671,7 +1671,7 @@ Completed box being shipped out [2]
......\glue 0.0
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{floatstructure.29}{}}}
+......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{figure.struct.29}{}}}
......\glue 6.0 plus 2.0 minus 2.0
......\glue 0.0
......\pdfdest name{floatstructure.35} xyz
@@ -1710,7 +1710,7 @@ Completed box being shipped out [2]
.......\glue(\rightskip) 0.0
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{floatstructure.35}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{figure.struct.35}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.05556
......\hbox(6.94444+1.94444)x345.0, glue set 81.61096fil, direction TLT
@@ -1773,7 +1773,7 @@ Completed box being shipped out [2]
......\glue 0.0
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{floatstructure.35}{}}}
+......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{figure.struct.35}{}}}
......\glue 0.0
....\glue 0.0 plus 1.0fil
...\pdflinkstate 1
diff --git a/required/latex-lab/testfiles-float/float-004.tlg b/required/latex-lab/testfiles-float/float-004.tlg
index 4408ca49..8539be9f 100644
--- a/required/latex-lab/testfiles-float/float-004.tlg
+++ b/required/latex-lab/testfiles-float/float-004.tlg
@@ -341,8 +341,8 @@ Completed box being shipped out [1]
...\vbox(550.0+0.0)x345.0, glue set 55.20148fil
....\vbox(305.75659+0.0)x345.0
.....\vbox(305.75659+0.0)x345.0
-......\pdfdest name{floatstructure.13} xyz
-......\pdfdest struct39 name{floatstructure.13} xyz
+......\pdfdest name{figure.struct.13} xyz
+......\pdfdest struct39 name{figure.struct.13} xyz
......\penalty 10000
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
@@ -388,7 +388,7 @@ Completed box being shipped out [1]
......\marks4{b+,12,15,text,,,}
......\marks4{e-,12,15,}
......\marks4{e+,12,15,}
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{floatstructure.13}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{figure.struct.13}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.1128
......\hbox(6.8872+1.94397)x345.0, glue set 93.2138fil
@@ -434,7 +434,7 @@ Completed box being shipped out [1]
.......\T1/cmr/m/n/10 g
.......\T1/cmr/m/n/10 e
.......\glue 3.33252 plus 1.66626 minus 1.11084
-.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{floatstructure.13}{}}}
+.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{figure.struct.13}{}}}
.......\penalty 10000
.......\glue 0.0
.......\pdfliteral page{EMC}
@@ -705,7 +705,7 @@ Completed box being shipped out [1]
.....\pdfliteral page{EMC}
.....\write1{\new at label@record{mcid-4}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{4}{tagmcid}{\__property_code_tagmcid: }}}
.....\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00310033> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action goto name{floatstructure.13}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020006600690067007500720065002E007300740072007500630074002E00310033> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action goto name{figure.struct.13}
.....\T1/cmr/m/n/10 1
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 2}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -774,7 +774,7 @@ Completed box being shipped out [1]
.....\pdfliteral page{EMC}
.....\write1{\new at label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}}
.....\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00320039> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action goto name{floatstructure.29}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020006600690067007500720065002E007300740072007500630074002E00320039> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action goto name{figure.struct.29}
.....\T1/cmr/m/n/10 2
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 3}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -796,7 +796,7 @@ Completed box being shipped out [1]
.....\pdfliteral page{EMC}
.....\write1{\new at label@record{mcid-8}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{8}{tagmcid}{\__property_code_tagmcid: }}}
.....\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00330035> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action goto name{floatstructure.35}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020006600690067007500720065002E007300740072007500630074002E00330035> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action goto name{figure.struct.35}
.....\T1/cmr/m/n/10 3
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 4}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -1025,7 +1025,7 @@ Completed box being shipped out [1]
.....\pdfliteral page{EMC}
.....\write1{\new at label@record{mcid-17}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{17}{tagmcid}{\__property_code_tagmcid: }}}
.....\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E00200066006C006F00610074007300740072007500630074007500720065002E00320034> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action goto name{floatstructure.24}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020007400610062006C0065002E007300740072007500630074002E00320034> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action goto name{table.struct.24}
.....\T1/cmr/m/n/10 1
.....\pdfendlink
.....\write1{\new at label@record{@tag at objr@page at 5}{{tagabspage}{\__property_code_tagabspage: }}}
@@ -1219,10 +1219,10 @@ Completed box being shipped out [1]
....\glue 20.0 plus 2.0 minus 4.0
....\vbox(43.19171+0.0)x345.0
.....\vbox(43.19171+0.0)x345.0
-......\pdfdest name{floatstructure.24} xyz
-......\pdfdest struct53 name{floatstructure.24} xyz
+......\pdfdest name{table.struct.24} xyz
+......\pdfdest struct53 name{table.struct.24} xyz
......\penalty 10000
-......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.24}\protected at file@percent }}
+......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.24}\protected at file@percent }}
......\glue 10.0
......\hbox(6.8872+1.94397)x345.0, glue set 92.88055fil
.......\glue 0.0 plus 1.0fil
@@ -1278,7 +1278,7 @@ Completed box being shipped out [1]
......\marks4{e-,20,25,}
......\marks4{e+,20,25,}
......\glue 0.0
-......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{floatstructure.24}{}}}
+......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{table.struct.24}{}}}
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
......\glue(\baselineskip) 7.11476
@@ -1391,8 +1391,8 @@ Completed box being shipped out [2]
....\glue 8.0 plus 2.0fil
....\vbox(481.94308+0.0)x345.0
.....\vbox(481.94308+0.0)x345.0
-......\pdfdest name{floatstructure.29} xyz
-......\pdfdest struct58 name{floatstructure.29} xyz
+......\pdfdest name{figure.struct.29} xyz
+......\pdfdest struct58 name{figure.struct.29} xyz
......\penalty 10000
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
@@ -1438,7 +1438,7 @@ Completed box being shipped out [2]
......\marks4{b+,24,31,text,,,}
......\marks4{e-,24,31,}
......\marks4{e+,24,31,}
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{floatstructure.29}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{figure.struct.29}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.1128
......\hbox(6.8872+1.94397)x345.0, glue set 28.18802fil
@@ -1526,7 +1526,7 @@ Completed box being shipped out [2]
......\marks4{e-,26,33,}
......\marks4{e+,26,33,}
......\glue 0.0
-......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{floatstructure.29}{}}}
+......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{figure.struct.29}{}}}
......\glue 6.0 plus 2.0 minus 2.0
......\glue 0.0
......\pdfdest name{floatstructure.35} xyz
@@ -1577,7 +1577,7 @@ Completed box being shipped out [2]
......\marks4{b+,29,37,text,,,}
......\marks4{e-,29,37,}
......\marks4{e+,29,37,}
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{floatstructure.35}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{figure.struct.35}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.1128
......\hbox(6.8872+1.94397)x345.0, glue set 81.6333fil
@@ -1637,7 +1637,7 @@ Completed box being shipped out [2]
......\marks4{e-,31,39,}
......\marks4{e+,31,39,}
......\glue 0.0
-......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{floatstructure.35}{}}}
+......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{figure.struct.35}{}}}
......\glue 0.0
....\glue 0.0 plus 1.0fil
...\pdfrunninglinkoff
diff --git a/required/latex-lab/testfiles-float/float-005-double.luatex.tlg b/required/latex-lab/testfiles-float/float-005-double.luatex.tlg
index a5ecbb52..fc93b5d7 100644
--- a/required/latex-lab/testfiles-float/float-005-double.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-005-double.luatex.tlg
@@ -1436,7 +1436,7 @@ Completed box being shipped out [2]
......\glue(\rightskip) 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.11111
.....\hbox(6.94444+1.94444)x469.0, glue set 184.54158fil, direction TLT
diff --git a/required/latex-lab/testfiles-float/float-005-double.tlg b/required/latex-lab/testfiles-float/float-005-double.tlg
index f47aed10..f213a86b 100644
--- a/required/latex-lab/testfiles-float/float-005-double.tlg
+++ b/required/latex-lab/testfiles-float/float-005-double.tlg
@@ -1319,7 +1319,7 @@ Completed box being shipped out [2]
.....\marks4{b+,4,12,text,,,}
.....\marks4{e-,4,12,}
.....\marks4{e+,4,12,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{floatstructure.10}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{figure.struct.10}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.16882
.....\hbox(6.8872+1.94397)x469.0, glue set 184.55386fil
diff --git a/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg b/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg
index bd5799e7..aa1b77c9 100644
--- a/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg
@@ -44,8 +44,8 @@ Completed box being shipped out [1]
....\glue 8.0 plus 2.0fil
....\vbox(80.84995+0.0)x345.0, direction TLT
.....\vbox(80.84995+0.0)x345.0, direction TLT
-......\pdfdest name{floatstructure.5} xyz
-......\pdfdest name{floatstructure.5} xyz
+......\pdfdest name{figure.struct.5} xyz
+......\pdfdest name{figure.struct.5} xyz
......\penalty 10000
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
@@ -66,7 +66,7 @@ Completed box being shipped out [1]
.......\glue(\rightskip) 0.0 plus 1.0fil
......\pdfliteral page <lua data reference ...>
......\pdfliteral page <lua data reference ...>
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{floatstructure.5}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{figure.struct.5}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.16669
......\hbox(6.83331+1.94444)x345.0, glue set 130.33325fil, direction TLT
diff --git a/required/latex-lab/testfiles-float/float-006-spacing.tlg b/required/latex-lab/testfiles-float/float-006-spacing.tlg
index 783976cc..a27e1ce4 100644
--- a/required/latex-lab/testfiles-float/float-006-spacing.tlg
+++ b/required/latex-lab/testfiles-float/float-006-spacing.tlg
@@ -49,8 +49,8 @@ Completed box being shipped out [1]
....\glue 8.0 plus 2.0fil
....\vbox(80.84947+0.0)x345.0
.....\vbox(80.84947+0.0)x345.0
-......\pdfdest name{floatstructure.5} xyz
-......\pdfdest struct13 name{floatstructure.5} xyz
+......\pdfdest name{figure.struct.5} xyz
+......\pdfdest struct13 name{figure.struct.5} xyz
......\penalty 10000
......\glue(\parskip) 0.0
......\glue(\parskip) 0.0
@@ -69,7 +69,7 @@ Completed box being shipped out [1]
......\marks4{b+,1,7,text,,,}
......\marks4{e-,1,7,}
......\marks4{e+,1,7,}
-......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{floatstructure.5}\protected at file@percent }}
+......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{figure.struct.5}\protected at file@percent }}
......\glue 10.0
......\glue(\baselineskip) 5.1128
......\hbox(6.8872+1.94397)x345.0, glue set 130.34363fil
diff --git a/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg b/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg
index ebe69dd8..b5c2ce41 100644
--- a/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg
+++ b/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg
@@ -242,7 +242,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0 plus 1.0fil
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{floatstructure.17}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{figure.struct.17}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.11111
.....\hbox(6.94444+1.94444)x345.0, glue set 135.87492fil, direction TLT
@@ -278,7 +278,7 @@ Completed box being shipped out [1]
.....\glue 0.0
.....\pdfliteral page <lua data reference ...>
.....\pdfliteral page <lua data reference ...>
-.....\write1{\newlabel{figure1}{{1}{\thepage }{}{floatstructure.17}{}}}
+.....\write1{\newlabel{figure1}{{1}{\thepage }{}{figure.struct.17}{}}}
.....\glue 0.0
...\penalty 0
...\glue 12.0 plus 2.0 minus 2.0
diff --git a/required/latex-lab/testfiles-float/float-007-gh55.tlg b/required/latex-lab/testfiles-float/float-007-gh55.tlg
index 7a32f7d7..af79c4cc 100644
--- a/required/latex-lab/testfiles-float/float-007-gh55.tlg
+++ b/required/latex-lab/testfiles-float/float-007-gh55.tlg
@@ -259,7 +259,7 @@ Completed box being shipped out [1]
.....\marks4{b+,11,19,text,,,}
.....\marks4{e-,11,19,}
.....\marks4{e+,11,19,}
-.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{floatstructure.17}\protected at file@percent }}
+.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{figure.struct.17}\protected at file@percent }}
.....\glue 10.0
.....\glue(\baselineskip) 3.16882
.....\hbox(6.8872+1.94397)x345.0, glue set 135.88394fil
@@ -297,7 +297,7 @@ Completed box being shipped out [1]
.....\marks4{e-,13,20,}
.....\marks4{e+,13,20,}
.....\glue 0.0
-.....\write1{\newlabel{figure1}{{1}{\thepage }{}{floatstructure.17}{}}}
+.....\write1{\newlabel{figure1}{{1}{\thepage }{}{figure.struct.17}{}}}
.....\glue 0.0
...\penalty 0
...\glue 12.0 plus 2.0 minus 2.0
More information about the latex3-commits
mailing list.